From e37b7ce7d6208a75960372b7161f1ebf16b2a7e4 Mon Sep 17 00:00:00 2001 From: macronova Date: Thu, 15 Aug 2024 17:05:10 -0700 Subject: [PATCH 0001/1107] kdePackages.wallpaper-engine-plugin: init at latest (1e60410) qt6 branch Update maintainer --- maintainers/maintainer-list.nix | 9 +++ pkgs/kde/default.nix | 1 + .../wallpaper-engine-plugin/default.nix | 61 +++++++++++++++++++ .../wallpaper-engine-plugin/nix-plugin.patch | 17 ++++++ 4 files changed, 88 insertions(+) create mode 100644 pkgs/kde/third-party/wallpaper-engine-plugin/default.nix create mode 100644 pkgs/kde/third-party/wallpaper-engine-plugin/nix-plugin.patch diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a02b6f0be78f..0b9854a306aa 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12292,6 +12292,15 @@ githubId = 401263; keys = [ { fingerprint = "1147 43F1 E707 6F3E 6F4B 2C96 B9A8 B592 F126 F8E8"; } ]; }; + macronova = { + name = "Sicheng Pan"; + email = "trivial@invariantspace.com"; + matrix = "@macronova:invariantspace.com"; + github = "Sicheng-Pan"; + githubId = 60079945; + keys = [ { fingerprint = "49D3 FFDA 4D30 DDEE 68EF AE84 EBC4 A200 6737 3921"; } ]; + }; + mac-chaffee = { name = "Mac Chaffee"; github = "mac-chaffee"; diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix index 6f80e4eaadb4..e2fd6c7e1dac 100644 --- a/pkgs/kde/default.nix +++ b/pkgs/kde/default.nix @@ -78,6 +78,7 @@ phonon-vlc = self.callPackage ./misc/phonon-vlc {}; polkit-qt-1 = self.callPackage ./misc/polkit-qt-1 {}; pulseaudio-qt = self.callPackage ./misc/pulseaudio-qt {}; + wallpaper-engine-plugin = self.callPackage ./third-party/wallpaper-engine-plugin {}; } ); in diff --git a/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix b/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix new file mode 100644 index 000000000000..210b93f87464 --- /dev/null +++ b/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix @@ -0,0 +1,61 @@ +{ + extra-cmake-modules, + fetchFromGitHub, + full, + kpackage, + libplasma, + lib, + lz4, + mkKdeDerivation, + mpv, + pkg-config, + python3, +}: +mkKdeDerivation { + pname = "wallpaper-engine-kde-plugin"; + version = "qt6"; + + src = fetchFromGitHub { + owner = "catsout"; + repo = "wallpaper-engine-kde-plugin"; + rev = "1e604105c586c7938c5b2c19e3dc8677b2eb4bb4"; + hash = "sha256-bKGQxyS8gUi+37lODLVHphMoQwLKZt/hpSjR5MN+5GA="; + fetchSubmodules = true; + }; + + patches = [./nix-plugin.patch]; + + extraBuildInputs = [ + extra-cmake-modules + full + libplasma + lz4 + mpv + ]; + + extraCmakeFlags = ["-DUSE_PLASMAPKG=ON"]; + + extraNativeBuildInputs = [ + kpackage + pkg-config + ]; + + postInstall = let + py3-ws = python3.withPackages (ps: + with ps; [ + websockets + ]); + in '' + cd ../plugin + PATH=${py3-ws}/bin:$PATH patchShebangs --build ./contents/pyext.py + substituteInPlace ./contents/ui/Pyext.qml --replace-fail NIX_STORE_PACKAGE_PATH ${placeholder "out"} + kpackagetool6 -i ./ -p $out/share/plasma/wallpapers/ + ''; + + meta = with lib; { + description = "A KDE wallpaper plugin integrating Wallpaper Engine"; + homepage = "https://github.com/catsout/wallpaper-engine-kde-plugin"; + license = licenses.gpl2; + maintainers = with maintainers; [ macronova ]; + }; +} diff --git a/pkgs/kde/third-party/wallpaper-engine-plugin/nix-plugin.patch b/pkgs/kde/third-party/wallpaper-engine-plugin/nix-plugin.patch new file mode 100644 index 000000000000..042226d6dabe --- /dev/null +++ b/pkgs/kde/third-party/wallpaper-engine-plugin/nix-plugin.patch @@ -0,0 +1,17 @@ +diff --git a/plugin/contents/pyext.py b/plugin/contents/pyext.py +old mode 100644 +new mode 100755 +diff --git a/plugin/contents/ui/Pyext.qml b/plugin/contents/ui/Pyext.qml +index 1a48f5e..8a9c9c9 100644 +--- a/plugin/contents/ui/Pyext.qml ++++ b/plugin/contents/ui/Pyext.qml +@@ -15,7 +15,8 @@ Item { + "[ -f /usr/share/$EXT ] && WKD=/usr/share/$EXT", + "[ -f \"$HOME/.local/share/$EXT\" ] && WKD=\"$HOME/.local/share/$EXT\"", + "[ -f \"$XDG_DATA_HOME/$EXT\" ] && WKD=\"$XDG_DATA_HOME/$EXT\"", +- `exec python3 "$WKD" "${ws_server.url}"` ++ "[ -f \"NIX_STORE_PACKAGE_PATH/share/$EXT\" ] && WKD=\"NIX_STORE_PACKAGE_PATH/share/$EXT\"", ++ `"$WKD" "${ws_server.url}"` + ].join("\n"); + return sh; + } From 4af2833729816681f0e59c3503fe8cc8a6fdb9d4 Mon Sep 17 00:00:00 2001 From: macronova Date: Thu, 15 Aug 2024 18:08:45 -0700 Subject: [PATCH 0002/1107] Reorder maintainer and format new file --- maintainers/maintainer-list.nix | 11 ++++---- .../wallpaper-engine-plugin/default.nix | 25 +++++++++---------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0b9854a306aa..aeced5c4e464 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12292,6 +12292,11 @@ githubId = 401263; keys = [ { fingerprint = "1147 43F1 E707 6F3E 6F4B 2C96 B9A8 B592 F126 F8E8"; } ]; }; + mac-chaffee = { + name = "Mac Chaffee"; + github = "mac-chaffee"; + githubId = 7581860; + }; macronova = { name = "Sicheng Pan"; email = "trivial@invariantspace.com"; @@ -12300,12 +12305,6 @@ githubId = 60079945; keys = [ { fingerprint = "49D3 FFDA 4D30 DDEE 68EF AE84 EBC4 A200 6737 3921"; } ]; }; - - mac-chaffee = { - name = "Mac Chaffee"; - github = "mac-chaffee"; - githubId = 7581860; - }; madjar = { email = "georges.dubus@compiletoi.net"; github = "madjar"; diff --git a/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix b/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix index 210b93f87464..8a1302a1de37 100644 --- a/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix +++ b/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix @@ -23,7 +23,7 @@ mkKdeDerivation { fetchSubmodules = true; }; - patches = [./nix-plugin.patch]; + patches = [ ./nix-plugin.patch ]; extraBuildInputs = [ extra-cmake-modules @@ -33,24 +33,23 @@ mkKdeDerivation { mpv ]; - extraCmakeFlags = ["-DUSE_PLASMAPKG=ON"]; + extraCmakeFlags = [ "-DUSE_PLASMAPKG=ON" ]; extraNativeBuildInputs = [ kpackage pkg-config ]; - postInstall = let - py3-ws = python3.withPackages (ps: - with ps; [ - websockets - ]); - in '' - cd ../plugin - PATH=${py3-ws}/bin:$PATH patchShebangs --build ./contents/pyext.py - substituteInPlace ./contents/ui/Pyext.qml --replace-fail NIX_STORE_PACKAGE_PATH ${placeholder "out"} - kpackagetool6 -i ./ -p $out/share/plasma/wallpapers/ - ''; + postInstall = + let + py3-ws = python3.withPackages (ps: with ps; [ websockets ]); + in + '' + cd ../plugin + PATH=${py3-ws}/bin:$PATH patchShebangs --build ./contents/pyext.py + substituteInPlace ./contents/ui/Pyext.qml --replace-fail NIX_STORE_PACKAGE_PATH ${placeholder "out"} + kpackagetool6 -i ./ -p $out/share/plasma/wallpapers/ + ''; meta = with lib; { description = "A KDE wallpaper plugin integrating Wallpaper Engine"; From 35f153ec6e334db49ab4252767d8b5956224c442 Mon Sep 17 00:00:00 2001 From: macronova Date: Fri, 16 Aug 2024 17:59:20 -0700 Subject: [PATCH 0003/1107] Add CMake flag to find Qt6 --- pkgs/kde/third-party/wallpaper-engine-plugin/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix b/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix index 17038ce429d8..6296c19b5124 100644 --- a/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix +++ b/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix @@ -1,7 +1,6 @@ { extra-cmake-modules, fetchFromGitHub, - full, kpackage, libplasma, lib, @@ -10,6 +9,7 @@ mpv, pkg-config, python3, + qtbase, }: mkKdeDerivation { pname = "wallpaper-engine-kde-plugin"; @@ -32,13 +32,15 @@ mkKdeDerivation { extraBuildInputs = [ extra-cmake-modules - full libplasma lz4 mpv ]; - extraCmakeFlags = [ "-DUSE_PLASMAPKG=ON" ]; + extraCmakeFlags = [ + "-DQt6_DIR=${qtbase}/lib/cmake/Qt6" + "-DUSE_PLASMAPKG=ON" + ]; postInstall = let From 5ba93319d81da028339755243fa405556a2b18d7 Mon Sep 17 00:00:00 2001 From: macronova Date: Sat, 17 Aug 2024 11:29:54 -0700 Subject: [PATCH 0004/1107] Patch plugin to remove environment dependencies --- pkgs/kde/default.nix | 1 + .../wallpaper-engine-plugin/default.nix | 12 +++++++ .../wallpaper-engine-plugin/nix-plugin.patch | 35 +++++++++++++++++++ 3 files changed, 48 insertions(+) diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix index b891c223e5ff..9c6930785346 100644 --- a/pkgs/kde/default.nix +++ b/pkgs/kde/default.nix @@ -77,6 +77,7 @@ phonon-vlc = self.callPackage ./misc/phonon-vlc {}; polkit-qt-1 = self.callPackage ./misc/polkit-qt-1 {}; pulseaudio-qt = self.callPackage ./misc/pulseaudio-qt {}; + applet-window-buttons6 = self.callPackage ./third-party/applet-window-buttons6 {}; karousel = self.callPackage ./third-party/karousel {}; kzones = self.callPackage ./third-party/kzones {}; diff --git a/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix b/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix index 6296c19b5124..38bf59f909ab 100644 --- a/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix +++ b/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix @@ -10,6 +10,10 @@ pkg-config, python3, qtbase, + qtmultimedia, + qtwebchannel, + qtwebengine, + qtwebsockets, }: mkKdeDerivation { pname = "wallpaper-engine-kde-plugin"; @@ -38,6 +42,14 @@ mkKdeDerivation { ]; extraCmakeFlags = [ + "-DQML2_CMAKE_PATH=${ + lib.makeSearchPath "lib/qt-6/qml" [ + qtmultimedia + qtwebchannel + qtwebengine + qtwebsockets + ] + }" "-DQt6_DIR=${qtbase}/lib/cmake/Qt6" "-DUSE_PLASMAPKG=ON" ]; diff --git a/pkgs/kde/third-party/wallpaper-engine-plugin/nix-plugin.patch b/pkgs/kde/third-party/wallpaper-engine-plugin/nix-plugin.patch index 042226d6dabe..951250aa407a 100644 --- a/pkgs/kde/third-party/wallpaper-engine-plugin/nix-plugin.patch +++ b/pkgs/kde/third-party/wallpaper-engine-plugin/nix-plugin.patch @@ -1,3 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e1298ba..1c9ddec 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,6 +9,7 @@ set(KF_MIN_VERSION "5.68.0") + project("WallpaperEngineKde") + + ++add_definitions(-DQML2_CMAKE_PATH="${QML2_CMAKE_PATH}") + set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY true) + set(CMAKE_POSITION_INDEPENDENT_CODE ON) + if(NOT OpenGL_GL_PREFERENCE) diff --git a/plugin/contents/pyext.py b/plugin/contents/pyext.py old mode 100644 new mode 100755 @@ -15,3 +27,26 @@ index 1a48f5e..8a9c9c9 100644 ].join("\n"); return sh; } +diff --git a/src/plugin.cpp b/src/plugin.cpp +index 5e8a7e2..1709a27 100644 +--- a/src/plugin.cpp ++++ b/src/plugin.cpp +@@ -13,6 +13,18 @@ class Port : public QQmlExtensionPlugin { + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) + + public: ++ void initializeEngine(QQmlEngine *engine, const char *uri) override { ++ if (strcmp(uri, "com.github.catsout.wallpaperEngineKde") != 0) return; ++ if (!engine) return; ++ ++ QString pathList = QML2_CMAKE_PATH; ++ QStringList paths = pathList.split(':', Qt::SkipEmptyParts); ++ for (const QString &path : paths) { ++ engine->addImportPath(path); ++ } ++ ++ QQmlExtensionPlugin::initializeEngine(engine, uri); ++ } + void registerTypes(const char* uri) override { + if (strcmp(uri, "com.github.catsout.wallpaperEngineKde") != 0) return; + qmlRegisterType(uri, WPVer[0], WPVer[1], "PluginInfo"); From 2f52ab637ca79d562075af2cc0f9729df40696d5 Mon Sep 17 00:00:00 2001 From: ThinkChaos Date: Sat, 9 Nov 2024 13:51:42 -0500 Subject: [PATCH 0005/1107] nixos/acme: fix account creation service ordering If the chosen leader was an HTTP service, then the web server would be both before and after the server. --- nixos/modules/security/acme/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/modules/security/acme/default.nix b/nixos/modules/security/acme/default.nix index 4af92d8779ef..94d1f7ae813f 100644 --- a/nixos/modules/security/acme/default.nix +++ b/nixos/modules/security/acme/default.nix @@ -1017,11 +1017,13 @@ in { # systemd clean --what=state is used to delete the account, so long as the user # then runs one of the cert services, there won't be any issues. accountTargets = lib.mapAttrs' (hash: confs: let - leader = "acme-${(builtins.head confs).cert}.service"; - dependantServices = map (conf: "acme-${conf.cert}.service") (builtins.tail confs); + dnsConfs = builtins.filter (conf: cfg.certs.${conf.cert}.dnsProvider != null) confs; + leaderConf = if dnsConfs != [ ] then builtins.head dnsConfs else builtins.head confs; + leader = "acme-${leaderConf.cert}.service"; + followers = map (conf: "acme-${conf.cert}.service") (builtins.filter (conf: conf != leaderConf) confs); in lib.nameValuePair "acme-account-${hash}" { - requiredBy = dependantServices; - before = dependantServices; + requiredBy = followers; + before = followers; requires = [ leader ]; after = [ leader ]; }) (lib.groupBy (conf: conf.accountHash) (lib.attrValues certConfigs)); From 3a3e7904b74518fa7f0e8edacdd00e7e505fde1d Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Wed, 20 Nov 2024 16:24:15 +0100 Subject: [PATCH 0006/1107] python312Packages.mongomock: 4.2.0.post1 -> 4.3.0 Signed-off-by: Florian Brandes --- pkgs/development/python-modules/mongomock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mongomock/default.nix b/pkgs/development/python-modules/mongomock/default.nix index 608422286622..1dbe742f0471 100644 --- a/pkgs/development/python-modules/mongomock/default.nix +++ b/pkgs/development/python-modules/mongomock/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "mongomock"; - version = "4.2.0.post1"; + version = "4.3.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-kkHSzscnS5c22+jtrLGVKP9mrzs3ebMk157MQgEifzE="; + hash = "sha256-MmZ7eQZvq8EtTxfxao/XNhtfRDUgizujLCJuUiEqjDA="; }; build-system = [ 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 0007/1107] 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 673076b0a89ce4f1638650e97a44b38061c384e6 Mon Sep 17 00:00:00 2001 From: Bryan Lai Date: Wed, 25 Dec 2024 19:49:02 +0800 Subject: [PATCH 0008/1107] python2Packages.pygtk: fix build w/ `-fpermissive` ... and adopt the package: add @bryango to maintainers. --- pkgs/development/python2-modules/pygtk/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python2-modules/pygtk/default.nix b/pkgs/development/python2-modules/pygtk/default.nix index 9ba5ce952e17..066a00884ef0 100644 --- a/pkgs/development/python2-modules/pygtk/default.nix +++ b/pkgs/development/python2-modules/pygtk/default.nix @@ -58,7 +58,8 @@ buildPythonPackage rec { env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-ObjC" - + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) " -lpython2.7"; + + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) " -lpython2.7" + + " -fpermissive"; # downgrade code errors to warnings installPhase = "installPhase"; @@ -94,5 +95,6 @@ buildPythonPackage rec { homepage = "https://gitlab.gnome.org/Archive/pygtk"; platforms = platforms.all; license = with licenses; [ lgpl21Plus ]; + maintainers = with lib.maintainers; [ bryango ]; }; } From becb2fa1523e7e446698e613141d6c975f70555c Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Fri, 27 Dec 2024 18:45:06 +0100 Subject: [PATCH 0009/1107] temurin-bin: minor updates as generated with ./generate-sources.py --- .../compilers/temurin-bin/sources.json | 640 +++++++++--------- 1 file changed, 320 insertions(+), 320 deletions(-) diff --git a/pkgs/development/compilers/temurin-bin/sources.json b/pkgs/development/compilers/temurin-bin/sources.json index 9443eb45f401..225c244e3cfc 100644 --- a/pkgs/development/compilers/temurin-bin/sources.json +++ b/pkgs/development/compilers/temurin-bin/sources.json @@ -6,62 +6,62 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "ae988c72eeb2d78bb729a3387601ce0ea84305734ebdbe95d276f39952a8e019", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.24_8.tar.gz", - "version": "11.0.24" + "build": "9", + "sha256": "0a431310ccccc36c85b1274b5d31e368fdc8cf62cb7c2ed98d7b59eb5a13dc82", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.25_9.tar.gz", + "version": "11.0.25" } }, "openjdk17": { "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "6d274a292a717a6f8d00a3ed0695497405c5c634c27fec1692dd13784f6ff6fa", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "67632ee4563e9827b56f62ab6da95bce200d9e82092b211988c0d2113abc4071", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" } }, "openjdk21": { "aarch64": { - "build": "7", - "sha256": "849c6d5a62a1f3dc2a3d2d7be07ffda089d35b862f6160b2a288c0408c2d8be8", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.4_7.tar.gz", - "version": "21.0.4" + "build": "11", + "sha256": "f22e32b869dd0e5e3f248646f62bffaa307b360299488ac8764e622923d7e747", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.5_11.tar.gz", + "version": "21.0.5" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "8fa232fc9de5a861c1a6b0cbdc861d0b0a2bdbdd27da53d991802a460a7f0973", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.4_7.tar.gz", - "version": "21.0.4" + "build": "11", + "sha256": "8da7da49101d45f646272616f20e8b10d57472bbf5961d64ffb07d7ba93c6909", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.5_11.tar.gz", + "version": "21.0.5" } }, "openjdk23": { "aarch64": { - "build": "37", - "sha256": "7e842c9b8a44a5a21d83a3e38ae3b141cfbdb429dde70ff264d3da4bff44e1c7", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_aarch64_alpine-linux_hotspot_23_37.tar.gz", - "version": "23.0.0" + "build": "11", + "sha256": "ebdd6602d27bd7535bf06f21e8a0c3d563be7b790a90bef00cb6ac4123c66f86", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_aarch64_alpine-linux_hotspot_23.0.1_11.tar.gz", + "version": "23.0.1" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "37", - "sha256": "bff4c78f30d8d173e622bf2f40c36113df47337fc6d1ee5105ed2459841165aa", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_x64_alpine-linux_hotspot_23_37.tar.gz", - "version": "23.0.0" + "build": "11", + "sha256": "4c37a9e885c4e099b049c3ba9baa073de1525e28cd5ffca016c5c5bd7ed385a6", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_x64_alpine-linux_hotspot_23.0.1_11.tar.gz", + "version": "23.0.1" } }, "openjdk8": { "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "5", - "sha256": "525a7731331cad502b9293ccb4ac2b13e85516736e98a57cb27c2767005188e1", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u422b05.tar.gz", - "version": "8.0.422" + "build": "6", + "sha256": "86071bc98901cae80c62745a64bb4486212985fe5b66b5aec36ce92e8a036a9d", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u432b06.tar.gz", + "version": "8.0.432" } } }, @@ -70,62 +70,62 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "0ac795729cc11f47323a71713eac2a5b22d4615fd9b66c8766f964c03fb6e160", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.24_8.tar.gz", - "version": "11.0.24" + "build": "9", + "sha256": "905e35f14228904d67a7a56f9f0b8ede58e9b15f9af3a3d54fb86f78c8e47a34", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.25_9.tar.gz", + "version": "11.0.25" } }, "openjdk17": { "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "63bae276cc322532b451ae7473127c92a75db16cc95473577f133cd09349822a", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "7a2df4e2f86eca649af1e17d990ab8e354cb6dee389606025b9d05f75623c388", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" } }, "openjdk21": { "aarch64": { - "build": "7", - "sha256": "f9410264235861deaf30f97bec80870cf3bc38b1d8e57d897d8bb1f706ae6705", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_aarch64_alpine-linux_hotspot_21.0.4_7.tar.gz", - "version": "21.0.4" + "build": "11", + "sha256": "12b988a3d934e3eb89c6a981a93f8e2adf0a62cc9030487dee76c0c29b93714d", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_aarch64_alpine-linux_hotspot_21.0.5_11.tar.gz", + "version": "21.0.5" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "0dfd0ebab44d777f65bceaff7f79e8e0b9deb74a5eb166922483f1864bcf2052", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_x64_alpine-linux_hotspot_21.0.4_7.tar.gz", - "version": "21.0.4" + "build": "11", + "sha256": "2dfa33fb8e9474e6967c6cf17964abb5ddce9c17fa6a9f8d7aa221a0ae295df9", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_x64_alpine-linux_hotspot_21.0.5_11.tar.gz", + "version": "21.0.5" } }, "openjdk23": { "aarch64": { - "build": "37", - "sha256": "858aa6b255164e535e2fd6cc8dfbf129327a9126ebb9e8f24115c2089efd36f3", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_aarch64_alpine-linux_hotspot_23_37.tar.gz", - "version": "23.0.0" + "build": "11", + "sha256": "b56eaedc094cb9107be2d5be9ad34c3dd9492c45aa671d102b5829a488cfc744", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_aarch64_alpine-linux_hotspot_23.0.1_11.tar.gz", + "version": "23.0.1" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "37", - "sha256": "7acbc972b0dd84ca10ec6f192b20e76445a22f4c5558e1657ff393e4868e9343", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_x64_alpine-linux_hotspot_23_37.tar.gz", - "version": "23.0.0" + "build": "11", + "sha256": "38a1b20b5ee8869b20e9f9aefdc91eedf245584d35287842a66540f0745dd3d0", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_x64_alpine-linux_hotspot_23.0.1_11.tar.gz", + "version": "23.0.1" } }, "openjdk8": { "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "5", - "sha256": "9a7a939638b9cdaa8e1a119b8f21bfdd4cb2390b8a47cc27ccf9effc90f4b437", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u422b05.tar.gz", - "version": "8.0.422" + "build": "6", + "sha256": "7f7c265560dd5a42533bf282831d7d2f044a7ff7f4c310b40a0f9f8e19ff12e5", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u432b06.tar.gz", + "version": "8.0.432" } } } @@ -134,332 +134,332 @@ "jdk": { "openjdk11": { "aarch64": { - "build": "8", - "sha256": "04e21301fedc76841fb03929ac6cacfbbda30b5693acfd515a8f34d4a0cdeb28", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.24_8.tar.gz", - "version": "11.0.24" + "build": "9", + "sha256": "f2087cc3abdd509b74facf8e43e81e36244d14c70dec080b8f3a662695417ca7", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.25_9.tar.gz", + "version": "11.0.25" }, "armv6l": { - "build": "8", - "sha256": "9d14a076d1440161ab4c9736644e8e9f4719eb8e9f44c03470640960c3cd5e00", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_arm_linux_hotspot_11.0.24_8.tar.gz", - "version": "11.0.24" + "build": "9", + "sha256": "6bdd7da08c9f8fedded8da0411b6566c16cb9a904d164b68a0b7f11c8376673a", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.25_9.tar.gz", + "version": "11.0.25" }, "armv7l": { - "build": "8", - "sha256": "9d14a076d1440161ab4c9736644e8e9f4719eb8e9f44c03470640960c3cd5e00", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_arm_linux_hotspot_11.0.24_8.tar.gz", - "version": "11.0.24" + "build": "9", + "sha256": "6bdd7da08c9f8fedded8da0411b6566c16cb9a904d164b68a0b7f11c8376673a", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.25_9.tar.gz", + "version": "11.0.25" }, "packageType": "jdk", "powerpc64le": { - "build": "8", - "sha256": "4dfdc498938a159c592a2f094576f09c94999e17327c1f5ff81794694992054d", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.24_8.tar.gz", - "version": "11.0.24" + "build": "9", + "sha256": "0014ffdae26d2b8f840b4842e3f9d4edc3576b4a961770708273d8ecc86ba5b6", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.25_9.tar.gz", + "version": "11.0.25" }, "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "0e71a01563a5c7b9988a168b0c4ce720a6dff966b3c27bb29d1ded461ff71d0e", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_x64_linux_hotspot_11.0.24_8.tar.gz", - "version": "11.0.24" + "build": "9", + "sha256": "191baa2e052627614022171400a917d28f0987dc54da48aaf07b06f552bb9884", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.25_9.tar.gz", + "version": "11.0.25" } }, "openjdk17": { "aarch64": { - "build": "7", - "sha256": "8257de06bf37f0c8f19f8d542e2ab5a4e17db3ca5f29d041bd0b02ab265db021", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "0c17fa4f14c0d2cc9e9334f996fccdddc5da4459d768f3105c7ff0283c47bf62", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" }, "armv6l": { - "build": "7", - "sha256": "ce7873ebf40ed0eb1089941ead4d3af79a205b1264f3162860d26ae957572b74", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "e69d43be937e05dbccae4cc98f732ed86aa11993234bf5ad6e81c30475a78ce7", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_arm_linux_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" }, "armv7l": { - "build": "7", - "sha256": "ce7873ebf40ed0eb1089941ead4d3af79a205b1264f3162860d26ae957572b74", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "e69d43be937e05dbccae4cc98f732ed86aa11993234bf5ad6e81c30475a78ce7", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_arm_linux_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" }, "packageType": "jdk", "powerpc64le": { - "build": "7", - "sha256": "c97988e5a99b8ae0c47ba330b0883398c7433312db0051d8c5ff97911bae1605", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "d4e553c6fa7afdfe2577420c6e77a558db8113a3cef84e755384148f5610834e", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" }, "riscv64": { - "build": "7", - "sha256": "d024c100eba4709970716ddcac757ba5e3122a8ff9c6f539ff8bac5b47f51f3a", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_riscv64_linux_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "e7c82833a7381a05cae2be0e947c08e971bbae4f2e4142c6ec87bbd7530a5646", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_riscv64_linux_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" }, "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "9d4dd339bf7e6a9dcba8347661603b74c61ab2a5083ae67bf76da6285da8a778", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "8682892fc02965930b9022c066fa164dd6f458ef4a5dc262016aa28333b30f49", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_x64_linux_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" } }, "openjdk21": { "aarch64": { - "build": "7", - "sha256": "d768eecddd7a515711659e02caef8516b7b7177fa34880a56398fd9822593a79", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.4_7.tar.gz", - "version": "21.0.4" + "build": "11", + "sha256": "6482639ed9fd22aa2e704cc366848b1b3e1586d2bf1213869c43e80bca58fe5c", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.5_11.tar.gz", + "version": "21.0.5" }, "packageType": "jdk", "powerpc64le": { - "build": "7", - "sha256": "c208cd0fb90560644a90f928667d2f53bfe408c957a5e36206585ad874427761", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.4_7.tar.gz", - "version": "21.0.4" + "build": "11", + "sha256": "3c6f4c358facfb6c19d90faf02bfe0fc7512d6b0e80ac18146bbd7e0d01deeef", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.5_11.tar.gz", + "version": "21.0.5" }, "riscv64": { - "build": "7", - "sha256": "b04fd7f52d18268a935f1a7144dae802b25db600ec97156ddd46b3100cbd13da", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.4_7.tar.gz", - "version": "21.0.4" + "build": "11", + "sha256": "2f1b3e401e36de803398dfb9818861f9f14ca8ae7db650ea0946ab048fefe3b9", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.5_11.tar.gz", + "version": "21.0.5" }, "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "51fb4d03a4429c39d397d3a03a779077159317616550e4e71624c9843083e7b9", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_linux_hotspot_21.0.4_7.tar.gz", - "version": "21.0.4" + "build": "11", + "sha256": "3c654d98404c073b8a7e66bffb27f4ae3e7ede47d13284c132d40a83144bfd8c", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_x64_linux_hotspot_21.0.5_11.tar.gz", + "version": "21.0.5" } }, "openjdk23": { "aarch64": { - "build": "37", - "sha256": "e8043d1bd9c4f42c5cf7883aca1fc3ef6bcccf4a664f378818ac0fd4fb987b7e", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_aarch64_linux_hotspot_23_37.tar.gz", - "version": "23.0.0" + "build": "11", + "sha256": "808e3843293e50515bf02ad2f956e543da65e32dac82ae7a266a147b3485c61a", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_aarch64_linux_hotspot_23.0.1_11.tar.gz", + "version": "23.0.1" }, "packageType": "jdk", "powerpc64le": { - "build": "37", - "sha256": "4d3b0609c783dea1f6a899bfc8c84b4000d1f48f39e2489d70050bbf2c7f7d9c", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_ppc64le_linux_hotspot_23_37.tar.gz", - "version": "23.0.0" + "build": "11", + "sha256": "1885ab141fe7b8ed6beb77b814b1c1c99fd54713399bf917edb6a4020545adde", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_ppc64le_linux_hotspot_23.0.1_11.tar.gz", + "version": "23.0.1" }, "riscv64": { - "build": "37", - "sha256": "d401699a92469de7bfb72909c1d11019537a0a2c21af01a8dce1831f09ef5165", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_riscv64_linux_hotspot_23_37.tar.gz", - "version": "23.0.0" + "build": "11", + "sha256": "80d7bab9f9614bdf934c6bc441031bd1fead3aea85f16770123bd8a6bcdc52b6", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_riscv64_linux_hotspot_23.0.1_11.tar.gz", + "version": "23.0.1" }, "vmType": "hotspot", "x86_64": { - "build": "37", - "sha256": "630c4f3870056e7e005736ec1edc34ee63a9b45e2027582c52f53a9bf44314b8", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_x64_linux_hotspot_23_37.tar.gz", - "version": "23.0.0" + "build": "11", + "sha256": "2400267e4e9c0f6ae880a4d763af6caf18c673714bdee5debf8388b0b5d52886", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_x64_linux_hotspot_23.0.1_11.tar.gz", + "version": "23.0.1" } }, "openjdk8": { "aarch64": { - "build": "5", - "sha256": "af98a839ec238106078bd360af9e405dc6665c05ee837178ed13b92193681923", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_aarch64_linux_hotspot_8u422b05.tar.gz", - "version": "8.0.422" + "build": "6", + "sha256": "383caabc20428e9500f2e07965317ed4387a0e336104483e29a9e06eeffbf26b", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_aarch64_linux_hotspot_8u432b06.tar.gz", + "version": "8.0.432" }, "armv6l": { - "build": "5", - "sha256": "5bd0203b2b09b033e3a762299a4975939d7571b433eab8b59340cc966102bef1", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_arm_linux_hotspot_8u422b05.tar.gz", - "version": "8.0.422" + "build": "6", + "sha256": "ff1ce3f6f1cf11987ab63f278b29cf1aae799652606c547f8a590e7acbd16b61", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_arm_linux_hotspot_8u432b06.tar.gz", + "version": "8.0.432" }, "armv7l": { - "build": "5", - "sha256": "5bd0203b2b09b033e3a762299a4975939d7571b433eab8b59340cc966102bef1", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_arm_linux_hotspot_8u422b05.tar.gz", - "version": "8.0.422" + "build": "6", + "sha256": "ff1ce3f6f1cf11987ab63f278b29cf1aae799652606c547f8a590e7acbd16b61", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_arm_linux_hotspot_8u432b06.tar.gz", + "version": "8.0.432" }, "packageType": "jdk", "powerpc64le": { - "build": "5", - "sha256": "78fbd7b01204cdf90bcb3f9fe6a8e9432bdaa75776fa333aa9cbcb5a79de34cd", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u422b05.tar.gz", - "version": "8.0.422" + "build": "6", + "sha256": "64fb17e83b79f9ad41dc18351a408bfe90324fd6360903ca5c0a740006c81be3", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u432b06.tar.gz", + "version": "8.0.432" }, "vmType": "hotspot", "x86_64": { - "build": "5", - "sha256": "4c6056f6167fae73ace7c3080b78940be5c87d54f5b08894b3517eed1cbb2c06", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_x64_linux_hotspot_8u422b05.tar.gz", - "version": "8.0.422" + "build": "6", + "sha256": "abaaa90deadf51bd28921453baf2992b3dff6171bb7142f5bdd14ef269f7b245", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_x64_linux_hotspot_8u432b06.tar.gz", + "version": "8.0.432" } } }, "jre": { "openjdk11": { "aarch64": { - "build": "8", - "sha256": "1fe97cdaad47d7d108f329c6e4560b46748ef7f2948a1027812ade0bbc2a3597", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.24_8.tar.gz", - "version": "11.0.24" + "build": "9", + "sha256": "e37ba6636e31f3c9191ac7e3fd0ab7fb354a2f3b320d68bfb95efd1e053134c9", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.25_9.tar.gz", + "version": "11.0.25" }, "armv6l": { - "build": "8", - "sha256": "bf893085627c6ec484e63aa1290276b23bcfee547459da6b0432ae9c5c1be22a", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_arm_linux_hotspot_11.0.24_8.tar.gz", - "version": "11.0.24" + "build": "9", + "sha256": "6b7b1297da762cf2b1eb4834073e6a45cda82a359efb17a89eba3fc6b59b4d26", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.25_9.tar.gz", + "version": "11.0.25" }, "armv7l": { - "build": "8", - "sha256": "bf893085627c6ec484e63aa1290276b23bcfee547459da6b0432ae9c5c1be22a", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_arm_linux_hotspot_11.0.24_8.tar.gz", - "version": "11.0.24" + "build": "9", + "sha256": "6b7b1297da762cf2b1eb4834073e6a45cda82a359efb17a89eba3fc6b59b4d26", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.25_9.tar.gz", + "version": "11.0.25" }, "packageType": "jre", "powerpc64le": { - "build": "8", - "sha256": "8ee351314182df93fbad96139bb74b97814944d66197896e388404a1ecfa06b3", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.24_8.tar.gz", - "version": "11.0.24" + "build": "9", + "sha256": "7e7edaf34c29c304514d60f40f6c9ce58eb3e32b0dec20bb6ccd1cfbb4456698", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.25_9.tar.gz", + "version": "11.0.25" }, "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "e0c1938093da3780e4494d366a4e6b75584dde8d46a19acea6691ae11df4cda5", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_x64_linux_hotspot_11.0.24_8.tar.gz", - "version": "11.0.24" + "build": "9", + "sha256": "84cd7101f39172a4db085fb52940595bb14dad6bc3afb5bf82ee497eceaf86d3", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.25_9.tar.gz", + "version": "11.0.25" } }, "openjdk17": { "aarch64": { - "build": "7", - "sha256": "9dfe4c56463690ae67d22268980d8861eb46b907d7914f8f2e6fc7b25778c8ec", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "97c4fb748eaa1292fb2f28fec90a3eba23e35974ef67f8b3aa304ad4db2ba162", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" }, "armv6l": { - "build": "7", - "sha256": "f093094abe0cb2bb5a255d8180810030321073520541f289926c4682eda76136", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "f9c4008680db016c9cab26cc2739d4553898911522f6a78a611fafa1f5270c88", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_arm_linux_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" }, "armv7l": { - "build": "7", - "sha256": "f093094abe0cb2bb5a255d8180810030321073520541f289926c4682eda76136", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "f9c4008680db016c9cab26cc2739d4553898911522f6a78a611fafa1f5270c88", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_arm_linux_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" }, "packageType": "jre", "powerpc64le": { - "build": "7", - "sha256": "2759c48e1e56117871b04c851af18b92b6992cf67590f602949b96c3cff15c73", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "790f53fcc95cc76ed8f27d3146cf789fc354a2afb7148cffd197ca61a643212f", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" }, "riscv64": { - "build": "7", - "sha256": "2d1ed42918305a1a0754a6e1e9294c7d4d7fda4bff6dba7bc5682037d860dbc9", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_riscv64_linux_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "f6f3e71e5452b764aad47e6ffa4f0b26fcfe69bd9eb07fbd468343f9dd5f17b5", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_riscv64_linux_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" }, "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "0e8088d7a3a7496faba7ac8787db09dc0264c2bc6f568ea8024fd775a783e13c", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_x64_linux_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "4086cc7cb2d9e7810141f255063caad10a8a018db5e6b47fa5394c506ab65bff", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_x64_linux_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" } }, "openjdk21": { "aarch64": { - "build": "7", - "sha256": "58845ce4275f3ec74fba075597c8216bb201773da036c4703be8b7b7b457355d", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.4_7.tar.gz", - "version": "21.0.4" + "build": "11", + "sha256": "e4d02c33aeaf8e1148c1c505e129a709c5bc1889e855d4fb4f001b1780db42b4", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.5_11.tar.gz", + "version": "21.0.5" }, "packageType": "jre", "powerpc64le": { - "build": "7", - "sha256": "46cf93653e2b553fb1c91760cfe2ff20999ba358d648d2df69e5948784768440", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.4_7.tar.gz", - "version": "21.0.4" + "build": "11", + "sha256": "ae9ad61578da420fa7aeb01d3f6909da8a74d54a31bb8ba090a263cfadf221cc", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.5_11.tar.gz", + "version": "21.0.5" }, "riscv64": { - "build": "7", - "sha256": "bf814344429f53d11f8aace14d326e2580ea6e66dd81b109c79160bd41735237", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_riscv64_linux_hotspot_21.0.4_7.tar.gz", - "version": "21.0.4" + "build": "11", + "sha256": "c6fe71bb6ce61366242073e3904c4f51613252a885d54be81c65d3fadd2c5b7c", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_riscv64_linux_hotspot_21.0.5_11.tar.gz", + "version": "21.0.5" }, "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "d3affbb011ca6c722948f6345d15eba09bded33f9947d4d67e09723e2518c12a", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_x64_linux_hotspot_21.0.4_7.tar.gz", - "version": "21.0.4" + "build": "11", + "sha256": "553dda64b3b1c3c16f8afe402377ffebe64fb4a1721a46ed426a91fd18185e62", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_x64_linux_hotspot_21.0.5_11.tar.gz", + "version": "21.0.5" } }, "openjdk23": { "aarch64": { - "build": "37", - "sha256": "ec45f4f9a4a98d8a0af24b508ca84a411ea88fac8abb8ad2cfca85cb3902ab5d", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_aarch64_linux_hotspot_23_37.tar.gz", - "version": "23.0.0" + "build": "11", + "sha256": "0b498a5b673cb50fe9cfd0a13bd39c7259b4fad4d930d614e1563aeb8bca7f0e", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_aarch64_linux_hotspot_23.0.1_11.tar.gz", + "version": "23.0.1" }, "packageType": "jre", "powerpc64le": { - "build": "37", - "sha256": "9120876c35b904ac041c5a021330a6f11d4e6c7537ce28bdbb7170b944673435", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_ppc64le_linux_hotspot_23_37.tar.gz", - "version": "23.0.0" + "build": "11", + "sha256": "ae5d49932f7d9b182c2d9ededa18bd4defc61873f1d717caa3d905bba870a683", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_ppc64le_linux_hotspot_23.0.1_11.tar.gz", + "version": "23.0.1" }, "riscv64": { - "build": "37", - "sha256": "ca32d942ef5357fb948604cd8aea5c597130cf7fdf6ddee267b4aa99406ee471", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_riscv64_linux_hotspot_23_37.tar.gz", - "version": "23.0.0" + "build": "11", + "sha256": "cf65a926c2d7cbdbaa63242a8d20ce747335e7260eaaabd7bb52d51c099fda9a", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_riscv64_linux_hotspot_23.0.1_11.tar.gz", + "version": "23.0.1" }, "vmType": "hotspot", "x86_64": { - "build": "37", - "sha256": "9c3c3d42ffb2603b328b7154fc9eb449ef87488b3cbeb24a497d46677c7fd44d", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_x64_linux_hotspot_23_37.tar.gz", - "version": "23.0.0" + "build": "11", + "sha256": "1233cbec40f05c76ad926b68521ae78c6ae4f454996ef549602be6987069fa77", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_x64_linux_hotspot_23.0.1_11.tar.gz", + "version": "23.0.1" } }, "openjdk8": { "aarch64": { - "build": "5", - "sha256": "8fbefff2c578f73d95118d830347589ddc9aa84510200a5a5001901c2dea4810", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_aarch64_linux_hotspot_8u422b05.tar.gz", - "version": "8.0.422" + "build": "6", + "sha256": "786522da4c761104dd8274c81edc90126a25acaafbbbc5da886b3fb51f33cba2", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_aarch64_linux_hotspot_8u432b06.tar.gz", + "version": "8.0.432" }, "armv6l": { - "build": "5", - "sha256": "13bdefdeae6f18bc9c87bba18c853b8b12c5442ce07ff0a3956ce28776d695ff", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_arm_linux_hotspot_8u422b05.tar.gz", - "version": "8.0.422" + "build": "6", + "sha256": "49894dbe2f915dfad026cf7b4013118c0284e88359172499b1b25a4dac195ff1", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_arm_linux_hotspot_8u432b06.tar.gz", + "version": "8.0.432" }, "armv7l": { - "build": "5", - "sha256": "13bdefdeae6f18bc9c87bba18c853b8b12c5442ce07ff0a3956ce28776d695ff", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_arm_linux_hotspot_8u422b05.tar.gz", - "version": "8.0.422" + "build": "6", + "sha256": "49894dbe2f915dfad026cf7b4013118c0284e88359172499b1b25a4dac195ff1", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_arm_linux_hotspot_8u432b06.tar.gz", + "version": "8.0.432" }, "packageType": "jre", "powerpc64le": { - "build": "5", - "sha256": "2991edbedee448c0f1edf131beca84b415dac64ea97365b9bfd85bc2f39893bb", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_ppc64le_linux_hotspot_8u422b05.tar.gz", - "version": "8.0.422" + "build": "6", + "sha256": "c573f33f9e5ba49a4838847d0d34efc9c1dc57a9ba71b926599530bbcda87f65", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_ppc64le_linux_hotspot_8u432b06.tar.gz", + "version": "8.0.432" }, "vmType": "hotspot", "x86_64": { - "build": "5", - "sha256": "0ac516cc1eadffb4cd3cfc9736a33d58ea6a396bf85729036c973482f7c063d9", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_x64_linux_hotspot_8u422b05.tar.gz", - "version": "8.0.422" + "build": "6", + "sha256": "bb8c8cc575b69e68e12a213674ec2e3848baff4f1955d2973d98e67666ab94d7", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_x64_linux_hotspot_8u432b06.tar.gz", + "version": "8.0.432" } } } @@ -468,152 +468,152 @@ "jdk": { "openjdk11": { "aarch64": { - "build": "8", - "sha256": "8bcbb98e293fb3c4d5cae3539f240ed478fae85962311fccd4c628ebad3a90e4", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.24_8.tar.gz", - "version": "11.0.24" + "build": "9", + "sha256": "658f73050ab168109862d4e25eefeedb587063cc01128a78ea4081e8ec62edcf", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.25_9.tar.gz", + "version": "11.0.25" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "07a1be21f45f0951db05516e57602c414295c51a920f7e9b6ddeaa325d619b28", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_x64_mac_hotspot_11.0.24_8.tar.gz", - "version": "11.0.24" + "build": "9", + "sha256": "fa6f88ebd8c3d2b4f5146cd45e4ef875cb2d073b6e95b60de86a1ce0bfdb463a", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_x64_mac_hotspot_11.0.25_9.tar.gz", + "version": "11.0.25" } }, "openjdk17": { "aarch64": { - "build": "7", - "sha256": "d7910b1acaeb290c5c5da21811d2b2b8635f806612a2d6e8d1953b2f77580f78", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "d8b2f77f755d06e81a540834c5be22ed86f3c8a51a20396606c074303f8f9e2d", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "d5230eeec88739aa7133e4c8635bbd4ab226708c12deaafa13cf26b02bc8e8c4", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_mac_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "840535070200a944a6b582d258ee84608bd25c9f2b5d1cdddb58dfadb019675a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_x64_mac_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" } }, "openjdk21": { "aarch64": { - "build": "7", - "sha256": "dcf69a21601d9b1b25454bbad4f0f32784bb42cdbe4063492e15a851b74cb61e", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.4_7.tar.gz", - "version": "21.0.4" + "build": "11", + "sha256": "dc6db7347907d23743d13af935d3c10e8b3490acdf542115f578838227da0dab", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.5_11.tar.gz", + "version": "21.0.5" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "e368e5de7111aa88e6bbabeff6f4c040772b57fb279cc4e197b51654085bbc18", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_mac_hotspot_21.0.4_7.tar.gz", - "version": "21.0.4" + "build": "11", + "sha256": "b9b46f396ab5f3658fa5569af963896167c7f735cfec816359c04101fae38bdf", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_x64_mac_hotspot_21.0.5_11.tar.gz", + "version": "21.0.5" } }, "openjdk23": { "aarch64": { - "build": "37", - "sha256": "411934ca9ede95671afc1e7e1d9c8912c43247c7e4fba97730f20c0875287d44", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_aarch64_mac_hotspot_23_37.tar.gz", - "version": "23.0.0" + "build": "11", + "sha256": "9e69810a50c8183e01429243d0bb112e381a122c6e7be936b7c13c3cfe7b29a0", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_aarch64_mac_hotspot_23.0.1_11.tar.gz", + "version": "23.0.1" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "37", - "sha256": "0b4b14f7cb44cab89083fb72beafa6d4f12ee6722bf682e5dd026dab12cc8d23", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_x64_mac_hotspot_23_37.tar.gz", - "version": "23.0.0" + "build": "11", + "sha256": "055a5b9c27991ad955c8207a20b549ac3254d479aa8a4fc199b6b02d56b1875e", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_x64_mac_hotspot_23.0.1_11.tar.gz", + "version": "23.0.1" } }, "openjdk8": { "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "5", - "sha256": "14e93cac142c4e7734aab53d1e9f44ef2851cf1cc4657918abccdf99e78c8bad", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05.1/OpenJDK8U-jdk_x64_mac_hotspot_8u422b05.tar.gz", - "version": "8.0.422" + "build": "6", + "sha256": "e5cc78b704cf96f7a6c4ad677048f79331f38cd37fbef6c86dce75e1bfe28895", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_x64_mac_hotspot_8u432b06.tar.gz", + "version": "8.0.432" } } }, "jre": { "openjdk11": { "aarch64": { - "build": "8", - "sha256": "809c13c1c3abefe09c8396b18d6dd64837f30bf7bda7cbe317c6567bcd161d7a", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.24_8.tar.gz", - "version": "11.0.24" + "build": "9", + "sha256": "f1d602b478269c7def552d4a01c5ba3ac91cc34f5d66b5313da3aa0b72d670e7", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.25_9.tar.gz", + "version": "11.0.25" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "764d30489541ae088d2d0a75d46524ec35797dcdbe4a11b6bfbaee7957d8f77e", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_x64_mac_hotspot_11.0.24_8.tar.gz", - "version": "11.0.24" + "build": "9", + "sha256": "97e0e32b12460e92e3b4632492b3ccd648cf03a6023ca2ee7dc81f7cfa3bd275", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_x64_mac_hotspot_11.0.25_9.tar.gz", + "version": "11.0.25" } }, "openjdk17": { "aarch64": { - "build": "7", - "sha256": "5c1cb2cbd2ef3f2b529e2733d0ab55381e10c4c3607f4d62f2bf12f0942198bf", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "a886b8f2a50eca2e59b45ea59f5a2e8e9d27ff5b5b3b069443a70cda7f27c907", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "331aceddc402263c5e47529234965927573ead684ea2b7a0358fbb6c279c1510", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_x64_mac_hotspot_17.0.12_7.tar.gz", - "version": "17.0.12" + "build": "11", + "sha256": "bf9faf4540001a251e6bfb52b99c7ec5b1f36d3ebe94e104f61a30f173ba8c78", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_x64_mac_hotspot_17.0.13_11.tar.gz", + "version": "17.0.13" } }, "openjdk21": { "aarch64": { - "build": "7", - "sha256": "14b39c00ec0ec6e0c465f784261449d0a1c4256b3b15c63c222397ccb31758aa", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_aarch64_mac_hotspot_21.0.4_7.tar.gz", - "version": "21.0.4" + "build": "11", + "sha256": "12249a1c5386957c93fc372260c483ae921b1ec6248a5136725eabd0abc07f93", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_aarch64_mac_hotspot_21.0.5_11.tar.gz", + "version": "21.0.5" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "f67f17413d012672da11163dd73600e0d92eef6f6ff27c6ae25523bd9df74222", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_x64_mac_hotspot_21.0.4_7.tar.gz", - "version": "21.0.4" + "build": "11", + "sha256": "0e0dcb571f7bf7786c111fe066932066d9eab080c9f86d8178da3e564324ee81", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_x64_mac_hotspot_21.0.5_11.tar.gz", + "version": "21.0.5" } }, "openjdk23": { "aarch64": { - "build": "37", - "sha256": "2c96b006080906951fb0ddae8e23ca3ef2bd327b77cac84b4302b8d84c7014f5", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_aarch64_mac_hotspot_23_37.tar.gz", - "version": "23.0.0" + "build": "11", + "sha256": "e29029d35608f4e415e49c7990ebe0f42d0ecb7dc2d4d444e41adf3e3287f922", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_aarch64_mac_hotspot_23.0.1_11.tar.gz", + "version": "23.0.1" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "37", - "sha256": "1f41755494c45a8a88dfed926251f478544c0e51a71a011314fc282e915f804f", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jre_x64_mac_hotspot_23_37.tar.gz", - "version": "23.0.0" + "build": "11", + "sha256": "87e532fda02327e0f2766650223b6bd63a4407c4907f82790edb5862a5285116", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_x64_mac_hotspot_23.0.1_11.tar.gz", + "version": "23.0.1" } }, "openjdk8": { "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "5", - "sha256": "814a1e262c10cb3f056adbdb20396564fe9ea0f039a863bae6b648f7680b30cc", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05.1/OpenJDK8U-jre_x64_mac_hotspot_8u422b05.tar.gz", - "version": "8.0.422" + "build": "6", + "sha256": "55aac241ad7cb7c1903d4810ad705ffe2f2536a88b6a88efabb4942a9f09db33", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_x64_mac_hotspot_8u432b06.tar.gz", + "version": "8.0.432" } } } From f9a85f2330b03aa678d3bca9ff601870bf6b5f88 Mon Sep 17 00:00:00 2001 From: lucasew Date: Fri, 27 Dec 2024 14:19:03 -0300 Subject: [PATCH 0010/1107] cargoCheckHook: pass test-threads using an environment variable Signed-off-by: lucasew --- pkgs/build-support/rust/hooks/cargo-check-hook.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/rust/hooks/cargo-check-hook.sh b/pkgs/build-support/rust/hooks/cargo-check-hook.sh index 965e2b451447..168a7e933ff0 100644 --- a/pkgs/build-support/rust/hooks/cargo-check-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-check-hook.sh @@ -11,10 +11,9 @@ cargoCheckHook() { local flagsArray=("-j" "$NIX_BUILD_CORES") - if [[ -z ${dontUseCargoParallelTests-} ]]; then - prependToVar checkFlags "--test-threads=$NIX_BUILD_CORES" - else - prependToVar checkFlags "--test-threads=1" + export RUST_TEST_THREADS=$NIX_BUILD_CORES + if [[ ! -z ${dontUseCargoParallelTests-} ]]; then + RUST_TEST_THREADS=1 fi if [ "${cargoCheckType}" != "debug" ]; then From 09388f4eb330d3ff0718c046e59959ad54f152e3 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Tue, 31 Dec 2024 16:05:58 +1000 Subject: [PATCH 0011/1107] lua: Don't flood stdout when included in `mkShell` fixes 665f3f694 --- pkgs/development/interpreters/lua-5/utils.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/lua-5/utils.sh b/pkgs/development/interpreters/lua-5/utils.sh index 2365af08dc9c..04d614fc0430 100644 --- a/pkgs/development/interpreters/lua-5/utils.sh +++ b/pkgs/development/interpreters/lua-5/utils.sh @@ -66,7 +66,7 @@ addToLuaPath() { _addToLuaPath() { local dir="$1" - echo "_addToLuaPath called for dir $dir" + nix_debug "_addToLuaPath called for dir $dir" if [[ ! -d "$dir" ]]; then nix_debug "$dir not a directory abort" @@ -77,7 +77,7 @@ _addToLuaPath() { # if [ -n "${pythonPathsSeen[$dir]}" ]; then return; fi if [[ -n "${luaPathsSeen[$dir]:-}" ]]; then # if [ -n "${luaPathsSeen[$dir]}" ]; then - echo "$dir already parsed" + nix_debug "$dir already parsed" return fi @@ -103,7 +103,7 @@ _addToLuaPath() { if [ -e "$prop" ]; then local new_path for new_path in $(cat $prop); do - echo "newpath: $new_path" + nix_debug "newpath: $new_path" _addToLuaPath "$new_path" done fi @@ -116,7 +116,7 @@ buildLuaPath() { local luaPath="$1" local path - echo "BUILD_LUA_PATH" + nix_debug "BUILD_LUA_PATH" # # set -x # # Create an empty table of paths (see doc on loadFromPropagatedInputs From c1a7fc76e7387c5c44305778cfd4661999fe6e1f Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 2 Jan 2025 15:32:12 +0100 Subject: [PATCH 0012/1107] facetimehd-calibration: fix strictDeps build --- pkgs/by-name/fa/facetimehd-calibration/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fa/facetimehd-calibration/package.nix b/pkgs/by-name/fa/facetimehd-calibration/package.nix index 8c843f5f564f..6a0d236e7361 100644 --- a/pkgs/by-name/fa/facetimehd-calibration/package.nix +++ b/pkgs/by-name/fa/facetimehd-calibration/package.nix @@ -58,7 +58,7 @@ stdenvNoCC.mkDerivation { dontUnpack = true; dontInstall = true; - buildInputs = [ unrar-wrapper ]; + nativeBuildInputs = [ unrar-wrapper ]; buildPhase = '' From 1e168a68713126d569ef48914b59d592cd6d0a4e Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 2 Jan 2025 15:32:12 +0100 Subject: [PATCH 0013/1107] python312Packages.shiboken2: fix strictDeps build --- pkgs/development/python-modules/shiboken2/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix index 88f59fc86ebb..14ab87dd56b8 100644 --- a/pkgs/development/python-modules/shiboken2/default.nix +++ b/pkgs/development/python-modules/shiboken2/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation { setuptools ] )) + qt5.qmake ]; buildInputs = From 2c9f8d299d71cd44a28829d4eed12adf43ae8b93 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Fri, 3 Jan 2025 15:59:48 +0100 Subject: [PATCH 0014/1107] pypy310Packages.pyflakes: disable failing tests --- .../python-modules/pyflakes/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index 4550ca77e02b..04534f99c58d 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + isPyPy, pythonAtLeast, pythonOlder, fetchFromGitHub, @@ -27,10 +28,17 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = lib.optionals (pythonAtLeast "3.13") [ - # https://github.com/PyCQA/pyflakes/issues/812 - "test_errors_syntax" - ]; + disabledTests = + lib.optionals (pythonAtLeast "3.13") [ + # https://github.com/PyCQA/pyflakes/issues/812 + "test_errors_syntax" + ] + ++ lib.optionals isPyPy [ + # https://github.com/PyCQA/pyflakes/issues/779 + "test_eofSyntaxError" + "test_misencodedFileUTF8" + "test_multilineSyntaxError" + ]; pythonImportsCheck = [ "pyflakes" ]; From d94b52ff981d41eff1bb1858b6ab945cf4a3cd63 Mon Sep 17 00:00:00 2001 From: Chuang Zhu Date: Sun, 5 Jan 2025 00:58:54 +0800 Subject: [PATCH 0015/1107] usbutils: 017 -> 018 --- pkgs/by-name/us/usbutils/fix-paths.patch | 21 ++++++++++++--------- pkgs/by-name/us/usbutils/package.nix | 14 ++++++-------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/us/usbutils/fix-paths.patch b/pkgs/by-name/us/usbutils/fix-paths.patch index ef63a41e726c..af522ac50d7b 100644 --- a/pkgs/by-name/us/usbutils/fix-paths.patch +++ b/pkgs/by-name/us/usbutils/fix-paths.patch @@ -1,11 +1,14 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -61,7 +61,7 @@ EXTRA_DIST = \ - LICENSES/GPL-3.0-only.txt +diff --git a/lsusb.py b/lsusb.py +index bbc4dbb..8af1b1f 100755 +--- a/lsusb.py ++++ b/lsusb.py +@@ -27,8 +27,7 @@ showwakeup = False - lsusb.py: $(srcdir)/lsusb.py.in -- sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@ -+ sed 's|VERSION|$(VERSION)|g;s|@usbids@|@hwdata@/share/hwdata/usb.ids|g' $< >$@ - chmod 755 $@ + prefix = "/sys/bus/usb/devices/" + usbids = [ +- "/usr/share/hwdata/usb.ids", +- "/usr/share/usb.ids", ++ "@hwdata@/share/hwdata/usb.ids", + ] + cols = ("", "", "", "", "", "") - lsusb.8: $(srcdir)/lsusb.8.in diff --git a/pkgs/by-name/us/usbutils/package.nix b/pkgs/by-name/us/usbutils/package.nix index 3ffd5fe88a66..627069dafd65 100644 --- a/pkgs/by-name/us/usbutils/package.nix +++ b/pkgs/by-name/us/usbutils/package.nix @@ -3,7 +3,8 @@ stdenv, fetchurl, substituteAll, - autoreconfHook, + meson, + ninja, pkg-config, libusb1, hwdata, @@ -12,11 +13,11 @@ stdenv.mkDerivation rec { pname = "usbutils"; - version = "017"; + version = "018"; src = fetchurl { url = "mirror://kernel/linux/utils/usb/usbutils/usbutils-${version}.tar.xz"; - hash = "sha256-pqJf/c+RA+ONekRzKsoXBz9OYCuS5K5VYlIxqCcC4Fs="; + hash = "sha256-g/aLWbWFR1icACZugmcYZGJ1k6tDYtjIB/UO6pI8rZM="; }; patches = [ @@ -27,7 +28,8 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - autoreconfHook + meson + ninja pkg-config ]; buildInputs = [ @@ -41,10 +43,6 @@ stdenv.mkDerivation rec { "python" ]; - postBuild = '' - $CC $NIX_CFLAGS -o usbreset usbreset.c - ''; - postInstall = '' moveToOutput "bin/lsusb.py" "$python" install -Dm555 usbreset -t $out/bin From cad4696db22cfa7b41c99b6c50a249d04a2398ef Mon Sep 17 00:00:00 2001 From: Chuang Zhu Date: Sun, 5 Jan 2025 01:13:23 +0800 Subject: [PATCH 0016/1107] usbutils: add darwin support --- pkgs/by-name/us/usbutils/package.nix | 42 ++++++++++++++++++---------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/us/usbutils/package.nix b/pkgs/by-name/us/usbutils/package.nix index 627069dafd65..72a557c931f0 100644 --- a/pkgs/by-name/us/usbutils/package.nix +++ b/pkgs/by-name/us/usbutils/package.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, substituteAll, + fetchpatch, meson, ninja, pkg-config, @@ -20,12 +21,19 @@ stdenv.mkDerivation rec { hash = "sha256-g/aLWbWFR1icACZugmcYZGJ1k6tDYtjIB/UO6pI8rZM="; }; - patches = [ - (substituteAll { - src = ./fix-paths.patch; - inherit hwdata; - }) - ]; + patches = + [ + (substituteAll { + src = ./fix-paths.patch; + inherit hwdata; + }) + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + (fetchpatch { + url = "https://raw.githubusercontent.com/Homebrew/formula-patches/24a6945778381a62ecdcc1d78bcc16b9f86778c1/usbutils/portable.patch"; + hash = "sha256-spTkWURij4sPLoWtDaWVMIk81AS5W+qUUOQL1pAZEvs="; + }) + ]; nativeBuildInputs = [ meson @@ -37,13 +45,16 @@ stdenv.mkDerivation rec { python3 ]; - outputs = [ - "out" - "man" - "python" - ]; + outputs = + [ + "out" + "man" + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + "python" # uses sysfs + ]; - postInstall = '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' moveToOutput "bin/lsusb.py" "$python" install -Dm555 usbreset -t $out/bin ''; @@ -51,12 +62,15 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.linux-usb.org/"; description = "Tools for working with USB devices, such as lsusb"; - maintainers = with lib.maintainers; [ cafkafk ]; + maintainers = with lib.maintainers; [ + cafkafk + chuangzhu + ]; license = with lib.licenses; [ gpl2Only # manpages, usbreset gpl2Plus # most of the code ]; - platforms = lib.platforms.linux; + platforms = with lib.platforms; linux ++ darwin; mainProgram = "lsusb"; }; } From 510a1ff255357e605d5acd305f65f814a9a5ec38 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Fri, 3 Jan 2025 15:59:48 +0100 Subject: [PATCH 0017/1107] pypy310Packages.flake8: disable failing tests --- pkgs/development/python-modules/flake8/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 624f36a7447a..6f2a8c49d570 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + isPyPy, pythonOlder, fetchFromGitHub, setuptools, @@ -35,6 +36,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = lib.optionals isPyPy [ + # tests fail due to slightly different error position + "test_tokenization_error_is_a_syntax_error" + "test_tokenization_error_but_not_syntax_error" + ]; + meta = with lib; { changelog = "https://github.com/PyCQA/flake8/blob/${src.rev}/docs/source/release-notes/${version}.rst"; description = "Modular source code checker: pep8, pyflakes and co"; From 23221bbf26dea7691134a59c991dd825a66ffe32 Mon Sep 17 00:00:00 2001 From: misuzu Date: Mon, 6 Jan 2025 00:24:51 +0200 Subject: [PATCH 0018/1107] bpftools: fix cross for riscv64-linux --- pkgs/by-name/bp/bpftools/package.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/by-name/bp/bpftools/package.nix b/pkgs/by-name/bp/bpftools/package.nix index 88ec301bc356..6c3badae4411 100644 --- a/pkgs/by-name/bp/bpftools/package.nix +++ b/pkgs/by-name/bp/bpftools/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, linuxHeaders, buildPackages, libopcodes, @@ -25,6 +26,25 @@ stdenv.mkDerivation rec { patches = [ # fix unknown type name '__vector128' on ppc64le ./include-asm-types-for-ppc64le.patch + # fix build for riscv64 + (fetchpatch { + # libbpf: Add missing per-arch include path + # https://patchwork.kernel.org/project/linux-riscv/patch/20240927131355.350918-1-bjorn@kernel.org/ + url = "https://patchwork.kernel.org/project/linux-riscv/patch/20240927131355.350918-1-bjorn@kernel.org/raw/"; + hash = "sha256-edXY/ejHW5L7rGgY5B2GmVZxUgnLdBadNhBOSAgcL7M="; + }) + (fetchpatch { + # selftests: bpf: Add missing per-arch include path + # https://patchwork.kernel.org/project/linux-riscv/patch/20240927131355.350918-2-bjorn@kernel.org/ + url = "https://patchwork.kernel.org/project/linux-riscv/patch/20240927131355.350918-2-bjorn@kernel.org/raw/"; + hash = "sha256-7yNWE/L/qd3vcLtJYoSyGxB3ytySlr20R0D3t5ni2Fc="; + }) + (fetchpatch { + # tools: Override makefile ARCH variable if defined, but empty + # https://patchwork.kernel.org/project/linux-riscv/patch/20241127101748.165693-1-bjorn@kernel.org/ + url = "https://patchwork.kernel.org/project/linux-riscv/patch/20241127101748.165693-1-bjorn@kernel.org/raw/"; + hash = "sha256-y8N71Hm1XfX9g3S6PzW2m7Lxp6wQQMfQE9L0QNt8cYY="; + }) ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -68,6 +88,9 @@ stdenv.mkDerivation rec { "bpf_dbg" ]; + # needed for cross to riscv64 + makeFlags = [ "ARCH=${stdenv.hostPlatform.linuxArch}" ]; + installPhase = '' make -C bpftool install install -Dm755 -t $out/bin bpf_asm From e2d137d8539b0eb500eb650b12ccdbad40660488 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Tue, 7 Jan 2025 00:12:17 -0800 Subject: [PATCH 0019/1107] ldns: run autoreconfHook The pregenerated configure script does not generate dynamic libraries on OpenBSD. Run autoreconfHook to generate a working one --- pkgs/by-name/ld/ldns/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ld/ldns/package.nix b/pkgs/by-name/ld/ldns/package.nix index ed0a570a7503..42caae4fed34 100644 --- a/pkgs/by-name/ld/ldns/package.nix +++ b/pkgs/by-name/ld/ldns/package.nix @@ -6,6 +6,7 @@ perl, which, dns-root-data, + autoreconfHook, }: stdenv.mkDerivation rec { @@ -28,7 +29,11 @@ stdenv.mkDerivation rec { "examples" ]; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ + perl + autoreconfHook + ]; + buildInputs = [ openssl ]; configureFlags = From 07cee321f1c6ea241e46a599caa12a1b5dee40eb Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Tue, 7 Jan 2025 00:15:11 -0800 Subject: [PATCH 0020/1107] libedit: run autoreconfHook The generated configure script will not generate dynamic libriares on OpenBSD when building cross. Run autoreconfHook to give us dynamic libraires on OpenBSD --- pkgs/by-name/li/libedit/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/li/libedit/package.nix b/pkgs/by-name/li/libedit/package.nix index 92248a806d25..12bd2e966a1e 100644 --- a/pkgs/by-name/li/libedit/package.nix +++ b/pkgs/by-name/li/libedit/package.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, ncurses, + autoreconfHook, }: stdenv.mkDerivation (finalAttrs: { @@ -24,6 +25,10 @@ stdenv.mkDerivation (finalAttrs: { ./01-cygwin.patch ]; + nativeBuildInputs = [ + autoreconfHook + ]; + propagatedBuildInputs = [ ncurses ]; From c5567687762a0faf9c928cf890dd70d299bda8f6 Mon Sep 17 00:00:00 2001 From: Alex Gorichev Date: Mon, 6 Jan 2025 11:00:59 +0000 Subject: [PATCH 0021/1107] nixos/fail2ban: Update openssh option in docs The ``` services.openssh.logLevel ``` option has been changed to ``` services.openssh.settings.LogLevel ``` since cf10d7aef8ff9ca0e178e87981d9e4fd3018193c and this service is already using the new option (on line 462) but the description just hasn't been updated. The `option` formatting as also been updated by the suggestion of @Defelo --- nixos/modules/services/security/fail2ban.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix index 83a65111756b..dffb246dd1d5 100644 --- a/nixos/modules/services/security/fail2ban.nix +++ b/nixos/modules/services/security/fail2ban.nix @@ -91,7 +91,7 @@ in description = '' Whether to enable the fail2ban service. - See the documentation of {option}`services.fail2ban.jails` + See the documentation of [](#opt-services.fail2ban.jails) for what jails are enabled by default. ''; }; @@ -326,7 +326,7 @@ in NixOS comes with a default `sshd` jail; for it to work well, - {option}`services.openssh.logLevel` should be set to + [](#opt-services.openssh.settings.LogLevel) should be set to `"VERBOSE"` or higher so that fail2ban can observe failed login attempts. This module sets it to `"VERBOSE"` if From a426ed3d09b3b68341f7c1cd9fc7c394a65e7d21 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Tue, 7 Jan 2025 00:03:36 -0800 Subject: [PATCH 0022/1107] lesspipe: Fix build on OpenBSD For some reason resholve can figure out that `file` built for FreeBSD and Linux do not execute arguments, but not for OpenBSD. Explicitly tell it that there is no problem --- pkgs/by-name/le/lesspipe/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/le/lesspipe/package.nix b/pkgs/by-name/le/lesspipe/package.nix index 0fd06e2758de..7f42f6bbf59a 100644 --- a/pkgs/by-name/le/lesspipe/package.nix +++ b/pkgs/by-name/le/lesspipe/package.nix @@ -167,6 +167,7 @@ stdenv.mkDerivation rec { }; execer = [ "cannot:${iconv}/bin/iconv" + "cannot:${file}/bin/file" ]; }} ${resholve.phraseSolution "lesscomplete" { @@ -216,6 +217,9 @@ stdenv.mkDerivation rec { ]; builtin = [ "setopt" ]; }; + execer = [ + "cannot:${file}/bin/file" + ]; }} ''; From fa9a371817f32dad7c2d2e7b8489ad0a6c665454 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 0023/1107] blas: fix static build --- pkgs/by-name/bl/blas/package.nix | 34 +++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/bl/blas/package.nix b/pkgs/by-name/bl/blas/package.nix index 0372753c8ef4..01ad1839c339 100644 --- a/pkgs/by-name/bl/blas/package.nix +++ b/pkgs/by-name/bl/blas/package.nix @@ -164,10 +164,10 @@ let version = "3"; canonicalExtension = - if stdenv.hostPlatform.isLinux then + if stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isStatic then "${stdenv.hostPlatform.extensions.sharedLibrary}.${version}" else - stdenv.hostPlatform.extensions.sharedLibrary; + stdenv.hostPlatform.extensions.sharedLibrary or ".a"; blasImplementation = lib.getName blasProvider; blasProvider' = @@ -212,18 +212,20 @@ stdenv.mkDerivation { echo "$libblas does not exist, ${blasProvider'.name} does not provide libblas." exit 1 fi - + '' + + lib.optionalString (!stdenv.hostPlatform.isStatic) '' $NM -an "$libblas" | cut -f3 -d' ' > symbols for symbol in ${toString blasFortranSymbols}; do grep -q "^$symbol_$" symbols || { echo "$symbol" was not found in "$libblas"; exit 1; } done - + '' + + '' cp -L "$libblas" $out/lib/libblas${canonicalExtension} chmod +w $out/lib/libblas${canonicalExtension} '' + ( - if stdenv.hostPlatform.isElf then + if (stdenv.hostPlatform.isElf && !stdenv.hostPlatform.isStatic) then '' patchelf --set-soname libblas${canonicalExtension} $out/lib/libblas${canonicalExtension} patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libblas${canonicalExtension}):${lib.getLib blasProvider'}/lib" $out/lib/libblas${canonicalExtension} @@ -238,8 +240,12 @@ stdenv.mkDerivation { ) + '' - if [ "$out/lib/libblas${canonicalExtension}" != "$out/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}" ]; then - ln -s $out/lib/libblas${canonicalExtension} "$out/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}" + if [ "$out/lib/libblas${canonicalExtension}" != "$out/lib/libblas${ + stdenv.hostPlatform.extensions.sharedLibrary or ".a" + }" ]; then + ln -s $out/lib/libblas${canonicalExtension} "$out/lib/libblas${ + stdenv.hostPlatform.extensions.sharedLibrary or ".a" + }" fi cat < $dev/lib/pkgconfig/blas.pc @@ -262,7 +268,7 @@ stdenv.mkDerivation { '' + ( - if stdenv.hostPlatform.isElf then + if (stdenv.hostPlatform.isElf && !stdenv.hostPlatform.isStatic) then '' patchelf --set-soname libcblas${canonicalExtension} $out/lib/libcblas${canonicalExtension} patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libcblas${canonicalExtension}):${lib.getLib blasProvider'}/lib" $out/lib/libcblas${canonicalExtension} @@ -276,8 +282,12 @@ stdenv.mkDerivation { '' ) + '' - if [ "$out/lib/libcblas${canonicalExtension}" != "$out/lib/libcblas${stdenv.hostPlatform.extensions.sharedLibrary}" ]; then - ln -s $out/lib/libcblas${canonicalExtension} "$out/lib/libcblas${stdenv.hostPlatform.extensions.sharedLibrary}" + if [ "$out/lib/libcblas${canonicalExtension}" != "$out/lib/libcblas${ + stdenv.hostPlatform.extensions.sharedLibrary or ".a" + }" ]; then + ln -s $out/lib/libcblas${canonicalExtension} "$out/lib/libcblas${ + stdenv.hostPlatform.extensions.sharedLibrary or ".a" + }" fi cp ${lib.getDev lapack-reference}/include/cblas{,_mangling}.h $dev/include @@ -293,7 +303,9 @@ stdenv.mkDerivation { + lib.optionalString (blasImplementation == "mkl") '' mkdir -p $out/nix-support echo 'export MKL_INTERFACE_LAYER=${lib.optionalString isILP64 "I"}LP64,GNU' > $out/nix-support/setup-hook - ln -s $out/lib/libblas${canonicalExtension} $out/lib/libmkl_rt${stdenv.hostPlatform.extensions.sharedLibrary} + ln -s $out/lib/libblas${canonicalExtension} $out/lib/libmkl_rt${ + stdenv.hostPlatform.extensions.sharedLibrary or ".a" + } ln -sf ${blasProvider'}/include/* $dev/include '' ); From 54632790fbd6e717db81ed2d98e295922e8e7cbf Mon Sep 17 00:00:00 2001 From: phaer Date: Sat, 11 Jan 2025 00:19:59 +0100 Subject: [PATCH 0024/1107] nixos/image/images: fix sd-card image on aarch64 by using qemuArch, not linuxArch. The former is "aarch64", while the later is "arm64" on such machines. --- nixos/modules/image/images.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/image/images.nix b/nixos/modules/image/images.nix index 84e364818adc..b693f3b51e5e 100644 --- a/nixos/modules/image/images.nix +++ b/nixos/modules/image/images.nix @@ -51,7 +51,7 @@ let sd-card = [ ( let - module = ../. + "/installer/sd-card/sd-image-${pkgs.targetPlatform.linuxArch}.nix"; + module = ../. + "/installer/sd-card/sd-image-${pkgs.targetPlatform.qemuArch}.nix"; in if builtins.pathExists module then module else throw "The module ${module} does not exist." ) From c262d2ca8d15f2ec508b6984eb3b89a16ca20a35 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sat, 11 Jan 2025 00:03:23 -0500 Subject: [PATCH 0025/1107] itk: 5.4.1 -> 5.4.2 --- pkgs/development/libraries/itk/5.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/itk/5.x.nix b/pkgs/development/libraries/itk/5.x.nix index 80a9c0123bf2..2398715a6ba3 100644 --- a/pkgs/development/libraries/itk/5.x.nix +++ b/pkgs/development/libraries/itk/5.x.nix @@ -1,5 +1,5 @@ import ./generic.nix rec { - version = "5.4.1"; + version = "5.4.2"; rev = "refs/tags/v${version}"; - sourceSha256 = "sha256-XzBmfyv7Bz7CD/RaNgL888R6rUossWLCS8QtbCLPBnY="; + sourceSha256 = "sha256-aQAqh0Z01JqKm78cmxkpC/+gbdx6wTJQh34c1lN+DR0="; } From 00d34304266337a21d02aa76de0742f0dd662322 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 11 Jan 2025 07:07:02 +0000 Subject: [PATCH 0026/1107] bc: 1.07.1 -> 1.08.1 Changes: - https://lists.gnu.org/archive/html/info-gnu/2025-01/msg00000.html - https://lists.gnu.org/archive/html/info-gnu/2025-01/msg00002.html --- pkgs/by-name/bc/bc/cross-bc.patch | 169 ------------------------------ pkgs/by-name/bc/bc/package.nix | 7 +- 2 files changed, 3 insertions(+), 173 deletions(-) delete mode 100644 pkgs/by-name/bc/bc/cross-bc.patch diff --git a/pkgs/by-name/bc/bc/cross-bc.patch b/pkgs/by-name/bc/bc/cross-bc.patch deleted file mode 100644 index ba8857abb581..000000000000 --- a/pkgs/by-name/bc/bc/cross-bc.patch +++ /dev/null @@ -1,169 +0,0 @@ -commit fdda59736ddc048cf38a2c7103f4f5d9eeaf995e -Author: Ben Gamari -Date: Tue Oct 17 10:51:34 2017 -0400 - - Try implementing cross-compilation - -diff --git a/bc/Makefile.am b/bc/Makefile.am -index d9d412e..fdef633 100644 ---- a/bc/Makefile.am -+++ b/bc/Makefile.am -@@ -17,6 +17,7 @@ MAINTAINERCLEANFILES = Makefile.in bc.c bc.h scan.c \ - - AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/../h - LIBBC = ../lib/libbc.a -+LIBBC_HOST = ../lib/libbc_host.a - LIBL = @LEXLIB@ - LDADD = $(LIBBC) $(LIBL) @READLINELIB@ - -@@ -29,12 +30,20 @@ $(PROGRAMS): libmath.h $(LIBBC) - scan.o: bc.h - global.o: libmath.h -+ -+main_host.c : main.c -+ cp $< $@ - --fbcOBJ = main.o bc.o scan.o execute.o load.o storage.o util.o warranty.o -+fbcOBJ = $(addsuffix _host,main.o bc.o scan.o execute.o load.o storage.o util.o warranty.o) -+ -+%.o_host : CC:=$(CC_FOR_BUILD) -+ -+%.o_host : %.c -+ $(COMPILE) -c $(CFLAGS) $(INCLUDES) -o $@ $< - --libmath.h: libmath.b $(fbcOBJ) $(LIBBC) -+libmath.h: libmath.b $(fbcOBJ) $(LIBBC_HOST) - echo '{0}' > libmath.h -- $(MAKE) global.o -- $(LINK) -o fbc $(fbcOBJ) global.o $(LIBBC) $(LIBL) $(READLINELIB) $(LIBS) -+ $(MAKE) global.o_host -+ $(CC_FOR_BUILD) -o fbc $(fbcOBJ) global.o_host $(LIBBC_HOST) $(LIBL) ${READLINELIB} $(LIBS) - ./fbc -c $(srcdir)/libmath.b libmath.h - $(srcdir)/fix-libmath_h - rm -f ./fbc ./global.o -diff --git a/configure.ac b/configure.ac -index fc74573..5cabb73 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,6 +20,7 @@ m4_define([dc_version], 1.4.1) - - AC_INIT([bc],[bc_version]) - AC_CONFIG_SRCDIR(doc/bc.1) -+AC_CONFIG_MACRO_DIR([m4]) - AM_INIT_AUTOMAKE([dist-bzip2]) - AC_CONFIG_HEADERS(config.h) - -@@ -35,6 +36,7 @@ AC_DEFINE([DC_COPYRIGHT], - [Define the dc copyright line.]) - - AC_PROG_CC -+AX_CC_FOR_BUILD - AC_USE_SYSTEM_EXTENSIONS - - AM_PROG_LEX -diff --git a/lib/Makefile.am b/lib/Makefile.am -index ec4bf59..c670f5b 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -1,5 +1,5 @@ - ## Process this file with automake to produce Makefile.in --noinst_LIBRARIES = libbc.a -+noinst_LIBRARIES = libbc.a libbc_host.a - - AM_CPPFLAGS = -I. -I.. -I$(srcdir)/../h - -@@ -24,3 +24,11 @@ testmul: testmul.o number.o - - specialnumber: newnumber.o - cp newnumber.o number.o -+ -+%.o_host : CC:=$(CC_FOR_BUILD) -+%.o_host : %.c -+ $(COMPILE) -c $(CFLAGS) $(INCLUDES) -o $@ $< -+ -+libbc_host.a : $(addsuffix _host,$(libbc_a_OBJECTS)) -+ ar cru $@ $+ -+ ranlib $@ -diff --git a/m4/cc_for_build.m4 b/m4/cc_for_build.m4 -new file mode 100644 -index 0000000..c62ffad ---- /dev/null -+++ b/m4/cc_for_build.m4 -@@ -0,0 +1,77 @@ -+# =========================================================================== -+# https://www.gnu.org/software/autoconf-archive/ax_cc_for_build.html -+# =========================================================================== -+# -+# SYNOPSIS -+# -+# AX_CC_FOR_BUILD -+# -+# DESCRIPTION -+# -+# Find a build-time compiler. Sets CC_FOR_BUILD and EXEEXT_FOR_BUILD. -+# -+# LICENSE -+# -+# Copyright (c) 2010 Reuben Thomas -+# Copyright (c) 1999 Richard Henderson -+# -+# This program is free software: you can redistribute it and/or modify it -+# under the terms of the GNU General Public License as published by the -+# Free Software Foundation, either version 3 of the License, or (at your -+# option) any later version. -+# -+# This program is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -+# Public License for more details. -+# -+# You should have received a copy of the GNU General Public License along -+# with this program. If not, see . -+# -+# As a special exception, the respective Autoconf Macro's copyright owner -+# gives unlimited permission to copy, distribute and modify the configure -+# scripts that are the output of Autoconf when processing the Macro. You -+# need not follow the terms of the GNU General Public License when using -+# or distributing such scripts, even though portions of the text of the -+# Macro appear in them. The GNU General Public License (GPL) does govern -+# all other use of the material that constitutes the Autoconf Macro. -+# -+# This special exception to the GPL applies to versions of the Autoconf -+# Macro released by the Autoconf Archive. When you make and distribute a -+# modified version of the Autoconf Macro, you may extend this special -+# exception to the GPL to apply to your modified version as well. -+ -+#serial 3 -+ -+dnl Get a default for CC_FOR_BUILD to put into Makefile. -+AC_DEFUN([AX_CC_FOR_BUILD], -+[# Put a plausible default for CC_FOR_BUILD in Makefile. -+if test -z "$CC_FOR_BUILD"; then -+ if test "x$cross_compiling" = "xno"; then -+ CC_FOR_BUILD='$(CC)' -+ else -+ CC_FOR_BUILD=gcc -+ fi -+fi -+AC_SUBST(CC_FOR_BUILD) -+# Also set EXEEXT_FOR_BUILD. -+if test "x$cross_compiling" = "xno"; then -+ EXEEXT_FOR_BUILD='$(EXEEXT)' -+else -+ AC_CACHE_CHECK([for build system executable suffix], bfd_cv_build_exeext, -+ [rm -f conftest* -+ echo 'int main () { return 0; }' > conftest.c -+ bfd_cv_build_exeext= -+ ${CC_FOR_BUILD} -o conftest conftest.c 1>&5 2>&5 -+ for file in conftest.*; do -+ case $file in -+ *.c | *.o | *.obj | *.ilk | *.pdb) ;; -+ *) bfd_cv_build_exeext=`echo $file | sed -e s/conftest//` ;; -+ esac -+ done -+ rm -f conftest* -+ test x"${bfd_cv_build_exeext}" = x && bfd_cv_build_exeext=no]) -+ EXEEXT_FOR_BUILD="" -+ test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeext} -+fi -+AC_SUBST(EXEEXT_FOR_BUILD)])dnl diff --git a/pkgs/by-name/bc/bc/package.nix b/pkgs/by-name/bc/bc/package.nix index 47f6b40690c3..b58d9f7e0ebb 100644 --- a/pkgs/by-name/bc/bc/package.nix +++ b/pkgs/by-name/bc/bc/package.nix @@ -12,17 +12,16 @@ stdenv.mkDerivation rec { pname = "bc"; - version = "1.07.1"; + version = "1.08.1"; src = fetchurl { - url = "mirror://gnu/bc/bc-${version}.tar.gz"; - sha256 = "62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a"; + url = "mirror://gnu/bc/bc-${version}.tar.xz"; + hash = "sha256-UVQwEVszNMY2MXUDRgoJUN/3mUCqMlnOLBqmfCiB0CM="; }; configureFlags = [ "--with-readline" ]; # As of 1.07 cross-compilation is quite complicated as the build system wants # to build a code generator, bc/fbc, on the build machine. - patches = [ ./cross-bc.patch ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ # Tools From 04791f4a4d1cac8bcd9f3ace9219efc742b9f5ef Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 11 Jan 2025 12:31:08 +0000 Subject: [PATCH 0027/1107] bintools-wrapper: enable stackclashprotection by default --- pkgs/build-support/bintools-wrapper/default.nix | 1 + pkgs/top-level/stage.nix | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 878439cb31a6..fdf3fcfb284d 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -43,6 +43,7 @@ "fortify3" "pic" "relro" + "stackclashprotection" "stackprotector" "strictoverflow" "zerocallusedregs" diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 1cedd8dd1845..b9f671629c39 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -329,7 +329,6 @@ let super'.stdenv.cc.defaultHardeningFlags ++ [ "shadowstack" "pacret" - "stackclashprotection" "trivialautovarinit" ] ) super'.stdenv; From 2adcab08d28abefe6dc2ce6818376ef338914435 Mon Sep 17 00:00:00 2001 From: vdbe Date: Sat, 11 Jan 2025 15:25:39 +0100 Subject: [PATCH 0028/1107] nixos/libvirtd: fix path in hooks.network desc `virtualisation.libvirtd.hooks.network` places the hooks under `/var/lib/libvirt/hooks/network.d/`. --- nixos/modules/virtualisation/libvirtd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 165876910749..57590165071e 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -179,7 +179,7 @@ let type = types.attrsOf types.path; default = { }; description = '' - Hooks that will be placed under /var/lib/libvirt/hooks/lxc.d/ + Hooks that will be placed under /var/lib/libvirt/hooks/network.d/ and called for networks begin/end events. Please see https://libvirt.org/hooks.html for documentation. ''; From 35f9fefe10c82251ee7d0bccd18795f47818a598 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Jan 2025 01:50:32 +0000 Subject: [PATCH 0029/1107] owncast: 0.1.3 -> 0.2.0 --- pkgs/by-name/ow/owncast/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ow/owncast/package.nix b/pkgs/by-name/ow/owncast/package.nix index a7407bc783b5..66a2c11e9210 100644 --- a/pkgs/by-name/ow/owncast/package.nix +++ b/pkgs/by-name/ow/owncast/package.nix @@ -10,7 +10,7 @@ }: let - version = "0.1.3"; + version = "0.2.0"; in buildGoModule { pname = "owncast"; @@ -19,9 +19,9 @@ buildGoModule { owner = "owncast"; repo = "owncast"; rev = "v${version}"; - hash = "sha256-VoItAV/8hzrqj4bIgMum9Drr/kAafH63vXw3GO6nSOc="; + hash = "sha256-MdquhDdbOdP1shnKHBlzQrSDe41fp0qnMzgaqL89jTk="; }; - vendorHash = "sha256-JitvKfCLSravW5WRE0QllJTrRPLaaBg1GxJi3kmtiIU="; + vendorHash = "sha256-ERilQZ8vnhGW1IEcLA4CcmozDooHKbnmASMw87tjYD4="; propagatedBuildInputs = [ ffmpeg ]; From 2e30794916665787d7a7831972272e3d160ab856 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Jan 2025 02:01:23 +0000 Subject: [PATCH 0030/1107] harfbuzz: 10.1.0 -> 10.2.0 --- pkgs/development/libraries/harfbuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index e05d85a4a015..243ebdae7351 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "harfbuzz${lib.optionalString withIcu "-icu"}"; - version = "10.1.0"; + version = "10.2.0"; src = fetchurl { url = "https://github.com/harfbuzz/harfbuzz/releases/download/${finalAttrs.version}/harfbuzz-${finalAttrs.version}.tar.xz"; - hash = "sha256-bONSDy0ImjPO8PxIMhM0uOC3IUH2p2Nxmqrs0neey4I="; + hash = "sha256-Yg40aPrsLqhoXTLEalhGm4UO9jBAs1Zc3gWVmCW0gic="; }; postPatch = From 117929b9ccfc42c338e5ecfa00ec980a27611549 Mon Sep 17 00:00:00 2001 From: Isaac Shapira Date: Fri, 12 Jan 2024 17:28:58 -0700 Subject: [PATCH 0031/1107] buildNpmPackage: avoid using npm config --- .../node/build-npm-package/hooks/npm-config-hook.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh b/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh index 486b0c2f8372..6a301e715ef8 100644 --- a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh +++ b/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh @@ -81,9 +81,11 @@ npmConfigHook() { cachePath="$TMPDIR/cache" fi - npm config set cache "$cachePath" - npm config set offline true - npm config set progress false + echo "Setting npm_config_cache to $cachePath" + # do not use npm config to avoid modifying .npmrc + export npm_config_cache="$cachePath" + export npm_config_offline="true" + export npm_config_progress="false" echo "Installing dependencies" From aedf74603ab156d5353389d872c87744f4102b8a Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 12 Jan 2025 17:46:13 +0100 Subject: [PATCH 0032/1107] taglib: Modernise - Set strictDeps - Use lib.cmake* for cmakeFlags - Drop meta-wide "with lib" - Correct meta.license: COPYING.LGPL on the repo is version 2.1, no plus clauses used in code - Add meta.platforms --- pkgs/by-name/ta/taglib/package.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ta/taglib/package.nix b/pkgs/by-name/ta/taglib/package.nix index 684a37f0172f..865ee774ddee 100644 --- a/pkgs/by-name/ta/taglib/package.nix +++ b/pkgs/by-name/ta/taglib/package.nix @@ -18,21 +18,23 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-QX0EpHGT36UsgIfRf5iALnwxe0jjLpZvCTbk8vSMFF4="; }; + strictDeps = true; + nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" + (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) # Workaround unconditional ${prefix} until upstream is fixed: # https://github.com/taglib/taglib/issues/1098 - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" + (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") + (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = with lib; { + meta = { homepage = "https://taglib.org/"; description = "Library for reading and editing audio file metadata"; mainProgram = "taglib-config"; @@ -42,14 +44,15 @@ stdenv.mkDerivation (finalAttrs: { files, Ogg Vorbis comments and ID3 tags and Vorbis comments in FLAC, MPC, Speex, WavPack, TrueAudio, WAV, AIFF, MP4 and ASF files. ''; - license = with licenses; [ - lgpl3 + license = with lib.licenses; [ + lgpl21Only mpl11 ]; - maintainers = with maintainers; [ ttuegel ]; + maintainers = with lib.maintainers; [ ttuegel ]; pkgConfigModules = [ "taglib" "taglib_c" ]; + platforms = lib.platforms.all; }; }) From 3f8f35ae4345e930bbe42ce64b765f33ce9b9a8a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Jan 2025 01:12:30 +0000 Subject: [PATCH 0033/1107] openblas: 0.3.28 -> 0.3.29 --- pkgs/development/libraries/science/math/openblas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 0a81f0f8af39..9ceec2d760d0 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -158,7 +158,7 @@ let in stdenv.mkDerivation rec { pname = "openblas"; - version = "0.3.28"; + version = "0.3.29"; outputs = [ "out" @@ -169,7 +169,7 @@ stdenv.mkDerivation rec { owner = "OpenMathLib"; repo = "OpenBLAS"; rev = "v${version}"; - hash = "sha256-430zG47FoBNojcPFsVC7FA43FhVPxrulxAW3Fs6CHo8="; + hash = "sha256-n/3FGmZxnNiOEKYHSIuqX2LJS1BzYPCwLWT9DSwEoPI="; }; postPatch = '' From 2c2a56dba0ef44460f2fffb4caf6659f8ea60ba6 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 13 Jan 2025 06:23:28 +0000 Subject: [PATCH 0034/1107] doxygen: 1.13.0 -> 1.13.2 Changes: - https://www.doxygen.nl/manual/changelog.html#log_1_13_1 - https://www.doxygen.nl/manual/changelog.html#log_1_13_2 --- pkgs/development/tools/documentation/doxygen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 66ccab402e2f..194b614a12d5 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "doxygen"; - version = "1.13.0"; + version = "1.13.2"; src = fetchFromGitHub { owner = "doxygen"; repo = "doxygen"; tag = "Release_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-XKzH2nMByE0WE7WX4YYj2boq9+iwD7SyO5w9/4g9cGE="; + hash = "sha256-tet2Ep2Mvucg2QBJbo9A6531cJhQ9L7+ZMmo07S8cwY="; }; # https://github.com/doxygen/doxygen/issues/10928#issuecomment-2179320509 From 4517d158a1c8bfdeeaefc20a66e56c977e82ec90 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 0035/1107] glog: disable broken test everywhere --- pkgs/by-name/gl/glog/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gl/glog/package.nix b/pkgs/by-name/gl/glog/package.nix index ed30b55a60f4..6206cdf3e1c9 100644 --- a/pkgs/by-name/gl/glog/package.nix +++ b/pkgs/by-name/gl/glog/package.nix @@ -67,8 +67,8 @@ stdenv.mkDerivation rec { lib.optionals stdenv.hostPlatform.isDarwin [ "mock-log" ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ - "logging" # works around segfaults on aarch64-darwin for now + ++ [ + "logging" # works around segfaults for now ]; excludedTestsRegex = lib.optionalString ( excludedTests != [ ] From 824d063356df578d766dc20c322637c013b9ec9b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 14 Jan 2025 07:10:24 +0000 Subject: [PATCH 0036/1107] npth: 1.7 -> 1.8 Changes: https://dev.gnupg.org/T7387 --- pkgs/by-name/np/npth/package.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/np/npth/package.nix b/pkgs/by-name/np/npth/package.nix index 16e386e72143..d3b6d95cd5ac 100644 --- a/pkgs/by-name/np/npth/package.nix +++ b/pkgs/by-name/np/npth/package.nix @@ -2,28 +2,19 @@ lib, stdenv, fetchurl, - fetchpatch, autoreconfHook, pkgsCross, }: stdenv.mkDerivation rec { pname = "npth"; - version = "1.7"; + version = "1.8"; src = fetchurl { url = "mirror://gnupg/npth/npth-${version}.tar.bz2"; - sha256 = "sha256-hYn1aTe3XOM7KNMS/MvzArO3HsPzlF/eaqp0AnkUrQU="; + hash = "sha256-i9JLTyOjBl1uWybpirqc54PqT9eBBpwbNdFJaU6Qyj4="; }; - patches = [ - (fetchpatch { - name = "musl.patch"; - url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git;a=patch;h=417abd56fd7bf45cd4948414050615cb1ad59134"; - hash = "sha256-0g2tLFjW1bybNi6oxlW7vPimsQLjmTih4JZSoATjESI="; - }) - ]; - nativeBuildInputs = [ autoreconfHook ]; doCheck = true; From 6845526c09ed356f0bdde74ec747aaf079f80a70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 14 Jan 2025 19:34:09 +0100 Subject: [PATCH 0037/1107] iana-etc: 20240318 -> 20250108 Diff: https://github.com/Mic92/iana-etc/compare/None...20250108 --- pkgs/by-name/ia/iana-etc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ia/iana-etc/package.nix b/pkgs/by-name/ia/iana-etc/package.nix index 0cfaee22c6e4..f3a2fac0fb3c 100644 --- a/pkgs/by-name/ia/iana-etc/package.nix +++ b/pkgs/by-name/ia/iana-etc/package.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation rec { pname = "iana-etc"; - version = "20240318"; + version = "20250108"; src = fetchzip { url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz"; - sha256 = "sha256-t/VOTFDdAH+EdzofdMyUO9Yvl5qdMjdPl9ebYtBC388="; + sha256 = "sha256-vQxZ8wqAQfBuyQ6QOQonmotBpl0JFJKqkw9NTma1G6k="; }; installPhase = '' From 7befd3471f0ff2c05ca12da1753953960afadb7a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 15 Jan 2025 06:25:22 +0000 Subject: [PATCH 0038/1107] sqlite, sqlite-analyzer: 3.47.2 -> 3.48.0 Changes: https://www.sqlite.org/releaselog/3_48_0.html --- pkgs/development/libraries/sqlite/default.nix | 13 +++++-------- pkgs/development/libraries/sqlite/tools.nix | 6 +++--- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index c483d5e3a262..5522cab569ab 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -16,17 +16,17 @@ in stdenv.mkDerivation rec { pname = "sqlite${lib.optionalString interactive "-interactive"}"; - version = "3.47.2"; + version = "3.48.0"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { - url = "https://sqlite.org/2024/sqlite-autoconf-${archiveVersion version}.tar.gz"; - hash = "sha256-8bLuQSwo10cryVupljaNbwzc8ANir/2tsn7ShsF5VAs="; + url = "https://sqlite.org/2025/sqlite-autoconf-${archiveVersion version}.tar.gz"; + hash = "sha256-rJkvf8o5id5+0f6ZwWNj+Eh5TIwyoVja/U65J6LgL9U="; }; docsrc = fetchurl { - url = "https://sqlite.org/2024/sqlite-doc-${archiveVersion version}.zip"; - hash = "sha256-bcyommdJAp+6gbwPQYjL1PeKy0jWo+rcbVSK+RF8P0E="; + url = "https://sqlite.org/2025/sqlite-doc-${archiveVersion version}.zip"; + hash = "sha256-PcE3/NfGrLMmr2CmG5hE3RXTdzywXnqc4nbEH3E9dlo="; }; outputs = [ "bin" "dev" "man" "doc" "out" ]; @@ -86,9 +86,6 @@ stdenv.mkDerivation rec { ''; postInstall = '' - # Do not contaminate dependent libtool-based projects with sqlite dependencies. - sed -i $out/lib/libsqlite3.la -e "s/dependency_libs=.*/dependency_libs='''/" - mkdir -p $doc/share/doc unzip $docsrc mv sqlite-doc-${archiveVersion version} $doc/share/doc/sqlite diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 29c6192fd7de..fc32439f9e31 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -4,12 +4,12 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec { inherit pname; - version = "3.47.2"; + version = "3.48.0"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { - url = "https://sqlite.org/2024/sqlite-src-${archiveVersion version}.zip"; - hash = "sha256-5qRx8SOCJfNMLEjFYBtUAkzFOARDaCMPWf8Gcr4fxiM="; + url = "https://sqlite.org/2025/sqlite-src-${archiveVersion version}.zip"; + hash = "sha256-LXsDK2/f6MRCqoCfhQaHqB0GOB3uzXvjMSYB0oYS5kA="; }; nativeBuildInputs = [ unzip ]; From 514875c4bf7608d5bd5d8ad141ee18ed5cba0cdd Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 15 Jan 2025 07:05:05 +0000 Subject: [PATCH 0039/1107] libinput: 1.27.0 -> 1.27.1 Changes: https://newreleases.io/project/freedesktop-gitlab/libinput/libinput/release/1.27.1 --- pkgs/development/libraries/libinput/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 36e232ee0d0d..bb527c5257db 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { pname = "libinput"; - version = "1.27.0"; + version = "1.27.1"; outputs = [ "bin" "out" "dev" ]; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { owner = "libinput"; repo = "libinput"; rev = version; - hash = "sha256-aeCMZnH4RPvaV4+1kqeOSqIj1ViUlaryEXQAo8KaOQE="; + hash = "sha256-3U+2a/uSoSj1t34uz7xO2QQtJExygKOhBL7BUGP0Fbo="; }; patches = [ From b7352212f8ce5de214da7c4296b7bcd59de37d43 Mon Sep 17 00:00:00 2001 From: Nathan Henrie Date: Thu, 16 Jan 2025 17:22:28 -0700 Subject: [PATCH 0040/1107] 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 45a36cc9da3b7cc25b946f4db4c0276a0331de66 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Jan 2025 00:34:48 +0000 Subject: [PATCH 0041/1107] libexif: 0.6.24 -> 0.6.25 --- pkgs/by-name/li/libexif/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libexif/package.nix b/pkgs/by-name/li/libexif/package.nix index 31fc243ca2df..35f37c9c41a9 100644 --- a/pkgs/by-name/li/libexif/package.nix +++ b/pkgs/by-name/li/libexif/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "libexif"; - version = "0.6.24"; + version = "0.6.25"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "${pname}-${builtins.replaceStrings [ "." ] [ "_" ] version}-release"; - sha256 = "sha256-Eqgnm31s8iPJdhTpk5HM89HSZTXTK+e7YZ/CCdbeJX4="; + sha256 = "sha256-H8YzfNO2FCrYAwEA4bkOpRdxISK9RXaHVuK8zz70TlM="; }; nativeBuildInputs = [ From dd00c73e4c9aad9a2d1a443d62a7bbd6489e1b3a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 18 Jan 2025 06:28:09 +0000 Subject: [PATCH 0042/1107] s2n-tls: 1.5.10 -> 1.5.11 Changes: https://github.com/aws/s2n-tls/releases/tag/v1.5.11 --- pkgs/by-name/s2/s2n-tls/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/s2/s2n-tls/package.nix b/pkgs/by-name/s2/s2n-tls/package.nix index 2f327ea9e768..283415040952 100644 --- a/pkgs/by-name/s2/s2n-tls/package.nix +++ b/pkgs/by-name/s2/s2n-tls/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.5.10"; + version = "1.5.11"; src = fetchFromGitHub { owner = "aws"; repo = "s2n-tls"; rev = "v${version}"; - hash = "sha256-oIDWlWE9HE+Zrhei2D56U/dO1VEkbQg3VLrUIopg2oc="; + hash = "sha256-3eh4+y3XyO2sUfPhkOeF5fKgakFz9f4zLceYqklEYBw="; }; nativeBuildInputs = [ cmake ]; From 8d5abcd1bb3d5d9483aa1a1261e15b96650f500c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 27 Mar 2023 20:08:22 +0200 Subject: [PATCH 0043/1107] nixos/install-grub: use more modern make_path mkpath is a legacy interface. --- nixos/modules/system/boot/loader/grub/install-grub.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 6f0f62546a01..d6d92ffa0e9a 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -3,7 +3,7 @@ use warnings; use Class::Struct; use XML::LibXML; use File::Basename; -use File::Path; +use File::Path qw(make_path); use File::stat; use File::Copy; use File::Copy::Recursive qw(rcopy pathrm); @@ -98,7 +98,7 @@ $ENV{'PATH'} = get("path"); print STDERR "updating GRUB 2 menu...\n"; -mkpath("$bootPath/grub", 0, 0700); +make_path("$bootPath/grub", { mode => 0700 }); # Discover whether the bootPath is on the same filesystem as / and # /nix/store. If not, then all kernels and initrds must be copied to @@ -438,7 +438,7 @@ $conf .= "$extraConfig\n"; $conf .= "\n"; my %copied; -mkpath("$bootPath/kernels", 0, 0755) if $copyKernels; +make_path("$bootPath/kernels", { mode => 0755 }) if $copyKernels; sub copyToKernelsDir { my ($path) = @_; @@ -471,7 +471,7 @@ sub addEntry { my $systemName = basename(Cwd::abs_path("$path")); my $initrdSecretsPath = "$bootPath/kernels/$systemName-secrets"; - mkpath(dirname($initrdSecretsPath), 0, 0755); + make_path(dirname($initrdSecretsPath), { mode => 0755 }); my $oldUmask = umask; # Make sure initrd is not world readable (won't work if /boot is FAT) umask 0137; From 33c2472b6925510fb565acdecb9a0dcc4d40aa39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 27 Mar 2023 20:09:26 +0200 Subject: [PATCH 0044/1107] nixos/install-grub: don't use bare file handles and 3 argument open this is not best practice perl since a long time. --- .../system/boot/loader/grub/install-grub.pl | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index d6d92ffa0e9a..bf34859ec1e3 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -37,7 +37,8 @@ sub readFile { my ($fn) = @_; # enable slurp mode: read entire file in one go local $/ = undef; - open my $fh, "<$fn" or return undef; + open my $fh, "<", $fn + or return; my $s = <$fh>; close $fh; # disable slurp mode @@ -48,7 +49,7 @@ sub readFile { sub writeFile { my ($fn, $s) = @_; - open my $fh, ">$fn" or die "cannot create $fn: $!\n"; + open my $fh, ">", $fn or die "cannot create $fn: $!\n"; print $fh $s or die "cannot write to $fn: $!\n"; close $fh or die "cannot close $fn: $!\n"; } @@ -690,17 +691,17 @@ struct(GrubState => { # because it is read line-by-line. sub readGrubState { my $defaultGrubState = GrubState->new(name => "", version => "", efi => "", devices => "", efiMountPoint => "", extraGrubInstallArgs => () ); - open FILE, "<$bootPath/grub/state" or return $defaultGrubState; + open my $fh, "<", "$bootPath/grub/state" or return $defaultGrubState; local $/ = "\n"; - my $name = ; + my $name = <$fh>; chomp($name); - my $version = ; + my $version = <$fh>; chomp($version); - my $efi = ; + my $efi = <$fh>; chomp($efi); - my $devices = ; + my $devices = <$fh>; chomp($devices); - my $efiMountPoint = ; + my $efiMountPoint = <$fh>; chomp($efiMountPoint); # Historically, arguments in the state file were one per each line, but that # gets really messy when newlines are involved, structured arguments @@ -708,7 +709,7 @@ sub readGrubState { # when we need to remove a setting in the future. Thus, the 6th line is a JSON # object that can store structured data, with named keys, and all new state # should go in there. - my $jsonStateLine = ; + my $jsonStateLine = <$fh>; # For historical reasons we do not check the values above for un-definedness # (that is, when the state file has too few lines and EOF is reached), # because the above come from the first version of this logic and are thus @@ -720,7 +721,7 @@ sub readGrubState { } my %jsonState = %{decode_json($jsonStateLine)}; my @extraGrubInstallArgs = exists($jsonState{'extraGrubInstallArgs'}) ? @{$jsonState{'extraGrubInstallArgs'}} : (); - close FILE; + close $fh; my $grubState = GrubState->new(name => $name, version => $version, efi => $efi, devices => $devices, efiMountPoint => $efiMountPoint, extraGrubInstallArgs => \@extraGrubInstallArgs ); return $grubState } @@ -787,18 +788,18 @@ if ($requireNewInstall != 0) { my $stateFile = "$bootPath/grub/state"; my $stateFileTmp = $stateFile . ".tmp"; - open FILE, ">$stateFileTmp" or die "cannot create $stateFileTmp: $!\n"; - print FILE get("fullName"), "\n" or die; - print FILE get("fullVersion"), "\n" or die; - print FILE $efiTarget, "\n" or die; - print FILE join( ",", @deviceTargets ), "\n" or die; - print FILE $efiSysMountPoint, "\n" or die; + open my $fh, ">", "$stateFileTmp" or die "cannot create $stateFileTmp: $!\n"; + print $fh get("fullName"), "\n" or die; + print $fh get("fullVersion"), "\n" or die; + print $fh $efiTarget, "\n" or die; + print $fh join( ",", @deviceTargets ), "\n" or die; + print $fh $efiSysMountPoint, "\n" or die; my %jsonState = ( extraGrubInstallArgs => \@extraGrubInstallArgs ); my $jsonStateLine = encode_json(\%jsonState); - print FILE $jsonStateLine, "\n" or die; - close FILE or die; + print $fh $jsonStateLine, "\n" or die; + close $fh or die; # Atomically switch to the new state file rename $stateFileTmp, $stateFile or die "cannot rename $stateFileTmp to $stateFile: $!\n"; From a7bb9745cb0f543331c6b9b13c299e93510ea651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Sat, 18 Jan 2025 22:01:37 +0100 Subject: [PATCH 0045/1107] awscli2: make it build with darwin sandbox --- pkgs/by-name/aw/awscli2/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/aw/awscli2/package.nix b/pkgs/by-name/aw/awscli2/package.nix index 24064b1668e1..a835aa5684e6 100644 --- a/pkgs/by-name/aw/awscli2/package.nix +++ b/pkgs/by-name/aw/awscli2/package.nix @@ -146,6 +146,9 @@ py.pkgs.buildPythonApplication rec { rm $out/nix-support/propagated-build-inputs ''; + # tests/unit/customizations/sso/test_utils.py uses sockets + __darwinAllowLocalNetworking = true; + pytestFlagsArray = [ "-Wignore::DeprecationWarning" ]; From d0d2f479c2f5aad8fd0b25b5c8c40147d9f83f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Sat, 18 Jan 2025 22:02:28 +0100 Subject: [PATCH 0046/1107] pythonPackages.pook: make it build with darwin sandbox --- pkgs/development/python-modules/pook/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pook/default.nix b/pkgs/development/python-modules/pook/default.nix index 9b704e6b2e77..f168ad2bba50 100644 --- a/pkgs/development/python-modules/pook/default.nix +++ b/pkgs/development/python-modules/pook/default.nix @@ -53,6 +53,9 @@ buildPythonPackage rec { "tests/unit/interceptors/" ]; + # Tests use sockets + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "HTTP traffic mocking and testing"; homepage = "https://github.com/h2non/pook"; From 83efee239ff434bd7b8adcba2397902f20f5e156 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Sat, 18 Jan 2025 22:02:50 +0100 Subject: [PATCH 0047/1107] pythonPackages.pytest-services: make it build with darwin sandbox --- pkgs/development/python-modules/pytest-services/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pytest-services/default.nix b/pkgs/development/python-modules/pytest-services/default.nix index a8a0b69f363b..537e06b5e04b 100644 --- a/pkgs/development/python-modules/pytest-services/default.nix +++ b/pkgs/development/python-modules/pytest-services/default.nix @@ -66,6 +66,9 @@ buildPythonPackage rec { "test_xvfb" ]; + # Tests use sockets + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Services plugin for pytest testing framework"; homepage = "https://github.com/pytest-dev/pytest-services"; From 5b4e52e94ce748de047e934b67cb8e46e1de27d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Sat, 18 Jan 2025 22:03:54 +0100 Subject: [PATCH 0048/1107] pythonPackages.waitress: make it build with darwin sandbox --- pkgs/development/python-modules/waitress/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/waitress/default.nix b/pkgs/development/python-modules/waitress/default.nix index 79e9b73780bb..4a3fb719bb53 100644 --- a/pkgs/development/python-modules/waitress/default.nix +++ b/pkgs/development/python-modules/waitress/default.nix @@ -31,6 +31,9 @@ buildPythonPackage rec { "test_service_port" ]; + # Tests use sockets + __darwinAllowLocalNetworking = true; + meta = with lib; { homepage = "https://github.com/Pylons/waitress"; description = "Waitress WSGI server"; From baab5df8efc83fec1c95686b7f7d040ac235583b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 19 Jan 2025 09:51:17 +0000 Subject: [PATCH 0049/1107] lvm2: 2.03.29 -> 2.03.30 Changes: https://gitlab.com/lvmteam/lvm2/-/tags/v2_03_30 --- pkgs/os-specific/linux/lvm2/2_03.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lvm2/2_03.nix b/pkgs/os-specific/linux/lvm2/2_03.nix index 558f54afadd8..d45fb41336ba 100644 --- a/pkgs/os-specific/linux/lvm2/2_03.nix +++ b/pkgs/os-specific/linux/lvm2/2_03.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "2.03.29"; - hash = "sha256-MMU3dstN32v57KKdDCjb+cWsFwwJFUMhITsRw9u1vpw="; + version = "2.03.30"; + hash = "sha256-rXar7LjciHcz4GxEnLmt0Eo1BvnweAwSiBem4aF87AU="; } From dfc725314dd9195773f6791560caf0d4eaa51289 Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Sun, 19 Jan 2025 16:58:54 +0100 Subject: [PATCH 0050/1107] kubevpn: 2.2.10 -> 2.3.9 --- pkgs/by-name/ku/kubevpn/package.nix | 35 +++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ku/kubevpn/package.nix b/pkgs/by-name/ku/kubevpn/package.nix index 9faec05431a4..25637f2dd3b9 100644 --- a/pkgs/by-name/ku/kubevpn/package.nix +++ b/pkgs/by-name/ku/kubevpn/package.nix @@ -2,27 +2,54 @@ lib, buildGoModule, fetchFromGitHub, + go, }: buildGoModule rec { pname = "kubevpn"; - version = "2.2.10"; + version = "2.3.9"; src = fetchFromGitHub { owner = "KubeNetworks"; repo = "kubevpn"; rev = "v${version}"; - hash = "sha256-2LDV2aVdGuclVmOgIIwMYRKTMVLzlmNFI6xHFpxMRJw="; + hash = "sha256-g/N9Ho+s2AEA4iQSK48KGoTgsEMqv8ya3ZqCAhgVInc="; }; vendorHash = null; - # TODO investigate why some config tests are failing - doCheck = false; + tags = [ + "noassets" # required to build synthing gui without generating assets + ]; + + ldflags = [ + "-X github.com/wencaiwulue/kubevpn/v2/pkg/config.Version=v${version}" + "-X github.com/wencaiwulue/kubevpn/v2/cmd/kubevpn/cmds.OsArch=${go.GOOS}/${go.GOARCH}" + ]; + + # Resolve configuration tests, which access $HOME + preCheck = '' + export HOME=$(mktemp -d) + ''; + + # Disable network tests + checkFlags = [ + "-skip=^Test(Route|Functions|ByDumpClusterInfo|ByCreateSvc|Elegant)$" + ]; + + doInstallCheck = true; + + installCheckPhase = '' + runHook preInstallCheck + $out/bin/kubevpn help + $out/bin/kubevpn version | grep -e "Version: v${version}" + runHook postInstallCheck + ''; meta = with lib; { changelog = "https://github.com/KubeNetworks/kubevpn/releases/tag/${src.rev}"; description = "Create a VPN and connect to Kubernetes cluster network, access resources, and more"; + mainProgram = "kubevpn"; homepage = "https://github.com/KubeNetworks/kubevpn"; license = licenses.mit; maintainers = with maintainers; [ mig4ng ]; From bfd2463b20a160d66d9149a58943455dd1abc5c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Jan 2025 00:39:29 +0000 Subject: [PATCH 0051/1107] sord: 0.16.16 -> 0.16.18 --- pkgs/by-name/so/sord/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/so/sord/package.nix b/pkgs/by-name/so/sord/package.nix index aeda79e8a4a5..faa786b97d78 100644 --- a/pkgs/by-name/so/sord/package.nix +++ b/pkgs/by-name/so/sord/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "sord"; - version = "0.16.16"; + version = "0.16.18"; src = fetchFromGitHub { owner = "drobilla"; repo = pname; rev = "v${version}"; - hash = "sha256-GDs1m8KoEhJDdCf7kacQMZzCNPoZhESJds6KupQvOkU="; + hash = "sha256-cFobmmO2RHJdfCgTyGigzsdLpj7YF6U3r71i267Azks="; }; outputs = [ From 6e1ce1a647bbda8e174970a3811ad121bc79f6e7 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sat, 18 Jan 2025 22:15:42 -0800 Subject: [PATCH 0052/1107] perl: set ar, cc, and ld in the generic builder --- pkgs/development/perl-modules/generic/builder.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh index 3c45dc3b4c5a..c95b5cbb7d54 100644 --- a/pkgs/development/perl-modules/generic/builder.sh +++ b/pkgs/development/perl-modules/generic/builder.sh @@ -23,7 +23,9 @@ preConfigure() { local flagsArray=() concatTo flagsArray makeMakerFlags - perl Makefile.PL PREFIX=$out INSTALLDIRS=site "${flagsArray[@]}" PERL=$(type -P perl) FULLPERL=\"$fullperl/bin/perl\" + perl Makefile.PL AR=$AR FULL_AR=$AR CC=$CC LD=$CC CPPRUN="$CC -E" \ + PREFIX=$out INSTALLDIRS=site "${flagsArray[@]}" \ + PERL=$(type -P perl) FULLPERL=\"$fullperl/bin/perl\" } if test -n "$perlPreHook"; then From 365e9b3b0b48056067ef942417096b84a31c0b63 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 20 Jan 2025 06:29:55 +0000 Subject: [PATCH 0053/1107] sratom: 0.6.16 - 0.6.18 Changes: https://drobilla.net/2025/01/19/sratom-0-6-18.html --- pkgs/by-name/sr/sratom/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sr/sratom/package.nix b/pkgs/by-name/sr/sratom/package.nix index b92c4d2f67e9..bcff1fc39ee9 100644 --- a/pkgs/by-name/sr/sratom/package.nix +++ b/pkgs/by-name/sr/sratom/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "sratom"; - version = "0.6.16"; + version = "0.6.18"; outputs = [ "out" @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.xz"; - hash = "sha256-ccFXmRGD5T0FVTk7tCccdcm19dq3Sl7yLyCLsi3jIsQ="; + hash = "sha256-TGptngtNbAHMBqiEmRD+zrkuZmyzh3nGFN0kBKmTHpI="; }; strictDeps = true; From ceba2c6c3ba235cbf2b92666ff26d98838db774c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 20 Jan 2025 06:35:33 +0000 Subject: [PATCH 0054/1107] serd: 0.32.2 -> 0.32.4 Changes: https://drobilla.net/2025/01/19/serd-0-32-4.html --- pkgs/by-name/se/serd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/se/serd/package.nix b/pkgs/by-name/se/serd/package.nix index 750591e0f2e2..4c830a3e430e 100644 --- a/pkgs/by-name/se/serd/package.nix +++ b/pkgs/by-name/se/serd/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "serd"; - version = "0.32.2"; + version = "0.32.4"; outputs = [ "out" @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.xz"; - hash = "sha256-333CyW8rod7P11bkWOBh3tfYFY0lVVTnaTSDrAljxWs="; + hash = "sha256-y++1aejbaGvoxpyzhmqVOMfLBV6PJCF91qRHHv+n00k="; }; nativeBuildInputs = [ From 261db7efdc493542cc868e39c602d86658e8080a Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Sun, 19 Jan 2025 12:21:41 +0100 Subject: [PATCH 0055/1107] llvmPackages.openmp: fix cross build --- pkgs/development/compilers/llvm/common/openmp/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/llvm/common/openmp/default.nix b/pkgs/development/compilers/llvm/common/openmp/default.nix index 68c50e06abd3..52e04dd03abc 100644 --- a/pkgs/development/compilers/llvm/common/openmp/default.nix +++ b/pkgs/development/compilers/llvm/common/openmp/default.nix @@ -14,6 +14,7 @@ , clang-unwrapped , perl , pkg-config +, python3 , version , devExtraCmakeFlags ? [] }: @@ -45,6 +46,7 @@ stdenv.mkDerivation (rec { nativeBuildInputs = [ cmake + python3.pythonOnBuildForHost ] ++ lib.optionals (lib.versionAtLeast release_version "15") [ ninja ] ++ [ perl ] ++ lib.optionals (lib.versionAtLeast release_version "14") [ @@ -53,6 +55,7 @@ stdenv.mkDerivation (rec { buildInputs = [ (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) + python3 ]; cmakeFlags = lib.optionals (lib.versions.major release_version == "13") [ From 95f46cf70bdc142b0b7eadfe91b2e8bf8c389aff Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 20 Jan 2025 21:52:41 +0000 Subject: [PATCH 0056/1107] serd: access to `version` via `finalAttrs` --- pkgs/by-name/se/serd/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/se/serd/package.nix b/pkgs/by-name/se/serd/package.nix index 4c830a3e430e..f7deb8c01c13 100644 --- a/pkgs/by-name/se/serd/package.nix +++ b/pkgs/by-name/se/serd/package.nix @@ -13,7 +13,7 @@ writeScript, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "serd"; version = "0.32.4"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://download.drobilla.net/${pname}-${version}.tar.xz"; + url = "https://download.drobilla.net/serd-${finalAttrs.version}.tar.xz"; hash = "sha256-y++1aejbaGvoxpyzhmqVOMfLBV6PJCF91qRHHv+n00k="; }; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { new_version="$(curl -s https://drobilla.net/category/serd/ | pcregrep -o1 'download.drobilla.net/serd-([0-9.]+).tar.xz' | head -n1)" - update-source-version ${pname} "$new_version" + update-source-version ${finalAttrs.pname} "$new_version" ''; }; @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { mainProgram = "serdi"; platforms = lib.platforms.unix; }; -} +}) From 5481eb6b7edceabdac5613a4b2fffd195bf75d6e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 21 Jan 2025 06:32:06 +0000 Subject: [PATCH 0057/1107] libzip: 1.11.2 -> 1.11.3 Changes: https://libzip.org/news/release-1.11.3.html --- pkgs/by-name/li/libzip/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libzip/package.nix b/pkgs/by-name/li/libzip/package.nix index 8a4e56f86065..6c6cbc95c7fc 100644 --- a/pkgs/by-name/li/libzip/package.nix +++ b/pkgs/by-name/li/libzip/package.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libzip"; - version = "1.11.2"; + version = "1.11.3"; src = fetchurl { url = "https://libzip.org/download/libzip-${finalAttrs.version}.tar.gz"; - hash = "sha256-aypDg3AF4cI/3+5TK3j4BoY+QS0gibnEK0mrCMvNdmU="; + hash = "sha256-dmU/E13eMDYDbFAOEYYWSP+/nh/FsjP/RzxgiX2dsOo="; }; outputs = [ From 0662d80a4e138906a4b707437194a16eda0ce36a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Jan 2025 07:50:47 +0000 Subject: [PATCH 0058/1107] dav1d: 1.5.0 -> 1.5.1 --- pkgs/by-name/da/dav1d/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/da/dav1d/package.nix b/pkgs/by-name/da/dav1d/package.nix index a17e26b2981f..144bbe552a20 100644 --- a/pkgs/by-name/da/dav1d/package.nix +++ b/pkgs/by-name/da/dav1d/package.nix @@ -27,13 +27,13 @@ assert useVulkan -> withExamples; stdenv.mkDerivation rec { pname = "dav1d"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "videolan"; repo = pname; rev = version; - hash = "sha256-eOMQj88vlgoxguV+eK4iWXFjUPiXwqRTJlhehev+yGY="; + hash = "sha256-qcs9QoZ/uWEQ8l1ChZ8nYctZnnWJ0VvCw1q2rEktC9g="; }; outputs = [ From f53e20736f23e243c14a8ea6c0e3fa0a0b34ca1b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Jan 2025 10:33:20 +0000 Subject: [PATCH 0059/1107] libmaxminddb: 1.11.0 -> 1.12.2 --- pkgs/by-name/li/libmaxminddb/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libmaxminddb/package.nix b/pkgs/by-name/li/libmaxminddb/package.nix index 539fa33d2c54..ee2d191d7239 100644 --- a/pkgs/by-name/li/libmaxminddb/package.nix +++ b/pkgs/by-name/li/libmaxminddb/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "libmaxminddb"; - version = "1.11.0"; + version = "1.12.2"; src = fetchurl { url = meta.homepage + "/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-su6nmpb+13rU1sOew0/tg9Rfy3WjHFiVaBPVjc8wsZ8="; + sha256 = "sha256-G/v477o+1kYuBOIlkGrVzl/pWKo9YmoSNbKiJT1gB0M="; }; meta = with lib; { From 21548b6325511256de280abad14ea957cb8f832e Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Tue, 21 Jan 2025 15:39:44 +0100 Subject: [PATCH 0060/1107] rquickshare: 0.11.3 -> 0.11.4 --- pkgs/by-name/rq/rquickshare/package.nix | 6 +++--- .../remove-duplicate-versions-of-sys-metrics.patch | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/rq/rquickshare/package.nix b/pkgs/by-name/rq/rquickshare/package.nix index 1cd300f6ba0a..452ccab83135 100644 --- a/pkgs/by-name/rq/rquickshare/package.nix +++ b/pkgs/by-name/rq/rquickshare/package.nix @@ -39,13 +39,13 @@ let in rustPlatform.buildRustPackage rec { pname = "rquickshare" + (app-type-either "" "-legacy"); - version = "0.11.3"; + version = "0.11.4"; src = fetchFromGitHub { owner = "Martichou"; repo = "rquickshare"; tag = "v${version}"; - hash = "sha256-6gXt1UGcjOFInsCep56s3K5Zk/KIz2ZrFlmrgXP7/e8="; + hash = "sha256-Gq78vxM9hJ+dAHM3RAKHtkFIsoV0XQN4vNbOO3amvTs="; }; # from https://github.com/NixOS/nixpkgs/blob/04e40bca2a68d7ca85f1c47f00598abb062a8b12/pkgs/by-name/ca/cargo-tauri/test-app.nix#L23-L26 @@ -66,7 +66,7 @@ rustPlatform.buildRustPackage rec { cargoRoot = "app/${app-type}/src-tauri"; buildAndTestSubdir = cargoRoot; cargoPatches = [ ./remove-duplicate-versions-of-sys-metrics.patch ]; - cargoHash = app-type-either "sha256-R1RDBV8lcEuFdkh9vrNxFRSPSYVOWDvafPQAmQiJV2s=" "sha256-tgnSOICA/AFASIIlxnRoSjq5nx30Z7C6293bcvnWl0k="; + cargoHash = app-type-either "sha256-wraCzzC7YVCXEXBTd8c1cbtCdBunENpUMQ1vZGwfGMs=" "sha256-TBsHlFwbWWa2LEZdmDyz/9vWiFOXKX39PCsjW6OqEGY="; nativeBuildInputs = [ proper-cargo-tauri.hook diff --git a/pkgs/by-name/rq/rquickshare/remove-duplicate-versions-of-sys-metrics.patch b/pkgs/by-name/rq/rquickshare/remove-duplicate-versions-of-sys-metrics.patch index b5128e047838..af1f423857fd 100644 --- a/pkgs/by-name/rq/rquickshare/remove-duplicate-versions-of-sys-metrics.patch +++ b/pkgs/by-name/rq/rquickshare/remove-duplicate-versions-of-sys-metrics.patch @@ -1,5 +1,5 @@ diff --git a/app/legacy/src-tauri/Cargo.lock b/app/legacy/src-tauri/Cargo.lock -index 109db68..c3a70c6 100644 +index 1bba0ae..af24986 100644 --- a/app/legacy/src-tauri/Cargo.lock +++ b/app/legacy/src-tauri/Cargo.lock @@ -4138,7 +4138,7 @@ dependencies = [ @@ -45,7 +45,7 @@ index 109db68..c3a70c6 100644 "core-foundation-sys", "glob", diff --git a/app/legacy/src-tauri/Cargo.toml b/app/legacy/src-tauri/Cargo.toml -index 5468707..68ed47b 100644 +index b971c3d..44abf29 100644 --- a/app/legacy/src-tauri/Cargo.toml +++ b/app/legacy/src-tauri/Cargo.toml @@ -20,7 +20,7 @@ notify-rust = "4.10" @@ -58,7 +58,7 @@ index 5468707..68ed47b 100644 tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } diff --git a/app/main/src-tauri/Cargo.lock b/app/main/src-tauri/Cargo.lock -index c1f175c..7bf1450 100644 +index bc4753a..ed4c7e8 100644 --- a/app/main/src-tauri/Cargo.lock +++ b/app/main/src-tauri/Cargo.lock @@ -4182,7 +4182,7 @@ dependencies = [ @@ -102,7 +102,7 @@ index c1f175c..7bf1450 100644 name = "sys_metrics" version = "0.2.7" diff --git a/app/main/src-tauri/Cargo.toml b/app/main/src-tauri/Cargo.toml -index 90dcc88..56abae2 100644 +index 5653700..5120513 100644 --- a/app/main/src-tauri/Cargo.toml +++ b/app/main/src-tauri/Cargo.toml @@ -20,7 +20,7 @@ notify-rust = "4.10" @@ -111,6 +111,6 @@ index 90dcc88..56abae2 100644 serde_json = "1.0" -sys_metrics = "0.2" +sys_metrics = { git = "https://github.com/Martichou/sys_metrics" } - tauri = { version = "2.2", features = [ "devtools", "tray-icon", "native-tls-vendored"] } + tauri = { version = "2.2", features = [ "devtools", "tray-icon", "native-tls-vendored", "image-png"] } tauri-plugin-autostart = "2.2" tauri-plugin-process = "2.2" From 9f7e3c9d1faf2a45245826580883ce70f2dd3b2e Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Tue, 21 Jan 2025 15:44:50 +0100 Subject: [PATCH 0061/1107] rquickshare-legacy: don't set `updateScript` Even when it was set to null, r-ryantm still picked it up. --- pkgs/by-name/rq/rquickshare/package.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/rq/rquickshare/package.nix b/pkgs/by-name/rq/rquickshare/package.nix index 452ccab83135..9a2102a9affb 100644 --- a/pkgs/by-name/rq/rquickshare/package.nix +++ b/pkgs/by-name/rq/rquickshare/package.nix @@ -97,17 +97,16 @@ rustPlatform.buildRustPackage rec { libsoup_2_4 ]; - passthru.updateScript = - let + passthru = + # Don't set an update script for the legacy version + # so r-ryantm won't create two duplicate PRs + lib.optionalAttrs (app-type == "main") { updateScript = writeShellScript "update-rquickshare.sh" '' ${lib.getExe nix-update} rquickshare sed -i 's/version = "0.0.0";/' pkgs/by-name/rq/rquickshare/package.nix ${lib.getExe nix-update} rquickshare-legacy ''; - in - # Don't set an update script for the legacy version - # so r-ryantm won't create two duplicate PRs - app-type-either updateScript null; + }; meta = { description = "Rust implementation of NearbyShare/QuickShare from Android for Linux and macOS"; From 0ac2e31b54cb69a7229b33e6b100d4a7f43278f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Jan 2025 15:29:18 +0000 Subject: [PATCH 0062/1107] libipt: 2.1.1 -> 2.1.2 --- pkgs/by-name/li/libipt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libipt/package.nix b/pkgs/by-name/li/libipt/package.nix index 73f14cec3603..8b2baaad6ce1 100644 --- a/pkgs/by-name/li/libipt/package.nix +++ b/pkgs/by-name/li/libipt/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "libipt"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "intel"; repo = "libipt"; rev = "v${version}"; - sha256 = "sha256-tyOheitSlccf/n3mklGL2oAKLBKYT60LSLre9/G/b9Q="; + sha256 = "sha256-rO2Mf2/BfKlPh1wHe0qTuyQAyqpSB/j3Q+JWpNDyNm0="; }; nativeBuildInputs = [ cmake ]; From c1094176e863f8ab9518942fe04324a5241ca6b3 Mon Sep 17 00:00:00 2001 From: Rowan Goemans Date: Tue, 21 Jan 2025 14:43:41 +0100 Subject: [PATCH 0063/1107] pyquaternion: Patch for numpy2 support --- .../python-modules/pyquaternion/default.nix | 4 ++ .../pyquaternion/numpy2-repr.patch | 68 +++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 pkgs/development/python-modules/pyquaternion/numpy2-repr.patch diff --git a/pkgs/development/python-modules/pyquaternion/default.nix b/pkgs/development/python-modules/pyquaternion/default.nix index fab1e6c4f8cc..f3e1212d9847 100644 --- a/pkgs/development/python-modules/pyquaternion/default.nix +++ b/pkgs/development/python-modules/pyquaternion/default.nix @@ -19,6 +19,10 @@ buildPythonPackage rec { hash = "sha256-L0wT9DFUDRcmmN7OpmIDNvtQWQrM7iFnZt6R2xrJ+3A="; }; + patches = [ + ./numpy2-repr.patch + ]; + # The VERSION.txt file is required for setup.py # See: https://github.com/KieranWynn/pyquaternion/blob/master/setup.py#L14-L15 postPatch = '' diff --git a/pkgs/development/python-modules/pyquaternion/numpy2-repr.patch b/pkgs/development/python-modules/pyquaternion/numpy2-repr.patch new file mode 100644 index 000000000000..a420002a2303 --- /dev/null +++ b/pkgs/development/python-modules/pyquaternion/numpy2-repr.patch @@ -0,0 +1,68 @@ +diff --git a/pyquaternion/test/test_quaternion.py b/pyquaternion/test/test_quaternion.py +index f56afff..7178b52 100644 +--- a/pyquaternion/test/test_quaternion.py ++++ b/pyquaternion/test/test_quaternion.py +@@ -50,6 +50,16 @@ ALMOST_EQUAL_TOLERANCE = 13 + def randomElements(): + return tuple(np.random.uniform(-1, 1, 4)) + ++# In numpy 2, repr(np.float64(0.123)) becomes "np.float64(0.123)" ++# which means it's not directly a parseable float. In numpy 1 that ++# used to be the case. This hack papers over that ++def repr_np(x): ++ has_item = hasattr(x, 'item') ++ if isinstance(x, np.generic) and has_item: ++ return repr(x.item()) ++ else: ++ return repr(x) ++ + class TestQuaternionInitialisation(unittest.TestCase): + + def test_init_default(self): +@@ -77,7 +87,7 @@ class TestQuaternionInitialisation(unittest.TestCase): + def test_init_from_scalar(self): + s = random() + q1 = Quaternion(s) +- q2 = Quaternion(repr(s)) ++ q2 = Quaternion(repr_np(s)) + self.assertIsInstance(q1, Quaternion) + self.assertIsInstance(q2, Quaternion) + self.assertEqual(q1, Quaternion(s, 0.0, 0.0, 0.0)) +@@ -90,8 +100,8 @@ class TestQuaternionInitialisation(unittest.TestCase): + def test_init_from_elements(self): + a, b, c, d = randomElements() + q1 = Quaternion(a, b, c, d) +- q2 = Quaternion(repr(a), repr(b), repr(c), repr(d)) +- q3 = Quaternion(a, repr(b), c, d) ++ q2 = Quaternion(repr_np(a), repr_np(b), repr_np(c), repr_np(d)) ++ q3 = Quaternion(a, repr_np(b), c, d) + self.assertIsInstance(q1, Quaternion) + self.assertIsInstance(q2, Quaternion) + self.assertIsInstance(q3, Quaternion) +@@ -154,7 +164,7 @@ class TestQuaternionInitialisation(unittest.TestCase): + def test_init_from_explicit_elements(self): + e1, e2, e3, e4 = randomElements() + q1 = Quaternion(w=e1, x=e2, y=e3, z=e4) +- q2 = Quaternion(a=e1, b=repr(e2), c=e3, d=e4) ++ q2 = Quaternion(a=e1, b=repr_np(e2), c=e3, d=e4) + q3 = Quaternion(a=e1, i=e2, j=e3, k=e4) + q4 = Quaternion(a=e1) + self.assertIsInstance(q1, Quaternion) +@@ -525,7 +535,7 @@ class TestQuaternionArithmetic(unittest.TestCase): + q3 = q1 + self.assertEqual(q1 * s, q2) # post-multiply by scalar + self.assertEqual(s * q1, q2) # pre-multiply by scalar +- q3 *= repr(s) ++ q3 *= repr_np(s) + self.assertEqual(q3, q2) + + def test_multiply_incorrect_type(self): +@@ -595,7 +605,7 @@ class TestQuaternionArithmetic(unittest.TestCase): + with self.assertRaises(ZeroDivisionError): + s / q1 + +- q3 /= repr(s) ++ q3 /= repr_np(s) + self.assertEqual(q3, q2) + + with self.assertRaises(ZeroDivisionError): From 0f126632da421a8c7da53d3e411a4c10bbcbca18 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 22 Jan 2025 06:34:54 +0000 Subject: [PATCH 0064/1107] coreutils: 9.5 -> 9.6 Changes: https://savannah.gnu.org/news/?id=10715 --- pkgs/tools/misc/coreutils/default.nix | 17 +------ .../fix-mix-flags-deps-libintl.patch | 49 ------------------- .../coreutils/fix-test-failure-musl.patch | 23 --------- 3 files changed, 2 insertions(+), 87 deletions(-) delete mode 100644 pkgs/tools/misc/coreutils/fix-mix-flags-deps-libintl.patch delete mode 100644 pkgs/tools/misc/coreutils/fix-test-failure-musl.patch diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index d7ce076e8a85..9e841d6338c9 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -48,26 +48,13 @@ let in stdenv.mkDerivation rec { pname = "coreutils" + (optionalString (!minimal) "-full"); - version = "9.5"; + version = "9.6"; src = fetchurl { url = "mirror://gnu/coreutils/coreutils-${version}.tar.xz"; - hash = "sha256-zTKO3qyS9qZl3p8yPJO3Eq8YWLwuDYjz9xAEaUcKG4o="; + hash = "sha256-egEkMns5j9nrGmq95YM4mCFCLHRP+hBzSyT1V2ENMoM="; }; - patches = - [ - # https://lists.gnu.org/archive/html/bug-coreutils/2024-05/msg00037.html - # This is not precisely the patch provided - this is a diff of the Makefile.in - # after the patch was applied and autoreconf was run, since adding autoreconf - # here causes infinite recursion. - ./fix-mix-flags-deps-libintl.patch - ] - ++ lib.optionals stdenv.hostPlatform.isMusl [ - # https://lists.gnu.org/archive/html/bug-coreutils/2024-03/msg00089.html - ./fix-test-failure-musl.patch - ]; - postPatch = '' # The test tends to fail on btrfs, f2fs and maybe other unusual filesystems. diff --git a/pkgs/tools/misc/coreutils/fix-mix-flags-deps-libintl.patch b/pkgs/tools/misc/coreutils/fix-mix-flags-deps-libintl.patch deleted file mode 100644 index f6002b55faf6..000000000000 --- a/pkgs/tools/misc/coreutils/fix-mix-flags-deps-libintl.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- a/Makefile.in 2024-05-21 17:03:50.488979000 -0700 -+++ b/Makefile.in 2024-05-21 17:18:56.243091000 -0700 -@@ -692,8 +692,6 @@ - @USE_PCLMUL_CRC32_TRUE@am__append_211 = $(cksum_pclmul_ldadd) - @USE_AVX2_WC_LINECOUNT_TRUE@am__append_212 = src/libwc_avx2.a - @USE_AVX2_WC_LINECOUNT_TRUE@am__append_213 = $(wc_avx2_ldadd) --@SINGLE_BINARY_FALSE@src_coreutils_DEPENDENCIES = \ --@SINGLE_BINARY_FALSE@ $(am__DEPENDENCIES_2) - # Command arch - # Command hostname - # Command chroot -@@ -2825,6 +2823,12 @@ - nodist_src_coreutils_OBJECTS = - src_coreutils_OBJECTS = $(am_src_coreutils_OBJECTS) \ - $(nodist_src_coreutils_OBJECTS) -+@SINGLE_BINARY_FALSE@src_coreutils_DEPENDENCIES = \ -+@SINGLE_BINARY_FALSE@ $(am__DEPENDENCIES_2) -+@SINGLE_BINARY_TRUE@src_coreutils_DEPENDENCIES = \ -+@SINGLE_BINARY_TRUE@ $(am__DEPENDENCIES_1) \ -+@SINGLE_BINARY_TRUE@ $(am__DEPENDENCIES_2) \ -+@SINGLE_BINARY_TRUE@ $(am__DEPENDENCIES_1) - src_coreutils_LINK = $(CCLD) $(src_coreutils_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ - am__objects_221 = src/copy.$(OBJEXT) src/cp-hash.$(OBJEXT) \ -@@ -7492,7 +7496,12 @@ - src_libstdbuf_so_CFLAGS = -fPIC $(AM_CFLAGS) - # Single binary dependencies - @SINGLE_BINARY_TRUE@src_coreutils_CFLAGS = -DSINGLE_BINARY $(AM_CFLAGS) --@SINGLE_BINARY_TRUE@src_coreutils_DEPENDENCIES = $(LDADD) $(single_binary_deps) -+ -+# Creates symlinks or shebangs to the installed programs when building -+# coreutils single binary. -+@SINGLE_BINARY_TRUE@EXTRA_src_coreutils_DEPENDENCIES = \ -+@SINGLE_BINARY_TRUE@ $(single_binary_deps) \ -+@SINGLE_BINARY_TRUE@ src/coreutils_$(single_binary_install_type) - @SINGLE_BINARY_TRUE@src_libsinglebin_dir_a_DEPENDENCIES = src/libsinglebin_ls.a - @SINGLE_BINARY_TRUE@src_libsinglebin_vdir_a_DEPENDENCIES = src/libsinglebin_ls.a - @SINGLE_BINARY_TRUE@src_libsinglebin_arch_a_DEPENDENCIES = src/libsinglebin_uname.a -@@ -7880,10 +7889,6 @@ - @SINGLE_BINARY_TRUE@src_libsinglebin_yes_a_DEPENDENCIES = $(src_yes_DEPENDENCIES) - @SINGLE_BINARY_TRUE@src_libsinglebin_yes_a_CFLAGS = "-Dmain=single_binary_main_yes (int, char **); int single_binary_main_yes" -Dusage=_usage_yes $(src_coreutils_CFLAGS) - --# Creates symlinks or shebangs to the installed programs when building --# coreutils single binary. --@SINGLE_BINARY_TRUE@EXTRA_src_coreutils_DEPENDENCIES = src/coreutils_$(single_binary_install_type) -- - # false exits nonzero even with --help or --version. - # test doesn't support --help or --version. - # Tell automake to exempt then from that installcheck test. diff --git a/pkgs/tools/misc/coreutils/fix-test-failure-musl.patch b/pkgs/tools/misc/coreutils/fix-test-failure-musl.patch deleted file mode 100644 index 2d54dd27ab3f..000000000000 --- a/pkgs/tools/misc/coreutils/fix-test-failure-musl.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 1defda6356c29c7f731bddb9e9231f594e01d9c9 -(adjusted so it can be applied on coreutils to coreutils tarball) - -Reported by Adept's Lab via Pádraig Brady at -. - -diff --git a/gnulib-tests/test-canonicalize.c b/gnulib-tests/test-canonicalize.c -index 6763a525c9..5d19285c00 100644 ---- a/gnulib-tests/test-canonicalize.c -+++ b/gnulib-tests/test-canonicalize.c -@@ -394,9 +394,9 @@ main (void) - ASSERT (stat ("/", &st1) == 0); - ASSERT (stat ("//", &st2) == 0); - bool same = psame_inode (&st1, &st2); --#if defined __MVS__ || defined MUSL_LIBC -- /* On IBM z/OS and musl libc, "/" and "//" both canonicalize to -- themselves, yet they both have st_dev == st_ino == 1. */ -+#if defined __MVS__ -+ /* On IBM z/OS, "/" and "//" both canonicalize to themselves, yet they both -+ have st_dev == st_ino == 1. */ - same = false; - #endif - if (same) From 702d03842740b572ee77bfb3d949ef0929a756d5 Mon Sep 17 00:00:00 2001 From: misilelaboratory Date: Wed, 22 Jan 2025 21:07:33 +0900 Subject: [PATCH 0065/1107] perl: 5.40.0 -> 5.40.1 Signed-off-by: misilelaboratory --- pkgs/development/interpreters/perl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 8fd99172be10..3c27f488b361 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -65,8 +65,8 @@ in rec { # Maint version perl540 = callPackage ./interpreter.nix { self = perl540; - version = "5.40.0"; - sha256 = "sha256-x0A0jzVzljJ6l5XT6DI7r9D+ilx4NfwcuroMyN/nFh8="; + version = "5.40.1"; + sha256 = "sha256-AvjEW7N57Qw951FPrUjHFP1Gvo8LU2v9UyAFAWWh7iY="; inherit passthruFun; }; } From 20a84908cd1b6c1554d96b12dac241b936555992 Mon Sep 17 00:00:00 2001 From: misilelaboratory Date: Thu, 23 Jan 2025 01:17:13 +0900 Subject: [PATCH 0066/1107] iproute2: 6.12.0 -> 6.13.0 Signed-off-by: misilelaboratory --- pkgs/by-name/ip/iproute2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ip/iproute2/package.nix b/pkgs/by-name/ip/iproute2/package.nix index d1b963a26035..ab192d828ea3 100644 --- a/pkgs/by-name/ip/iproute2/package.nix +++ b/pkgs/by-name/ip/iproute2/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "iproute2"; - version = "6.12.0"; + version = "6.13.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-u9FB73tdASfMIVKEO6YfJ03DKBT6Pg8T59B6CAvvU9k="; + hash = "sha256-pDqkMzjYgrRNAeVJ8/EFqSrp/uoyqC+uRaiOekkwKBk="; }; patches = [ From f5bc15e449594009d67dbb5b02103e1d9c018252 Mon Sep 17 00:00:00 2001 From: misilelaboratory Date: Thu, 23 Jan 2025 02:45:48 +0900 Subject: [PATCH 0067/1107] perl538: 5.38.2 -> 5.38.3 Signed-off-by: misilelaboratory --- pkgs/development/interpreters/perl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 3c27f488b361..5c9034a0472a 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -57,8 +57,8 @@ in rec { # Maint version perl538 = callPackage ./interpreter.nix { self = perl538; - version = "5.38.2"; - sha256 = "sha256-oKMVNEUet7g8fWWUpJdUOlTUiLyQygD140diV39AZV4="; + version = "5.38.3"; + sha256 = "sha256-ioAzhZ3R116wyRWO7dc4TfGva0aipOhQc7B+bMfFuHM="; inherit passthruFun; }; From cebe2f93e3bab3fce1c10e9e51ff108bd3169732 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 23 Jan 2025 06:18:41 +0000 Subject: [PATCH 0068/1107] mupdf: 1.25.2 -> 1.25.3 Changes: https://mupdf.com/releases/history --- pkgs/by-name/mu/mupdf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mu/mupdf/package.nix b/pkgs/by-name/mu/mupdf/package.nix index 93839bb44023..79fc67987ca6 100644 --- a/pkgs/by-name/mu/mupdf/package.nix +++ b/pkgs/by-name/mu/mupdf/package.nix @@ -62,12 +62,12 @@ let in stdenv.mkDerivation rec { - version = "1.25.2"; + version = "1.25.3"; pname = "mupdf"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; - hash = "sha256-Nsz2peaR4Yis+NtumNCL8F8nu0zjBDLcFfx20ympLU0="; + hash = "sha256-uXTXBqloBTPRBLQRIiTHvz3pPye+fKQbS/tRVSYk8Kk="; }; patches = [ From 78a09ac680cb37ef934165195d6fbefd23adcaef Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 18 Jan 2025 06:54:44 +0000 Subject: [PATCH 0069/1107] pahole: 1.27 -> 1.29 Changes: - https://lore.kernel.org/bpf/Z1RcnB8WD8wZphcr@x1/T/ - https://lore.kernel.org/bpf/Z4-TDt42dTKZvCo6@x1/T/ --- pkgs/by-name/pa/pahole/package.nix | 18 +++--------------- .../pa/pahole/threading-reproducibility.patch | 6 ++---- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/pa/pahole/package.nix b/pkgs/by-name/pa/pahole/package.nix index 444b165cb80d..b75d39b34f57 100644 --- a/pkgs/by-name/pa/pahole/package.nix +++ b/pkgs/by-name/pa/pahole/package.nix @@ -10,15 +10,14 @@ argp-standalone, musl-obstack, nixosTests, - fetchpatch, }: stdenv.mkDerivation rec { pname = "pahole"; - version = "1.27"; + version = "1.29"; src = fetchzip { url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-${version}.tar.gz"; - hash = "sha256-BwA17lc2yegmOzLfoIu8OmG/PVdc+4sOGzB8Jc4ZjGM="; + hash = "sha256-ke7WIIz0ZURw3Pgmt7WNL9WPbcv5B998Rflw/8/JQ8U="; }; nativeBuildInputs = [ @@ -39,22 +38,11 @@ stdenv.mkDerivation rec { patches = [ # https://github.com/acmel/dwarves/pull/51 / https://lkml.kernel.org/r/20240626032253.3406460-1-asmadeus@codewreck.org ./threading-reproducibility.patch - # https://github.com/acmel/dwarves/issues/53 - (fetchpatch { - name = "fix-clang-btf-generation-bug.patch"; - url = "https://github.com/acmel/dwarves/commit/6a2b27c0f512619b0e7a769a18a0fb05bb3789a5.patch"; - hash = "sha256-Le1BAew/a/QKkYNLgSQxEvZ9mEEglUw8URwz1kiheeE="; - }) - (fetchpatch { - name = "fix-clang-btf-generation-bug-2.patch"; - url = "https://github.com/acmel/dwarves/commit/94a01bde592c555b3eb526aeb4c2ad695c5660d8.patch"; - hash = "sha256-SMIxLEBjBkprAqVNX1h7nXxAsgbwvCD/Bz7c1ekwg5w="; - }) ]; # Put libraries in "lib" subdirectory, not top level of $out cmakeFlags = [ - "-D__LIB=lib" + "-DCMAKE_INSTALL_LIBDIR=lib" "-DLIBBPF_EMBEDDED=OFF" ]; diff --git a/pkgs/by-name/pa/pahole/threading-reproducibility.patch b/pkgs/by-name/pa/pahole/threading-reproducibility.patch index 3c76d9c8521e..0cc9a6154407 100644 --- a/pkgs/by-name/pa/pahole/threading-reproducibility.patch +++ b/pkgs/by-name/pa/pahole/threading-reproducibility.patch @@ -1,5 +1,3 @@ -diff --git a/pahole.c b/pahole.c -index 954498d2ad4f..2b010658330c 100644 --- a/pahole.c +++ b/pahole.c @@ -3705,6 +3705,10 @@ int main(int argc, char *argv[]) @@ -10,6 +8,6 @@ index 954498d2ad4f..2b010658330c 100644 + if (getenv("SOURCE_DATE_EPOCH")) + conf_load.reproducible_build = true; + - if (languages.str && parse_languages()) - return rc; + if (show_running_kernel_vmlinux) { + const char *vmlinux = vmlinux_path__find_running_kernel(); From 42d80b7a7ec5e116b165d82ba27bce57ecda36c2 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 23 Jan 2025 06:41:32 +0000 Subject: [PATCH 0070/1107] python3Packages.pymupdf: 1.25.1 -> 1.25.2 Changes: https://github.com/pymupdf/PyMuPDF/releases/tag/1.25.2 --- .../python-modules/pymupdf/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index b73c6bd05998..c05baaa6c444 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + fetchpatch, python, # build-system @@ -41,7 +42,7 @@ let in buildPythonPackage rec { pname = "pymupdf"; - version = "1.25.1"; + version = "1.25.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -50,9 +51,19 @@ buildPythonPackage rec { owner = "pymupdf"; repo = "PyMuPDF"; tag = version; - hash = "sha256-kdu8CuQJ5+h8+PS66acWEfcttgALiD+JBoWWyGtjBzs="; + hash = "sha256-6XbHQ8PE9IF0kngUhYkFSGjwgt+r+19v+PeDAQin2Ko="; }; + patches = [ + # Fix build against mupdf-1.25.3: + # https://github.com/pymupdf/PyMuPDF/pull/4248 + (fetchpatch { + name = "mupdf-1.25.3.patch"; + url = "https://github.com/pymupdf/PyMuPDF/commit/f42ef85058fee087d3f5e565f34a7657aad11240.patch"; + hash = "sha256-X5JF8nPLj4uubdEdvUJ5aEf0yZkW+ks99pzua0vCrZc="; + }) + ]; + # swig is not wrapped as Python package # libclang calls itself just clang in wheel metadata postPatch = '' From 9f93116aa0684a19a83bc971841893dc87c98bd7 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 23 Jan 2025 13:14:46 +0800 Subject: [PATCH 0071/1107] boost: fix operator<< for shared_ptr and intrusive_ptr --- pkgs/development/libraries/boost/generic.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 593c8b8deddf..64194a509446 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -222,6 +222,15 @@ stdenv.mkDerivation { extraPrefix = "libs/python/"; hash = "sha256-0IHK55JSujYcwEVOuLkwOa/iPEkdAKQlwVWR42p/X2U="; }) + ] + ++ lib.optional (lib.versionAtLeast version "1.87") [ + # Fix operator<< for shared_ptr and intrusive_ptr + # https://github.com/boostorg/smart_ptr/issues/115 + (fetchpatch { + url = "https://github.com/boostorg/smart_ptr/commit/e7433ba54596da97cb7859455cd37ca140305a9c.patch"; + relative = "include"; + hash = "sha256-9JvKQOAB19wQpWLNAhuB9eL8qKqXWTQHAJIXdLYMNG8="; + }) ]; meta = with lib; { From e0c1131f01d67a443e75c263b793b9ca5a8e9dd9 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 23 Jan 2025 17:11:40 +0800 Subject: [PATCH 0072/1107] wlroots: clear up --- pkgs/development/libraries/wlroots/default.nix | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index a219181feaed..4855e6a4b220 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -72,10 +72,14 @@ let pkg-config wayland-scanner glslang + hwdata ] ++ extraNativeBuildInputs; buildInputs = [ + ffmpeg + libliftoff + libdisplay-info libGL libcap libinput @@ -149,26 +153,12 @@ rec { wlroots_0_17 = generic { version = "0.17.4"; hash = "sha256-AzmXf+HMX/6VAr0LpfHwfmDB9dRrrLQHt7l35K98MVo="; - extraNativeBuildInputs = [ - hwdata - ]; - extraBuildInputs = [ - ffmpeg - libliftoff - libdisplay-info - ]; }; wlroots_0_18 = generic { version = "0.18.2"; hash = "sha256-vKvMWRPPJ4PRKWVjmKKCdNSiqsQm+uQBoBnBUFElLNA="; - extraNativeBuildInputs = [ - hwdata - ]; extraBuildInputs = [ - ffmpeg - libliftoff - libdisplay-info lcms2 ]; }; From a9d5785365b8fc79189b924143b062ce062b1825 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Tue, 21 Jan 2025 16:35:39 +0100 Subject: [PATCH 0073/1107] protobuf: add hook to provide protoc path --- .../libraries/protobuf/generic.nix | 23 +++++++++++-------- .../libraries/protobuf/setup-hook.sh | 9 ++++++++ 2 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 pkgs/development/libraries/protobuf/setup-hook.sh diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index f8cfa4daff03..d528262e3180 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -13,6 +13,7 @@ zlib, version, hash, + replaceVars, versionCheckHook, # downstream dependencies @@ -36,9 +37,9 @@ stdenv.mkDerivation (finalAttrs: { inherit hash; }; - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionOlder version "29") '' substituteInPlace src/google/protobuf/testing/googletest.cc \ - --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' + --replace-fail 'tmpnam(b)' '"'$TMPDIR'/foo"' ''; patches = lib.optionals (lib.versionOlder version "22") [ @@ -50,15 +51,17 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - nativeBuildInputs = - [ - cmake - ] - ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - # protoc of the same version must be available for build. For non-cross builds, it's able to - # re-use the executable generated as part of the build + # hook to provide the path to protoc executable, used at build time + build_protobuf = + if (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) then buildPackages."protobuf_${lib.versions.major version}" - ]; + else + (placeholder "out"); + setupHook = ./setup-hook.sh; + + nativeBuildInputs = [ + cmake + ]; buildInputs = [ gtest diff --git a/pkgs/development/libraries/protobuf/setup-hook.sh b/pkgs/development/libraries/protobuf/setup-hook.sh new file mode 100644 index 000000000000..a41f112ab2aa --- /dev/null +++ b/pkgs/development/libraries/protobuf/setup-hook.sh @@ -0,0 +1,9 @@ +ProtobufCMakeFlags() { + cmakeFlagsArray+=( + -DPROTOC_EXE="@build_protobuf@/bin/protoc" + -DProtobuf_PROTOC_EXE="@build_protobuf@/bin/protoc" + -DProtobuf_PROTOC_EXECUTABLE="@build_protobuf@/bin/protoc" + ) +} + +preConfigureHooks+=(ProtobufCMakeFlags) From 26d1630bae2ca44958a40ae81cf8de900738a163 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Tue, 21 Jan 2025 16:35:39 +0100 Subject: [PATCH 0074/1107] opencv4: use latest protobuf, remove no longer needed cross fix --- pkgs/development/libraries/opencv/4.x.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index e05c1f65dd12..dc7883b27c88 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -12,7 +12,7 @@ , glib , glog , gflags -, protobuf_21 +, protobuf_29 , config , ocl-icd , buildPackages @@ -308,7 +308,7 @@ effectiveStdenv.mkDerivation { glib glog pcre2 - protobuf_21 + protobuf_29 zlib ] ++ optionals enablePython [ pythonPackages.python @@ -419,7 +419,6 @@ effectiveStdenv.mkDerivation { (cmakeBool "OPENCV_GENERATE_PKGCONFIG" true) (cmakeBool "WITH_OPENMP" true) (cmakeBool "BUILD_PROTOBUF" false) - (cmakeOptionType "path" "Protobuf_PROTOC_EXECUTABLE" (getExe buildPackages.protobuf_21)) (cmakeBool "PROTOBUF_UPDATE_FILES" true) (cmakeBool "OPENCV_ENABLE_NONFREE" enableUnfree) (cmakeBool "BUILD_TESTS" runAccuracyTests) From 40a3a48d08143ab7f0e8481658bae69d872d048e Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Tue, 21 Jan 2025 16:35:39 +0100 Subject: [PATCH 0075/1107] monero-gui: use latest protobuf --- pkgs/applications/blockchains/monero-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 57c949f451f3..790f691b79b2 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -30,7 +30,7 @@ trezorSupport ? true, hidapi, libusb1, - protobuf_21, + protobuf, python3, udev, }: @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { ++ lib.optionals trezorSupport [ hidapi libusb1 - protobuf_21 + protobuf python3 ] ++ lib.optionals (trezorSupport && stdenv.hostPlatform.isLinux) [ From fc29afa6fcfc60f1ee7402f94b8947c1c92fe717 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Tue, 21 Jan 2025 16:35:39 +0100 Subject: [PATCH 0076/1107] monero-cli: use latest protobuf, mark cross as broken --- pkgs/applications/blockchains/monero-cli/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/monero-cli/default.nix b/pkgs/applications/blockchains/monero-cli/default.nix index 0b4f90b2313f..e39d5374b9ad 100644 --- a/pkgs/applications/blockchains/monero-cli/default.nix +++ b/pkgs/applications/blockchains/monero-cli/default.nix @@ -23,7 +23,7 @@ trezorSupport ? true, hidapi, libusb1, - protobuf_21, + protobuf, udev, }: @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { python3 hidapi libusb1 - protobuf_21 + protobuf ] ++ lib.optionals (trezorSupport && stdenv.hostPlatform.isLinux) [ udev ]; @@ -138,5 +138,7 @@ stdenv.mkDerivation rec { rnhmjoj ]; mainProgram = "monero-wallet-cli"; + # internal build tool generate_translations_header is tricky to compile for the build platform + broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; }; } From 5db6786f743af2003666820fd1e164f400c54e9e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 23 Jan 2025 22:56:52 +0000 Subject: [PATCH 0077/1107] mc: 4.8.32 -> 4.8.33 Changes: https://midnight-commander.org/wiki/NEWS-4.8.33 --- pkgs/applications/file-managers/mc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/file-managers/mc/default.nix b/pkgs/applications/file-managers/mc/default.nix index 80e929eb7160..0dd6b8c9418e 100644 --- a/pkgs/applications/file-managers/mc/default.nix +++ b/pkgs/applications/file-managers/mc/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "mc"; - version = "4.8.32"; + version = "4.8.33"; src = fetchurl { url = "https://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz"; - hash = "sha256-TdyD0e3pryNjs+q5h/VLh89mGTJBEM4tOg5wlE0TWf4="; + hash = "sha256-yuFJ1C+ETlGF2MgdfbOROo+iFMZfhSIAqdiWtGivFkw="; }; nativeBuildInputs = From 3ba60f2e504b3677e25e865eb836e1741e2ae4e8 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 24 Jan 2025 06:33:18 +0000 Subject: [PATCH 0078/1107] aws-c-auth: 0.8.0 -> 0.8.1 Changes: https://github.com/awslabs/aws-c-auth/releases/tag/v0.8.1 --- pkgs/by-name/aw/aws-c-auth/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/aw/aws-c-auth/package.nix b/pkgs/by-name/aw/aws-c-auth/package.nix index dc840631bffb..d915ec34e562 100644 --- a/pkgs/by-name/aw/aws-c-auth/package.nix +++ b/pkgs/by-name/aw/aws-c-auth/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "aws-c-auth"; # nixpkgs-update: no auto update - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-auth"; rev = "v${version}"; - hash = "sha256-wVHTfiAejAra8LnytxSJijUXHDmEwAj5D+wXOKq32B4="; + hash = "sha256-p8D79BRjaPlhzap/FWbqMlkrbVELSgeJW8CljxBAaCI="; }; nativeBuildInputs = [ From 1c4cadc0a81f534b997af6e48ffd51dc5a90824f Mon Sep 17 00:00:00 2001 From: misilelab Date: Sat, 11 Jan 2025 18:49:57 +0900 Subject: [PATCH 0079/1107] cmake: 3.13.3 -> 3.13.5 Signed-off-by: misilelaboratory --- pkgs/by-name/cm/cmake/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix index cae5089ffdfc..0ca8cf87762d 100644 --- a/pkgs/by-name/cm/cmake/package.nix +++ b/pkgs/by-name/cm/cmake/package.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString isMinimalBuild "-minimal" + lib.optionalString cursesUI "-cursesUI" + lib.optionalString qt5UI "-qt5UI"; - version = "3.31.3"; + version = "3.31.5"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-+sRbxtQQtJsxE6uGYHSIjWyencgaFBh0RG6yOaw4y4c="; + hash = "sha256-ZvtToUVki+VrRvqejMreOk0N/JLkAeUs52va0f6kPSc="; }; patches = [ From 85a56d3848425e40baa2f633054be3597f373c01 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 25 Jan 2025 06:57:39 +0000 Subject: [PATCH 0080/1107] gumbo: 0.12.3 -> 0.13.0 Changes: https://codeberg.org/gumbo-parser/gumbo-parser/releases/tag/0.13.0 --- pkgs/by-name/gu/gumbo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gu/gumbo/package.nix b/pkgs/by-name/gu/gumbo/package.nix index c4e674255837..21886b96e9ed 100644 --- a/pkgs/by-name/gu/gumbo/package.nix +++ b/pkgs/by-name/gu/gumbo/package.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "gumbo"; - version = "0.12.3"; + version = "0.13.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "gumbo-parser"; repo = "gumbo-parser"; rev = version; - hash = "sha256-C5+MCQ/hC+lfjxPykiAJspYQtI1G7/mFa4XlPrDJl/c="; + hash = "sha256-QpGOBKNPBryCXZKKEQMv9TXJiNyXESBFiR4wM0lmjiI="; }; nativeBuildInputs = [ autoreconfHook ]; From 6b0a29262ac82255a8e06ec807bf3fca22527c8b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 25 Jan 2025 06:59:47 +0000 Subject: [PATCH 0081/1107] gumbo: enable parallel building --- pkgs/by-name/gu/gumbo/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/gu/gumbo/package.nix b/pkgs/by-name/gu/gumbo/package.nix index 21886b96e9ed..d7506c58c544 100644 --- a/pkgs/by-name/gu/gumbo/package.nix +++ b/pkgs/by-name/gu/gumbo/package.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; + enableParallelBuilding = true; + meta = with lib; { description = "C99 HTML parsing algorithm"; homepage = "https://codeberg.org/gumbo-parser/gumbo-parser"; From e4c372b37683624290712d7541437f8c06362bb3 Mon Sep 17 00:00:00 2001 From: macronova Date: Sat, 25 Jan 2025 15:59:17 +0800 Subject: [PATCH 0082/1107] Update patch --- .../wallpaper-engine-plugin/default.nix | 45 +++++++++---------- .../wallpaper-engine-plugin/nix-plugin.patch | 14 +++--- 2 files changed, 27 insertions(+), 32 deletions(-) diff --git a/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix b/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix index 38bf59f909ab..663624b51dfb 100644 --- a/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix +++ b/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix @@ -17,17 +17,17 @@ }: mkKdeDerivation { pname = "wallpaper-engine-kde-plugin"; - version = "0.5.5-unstable-2024-06-16"; + version = "0.5.5-unstable-2024-11-03"; src = fetchFromGitHub { owner = "catsout"; repo = "wallpaper-engine-kde-plugin"; - rev = "1e604105c586c7938c5b2c19e3dc8677b2eb4bb4"; - hash = "sha256-bKGQxyS8gUi+37lODLVHphMoQwLKZt/hpSjR5MN+5GA="; + rev = "ed58dd8b920dbb2bf0859ab64e0b5939b8a32a0e"; + hash = "sha256-ICQLtw+qaOMf0lkqKegp+Dkl7eUgPqKDn8Fj5Osb7eA="; fetchSubmodules = true; }; - patches = [ ./nix-plugin.patch ]; + patches = [./nix-plugin.patch]; extraNativeBuildInputs = [ kpackage @@ -42,33 +42,28 @@ mkKdeDerivation { ]; extraCmakeFlags = [ - "-DQML2_CMAKE_PATH=${ - lib.makeSearchPath "lib/qt-6/qml" [ - qtmultimedia - qtwebchannel - qtwebengine - qtwebsockets - ] - }" - "-DQt6_DIR=${qtbase}/lib/cmake/Qt6" - "-DUSE_PLASMAPKG=ON" + (lib.cmakeFeature "QML_LIB" (lib.makeSearchPathOutput "out" "lib/qt-6/qml" [ + qtmultimedia + qtwebchannel + qtwebengine + qtwebsockets + ])) + (lib.cmakeFeature "Qt6_DIR" "${qtbase}/lib/cmake/Qt6") ]; - postInstall = - let - py3-ws = python3.withPackages (ps: with ps; [ websockets ]); - in - '' - cd ../plugin - PATH=${py3-ws}/bin:$PATH patchShebangs --build ./contents/pyext.py - substituteInPlace ./contents/ui/Pyext.qml --replace-fail NIX_STORE_PACKAGE_PATH ${placeholder "out"} - kpackagetool6 -i ./ -p $out/share/plasma/wallpapers/ - ''; + postInstall = let + py3-ws = python3.withPackages (ps: with ps; [websockets]); + in '' + cd $out/share/plasma/wallpapers/com.github.catsout.wallpaperEngineKde + chmod +x ./contents/pyext.py + PATH=${py3-ws}/bin:$PATH patchShebangs --build ./contents/pyext.py + substituteInPlace ./contents/ui/Pyext.qml --replace-fail NIX_STORE_PACKAGE_PATH ${placeholder "out"} + ''; meta = with lib; { description = "KDE wallpaper plugin integrating Wallpaper Engine"; homepage = "https://github.com/catsout/wallpaper-engine-kde-plugin"; license = licenses.gpl2Only; - maintainers = with maintainers; [ macronova ]; + maintainers = with maintainers; [macronova]; }; } diff --git a/pkgs/kde/third-party/wallpaper-engine-plugin/nix-plugin.patch b/pkgs/kde/third-party/wallpaper-engine-plugin/nix-plugin.patch index 951250aa407a..b689f4937946 100644 --- a/pkgs/kde/third-party/wallpaper-engine-plugin/nix-plugin.patch +++ b/pkgs/kde/third-party/wallpaper-engine-plugin/nix-plugin.patch @@ -1,12 +1,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index e1298ba..1c9ddec 100644 +index e1298ba..1af7d0a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,6 +9,7 @@ set(KF_MIN_VERSION "5.68.0") project("WallpaperEngineKde") -+add_definitions(-DQML2_CMAKE_PATH="${QML2_CMAKE_PATH}") ++add_definitions(-DQML_LIB="${QML_LIB}") set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY true) set(CMAKE_POSITION_INDEPENDENT_CODE ON) if(NOT OpenGL_GL_PREFERENCE) @@ -14,7 +14,7 @@ diff --git a/plugin/contents/pyext.py b/plugin/contents/pyext.py old mode 100644 new mode 100755 diff --git a/plugin/contents/ui/Pyext.qml b/plugin/contents/ui/Pyext.qml -index 1a48f5e..8a9c9c9 100644 +index 1a48f5e..7db2480 100644 --- a/plugin/contents/ui/Pyext.qml +++ b/plugin/contents/ui/Pyext.qml @@ -15,7 +15,8 @@ Item { @@ -22,16 +22,16 @@ index 1a48f5e..8a9c9c9 100644 "[ -f \"$HOME/.local/share/$EXT\" ] && WKD=\"$HOME/.local/share/$EXT\"", "[ -f \"$XDG_DATA_HOME/$EXT\" ] && WKD=\"$XDG_DATA_HOME/$EXT\"", - `exec python3 "$WKD" "${ws_server.url}"` -+ "[ -f \"NIX_STORE_PACKAGE_PATH/share/$EXT\" ] && WKD=\"NIX_STORE_PACKAGE_PATH/share/$EXT\"", ++ "[ -f \"NIX_STORE_PACKAGE_PATH/share/$EXT\" ] && WKD=\"NIX_STORE_PACKAGE_PATH/share/$EXT\"", + `"$WKD" "${ws_server.url}"` ].join("\n"); return sh; } diff --git a/src/plugin.cpp b/src/plugin.cpp -index 5e8a7e2..1709a27 100644 +index 4bc817e..a98cb4a 100644 --- a/src/plugin.cpp +++ b/src/plugin.cpp -@@ -13,6 +13,18 @@ class Port : public QQmlExtensionPlugin { +@@ -14,6 +14,18 @@ class Port : public QQmlExtensionPlugin { Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: @@ -39,7 +39,7 @@ index 5e8a7e2..1709a27 100644 + if (strcmp(uri, "com.github.catsout.wallpaperEngineKde") != 0) return; + if (!engine) return; + -+ QString pathList = QML2_CMAKE_PATH; ++ QString pathList = QML_LIB; + QStringList paths = pathList.split(':', Qt::SkipEmptyParts); + for (const QString &path : paths) { + engine->addImportPath(path); From c7e0e9fabefe229278d93744fb33a2a1fdd48f41 Mon Sep 17 00:00:00 2001 From: macronova Date: Sat, 25 Jan 2025 16:02:30 +0800 Subject: [PATCH 0083/1107] Minor format --- pkgs/kde/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix index bcf74cb22808..76a9d19e28aa 100644 --- a/pkgs/kde/default.nix +++ b/pkgs/kde/default.nix @@ -93,7 +93,7 @@ let koi = self.callPackage ./third-party/koi { }; krohnkite = self.callPackage ./third-party/krohnkite { }; kzones = self.callPackage ./third-party/kzones { }; - wallpaper-engine-plugin = self.callPackage ./third-party/wallpaper-engine-plugin {}; + wallpaper-engine-plugin = self.callPackage ./third-party/wallpaper-engine-plugin { }; } ); in From b6a32aa7066699d5c944334012e12e0d5aa7b6ec Mon Sep 17 00:00:00 2001 From: macronova Date: Sat, 25 Jan 2025 16:06:23 +0800 Subject: [PATCH 0084/1107] Use nixfmt --- .../wallpaper-engine-plugin/default.nix | 43 +++++-------------- 1 file changed, 11 insertions(+), 32 deletions(-) diff --git a/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix b/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix index 663624b51dfb..621a0109d809 100644 --- a/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix +++ b/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix @@ -1,20 +1,6 @@ -{ - extra-cmake-modules, - fetchFromGitHub, - kpackage, - libplasma, - lib, - lz4, - mkKdeDerivation, - mpv, - pkg-config, - python3, - qtbase, - qtmultimedia, - qtwebchannel, - qtwebengine, - qtwebsockets, -}: +{ extra-cmake-modules, fetchFromGitHub, kpackage, libplasma, lib, lz4 +, mkKdeDerivation, mpv, pkg-config, python3, qtbase, qtmultimedia, qtwebchannel +, qtwebengine, qtwebsockets, }: mkKdeDerivation { pname = "wallpaper-engine-kde-plugin"; version = "0.5.5-unstable-2024-11-03"; @@ -27,19 +13,11 @@ mkKdeDerivation { fetchSubmodules = true; }; - patches = [./nix-plugin.patch]; + patches = [ ./nix-plugin.patch ]; - extraNativeBuildInputs = [ - kpackage - pkg-config - ]; + extraNativeBuildInputs = [ kpackage pkg-config ]; - extraBuildInputs = [ - extra-cmake-modules - libplasma - lz4 - mpv - ]; + extraBuildInputs = [ extra-cmake-modules libplasma lz4 mpv ]; extraCmakeFlags = [ (lib.cmakeFeature "QML_LIB" (lib.makeSearchPathOutput "out" "lib/qt-6/qml" [ @@ -51,19 +29,20 @@ mkKdeDerivation { (lib.cmakeFeature "Qt6_DIR" "${qtbase}/lib/cmake/Qt6") ]; - postInstall = let - py3-ws = python3.withPackages (ps: with ps; [websockets]); + postInstall = let py3-ws = python3.withPackages (ps: with ps; [ websockets ]); in '' cd $out/share/plasma/wallpapers/com.github.catsout.wallpaperEngineKde chmod +x ./contents/pyext.py PATH=${py3-ws}/bin:$PATH patchShebangs --build ./contents/pyext.py - substituteInPlace ./contents/ui/Pyext.qml --replace-fail NIX_STORE_PACKAGE_PATH ${placeholder "out"} + substituteInPlace ./contents/ui/Pyext.qml --replace-fail NIX_STORE_PACKAGE_PATH ${ + placeholder "out" + } ''; meta = with lib; { description = "KDE wallpaper plugin integrating Wallpaper Engine"; homepage = "https://github.com/catsout/wallpaper-engine-kde-plugin"; license = licenses.gpl2Only; - maintainers = with maintainers; [macronova]; + maintainers = with maintainers; [ macronova ]; }; } From 4615c564a256367024cd66d5a2de12bb736d500b Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sat, 25 Jan 2025 17:23:51 -0500 Subject: [PATCH 0085/1107] python312Packages.crc32c: 2.4 -> 2.7.1 --- pkgs/development/python-modules/crc32c/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/crc32c/default.nix b/pkgs/development/python-modules/crc32c/default.nix index 705a3d0654db..1aa1b5f97f97 100644 --- a/pkgs/development/python-modules/crc32c/default.nix +++ b/pkgs/development/python-modules/crc32c/default.nix @@ -8,8 +8,8 @@ }: buildPythonPackage rec { - version = "2.4"; pname = "crc32c"; + version = "2.7.1"; pyproject = true; disabled = pythonOlder "3.5"; @@ -18,16 +18,17 @@ buildPythonPackage rec { owner = "ICRAR"; repo = pname; tag = "v${version}"; - hash = "sha256-rWR2MtTLhqqvgdqEyevg/i8ZHM3OU1bJb27JkBx1J3w="; + hash = "sha256-WBFiAbdzV719vPdZkRGei2+Y33RroMZ7FeQmWo/OfE0="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; meta = { description = "Python software implementation and hardware API of CRC32C checksum algorithm"; homepage = "https://github.com/ICRAR/crc32c"; + changelog = "https://github.com/ICRAR/crc32c/blob/master/CHANGELOG.md"; license = lib.licenses.lgpl21; maintainers = with lib.maintainers; [ bcdarwin ]; }; From b7f046b9d4152003661bba9202cca77b9f4f66a4 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Fri, 24 Jan 2025 08:25:56 +0100 Subject: [PATCH 0086/1107] libsForQt5.extra-cmake-modules: fix strictDeps usage --- .../kde-frameworks/extra-cmake-modules/default.nix | 12 ++++++++++++ .../kde-frameworks/extra-cmake-modules/setup-hook.sh | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix index 11a807d190ad..c3aa3f518e22 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix @@ -2,6 +2,7 @@ mkDerivation, lib, fetchpatch, + bash, cmake, pkg-config, }: @@ -19,11 +20,22 @@ mkDerivation { outputs = [ "out" ]; # this package has no runtime components + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + bash + ]; + + # note: these will be propagated into the same list extra-cmake-modules is in propagatedBuildInputs = [ cmake pkg-config ]; + strictDeps = true; + setupHook = ./setup-hook.sh; meta = with lib; { diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh index abf330fd9662..853a163fab98 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh @@ -1,3 +1,9 @@ +ecmCMakeFlags() { + appendToVar cmakeFlags "-DECM_DIR=@out@/share/ECM/cmake" +} + +preConfigureHooks+=(ecmCMakeFlags) + ecmEnvHook() { addToSearchPath XDG_DATA_DIRS "$1/share" addToSearchPath XDG_CONFIG_DIRS "$1/etc/xdg" From cb1b74a675147ad5bbd8d923a58d09a851454479 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 01:18:39 +0000 Subject: [PATCH 0087/1107] fluidsynth: 2.4.2 -> 2.4.3 --- pkgs/applications/audio/fluidsynth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index e1fe7689a7fb..f0aab08ffb7f 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "fluidsynth"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; rev = "v${version}"; - hash = "sha256-rpTL1eOm3PQIBuxoPEZwj64QXasNQN80kGSW7h6dDdw="; + hash = "sha256-LaJcWrHgt/RzlDQmpzOjF/9ugD5d+8XWRt7pU3SM5Rk="; }; outputs = [ "out" "dev" "man" ]; From fde48ae2ceab50774b81d32d050a9c7a7b6f7dee Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 26 Jan 2025 06:48:32 +0000 Subject: [PATCH 0088/1107] xz: 5.6.3 -> 5.6.4 Changes: https://github.com/tukaani-project/xz/releases/tag/v5.6.4 --- pkgs/tools/compression/xz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 658e8d8216a8..09ceed93bbc8 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xz"; - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { url = with finalAttrs; "https://github.com/tukaani-project/xz/releases/download/v${version}/xz-${version}.tar.xz"; - hash = "sha256-2wWQYptvD6NudK6l+XMdxvjfBoznt7r6RTAYMqXuvDo="; + hash = "sha256-gpzP5512l0j3VX56RCmmTQaFjifh42LiXQGre5MdnJU="; }; strictDeps = true; From 2fc18d426cc54eed1ad935ad1d373505ea792859 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 7 Jan 2025 23:12:40 -0500 Subject: [PATCH 0089/1107] git: link git-credential-osxkeychain into standard path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Git that Apple ships has this at this location `$(git --exec-path)/git-credential-osxkeychain`, while we previously only linked it into `$out/bin`. Link it to the former as well to maintain compatibility with tooling that expects it to be where Apple’s Git distribution puts it. --- pkgs/applications/version-management/git/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 082b1c9f37aa..4dd0f9c7c888 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -283,6 +283,7 @@ stdenv.mkDerivation (finalAttrs: { done '') + lib.optionalString osxkeychainSupport '' + ln -s $out/share/git/contrib/credential/osxkeychain/git-credential-osxkeychain $out/libexec/git-core/ # enable git-credential-osxkeychain on darwin if desired (default) mkdir -p $out/etc cat > $out/etc/gitconfig << EOF From 872d6618268e3880da037f9d7dbb6b19e2a78106 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sun, 26 Jan 2025 08:14:51 -0500 Subject: [PATCH 0090/1107] gitMinimal: disable osxkeychainSupport This should have no need in builds (as it should be irrelevant in the sandbox). While it likely has a minimal effect on closure size, it should reduce the probability of mass rebuilds by reducing the scope of gitMinimal. --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abec87a7de8b..b54c848f0d63 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1156,6 +1156,7 @@ with pkgs; gitMinimal = git.override { withManual = false; + osxkeychainSupport = false; pythonSupport = false; perlSupport = false; withpcre2 = false; From a8f509677f4a392d75b21b72de4bc74d52b177fb Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 26 Jan 2025 16:37:03 +0100 Subject: [PATCH 0091/1107] various: replace substituteAll with replaceVars Some easy ones. --- pkgs/build-support/buildenv/builder.pl | 2 -- pkgs/build-support/buildenv/default.nix | 5 ++--- pkgs/development/python-modules/psycopg/default.nix | 5 ++--- pkgs/development/python-modules/pypass/default.nix | 5 ++--- pkgs/servers/sql/postgresql/generic.nix | 5 ++--- 5 files changed, 8 insertions(+), 14 deletions(-) diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl index d416ff58e2cb..76606716d808 100755 --- a/pkgs/build-support/buildenv/builder.pl +++ b/pkgs/build-support/buildenv/builder.pl @@ -1,5 +1,3 @@ -#! @perl@ -w - use strict; use feature 'signatures'; use Cwd 'abs_path'; diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index df5bce5feed4..6aaa59df0642 100644 --- a/pkgs/build-support/buildenv/default.nix +++ b/pkgs/build-support/buildenv/default.nix @@ -5,13 +5,12 @@ buildPackages, runCommand, lib, - substituteAll, + replaceVars, writeClosure, }: let - builder = substituteAll { - src = ./builder.pl; + builder = replaceVars ./builder.pl { inherit (builtins) storeDir; }; in diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index b25dd7e325e5..25436138ff8f 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, fetchurl, pythonOlder, - substituteAll, + replaceVars, # build libpq, @@ -45,8 +45,7 @@ let }; patches = [ - (substituteAll { - src = ./ctypes.patch; + (replaceVars ./ctypes.patch { libpq = "${libpq}/lib/libpq${stdenv.hostPlatform.extensions.sharedLibrary}"; libc = "${stdenv.cc.libc}/lib/libc.so.6"; }) diff --git a/pkgs/development/python-modules/pypass/default.nix b/pkgs/development/python-modules/pypass/default.nix index d1581e898547..ee73ddc09ec4 100644 --- a/pkgs/development/python-modules/pypass/default.nix +++ b/pkgs/development/python-modules/pypass/default.nix @@ -13,7 +13,7 @@ pythonAtLeast, pytestCheckHook, setuptools, - substituteAll, + replaceVars, tree, xclip, }: @@ -32,8 +32,7 @@ buildPythonPackage rec { # Set absolute nix store paths to the executables that pypass uses patches = [ - (substituteAll { - src = ./mark-executables.patch; + (replaceVars ./mark-executables.patch { git_exec = "${gitMinimal}/bin/git"; grep_exec = "${gnugrep}/bin/grep"; gpg_exec = "${gnupg}/bin/gpg2"; diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 1ea97c93f425..00b9f0e15ce1 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -7,7 +7,7 @@ let fetchpatch, fetchurl, lib, - substituteAll, + replaceVars, writeShellScriptBin, # source specification @@ -304,8 +304,7 @@ let hash = "sha256-EQJkDR0eb7QWCjyMzXMn+Vbcwx3MMdC83oN7XSVJP0U="; }) - (substituteAll { - src = ./patches/locale-binary-path.patch; + (replaceVars ./patches/locale-binary-path.patch { locale = "${ if stdenv.hostPlatform.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc }/bin/locale"; From 7fea091aa812b0755fd1d80cac4da679192cd852 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 25 Jan 2025 17:03:49 +0100 Subject: [PATCH 0092/1107] {lua-5,luajit}: fix missing @ lua @ reference in utils.sh --- pkgs/development/interpreters/lua-5/interpreter.nix | 5 ++--- pkgs/development/interpreters/lua-5/utils.sh | 7 +------ pkgs/development/interpreters/luajit/default.nix | 5 ++--- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index 54435308d1c1..02868d749fa6 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -7,7 +7,7 @@ makeWrapper, self, packageOverrides ? (final: prev: { }), - substituteAll, + replaceVars, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, @@ -149,8 +149,7 @@ stdenv.mkDerivation ( postInstall = '' mkdir -p "$out/nix-support" "$out/share/doc/lua" "$out/lib/pkgconfig" cp ${ - substituteAll { - src = ./utils.sh; + replaceVars ./utils.sh { luapathsearchpaths = lib.escapeShellArgs finalAttrs.LuaPathSearchPaths; luacpathsearchpaths = lib.escapeShellArgs finalAttrs.LuaCPathSearchPaths; } diff --git a/pkgs/development/interpreters/lua-5/utils.sh b/pkgs/development/interpreters/lua-5/utils.sh index 2365af08dc9c..50b627004203 100644 --- a/pkgs/development/interpreters/lua-5/utils.sh +++ b/pkgs/development/interpreters/lua-5/utils.sh @@ -118,15 +118,10 @@ buildLuaPath() { echo "BUILD_LUA_PATH" -# # set -x # # Create an empty table of paths (see doc on loadFromPropagatedInputs -# # for how this is used). Build up the program_PATH and program_LUA_PATH -# # variables. - # declare -gA luaPathsSeen=() +# # for how this is used). Build up the program_PATH variable. # # shellcheck disable=SC2034 program_PATH= - luaPathsSeen["@lua@"]=1 -# addToSearchPath program_PATH @lua@/bin for path in $luaPath; do _addToLuaPath "$path" done diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 147884c59f01..88d318b207b3 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -4,7 +4,7 @@ buildPackages, version, src, - substituteAll, + replaceVars, extraMeta ? { }, self, packageOverrides ? (final: prev: { }), @@ -102,8 +102,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' mkdir -p $out/nix-support cp ${ - substituteAll { - src = ../lua-5/utils.sh; + replaceVars ../lua-5/utils.sh { luapathsearchpaths = lib.escapeShellArgs finalAttrs.LuaPathSearchPaths; luacpathsearchpaths = lib.escapeShellArgs finalAttrs.LuaCPathSearchPaths; } From ced568bf30daea79411d4638bc5c5d4a2a80b951 Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Sun, 26 Jan 2025 16:24:48 +0100 Subject: [PATCH 0093/1107] geogram: 1.8.6 -> 1.9.2 --- pkgs/by-name/ge/geogram/package.nix | 52 ++++++++++++++++++----------- 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/ge/geogram/package.nix b/pkgs/by-name/ge/geogram/package.nix index 8dfff7a3d24a..eca1fd30a50e 100644 --- a/pkgs/by-name/ge/geogram/package.nix +++ b/pkgs/by-name/ge/geogram/package.nix @@ -1,30 +1,39 @@ { lib, stdenv, - fetchurl, fetchFromGitHub, - cmake, doxygen, zlib, python3Packages, + nix-update-script, + fetchpatch2, }: let + exploragram = fetchFromGitHub { + owner = "BrunoLevy"; + repo = "exploragram"; + rev = "3190f685653f8aa75b7c4604d008c59a999f1bb6"; + hash = "sha256-9ePCOyQWSxu12PtHFSxfoDcvTtxvYR3T68sU3cAfZiE="; + }; testdata = fetchFromGitHub { owner = "BrunoLevy"; repo = "geogram.data"; - rev = "43dd49054a78d9b3fb8ef729f48ab47a272c718c"; - hash = "sha256-F2Lyt4nEOczVYLz6WLny+YrsxNwREBGPkProN8NHFN4="; + rev = "ceab6179189d23713b902b6f26ea2ff36aea1515"; + hash = "sha256-zUmYI6+0IdDkglLzzWHS8ZKmc5O6aJ2X4IwRBouRIxI="; }; in stdenv.mkDerivation rec { pname = "geogram"; - version = "1.8.6"; + version = "1.9.2"; - src = fetchurl { - url = "https://github.com/BrunoLevy/geogram/releases/download/v${version}/geogram_${version}.tar.gz"; - hash = "sha256-Xqha5HVqD2Ao0z++RKcQdMZUmtMb5eZ1DMJEVrfNUzE="; + src = fetchFromGitHub { + owner = "BrunoLevy"; + repo = "geogram"; + tag = "v${version}"; + hash = "sha256-v7ChuE9F/z1MD5OUMiGXZWiGqjMauIka4sNXVDe/yYU="; + fetchSubmodules = true; }; outputs = [ @@ -65,11 +74,22 @@ stdenv.mkDerivation rec { zlib ]; + # exploragram library is not listed as submodule and must be copied manually + prePatch = '' + cp -r ${exploragram} ./src/lib/exploragram/ && chmod 755 ./src/lib/exploragram/ + ''; + patches = [ # This patch replaces the bundled (outdated) zlib with our zlib # Should be harmless, but if there are issues this patch can also be removed # Also check https://github.com/BrunoLevy/geogram/issues/49 for progress ./replace-bundled-zlib.patch + + # fixes https://github.com/BrunoLevy/geogram/issues/203, remove when 1.9.3 is released + (fetchpatch2 { + url = "https://github.com/BrunoLevy/geogram/commit/2e1b6fba499ddc55b2150a1f610cf9f8d4934c39.patch"; + hash = "sha256-t6Pocf3VT8HpKOSh1UKKa0QHpsZyFqlAng6ltiAfKA8="; + }) ]; postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' @@ -90,16 +110,12 @@ stdenv.mkDerivation rec { checkPhase = let skippedTests = [ - # Failing tests as of version 1.8.3 - "FileConvert" - "Reconstruct" - "Remesh" - # Skip slow RVD test "RVD" - # Flaky as of 1.8.5 (SIGSEGV, possibly a use-after-free) - "Delaunay" + # Needs unfree library geogramplus with extended precision + # see https://github.com/BrunoLevy/geogram/wiki/GeogramPlus + "CSGplus" ]; in '' @@ -115,6 +131,8 @@ stdenv.mkDerivation rec { runHook postCheck ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Programming Library with Geometric Algorithms"; longDescription = '' @@ -125,10 +143,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/BrunoLevy/geogram"; license = licenses.bsd3; - # Broken on aarch64-linux as of version 1.8.3 - # See https://github.com/BrunoLevy/geogram/issues/74 - broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; - platforms = [ "x86_64-linux" "aarch64-linux" From c61f629dd9d3f2ab0629899fbc890a124282cad4 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Sat, 11 Jan 2025 00:54:34 +0000 Subject: [PATCH 0094/1107] c-ares: 1.27.0 -> 1.34.4 --- pkgs/development/libraries/c-ares/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index 913c65e93f97..aeeda1bf5073 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -18,14 +18,12 @@ stdenv.mkDerivation rec { pname = "c-ares"; - version = "1.27.0"; + version = "1.34.4"; src = fetchurl { # Note: tag name varies in some versions, e.g. v1.30.0, c-ares-1_17_0. - url = "https://github.com/c-ares/${pname}/releases/download/cares-${ - builtins.replaceStrings [ "." ] [ "_" ] version - }/${pname}-${version}.tar.gz"; - hash = "sha256-CnK+ZpWZVcQ+KvL70DQY6Cor1UZGBOyaYhR+N6zrQgs="; + url = "https://github.com/c-ares/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; + hash = "sha256-+jjb7WWe5MxaMt9eJ97aV1+mhSx5pyuhr4XeNaauIi8="; }; outputs = [ @@ -50,6 +48,10 @@ stdenv.mkDerivation rec { curl = (curl.override { c-aresSupport = true; }).tests.withCheck; }; + preFixup = lib.optionalString withCMake '' + substituteInPlace $out/lib/pkgconfig/libcares.pc --replace-fail \''${prefix}/ "" + ''; + meta = with lib; { description = "C library for asynchronous DNS requests"; homepage = "https://c-ares.haxx.se"; From eb96c8dc5b69f2838e3ff8e6ce6ba69956ada02c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 26 Jan 2025 13:10:53 +0100 Subject: [PATCH 0095/1107] postgresql: refactor `postgresqlVersions` attribute & tests Every postgresql testcase essentially does the following things: * Filter `postgresqlVersions` for server packages * Filter postgresql server packages for suitable ones (i.e. extensions must support the given version) * Generate an attribute-set of testcases The first item became necessary in 7ab1e888334ddc2745b285e3df0b0efd5839d0f8 given that `postgresql/default.nix` now exposes JIT and non-JIT servers AND a `libpq` that is not suitable for the tests here. This changes restructures this a little bit, i.e.: * Having an attribute-set that contains a bunch of postgresql servers and a single client package seems odd (and the sole consumer of `postgresqlVersions` in nixpkgs, the test suite, has to take that into account). Hence, postgresql's default.nix now provides `libpq` (the client) and a `postgresqlVersions` attribute with all supported JIT and non-JIT variants of postgresql. * Each test-case gets a third argument, a function called `genTests`: this function sets `recurseForDerivations = true;` and generates an attribute-set of tests for each postgresql version given a function that returns a testcase or multiple test-cases (`makeTestFor`). The argument to `makeTestFor` is a postgresql server package. This function also accepts a filter predicate that is passed against `filterAttrs` to remove postgresql server packages that are not suitable for the test (e.g. because the version isn't supported by the extension to test). I checked by making sure that the `.drv` doesn't change on staging with this change on top for postgresq, postgresql-jit, postgresql-wal-receiver, postgresql-tls-client-cert, anonymizer, pgjwt, pgvecto-rs, timescaledb, tsja and wal2json. --- nixos/tests/postgresql/anonymizer.nix | 13 +++++------- nixos/tests/postgresql/default.nix | 20 ++++++++++++++++++- nixos/tests/postgresql/pgjwt.nix | 13 +++++------- nixos/tests/postgresql/pgvecto-rs.nix | 13 +++++------- nixos/tests/postgresql/postgresql-jit.nix | 13 +++++------- .../postgresql/postgresql-tls-client-cert.nix | 10 ++-------- .../postgresql/postgresql-wal-receiver.nix | 10 ++-------- nixos/tests/postgresql/postgresql.nix | 10 ++-------- nixos/tests/postgresql/timescaledb.nix | 13 +++++------- nixos/tests/postgresql/tsja.nix | 13 +++++------- nixos/tests/postgresql/wal2json.nix | 13 +++++------- pkgs/servers/sql/postgresql/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 7 ++++--- 13 files changed, 70 insertions(+), 86 deletions(-) diff --git a/nixos/tests/postgresql/anonymizer.nix b/nixos/tests/postgresql/anonymizer.nix index abbcd4890976..d59a26f101e8 100644 --- a/nixos/tests/postgresql/anonymizer.nix +++ b/nixos/tests/postgresql/anonymizer.nix @@ -1,6 +1,7 @@ { pkgs, makeTest, + genTests, }: let @@ -107,11 +108,7 @@ let ''; }; in -lib.recurseIntoAttrs ( - lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( - lib.filterAttrs (_: p: p ? pkgs && !p.pkgs.anonymizer.meta.broken) pkgs.postgresqlVersions - ) - // { - passthru.override = p: makeTestFor p; - } -) +genTests { + inherit makeTestFor; + filter = _: p: !p.pkgs.anonymizer.meta.broken; +} diff --git a/nixos/tests/postgresql/default.nix b/nixos/tests/postgresql/default.nix index 4fe7e7a37e7e..91f7694208b1 100644 --- a/nixos/tests/postgresql/default.nix +++ b/nixos/tests/postgresql/default.nix @@ -7,7 +7,25 @@ with import ../../lib/testing-python.nix { inherit system pkgs; }; let - importWithArgs = path: import path { inherit pkgs makeTest; }; + inherit (pkgs.lib) + recurseIntoAttrs + filterAttrs + mapAttrs + const + ; + genTests = + { + makeTestFor, + filter ? (_: _: true), + }: + recurseIntoAttrs ( + mapAttrs (const makeTestFor) (filterAttrs filter pkgs.postgresqlVersions) + // { + passthru.override = makeTestFor; + } + ); + + importWithArgs = path: import path { inherit pkgs makeTest genTests; }; in { # postgresql diff --git a/nixos/tests/postgresql/pgjwt.nix b/nixos/tests/postgresql/pgjwt.nix index 27033a1383b1..f00d9a939d3d 100644 --- a/nixos/tests/postgresql/pgjwt.nix +++ b/nixos/tests/postgresql/pgjwt.nix @@ -1,6 +1,7 @@ { pkgs, makeTest, + genTests, }: let @@ -48,11 +49,7 @@ let ''; }; in -lib.recurseIntoAttrs ( - lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( - lib.filterAttrs (_: p: p ? pkgs && !p.pkgs.pgjwt.meta.broken) pkgs.postgresqlVersions - ) - // { - passthru.override = p: makeTestFor p; - } -) +genTests { + inherit makeTestFor; + filter = _: p: !p.pkgs.pgjwt.meta.broken; +} diff --git a/nixos/tests/postgresql/pgvecto-rs.nix b/nixos/tests/postgresql/pgvecto-rs.nix index 98241ec48090..300449617e9b 100644 --- a/nixos/tests/postgresql/pgvecto-rs.nix +++ b/nixos/tests/postgresql/pgvecto-rs.nix @@ -1,6 +1,7 @@ { pkgs, makeTest, + genTests, }: let @@ -72,11 +73,7 @@ let ''; }; in -lib.recurseIntoAttrs ( - lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( - lib.filterAttrs (_: p: p ? pkgs && !p.pkgs.pgvecto-rs.meta.broken) pkgs.postgresqlVersions - ) - // { - passthru.override = p: makeTestFor p; - } -) +genTests { + inherit makeTestFor; + filter = _: p: !p.pkgs.pgvecto-rs.meta.broken; +} diff --git a/nixos/tests/postgresql/postgresql-jit.nix b/nixos/tests/postgresql/postgresql-jit.nix index 5d0406062eae..e082ff141327 100644 --- a/nixos/tests/postgresql/postgresql-jit.nix +++ b/nixos/tests/postgresql/postgresql-jit.nix @@ -1,6 +1,7 @@ { pkgs, makeTest, + genTests, }: let @@ -48,11 +49,7 @@ let ''; }; in -lib.recurseIntoAttrs ( - lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( - lib.filterAttrs (n: _: lib.hasSuffix "_jit" n) pkgs.postgresqlVersions - ) - // { - passthru.override = p: makeTestFor p; - } -) +genTests { + inherit makeTestFor; + filter = n: _: lib.hasSuffix "_jit" n; +} diff --git a/nixos/tests/postgresql/postgresql-tls-client-cert.nix b/nixos/tests/postgresql/postgresql-tls-client-cert.nix index 0861416d6c40..117b9b0e24a9 100644 --- a/nixos/tests/postgresql/postgresql-tls-client-cert.nix +++ b/nixos/tests/postgresql/postgresql-tls-client-cert.nix @@ -1,6 +1,7 @@ { pkgs, makeTest, + genTests, }: let @@ -128,11 +129,4 @@ let ''; }; in -lib.recurseIntoAttrs ( - lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( - lib.filterAttrs (_: p: p ? pkgs) pkgs.postgresqlVersions - ) - // { - passthru.override = p: makeTestFor p; - } -) +genTests { inherit makeTestFor; } diff --git a/nixos/tests/postgresql/postgresql-wal-receiver.nix b/nixos/tests/postgresql/postgresql-wal-receiver.nix index eee6c0c14de1..c99c3889c027 100644 --- a/nixos/tests/postgresql/postgresql-wal-receiver.nix +++ b/nixos/tests/postgresql/postgresql-wal-receiver.nix @@ -1,6 +1,7 @@ { pkgs, makeTest, + genTests, }: let @@ -108,11 +109,4 @@ let ''; }; in -lib.recurseIntoAttrs ( - lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( - lib.filterAttrs (_: p: p ? pkgs) pkgs.postgresqlVersions - ) - // { - passthru.override = p: makeTestFor p; - } -) +genTests { inherit makeTestFor; } diff --git a/nixos/tests/postgresql/postgresql.nix b/nixos/tests/postgresql/postgresql.nix index 0aa56330ce01..7741d14808eb 100644 --- a/nixos/tests/postgresql/postgresql.nix +++ b/nixos/tests/postgresql/postgresql.nix @@ -1,6 +1,7 @@ { pkgs, makeTest, + genTests, }: let @@ -262,11 +263,4 @@ let ''; }; in -lib.recurseIntoAttrs ( - lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( - lib.filterAttrs (_: p: p ? pkgs) pkgs.postgresqlVersions - ) - // { - passthru.override = p: makeTestFor p; - } -) +genTests { inherit makeTestFor; } diff --git a/nixos/tests/postgresql/timescaledb.nix b/nixos/tests/postgresql/timescaledb.nix index acfe5ed7ecc6..7ad8b0fcc972 100644 --- a/nixos/tests/postgresql/timescaledb.nix +++ b/nixos/tests/postgresql/timescaledb.nix @@ -1,6 +1,7 @@ { pkgs, makeTest, + genTests, }: let @@ -91,11 +92,7 @@ in # Not run by default, because this requires allowUnfree. # To run these tests: # NIXPKGS_ALLOW_UNFREE=1 nix-build -A nixosTests.postgresql.timescaledb -lib.dontRecurseIntoAttrs ( - lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( - lib.filterAttrs (_: p: p ? pkgs && !p.pkgs.timescaledb.meta.broken) pkgs.postgresqlVersions - ) - // { - passthru.override = p: makeTestFor p; - } -) +lib.dontRecurseIntoAttrs (genTests { + inherit makeTestFor; + filter = _: p: !p.pkgs.timescaledb.meta.broken; +}) diff --git a/nixos/tests/postgresql/tsja.nix b/nixos/tests/postgresql/tsja.nix index 34437068ae67..4cc5bd124139 100644 --- a/nixos/tests/postgresql/tsja.nix +++ b/nixos/tests/postgresql/tsja.nix @@ -1,6 +1,7 @@ { pkgs, makeTest, + genTests, }: let @@ -41,11 +42,7 @@ let ''; }; in -lib.recurseIntoAttrs ( - lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( - lib.filterAttrs (_: p: p ? pkgs && !p.pkgs.tsja.meta.broken) pkgs.postgresqlVersions - ) - // { - passthru.override = p: makeTestFor p; - } -) +genTests { + inherit makeTestFor; + filter = _: p: !p.pkgs.tsja.meta.broken; +} diff --git a/nixos/tests/postgresql/wal2json.nix b/nixos/tests/postgresql/wal2json.nix index 644ade741d83..abfe60673753 100644 --- a/nixos/tests/postgresql/wal2json.nix +++ b/nixos/tests/postgresql/wal2json.nix @@ -1,6 +1,7 @@ { pkgs, makeTest, + genTests, }: let @@ -43,11 +44,7 @@ let ''; }; in -lib.recurseIntoAttrs ( - lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( - lib.filterAttrs (_: p: p ? pkgs && !p.pkgs.wal2json.meta.broken) pkgs.postgresqlVersions - ) - // { - passthru.override = p: makeTestFor p; - } -) +genTests { + inherit makeTestFor; + filter = _: p: !p.pkgs.wal2json.meta.broken; +} diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index cfff0f4a98b9..c6a47a424959 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -33,5 +33,9 @@ let libpq = self.callPackage ./libpq.nix { }; in -# variations without and with JIT -(mkAttributes false) // (mkAttributes true) // { inherit libpq; } +{ + # variations without and with JIT + postgresqlVersions = mkAttributes false // mkAttributes true; + + inherit libpq; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abec87a7de8b..2fea98c75cea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11688,10 +11688,11 @@ with pkgs; asciidoc = asciidoc-full; }; - postgresqlVersions = import ../servers/sql/postgresql pkgs; - inherit (postgresqlVersions) - libpq + inherit (import ../servers/sql/postgresql pkgs) + postgresqlVersions + libpq; + inherit (postgresqlVersions) postgresql_13 postgresql_14 postgresql_15 From 8b9a57c1a984e82e83fa6f8d71458d1bc1c880ad Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 27 Jan 2025 01:00:01 +0000 Subject: [PATCH 0096/1107] llvmPackages: fix broken symlink in `mkExtraBuildCommandsBasicRt` --- pkgs/development/compilers/llvm/common/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 7d2ef2e3f135..96992bee1987 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -337,7 +337,6 @@ let mkExtraBuildCommands0 cc + '' ln -s "${targetLlvmLibraries.compiler-rt-no-libc.out}/lib" "$rsrc/lib" - ln -s "${targetLlvmLibraries.compiler-rt-no-libc.out}/share" "$rsrc/share" ''; mkExtraBuildCommands = cc: From d1b1c3cf5d8464c31afc2b559769ebc22da59a73 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 27 Jan 2025 07:04:35 +0000 Subject: [PATCH 0097/1107] libseccomp: 2.5.5 -> 2.6.0 Changes: https://github.com/seccomp/libseccomp/releases/tag/v2.6.0 --- pkgs/by-name/li/libseccomp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libseccomp/package.nix b/pkgs/by-name/li/libseccomp/package.nix index 9ff313c84a65..2d238f64dc66 100644 --- a/pkgs/by-name/li/libseccomp/package.nix +++ b/pkgs/by-name/li/libseccomp/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "libseccomp"; - version = "2.5.5"; + version = "2.6.0"; src = fetchurl { url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz"; - hash = "sha256-JIosik2bmFiqa69ScSw0r+/PnJ6Ut23OAsHJqiX7M3U="; + hash = "sha256-g7YIUjLRWIw3ncm5yuR7s3QHzyYubnSZPGG6ctKnhNw="; }; outputs = [ From 869586e6ddc7758fbc9646797532a3b4c6a4eb6f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 27 Jan 2025 07:20:16 +0000 Subject: [PATCH 0098/1107] libimagequant: 4.3.3 -> 4.3.4 Changes: https://github.com/ImageOptim/libimagequant/compare/4.3.3...4.3.4 --- pkgs/by-name/li/libimagequant/Cargo.lock | 34 +++++++++++------------ pkgs/by-name/li/libimagequant/package.nix | 4 +-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/li/libimagequant/Cargo.lock b/pkgs/by-name/li/libimagequant/Cargo.lock index 2c9cecbf894c..ff75c4e1d8ed 100644 --- a/pkgs/by-name/li/libimagequant/Cargo.lock +++ b/pkgs/by-name/li/libimagequant/Cargo.lock @@ -16,15 +16,15 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[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 = "bytemuck" -version = "1.20.0" +version = "1.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a" +checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3" [[package]] name = "c_test" @@ -36,9 +36,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.2" +version = "1.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f34d93e62b03caf570cccc334cbc6c2fceca82f39211051345108adcba3eebdc" +checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229" dependencies = [ "shlex", ] @@ -60,9 +60,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" dependencies = [ "crossbeam-epoch", "crossbeam-utils", @@ -79,9 +79,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "either" @@ -101,7 +101,7 @@ dependencies = [ [[package]] name = "imagequant" -version = "4.3.3" +version = "4.3.4" dependencies = [ "arrayvec", "lodepng", @@ -122,15 +122,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.167" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "lodepng" -version = "3.10.7" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b2dea7cda68e381418c985fd8f32a9c279a21ae8c715f2376adb20c27a0fad3" +checksum = "a7720115060cd38dcfe5c758525a43fd34dc615d0566374212ff0dc3b6151eac" dependencies = [ "crc32fast", "flate2", @@ -140,9 +140,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" dependencies = [ "adler2", ] diff --git a/pkgs/by-name/li/libimagequant/package.nix b/pkgs/by-name/li/libimagequant/package.nix index d1e3c6e4470c..d340ed1008d5 100644 --- a/pkgs/by-name/li/libimagequant/package.nix +++ b/pkgs/by-name/li/libimagequant/package.nix @@ -14,13 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "libimagequant"; - version = "4.3.3"; + version = "4.3.4"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "libimagequant"; rev = version; - hash = "sha256-l5YWT0lZ9+RSa347CEjfPX+MPZBQkraKADEBWg4ssNY="; + hash = "sha256-2P8FiRfOuCHxJrB+rnDDOFsrFjPv5GMBK/5sq7eb32w="; }; cargoLock = { From d61d9233df70e41b302602c242255c0b06266695 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 10:53:17 +0000 Subject: [PATCH 0099/1107] flatbuffers: 24.12.23 -> 25.1.24 --- pkgs/development/libraries/flatbuffers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index 71c47c43089e..f2430aa47b2d 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "flatbuffers"; - version = "24.12.23"; + version = "25.1.24"; src = fetchFromGitHub { owner = "google"; repo = "flatbuffers"; rev = "v${version}"; - hash = "sha256-6L6Eb+2xGXEqLYITWsNNPW4FTvfPFSmChK4hLusk5gU="; + hash = "sha256-LApjF14eoqcT11Jp9SaJQbtvK8iIelTY4GJKqjVCpCM="; }; nativeBuildInputs = [ From dba233a016e710f6f2ae4bfd14bb7e8659743987 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 27 Jan 2025 17:30:29 -0500 Subject: [PATCH 0100/1107] python312Packages.highdicom: 0.23.1 -> 0.24.0 --- pkgs/development/python-modules/highdicom/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/highdicom/default.nix b/pkgs/development/python-modules/highdicom/default.nix index fd3a9318b8ca..abd65d8e5a5b 100644 --- a/pkgs/development/python-modules/highdicom/default.nix +++ b/pkgs/development/python-modules/highdicom/default.nix @@ -11,6 +11,7 @@ pylibjpeg, pylibjpeg-libjpeg, setuptools, + typing-extensions, }: let @@ -23,7 +24,7 @@ let in buildPythonPackage rec { pname = "highdicom"; - version = "0.23.1"; + version = "0.24.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -32,7 +33,7 @@ buildPythonPackage rec { owner = "MGHComputationalPathology"; repo = "highdicom"; tag = "v${version}"; - hash = "sha256-LrsG85/bpqIEP++LgvyaVyw4tMsuUTtHNwWl7apuToM="; + hash = "sha256-1LRXJkltRLtPJ/NrFZVyjTusXfmcEVOTFEuq0gOI+yQ="; }; build-system = [ @@ -44,6 +45,7 @@ buildPythonPackage rec { pillow pillow-jpls pydicom + typing-extensions ]; optional-dependencies = { @@ -77,6 +79,7 @@ buildPythonPackage rec { "test_rgb_jpegls" "test_construction_autotile" "test_pixel_types_fractional" + "test_pixel_types_labelmap" ]; pythonImportsCheck = [ From 3379ddaa64b02d84fe13d264cb3fa5c772b6f1ac Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Thu, 23 Jan 2025 17:22:44 -0500 Subject: [PATCH 0101/1107] python312Packages.pylibjpeg-openjpeg: unbreak by lifting poetry-core version bounds --- pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix index e6d301908db7..ddd616eb0bfe 100644 --- a/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix +++ b/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix @@ -36,6 +36,8 @@ buildPythonPackage rec { rmdir lib/openjpeg cp -r ${openjpeg.src} lib/openjpeg chmod +rwX -R lib/openjpeg + + substituteInPlace pyproject.toml --replace-fail "poetry-core >=1.8,<2" "poetry-core" ''; dontUseCmakeConfigure = true; From 63a37dd5ed6093fe1e3a4fdf3823b5996cadc69f Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 27 Jan 2025 18:05:03 -0500 Subject: [PATCH 0102/1107] python312Packages.highdicom: restore pylibjpeg-openjpeg optional dependency --- pkgs/development/python-modules/highdicom/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/highdicom/default.nix b/pkgs/development/python-modules/highdicom/default.nix index fd3a9318b8ca..9310cb72eedd 100644 --- a/pkgs/development/python-modules/highdicom/default.nix +++ b/pkgs/development/python-modules/highdicom/default.nix @@ -10,6 +10,7 @@ pydicom, pylibjpeg, pylibjpeg-libjpeg, + pylibjpeg-openjpeg, setuptools, }: @@ -50,7 +51,7 @@ buildPythonPackage rec { libjpeg = [ pylibjpeg pylibjpeg-libjpeg - #pylibjpeg-openjpeg # broken on aarch64-linux + pylibjpeg-openjpeg ]; }; From 4bf87e58ac6983016e9b37437323a109e67775fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Jan 2025 03:21:19 +0000 Subject: [PATCH 0103/1107] wavpack: 5.7.0 -> 5.8.0 --- pkgs/by-name/wa/wavpack/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/wavpack/package.nix b/pkgs/by-name/wa/wavpack/package.nix index 906521e602dd..fb7dea59c951 100644 --- a/pkgs/by-name/wa/wavpack/package.nix +++ b/pkgs/by-name/wa/wavpack/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "wavpack"; - version = "5.7.0"; + version = "5.8.0"; enableParallelBuilding = true; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "dbry"; repo = "WavPack"; rev = version; - hash = "sha256-vFZxg1mVqE7Kp38vEGA5V8m2tjqhssFsUZURixhlfk0="; + hash = "sha256-JT4WOlga3jyHMznEJmgc6EQIAVBZdlazmQphJC1+r4s="; }; outputs = [ From 7851048caf6c5e41ecd73b06c139c1646d6196d2 Mon Sep 17 00:00:00 2001 From: macronova Date: Tue, 28 Jan 2025 14:45:58 +0800 Subject: [PATCH 0104/1107] Fix python dep --- .../wallpaper-engine-plugin/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix b/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix index 621a0109d809..a14b80983c8b 100644 --- a/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix +++ b/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix @@ -1,6 +1,6 @@ { extra-cmake-modules, fetchFromGitHub, kpackage, libplasma, lib, lz4 -, mkKdeDerivation, mpv, pkg-config, python3, qtbase, qtmultimedia, qtwebchannel -, qtwebengine, qtwebsockets, }: +, mkKdeDerivation, mpv-unwrapped, pkg-config, python3, qtbase, qtmultimedia +, qtwebchannel, qtwebengine, qtwebsockets, }: mkKdeDerivation { pname = "wallpaper-engine-kde-plugin"; version = "0.5.5-unstable-2024-11-03"; @@ -15,9 +15,13 @@ mkKdeDerivation { patches = [ ./nix-plugin.patch ]; - extraNativeBuildInputs = [ kpackage pkg-config ]; + extraNativeBuildInputs = [ + kpackage + pkg-config + (python3.withPackages (ps: with ps; [ websockets ])) + ]; - extraBuildInputs = [ extra-cmake-modules libplasma lz4 mpv ]; + extraBuildInputs = [ extra-cmake-modules libplasma lz4 mpv-unwrapped ]; extraCmakeFlags = [ (lib.cmakeFeature "QML_LIB" (lib.makeSearchPathOutput "out" "lib/qt-6/qml" [ @@ -29,11 +33,10 @@ mkKdeDerivation { (lib.cmakeFeature "Qt6_DIR" "${qtbase}/lib/cmake/Qt6") ]; - postInstall = let py3-ws = python3.withPackages (ps: with ps; [ websockets ]); - in '' + postInstall = '' cd $out/share/plasma/wallpapers/com.github.catsout.wallpaperEngineKde chmod +x ./contents/pyext.py - PATH=${py3-ws}/bin:$PATH patchShebangs --build ./contents/pyext.py + patchShebangs --build ./contents/pyext.py substituteInPlace ./contents/ui/Pyext.qml --replace-fail NIX_STORE_PACKAGE_PATH ${ placeholder "out" } From 526197eff9878135a123516d6bbaab213ab6c2ed Mon Sep 17 00:00:00 2001 From: macronova Date: Tue, 28 Jan 2025 14:55:30 +0800 Subject: [PATCH 0105/1107] Update key signature and format --- maintainers/maintainer-list.nix | 2 +- .../wallpaper-engine-plugin/default.nix | 47 ++++++++++++++----- 2 files changed, 35 insertions(+), 14 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fc3cb9791f5c..f7a752116ef8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13822,7 +13822,7 @@ matrix = "@macronova:invariantspace.com"; github = "Sicheng-Pan"; githubId = 60079945; - keys = [ { fingerprint = "49D3 FFDA 4D30 DDEE 68EF AE84 EBC4 A200 6737 3921"; } ]; + keys = [ { fingerprint = "7590 C9DD E19D 4497 9EE9 0B14 CE96 9670 FB4B 4A56"; } ]; }; madjar = { email = "georges.dubus@compiletoi.net"; diff --git a/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix b/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix index a14b80983c8b..4ea13d340dbf 100644 --- a/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix +++ b/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix @@ -1,6 +1,20 @@ -{ extra-cmake-modules, fetchFromGitHub, kpackage, libplasma, lib, lz4 -, mkKdeDerivation, mpv-unwrapped, pkg-config, python3, qtbase, qtmultimedia -, qtwebchannel, qtwebengine, qtwebsockets, }: +{ + extra-cmake-modules, + fetchFromGitHub, + kpackage, + libplasma, + lib, + lz4, + mkKdeDerivation, + mpv-unwrapped, + pkg-config, + python3, + qtbase, + qtmultimedia, + qtwebchannel, + qtwebengine, + qtwebsockets, +}: mkKdeDerivation { pname = "wallpaper-engine-kde-plugin"; version = "0.5.5-unstable-2024-11-03"; @@ -21,15 +35,22 @@ mkKdeDerivation { (python3.withPackages (ps: with ps; [ websockets ])) ]; - extraBuildInputs = [ extra-cmake-modules libplasma lz4 mpv-unwrapped ]; + extraBuildInputs = [ + extra-cmake-modules + libplasma + lz4 + mpv-unwrapped + ]; extraCmakeFlags = [ - (lib.cmakeFeature "QML_LIB" (lib.makeSearchPathOutput "out" "lib/qt-6/qml" [ - qtmultimedia - qtwebchannel - qtwebengine - qtwebsockets - ])) + (lib.cmakeFeature "QML_LIB" ( + lib.makeSearchPathOutput "out" "lib/qt-6/qml" [ + qtmultimedia + qtwebchannel + qtwebengine + qtwebsockets + ] + )) (lib.cmakeFeature "Qt6_DIR" "${qtbase}/lib/cmake/Qt6") ]; @@ -37,9 +58,9 @@ mkKdeDerivation { cd $out/share/plasma/wallpapers/com.github.catsout.wallpaperEngineKde chmod +x ./contents/pyext.py patchShebangs --build ./contents/pyext.py - substituteInPlace ./contents/ui/Pyext.qml --replace-fail NIX_STORE_PACKAGE_PATH ${ - placeholder "out" - } + substituteInPlace ./contents/ui/Pyext.qml \ + --replace-fail NIX_STORE_PACKAGE_PATH ${placeholder "out"} + cd - ''; meta = with lib; { From 88d9c7ffb7b9b5cbd83c2f841b6d5048b34c87e4 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Tue, 28 Jan 2025 15:38:16 +0530 Subject: [PATCH 0106/1107] dprint-plugin-toml: 0.6.3 -> 0.6.4 Signed-off-by: phanirithvij --- pkgs/by-name/dp/dprint/plugins/dprint-plugin-toml.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-toml.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-toml.nix index 3eef32b0e3bd..c45e02804f64 100644 --- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-toml.nix +++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-toml.nix @@ -1,7 +1,7 @@ { mkDprintPlugin }: mkDprintPlugin { description = "TOML code formatter."; - hash = "sha256-aDfo/sKfOeNpyfd/4N1LgL1bObTTnviYrA8T7M/1KNs="; + hash = "sha256-4g/nu8Wo7oF+8OAyXOzs9MuGpt2RFGvD58Bafnrr3ZQ="; initConfig = { configExcludes = [ ]; configKey = "toml"; @@ -9,6 +9,6 @@ mkDprintPlugin { }; pname = "dprint-plugin-toml"; updateUrl = "https://plugins.dprint.dev/dprint/toml/latest.json"; - url = "https://plugins.dprint.dev/toml-0.6.3.wasm"; - version = "0.6.3"; + url = "https://plugins.dprint.dev/toml-0.6.4.wasm"; + version = "0.6.4"; } From e96c70a7ff61a9a6b82f3ca7767c5b0ccf7ac872 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 27 Jan 2025 00:45:25 +0100 Subject: [PATCH 0107/1107] rustPlatform.fetchCargoVendor: set strictDeps and dontConfigure by default --- pkgs/build-support/rust/fetch-cargo-vendor.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/build-support/rust/fetch-cargo-vendor.nix b/pkgs/build-support/rust/fetch-cargo-vendor.nix index 899c799c5fcc..d166cb0c44e6 100644 --- a/pkgs/build-support/rust/fetch-cargo-vendor.nix +++ b/pkgs/build-support/rust/fetch-cargo-vendor.nix @@ -71,6 +71,9 @@ let runHook postBuild ''; + strictDeps = true; + + dontConfigure = true; dontInstall = true; dontFixup = true; From 3b14303c5955c413cb7ad942b8c4e68b60146d43 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Sun, 19 Jan 2025 12:28:21 +0100 Subject: [PATCH 0108/1107] libsecret: enable TPM support --- pkgs/by-name/li/libsecret/package.nix | 110 +++++++++++++++++++++++--- 1 file changed, 97 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/li/libsecret/package.nix b/pkgs/by-name/li/libsecret/package.nix index f422de359ca2..52bf76bc68a7 100644 --- a/pkgs/by-name/li/libsecret/package.nix +++ b/pkgs/by-name/li/libsecret/package.nix @@ -24,8 +24,51 @@ gjs, libintl, dbus, + withTpm2Tss ? false, + abrmdSupport ? false, + writeShellApplication, + tpm2-tss, + tpm2-abrmd, + libsecret, }: +assert abrmdSupport -> withTpm2Tss; + +let + tpm-emu = writeShellApplication { + name = "tpm-emu"; + runtimeInputs = [ + dbus + tpm2-abrmd + ]; + + text = '' + coproc { + # Monitor session bus for name acquisition + dbus-monitor "type='signal',interface='org.freedesktop.DBus',member='NameAcquired',arg0='com.intel.tss2.Tabrmd'" + } + + # Discard initial dbus-monitor output + while read -r -t 0.1 -u "''${COPROC[0]}"; do :; done + + tpm2-abrmd \ + --tcti=libtpms \ + --allow-root \ + --flush-all \ + --session & + + # Terminate tpm2-abrmd on exit + # shellcheck disable=SC2064 # immediate expansion intended + trap "kill '$!'" EXIT + + # Wait for daemon to become available to avoid spurious test failures + read -r -t 60 -u "''${COPROC[0]}" + kill "$COPROC_PID" + + TCTI="tabrmd:bus_type=session" "$@" + ''; + }; +in stdenv.mkDerivation rec { pname = "libsecret"; version = "0.21.6"; @@ -62,9 +105,12 @@ stdenv.mkDerivation rec { gobject-introspection ]; - buildInputs = [ - libgcrypt - ]; + buildInputs = + [ + libgcrypt + ] + ++ lib.optionals withTpm2Tss [ tpm2-tss ] + ++ lib.optionals abrmdSupport [ tpm2-abrmd ]; propagatedBuildInputs = [ glib @@ -81,6 +127,7 @@ stdenv.mkDerivation rec { mesonFlags = [ (lib.mesonBool "introspection" withIntrospection) (lib.mesonBool "gtk_doc" withIntrospection) + (lib.mesonBool "tpm2" withTpm2Tss) (lib.mesonOption "bashcompdir" "share/bash-completion/completions") ]; @@ -93,19 +140,39 @@ stdenv.mkDerivation rec { # dbus-run-session defaults to FHS path substituteInPlace meson.build --replace-fail \ "exe_wrapper: dbus_run_session," \ - "exe_wrapper: [dbus_run_session, '--config-file=${dbus}/share/dbus-1/session.conf']," + "exe_wrapper: [dbus_run_session, '--config-file=${dbus}/share/dbus-1/session.conf'${lib.optionalString withTpm2Tss ", '${lib.getExe tpm-emu}'"}]," ''; - preCheck = '' - # Our gobject-introspection patches make the shared library paths absolute - # in the GIR files. When running tests, the library is not yet installed, - # though, so we need to replace the absolute path with a local one during build. - # We are using a symlink that will be overwitten during installation. - mkdir -p $out/lib $out/lib - ln -s "$PWD/libsecret/libmock-service.so" "$out/lib/libmock-service.so" - ln -s "$PWD/libsecret/libsecret-1.so.0" "$out/lib/libsecret-1.so.0" + preConfigure = lib.optionalString abrmdSupport '' + # Add dependencies on TCTI modules required for user‐space TPM resource + # manager support so that they can be loaded at run time through dlopen(). + mesonFlagsArray+=("-Dc_link_args=-Wl,--push-state,--no-as-needed -ltss2-tcti-tabrmd -ltss2-tcti-device -Wl,--pop-state") ''; + preCheck = + '' + # Our gobject-introspection patches make the shared library paths absolute + # in the GIR files. When running tests, the library is not yet installed, + # though, so we need to replace the absolute path with a local one during build. + # We are using a symlink that will be overwitten during installation. + mkdir -p $out/lib $out/lib + ln -s "$PWD/libsecret/libmock-service.so" "$out/lib/libmock-service.so" + ln -s "$PWD/libsecret/libsecret-1.so.0" "$out/lib/libsecret-1.so.0" + '' + + lib.optionalString (withTpm2Tss && !abrmdSupport) '' + # If abrmdSupport is disabled, the user‐space resource manager TCTI + # module is not linked at compile time. It is however needed during + # testing because the TPM emulator lacks an integrated resource manager + # The module path is therefore injected temporarly using the + # LD_LIBRARY_PATH environment variable, so that it may be found by + # dlopen(). + # + # If abrmdSupport is enabled, this is avoided to check that the + # module has been properly linked and can be located through the + # DT_RUNPATH and DT_NEEDED entries in libsecret-1.so. + export LD_LIBRARY_PATH+=":${lib.makeLibraryPath [ tpm2-abrmd ]}" + ''; + checkPhase = '' runHook preCheck @@ -130,6 +197,18 @@ stdenv.mkDerivation rec { # Does not seem to use the odd-unstable policy: https://gitlab.gnome.org/GNOME/libsecret/issues/30 versionPolicy = "none"; }; + + tests = { + libsecret-tpm2 = libsecret.override { + withTpm2Tss = true; + abrmdSupport = false; + }; + + libsecret-tpm2-abrmd = libsecret.override { + withTpm2Tss = true; + abrmdSupport = true; + }; + }; }; meta = { @@ -137,6 +216,11 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/libsecret"; license = lib.licenses.lgpl21Plus; mainProgram = "secret-tool"; - inherit (glib.meta) platforms maintainers; + platforms = + if withTpm2Tss then + lib.intersectLists glib.meta.platforms tpm2-tss.meta.platforms + else + glib.meta.platforms; + inherit (glib.meta) maintainers; }; } From 1244a54f747174479e5355b4382830a59cbc1b9e Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 28 Jan 2025 22:10:47 +0100 Subject: [PATCH 0109/1107] rustPlatform.fetchCargoVendor: reuse http session across requests --- pkgs/build-support/rust/fetch-cargo-vendor-util.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/rust/fetch-cargo-vendor-util.py b/pkgs/build-support/rust/fetch-cargo-vendor-util.py index bb70a559fe96..a0c1104cedf3 100644 --- a/pkgs/build-support/rust/fetch-cargo-vendor-util.py +++ b/pkgs/build-support/rust/fetch-cargo-vendor-util.py @@ -31,7 +31,7 @@ def get_lockfile_version(cargo_lock_toml: dict[str, Any]) -> int: return version -def download_file_with_checksum(url: str, destination_path: Path) -> str: +def create_http_session() -> requests.Session: retries = Retry( total=5, backoff_factor=0.5, @@ -40,7 +40,10 @@ def download_file_with_checksum(url: str, destination_path: Path) -> str: session = requests.Session() session.mount('http://', HTTPAdapter(max_retries=retries)) session.mount('https://', HTTPAdapter(max_retries=retries)) + return session + +def download_file_with_checksum(session: requests.Session, url: str, destination_path: Path) -> str: sha256_hash = hashlib.sha256() with session.get(url, stream=True) as response: if not response.ok: @@ -66,7 +69,7 @@ def get_download_url_for_tarball(pkg: dict[str, Any]) -> str: return f"https://crates.io/api/v1/crates/{pkg["name"]}/{pkg["version"]}/download" -def download_tarball(pkg: dict[str, Any], out_dir: Path) -> None: +def download_tarball(session: requests.Session, pkg: dict[str, Any], out_dir: Path) -> None: url = get_download_url_for_tarball(pkg) filename = f"{pkg["name"]}-{pkg["version"]}.tar.gz" @@ -78,7 +81,7 @@ def download_tarball(pkg: dict[str, Any], out_dir: Path) -> None: tarball_out_dir = out_dir / "tarballs" / filename eprint(f"Fetching {url} -> tarballs/{filename}") - calculated_checksum = download_file_with_checksum(url, tarball_out_dir) + calculated_checksum = download_file_with_checksum(session, url, tarball_out_dir) if calculated_checksum != expected_checksum: raise Exception(f"Hash mismatch! File fetched from {url} had checksum {calculated_checksum}, expected {expected_checksum}.") @@ -157,7 +160,8 @@ def create_vendor_staging(lockfile_path: Path, out_dir: Path) -> None: with mp.Pool(min(5, mp.cpu_count())) as pool: if len(registry_packages) != 0: (out_dir / "tarballs").mkdir() - tarball_args_gen = ((pkg, out_dir) for pkg in registry_packages) + session = create_http_session() + tarball_args_gen = ((session, pkg, out_dir) for pkg in registry_packages) pool.starmap(download_tarball, tarball_args_gen) From e0d1accdeef5866226c90032fbdf0197b5d9bb43 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 28 Jan 2025 22:54:06 +0000 Subject: [PATCH 0110/1107] pkgsi686Linux.libredirect: do no fail on 64-bit inodes Without the change `pkgsi686Linux.libredirect` tests fail on `btrfs` where inodes are outside 32-bit range: $ nix build --no-link -f. -L pkgsi686Linux.libredirect ... libredirect> test: test.c:95: main: Assertion `stat(TESTPATH, &testsb) != -1' failed. As libredirect` intends to test 32-bit syscall interface let's just skip the overflows. --- pkgs/by-name/li/libredirect/test.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libredirect/test.c b/pkgs/by-name/li/libredirect/test.c index e5685fcb31b7..59a47d8a02ae 100644 --- a/pkgs/by-name/li/libredirect/test.c +++ b/pkgs/by-name/li/libredirect/test.c @@ -92,11 +92,15 @@ int main(int argc, char *argv[]) assert(access(TESTPATH, X_OK) == 0); - assert(stat(TESTPATH, &testsb) != -1); + // On EOVERFLOW checks below: when TESTPATH lands on a filesystem + // that requires 64-bit inode values (like btrfs used for a while) + // it will fail on 32-bit systems. + + assert(stat(TESTPATH, &testsb) != -1 || errno == EOVERFLOW); #ifdef __GLIBC__ assert(stat64(TESTPATH, &testsb64) != -1); #endif - assert(fstatat(123, TESTPATH, &testsb, 0) != -1); + assert(fstatat(123, TESTPATH, &testsb, 0) != -1 || errno == EOVERFLOW); #ifdef __GLIBC__ assert(fstatat64(123, TESTPATH, &testsb64, 0) != -1); #endif From efb7d4f32774bad72e9f31e205cbf5efc9c4b28b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 28 Jan 2025 02:10:33 +0100 Subject: [PATCH 0111/1107] util-linuxMinimal: build without pam and shadow These depend on python via audit preventing the use of libuuid from util-linux in python builds. --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f2de6a7b18d..cdcabbf17d86 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12502,6 +12502,8 @@ with pkgs; util-linuxMinimal = util-linux.override { nlsSupport = false; ncursesSupport = false; + pamSupport = false; + shadowSupport = false; systemdSupport = false; translateManpages = false; }; From 94e717e8ff1283e5120759ebab13f70939d895d5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 28 Jan 2025 02:11:22 +0100 Subject: [PATCH 0112/1107] cpython: provide libuuid for the _uuid module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Relying on libuuid offers synchronization primitives, so that "no two processes can obtain the same UUID"¹. [1] https://docs.python.org/3/library/uuid.html#module-uuid --- pkgs/development/interpreters/python/cpython/default.nix | 2 ++ pkgs/development/interpreters/python/default.nix | 1 + 2 files changed, 3 insertions(+) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index d0cb05268d43..eb839b446c13 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -15,6 +15,7 @@ , bzip2 , expat , libffi +, libuuid , libxcrypt , mpdecimal , ncurses @@ -166,6 +167,7 @@ let bzip2 expat libffi + libuuid libxcrypt mpdecimal ncurses diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 582c37cd2c79..edc187ac2a16 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -117,6 +117,7 @@ in { gdbm = null; sqlite = null; tzdata = null; + libuuid = null; libffi = libffiBoot; # without test suite stripConfig = true; stripIdlelib = true; From 001ba37df7fe527b68d23d78ed5ff5d7f174ad7d Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Wed, 29 Jan 2025 09:07:38 +0100 Subject: [PATCH 0113/1107] dotnet-repl: 0.1.216 -> 0.3.230 --- pkgs/by-name/do/dotnet-repl/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/do/dotnet-repl/package.nix b/pkgs/by-name/do/dotnet-repl/package.nix index be1790159839..746819980117 100644 --- a/pkgs/by-name/do/dotnet-repl/package.nix +++ b/pkgs/by-name/do/dotnet-repl/package.nix @@ -6,12 +6,12 @@ buildDotnetGlobalTool { pname = "dotnet-repl"; - version = "0.1.216"; + version = "0.3.230"; - dotnet-sdk = dotnetCorePackages.sdk_8_0; - dotnet-runtime = dotnetCorePackages.runtime_8_0; + dotnet-sdk = dotnetCorePackages.sdk_9_0; + dotnet-runtime = dotnetCorePackages.runtime_9_0; - nugetHash = "sha256-JHatCW+hl2792S+HYeEbbYbCIS+N4DmOctqXB/56/HU="; + nugetHash = "sha256-FtITkDZ0Qbjo0XvQ8psRlIsbEZhMjIhk8mVrHmUxlIg="; meta = { description = "A polyglot REPL built on .NET Interactive"; From 684ddcb6c22100f6d1ab73b3f40020d70076c69e Mon Sep 17 00:00:00 2001 From: Mia <59005594+kawaiiepic@users.noreply.github.com> Date: Wed, 29 Jan 2025 13:33:07 -0500 Subject: [PATCH 0114/1107] Update ltc.nix --- pkgs/applications/misc/electrum/ltc.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index 8e2ad76b2655..4148adcc6bab 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -85,6 +85,7 @@ python3.pkgs.buildPythonApplication { ckcc-protocol keepkey trezor + distutils ] ++ lib.optionals enableQt [ pyqt5 From 635db320d080fc5decff99abf0d1689e846a18f5 Mon Sep 17 00:00:00 2001 From: Mia <59005594+kawaiiepic@users.noreply.github.com> Date: Wed, 29 Jan 2025 19:21:59 -0500 Subject: [PATCH 0115/1107] change sha256 to hash --- pkgs/applications/misc/electrum/ltc.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index 4148adcc6bab..51df5b17b99d 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://electrum-ltc.org/download/Electrum-LTC-${version}.tar.gz"; - sha256 = "sha256-7F28cve+HD5JDK5igfkGD/NvTCfA33g+DmQJ5mwPM9Q="; + hash = "sha256-7F28cve+HD5JDK5igfkGD/NvTCfA33g+DmQJ5mwPM9Q="; }; postUnpack = '' From ec413d40ad1c4c09615d029ae298a71b9b729901 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Jan 2025 01:31:21 +0000 Subject: [PATCH 0116/1107] libsepol: 3.7 -> 3.8 --- pkgs/by-name/li/libsepol/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libsepol/package.nix b/pkgs/by-name/li/libsepol/package.nix index 01e038d4ec0c..09feeb1e2fdf 100644 --- a/pkgs/by-name/li/libsepol/package.nix +++ b/pkgs/by-name/li/libsepol/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "libsepol"; - version = "3.7"; + version = "3.8"; se_url = "https://github.com/SELinuxProject/selinux/releases/download"; outputs = [ @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${se_url}/${version}/libsepol-${version}.tar.gz"; - sha256 = "sha256-zXQeJSROfvbNk01jNhQTGiZsPq6rM9i/pF6Kk7RcyQE="; + sha256 = "sha256-hE+9vwIzS5zgODOtimcQU/Z7QHbXLbTwPg7iZl7C61U="; }; postPatch = lib.optionalString stdenv.hostPlatform.isStatic '' From f3ef7bf9f94510d80ca2721329d0d7debad21458 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 29 Jan 2025 03:04:12 +0100 Subject: [PATCH 0117/1107] =?UTF-8?q?gtk3:=203.24.43=20=E2=86=92=203.24.48?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtk/-/compare/3.24.43...3.24.48 --- pkgs/development/libraries/gtk/3.x.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 984ab02bf645..e995b48a1557 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -63,7 +63,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gtk+3"; - version = "3.24.43"; + version = "3.24.48"; outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; outputBin = "dev"; @@ -76,8 +76,8 @@ stdenv.mkDerivation (finalAttrs: { src = let inherit (finalAttrs) version; in fetchurl { - url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - hash = "sha256-fgTwZIUVA0uAa3SuXXdNh8/7GiqWxGjLW+R21Rvy88c="; + url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; + hash = "sha256-0Qzp6p30TBAW2NFyHznlXT1gf8+4UzSuwNI2zcmnBVY="; }; patches = [ @@ -233,7 +233,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = gnome.updateScript { - packageName = "gtk+"; + packageName = "gtk"; attrPath = "gtk3"; freeze = true; }; From 4745969cb31fb6155f5a2c4323117cd7effa05f2 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 17 Jan 2025 15:29:07 +0100 Subject: [PATCH 0118/1107] meson.setupHook: build test targets In Meson 1.7, these will no longer be built by default [1], so because we're running meson test with --no-rebuild, we need to build them before running the test. Doing this in checkPhase makes more sense than in buildPhase, because allows buildPhase to work without test-only dependencies, something we've had to work around in the past by adding options to packages to disable building the tests. The meson-test-prereq target has been available since Meson 0.63.0 according to the documentation, so we can do this ahead of actually upgrading to Meson 1.7.0. Link: https://mesonbuild.com/Release-notes-for-1-7-0.html#test-targets-no-longer-built-by-default [1] --- pkgs/by-name/me/meson/setup-hook.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/me/meson/setup-hook.sh b/pkgs/by-name/me/meson/setup-hook.sh index b2061a12058c..1885265eabbf 100644 --- a/pkgs/by-name/me/meson/setup-hook.sh +++ b/pkgs/by-name/me/meson/setup-hook.sh @@ -58,6 +58,14 @@ mesonCheckPhase() { flagsArray+=("--timeout-multiplier=0") fi + # Parallel building is enabled by default. + local buildCores=1 + if [ "${enableParallelBuilding-1}" ]; then + buildCores="$NIX_BUILD_CORES" + fi + + TERM=dumb ninja -j"$buildCores" $ninjaFlags "${ninjaFlagsArray[@]}" meson-test-prereq + echoCmd 'mesonCheckPhase flags' "${flagsArray[@]}" meson test --no-rebuild --print-errorlogs "${flagsArray[@]}" From 562b6042f16770e1343342eb8f67638c27fe576e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 30 Jan 2025 06:32:48 +0000 Subject: [PATCH 0119/1107] meson: 1.6.1 -> 1.7.0 Changes: https://github.com/mesonbuild/meson/blob/1.7.0/docs/markdown/Release-notes-for-1.7.0.md --- pkgs/by-name/me/meson/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index d4bd67c4b494..79d0e5b7eb54 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -28,13 +28,13 @@ let in python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "mesonbuild"; repo = "meson"; tag = version; - hash = "sha256-t0JItqEbf2YqZnu5mVsCO9YGzB7WlCfsIwi76nHJ/WI="; + hash = "sha256-nvaq+9evQSj/ahK68nj8FckG4nA1gs2DqcZxFEFH1iU="; }; patches = [ From e64988cb6685e05b12f6f0a7285ef0f9adf4102a Mon Sep 17 00:00:00 2001 From: misilelab Date: Thu, 30 Jan 2025 04:34:30 +0900 Subject: [PATCH 0120/1107] fontconfig: 2.15.0 -> 2.16.0 Signed-off-by: misilelab --- pkgs/development/libraries/fontconfig/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index c7f14c8d86d4..7caccd4a2881 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fontconfig"; - version = "2.15.0"; + version = "2.16.0"; outputs = [ "bin" @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { url = with finalAttrs; "https://www.freedesktop.org/software/fontconfig/release/${pname}-${version}.tar.xz"; - hash = "sha256-Y6BljQ4G4PqIYQZFK1jvBPIfWCAuoCqUw53g0zNdfA4="; + hash = "sha256-ajPcVVzJuosQyvdpWHjvE07rNtCvNmBB9jmx2ptu0iA="; }; nativeBuildInputs = [ @@ -51,6 +51,9 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' # Requires networking. sed -i '/check_PROGRAMS += test-crbug1004254/d' test/Makefile.am + + # Test causes error without patch shebangs. + patchShebangs doc/check-whitespace-in-args.py ''; configureFlags = From b9f7683ecc09e11102839f9e8b5b37dddd798f8c Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Thu, 30 Jan 2025 17:58:23 +0000 Subject: [PATCH 0121/1107] doc: add redirect for no-broken-symlinks.sh --- doc/redirects.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/redirects.json b/doc/redirects.json index 4fada4e6cf2f..10f383a2613d 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -20,6 +20,9 @@ "nixpkgs-manual": [ "index.html#nixpkgs-manual" ], + "no-broken-symlinks.sh": [ + "index.html#no-broken-symlinks.sh" + ], "preface": [ "index.html#preface" ], From 5926f753b31528738be20c2826005c59ee72167d Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Thu, 30 Jan 2025 18:08:38 +0000 Subject: [PATCH 0122/1107] no-broken-symlinks: clean up error log output --- pkgs/build-support/setup-hooks/no-broken-symlinks.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/setup-hooks/no-broken-symlinks.sh b/pkgs/build-support/setup-hooks/no-broken-symlinks.sh index 6609c08e8436..e2694c2b7bde 100644 --- a/pkgs/build-support/setup-hooks/no-broken-symlinks.sh +++ b/pkgs/build-support/setup-hooks/no-broken-symlinks.sh @@ -51,10 +51,10 @@ noBrokenSymlinks() { fi if [[ $path == "$symlinkTarget" ]]; then - nixErrorLog "the symlink $path is reflexive $symlinkTarget" + nixErrorLog "the symlink $path is reflexive" numReflexiveSymlinks+=1 elif [[ ! -e $symlinkTarget ]]; then - nixErrorLog "the symlink $path points to a missing target $symlinkTarget" + nixErrorLog "the symlink $path points to a missing target: $symlinkTarget" numDanglingSymlinks+=1 else nixDebugLog "the symlink $path is irreflexive and points to a target which exists" From 4ff5979e5100613e77c5c3ebb11f86761bfd9ffe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Jan 2025 23:35:40 +0000 Subject: [PATCH 0123/1107] directx-headers: 1.614.1 -> 1.615.0 --- pkgs/by-name/di/directx-headers/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/di/directx-headers/package.nix b/pkgs/by-name/di/directx-headers/package.nix index 0acb2db0edc0..2c8773045ab5 100644 --- a/pkgs/by-name/di/directx-headers/package.nix +++ b/pkgs/by-name/di/directx-headers/package.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation rec { pname = "directx-headers"; - version = "1.614.1"; + version = "1.615.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "DirectX-Headers"; rev = "v${version}"; - hash = "sha256-CDmzKdV40EExLpOHPAUnytqG9x1+IGW4AZldfYs5YJk="; + hash = "sha256-1s/lrvUUOBGVAtfyAG2b/9raQVj2Hcjw9/RtqBO7ENA="; }; nativeBuildInputs = [ From c5b890c4139f854329caa6232c02fe2a592f3847 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Fri, 31 Jan 2025 08:29:56 +0100 Subject: [PATCH 0124/1107] patch-shebangs: fix `env -S` with only one argument MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In case `patchShebangs` encounters an `env -S` interpreter with only one argument following, it would duplicate that argument and most likely invalidate the resulting interpreter line. Reproducer: ```nix (import {}).writeTextFile { name = "patch-shebangs-env-s"; text = '' #!/bin/env -S bash ''; executable = true; checkPhase = '' patchShebangs $out ''; } ``` The resulting file would contain ``` #!/nix/store/pw…fk-coreutils-9.5/bin/env -S /nix/store/4f…g60-bash-5.2p37/bin/bash bash ``` instead of the correct ``` #!/nix/store/pw…fk-coreutils-9.5/bin/env -S /nix/store/4f…g60-bash-5.2p37/bin/bash ``` --- pkgs/build-support/setup-hooks/patch-shebangs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh index f22da254a791..a7b2b110f23f 100644 --- a/pkgs/build-support/setup-hooks/patch-shebangs.sh +++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh @@ -89,7 +89,7 @@ patchShebangs() { if [[ "$oldPath" == *"/bin/env" ]]; then if [[ $arg0 == "-S" ]]; then arg0=${args%% *} - args=${args#* } + [[ "$args" == *" "* ]] && args=${args#* } || args= newPath="$(PATH="${!pathName}" type -P "env" || true)" args="-S $(PATH="${!pathName}" type -P "$arg0" || true) $args" From 0f391bb2f20243a609758ecd8c426671c31c9a19 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Jan 2025 10:43:23 +0000 Subject: [PATCH 0125/1107] mvfst: 2025.01.06.00 -> 2025.01.27.00 --- pkgs/by-name/mv/mvfst/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mv/mvfst/package.nix b/pkgs/by-name/mv/mvfst/package.nix index 0179fa3621e7..96a182cdf63d 100644 --- a/pkgs/by-name/mv/mvfst/package.nix +++ b/pkgs/by-name/mv/mvfst/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mvfst"; - version = "2025.01.06.00"; + version = "2025.01.27.00"; outputs = [ "bin" @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "mvfst"; tag = "v${finalAttrs.version}"; - hash = "sha256-xgqVksPcm9CStAK32oNz7DT0CVzFb8ANohNxtyP0iT0="; + hash = "sha256-8qYybElhtZyx87aZnR6r5exrLewsInS1U2m+zVPXSyw="; }; patches = [ From 4e54dd0c519c6f5d0101de9e01f719e3ac16820a Mon Sep 17 00:00:00 2001 From: DavHau Date: Wed, 1 Jan 2025 02:39:01 +0700 Subject: [PATCH 0126/1107] format pkgs/build-support/rust/hooks/default.nix --- pkgs/build-support/rust/hooks/default.nix | 84 ++++++++++++++--------- 1 file changed, 52 insertions(+), 32 deletions(-) diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix index 37d1b6686255..35d2e9844dae 100644 --- a/pkgs/build-support/rust/hooks/default.nix +++ b/pkgs/build-support/rust/hooks/default.nix @@ -1,59 +1,72 @@ -{ buildPackages -, callPackage -, cargo -, cargo-nextest -, clang -, lib -, makeSetupHook -, maturin -, rust -, rustc -, stdenv +{ + buildPackages, + callPackage, + cargo, + cargo-nextest, + clang, + lib, + makeSetupHook, + maturin, + rust, + rustc, + stdenv, -# This confusingly-named parameter indicates the *subdirectory of -# `target/` from which to copy the build artifacts. It is derived -# from a stdenv platform (or a JSON file). -, target ? stdenv.hostPlatform.rust.cargoShortTarget + # This confusingly-named parameter indicates the *subdirectory of + # `target/` from which to copy the build artifacts. It is derived + # from a stdenv platform (or a JSON file). + target ? stdenv.hostPlatform.rust.cargoShortTarget, }: { - cargoBuildHook = callPackage ({ }: + cargoBuildHook = callPackage ( + { }: makeSetupHook { name = "cargo-build-hook.sh"; propagatedBuildInputs = [ cargo ]; substitutions = { inherit (rust.envVars) rustHostPlatformSpec setEnv; }; - } ./cargo-build-hook.sh) {}; + } ./cargo-build-hook.sh + ) { }; - cargoCheckHook = callPackage ({ }: + cargoCheckHook = callPackage ( + { }: makeSetupHook { name = "cargo-check-hook.sh"; propagatedBuildInputs = [ cargo ]; substitutions = { inherit (rust.envVars) rustHostPlatformSpec setEnv; }; - } ./cargo-check-hook.sh) {}; + } ./cargo-check-hook.sh + ) { }; - cargoInstallHook = callPackage ({ }: + cargoInstallHook = callPackage ( + { }: makeSetupHook { name = "cargo-install-hook.sh"; propagatedBuildInputs = [ ]; substitutions = { targetSubdirectory = target; }; - } ./cargo-install-hook.sh) {}; + } ./cargo-install-hook.sh + ) { }; - cargoNextestHook = callPackage ({ }: + cargoNextestHook = callPackage ( + { }: makeSetupHook { name = "cargo-nextest-hook.sh"; - propagatedBuildInputs = [ cargo cargo-nextest ]; + propagatedBuildInputs = [ + cargo + cargo-nextest + ]; substitutions = { inherit (rust.envVars) rustHostPlatformSpec; }; - } ./cargo-nextest-hook.sh) {}; + } ./cargo-nextest-hook.sh + ) { }; - cargoSetupHook = callPackage ({ }: + cargoSetupHook = callPackage ( + { }: makeSetupHook { name = "cargo-setup-hook.sh"; propagatedBuildInputs = [ ]; @@ -71,12 +84,16 @@ [target."${stdenv.hostPlatform.rust.rustcTarget}"] "linker" = "${rust.envVars.ccForHost}" ''} - "rustflags" = [ "-C", "target-feature=${if stdenv.hostPlatform.isStatic then "+" else "-"}crt-static" ] + "rustflags" = [ "-C", "target-feature=${ + if stdenv.hostPlatform.isStatic then "+" else "-" + }crt-static" ] ''; }; - } ./cargo-setup-hook.sh) {}; + } ./cargo-setup-hook.sh + ) { }; - maturinBuildHook = callPackage ({ pkgsHostTarget }: + maturinBuildHook = callPackage ( + { pkgsHostTarget }: makeSetupHook { name = "maturin-build-hook.sh"; propagatedBuildInputs = [ @@ -87,14 +104,17 @@ substitutions = { inherit (rust.envVars) rustTargetPlatformSpec setEnv; }; - } ./maturin-build-hook.sh) {}; + } ./maturin-build-hook.sh + ) { }; - bindgenHook = callPackage ({}: makeSetupHook { + bindgenHook = callPackage ( + { }: + makeSetupHook { name = "rust-bindgen-hook"; substitutions = { libclang = (lib.getLib clang.cc); inherit clang; }; - } - ./rust-bindgen-hook.sh) {}; + } ./rust-bindgen-hook.sh + ) { }; } From db4cf6cb1dd04630efa35706050884d18a700374 Mon Sep 17 00:00:00 2001 From: DavHau Date: Wed, 1 Jan 2025 02:40:34 +0700 Subject: [PATCH 0127/1107] rust: fix splicing for rust hooks This fixes a long standing issue where rust hooks behave differently when used inside buildRustPackage vs inside mkDerivation, which lead to surprising behavior, like for example the package being built for the wrong paltform or the linker not being found especially in cross compilation scenarios. The reason for this inconsitency was, that buildRustPackage consumed the hooks in a non-spliced form, via [this inherit statement](https://github.com/NixOS/nixpkgs/blob/4506ece030a0c82d078edd0360ea8af6b4d94035/pkgs/development/compilers/rust/make-rust-platform.nix#L60), and therefore the usual platform shift on the hooks introduced by putting them in `nativeBuildInputs` was not applied here. Thoug whenever the hook was used inside other builders like `mkDerivation` the platform shift did apply correctly as the hook was consumed via the spliced package set, introducing the inconsitecy. Because of the wrong (non-spliced) use in buildRustPackage, most rust hooks have been designed with the wrong build/host/target shift in mind which is fixed by this change. Due to the inconsitent behavior between different builders, workarounds like `rust.envVars`, which were previously introduced, likely become obsolete by this change. This likely fixes a bunch of cross compilation issues for rust packages that are not based on `buildRustPackage` but instead consume the hooks directly. Done: - ensure that `buildRustPackage` consumes spliced hooks by using makeScopeWithSplicing' in make-rust-platform.nix. - refactor hooks to make them refer to correct build/host/target packages. - remove `rust.envVars` workaround from all rust hooks - implement tests for most rust hooks in /pkgs/test/rut-hooks The newly added tests can be executed for native as well as cross compilation via: ``` nix-build -A tests.rust-hooks -A pkgsCross.riscv64.tests.rust-hooks ``` --- .../rust/build-rust-package/default.nix | 1 + .../rust/hooks/cargo-build-hook.sh | 4 +- .../rust/hooks/cargo-check-hook.sh | 4 +- .../rust/hooks/cargo-nextest-hook.sh | 2 +- pkgs/build-support/rust/hooks/default.nix | 43 ++++---- .../rust/hooks/maturin-build-hook.sh | 4 +- .../compilers/rust/make-rust-platform.nix | 102 +++++++++-------- pkgs/test/default.nix | 2 + pkgs/test/rust-hooks/default.nix | 104 ++++++++++++++++++ pkgs/test/rust-hooks/hello/Cargo.lock | 7 ++ pkgs/test/rust-hooks/hello/Cargo.toml | 6 + pkgs/test/rust-hooks/hello/src/hello.rs | 3 + pkgs/test/rust-hooks/hello/src/lib.rs | 1 + pkgs/test/rust-hooks/hello/src/main.rs | 5 + pkgs/test/rust-hooks/hello/tests/my_test.rs | 6 + 15 files changed, 216 insertions(+), 78 deletions(-) create mode 100644 pkgs/test/rust-hooks/default.nix create mode 100644 pkgs/test/rust-hooks/hello/Cargo.lock create mode 100644 pkgs/test/rust-hooks/hello/Cargo.toml create mode 100644 pkgs/test/rust-hooks/hello/src/hello.rs create mode 100644 pkgs/test/rust-hooks/hello/src/lib.rs create mode 100644 pkgs/test/rust-hooks/hello/src/main.rs create mode 100644 pkgs/test/rust-hooks/hello/tests/my_test.rs diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index 909ec8f4c05f..7a34c4df28f7 100644 --- a/pkgs/build-support/rust/build-rust-package/default.nix +++ b/pkgs/build-support/rust/build-rust-package/default.nix @@ -185,6 +185,7 @@ stdenv.mkDerivation ( cargoInstallHook cargoSetupHook rustc + cargo ]; buildInputs = diff --git a/pkgs/build-support/rust/hooks/cargo-build-hook.sh b/pkgs/build-support/rust/hooks/cargo-build-hook.sh index 749ebed8b01b..d372d3a3f9d3 100644 --- a/pkgs/build-support/rust/hooks/cargo-build-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-build-hook.sh @@ -19,7 +19,7 @@ cargoBuildHook() { local flagsArray=( "-j" "$NIX_BUILD_CORES" - "--target" "@rustHostPlatformSpec@" + "--target" "@rustcTarget@" "--offline" ) @@ -38,7 +38,7 @@ cargoBuildHook() { concatTo flagsArray cargoBuildFlags echoCmd 'cargoBuildHook flags' "${flagsArray[@]}" - @setEnv@ cargo build "${flagsArray[@]}" + cargo build "${flagsArray[@]}" if [ -n "${buildAndTestSubdir-}" ]; then popd diff --git a/pkgs/build-support/rust/hooks/cargo-check-hook.sh b/pkgs/build-support/rust/hooks/cargo-check-hook.sh index 965e2b451447..55055b3d55aa 100644 --- a/pkgs/build-support/rust/hooks/cargo-check-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-check-hook.sh @@ -30,7 +30,7 @@ cargoCheckHook() { fi flagsArray+=( - "--target" "@rustHostPlatformSpec@" + "--target" "@rustcTarget@" "--offline" ) @@ -38,7 +38,7 @@ cargoCheckHook() { concatTo flagsArray cargoTestFlags checkFlags checkFlagsArray echoCmd 'cargoCheckHook flags' "${flagsArray[@]}" - @setEnv@ cargo test "${flagsArray[@]}" + cargo test "${flagsArray[@]}" if [[ -n "${buildAndTestSubdir-}" ]]; then popd diff --git a/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh b/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh index 4719d1bad8ae..9d9b90976b22 100644 --- a/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh @@ -10,7 +10,7 @@ cargoNextestHook() { fi local flagsArray=( - "--target" "@rustHostPlatformSpec@" + "--target" "@rustcTarget@" "--offline" ) diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix index 35d2e9844dae..f8feb79000ab 100644 --- a/pkgs/build-support/rust/hooks/default.nix +++ b/pkgs/build-support/rust/hooks/default.nix @@ -4,17 +4,19 @@ cargo, cargo-nextest, clang, + diffutils, lib, makeSetupHook, maturin, rust, rustc, stdenv, + pkgsTargetTarget, # This confusingly-named parameter indicates the *subdirectory of # `target/` from which to copy the build artifacts. It is derived # from a stdenv platform (or a JSON file). - target ? stdenv.hostPlatform.rust.cargoShortTarget, + target ? stdenv.targetPlatform.rust.cargoShortTarget, }: { @@ -22,9 +24,8 @@ { }: makeSetupHook { name = "cargo-build-hook.sh"; - propagatedBuildInputs = [ cargo ]; substitutions = { - inherit (rust.envVars) rustHostPlatformSpec setEnv; + inherit (stdenv.targetPlatform.rust) rustcTarget; }; } ./cargo-build-hook.sh ) { }; @@ -33,9 +34,8 @@ { }: makeSetupHook { name = "cargo-check-hook.sh"; - propagatedBuildInputs = [ cargo ]; substitutions = { - inherit (rust.envVars) rustHostPlatformSpec setEnv; + inherit (stdenv.targetPlatform.rust) rustcTarget; }; } ./cargo-check-hook.sh ) { }; @@ -44,7 +44,6 @@ { }: makeSetupHook { name = "cargo-install-hook.sh"; - propagatedBuildInputs = [ ]; substitutions = { targetSubdirectory = target; }; @@ -55,12 +54,9 @@ { }: makeSetupHook { name = "cargo-nextest-hook.sh"; - propagatedBuildInputs = [ - cargo - cargo-nextest - ]; + propagatedBuildInputs = [ cargo-nextest ]; substitutions = { - inherit (rust.envVars) rustHostPlatformSpec; + inherit (stdenv.targetPlatform.rust) rustcTarget; }; } ./cargo-nextest-hook.sh ) { }; @@ -75,19 +71,20 @@ # Specify the stdenv's `diff` by abspath to ensure that the user's build # inputs do not cause us to find the wrong `diff`. - diff = "${lib.getBin buildPackages.diffutils}/bin/diff"; + diff = "${lib.getBin diffutils}/bin/diff"; - cargoConfig = '' - [target."${stdenv.buildPlatform.rust.rustcTarget}"] - "linker" = "${rust.envVars.ccForBuild}" - ${lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) '' + cargoConfig = + lib.optionalString (stdenv.hostPlatform.config != stdenv.targetPlatform.config) '' + [target."${stdenv.targetPlatform.rust.rustcTarget}"] + "linker" = "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc" + '' + + '' [target."${stdenv.hostPlatform.rust.rustcTarget}"] - "linker" = "${rust.envVars.ccForHost}" - ''} - "rustflags" = [ "-C", "target-feature=${ - if stdenv.hostPlatform.isStatic then "+" else "-" - }crt-static" ] - ''; + "linker" = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" + "rustflags" = [ "-C", "target-feature=${ + if pkgsTargetTarget.stdenv.targetPlatform.isStatic then "+" else "-" + }crt-static" ] + ''; }; } ./cargo-setup-hook.sh ) { }; @@ -102,7 +99,7 @@ pkgsHostTarget.rustc ]; substitutions = { - inherit (rust.envVars) rustTargetPlatformSpec setEnv; + inherit (stdenv.targetPlatform.rust) rustcTarget; }; } ./maturin-build-hook.sh ) { }; diff --git a/pkgs/build-support/rust/hooks/maturin-build-hook.sh b/pkgs/build-support/rust/hooks/maturin-build-hook.sh index 899fc9e32e21..2039339fc80c 100644 --- a/pkgs/build-support/rust/hooks/maturin-build-hook.sh +++ b/pkgs/build-support/rust/hooks/maturin-build-hook.sh @@ -20,7 +20,7 @@ maturinBuildHook() { local flagsArray=( "--jobs=$NIX_BUILD_CORES" "--offline" - "--target" "@rustTargetPlatformSpec@" + "--target" "@rustcTarget@" "--manylinux" "off" "--strip" "--release" @@ -31,7 +31,7 @@ maturinBuildHook() { concatTo flagsArray maturinBuildFlags echoCmd 'maturinBuildHook flags' "${flagsArray[@]}" - @setEnv@ maturin build "${flagsArray[@]}" + maturin build "${flagsArray[@]}" if [ -n "${buildAndTestSubdir-}" ]; then popd diff --git a/pkgs/development/compilers/rust/make-rust-platform.nix b/pkgs/development/compilers/rust/make-rust-platform.nix index dfe97ead03ca..e7d0da9cbb5b 100644 --- a/pkgs/development/compilers/rust/make-rust-platform.nix +++ b/pkgs/development/compilers/rust/make-rust-platform.nix @@ -1,12 +1,13 @@ { lib, buildPackages, - callPackage, callPackages, cargo-auditable, config, stdenv, runCommand, + generateSplicesForMkScope, + makeScopeWithSplicing', }@prev: { @@ -17,59 +18,64 @@ ... }: -rec { - fetchCargoTarball = buildPackages.callPackage ../../../build-support/rust/fetch-cargo-tarball { - git = buildPackages.gitMinimal; - inherit cargo; - }; +(makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope "rustPlatform"; + f = + self: + let + inherit (self) callPackage; + in + { + fetchCargoTarball = buildPackages.callPackage ../../../build-support/rust/fetch-cargo-tarball { + git = buildPackages.gitMinimal; + inherit cargo; + }; - fetchCargoVendor = buildPackages.callPackage ../../../build-support/rust/fetch-cargo-vendor.nix { - inherit cargo; - }; + fetchCargoVendor = buildPackages.callPackage ../../../build-support/rust/fetch-cargo-vendor.nix { + inherit cargo; + }; - buildRustPackage = callPackage ../../../build-support/rust/build-rust-package { - inherit - stdenv - cargoBuildHook - cargoCheckHook - cargoInstallHook - cargoNextestHook - cargoSetupHook - fetchCargoTarball - fetchCargoVendor - importCargoLock - rustc - cargo - cargo-auditable - ; - }; + buildRustPackage = callPackage ../../../build-support/rust/build-rust-package { + inherit + stdenv + rustc + cargo + cargo-auditable + ; + }; - importCargoLock = buildPackages.callPackage ../../../build-support/rust/import-cargo-lock.nix { - inherit cargo; - }; + importCargoLock = buildPackages.callPackage ../../../build-support/rust/import-cargo-lock.nix { + inherit cargo; + }; - rustcSrc = callPackage ./rust-src.nix { - inherit runCommand rustc; - }; + rustcSrc = callPackage ./rust-src.nix { + inherit runCommand rustc; + }; - rustLibSrc = callPackage ./rust-lib-src.nix { - inherit runCommand rustc; - }; + rustLibSrc = callPackage ./rust-lib-src.nix { + inherit runCommand rustc; + }; - # Hooks - inherit - (callPackages ../../../build-support/rust/hooks { - inherit stdenv cargo rustc; - }) - cargoBuildHook - cargoCheckHook - cargoInstallHook - cargoNextestHook - cargoSetupHook - maturinBuildHook - bindgenHook - ; -} + # Hooks + inherit + (callPackages ../../../build-support/rust/hooks { + inherit + stdenv + cargo + rustc + callPackage + ; + }) + cargoBuildHook + cargoCheckHook + cargoInstallHook + cargoNextestHook + cargoSetupHook + maturinBuildHook + bindgenHook + ; + }; +}) // lib.optionalAttrs config.allowAliases { rust = { rustc = lib.warn "rustPlatform.rust.rustc is deprecated. Use rustc instead." rustc; diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 78b1ad61ea8e..7fc0943ba44e 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -210,4 +210,6 @@ with pkgs; substitute = recurseIntoAttrs (callPackage ./substitute { }); build-environment-info = callPackage ./build-environment-info { }; + + rust-hooks = recurseIntoAttrs (callPackages ./rust-hooks { }); } diff --git a/pkgs/test/rust-hooks/default.nix b/pkgs/test/rust-hooks/default.nix new file mode 100644 index 000000000000..edd2ee29e16d --- /dev/null +++ b/pkgs/test/rust-hooks/default.nix @@ -0,0 +1,104 @@ +{ + rustPlatform, + stdenv, + cargo, +}: +{ + /* + test each hook individually, to make sure that: + - each hook works properly outside of buildRustPackage + - each hook is usable independantly from each other + */ + cargoSetupHook = stdenv.mkDerivation { + name = "test-cargoSetupHook"; + src = ./hello; + cargoVendorDir = "hello"; + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + cargo + ]; + buildPhase = '' + cargo build --profile release --target ${stdenv.hostPlatform.rust.rustcTarget} + ''; + installPhase = '' + mkdir -p $out/bin + mv target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/hello $out/bin/ + ''; + }; + + cargoBuildHook = stdenv.mkDerivation { + name = "test-cargoBuildHook"; + src = ./hello; + cargoBuildType = "release"; + "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER" = + "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; + nativeBuildInputs = [ + rustPlatform.cargoBuildHook + cargo + ]; + installPhase = '' + mkdir -p $out/bin + mv target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/hello $out/bin/ + ''; + }; + + cargoInstallHook = stdenv.mkDerivation { + name = "test-cargoInstallHook"; + src = ./hello; + cargoBuildType = "release"; + "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER" = + "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; + nativeBuildInputs = [ + rustPlatform.cargoInstallHook + cargo + ]; + buildPhase = '' + cargo build --profile release --target ${stdenv.hostPlatform.rust.rustcTarget} + runHook postBuild + ''; + }; + + cargoCheckHook = stdenv.mkDerivation { + name = "test-cargoCheckHook"; + src = ./hello; + cargoBuildType = "release"; + "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER" = + "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; + nativeBuildInputs = [ + rustPlatform.cargoCheckHook + cargo + ]; + buildPhase = '' + cargo build --profile release --target ${stdenv.hostPlatform.rust.rustcTarget} + runHook postBuild + ''; + installPhase = '' + mkdir -p $out/bin + mv target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/hello $out/bin/ + ''; + cargoCheckType = "release"; + doCheck = true; + }; + + cargoNextestHook = stdenv.mkDerivation { + name = "test-cargoNextestHook"; + src = ./hello; + cargoBuildType = "release"; + "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER" = + "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; + nativeBuildInputs = [ + rustPlatform.cargoNextestHook + cargo + ]; + buildPhase = '' + cargo build --profile release --target ${stdenv.hostPlatform.rust.rustcTarget} + runHook postBuild + ''; + installPhase = '' + mkdir -p $out/bin + mv target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/hello $out/bin/ + ''; + cargoCheckType = "release"; + doCheck = true; + }; +} diff --git a/pkgs/test/rust-hooks/hello/Cargo.lock b/pkgs/test/rust-hooks/hello/Cargo.lock new file mode 100644 index 000000000000..c3aedd7700aa --- /dev/null +++ b/pkgs/test/rust-hooks/hello/Cargo.lock @@ -0,0 +1,7 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "hello" +version = "0.1.0" diff --git a/pkgs/test/rust-hooks/hello/Cargo.toml b/pkgs/test/rust-hooks/hello/Cargo.toml new file mode 100644 index 000000000000..fe619478a68c --- /dev/null +++ b/pkgs/test/rust-hooks/hello/Cargo.toml @@ -0,0 +1,6 @@ +[package] +name = "hello" +version = "0.1.0" +edition = "2021" + +[dependencies] diff --git a/pkgs/test/rust-hooks/hello/src/hello.rs b/pkgs/test/rust-hooks/hello/src/hello.rs new file mode 100644 index 000000000000..0cc3ffdd382e --- /dev/null +++ b/pkgs/test/rust-hooks/hello/src/hello.rs @@ -0,0 +1,3 @@ +pub fn hello() -> &'static str { + return "Hello, world!"; +} diff --git a/pkgs/test/rust-hooks/hello/src/lib.rs b/pkgs/test/rust-hooks/hello/src/lib.rs new file mode 100644 index 000000000000..152adf1c8a0a --- /dev/null +++ b/pkgs/test/rust-hooks/hello/src/lib.rs @@ -0,0 +1 @@ +pub mod hello; diff --git a/pkgs/test/rust-hooks/hello/src/main.rs b/pkgs/test/rust-hooks/hello/src/main.rs new file mode 100644 index 000000000000..dee351b57801 --- /dev/null +++ b/pkgs/test/rust-hooks/hello/src/main.rs @@ -0,0 +1,5 @@ +mod hello; + +fn main() { + println!("{}", hello::hello()); +} diff --git a/pkgs/test/rust-hooks/hello/tests/my_test.rs b/pkgs/test/rust-hooks/hello/tests/my_test.rs new file mode 100644 index 000000000000..e84057a42caa --- /dev/null +++ b/pkgs/test/rust-hooks/hello/tests/my_test.rs @@ -0,0 +1,6 @@ +use hello::hello; + +#[test] +fn test_hello() { + assert_eq!(hello::hello(), "Hello, world!"); +} From ff755cbeab4dd9a5c7b7e107f09a3de14f4a8401 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Jan 2025 13:11:05 +0000 Subject: [PATCH 0128/1107] libajantv2: 17.1.0 -> 17.1.3 --- pkgs/by-name/li/libajantv2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libajantv2/package.nix b/pkgs/by-name/li/libajantv2/package.nix index ef582206401e..2b9e8e9d03fa 100644 --- a/pkgs/by-name/li/libajantv2/package.nix +++ b/pkgs/by-name/li/libajantv2/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "libajantv2"; - version = "17.1.0"; + version = "17.1.3"; src = fetchFromGitHub { owner = "aja-video"; repo = "libajantv2"; rev = "ntv2_${builtins.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-n9j98r1E9E0hv5gA8jCg/eQyqGuyU9JlZYm/zlcTQOo="; + hash = "sha256-7APoPj2LnvdwfuVforoJz0YxKU1WmAgRqIfXao4IZmY="; }; patches = [ ./use-system-mbedtls.patch From dd5617fef7e6cd9b5500460906609bf88708c27e Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Fri, 31 Jan 2025 23:53:35 +1100 Subject: [PATCH 0129/1107] treewide: remove uses of now-removed nixUnstable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit nixUnstable was removed in 2b4e18f3d4a7b80af21b640c0970f83b34efceff but is still referred to from a variety of places, including Hydra's cross-trunk jobset: ``` in job ‘armv7l-hf.nixUnstable.aarch64-linux’: error: … while evaluating a branch condition at /nix/store/m549zq6lcl10d1jqcdgcdaxxj9xdhxfv-source/lib/customisation.nix:479:5: 478| in 479| if drv == null then null else deepSeq drv' drv'; | ^ 480| … in the left operand of the update (//) operator at /nix/store/m549zq6lcl10d1jqcdgcdaxxj9xdhxfv-source/lib/meta.nix:43:9: 42| addMetaAttrs = newAttrs: drv: 43| drv // { meta = (drv.meta or {}) // newAttrs; }; | ^ 44| (stack trace truncated; use '--show-trace' to show the full, detailed trace) error: nixUnstable has been removed. For bleeding edge (Nix master, roughly weekly updated) use nixVersions.git, otherwise use nixVersions.latest. ``` --- doc/using/configuration.chapter.md | 12 ++++++------ .../build-fhsenv-bubblewrap/default.nix | 2 +- pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 | 2 +- pkgs/top-level/release-cross.nix | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/using/configuration.chapter.md b/doc/using/configuration.chapter.md index d443cf1b8e54..cea9532d6a7b 100644 --- a/doc/using/configuration.chapter.md +++ b/doc/using/configuration.chapter.md @@ -193,7 +193,7 @@ source: ../config-options.json ### Build an environment {#sec-building-environment} -Using `packageOverrides`, it is possible to manage packages declaratively. This means that we can list all of our desired packages within a declarative Nix expression. For example, to have `aspell`, `bc`, `ffmpeg`, `coreutils`, `gdb`, `nixUnstable`, `emscripten`, `jq`, `nox`, and `silver-searcher`, we could use the following in `~/.config/nixpkgs/config.nix`: +Using `packageOverrides`, it is possible to manage packages declaratively. This means that we can list all of our desired packages within a declarative Nix expression. For example, to have `aspell`, `bc`, `ffmpeg`, `coreutils`, `gdb`, `nix`, `emscripten`, `jq`, `nox`, and `silver-searcher`, we could use the following in `~/.config/nixpkgs/config.nix`: ```nix { @@ -206,7 +206,7 @@ Using `packageOverrides`, it is possible to manage packages declaratively. This coreutils gdb ffmpeg - nixUnstable + nix emscripten jq nox @@ -230,7 +230,7 @@ To install it into our environment, you can just run `nix-env -iA nixpkgs.myPack coreutils gdb ffmpeg - nixUnstable + nix emscripten jq nox @@ -258,7 +258,7 @@ After building that new environment, look through `~/.nix-profile` to make sure bc coreutils ffmpeg - nixUnstable + nix emscripten jq nox @@ -292,7 +292,7 @@ This provides us with some useful documentation for using our packages. However coreutils ffmpeg man - nixUnstable + nix emscripten jq nox @@ -344,7 +344,7 @@ Configuring GNU info is a little bit trickier than man pages. To work correctly, coreutils ffmpeg man - nixUnstable + nix emscripten jq nox diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix index c204628d1668..0a2deefc22e3 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix @@ -93,7 +93,7 @@ let files = [ # NixOS Compatibility "static" - "nix" # mainly for nixUnstable users, but also for access to nix/netrc + "nix" # mainly for nixVersions.git users, but also for access to nix/netrc # Shells "shells" "bashrc" diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 index bd219998593c..279c0003c83c 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 @@ -272,7 +272,7 @@ relevant configuration options. Normally, .Nm first builds the -.Ql nixUnstable +.Ql nix attribute in Nixpkgs, and uses the resulting instance of the Nix package manager to build the new system configuration. This is necessary if the NixOS modules use features not provided by the currently installed version of Nix. This option diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index ace9220040b2..d29382562986 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -5,7 +5,7 @@ e.g. - $ nix-build pkgs/top-level/release-cross.nix -A crossMingw32.nixUnstable --arg supportedSystems '[builtins.currentSystem]' + $ nix-build pkgs/top-level/release-cross.nix -A crossMingw32.nix --arg supportedSystems '[builtins.currentSystem]' To build all of the bootstrapFiles bundles on every enabled platform, use: @@ -70,7 +70,7 @@ let gmp = nativePlatforms; libcCross = nativePlatforms; nix = nativePlatforms; - nixUnstable = nativePlatforms; + nixVersions.git = nativePlatforms; mesa = nativePlatforms; rustc = nativePlatforms; cargo = nativePlatforms; From 556899e3cf2170d7e3b67c86f754e900e9d9a01c Mon Sep 17 00:00:00 2001 From: Julian Kuhn Date: Thu, 30 Jan 2025 16:22:45 +0100 Subject: [PATCH 0130/1107] maintainers: add juli0604 --- maintainers/maintainer-list.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9d1d1f3e2b19..b5cf70fb2b1d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11596,6 +11596,14 @@ githubId = 79042825; name = "Jan Kremer"; }; + juli0604 = { + name = "Julian Kuhn"; + email = "juliankuhn06@gmail.com"; + matrix = "@julian:matrix.epiccraft-mc.de"; + github = "juli0604"; + githubId = 62934740; + keys = [ { fingerprint = "E9C6 44C7 F6AA A865 4CB9 2723 22C8 B0CE B9AC 4AFF"; } ]; + }; JulianFP = { name = "Julian Partanen"; github = "JulianFP"; From 0cba8ebde61cfb14fab08ae2eaeafee958755f5f Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Fri, 31 Jan 2025 12:04:43 -0500 Subject: [PATCH 0131/1107] sbcl: 2.5.0 -> 2.5.1 --- pkgs/development/compilers/sbcl/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 5a8348451e4a..03d170dfd389 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -20,12 +20,12 @@ let }; # By unofficial and very loose convention we keep the latest version of # SBCL, and the previous one in case someone quickly needs to roll back. - "2.4.11" = { - sha256 = "sha256-TwPlhG81g0wQcAu+Iy2kG6S9v4G9zKyx1N4kKXZXpBU="; - }; "2.5.0" = { sha256 = "sha256-Lhiv0Ijkot8ht3uuLhcM5XDRHabSdgcpImXxzGqKGbE="; }; + "2.5.1" = { + sha256 = "sha256-QTOzbNFtFNYzlpw3/VHCyJqOpdbhYRVSgZ2R9xshn4s="; + }; }; # Collection of pre-built SBCL binaries for platforms that need them for # bootstrapping. Ideally these are to be avoided. If ECL (or any other diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c164d7a5ec4c..b42591fb68c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11073,17 +11073,17 @@ with pkgs; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl_2_4_11 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.4.11"; }; - faslExt = "fasl"; - flags = [ "--dynamic-space-size" "3000" ]; - }; sbcl_2_5_0 = wrapLisp { pkg = callPackage ../development/compilers/sbcl { version = "2.5.0"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl = sbcl_2_5_0; + sbcl_2_5_1 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.5.1"; }; + faslExt = "fasl"; + flags = [ "--dynamic-space-size" "3000" ]; + }; + sbcl = sbcl_2_5_1; sbclPackages = recurseIntoAttrs sbcl.pkgs; From 51906a01b5cf41f05eebdff69b5cad04b2cca4a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Jan 2025 17:46:26 +0000 Subject: [PATCH 0132/1107] fb303: 2025.01.06.00 -> 2025.01.27.00 --- pkgs/by-name/fb/fb303/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fb/fb303/package.nix b/pkgs/by-name/fb/fb303/package.nix index c8f621acd987..ff773b58e27b 100644 --- a/pkgs/by-name/fb/fb303/package.nix +++ b/pkgs/by-name/fb/fb303/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fb303"; - version = "2025.01.06.00"; + version = "2025.01.27.00"; outputs = [ "out" @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "fb303"; tag = "v${finalAttrs.version}"; - hash = "sha256-SW1dRo1Wr14eHzYPg7Wm4QypFpNGXeaFlreEVWWyWgs="; + hash = "sha256-xSE+3fJiwNJT3tzZWighX/Qe/sCXg18arMR2csUAPbs="; }; patches = [ From fc6f8e0a5b5e1129d2aefe293470f308a9afadd7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Jan 2025 18:14:07 +0000 Subject: [PATCH 0133/1107] fbthrift: 2025.01.06.00 -> 2025.01.27.00 --- pkgs/by-name/fb/fbthrift/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fb/fbthrift/package.nix b/pkgs/by-name/fb/fbthrift/package.nix index 649564e6f8b5..a070d5273b1a 100644 --- a/pkgs/by-name/fb/fbthrift/package.nix +++ b/pkgs/by-name/fb/fbthrift/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fbthrift"; - version = "2025.01.06.00"; + version = "2025.01.27.00"; outputs = [ # Trying to split this up further into `bin`, `out`, and `dev` @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "fbthrift"; tag = "v${finalAttrs.version}"; - hash = "sha256-VIWUh238MJDGxf6j/yanom9SNnNjBBzGbpg/SAquN5E="; + hash = "sha256-HiPIpmRwlHSduwHV8EJSmhg7PYFDumx0TNo8uzJ9+j8="; }; patches = [ From 9edef67678690b4427a21f2389f816b3d8050170 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Jan 2025 22:15:02 +0000 Subject: [PATCH 0134/1107] bmake: 20241124 -> 20250125 --- pkgs/by-name/bm/bmake/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix index 27e75d875a7c..c975c343e3d0 100644 --- a/pkgs/by-name/bm/bmake/package.nix +++ b/pkgs/by-name/bm/bmake/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bmake"; - version = "20241124"; + version = "20250125"; src = fetchurl { url = "https://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-T2ZAYJHC+F6pZLI41p649xq0uqydykaHpxiDum3k3bI="; + hash = "sha256-TH230E27+tAOV63HUM3RgwlcxJS76vna8zhBXLWlmbI="; }; patches = [ From 3eacc4047d85235e413a0b06ddb44150e32a334d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Jan 2025 23:45:59 +0000 Subject: [PATCH 0135/1107] umockdev: 0.19.0 -> 0.19.1 --- pkgs/by-name/um/umockdev/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/um/umockdev/package.nix b/pkgs/by-name/um/umockdev/package.nix index 99086e0f2788..50cf36a647fd 100644 --- a/pkgs/by-name/um/umockdev/package.nix +++ b/pkgs/by-name/um/umockdev/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "umockdev"; - version = "0.19.0"; + version = "0.19.1"; outputs = [ "bin" @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/martinpitt/umockdev/releases/download/${finalAttrs.version}/umockdev-${finalAttrs.version}.tar.xz"; - hash = "sha256-MF7J+i1s4yVugWHx7rwsF4ahNTbWfzHnYODgpNoNQlQ="; + hash = "sha256-LOzg6ONmuJtAcL508zicn3+iGspW2KU1fpbjDNjU9CY="; }; patches = [ From a86be4fb58b7a15b32fc2b125258c07a04e0a5dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Feb 2025 00:52:17 +0000 Subject: [PATCH 0136/1107] liblc3: 1.1.1 -> 1.1.2 --- pkgs/by-name/li/liblc3/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/liblc3/package.nix b/pkgs/by-name/li/liblc3/package.nix index 0da8995a793f..8ab037e596bb 100644 --- a/pkgs/by-name/li/liblc3/package.nix +++ b/pkgs/by-name/li/liblc3/package.nix @@ -8,7 +8,7 @@ let name = "liblc3"; - version = "1.1.1"; + version = "1.1.2"; in stdenv.mkDerivation { pname = name; @@ -18,7 +18,7 @@ stdenv.mkDerivation { owner = "google"; repo = "liblc3"; rev = "v${version}"; - sha256 = "sha256-h9qy04FqlHXp0bOUoP4+WqI0yrM78e56S+DEn3HztYo="; + sha256 = "sha256-OWuj68+YztIh/dPvwqjW7ch7Ph3aiEIDvO9rMkVIrQ8="; }; outputs = [ From c0a7f07a6319004086551b59391cb17af92ccd57 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 1 Feb 2025 02:58:26 +0100 Subject: [PATCH 0137/1107] cpython: patch CVE-2025-0938 https://www.cve.org/CVERecord?id=CVE-2025-0938 --- .../python/cpython/CVE-2025-0938.patch | 200 ++++++++++++++++++ .../interpreters/python/cpython/default.nix | 2 + 2 files changed, 202 insertions(+) create mode 100644 pkgs/development/interpreters/python/cpython/CVE-2025-0938.patch diff --git a/pkgs/development/interpreters/python/cpython/CVE-2025-0938.patch b/pkgs/development/interpreters/python/cpython/CVE-2025-0938.patch new file mode 100644 index 000000000000..4bd6916a6297 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/CVE-2025-0938.patch @@ -0,0 +1,200 @@ +From 6204ab9f989be3841c8c47e1e2cfe6a658fe16d5 Mon Sep 17 00:00:00 2001 +From: Seth Michael Larson +Date: Tue, 28 Jan 2025 14:09:00 -0600 +Subject: [PATCH 1/4] gh-105704: Disallow square brackets ( and ) in domain + names for parsed URLs + +--- + Lib/test/test_urlparse.py | 14 +++++++++++++ + Lib/urllib/parse.py | 20 +++++++++++++++++-- + ...-01-28-14-08-03.gh-issue-105704.EnhHxu.rst | 4 ++++ + 3 files changed, 36 insertions(+), 2 deletions(-) + create mode 100644 Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst + +diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py +index 4516bdea6adb19..0f15a0998ff2ea 100644 +--- a/Lib/test/test_urlparse.py ++++ b/Lib/test/test_urlparse.py +@@ -1412,6 +1412,20 @@ def test_invalid_bracketed_hosts(self): + self.assertRaises(ValueError, urllib.parse.urlsplit, 'Scheme://user@[0439:23af::2309::fae7:1234]/Path?Query') + self.assertRaises(ValueError, urllib.parse.urlsplit, 'Scheme://user@[0439:23af:2309::fae7:1234:2342:438e:192.0.2.146]/Path?Query') + self.assertRaises(ValueError, urllib.parse.urlsplit, 'Scheme://user@]v6a.ip[/Path') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[v6a.ip]') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[v6a.ip].suffix') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[v6a.ip]/') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[v6a.ip].suffix/') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[v6a.ip]?') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[v6a.ip].suffix?') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]/') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix/') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]?') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix?') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://user@prefix.[v6a.ip]') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://user@[v6a.ip].suffix') + + def test_splitting_bracketed_hosts(self): + p1 = urllib.parse.urlsplit('scheme://user@[v6a.ip]/path?query') +diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py +index c412c729852272..9d51f4c6812b57 100644 +--- a/Lib/urllib/parse.py ++++ b/Lib/urllib/parse.py +@@ -439,6 +439,23 @@ def _checknetloc(netloc): + raise ValueError("netloc '" + netloc + "' contains invalid " + + "characters under NFKC normalization") + ++def _check_bracketed_netloc(netloc): ++ # Note that this function must mirror the splitting ++ # done in NetlocResultMixins._hostinfo(). ++ hostname_and_port = netloc.rpartition('@')[2] ++ before_bracket, have_open_br, bracketed = hostname_and_port.partition('[') ++ if have_open_br: ++ # No data is allowed before a bracket. ++ if before_bracket: ++ raise ValueError("Invalid IPv6 URL") ++ hostname, _, port = bracketed.partition(']') ++ # No data is allowed after the bracket but before the port delimiter. ++ if port and not port.startswith(":"): ++ raise ValueError("Invalid IPv6 URL") ++ else: ++ hostname, _, port = hostname_and_port.partition(':') ++ _check_bracketed_host(hostname) ++ + # Valid bracketed hosts are defined in + # https://www.rfc-editor.org/rfc/rfc3986#page-49 and https://url.spec.whatwg.org/ + def _check_bracketed_host(hostname): +@@ -505,8 +522,7 @@ def _urlsplit(url, scheme=None, allow_fragments=True): + (']' in netloc and '[' not in netloc)): + raise ValueError("Invalid IPv6 URL") + if '[' in netloc and ']' in netloc: +- bracketed_host = netloc.partition('[')[2].partition(']')[0] +- _check_bracketed_host(bracketed_host) ++ _check_bracketed_netloc(netloc) + if allow_fragments and '#' in url: + url, fragment = url.split('#', 1) + if '?' in url: +diff --git a/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst b/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst +new file mode 100644 +index 00000000000000..aaeac71678de87 +--- /dev/null ++++ b/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst +@@ -0,0 +1,4 @@ ++When using ``urllib.parse.urlsplit()`` and ``urlparse()`` host parsing would ++not reject domain names containing square brackets (``[`` and ``]``). Square ++brackets are only valid for IPv6 and IPvFuture hosts according to `RFC 3986 ++Section 3.2.2 `__. + +From 3ab35e8d890e2c5d4e6b0c0299f94775a3ded9ae Mon Sep 17 00:00:00 2001 +From: Seth Michael Larson +Date: Thu, 30 Jan 2025 09:50:14 -0600 +Subject: [PATCH 2/4] Use Sphinx references + +Co-authored-by: Peter Bierma +--- + .../Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst b/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst +index aaeac71678de87..fb8674f558db59 100644 +--- a/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst ++++ b/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst +@@ -1,4 +1,4 @@ +-When using ``urllib.parse.urlsplit()`` and ``urlparse()`` host parsing would ++When using :func:`urllib.parse.urlsplit()` and :func:`urllib.parse.urlparse()` host parsing would + not reject domain names containing square brackets (``[`` and ``]``). Square + brackets are only valid for IPv6 and IPvFuture hosts according to `RFC 3986 + Section 3.2.2 `__. + +From ebf92bb4d323d41778e5de6df177b26f18ecf7f9 Mon Sep 17 00:00:00 2001 +From: Seth Michael Larson +Date: Thu, 30 Jan 2025 11:10:35 -0600 +Subject: [PATCH 3/4] Add mismatched bracket test cases, fix news format + +--- + Lib/test/test_urlparse.py | 10 ++++++++++ + .../2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst | 8 ++++---- + 2 files changed, 14 insertions(+), 4 deletions(-) + +diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py +index 0f15a0998ff2ea..f8ce61b2b49621 100644 +--- a/Lib/test/test_urlparse.py ++++ b/Lib/test/test_urlparse.py +@@ -1426,6 +1426,16 @@ def test_invalid_bracketed_hosts(self): + self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix?') + self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://user@prefix.[v6a.ip]') + self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://user@[v6a.ip].suffix') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[v6a.ip') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://v6a.ip]') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://]v6a.ip[') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://]v6a.ip') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://v6a.ip[') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[v6a.ip') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://v6a.ip].suffix') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix]v6a.ip[suffix') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix]v6a.ip') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://v6a.ip[suffix') + + def test_splitting_bracketed_hosts(self): + p1 = urllib.parse.urlsplit('scheme://user@[v6a.ip]/path?query') +diff --git a/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst b/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst +index fb8674f558db59..bff1bc6b0d609c 100644 +--- a/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst ++++ b/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst +@@ -1,4 +1,4 @@ +-When using :func:`urllib.parse.urlsplit()` and :func:`urllib.parse.urlparse()` host parsing would +-not reject domain names containing square brackets (``[`` and ``]``). Square +-brackets are only valid for IPv6 and IPvFuture hosts according to `RFC 3986 +-Section 3.2.2 `__. ++When using :func:`urllib.parse.urlsplit` and :func:`urllib.parse.urlparse` host ++parsing would not reject domain names containing square brackets (``[`` and ++``]``). Square brackets are only valid for IPv6 and IPvFuture hosts according to ++`RFC 3986 Section 3.2.2 `__. + +From 2817b2e29c8b28a24f9eb97abce1e1b60b1162fa Mon Sep 17 00:00:00 2001 +From: Seth Michael Larson +Date: Thu, 30 Jan 2025 13:01:19 -0600 +Subject: [PATCH 4/4] Add more test coverage for ports + +--- + Lib/test/test_urlparse.py | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py +index f8ce61b2b49621..b51cc006b73280 100644 +--- a/Lib/test/test_urlparse.py ++++ b/Lib/test/test_urlparse.py +@@ -1424,6 +1424,15 @@ def test_invalid_bracketed_hosts(self): + self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix/') + self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]?') + self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix?') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]:a') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix:a') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]:a1') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix:a1') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]:1a') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix:1a') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]:') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix:/') ++ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]:?') + self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://user@prefix.[v6a.ip]') + self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://user@[v6a.ip].suffix') + self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[v6a.ip') +@@ -1438,14 +1447,16 @@ def test_invalid_bracketed_hosts(self): + self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://v6a.ip[suffix') + + def test_splitting_bracketed_hosts(self): +- p1 = urllib.parse.urlsplit('scheme://user@[v6a.ip]/path?query') ++ p1 = urllib.parse.urlsplit('scheme://user@[v6a.ip]:1234/path?query') + self.assertEqual(p1.hostname, 'v6a.ip') + self.assertEqual(p1.username, 'user') + self.assertEqual(p1.path, '/path') ++ self.assertEqual(p1.port, 1234) + p2 = urllib.parse.urlsplit('scheme://user@[0439:23af:2309::fae7%test]/path?query') + self.assertEqual(p2.hostname, '0439:23af:2309::fae7%test') + self.assertEqual(p2.username, 'user') + self.assertEqual(p2.path, '/path') ++ self.assertIs(p2.port, None) + p3 = urllib.parse.urlsplit('scheme://user@[0439:23af:2309::fae7:1234:192.0.2.146%test]/path?query') + self.assertEqual(p3.hostname, '0439:23af:2309::fae7:1234:192.0.2.146%test') + self.assertEqual(p3.username, 'user') diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index d0cb05268d43..3b249843f4f1 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -252,6 +252,8 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { # (since it will do a futile invocation of gcc (!) to find # libuuid, slowing down program startup a lot). noldconfigPatch + # https://www.cve.org/CVERecord?id=CVE-2025-0938 + ./CVE-2025-0938.patch ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isFreeBSD) [ # Cross compilation only supports a limited number of "known good" # configurations. If you're reading this and it's been a long time From 6a12ab0c22e87f845306158e3042445f35e1330c Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 31 Jan 2025 19:56:27 +0300 Subject: [PATCH 0138/1107] separateDebugInfo: don't create broken symlinks --- pkgs/build-support/setup-hooks/separate-debug-info.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/pkgs/build-support/setup-hooks/separate-debug-info.sh index ebc773a49218..9cec77b9b0cd 100644 --- a/pkgs/build-support/setup-hooks/separate-debug-info.sh +++ b/pkgs/build-support/setup-hooks/separate-debug-info.sh @@ -43,10 +43,11 @@ _separateDebugInfo() { then echo "separate-debug-info: warning: multiple files with build id $id found, overwriting" fi - $OBJCOPY --only-keep-debug "$i" "$dst/${id:0:2}/${id:2}.debug" - - # Also a create a symlink .debug. - ln -sfn ".build-id/${id:0:2}/${id:2}.debug" "$dst/../$(basename "$i")" + ( + $OBJCOPY --only-keep-debug "$i" "$dst/${id:0:2}/${id:2}.debug" && + # Also a create a symlink .debug. + ln -sfn ".build-id/${id:0:2}/${id:2}.debug" "$dst/../$(basename "$i")" + ) ) || rmdir -p "$dst/${id:0:2}" done < <(find "$prefix" -type f -print0 | sort -z) } From 25f794db5887e7edf40afc3b1f0593d3d7de4ef8 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 1 Feb 2025 15:19:29 +0300 Subject: [PATCH 0139/1107] Revert "qemu: remove broken symlink" This reverts commit bc002a41809b6621019d673cec1567714aedeb49. Hook is fixed now. --- pkgs/applications/virtualization/qemu/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 9009bb618acd..63675696b3b3 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -226,9 +226,6 @@ stdenv.mkDerivation (finalAttrs: { # injected by the pkgsStatic stdenv # rm -f $out/nix-support/propagated-build-inputs - '' + lib.optionalString finalAttrs.separateDebugInfo '' - # HACK: remove broken symlink created by hook - rm $debug/lib/debug/s390-ccw.img ''; preBuild = "cd build"; From 5678e06cfbe5948355b9925b3416f0553c410a35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20S=C3=A1nchez?= Date: Thu, 30 Jan 2025 13:32:55 +0000 Subject: [PATCH 0140/1107] aws-sso-util: builds on darwin --- pkgs/by-name/aw/aws-sso-util/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/aw/aws-sso-util/package.nix b/pkgs/by-name/aw/aws-sso-util/package.nix index c083f6254933..093c47dded24 100644 --- a/pkgs/by-name/aw/aws-sso-util/package.nix +++ b/pkgs/by-name/aw/aws-sso-util/package.nix @@ -38,6 +38,6 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ cterence ]; mainProgram = "aws-sso-util"; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } From 18cbd7791db474062cbf8a3407ddccc582389d00 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 28 Dec 2024 10:28:38 -0500 Subject: [PATCH 0141/1107] ld64: switch to patch set from reckenrode/ld64 This patch set is functionally similar to the in-tree patches but contains the following improvements: - Directly use OpenSSL instead of compatibility stubs; - Builds the `dyldinfo` tool; - Replaces (some) Darwin and private headers with LLVM-based headers; - Uses LLVM instead of libtapi for reading text-based stubs; and - Builds ld64 as a cross-linker by default (with no prefix). --- .../ld/ld64/0005-Support-LTO-in-nixpkgs.patch | 48 -- ...SL-based-CoreCrypto-digest-functions.patch | 311 -------- pkgs/by-name/ld/ld64/gen_compile_stubs.py | 8 - pkgs/by-name/ld/ld64/meson.build | 211 ------ pkgs/by-name/ld/ld64/meson.options | 6 - pkgs/by-name/ld/ld64/package.nix | 227 +++--- ...001-Always-use-write-instead-of-mmap.patch | 50 ++ ...s.h-using-Clang-s-embed-extension-fo.patch | 30 + ...efinitions-instead-of-using-private-.patch | 56 ++ ...004-Removed-unused-Blob-clone-method.patch | 27 + ...omics-and-std-mutex-for-portability.patch} | 57 +- .../patches/0006-Add-Meson-build-system.patch | 328 +++++++++ .../0007-Add-CrashReporterClient-header.patch | 91 +++ ...patibility-headers-based-on-LLVM-s-h.patch | 662 ++++++++++++++++++ .../patches/0009-Support-LTO-in-nixpkgs.patch | 111 +++ ...d-vendored-libtapi-to-the-ld64-build.patch | 97 +++ ...-libtapi-to-build-with-upstream-LLVM.patch | 120 ++++ ...bcodedirectory-to-its-own-subproject.patch | 471 +++++++++++++ ...-Set-the-version-string-in-the-build.patch | 41 ++ ...crypto-and-CommonCrypto-with-OpenSSL.patch | 341 +++++++++ ...b_a_linker_signature-implementation.patch} | 48 +- .../0016-Add-dyldinfo-to-the-ld64-build.patch | 35 + .../patches/0017-Fix-dyldinfo-build.patch | 37 + ...ontainers-instead-of-LLVM-containers.patch | 37 + ...move-unused-and-incomplete-blob-clone.diff | 14 - 25 files changed, 2689 insertions(+), 775 deletions(-) delete mode 100644 pkgs/by-name/ld/ld64/0005-Support-LTO-in-nixpkgs.patch delete mode 100644 pkgs/by-name/ld/ld64/0007-Add-OpenSSL-based-CoreCrypto-digest-functions.patch delete mode 100644 pkgs/by-name/ld/ld64/gen_compile_stubs.py delete mode 100644 pkgs/by-name/ld/ld64/meson.build delete mode 100644 pkgs/by-name/ld/ld64/meson.options create mode 100644 pkgs/by-name/ld/ld64/patches/0001-Always-use-write-instead-of-mmap.patch create mode 100644 pkgs/by-name/ld/ld64/patches/0002-Add-compile_stubs.h-using-Clang-s-embed-extension-fo.patch create mode 100644 pkgs/by-name/ld/ld64/patches/0003-Inline-missing-definitions-instead-of-using-private-.patch create mode 100644 pkgs/by-name/ld/ld64/patches/0004-Removed-unused-Blob-clone-method.patch rename pkgs/by-name/ld/ld64/{0004-Use-std-atomics-and-std-mutex.patch => patches/0005-Use-std-atomics-and-std-mutex-for-portability.patch} (84%) create mode 100644 pkgs/by-name/ld/ld64/patches/0006-Add-Meson-build-system.patch create mode 100644 pkgs/by-name/ld/ld64/patches/0007-Add-CrashReporterClient-header.patch create mode 100644 pkgs/by-name/ld/ld64/patches/0008-Provide-mach-compatibility-headers-based-on-LLVM-s-h.patch create mode 100644 pkgs/by-name/ld/ld64/patches/0009-Support-LTO-in-nixpkgs.patch create mode 100644 pkgs/by-name/ld/ld64/patches/0010-Add-vendored-libtapi-to-the-ld64-build.patch create mode 100644 pkgs/by-name/ld/ld64/patches/0011-Modify-vendored-libtapi-to-build-with-upstream-LLVM.patch create mode 100644 pkgs/by-name/ld/ld64/patches/0012-Move-libcodedirectory-to-its-own-subproject.patch create mode 100644 pkgs/by-name/ld/ld64/patches/0013-Set-the-version-string-in-the-build.patch create mode 100644 pkgs/by-name/ld/ld64/patches/0014-Replace-corecrypto-and-CommonCrypto-with-OpenSSL.patch rename pkgs/by-name/ld/ld64/{0006-Add-libcd_is_blob_a_linker_signature-implementation.patch => patches/0015-Add-libcd_is_blob_a_linker_signature-implementation.patch} (73%) create mode 100644 pkgs/by-name/ld/ld64/patches/0016-Add-dyldinfo-to-the-ld64-build.patch create mode 100644 pkgs/by-name/ld/ld64/patches/0017-Fix-dyldinfo-build.patch create mode 100644 pkgs/by-name/ld/ld64/patches/0018-Use-STL-containers-instead-of-LLVM-containers.patch delete mode 100644 pkgs/by-name/ld/ld64/remove-unused-and-incomplete-blob-clone.diff diff --git a/pkgs/by-name/ld/ld64/0005-Support-LTO-in-nixpkgs.patch b/pkgs/by-name/ld/ld64/0005-Support-LTO-in-nixpkgs.patch deleted file mode 100644 index fec7e31b5cdf..000000000000 --- a/pkgs/by-name/ld/ld64/0005-Support-LTO-in-nixpkgs.patch +++ /dev/null @@ -1,48 +0,0 @@ -From faa5ab7c6e8d9a6c6157a2b681edad592ce78555 Mon Sep 17 00:00:00 2001 -From: Randy Eckenrode -Date: Sun, 7 Apr 2024 15:33:36 -0400 -Subject: [PATCH 5/8] Support LTO in nixpkgs - ---- - src/ld/InputFiles.cpp | 11 ++--------- - src/ld/parsers/lto_file.cpp | 2 +- - 2 files changed, 3 insertions(+), 10 deletions(-) - -diff --git a/src/ld/InputFiles.cpp b/src/ld/InputFiles.cpp -index 427ab09..b8a9870 100644 ---- a/src/ld/InputFiles.cpp -+++ b/src/ld/InputFiles.cpp -@@ -464,15 +464,8 @@ ld::File* InputFiles::makeFile(const Options::FileInfo& info, bool indirectDylib - if ( _options.overridePathlibLTO() != NULL ) { - libLTO = _options.overridePathlibLTO(); - } -- else if ( _NSGetExecutablePath(ldPath, &bufSize) != -1 ) { -- if ( realpath(ldPath, tmpPath) != NULL ) { -- char* lastSlash = strrchr(tmpPath, '/'); -- if ( lastSlash != NULL ) -- strcpy(lastSlash, "/../lib/libLTO.dylib"); -- libLTO = tmpPath; -- if ( realpath(tmpPath, libLTOPath) != NULL ) -- libLTO = libLTOPath; -- } -+ else { -+ libLTO = "@libllvm@/lib/libLTO.dylib"; - } - throwf("could not process llvm bitcode object file, because %s could not be loaded", libLTO); - } -diff --git a/src/ld/parsers/lto_file.cpp b/src/ld/parsers/lto_file.cpp -index 5318212..e18e974 100644 ---- a/src/ld/parsers/lto_file.cpp -+++ b/src/ld/parsers/lto_file.cpp -@@ -1807,7 +1807,7 @@ bool optimize( const std::vector& allAtoms, - - }; // namespace lto - --static const char *sLTODylib = "@rpath/libLTO.dylib"; -+static const char *sLTODylib = "@libllvm@/lib/libLTO.dylib"; - static std::atomic sLTOIsLoaded(false); - - static void *getHandle() { --- -2.45.1 - diff --git a/pkgs/by-name/ld/ld64/0007-Add-OpenSSL-based-CoreCrypto-digest-functions.patch b/pkgs/by-name/ld/ld64/0007-Add-OpenSSL-based-CoreCrypto-digest-functions.patch deleted file mode 100644 index 16879634338a..000000000000 --- a/pkgs/by-name/ld/ld64/0007-Add-OpenSSL-based-CoreCrypto-digest-functions.patch +++ /dev/null @@ -1,311 +0,0 @@ -From 36767c7345161baf0ab125f95c8557f8e24f25db Mon Sep 17 00:00:00 2001 -From: Randy Eckenrode -Date: Tue, 9 Apr 2024 19:28:17 -0400 -Subject: [PATCH 7/8] Add OpenSSL-based CoreCrypto digest functions - ---- - compat/CommonCrypto/CommonDigest.h | 6 +++ - compat/CommonCrypto/CommonDigestSPI.c | 21 +++++++++++ - compat/CommonCrypto/CommonDigestSPI.h | 14 +++++++ - compat/corecrypto/api_defines.h | 10 +++++ - compat/corecrypto/ccdigest.c | 53 +++++++++++++++++++++++++++ - compat/corecrypto/ccdigest.h | 27 ++++++++++++++ - compat/corecrypto/ccdigest_private.h | 19 ++++++++++ - compat/corecrypto/ccsha1.c | 22 +++++++++++ - compat/corecrypto/ccsha1.h | 9 +++++ - compat/corecrypto/ccsha2.c | 22 +++++++++++ - compat/corecrypto/ccsha2.h | 9 +++++ - 11 files changed, 212 insertions(+) - create mode 100644 compat/CommonCrypto/CommonDigest.h - create mode 100644 compat/CommonCrypto/CommonDigestSPI.c - create mode 100644 compat/CommonCrypto/CommonDigestSPI.h - create mode 100644 compat/corecrypto/api_defines.h - create mode 100644 compat/corecrypto/ccdigest.c - create mode 100644 compat/corecrypto/ccdigest.h - create mode 100644 compat/corecrypto/ccdigest_private.h - create mode 100644 compat/corecrypto/ccsha1.c - create mode 100644 compat/corecrypto/ccsha1.h - create mode 100644 compat/corecrypto/ccsha2.c - create mode 100644 compat/corecrypto/ccsha2.h - -diff --git a/compat/CommonCrypto/CommonDigest.h b/compat/CommonCrypto/CommonDigest.h -new file mode 100644 -index 0000000..a60eba7 ---- /dev/null -+++ b/compat/CommonCrypto/CommonDigest.h -@@ -0,0 +1,6 @@ -+// SPDX-License-Identifier: APSL-2.0 -+// CoreCrypto compatibility shims written by Randy Eckenrode © 2024 -+ -+#pragma once -+ -+#define CCSHA256_OUTPUT_SIZE 32 -diff --git a/compat/CommonCrypto/CommonDigestSPI.c b/compat/CommonCrypto/CommonDigestSPI.c -new file mode 100644 -index 0000000..41269fc ---- /dev/null -+++ b/compat/CommonCrypto/CommonDigestSPI.c -@@ -0,0 +1,21 @@ -+// SPDX-License-Identifier: APSL-2.0 -+// CoreCrypto compatibility shims written by Randy Eckenrode © 2024 -+ -+#include "CommonDigestSPI.h" -+ -+#include -+#include -+ -+#include -+ -+void CCDigest(int type, const uint8_t* bytes, size_t count, uint8_t* digest) { -+ if (type != kCCDigestSHA256) { -+ abort(); -+ } -+ const struct ccdigest_info* di = ccsha256_di(); -+ -+ ccdigest_di_decl(_di, ctx); -+ ccdigest_init(di, ctx); -+ ccdigest_update(di, ctx, count, bytes); -+ ccdigest_final(di, ctx, digest); -+} -diff --git a/compat/CommonCrypto/CommonDigestSPI.h b/compat/CommonCrypto/CommonDigestSPI.h -new file mode 100644 -index 0000000..172742a ---- /dev/null -+++ b/compat/CommonCrypto/CommonDigestSPI.h -@@ -0,0 +1,14 @@ -+// SPDX-License-Identifier: APSL-2.0 -+// CoreCrypto compatibility shims written by Randy Eckenrode © 2024 -+ -+#pragma once -+ -+#include -+ -+#include -+#include -+ -+ -+#define kCCDigestSHA256 10 -+ -+EXTERN_C void CCDigest(int type, const uint8_t* bytes, size_t count, uint8_t* digest); -diff --git a/compat/corecrypto/api_defines.h b/compat/corecrypto/api_defines.h -new file mode 100644 -index 0000000..13d1e7a ---- /dev/null -+++ b/compat/corecrypto/api_defines.h -@@ -0,0 +1,10 @@ -+// SPDX-License-Identifier: APSL-2.0 -+// CoreCrypto compatibility shims written by Randy Eckenrode © 2024 -+ -+#pragma once -+ -+#ifdef __cplusplus -+#define EXTERN_C extern "C" -+#else -+#define EXTERN_C -+#endif -diff --git a/compat/corecrypto/ccdigest.c b/compat/corecrypto/ccdigest.c -new file mode 100644 -index 0000000..e29dcb8 ---- /dev/null -+++ b/compat/corecrypto/ccdigest.c -@@ -0,0 +1,53 @@ -+// SPDX-License-Identifier: APSL-2.0 -+// CoreCrypto compatibility shims written by Randy Eckenrode © 2024 -+ -+#include "ccdigest.h" -+#include "ccdigest_private.h" -+ -+#include -+ -+#include -+ -+ -+struct ccdigest_context* _ccdigest_context_new(void) -+{ -+ struct ccdigest_context* ctx = malloc(sizeof(struct ccdigest_context)); -+ ctx->context = EVP_MD_CTX_new(); -+ return ctx; -+} -+ -+struct ccdigest_info* _ccdigest_newprovider(const char* name) -+{ -+ struct ccdigest_info* di = malloc(sizeof(struct ccdigest_info)); -+ di->provider = EVP_MD_fetch(NULL, name, NULL); -+ return di; -+} -+ -+void ccdigest_init(const struct ccdigest_info* di, struct ccdigest_context* ctx) -+{ -+ if (!EVP_DigestInit_ex2(ctx->context, di->provider, NULL)) { -+ ERR_print_errors_fp(stderr); -+ abort(); -+ } -+} -+ -+void ccdigest_update( -+ const struct ccdigest_info* _di, -+ struct ccdigest_context* ctx, -+ size_t count, -+ const void* bytes -+) -+{ -+ if (!EVP_DigestUpdate(ctx->context, bytes, count)) { -+ ERR_print_errors_fp(stderr); -+ abort(); -+ } -+} -+ -+void ccdigest_final(const struct ccdigest_info* _di, struct ccdigest_context* ctx, uint8_t* digest) -+{ -+ if (!EVP_DigestFinal_ex(ctx->context, digest, NULL)) { -+ ERR_print_errors_fp(stderr); -+ abort(); -+ } -+} -diff --git a/compat/corecrypto/ccdigest.h b/compat/corecrypto/ccdigest.h -new file mode 100644 -index 0000000..9af2394 ---- /dev/null -+++ b/compat/corecrypto/ccdigest.h -@@ -0,0 +1,27 @@ -+// SPDX-License-Identifier: APSL-2.0 -+// CoreCrypto compatibility shims written by Randy Eckenrode © 2024 -+ -+#pragma once -+ -+#include -+#include -+ -+#include "api_defines.h" -+ -+ -+struct ccdigest_info; -+struct ccdigest_context; -+ -+EXTERN_C struct ccdigest_context* _ccdigest_context_new(void); -+ -+#define ccdigest_di_decl(_di, ctxvar) \ -+ struct ccdigest_context* (ctxvar) = _ccdigest_context_new() -+ -+EXTERN_C void ccdigest_init(const struct ccdigest_info* di, struct ccdigest_context* ctx); -+EXTERN_C void ccdigest_update( -+ const struct ccdigest_info* _di, -+ struct ccdigest_context* ctx, -+ size_t count, -+ const void* bytes -+); -+EXTERN_C void ccdigest_final(const struct ccdigest_info* _di, struct ccdigest_context* ctx, uint8_t* digest); -diff --git a/compat/corecrypto/ccdigest_private.h b/compat/corecrypto/ccdigest_private.h -new file mode 100644 -index 0000000..0ea9759 ---- /dev/null -+++ b/compat/corecrypto/ccdigest_private.h -@@ -0,0 +1,19 @@ -+// SPDX-License-Identifier: APSL-2.0 -+// CoreCrypto compatibility shims written by Randy Eckenrode © 2024 -+ -+#pragma once -+ -+#include "api_defines.h" -+ -+#include -+ -+ -+struct ccdigest_info { -+ EVP_MD* provider; -+}; -+ -+struct ccdigest_context { -+ EVP_MD_CTX* context; -+}; -+ -+EXTERN_C struct ccdigest_info* _ccdigest_newprovider(const char* name); -diff --git a/compat/corecrypto/ccsha1.c b/compat/corecrypto/ccsha1.c -new file mode 100644 -index 0000000..e02b2b6 ---- /dev/null -+++ b/compat/corecrypto/ccsha1.c -@@ -0,0 +1,22 @@ -+// SPDX-License-Identifier: APSL-2.0 -+// CoreCrypto compatibility shims written by Randy Eckenrode © 2024 -+ -+#include "ccsha1.h" -+ -+#include -+ -+#include -+ -+#include "ccdigest_private.h" -+ -+ -+static struct ccdigest_info* di = NULL; -+ -+const struct ccdigest_info* ccsha1_di(void) -+{ -+ if (!di) { -+ di = _ccdigest_newprovider("SHA-1"); -+ assert(EVP_MD_get_size(di->provider) == CS_SHA1_LEN); -+ } -+ return di; -+} -diff --git a/compat/corecrypto/ccsha1.h b/compat/corecrypto/ccsha1.h -new file mode 100644 -index 0000000..8e3f85f ---- /dev/null -+++ b/compat/corecrypto/ccsha1.h -@@ -0,0 +1,9 @@ -+// SPDX-License-Identifier: APSL-2.0 -+// CoreCrypto compatibility shims written by Randy Eckenrode © 2024 -+ -+#pragma once -+ -+#include -+ -+ -+EXTERN_C const struct ccdigest_info* ccsha1_di(void); -diff --git a/compat/corecrypto/ccsha2.c b/compat/corecrypto/ccsha2.c -new file mode 100644 -index 0000000..6504503 ---- /dev/null -+++ b/compat/corecrypto/ccsha2.c -@@ -0,0 +1,22 @@ -+// SPDX-License-Identifier: APSL-2.0 -+// CoreCrypto compatibility shims written by Randy Eckenrode © 2024 -+ -+#include "ccsha2.h" -+ -+#include -+ -+#include -+ -+#include "ccdigest_private.h" -+ -+ -+static struct ccdigest_info* di = NULL; -+ -+const struct ccdigest_info* ccsha256_di(void) -+{ -+ if (!di) { -+ di = _ccdigest_newprovider("SHA-256"); -+ assert(EVP_MD_get_size(di->provider) == CS_SHA256_LEN); -+ } -+ return di; -+} -diff --git a/compat/corecrypto/ccsha2.h b/compat/corecrypto/ccsha2.h -new file mode 100644 -index 0000000..9f30e03 ---- /dev/null -+++ b/compat/corecrypto/ccsha2.h -@@ -0,0 +1,9 @@ -+// SPDX-License-Identifier: APSL-2.0 -+// CoreCrypto compatibility shims written by Randy Eckenrode © 2024 -+ -+#pragma once -+ -+#include -+ -+ -+EXTERN_C const struct ccdigest_info* ccsha256_di(void); --- -2.45.1 - diff --git a/pkgs/by-name/ld/ld64/gen_compile_stubs.py b/pkgs/by-name/ld/ld64/gen_compile_stubs.py deleted file mode 100644 index 30fe30789a10..000000000000 --- a/pkgs/by-name/ld/ld64/gen_compile_stubs.py +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env python -import sys -from pathlib import Path - -byteseq = (str(int(x)) for x in Path(sys.argv[1]).read_bytes()) - -print("#pragma once") -print(f"static const char compile_stubs[] = {{ {', '.join(byteseq)} }};") diff --git a/pkgs/by-name/ld/ld64/meson.build b/pkgs/by-name/ld/ld64/meson.build deleted file mode 100644 index c9068b75d026..000000000000 --- a/pkgs/by-name/ld/ld64/meson.build +++ /dev/null @@ -1,211 +0,0 @@ -# Build settings based on the upstream Xcode project. -# See: https://github.com/apple-oss-distributions/ld64/blob/main/ld64.xcodeproj/project.pbxproj - -# Project settings -project( - 'ld64', - 'c', 'cpp', - version : '@version@', - default_options : {'cpp_std': 'c++20'}, -) - -fs = import('fs') - -# Options -target_prefix = get_option('target_prefix') - - -# Dependencies -cc = meson.get_compiler('c') -cxx = meson.get_compiler('cpp') -python = find_program('python3') - -libtapi = cxx.find_library('tapi') -openssl = dependency('openssl', version : '>=3.0') -xar = cc.find_library('xar') - - -# Generated files - -compile_stubs_h = custom_target( - 'compile_stubs.h', - capture : true, - command : [python, '@INPUT0@', '@INPUT1@'], - input : ['gen_compile_stubs.py', 'compile_stubs'], - output : ['compile_stubs.h'], -) - -configure_h = custom_target( - 'configure_h', - command : ['bash', '@INPUT@'], - env : { - 'DERIVED_FILE_DIR' : meson.current_build_dir(), - 'RC_ProjectSourceVersion': '@version@' - }, - input : ['src/create_configure'], - output : ['configure.h'], -) - -incdirs = include_directories( - 'compat', - 'src/abstraction', - 'src/ld', - 'src/ld/code-sign-blobs', - 'src/ld/parsers', - 'src/ld/passes', - 'src/mach_o', -) - -# Dynamic libraries -libcodedirectory = library( - 'codedirectory', - dependencies : [openssl], - include_directories : incdirs, - install : true, - sources : [ - 'compat/corecrypto/ccdigest.c', - 'compat/corecrypto/ccsha1.c', - 'compat/corecrypto/ccsha2.c', - 'compat/libcodedirectory.c', - 'src/ld/libcodedirectory.c' - ], - soversion : 1, -) -install_headers( - 'src/ld/cs_blobs.h', - 'src/ld/libcodedirectory.h', -) - - -# Static libraries -libprunetrie = static_library( - 'prunetrie', - include_directories : incdirs, - install : true, - override_options : {'b_lto': false}, - sources : [ - 'src/mach_o/Error.cpp', - 'src/mach_o/ExportsTrie.cpp', - 'src/other/PruneTrie.cpp', - ], -) -install_headers( - 'src/other/prune_trie.h', - subdir : 'mach-o', -) - - -# Binaries -ld64 = executable( - f'@target_prefix@ld', - dependencies : [libtapi, openssl, xar], - include_directories : incdirs, - install : true, - cpp_args : [ - # Required for `_COMM_PAGE_CPU_CAPABILITIES64` in - # on `x86_64-darwin` - '-DPRIVATE', - ], - # These linker flags mirror those used in a release build of the Xcode project. - # See: https://github.com/apple-oss-distributions/ld64/blob/47f477cb721755419018f7530038b272e9d0cdea/ld64.xcodeproj/project.pbxproj#L1292-L1299. - link_args : [ - '-Wl,-exported_symbol,__mh_execute_header', - '-Wl,-stack_size,0x02000000', - '-Wl,-client_name,ld', - ], - link_with : [libcodedirectory], - sources : [ - compile_stubs_h, - configure_h, - 'compat/CommonCrypto/CommonDigestSPI.c', - 'compat/corecrypto/ccdigest.c', - 'compat/corecrypto/ccsha1.c', - 'compat/corecrypto/ccsha2.c', - 'src/ld/FatFile.cpp', - 'src/ld/InputFiles.cpp', - 'src/ld/Mangling.cpp', - 'src/ld/Options.cpp', - 'src/ld/OutputFile.cpp', - 'src/ld/PlatformSupport.cpp', - 'src/ld/Resolver.cpp', - 'src/ld/ResponseFiles.cpp', - 'src/ld/Snapshot.cpp', - 'src/ld/SymbolTable.cpp', - 'src/ld/code-sign-blobs/blob.cpp', - 'src/ld/code-sign-blobs/blob.h', - 'src/ld/debugline.c', - 'src/ld/ld.cpp', - 'src/ld/parsers/archive_file.cpp', - 'src/ld/parsers/generic_dylib_file.cpp', - 'src/ld/parsers/lto_file.cpp', - 'src/ld/parsers/macho_dylib_file.cpp', - 'src/ld/parsers/macho_relocatable_file.cpp', - 'src/ld/parsers/opaque_section_file.cpp', - 'src/ld/parsers/textstub_dylib_file.cpp', - 'src/ld/passes/bitcode_bundle.cpp', - 'src/ld/passes/branch_island.cpp', - 'src/ld/passes/branch_shim.cpp', - 'src/ld/passes/code_dedup.cpp', - 'src/ld/passes/compact_unwind.cpp', - 'src/ld/passes/dtrace_dof.cpp', - 'src/ld/passes/dylibs.cpp', - 'src/ld/passes/got.cpp', - 'src/ld/passes/huge.cpp', - 'src/ld/passes/inits.cpp', - 'src/ld/passes/objc.cpp', - 'src/ld/passes/objc_constants.cpp', - 'src/ld/passes/objc_stubs.cpp', - 'src/ld/passes/order.cpp', - 'src/ld/passes/stubs/stubs.cpp', - 'src/ld/passes/thread_starts.cpp', - 'src/ld/passes/tlvp.cpp', - 'src/mach_o/Error.cpp', - 'src/mach_o/ExportsTrie.cpp', - ], -) -install_man('doc/man/man1/ld-classic.1') - -# Extra tools -unwinddump = executable( - f'@target_prefix@unwinddump', - include_directories : incdirs, - install : true, - sources : [ - configure_h, - 'src/other/UnwindDump.cpp', - ], -) -install_man('doc/man/man1/unwinddump.1') - -machocheck = executable( - f'@target_prefix@machocheck', - include_directories : incdirs, - install : true, - sources : [ - configure_h, - 'src/other/machochecker.cpp', - ], -) - -objectdump = executable( - f'@target_prefix@ObjectDump', - include_directories : incdirs, - install : true, - sources : [ - configure_h, - 'src/ld/PlatformSupport.cpp', - 'src/ld/debugline.c', - 'src/ld/parsers/macho_relocatable_file.cpp', - 'src/other/ObjectDump.cpp', - ], -) - -objcimageinfo = executable( - f'@target_prefix@objcimageinfo', - include_directories : incdirs, - install : true, - sources : [ - configure_h, - 'src/other/objcimageinfo.cpp', - ], -) diff --git a/pkgs/by-name/ld/ld64/meson.options b/pkgs/by-name/ld/ld64/meson.options deleted file mode 100644 index 2417b81f0401..000000000000 --- a/pkgs/by-name/ld/ld64/meson.options +++ /dev/null @@ -1,6 +0,0 @@ -option( - 'target_prefix', - type : 'string', - value : '', - description: 'Specifies the prefix to use when building for cross-compilation (e.g., `aarch64-apple-darwin`)' -) diff --git a/pkgs/by-name/ld/ld64/package.nix b/pkgs/by-name/ld/ld64/package.nix index 074e92daa725..c5cd1d7b9c1e 100644 --- a/pkgs/by-name/ld/ld64/package.nix +++ b/pkgs/by-name/ld/ld64/package.nix @@ -1,75 +1,42 @@ { lib, - stdenv, - stdenvNoCC, - fetchFromGitHub, - fetchurl, - apple-sdk, - apple-sdk_14, cctools, + cmake, darwin, + fetchFromGitHub, libtapi, llvm, meson, ninja, openssl, pkg-config, - python3, - swiftPackages, + stdenv, xar, - gitUpdater, }: let - # The targetPrefix is prepended to binary names to allow multiple binutils on the PATH to be usable. - targetPrefix = lib.optionalString ( - stdenv.targetPlatform != stdenv.hostPlatform - ) "${stdenv.targetPlatform.config}-"; + # ld64 uses `#embed` to embed `compile_stubs`, which is only implemented in Clang 19. + # This can be done unconditionally once the bootstrap tools have been updated. + hasEmbed = lib.versionAtLeast (lib.getVersion stdenv.cc) "19"; - # ld64 needs CrashReporterClient.h, which is hard to find, but WebKit2 has it. - # Fetch it directly because the Darwin stdenv bootstrap can’t depend on fetchgit. - crashreporter_h = fetchurl { - url = "https://raw.githubusercontent.com/apple-oss-distributions/WebKit2/WebKit2-7605.1.33.0.2/Platform/spi/Cocoa/CrashReporterClientSPI.h"; - hash = "sha256-0ybVcwHuGEdThv0PPjYQc3SW0YVOyrM3/L9zG/l1Vtk="; + # Copy the files from their original sources instead of using patches to reduce the size of the patch set in nixpkgs. + otherSrcs = { + # The last version of ld64 to have dyldinfo + ld64 = fetchFromGitHub { + owner = "apple-oss-distributions"; + repo = "ld64"; + tag = "ld64-762"; + hash = "sha256-UIq/fwO40vk8yvoTfx+UlLhnuzkI0Ih+Ym6W/BwnP0s="; + }; + + # Provides the source files used in the vendored libtapi. The libtapi derivation puts `tapi-src` first. + libtapi = lib.head libtapi.srcs; }; - dyld = apple-sdk_14.sourceRelease "dyld"; + ld64src = lib.escapeShellArg "${otherSrcs.ld64}"; + libtapisrc = lib.escapeShellArg "${otherSrcs.libtapi}"; - libdispatchPrivate = apple-sdk.sourceRelease "libdispatch"; - - xnu = apple-sdk.sourceRelease "xnu"; - - privateHeaders = stdenvNoCC.mkDerivation { - name = "ld64-deps-private-headers"; - - buildCommand = '' - mkdir -p "$out/include/System" - for dir in arm i386 machine; do - cp -r '${xnu}/osfmk/'$dir "$out/include/System/$dir" - done - - substitute '${crashreporter_h}' "$out/include/CrashReporterClient.h" \ - --replace-fail 'USE(APPLE_INTERNAL_SDK)' '0' - - cp -r '${libdispatchPrivate}/private' "$out/include/dispatch" - - install -D -t "$out/include/mach-o" \ - '${dyld}/include/mach-o/dyld_priv.h' \ - '${cctools.src}/include/mach-o/loader.h' - - install -D -t "$out/include/mach-o/arm" \ - '${cctools.src}/include/mach-o/arm/reloc.h' - - install -D -t "$out/include/sys" \ - '${xnu}/bsd/sys/commpage.h' - - substituteInPlace "$out/include/mach-o/dyld_priv.h" \ - --replace-fail ', bridgeos(3.0)' "" - ''; - }; - - # Avoid pulling in all of Swift just to build libdispatch - libdispatch = swiftPackages.Dispatch.override { useSwift = false; }; + llvmPath = "${lib.getLib llvm}"; in stdenv.mkDerivation (finalAttrs: { pname = "ld64"; @@ -84,84 +51,90 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "apple-oss-distributions"; repo = "ld64"; - rev = "ld64-${finalAttrs.version}"; + tag = "ld64-${finalAttrs.version}"; hash = "sha256-hLkfqgBwVPlO4gfriYOawTO5E1zSD63ZcNetm1E5I70"; }; + patches = + [ + # These patches are vendored from https://github.com/reckenrode/ld64/tree/ld64-951.9-nixpkgs. + # See their comments for more on what they do. + ./patches/0001-Always-use-write-instead-of-mmap.patch + ./patches/0003-Inline-missing-definitions-instead-of-using-private-.patch + ./patches/0004-Removed-unused-Blob-clone-method.patch + ./patches/0005-Use-std-atomics-and-std-mutex-for-portability.patch + ./patches/0006-Add-Meson-build-system.patch + ./patches/0007-Add-CrashReporterClient-header.patch + ./patches/0008-Provide-mach-compatibility-headers-based-on-LLVM-s-h.patch + ./patches/0009-Support-LTO-in-nixpkgs.patch + ./patches/0010-Add-vendored-libtapi-to-the-ld64-build.patch + ./patches/0011-Modify-vendored-libtapi-to-build-with-upstream-LLVM.patch + ./patches/0012-Move-libcodedirectory-to-its-own-subproject.patch + ./patches/0013-Set-the-version-string-in-the-build.patch + ./patches/0014-Replace-corecrypto-and-CommonCrypto-with-OpenSSL.patch + ./patches/0015-Add-libcd_is_blob_a_linker_signature-implementation.patch + ./patches/0016-Add-dyldinfo-to-the-ld64-build.patch + ./patches/0017-Fix-dyldinfo-build.patch + ./patches/0018-Use-STL-containers-instead-of-LLVM-containers.patch + ] + ++ lib.optionals (hasEmbed) [ + ./patches/0002-Add-compile_stubs.h-using-Clang-s-embed-extension-fo.patch + ]; + + prePatch = '' + # Copy dyldinfo source files + cp ${ld64src}/doc/man/man1/dyldinfo.1 doc/man/man1/dyldinfo.1 + cp ${ld64src}/src/other/dyldinfo.cpp src/other/dyldinfo.cpp + + # Copy files needed from libtapi by ld64 + mkdir -p subprojects/libtapi/tapi + cp ${libtapisrc}/tools/libtapi/*.cpp subprojects/libtapi + cp ${libtapisrc}/LICENSE.TXT subprojects/libtapi/LICENSE.TXT + + declare -a tapiHeaders=( + APIVersion.h + Defines.h + LinkerInterfaceFile.h + PackedVersion32.h + Symbol.h + Version.h + Version.inc.in + tapi.h + ) + for header in "''${tapiHeaders[@]}"; do + cp ${libtapisrc}/include/tapi/$header subprojects/libtapi/tapi/$header + done + ''; + + # Clang 16 doesn’t support C23, but the patchset expects a compiler that supports it. Only `#embed` is used, so stub + # out its usage and request an older C standard version. This can be dropped once the bootstrap tools are updated. + postPatch = lib.optionalString (!hasEmbed) '' + for meson_build in meson.build subprojects/libcodedirectory/meson.build subprojects/libtapi/meson.build; do + substituteInPlace $meson_build --replace-fail c23 c2x + done + echo '#pragma once' > src/ld/compile_stubs.h + echo 'static const char compile_stubs[] = "";' >> src/ld/compile_stubs.h + ''; + xcodeHash = "sha256-+j7Ed/6aD46SJnr3DWPfWuYWylb2FNJRPmWsUVxZJHM="; - - postUnpack = '' - # Verify that the Xcode project has not changed unexpectedly. - hashType=$(echo $xcodeHash | cut -d- -f1) - expectedHash=$(echo $xcodeHash | cut -d- -f2) - hash=$(openssl "$hashType" -binary "$sourceRoot/ld64.xcodeproj/project.pbxproj" | base64) - - if [ "$hash" != "$expectedHash" ]; then - echo 'error: hash mismatch in ld64.xcodeproj/project.pbxproj' - echo " specified: $xcodeHash" - echo " got: $hashType-$hash" - echo - echo 'Upstream Xcode project has changed. Update `meson.build` with any changes, then update `xcodeHash`.' - echo 'Use `nix-hash --flat --sri --type sha256 ld64.xcodeproj/project.pbxproj` to regenerate it.' - exit 1 - fi - ''; - - patches = [ - # Use std::atomic for atomics. Replaces private APIs (`os/lock_private.h`) with standard APIs. - ./0004-Use-std-atomics-and-std-mutex.patch - # ld64 assumes the default libLTO.dylib can be found relative to its bindir, which is - # not the case in nixpkgs. Override it to default to `stdenv.cc`’s libLTO.dylib. - ./0005-Support-LTO-in-nixpkgs.patch - # Add implementation of missing function required for code directory support. - ./0006-Add-libcd_is_blob_a_linker_signature-implementation.patch - # Add OpenSSL implementation of CoreCrypto digest functions. Avoids use of private and non-free APIs. - ./0007-Add-OpenSSL-based-CoreCrypto-digest-functions.patch - ./remove-unused-and-incomplete-blob-clone.diff - ]; - - postPatch = '' - substitute ${./meson.build} meson.build \ - --subst-var version - cp ${./meson.options} meson.options - - # Match the version format used by upstream. - sed -i src/ld/Options.cpp \ - -e '1iconst char ld_classicVersionString[] = "@(#)PROGRAM:ld PROJECT:ld64-${finalAttrs.version}\\n";' - - # Instead of messing around with trying to extract and run the script from the Xcode project, - # just use our own Python script to generate `compile_stubs.h` - cp ${./gen_compile_stubs.py} gen_compile_stubs.py - - # Enable LTO support using LLVM’s libLTO.dylib by default. - substituteInPlace src/ld/InputFiles.cpp \ - --subst-var-by libllvm '${lib.getLib llvm}' - substituteInPlace src/ld/parsers/lto_file.cpp \ - --subst-var-by libllvm '${lib.getLib llvm}' - - # Use portable includes - substituteInPlace src/ld/code-sign-blobs/endian.h \ - --replace-fail '#include ' '#include ' - ''; - - strictDeps = true; - - env.NIX_CFLAGS_COMPILE = "-DTARGET_OS_BRIDGE=0 -I${privateHeaders}/include"; + xcodeProject = "ld64.xcodeproj"; nativeBuildInputs = [ + cmake + darwin.xcodeProjectCheckHook meson ninja openssl pkg-config - python3 ]; buildInputs = [ - libtapi llvm openssl xar - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libdispatch ]; + ]; + + dontUseCmakeConfigure = true; # CMake is only needed because it’s used by Meson to find LLVM. # Note for overrides: ld64 cannot be built as a debug build because of UB in its iteration implementations, # which trigger libc++ debug assertions due to trying to take the address of the first element of an emtpy vector. @@ -170,7 +143,8 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ (lib.mesonOption "b_ndebug" "if-release") (lib.mesonOption "default_library" (if stdenv.hostPlatform.isStatic then "static" else "shared")) - ] ++ lib.optionals (targetPrefix != "") [ (lib.mesonOption "target_prefix" targetPrefix) ]; + (lib.mesonOption "libllvm_path" llvmPath) + ]; doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; @@ -182,17 +156,24 @@ stdenv.mkDerivation (finalAttrs: { cd "$NIX_BUILD_TOP/$sourceRoot" - export NIX_CFLAGS_COMPILE+=" --ld-path=$out/bin/${targetPrefix}ld" + export NIX_CFLAGS_COMPILE+=" --ld-path=$out/bin/ld" export NIX_CFLAGS_LINK+=" -L$SDKROOT/usr/lib" - meson setup build-install-check -Db_lto=true --buildtype=$mesonBuildType${ - lib.optionalString (targetPrefix != "") " -Dtarget_prefix=${targetPrefix}" + meson setup build-install-check --buildtype=$mesonBuildType ${ + lib.escapeShellArgs [ + (lib.mesonBool "b_lto" true) + (lib.mesonOption "libllvm_path" llvmPath) + ] } cd build-install-check - ninja ${targetPrefix}ld "-j$NIX_BUILD_CORES" + ninja src/ld/ld "-j$NIX_BUILD_CORES" # Confirm that ld found the LTO library and reports it. - ./${targetPrefix}ld -v 2>&1 | grep -q 'LTO support' + if ./src/ld/ld -v 2>&1 | grep -q 'LTO support'; then + echo "LTO: supported" + else + echo "LTO: not supported" && exit 1 + fi runHook postInstallCheck ''; @@ -205,8 +186,6 @@ stdenv.mkDerivation (finalAttrs: { __structuredAttrs = true; - passthru.updateScript = gitUpdater { rev-prefix = "ld64-"; }; - meta = { description = "The classic linker for Darwin"; homepage = "https://opensource.apple.com/releases/"; diff --git a/pkgs/by-name/ld/ld64/patches/0001-Always-use-write-instead-of-mmap.patch b/pkgs/by-name/ld/ld64/patches/0001-Always-use-write-instead-of-mmap.patch new file mode 100644 index 000000000000..5e6648eb6040 --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0001-Always-use-write-instead-of-mmap.patch @@ -0,0 +1,50 @@ +From 49489b079a3a2fd42f62c62441981cc734b0d7e7 Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Wed, 13 Nov 2024 13:53:14 -0500 +Subject: [PATCH 01/18] Always use `write` instead of `mmap` + +This is already required on aarch64-darwin (even under Rosetta 2), so also do it on x86_64-darwin to +avoid needing to use private headers to get the definition of `_COMM_PAGE_CPU_CAPABILITIES64`. +--- + src/ld/OutputFile.cpp | 18 ++---------------- + 1 file changed, 2 insertions(+), 16 deletions(-) + +diff --git a/src/ld/OutputFile.cpp b/src/ld/OutputFile.cpp +index edefb71..487b338 100644 +--- a/src/ld/OutputFile.cpp ++++ b/src/ld/OutputFile.cpp +@@ -57,7 +57,7 @@ extern "C" { + + #include + #include +-#include ++ + + #include "ExportsTrie.h" + +@@ -4011,21 +4011,7 @@ void OutputFile::writeOutputFile(ld::Internal& state) + } + + // assume mappable by default +- bool outputIsMappableFile = true; +- +-#if __arm64__ +- // work around VM limitation on Apple Silicon and use write() instead of mmap() to produce output file +- outputIsMappableFile = false; +-#elif __x86_64__ +-#ifndef kIsTranslated +- #define kIsTranslated 0x4000000000000000ULL +-#endif +- // +- bool isTranslated = ((*(uint64_t*)_COMM_PAGE_CPU_CAPABILITIES64) & kIsTranslated); +- if ( isTranslated ) { +- outputIsMappableFile = false; +- } +-#endif ++ bool outputIsMappableFile = false; + + // rdar://107066824 (ld64: provide an environment variable or so to switch to the + // allocate+pwrite writing mode (instead of mmap) on Intels) +-- +2.47.2 + diff --git a/pkgs/by-name/ld/ld64/patches/0002-Add-compile_stubs.h-using-Clang-s-embed-extension-fo.patch b/pkgs/by-name/ld/ld64/patches/0002-Add-compile_stubs.h-using-Clang-s-embed-extension-fo.patch new file mode 100644 index 000000000000..472bfc1666c0 --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0002-Add-compile_stubs.h-using-Clang-s-embed-extension-fo.patch @@ -0,0 +1,30 @@ +From 966a7c3af74fb0de0f97d344b14890dc2d45f7e1 Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Wed, 13 Nov 2024 13:53:14 -0500 +Subject: [PATCH 02/18] =?UTF-8?q?Add=20compile=5Fstubs.h=20using=20Clang?= + =?UTF-8?q?=E2=80=99s=20`#embed`=20extension=20for=20C++?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + src/ld/compile_stubs.h | 7 +++++++ + 1 file changed, 7 insertions(+) + create mode 100644 src/ld/compile_stubs.h + +diff --git a/src/ld/compile_stubs.h b/src/ld/compile_stubs.h +new file mode 100644 +index 0000000..88b8462 +--- /dev/null ++++ b/src/ld/compile_stubs.h +@@ -0,0 +1,7 @@ ++// SPDX-License-Identifier: APSL-2.0 ++ ++#pragma once ++ ++static const char compile_stubs[] = { ++#embed "../../compile_stubs" suffix(, '\0') if_empty('\0') ++}; +-- +2.47.2 + diff --git a/pkgs/by-name/ld/ld64/patches/0003-Inline-missing-definitions-instead-of-using-private-.patch b/pkgs/by-name/ld/ld64/patches/0003-Inline-missing-definitions-instead-of-using-private-.patch new file mode 100644 index 000000000000..7622f9a8e70f --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0003-Inline-missing-definitions-instead-of-using-private-.patch @@ -0,0 +1,56 @@ +From ddcefc16f5db7fd36c885cf3bcd3713c8383e93b Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Wed, 13 Nov 2024 13:53:14 -0500 +Subject: [PATCH 03/18] Inline missing definitions instead of using private + mach-o/dyld_private.h header + +Based on: https://github.com/llvm/llvm-project/blob/38870fe124eb5e6e24136f9d3e4551a62370faee/libunwind/src/AddressSpace.hpp#L57-L67 +--- + src/ld/Options.cpp | 1 - + src/ld/parsers/libunwind/AddressSpace.hpp | 10 +++++++++- + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/src/ld/Options.cpp b/src/ld/Options.cpp +index 991387f..cde3fad 100644 +--- a/src/ld/Options.cpp ++++ b/src/ld/Options.cpp +@@ -35,7 +35,6 @@ + #include + #include + #include +-#include + + #include + #include +diff --git a/src/ld/parsers/libunwind/AddressSpace.hpp b/src/ld/parsers/libunwind/AddressSpace.hpp +index eb47390..0788cc2 100644 +--- a/src/ld/parsers/libunwind/AddressSpace.hpp ++++ b/src/ld/parsers/libunwind/AddressSpace.hpp +@@ -35,7 +35,6 @@ + #include + #include + #include +-#include + #include + + #include "FileAbstraction.hpp" +@@ -73,7 +72,16 @@ bool _dyld_find_unwind_sections(void* addr, dyld_unwind_sections* info) + } + #endif // 0 + ++struct dyld_unwind_sections ++{ ++ const struct mach_header* mh; ++ const void* dwarf_section; ++ uintptr_t dwarf_section_length; ++ const void* compact_unwind_section; ++ uintptr_t compact_unwind_section_length; ++}; + ++extern "C" bool _dyld_find_unwind_sections(void*, dyld_unwind_sections*); + + namespace libunwind { + +-- +2.47.2 + diff --git a/pkgs/by-name/ld/ld64/patches/0004-Removed-unused-Blob-clone-method.patch b/pkgs/by-name/ld/ld64/patches/0004-Removed-unused-Blob-clone-method.patch new file mode 100644 index 000000000000..05c45d651a1b --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0004-Removed-unused-Blob-clone-method.patch @@ -0,0 +1,27 @@ +From 3c0038576173103e8aaa5286f853046b619c35fe Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Wed, 13 Nov 2024 13:53:14 -0500 +Subject: [PATCH 04/18] Removed unused `Blob::clone` method + +Fixes a compiler error due to a missing `BlobCore::clone` method. +--- + src/ld/code-sign-blobs/blob.h | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/ld/code-sign-blobs/blob.h b/src/ld/code-sign-blobs/blob.h +index 19c63a9..2ac0aa8 100644 +--- a/src/ld/code-sign-blobs/blob.h ++++ b/src/ld/code-sign-blobs/blob.h +@@ -179,9 +179,6 @@ public: + return p; + return NULL; + } +- +- BlobType *clone() const +- { assert(validateBlob()); return specific(this->BlobCore::clone()); } + + static BlobType *readBlob(int fd) + { return specific(BlobCore::readBlob(fd, _magic, sizeof(BlobType), 0), true); } +-- +2.47.2 + diff --git a/pkgs/by-name/ld/ld64/0004-Use-std-atomics-and-std-mutex.patch b/pkgs/by-name/ld/ld64/patches/0005-Use-std-atomics-and-std-mutex-for-portability.patch similarity index 84% rename from pkgs/by-name/ld/ld64/0004-Use-std-atomics-and-std-mutex.patch rename to pkgs/by-name/ld/ld64/patches/0005-Use-std-atomics-and-std-mutex-for-portability.patch index 8c414fcb51d8..536076529a2e 100644 --- a/pkgs/by-name/ld/ld64/0004-Use-std-atomics-and-std-mutex.patch +++ b/pkgs/by-name/ld/ld64/patches/0005-Use-std-atomics-and-std-mutex-for-portability.patch @@ -1,20 +1,20 @@ -From 5e92d65ef2b5cc07dc25b5b1bf645b314599f5d1 Mon Sep 17 00:00:00 2001 +From effdf4d0f3a3d2332ec2a61eefe076ff37964594 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode -Date: Sat, 6 Apr 2024 20:29:25 -0400 -Subject: [PATCH 4/8] Use std::atomics and std::mutex +Date: Wed, 13 Nov 2024 13:53:14 -0500 +Subject: [PATCH 05/18] Use std::atomics and std::mutex for portability --- - src/ld/InputFiles.cpp | 13 ++++++------- + src/ld/InputFiles.cpp | 15 +++++++-------- src/ld/InputFiles.h | 9 +++++---- - src/ld/OutputFile.cpp | 13 ++++++------- + src/ld/OutputFile.cpp | 13 +++++++------ src/ld/ld.cpp | 11 +++++------ - 4 files changed, 22 insertions(+), 24 deletions(-) + 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/ld/InputFiles.cpp b/src/ld/InputFiles.cpp -index ec53a60..427ab09 100644 +index 4d49ba3..e045e90 100644 --- a/src/ld/InputFiles.cpp +++ b/src/ld/InputFiles.cpp -@@ -42,7 +42,6 @@ +@@ -42,12 +42,11 @@ #include #include #include @@ -22,6 +22,12 @@ index ec53a60..427ab09 100644 #if HAVE_LIBDISPATCH #include #endif + +-#include ++#include + #include + #include + #include @@ -387,16 +386,16 @@ ld::File* InputFiles::makeFile(const Options::FileInfo& info, bool indirectDylib ld::relocatable::File* objResult = mach_o::relocatable::parse(p, len, info.path, info.modTime, info.ordinal, objOpts); @@ -55,7 +61,7 @@ index ec53a60..427ab09 100644 } diff --git a/src/ld/InputFiles.h b/src/ld/InputFiles.h -index c18ccf8..ffff26b 100644 +index c18ccf8..40353fa 100644 --- a/src/ld/InputFiles.h +++ b/src/ld/InputFiles.h @@ -46,6 +46,7 @@ @@ -74,31 +80,28 @@ index c18ccf8..ffff26b 100644 - volatile int64_t _totalArchiveSize; - volatile int32_t _totalObjectLoaded; - volatile int32_t _totalArchivesLoaded; -+ std::atomic _totalObjectSize; -+ std::atomic _totalArchiveSize; -+ std::atomic _totalObjectLoaded; -+ std::atomic _totalArchivesLoaded; ++ std::atomic _totalObjectSize; ++ std::atomic _totalArchiveSize; ++ std::atomic _totalObjectLoaded; ++ std::atomic _totalArchivesLoaded; int32_t _totalDylibsLoaded; diff --git a/src/ld/OutputFile.cpp b/src/ld/OutputFile.cpp -index e2c0397..15912a2 100644 +index 487b338..2a175a7 100644 --- a/src/ld/OutputFile.cpp +++ b/src/ld/OutputFile.cpp -@@ -43,11 +43,10 @@ - #include - #include - #include --#include +@@ -47,7 +47,8 @@ extern "C" { #include } -#include ++ +#include #include #include #include -@@ -1362,7 +1361,7 @@ void OutputFile::rangeCheckRISCVBranch20(int64_t displacement, ld::Internal& sta +@@ -1315,7 +1316,7 @@ void OutputFile::rangeCheckRISCVBranch20(int64_t displacement, ld::Internal& sta #if SUPPORT_ARCH_arm64e @@ -107,7 +110,7 @@ index e2c0397..15912a2 100644 #endif void OutputFile::applyFixUps(ld::Internal& state, uint64_t mhAddress, const ld::Atom* atom, uint8_t* buffer) -@@ -1737,11 +1736,11 @@ void OutputFile::applyFixUps(ld::Internal& state, uint64_t mhAddress, const ld:: +@@ -1690,11 +1691,11 @@ void OutputFile::applyFixUps(ld::Internal& state, uint64_t mhAddress, const ld:: } else { auto fixupOffset = (uintptr_t)(fixUpLocation - mhAddress); @@ -121,7 +124,7 @@ index e2c0397..15912a2 100644 // Zero out this entry which we will expect later. set64LE(fixUpLocation, 0); } -@@ -1768,11 +1767,11 @@ void OutputFile::applyFixUps(ld::Internal& state, uint64_t mhAddress, const ld:: +@@ -1721,11 +1722,11 @@ void OutputFile::applyFixUps(ld::Internal& state, uint64_t mhAddress, const ld:: } else { auto fixupOffset = (uintptr_t)(fixUpLocation - mhAddress); @@ -136,7 +139,7 @@ index e2c0397..15912a2 100644 set64LE(fixUpLocation, 0); } diff --git a/src/ld/ld.cpp b/src/ld/ld.cpp -index b7590a3..f1bf9df 100644 +index b532c9a..8608ea5 100644 --- a/src/ld/ld.cpp +++ b/src/ld/ld.cpp @@ -47,9 +47,8 @@ extern "C" double log2 ( double ); @@ -150,7 +153,7 @@ index b7590a3..f1bf9df 100644 #include #include #include -@@ -1603,8 +1602,8 @@ int main(int argc, const char* argv[]) +@@ -1539,8 +1538,8 @@ int main(int argc, const char* argv[]) statistics.vmEnd.faults-statistics.vmStart.faults); fprintf(stderr, "memory active: %lu, wired: %lu\n", statistics.vmEnd.active_count * vm_page_size, statistics.vmEnd.wire_count * vm_page_size); char temp[40]; @@ -161,7 +164,7 @@ index b7590a3..f1bf9df 100644 fprintf(stderr, "processed %3u dylib files\n", inputFiles._totalDylibsLoaded); fprintf(stderr, "wrote output file totaling %15s bytes\n", commatize(out.fileSize(), temp)); } -@@ -1634,12 +1633,12 @@ int main(int argc, const char* argv[]) +@@ -1570,12 +1569,12 @@ int main(int argc, const char* argv[]) #ifndef NDEBUG // now that the linker is multi-threaded, only allow one assert() to be processed @@ -172,10 +175,10 @@ index b7590a3..f1bf9df 100644 void __assert_rtn(const char* func, const char* file, int line, const char* failedexpr) { - os_lock_lock(&sAssertLock); -+ sAssertLock.lock(); ++ sAssertLock.lock(); Snapshot *snapshot = Snapshot::globalSnapshot; -- -2.45.1 +2.47.2 diff --git a/pkgs/by-name/ld/ld64/patches/0006-Add-Meson-build-system.patch b/pkgs/by-name/ld/ld64/patches/0006-Add-Meson-build-system.patch new file mode 100644 index 000000000000..c03f5f5a2fb2 --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0006-Add-Meson-build-system.patch @@ -0,0 +1,328 @@ +From 099f663adc119ade6509569505358a0955c2b02a Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Wed, 13 Nov 2024 13:53:14 -0500 +Subject: [PATCH 06/18] Add Meson build system + +--- + meson.build | 42 +++++++++++++++++++ + meson.options | 5 +++ + src/abstraction/meson.build | 3 ++ + src/ld/meson.build | 68 +++++++++++++++++++++++++++++++ + src/ld/parsers/meson.build | 26 ++++++++++++ + src/mach_o/meson.build | 13 ++++++ + src/meson.build | 16 ++++++++ + src/other/meson.build | 80 +++++++++++++++++++++++++++++++++++++ + 8 files changed, 253 insertions(+) + create mode 100644 meson.build + create mode 100644 meson.options + create mode 100644 src/abstraction/meson.build + create mode 100644 src/ld/meson.build + create mode 100644 src/ld/parsers/meson.build + create mode 100644 src/mach_o/meson.build + create mode 100644 src/meson.build + create mode 100644 src/other/meson.build + +diff --git a/meson.build b/meson.build +new file mode 100644 +index 0000000..cd4e8da +--- /dev/null ++++ b/meson.build +@@ -0,0 +1,42 @@ ++project( ++ 'ld64', ++ 'c', 'cpp', ++ default_options : {'c_std': 'c23', 'cpp_std': 'c++23'}, ++ license : 'APSL-2.0', ++ license_files : 'APPLE_LICENSE', ++ meson_version : '>=1.6.0', ++ version : '954.16', ++) ++ ++add_project_arguments( ++ # Avoid needing to link libSupport, which helps avoid a dependency on LLVM in packages ++ # that link libprunetrie.a (such as cctools). ++ '-DLLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING=1', ++ language : 'cpp', ++) ++ ++ ++cc = meson.get_compiler('c') ++cxx = meson.get_compiler('cpp') ++ ++ ++libcodedirectory_dep = dependency( ++ 'libcodedirectory', ++ version : '=819.6.1', ++) ++libtapi_dep = dependency( ++ 'libtapi', ++ version : [ '>=1500' , '<1600' ], ++) ++llvm_dep = dependency( ++ 'llvm', ++ version : '>=19.1' ++).partial_dependency(includes : true) # ld64 only needs LLVM headers for ADTs. ++openssl_dep = dependency( ++ 'openssl', ++ version : '>=3.0' ++) ++xar_dep = cc.find_library('xar') ++ ++ ++subdir('src') +diff --git a/meson.options b/meson.options +new file mode 100644 +index 0000000..dd40e66 +--- /dev/null ++++ b/meson.options +@@ -0,0 +1,5 @@ ++option( ++ 'libllvm_path', ++ type : 'string', ++ description: 'Specifies the default path to LLVM for `libLTO.dylib`' ++) +diff --git a/src/abstraction/meson.build b/src/abstraction/meson.build +new file mode 100644 +index 0000000..eae50ea +--- /dev/null ++++ b/src/abstraction/meson.build +@@ -0,0 +1,3 @@ ++abstraction_dep = declare_dependency( ++ include_directories : [ '.' ] ++) +diff --git a/src/ld/meson.build b/src/ld/meson.build +new file mode 100644 +index 0000000..8bc85b7 +--- /dev/null ++++ b/src/ld/meson.build +@@ -0,0 +1,68 @@ ++subdir('parsers') ++ ++executable( ++ 'ld', ++ cpp_args : [ ++ '-Wno-c23-extensions', ++ '-Wno-vla-cxx-extension', ++ ], ++ dependencies : [ ++ abstraction_dep, ++ libcodedirectory_dep, ++ libtapi_dep, ++ llvm_dep, ++ mach_o_dep, ++ openssl_dep, ++ parsers_dep, ++ xar_dep, ++ ], ++ include_directories : [ ++ 'code-sign-blobs', ++ 'parsers', ++ 'passes', ++ ], ++ install : true, ++ # These linker flags mirror those used in a release build of the Xcode project. ++ # See: https://github.com/apple-oss-distributions/ld64/blob/47f477cb721755419018f7530038b272e9d0cdea/ld64.xcodeproj/project.pbxproj#L1292-L1299. ++ link_args : [ ++ '-Wl,-exported_symbol,__mh_execute_header', ++ '-Wl,-stack_size,0x02000000', ++ '-Wl,-client_name,ld', ++ ], ++ sources : [ ++ configure_h, ++ 'FatFile.cpp', ++ 'InputFiles.cpp', ++ 'Mangling.cpp', ++ 'Options.cpp', ++ 'OutputFile.cpp', ++ 'PlatformSupport.cpp', ++ 'Resolver.cpp', ++ 'ResponseFiles.cpp', ++ 'Snapshot.cpp', ++ 'SymbolTable.cpp', ++ 'code-sign-blobs/blob.cpp', ++ 'code-sign-blobs/blob.h', ++ 'debugline.c', ++ 'ld.cpp', ++ 'libcodedirectory.c', ++ 'passes/bitcode_bundle.cpp', ++ 'passes/branch_island.cpp', ++ 'passes/branch_shim.cpp', ++ 'passes/code_dedup.cpp', ++ 'passes/compact_unwind.cpp', ++ 'passes/dtrace_dof.cpp', ++ 'passes/dylibs.cpp', ++ 'passes/got.cpp', ++ 'passes/huge.cpp', ++ 'passes/inits.cpp', ++ 'passes/objc.cpp', ++ 'passes/objc_constants.cpp', ++ 'passes/objc_stubs.cpp', ++ 'passes/order.cpp', ++ 'passes/stubs/stubs.cpp', ++ 'passes/thread_starts.cpp', ++ 'passes/tlvp.cpp', ++ ], ++) ++install_man(meson.global_source_root() / 'doc/man/man1/ld-classic.1') +diff --git a/src/ld/parsers/meson.build b/src/ld/parsers/meson.build +new file mode 100644 +index 0000000..a88f651 +--- /dev/null ++++ b/src/ld/parsers/meson.build +@@ -0,0 +1,26 @@ ++parsers = static_library( ++ 'parsers', ++ cpp_args : [ '-Wno-vla-cxx-extension' ], ++ dependencies : [ ++ abstraction_dep, ++ libtapi_dep, ++ ], ++ include_directories : [ ++ '..', # For ld64 headers ++ ], ++ sources : [ ++ configure_h, ++ 'archive_file.cpp', ++ 'generic_dylib_file.cpp', ++ 'lto_file.cpp', ++ 'macho_dylib_file.cpp', ++ 'macho_relocatable_file.cpp', ++ 'opaque_section_file.cpp', ++ 'textstub_dylib_file.cpp', ++ ], ++) ++ ++parsers_dep = declare_dependency( ++ include_directories : [ '.' ], ++ link_with : parsers, ++) +diff --git a/src/mach_o/meson.build b/src/mach_o/meson.build +new file mode 100644 +index 0000000..88d4f7a +--- /dev/null ++++ b/src/mach_o/meson.build +@@ -0,0 +1,13 @@ ++mach_o = static_library( ++ 'mach_o', ++ cpp_args : [ '-Wno-vla-cxx-extension' ], ++ sources : [ ++ 'Error.cpp', ++ 'ExportsTrie.cpp', ++ ], ++) ++ ++mach_o_dep = declare_dependency( ++ include_directories : [ '.' ], ++ link_with : mach_o, ++) +diff --git a/src/meson.build b/src/meson.build +new file mode 100644 +index 0000000..e1e3b1a +--- /dev/null ++++ b/src/meson.build +@@ -0,0 +1,16 @@ ++configure_h = custom_target( ++ 'configure_h', ++ command : [ find_program('bash'), '@INPUT@' ], ++ env : { ++ 'DERIVED_FILE_DIR' : meson.current_build_dir(), ++ 'RC_ProjectSourceVersion': meson.project_version(), ++ }, ++ input : 'create_configure', ++ output : 'configure.h', ++) ++ ++subdir('abstraction') ++subdir('mach_o') ++ ++subdir('ld') ++subdir('other') +diff --git a/src/other/meson.build b/src/other/meson.build +new file mode 100644 +index 0000000..067a69c +--- /dev/null ++++ b/src/other/meson.build +@@ -0,0 +1,80 @@ ++machocheck = executable( ++ 'machocheck', ++ dependencies : [ ++ abstraction_dep, ++ llvm_dep, ++ ], ++ include_directories : [ '../ld' ], ++ install : true, ++ sources : [ ++ configure_h, ++ 'machochecker.cpp', ++ ], ++) ++ ++ObjectDump = executable( ++ 'ObjectDump', ++ cpp_args : [ '-Wno-vla-cxx-extension' ], ++ dependencies : [ ++ abstraction_dep, ++ libtapi_dep, ++ parsers_dep, ++ ], ++ include_directories : [ '../ld' ], ++ install : true, ++ sources : [ ++ configure_h, ++ '../ld/PlatformSupport.cpp', ++ '../ld/debugline.c', ++ 'ObjectDump.cpp', ++ ], ++) ++ ++objcimageinfo = executable( ++ 'objcimageinfo', ++ dependencies : [ ++ abstraction_dep, ++ llvm_dep, ++ ], ++ include_directories : [ '../ld' ], ++ install : true, ++ sources : [ ++ configure_h, ++ 'objcimageinfo.cpp', ++ ], ++) ++ ++unwinddump = executable( ++ 'unwinddump', ++ dependencies : [ ++ abstraction_dep, ++ llvm_dep, ++ ], ++ include_directories : [ '../ld' ], ++ install : true, ++ sources : [ ++ configure_h, ++ 'UnwindDump.cpp', ++ ], ++) ++install_man(meson.global_source_root() / 'doc/man/man1/unwinddump.1') ++ ++static_library( ++ 'prunetrie', ++ cpp_args : [ '-Wno-vla-cxx-extension' ], ++ dependencies : [ ++ abstraction_dep, ++ mach_o_dep ++ ], ++ include_directories : [ '../ld' ], ++ install : true, ++ override_options : {'b_lto': false}, ++ sources : [ ++ configure_h, ++ 'PruneTrie.cpp', ++ ], ++) ++install_headers( ++ 'prune_trie.h', ++ subdir : 'mach-o', ++) +-- +2.47.2 + diff --git a/pkgs/by-name/ld/ld64/patches/0007-Add-CrashReporterClient-header.patch b/pkgs/by-name/ld/ld64/patches/0007-Add-CrashReporterClient-header.patch new file mode 100644 index 000000000000..b3b84c8396fa --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0007-Add-CrashReporterClient-header.patch @@ -0,0 +1,91 @@ +From 8bc85cdac6c39215d0d7ea4facfea593efe785ec Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Wed, 13 Nov 2024 13:53:14 -0500 +Subject: [PATCH 07/18] Add CrashReporterClient header + +Based on: https://github.com/apple-oss-distributions/WebKit2/blob/523170e4638816ec4a39c8128a4f3c4ab70a6f89/Platform/spi/Cocoa/CrashReporterClientSPI.h +--- + include/CrashReporterClient.h | 48 +++++++++++++++++++++++++++++++++++ + include/meson.build | 4 +++ + meson.build | 1 + + 3 files changed, 53 insertions(+) + create mode 100644 include/CrashReporterClient.h + create mode 100644 include/meson.build + +diff --git a/include/CrashReporterClient.h b/include/CrashReporterClient.h +new file mode 100644 +index 0000000..f892448 +--- /dev/null ++++ b/include/CrashReporterClient.h +@@ -0,0 +1,48 @@ ++/* ++ * Copyright (C) 2017 Apple Inc. All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * ++ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' ++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS ++ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR ++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF ++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS ++ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN ++ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF ++ * THE POSSIBILITY OF SUCH DAMAGE. ++ */ ++#pragma once ++ ++#define CRASHREPORTER_ANNOTATIONS_SECTION "__crash_info" ++#define CRASHREPORTER_ANNOTATIONS_VERSION 5 ++#define CRASH_REPORTER_CLIENT_HIDDEN __attribute__((visibility("hidden"))) ++ ++#define _crc_make_getter(attr) ((const char *)(unsigned long)gCRAnnotations.attr) ++#define _crc_make_setter(attr, arg) (gCRAnnotations.attr = (uint64_t)(unsigned long)(arg)) ++#define CRGetCrashLogMessage() _crc_make_getter(message) ++#define CRSetCrashLogMessage(m) _crc_make_setter(message, m) ++ ++struct crashreporter_annotations_t { ++ uint64_t version; ++ uint64_t message; ++ uint64_t signature_string; ++ uint64_t backtrace; ++ uint64_t message2; ++ uint64_t thread; ++ uint64_t dialog_mode; ++ uint64_t abort_cause; ++}; ++ ++CRASH_REPORTER_CLIENT_HIDDEN ++extern struct crashreporter_annotations_t gCRAnnotations; +diff --git a/include/meson.build b/include/meson.build +new file mode 100644 +index 0000000..bbe6fcb +--- /dev/null ++++ b/include/meson.build +@@ -0,0 +1,4 @@ ++add_project_arguments( ++ '-I' + meson.global_source_root() / 'include', ++ language : [ 'c', 'cpp' ], ++) +diff --git a/meson.build b/meson.build +index cd4e8da..a79f03f 100644 +--- a/meson.build ++++ b/meson.build +@@ -39,4 +39,5 @@ openssl_dep = dependency( + xar_dep = cc.find_library('xar') + + ++subdir('include') + subdir('src') +-- +2.47.2 + diff --git a/pkgs/by-name/ld/ld64/patches/0008-Provide-mach-compatibility-headers-based-on-LLVM-s-h.patch b/pkgs/by-name/ld/ld64/patches/0008-Provide-mach-compatibility-headers-based-on-LLVM-s-h.patch new file mode 100644 index 000000000000..5991e1452bf3 --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0008-Provide-mach-compatibility-headers-based-on-LLVM-s-h.patch @@ -0,0 +1,662 @@ +From 5ce3538352b162cfaacca4a7e3c5e04fabf1d169 Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Wed, 13 Nov 2024 13:53:14 -0500 +Subject: [PATCH 08/18] =?UTF-8?q?Provide=20mach=20compatibility=20headers?= + =?UTF-8?q?=20based=20on=20LLVM=E2=80=99s=20headers?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + include/mach-o/fat.h | 16 ++ + include/mach-o/loader.h | 224 +++++++++++++++++++++++ + include/mach-o/nlist.h | 61 ++++++ + include/mach/machine.h | 200 ++++++++++++++++++++ + include/mach/vm_prot.h | 13 ++ + src/abstraction/MachOFileAbstraction.hpp | 32 ++-- + 6 files changed, 530 insertions(+), 16 deletions(-) + create mode 100644 include/mach-o/fat.h + create mode 100644 include/mach-o/loader.h + create mode 100644 include/mach-o/nlist.h + create mode 100644 include/mach/machine.h + create mode 100644 include/mach/vm_prot.h + +diff --git a/include/mach-o/fat.h b/include/mach-o/fat.h +new file mode 100644 +index 0000000..82f5dc1 +--- /dev/null ++++ b/include/mach-o/fat.h +@@ -0,0 +1,16 @@ ++// SPDX-License-Identifier: APSL-2.0 ++ ++// Derive `fat.h` from LLVM to avoid macro conflicts. ++ ++#pragma once ++ ++#include ++ ++using llvm::MachO::fat_arch; ++using llvm::MachO::fat_arch_64; ++using llvm::MachO::fat_header; ++ ++using llvm::MachO::FAT_CIGAM; ++using llvm::MachO::FAT_CIGAM_64; ++using llvm::MachO::FAT_MAGIC; ++using llvm::MachO::FAT_MAGIC_64; +diff --git a/include/mach-o/loader.h b/include/mach-o/loader.h +new file mode 100644 +index 0000000..5306a20 +--- /dev/null ++++ b/include/mach-o/loader.h +@@ -0,0 +1,224 @@ ++// SPDX-License-Identifier: APSL-2.0 ++ ++// Derive `loader.h` from LLVM to avoid macro conflicts. ++ ++#pragma once ++ ++#include ++ ++#include ++ ++using llvm::MachO::mach_header; ++using llvm::MachO::mach_header_64; ++ ++using llvm::MachO::data_in_code_entry; ++ ++using llvm::MachO::dylib_table_of_contents; ++ ++using llvm::MachO::dylib_module; ++using llvm::MachO::dylib_module_64; ++ ++using llvm::MachO::section; ++using llvm::MachO::section_64; ++ ++using llvm::MachO::build_tool_version; ++using llvm::MachO::build_version_command; ++using llvm::MachO::dyld_info_command; ++using llvm::MachO::dylib; ++using llvm::MachO::dylib_command; ++using llvm::MachO::dylinker_command; ++using llvm::MachO::dysymtab_command; ++using llvm::MachO::encryption_info_command; ++using llvm::MachO::encryption_info_command_64; ++using llvm::MachO::entry_point_command; ++using llvm::MachO::linkedit_data_command; ++using llvm::MachO::linker_option_command; ++using llvm::MachO::load_command; ++using llvm::MachO::routines_command; ++using llvm::MachO::routines_command_64; ++using llvm::MachO::rpath_command; ++using llvm::MachO::segment_command; ++using llvm::MachO::segment_command_64; ++using llvm::MachO::source_version_command; ++using llvm::MachO::sub_client_command; ++using llvm::MachO::sub_framework_command; ++using llvm::MachO::sub_library_command; ++using llvm::MachO::sub_umbrella_command; ++using llvm::MachO::symtab_command; ++using llvm::MachO::thread_command; ++using llvm::MachO::twolevel_hints_command; ++using llvm::MachO::uuid_command; ++using llvm::MachO::version_min_command; ++ ++using llvm::MachO::LC_BUILD_VERSION; ++using llvm::MachO::LC_CODE_SIGNATURE; ++using llvm::MachO::LC_DATA_IN_CODE; ++using llvm::MachO::LC_DYLD_ENVIRONMENT; ++using llvm::MachO::LC_DYLD_INFO; ++using llvm::MachO::LC_DYLD_INFO_ONLY; ++using llvm::MachO::LC_DYSYMTAB; ++using llvm::MachO::LC_ENCRYPTION_INFO; ++using llvm::MachO::LC_ENCRYPTION_INFO_64; ++using llvm::MachO::LC_FUNCTION_STARTS; ++using llvm::MachO::LC_ID_DYLIB; ++using llvm::MachO::LC_ID_DYLINKER; ++using llvm::MachO::LC_LINKER_OPTION; ++using llvm::MachO::LC_LOAD_DYLIB; ++using llvm::MachO::LC_LOAD_DYLINKER; ++using llvm::MachO::LC_LOAD_UPWARD_DYLIB; ++using llvm::MachO::LC_LOAD_WEAK_DYLIB; ++using llvm::MachO::LC_MAIN; ++using llvm::MachO::LC_REEXPORT_DYLIB; ++using llvm::MachO::LC_REQ_DYLD; ++using llvm::MachO::LC_ROUTINES; ++using llvm::MachO::LC_ROUTINES_64; ++using llvm::MachO::LC_RPATH; ++using llvm::MachO::LC_SEGMENT; ++using llvm::MachO::LC_SEGMENT_64; ++using llvm::MachO::LC_SEGMENT_SPLIT_INFO; ++using llvm::MachO::LC_SOURCE_VERSION; ++using llvm::MachO::LC_SUB_CLIENT; ++using llvm::MachO::LC_SUB_FRAMEWORK; ++using llvm::MachO::LC_SUB_LIBRARY; ++using llvm::MachO::LC_SUB_UMBRELLA; ++using llvm::MachO::LC_SYMTAB; ++using llvm::MachO::LC_UNIXTHREAD; ++using llvm::MachO::LC_UUID; ++using llvm::MachO::LC_VERSION_MIN_IPHONEOS; ++using llvm::MachO::LC_VERSION_MIN_MACOSX; ++using llvm::MachO::LC_VERSION_MIN_TVOS; ++using llvm::MachO::LC_VERSION_MIN_WATCHOS; ++using llvm::MachO::LC_DYLIB_CODE_SIGN_DRS; ++using llvm::MachO::LC_NOTE; ++using llvm::MachO::LC_LAZY_LOAD_DYLIB; ++using llvm::MachO::LC_PREBIND_CKSUM; ++using llvm::MachO::LC_TWOLEVEL_HINTS; ++ ++using llvm::MachO::MH_ALLOW_STACK_EXECUTION; ++using llvm::MachO::MH_APP_EXTENSION_SAFE; ++using llvm::MachO::MH_BINDS_TO_WEAK; ++using llvm::MachO::MH_BUNDLE; ++using llvm::MachO::MH_CIGAM; ++using llvm::MachO::MH_CIGAM_64; ++using llvm::MachO::MH_DEAD_STRIPPABLE_DYLIB; ++using llvm::MachO::MH_DYLDLINK; ++using llvm::MachO::MH_DYLIB; ++using llvm::MachO::MH_DYLIB_STUB; ++using llvm::MachO::MH_DYLINKER; ++using llvm::MachO::MH_EXECUTE; ++using llvm::MachO::MH_LAZY_INIT; ++using llvm::MachO::MH_INCRLINK; ++using llvm::MachO::MH_HAS_TLV_DESCRIPTORS; ++using llvm::MachO::MH_KEXT_BUNDLE; ++using llvm::MachO::MH_MAGIC; ++using llvm::MachO::MH_MAGIC_64; ++using llvm::MachO::MH_NOUNDEFS; ++using llvm::MachO::MH_NO_HEAP_EXECUTION; ++using llvm::MachO::MH_NO_REEXPORTED_DYLIBS; ++using llvm::MachO::MH_OBJECT; ++using llvm::MachO::MH_PIE; ++using llvm::MachO::MH_PREBOUND; ++using llvm::MachO::MH_PRELOAD; ++using llvm::MachO::MH_SPLIT_SEGS; ++using llvm::MachO::MH_SUBSECTIONS_VIA_SYMBOLS; ++using llvm::MachO::MH_TWOLEVEL; ++using llvm::MachO::MH_WEAK_DEFINES; ++ ++using llvm::MachO::BIND_IMMEDIATE_MASK; ++ ++using llvm::MachO::BIND_OPCODE_ADD_ADDR_ULEB; ++using llvm::MachO::BIND_OPCODE_DONE; ++using llvm::MachO::BIND_OPCODE_DO_BIND; ++using llvm::MachO::BIND_OPCODE_DO_BIND_ADD_ADDR_IMM_SCALED; ++using llvm::MachO::BIND_OPCODE_DO_BIND_ADD_ADDR_ULEB; ++using llvm::MachO::BIND_OPCODE_DO_BIND_ULEB_TIMES_SKIPPING_ULEB; ++using llvm::MachO::BIND_OPCODE_SET_ADDEND_SLEB; ++using llvm::MachO::BIND_OPCODE_SET_DYLIB_ORDINAL_IMM; ++using llvm::MachO::BIND_OPCODE_SET_DYLIB_ORDINAL_ULEB; ++using llvm::MachO::BIND_OPCODE_SET_DYLIB_SPECIAL_IMM; ++using llvm::MachO::BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB; ++using llvm::MachO::BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM; ++using llvm::MachO::BIND_OPCODE_SET_TYPE_IMM; ++using llvm::MachO::BIND_OPCODE_MASK; ++ ++using llvm::MachO::BIND_SPECIAL_DYLIB_FLAT_LOOKUP; ++using llvm::MachO::BIND_SPECIAL_DYLIB_MAIN_EXECUTABLE; ++using llvm::MachO::BIND_SPECIAL_DYLIB_SELF; ++ ++using llvm::MachO::BIND_SYMBOL_FLAGS_NON_WEAK_DEFINITION; ++using llvm::MachO::BIND_SYMBOL_FLAGS_WEAK_IMPORT; ++ ++using llvm::MachO::BIND_TYPE_POINTER; ++using llvm::MachO::BIND_TYPE_TEXT_ABSOLUTE32; ++using llvm::MachO::BIND_TYPE_TEXT_PCREL32; ++ ++using llvm::MachO::DICE_KIND_ABS_JUMP_TABLE32; ++using llvm::MachO::DICE_KIND_DATA; ++using llvm::MachO::DICE_KIND_JUMP_TABLE16; ++using llvm::MachO::DICE_KIND_JUMP_TABLE32; ++using llvm::MachO::DICE_KIND_JUMP_TABLE8; ++ ++using llvm::MachO::EXPORT_SYMBOL_FLAGS_KIND_MASK; ++using llvm::MachO::EXPORT_SYMBOL_FLAGS_KIND_REGULAR; ++using llvm::MachO::EXPORT_SYMBOL_FLAGS_KIND_THREAD_LOCAL; ++using llvm::MachO::EXPORT_SYMBOL_FLAGS_REEXPORT; ++using llvm::MachO::EXPORT_SYMBOL_FLAGS_STUB_AND_RESOLVER; ++using llvm::MachO::EXPORT_SYMBOL_FLAGS_WEAK_DEFINITION; ++ ++using llvm::MachO::REBASE_IMMEDIATE_MASK; ++ ++using llvm::MachO::REBASE_OPCODE_MASK; ++using llvm::MachO::REBASE_OPCODE_ADD_ADDR_IMM_SCALED; ++using llvm::MachO::REBASE_OPCODE_ADD_ADDR_ULEB; ++using llvm::MachO::REBASE_OPCODE_DONE; ++using llvm::MachO::REBASE_OPCODE_DO_REBASE_ADD_ADDR_ULEB; ++using llvm::MachO::REBASE_OPCODE_DO_REBASE_IMM_TIMES; ++using llvm::MachO::REBASE_OPCODE_DO_REBASE_ULEB_TIMES; ++using llvm::MachO::REBASE_OPCODE_DO_REBASE_ULEB_TIMES_SKIPPING_ULEB; ++using llvm::MachO::REBASE_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB; ++using llvm::MachO::REBASE_OPCODE_SET_TYPE_IMM; ++ ++using llvm::MachO::REBASE_TYPE_POINTER; ++using llvm::MachO::REBASE_TYPE_TEXT_ABSOLUTE32; ++using llvm::MachO::REBASE_TYPE_TEXT_PCREL32; ++ ++using llvm::MachO::S_4BYTE_LITERALS; ++using llvm::MachO::S_8BYTE_LITERALS; ++using llvm::MachO::S_16BYTE_LITERALS; ++using llvm::MachO::S_ATTR_DEBUG; ++using llvm::MachO::S_ATTR_EXT_RELOC; ++using llvm::MachO::S_ATTR_LIVE_SUPPORT; ++using llvm::MachO::S_ATTR_LOC_RELOC; ++using llvm::MachO::S_ATTR_LOC_RELOC; ++using llvm::MachO::S_ATTR_NO_DEAD_STRIP; ++using llvm::MachO::S_ATTR_PURE_INSTRUCTIONS; ++using llvm::MachO::S_ATTR_SELF_MODIFYING_CODE; ++using llvm::MachO::S_ATTR_SOME_INSTRUCTIONS; ++using llvm::MachO::S_COALESCED; ++using llvm::MachO::S_CSTRING_LITERALS; ++using llvm::MachO::S_DTRACE_DOF; ++using llvm::MachO::S_INTERPOSING; ++using llvm::MachO::S_LAZY_DYLIB_SYMBOL_POINTERS; ++using llvm::MachO::S_LAZY_SYMBOL_POINTERS; ++using llvm::MachO::S_LITERAL_POINTERS; ++using llvm::MachO::S_MOD_INIT_FUNC_POINTERS; ++using llvm::MachO::S_MOD_TERM_FUNC_POINTERS; ++using llvm::MachO::S_NON_LAZY_SYMBOL_POINTERS; ++using llvm::MachO::S_REGULAR; ++using llvm::MachO::S_SYMBOL_STUBS; ++using llvm::MachO::S_THREAD_LOCAL_INIT_FUNCTION_POINTERS; ++using llvm::MachO::S_THREAD_LOCAL_REGULAR; ++using llvm::MachO::S_THREAD_LOCAL_VARIABLES; ++using llvm::MachO::S_THREAD_LOCAL_VARIABLE_POINTERS; ++using llvm::MachO::S_THREAD_LOCAL_ZEROFILL; ++using llvm::MachO::S_ZEROFILL; ++ ++using llvm::MachO::SG_NORELOC; ++ ++using llvm::MachO::INDIRECT_SYMBOL_ABS; ++using llvm::MachO::INDIRECT_SYMBOL_LOCAL; ++using llvm::MachO::SECTION_TYPE; ++using llvm::MachO::TOOL_LD; ++ ++template ++inline constexpr int operator| (llvm::MachO::SectionType lhs, T rhs) { return (int) lhs | (int) rhs; } +diff --git a/include/mach-o/nlist.h b/include/mach-o/nlist.h +new file mode 100644 +index 0000000..3c319a4 +--- /dev/null ++++ b/include/mach-o/nlist.h +@@ -0,0 +1,61 @@ ++// SPDX-License-Identifier: APSL-2.0 ++ ++// Derive `nlist.h` from LLVM to avoid macro conflicts. ++ ++#pragma once ++ ++#include ++ ++using llvm::MachO::nlist; ++using llvm::MachO::nlist_64; ++ ++using llvm::MachO::N_ARM_THUMB_DEF; ++ ++using llvm::MachO::N_ABS; ++using llvm::MachO::N_EXT; ++using llvm::MachO::N_INDR; ++using llvm::MachO::N_PBUD; ++using llvm::MachO::N_PEXT; ++using llvm::MachO::N_SECT; ++using llvm::MachO::N_STAB; ++using llvm::MachO::N_TYPE; ++using llvm::MachO::N_UNDF; ++ ++using llvm::MachO::N_ALT_ENTRY; ++using llvm::MachO::N_NO_DEAD_STRIP; ++using llvm::MachO::N_SYMBOL_RESOLVER; ++using llvm::MachO::N_WEAK_DEF; ++using llvm::MachO::N_WEAK_REF; ++ ++#define N_REF_TO_WEAK 0x80 // Not defined in LLVM headers ++ ++using llvm::MachO::DYNAMIC_LOOKUP_ORDINAL; ++ ++using llvm::MachO::EXECUTABLE_ORDINAL; ++ ++using llvm::MachO::GET_COMM_ALIGN; ++using llvm::MachO::SET_COMM_ALIGN; ++ ++using llvm::MachO::GET_LIBRARY_ORDINAL; ++using llvm::MachO::SET_LIBRARY_ORDINAL; ++ ++using llvm::MachO::REFERENCE_FLAG_DEFINED; ++using llvm::MachO::REFERENCE_FLAG_PRIVATE_DEFINED; ++using llvm::MachO::REFERENCE_FLAG_PRIVATE_UNDEFINED_LAZY; ++using llvm::MachO::REFERENCE_FLAG_PRIVATE_UNDEFINED_NON_LAZY; ++using llvm::MachO::REFERENCE_FLAG_UNDEFINED_LAZY; ++using llvm::MachO::REFERENCE_FLAG_UNDEFINED_NON_LAZY; ++using llvm::MachO::REFERENCE_TYPE; ++ ++using llvm::MachO::REFERENCED_DYNAMICALLY; ++ ++using llvm::MachO::MAX_SECT; ++using llvm::MachO::NO_SECT; ++ ++using llvm::MachO::SELF_LIBRARY_ORDINAL; ++ ++template ++inline constexpr int operator| (llvm::MachO::NListType lhs, T rhs) { return (int) lhs | (int) rhs; } ++ ++template ++inline constexpr int operator| (T lhs, llvm::MachO::NListType rhs) { return (int) lhs | (int) rhs; } +diff --git a/include/mach/machine.h b/include/mach/machine.h +new file mode 100644 +index 0000000..9162c1d +--- /dev/null ++++ b/include/mach/machine.h +@@ -0,0 +1,200 @@ ++// SPDX-License-Identifier: APSL-2.0 ++ ++// Derive `machine.h` from LLVM to avoid macro conflicts. ++ ++#pragma once ++ ++#include_next ++ ++#undef CPU_ARCH_MASK ++ ++#undef CPU_ARCH_ABI64_32 ++#undef CPU_ARCH_ABI64 ++ ++#undef CPU_TYPE_ANY ++ ++#undef CPU_TYPE_ARM ++#undef CPU_TYPE_ARM64 ++#undef CPU_TYPE_ARM64_32 ++#undef CPU_TYPE_I386 ++#undef CPU_TYPE_X86 ++#undef CPU_TYPE_X86_64 ++#undef CPU_TYPE_MC98000 ++#undef CPU_TYPE_SPARC ++#undef CPU_TYPE_POWERPC ++#undef CPU_TYPE_POWERPC64 ++ ++#undef CPU_SUBTYPE_MASK ++ ++#undef CPU_SUBTYPE_ARM64E ++#undef CPU_SUBTYPE_ARM64_32_V8 ++#undef CPU_SUBTYPE_ARM64_ALL ++#undef CPU_SUBTYPE_ARM64_V8 ++#undef CPU_SUBTYPE_ARM_ALL ++#undef CPU_SUBTYPE_ARM_XSCALE ++#undef CPU_SUBTYPE_ARM_V4T ++#undef CPU_SUBTYPE_ARM_V5TEJ ++#undef CPU_SUBTYPE_ARM_V6 ++#undef CPU_SUBTYPE_ARM_V6M ++#undef CPU_SUBTYPE_ARM_V7 ++#undef CPU_SUBTYPE_ARM_V7EM ++#undef CPU_SUBTYPE_ARM_V7F ++#undef CPU_SUBTYPE_ARM_V7K ++#undef CPU_SUBTYPE_ARM_V7M ++#undef CPU_SUBTYPE_ARM_V7S ++#undef CPU_SUBTYPE_ARM_V8 ++ ++#undef CPU_SUBTYPE_I386_ALL ++#undef CPU_SUBTYPE_386 ++#undef CPU_SUBTYPE_486 ++#undef CPU_SUBTYPE_486SX ++#undef CPU_SUBTYPE_586 ++#undef CPU_SUBTYPE_PENT ++#undef CPU_SUBTYPE_PENTPRO ++#undef CPU_SUBTYPE_PENTII_M3 ++#undef CPU_SUBTYPE_PENTII_M5 ++#undef CPU_SUBTYPE_CELERON ++#undef CPU_SUBTYPE_CELERON_MOBILE ++#undef CPU_SUBTYPE_PENTIUM_3 ++#undef CPU_SUBTYPE_PENTIUM_3_M ++#undef CPU_SUBTYPE_PENTIUM_3_XEON ++#undef CPU_SUBTYPE_PENTIUM_M ++#undef CPU_SUBTYPE_PENTIUM_4 ++#undef CPU_SUBTYPE_PENTIUM_4_M ++#undef CPU_SUBTYPE_ITANIUM ++#undef CPU_SUBTYPE_ITANIUM_2 ++#undef CPU_SUBTYPE_XEON ++#undef CPU_SUBTYPE_XEON_MP ++ ++#undef CPU_SUBTYPE_X86_ALL ++#undef CPU_SUBTYPE_X86_ARCH1 ++ ++#undef CPU_SUBTYPE_X86_64_ALL ++#undef CPU_SUBTYPE_X86_64_H ++ ++#undef CPU_SUBTYPE_INTEL ++#undef CPU_SUBTYPE_INTEL_FAMILY ++#undef CPU_SUBTYPE_INTEL_FAMILY_MAX ++#undef CPU_SUBTYPE_INTEL_MODEL ++#undef CPU_SUBTYPE_INTEL_MODEL_ALL ++ ++#undef CPU_SUBTYPE_POWERPC_ALL ++#undef CPU_SUBTYPE_POWERPC_601 ++#undef CPU_SUBTYPE_POWERPC_602 ++#undef CPU_SUBTYPE_POWERPC_603 ++#undef CPU_SUBTYPE_POWERPC_603e ++#undef CPU_SUBTYPE_POWERPC_603ev ++#undef CPU_SUBTYPE_POWERPC_604 ++#undef CPU_SUBTYPE_POWERPC_604e ++#undef CPU_SUBTYPE_POWERPC_620 ++#undef CPU_SUBTYPE_POWERPC_750 ++#undef CPU_SUBTYPE_POWERPC_7400 ++#undef CPU_SUBTYPE_POWERPC_7450 ++#undef CPU_SUBTYPE_POWERPC_970 ++ ++#undef CPU_SUBTYPE_MC98601 ++ ++#undef CPU_SUBTYPE_SPARC_ALL ++ ++#undef CPU_SUBTYPE_LIB64 ++#undef CPU_SUBTYPE_MULTIPLE ++ ++#include ++ ++using llvm::MachO::CPU_ARCH_MASK; ++ ++using llvm::MachO::CPU_ARCH_ABI64_32; ++using llvm::MachO::CPU_ARCH_ABI64; ++ ++using llvm::MachO::CPU_TYPE_ANY; ++ ++using llvm::MachO::CPU_TYPE_ARM; ++using llvm::MachO::CPU_TYPE_ARM64; ++using llvm::MachO::CPU_TYPE_ARM64_32; ++using llvm::MachO::CPU_TYPE_I386; ++using llvm::MachO::CPU_TYPE_X86; ++using llvm::MachO::CPU_TYPE_X86_64; ++using llvm::MachO::CPU_TYPE_MC98000; ++using llvm::MachO::CPU_TYPE_SPARC; ++using llvm::MachO::CPU_TYPE_POWERPC; ++using llvm::MachO::CPU_TYPE_POWERPC64; ++ ++using llvm::MachO::CPU_SUBTYPE_MASK; ++ ++using llvm::MachO::CPU_SUBTYPE_ARM64E; ++using llvm::MachO::CPU_SUBTYPE_ARM64_32_V8; ++using llvm::MachO::CPU_SUBTYPE_ARM64_ALL; ++using llvm::MachO::CPU_SUBTYPE_ARM64_V8; ++using llvm::MachO::CPU_SUBTYPE_ARM_ALL; ++using llvm::MachO::CPU_SUBTYPE_ARM_XSCALE; ++using llvm::MachO::CPU_SUBTYPE_ARM_V4T; ++using llvm::MachO::CPU_SUBTYPE_ARM_V5TEJ; ++using llvm::MachO::CPU_SUBTYPE_ARM_V6; ++using llvm::MachO::CPU_SUBTYPE_ARM_V6M; ++using llvm::MachO::CPU_SUBTYPE_ARM_V7; ++using llvm::MachO::CPU_SUBTYPE_ARM_V7EM; ++using llvm::MachO::CPU_SUBTYPE_ARM_V7K; ++using llvm::MachO::CPU_SUBTYPE_ARM_V7M; ++using llvm::MachO::CPU_SUBTYPE_ARM_V7S; ++ ++using llvm::MachO::CPU_SUBTYPE_I386_ALL; ++using llvm::MachO::CPU_SUBTYPE_386; ++using llvm::MachO::CPU_SUBTYPE_486; ++using llvm::MachO::CPU_SUBTYPE_486SX; ++using llvm::MachO::CPU_SUBTYPE_586; ++using llvm::MachO::CPU_SUBTYPE_PENT; ++using llvm::MachO::CPU_SUBTYPE_PENTPRO; ++using llvm::MachO::CPU_SUBTYPE_PENTII_M3; ++using llvm::MachO::CPU_SUBTYPE_PENTII_M5; ++using llvm::MachO::CPU_SUBTYPE_CELERON; ++using llvm::MachO::CPU_SUBTYPE_CELERON_MOBILE; ++using llvm::MachO::CPU_SUBTYPE_PENTIUM_3; ++using llvm::MachO::CPU_SUBTYPE_PENTIUM_3_M; ++using llvm::MachO::CPU_SUBTYPE_PENTIUM_3_XEON; ++using llvm::MachO::CPU_SUBTYPE_PENTIUM_M; ++using llvm::MachO::CPU_SUBTYPE_PENTIUM_4; ++using llvm::MachO::CPU_SUBTYPE_PENTIUM_4_M; ++using llvm::MachO::CPU_SUBTYPE_ITANIUM; ++using llvm::MachO::CPU_SUBTYPE_ITANIUM_2; ++using llvm::MachO::CPU_SUBTYPE_XEON; ++using llvm::MachO::CPU_SUBTYPE_XEON_MP; ++ ++using llvm::MachO::CPU_SUBTYPE_X86_ALL; ++using llvm::MachO::CPU_SUBTYPE_X86_ARCH1; ++ ++using llvm::MachO::CPU_SUBTYPE_X86_64_ALL; ++using llvm::MachO::CPU_SUBTYPE_X86_64_H; ++ ++using llvm::MachO::CPU_SUBTYPE_INTEL; ++using llvm::MachO::CPU_SUBTYPE_INTEL_FAMILY; ++using llvm::MachO::CPU_SUBTYPE_INTEL_FAMILY_MAX; ++using llvm::MachO::CPU_SUBTYPE_INTEL_MODEL; ++using llvm::MachO::CPU_SUBTYPE_INTEL_MODEL_ALL; ++ ++using llvm::MachO::CPU_SUBTYPE_POWERPC_ALL; ++using llvm::MachO::CPU_SUBTYPE_POWERPC_601; ++using llvm::MachO::CPU_SUBTYPE_POWERPC_602; ++using llvm::MachO::CPU_SUBTYPE_POWERPC_603; ++using llvm::MachO::CPU_SUBTYPE_POWERPC_603e; ++using llvm::MachO::CPU_SUBTYPE_POWERPC_603ev; ++using llvm::MachO::CPU_SUBTYPE_POWERPC_604; ++using llvm::MachO::CPU_SUBTYPE_POWERPC_604e; ++using llvm::MachO::CPU_SUBTYPE_POWERPC_620; ++using llvm::MachO::CPU_SUBTYPE_POWERPC_750; ++using llvm::MachO::CPU_SUBTYPE_POWERPC_7400; ++using llvm::MachO::CPU_SUBTYPE_POWERPC_7450; ++using llvm::MachO::CPU_SUBTYPE_POWERPC_970; ++ ++using llvm::MachO::CPU_SUBTYPE_MC98601; ++ ++using llvm::MachO::CPU_SUBTYPE_SPARC_ALL; ++ ++using llvm::MachO::CPU_SUBTYPE_LIB64; ++using llvm::MachO::CPU_SUBTYPE_MULTIPLE; ++ ++// These definitions aren’t in the LLVM headers. ++#define CPU_TYPE_RISCV32 24 ++ ++#define CPU_SUBTYPE_ARM_V7F 10 ++#define CPU_SUBTYPE_ARM_V8 CPU_SUBTYPE_ARM64_V8 ++#define CPU_SUBTYPE_RISCV32_ALL 0 +diff --git a/include/mach/vm_prot.h b/include/mach/vm_prot.h +new file mode 100644 +index 0000000..e524808 +--- /dev/null ++++ b/include/mach/vm_prot.h +@@ -0,0 +1,13 @@ ++// SPDX-License-Identifier: APSL-2.0 ++ ++// Derive `vm_prot.h` from LLVM to avoid macro conflicts. ++ ++#pragma once ++ ++#include ++ ++using llvm::MachO::VM_PROT_EXECUTE; ++using llvm::MachO::VM_PROT_READ; ++using llvm::MachO::VM_PROT_WRITE; ++ ++#include_next +diff --git a/src/abstraction/MachOFileAbstraction.hpp b/src/abstraction/MachOFileAbstraction.hpp +index 71e7765..e8d9b5c 100644 +--- a/src/abstraction/MachOFileAbstraction.hpp ++++ b/src/abstraction/MachOFileAbstraction.hpp +@@ -847,8 +847,8 @@ public: + uint32_t cmdsize() const INLINE { return E::get32(fields.cmdsize); } + void set_cmdsize(uint32_t value) INLINE { E::set32(fields.cmdsize, value); } + +- uint32_t name_offset() const INLINE { return E::get32(fields.dylib.name.offset); } +- void set_name_offset(uint32_t value) INLINE { E::set32(fields.dylib.name.offset, value); } ++ uint32_t name_offset() const INLINE { return E::get32(fields.dylib.name); } ++ void set_name_offset(uint32_t value) INLINE { E::set32(fields.dylib.name, value); } + + uint32_t timestamp() const INLINE { return E::get32(fields.dylib.timestamp); } + void set_timestamp(uint32_t value) INLINE { E::set32(fields.dylib.timestamp, value); } +@@ -880,8 +880,8 @@ public: + uint32_t cmdsize() const INLINE { return E::get32(fields.cmdsize); } + void set_cmdsize(uint32_t value) INLINE { E::set32(fields.cmdsize, value); } + +- uint32_t name_offset() const INLINE { return E::get32(fields.name.offset); } +- void set_name_offset(uint32_t value) INLINE { E::set32(fields.name.offset, value); } ++ uint32_t name_offset() const INLINE { return E::get32(fields.name); } ++ void set_name_offset(uint32_t value) INLINE { E::set32(fields.name, value); } + + const char* name() const INLINE { return (const char*)&fields + name_offset(); } + void set_name_offset() INLINE { set_name_offset(sizeof(fields)); } +@@ -904,8 +904,8 @@ public: + uint32_t cmdsize() const INLINE { return E::get32(fields.cmdsize); } + void set_cmdsize(uint32_t value) INLINE { E::set32(fields.cmdsize, value); } + +- uint32_t umbrella_offset() const INLINE { return E::get32(fields.umbrella.offset); } +- void set_umbrella_offset(uint32_t value) INLINE { E::set32(fields.umbrella.offset, value); } ++ uint32_t umbrella_offset() const INLINE { return E::get32(fields.umbrella); } ++ void set_umbrella_offset(uint32_t value) INLINE { E::set32(fields.umbrella, value); } + + const char* umbrella() const INLINE { return (const char*)&fields + umbrella_offset(); } + void set_umbrella_offset() INLINE { set_umbrella_offset(sizeof(fields)); } +@@ -928,8 +928,8 @@ public: + uint32_t cmdsize() const INLINE { return E::get32(fields.cmdsize); } + void set_cmdsize(uint32_t value) INLINE { E::set32(fields.cmdsize, value); } + +- uint32_t client_offset() const INLINE { return E::get32(fields.client.offset); } +- void set_client_offset(uint32_t value) INLINE { E::set32(fields.client.offset, value); } ++ uint32_t client_offset() const INLINE { return E::get32(fields.client); } ++ void set_client_offset(uint32_t value) INLINE { E::set32(fields.client, value); } + + const char* client() const INLINE { return (const char*)&fields + client_offset(); } + void set_client_offset() INLINE { set_client_offset(sizeof(fields)); } +@@ -952,8 +952,8 @@ public: + uint32_t cmdsize() const INLINE { return E::get32(fields.cmdsize); } + void set_cmdsize(uint32_t value) INLINE { E::set32(fields.cmdsize, value); } + +- uint32_t sub_umbrella_offset() const INLINE { return E::get32(fields.sub_umbrella.offset); } +- void set_sub_umbrella_offset(uint32_t value) INLINE { E::set32(fields.sub_umbrella.offset, value); } ++ uint32_t sub_umbrella_offset() const INLINE { return E::get32(fields.sub_umbrella); } ++ void set_sub_umbrella_offset(uint32_t value) INLINE { E::set32(fields.sub_umbrella, value); } + + const char* sub_umbrella() const INLINE { return (const char*)&fields + sub_umbrella_offset(); } + void set_sub_umbrella_offset() INLINE { set_sub_umbrella_offset(sizeof(fields)); } +@@ -976,8 +976,8 @@ public: + uint32_t cmdsize() const INLINE { return E::get32(fields.cmdsize); } + void set_cmdsize(uint32_t value) INLINE { E::set32(fields.cmdsize, value); } + +- uint32_t sub_library_offset() const INLINE { return E::get32(fields.sub_library.offset); } +- void set_sub_library_offset(uint32_t value) INLINE { E::set32(fields.sub_library.offset, value); } ++ uint32_t sub_library_offset() const INLINE { return E::get32(fields.sub_library); } ++ void set_sub_library_offset(uint32_t value) INLINE { E::set32(fields.sub_library, value); } + + const char* sub_library() const INLINE { return (const char*)&fields + sub_library_offset(); } + void set_sub_library_offset() INLINE { set_sub_library_offset(sizeof(fields)); } +@@ -1355,8 +1355,8 @@ public: + uint32_t cmdsize() const INLINE { return E::get32(fields.cmdsize); } + void set_cmdsize(uint32_t value) INLINE { E::set32(fields.cmdsize, value); } + +- uint32_t path_offset() const INLINE { return E::get32(fields.path.offset); } +- void set_path_offset(uint32_t value) INLINE { E::set32(fields.path.offset, value); } ++ uint32_t path_offset() const INLINE { return E::get32(fields.path); } ++ void set_path_offset(uint32_t value) INLINE { E::set32(fields.path, value); } + + const char* path() const INLINE { return (const char*)&fields + path_offset(); } + void set_path_offset() INLINE { set_path_offset(sizeof(fields)); } +@@ -1381,8 +1381,8 @@ template <> struct macho_nlist_content > { struct nlist_ + template + class macho_nlist { + public: +- uint32_t n_strx() const INLINE { return E::get32(entry.fields.n_un.n_strx); } +- void set_n_strx(uint32_t value) INLINE { E::set32((uint32_t&)entry.fields.n_un.n_strx, value); } ++ uint32_t n_strx() const INLINE { return E::get32(entry.fields.n_strx); } ++ void set_n_strx(uint32_t value) INLINE { E::set32((uint32_t&)entry.fields.n_strx, value); } + + uint8_t n_type() const INLINE { return entry.fields.n_type; } + void set_n_type(uint8_t value) INLINE { entry.fields.n_type = value; } +-- +2.47.2 + diff --git a/pkgs/by-name/ld/ld64/patches/0009-Support-LTO-in-nixpkgs.patch b/pkgs/by-name/ld/ld64/patches/0009-Support-LTO-in-nixpkgs.patch new file mode 100644 index 000000000000..0fc0f83266f5 --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0009-Support-LTO-in-nixpkgs.patch @@ -0,0 +1,111 @@ +From 6a023ee77ca48497382050998d9b33c56330f735 Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Wed, 13 Nov 2024 13:53:14 -0500 +Subject: [PATCH 09/18] Support LTO in nixpkgs + +--- + src/ld/InputFiles.cpp | 11 ++--------- + src/ld/meson.build | 13 ++++++++++++- + src/ld/parsers/lto_file.cpp | 2 +- + src/ld/parsers/meson.build | 13 ++++++++++++- + 4 files changed, 27 insertions(+), 12 deletions(-) + +diff --git a/src/ld/InputFiles.cpp b/src/ld/InputFiles.cpp +index e045e90..d5341d9 100644 +--- a/src/ld/InputFiles.cpp ++++ b/src/ld/InputFiles.cpp +@@ -464,15 +464,8 @@ ld::File* InputFiles::makeFile(const Options::FileInfo& info, bool indirectDylib + if ( _options.overridePathlibLTO() != NULL ) { + libLTO = _options.overridePathlibLTO(); + } +- else if ( _NSGetExecutablePath(ldPath, &bufSize) != -1 ) { +- if ( realpath(ldPath, tmpPath) != NULL ) { +- char* lastSlash = strrchr(tmpPath, '/'); +- if ( lastSlash != NULL ) +- strcpy(lastSlash, "/../lib/libLTO.dylib"); +- libLTO = tmpPath; +- if ( realpath(tmpPath, libLTOPath) != NULL ) +- libLTO = libLTOPath; +- } ++ else { ++ libLTO = "@libllvm_path@/lib/libLTO.dylib"; + } + throwf("could not process llvm bitcode object file, because %s could not be loaded", libLTO); + } +diff --git a/src/ld/meson.build b/src/ld/meson.build +index 8bc85b7..ad8359a 100644 +--- a/src/ld/meson.build ++++ b/src/ld/meson.build +@@ -1,5 +1,16 @@ + subdir('parsers') + ++InputFiles_cpp = configure_file( ++ configuration : { ++ 'libllvm_path' : get_option('libllvm_path'), ++ # Silence warnings ++ 'APPLE_LICENSE_HEADER_START' : '@APPLE_LICENSE_HEADER_START@', ++ 'APPLE_LICENSE_HEADER_END' : '@APPLE_LICENSE_HEADER_END@', ++ }, ++ input : 'InputFiles.cpp', ++ output : '@PLAINNAME@', ++) ++ + executable( + 'ld', + cpp_args : [ +@@ -31,8 +42,8 @@ executable( + ], + sources : [ + configure_h, ++ InputFiles_cpp, + 'FatFile.cpp', +- 'InputFiles.cpp', + 'Mangling.cpp', + 'Options.cpp', + 'OutputFile.cpp', +diff --git a/src/ld/parsers/lto_file.cpp b/src/ld/parsers/lto_file.cpp +index e32e2f8..1a3b846 100644 +--- a/src/ld/parsers/lto_file.cpp ++++ b/src/ld/parsers/lto_file.cpp +@@ -1839,7 +1839,7 @@ bool optimize( const std::vector& allAtoms, + + }; // namespace lto + +-static const char *sLTODylib = "@rpath/libLTO.dylib"; ++static const char *sLTODylib = "@libllvm_path@/lib/libLTO.dylib"; + static std::atomic sLTOIsLoaded(false); + + static void *getHandle() { +diff --git a/src/ld/parsers/meson.build b/src/ld/parsers/meson.build +index a88f651..7bd3e89 100644 +--- a/src/ld/parsers/meson.build ++++ b/src/ld/parsers/meson.build +@@ -1,3 +1,14 @@ ++lto_file_cpp = configure_file( ++ configuration : { ++ 'libllvm_path' : get_option('libllvm_path'), ++ # Silence warnings ++ 'APPLE_LICENSE_HEADER_START' : '@APPLE_LICENSE_HEADER_START@', ++ 'APPLE_LICENSE_HEADER_END' : '@APPLE_LICENSE_HEADER_END@', ++ }, ++ input : 'lto_file.cpp', ++ output : '@PLAINNAME@', ++) ++ + parsers = static_library( + 'parsers', + cpp_args : [ '-Wno-vla-cxx-extension' ], +@@ -10,9 +21,9 @@ parsers = static_library( + ], + sources : [ + configure_h, ++ lto_file_cpp, + 'archive_file.cpp', + 'generic_dylib_file.cpp', +- 'lto_file.cpp', + 'macho_dylib_file.cpp', + 'macho_relocatable_file.cpp', + 'opaque_section_file.cpp', +-- +2.47.2 + diff --git a/pkgs/by-name/ld/ld64/patches/0010-Add-vendored-libtapi-to-the-ld64-build.patch b/pkgs/by-name/ld/ld64/patches/0010-Add-vendored-libtapi-to-the-ld64-build.patch new file mode 100644 index 000000000000..df3190da1bd7 --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0010-Add-vendored-libtapi-to-the-ld64-build.patch @@ -0,0 +1,97 @@ +From 2846b56c7e1d88942bd3de96cbe3fec6b0304012 Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Wed, 13 Nov 2024 13:53:14 -0500 +Subject: [PATCH 10/18] Add vendored libtapi to the ld64 build + +--- + meson.build | 3 +- + subprojects/libtapi/meson.build | 44 ++++++++++++++++++++++++++++ + subprojects/libtapi/tapi/meson.build | 11 +++++++ + 3 files changed, 57 insertions(+), 1 deletion(-) + create mode 100644 subprojects/libtapi/meson.build + create mode 100644 subprojects/libtapi/tapi/meson.build + +diff --git a/meson.build b/meson.build +index a79f03f..244458c 100644 +--- a/meson.build ++++ b/meson.build +@@ -26,7 +26,8 @@ libcodedirectory_dep = dependency( + ) + libtapi_dep = dependency( + 'libtapi', +- version : [ '>=1500' , '<1600' ], ++ version : [ '>=1600' , '<1700' ], ++ fallback : [ 'libtapi', 'libtapi_dep' ], + ) + llvm_dep = dependency( + 'llvm', +diff --git a/subprojects/libtapi/meson.build b/subprojects/libtapi/meson.build +new file mode 100644 +index 0000000..9cd1dcc +--- /dev/null ++++ b/subprojects/libtapi/meson.build +@@ -0,0 +1,44 @@ ++project( ++ 'libtapi', ++ 'c', 'cpp', ++ default_options : {'c_std': 'c23', 'cpp_std': 'c++23'}, ++ license : 'NCSA', ++ license_files : 'LICENSE.TXT', ++ meson_version : '>=1.6.0', ++ version : '1600.0.11.8', ++) ++ ++ ++cc = meson.get_compiler('c') ++cxx = meson.get_compiler('cpp') ++ ++# libtapi only needs a subset of functionality from LLVM, so link only what it needs statically ++# to avoid ODR violations when loading LTO plugins (which don’t use these APIs). ++llvm_dep = dependency( ++ 'llvm', ++ modules : [ ++ 'Demangle', ++ 'TargetParser', ++ 'TextAPI', ++ ], ++ static : true, ++ version : '>=19.1' ++) ++ ++ ++subdir('tapi') ++ ++libtapi = static_library( ++ 'tapi', ++ sources : [ ++ 'APIVersion.cpp', ++ 'LinkerInterfaceFile.cpp', ++ 'Version.cpp', ++ ], ++) ++ ++libtapi_dep = declare_dependency( ++ dependencies : [ llvm_dep ], ++ include_directories : [ '.' ], ++ link_with : libtapi, ++) +diff --git a/subprojects/libtapi/tapi/meson.build b/subprojects/libtapi/tapi/meson.build +new file mode 100644 +index 0000000..c9e463a +--- /dev/null ++++ b/subprojects/libtapi/tapi/meson.build +@@ -0,0 +1,11 @@ ++version_components = meson.project_version().split('.') ++version_inc = configure_file( ++ configuration : { ++ 'TAPI_VERSION' : meson.project_version(), ++ 'TAPI_VERSION_MAJOR' : version_components[0], ++ 'TAPI_VERSION_MINOR' : version_components[1], ++ 'TAPI_VERSION_PATCH' : version_components[2], ++ }, ++ input : 'Version.inc.in', ++ output : '@BASENAME@', ++) +-- +2.47.2 + diff --git a/pkgs/by-name/ld/ld64/patches/0011-Modify-vendored-libtapi-to-build-with-upstream-LLVM.patch b/pkgs/by-name/ld/ld64/patches/0011-Modify-vendored-libtapi-to-build-with-upstream-LLVM.patch new file mode 100644 index 000000000000..9702ca992a79 --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0011-Modify-vendored-libtapi-to-build-with-upstream-LLVM.patch @@ -0,0 +1,120 @@ +From ef6039563489695e2593f0c156d13b01491d2644 Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Wed, 13 Nov 2024 13:53:14 -0500 +Subject: [PATCH 11/18] Modify vendored libtapi to build with upstream LLVM + +--- + subprojects/libtapi/LinkerInterfaceFile.cpp | 47 +++++++++------------ + 1 file changed, 21 insertions(+), 26 deletions(-) + +diff --git a/subprojects/libtapi/LinkerInterfaceFile.cpp b/subprojects/libtapi/LinkerInterfaceFile.cpp +index 76797e3..632eac8 100644 +--- a/subprojects/libtapi/LinkerInterfaceFile.cpp ++++ b/subprojects/libtapi/LinkerInterfaceFile.cpp +@@ -10,12 +10,12 @@ + /// \brief Implements the C++ linker interface file API. + /// + //===----------------------------------------------------------------------===// +-#include "tapi/Core/LLVM.h" +-#include "tapi/Core/Registry.h" +-#include "tapi/Core/Utils.h" +-#include "llvm/ADT/StringExtras.h" +-#include "llvm/Object/MachO.h" +-#include "llvm/TextAPI/InterfaceFile.h" ++#include ++#include ++#include ++#include ++#include ++#include + #include + #include + #include +@@ -27,10 +27,17 @@ using namespace llvm::MachO; + + TAPI_NAMESPACE_V1_BEGIN + +-using namespace tapi::internal; + using InterfaceFile = llvm::MachO::InterfaceFile; + using PackedVersion = llvm::MachO::PackedVersion; + ++/// Determine if tapi is running in a B&I context. ++static inline bool inBnIEnvironment() { ++ if (auto isBnI = llvm::sys::Process::GetEnv("RC_XBS")) ++ return (isBnI.value() == "YES") && ++ (!llvm::sys::Process::GetEnv("RC_BUILDIT")); ++ return false; ++} ++ + static PackedVersion parseVersion32(StringRef str) { + uint32_t version = 0; + if (str.empty()) +@@ -118,7 +125,7 @@ public: + void processSymbol(StringRef name, PackedVersion minOSVersion, + bool disallowWeakImports) { + // $ld$ $ $ +- if (!name.startswith("$ld$")) ++ if (!name.starts_with("$ld$")) + return; + + StringRef action, condition, symbolName; +@@ -127,7 +134,7 @@ public: + if (action.empty() || condition.empty() || symbolName.empty()) + return; + +- if (!condition.startswith("os")) ++ if (!condition.starts_with("os")) + return; + + auto version = parseVersion32(condition.drop_front(2)); +@@ -198,33 +205,21 @@ LinkerInterfaceFile::getSupportedFileExtensions() noexcept { + /// \brief Load and parse the provided TBD file in the buffer and return on + /// success the interface file. + static Expected> +-loadFile(std::unique_ptr buffer, +- ReadFlags readFlags = ReadFlags::Symbols) { +- Registry registry; +- registry.addYAMLReaders(); +- registry.addJSONReaders(); +- registry.addDiagnosticReader(); +- +- auto textFile = registry.readTextFile(std::move(buffer), readFlags); ++loadFile(std::unique_ptr buffer) { ++ auto textFile = llvm::MachO::TextAPIReader::get(buffer->getMemBufferRef()); + if (!textFile) + return textFile.takeError(); + + return std::unique_ptr( + cast(textFile.get().release())); +- +- return std::make_unique(InterfaceFile()); + } + + bool LinkerInterfaceFile::isSupported(const std::string &path, + const uint8_t *data, + size_t size) noexcept { +- Registry registry; +- registry.addYAMLReaders(); +- registry.addJSONReaders(); +- registry.addDiagnosticReader(); + auto memBuffer = MemoryBufferRef( + StringRef(reinterpret_cast(data), size), path); +- return registry.canRead(memBuffer); ++ return !!llvm::MachO::TextAPIReader::canRead(memBuffer); + } + + bool LinkerInterfaceFile::shouldPreferTextBasedStubFile( +@@ -316,8 +311,8 @@ bool LinkerInterfaceFile::Impl::init( + + switch (symbol->getKind()) { + case EncodeKind::GlobalSymbol: +- if (symbol->getName().startswith("$ld$") && +- !symbol->getName().startswith("$ld$previous")) ++ if (symbol->getName().starts_with("$ld$") && ++ !symbol->getName().starts_with("$ld$previous")) + continue; + addSymbol(symbol->getName(), symbol->getFlags()); + break; +-- +2.47.2 + diff --git a/pkgs/by-name/ld/ld64/patches/0012-Move-libcodedirectory-to-its-own-subproject.patch b/pkgs/by-name/ld/ld64/patches/0012-Move-libcodedirectory-to-its-own-subproject.patch new file mode 100644 index 000000000000..31033dda8170 --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0012-Move-libcodedirectory-to-its-own-subproject.patch @@ -0,0 +1,471 @@ +From 4f186ca22f34cda1cbdea131a15f2bc79db440ba Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Wed, 13 Nov 2024 13:53:14 -0500 +Subject: [PATCH 12/18] Move libcodedirectory to its own subproject + +--- + meson.build | 1 + + src/ld/meson.build | 1 - + subprojects/libcodedirectory/APPLE_LICENSE | 367 ++++++++++++++++++ + .../libcodedirectory}/cs_blobs.h | 0 + .../libcodedirectory}/libcodedirectory.c | 0 + .../libcodedirectory}/libcodedirectory.h | 0 + subprojects/libcodedirectory/meson.build | 33 ++ + 7 files changed, 401 insertions(+), 1 deletion(-) + create mode 100644 subprojects/libcodedirectory/APPLE_LICENSE + rename {src/ld => subprojects/libcodedirectory}/cs_blobs.h (100%) + rename {src/ld => subprojects/libcodedirectory}/libcodedirectory.c (100%) + rename {src/ld => subprojects/libcodedirectory}/libcodedirectory.h (100%) + create mode 100644 subprojects/libcodedirectory/meson.build + +diff --git a/meson.build b/meson.build +index 244458c..c053d20 100644 +--- a/meson.build ++++ b/meson.build +@@ -23,6 +23,7 @@ cxx = meson.get_compiler('cpp') + libcodedirectory_dep = dependency( + 'libcodedirectory', + version : '=819.6.1', ++ fallback : [ 'libcodedirectory', 'libcodedirectory_dep' ], + ) + libtapi_dep = dependency( + 'libtapi', +diff --git a/src/ld/meson.build b/src/ld/meson.build +index ad8359a..201e891 100644 +--- a/src/ld/meson.build ++++ b/src/ld/meson.build +@@ -56,7 +56,6 @@ executable( + 'code-sign-blobs/blob.h', + 'debugline.c', + 'ld.cpp', +- 'libcodedirectory.c', + 'passes/bitcode_bundle.cpp', + 'passes/branch_island.cpp', + 'passes/branch_shim.cpp', +diff --git a/subprojects/libcodedirectory/APPLE_LICENSE b/subprojects/libcodedirectory/APPLE_LICENSE +new file mode 100644 +index 0000000..fe81a60 +--- /dev/null ++++ b/subprojects/libcodedirectory/APPLE_LICENSE +@@ -0,0 +1,367 @@ ++APPLE PUBLIC SOURCE LICENSE ++Version 2.0 - August 6, 2003 ++ ++Please read this License carefully before downloading this software. ++By downloading or using this software, you are agreeing to be bound by ++the terms of this License. If you do not or cannot agree to the terms ++of this License, please do not download or use the software. ++ ++1. General; Definitions. This License applies to any program or other ++work which Apple Computer, Inc. ("Apple") makes publicly available and ++which contains a notice placed by Apple identifying such program or ++work as "Original Code" and stating that it is subject to the terms of ++this Apple Public Source License version 2.0 ("License"). As used in ++this License: ++ ++1.1 "Applicable Patent Rights" mean: (a) in the case where Apple is ++the grantor of rights, (i) claims of patents that are now or hereafter ++acquired, owned by or assigned to Apple and (ii) that cover subject ++matter contained in the Original Code, but only to the extent ++necessary to use, reproduce and/or distribute the Original Code ++without infringement; and (b) in the case where You are the grantor of ++rights, (i) claims of patents that are now or hereafter acquired, ++owned by or assigned to You and (ii) that cover subject matter in Your ++Modifications, taken alone or in combination with Original Code. ++ ++1.2 "Contributor" means any person or entity that creates or ++contributes to the creation of Modifications. ++ ++1.3 "Covered Code" means the Original Code, Modifications, the ++combination of Original Code and any Modifications, and/or any ++respective portions thereof. ++ ++1.4 "Externally Deploy" means: (a) to sublicense, distribute or ++otherwise make Covered Code available, directly or indirectly, to ++anyone other than You; and/or (b) to use Covered Code, alone or as ++part of a Larger Work, in any way to provide a service, including but ++not limited to delivery of content, through electronic communication ++with a client other than You. ++ ++1.5 "Larger Work" means a work which combines Covered Code or portions ++thereof with code not governed by the terms of this License. ++ ++1.6 "Modifications" mean any addition to, deletion from, and/or change ++to, the substance and/or structure of the Original Code, any previous ++Modifications, the combination of Original Code and any previous ++Modifications, and/or any respective portions thereof. When code is ++released as a series of files, a Modification is: (a) any addition to ++or deletion from the contents of a file containing Covered Code; ++and/or (b) any new file or other representation of computer program ++statements that contains any part of Covered Code. ++ ++1.7 "Original Code" means (a) the Source Code of a program or other ++work as originally made available by Apple under this License, ++including the Source Code of any updates or upgrades to such programs ++or works made available by Apple under this License, and that has been ++expressly identified by Apple as such in the header file(s) of such ++work; and (b) the object code compiled from such Source Code and ++originally made available by Apple under this License. ++ ++1.8 "Source Code" means the human readable form of a program or other ++work that is suitable for making modifications to it, including all ++modules it contains, plus any associated interface definition files, ++scripts used to control compilation and installation of an executable ++(object code). ++ ++1.9 "You" or "Your" means an individual or a legal entity exercising ++rights under this License. For legal entities, "You" or "Your" ++includes any entity which controls, is controlled by, or is under ++common control with, You, where "control" means (a) the power, direct ++or indirect, to cause the direction or management of such entity, ++whether by contract or otherwise, or (b) ownership of fifty percent ++(50%) or more of the outstanding shares or beneficial ownership of ++such entity. ++ ++2. Permitted Uses; Conditions & Restrictions. Subject to the terms ++and conditions of this License, Apple hereby grants You, effective on ++the date You accept this License and download the Original Code, a ++world-wide, royalty-free, non-exclusive license, to the extent of ++Apple's Applicable Patent Rights and copyrights covering the Original ++Code, to do the following: ++ ++2.1 Unmodified Code. You may use, reproduce, display, perform, ++internally distribute within Your organization, and Externally Deploy ++verbatim, unmodified copies of the Original Code, for commercial or ++non-commercial purposes, provided that in each instance: ++ ++(a) You must retain and reproduce in all copies of Original Code the ++copyright and other proprietary notices and disclaimers of Apple as ++they appear in the Original Code, and keep intact all notices in the ++Original Code that refer to this License; and ++ ++(b) You must include a copy of this License with every copy of Source ++Code of Covered Code and documentation You distribute or Externally ++Deploy, and You may not offer or impose any terms on such Source Code ++that alter or restrict this License or the recipients' rights ++hereunder, except as permitted under Section 6. ++ ++2.2 Modified Code. You may modify Covered Code and use, reproduce, ++display, perform, internally distribute within Your organization, and ++Externally Deploy Your Modifications and Covered Code, for commercial ++or non-commercial purposes, provided that in each instance You also ++meet all of these conditions: ++ ++(a) You must satisfy all the conditions of Section 2.1 with respect to ++the Source Code of the Covered Code; ++ ++(b) You must duplicate, to the extent it does not already exist, the ++notice in Exhibit A in each file of the Source Code of all Your ++Modifications, and cause the modified files to carry prominent notices ++stating that You changed the files and the date of any change; and ++ ++(c) If You Externally Deploy Your Modifications, You must make ++Source Code of all Your Externally Deployed Modifications either ++available to those to whom You have Externally Deployed Your ++Modifications, or publicly available. Source Code of Your Externally ++Deployed Modifications must be released under the terms set forth in ++this License, including the license grants set forth in Section 3 ++below, for as long as you Externally Deploy the Covered Code or twelve ++(12) months from the date of initial External Deployment, whichever is ++longer. You should preferably distribute the Source Code of Your ++Externally Deployed Modifications electronically (e.g. download from a ++web site). ++ ++2.3 Distribution of Executable Versions. In addition, if You ++Externally Deploy Covered Code (Original Code and/or Modifications) in ++object code, executable form only, You must include a prominent ++notice, in the code itself as well as in related documentation, ++stating that Source Code of the Covered Code is available under the ++terms of this License with information on how and where to obtain such ++Source Code. ++ ++2.4 Third Party Rights. You expressly acknowledge and agree that ++although Apple and each Contributor grants the licenses to their ++respective portions of the Covered Code set forth herein, no ++assurances are provided by Apple or any Contributor that the Covered ++Code does not infringe the patent or other intellectual property ++rights of any other entity. Apple and each Contributor disclaim any ++liability to You for claims brought by any other entity based on ++infringement of intellectual property rights or otherwise. As a ++condition to exercising the rights and licenses granted hereunder, You ++hereby assume sole responsibility to secure any other intellectual ++property rights needed, if any. For example, if a third party patent ++license is required to allow You to distribute the Covered Code, it is ++Your responsibility to acquire that license before distributing the ++Covered Code. ++ ++3. Your Grants. In consideration of, and as a condition to, the ++licenses granted to You under this License, You hereby grant to any ++person or entity receiving or distributing Covered Code under this ++License a non-exclusive, royalty-free, perpetual, irrevocable license, ++under Your Applicable Patent Rights and other intellectual property ++rights (other than patent) owned or controlled by You, to use, ++reproduce, display, perform, modify, sublicense, distribute and ++Externally Deploy Your Modifications of the same scope and extent as ++Apple's licenses under Sections 2.1 and 2.2 above. ++ ++4. Larger Works. You may create a Larger Work by combining Covered ++Code with other code not governed by the terms of this License and ++distribute the Larger Work as a single product. In each such instance, ++You must make sure the requirements of this License are fulfilled for ++the Covered Code or any portion thereof. ++ ++5. Limitations on Patent License. Except as expressly stated in ++Section 2, no other patent rights, express or implied, are granted by ++Apple herein. Modifications and/or Larger Works may require additional ++patent licenses from Apple which Apple may grant in its sole ++discretion. ++ ++6. Additional Terms. You may choose to offer, and to charge a fee for, ++warranty, support, indemnity or liability obligations and/or other ++rights consistent with the scope of the license granted herein ++("Additional Terms") to one or more recipients of Covered Code. ++However, You may do so only on Your own behalf and as Your sole ++responsibility, and not on behalf of Apple or any Contributor. You ++must obtain the recipient's agreement that any such Additional Terms ++are offered by You alone, and You hereby agree to indemnify, defend ++and hold Apple and every Contributor harmless for any liability ++incurred by or claims asserted against Apple or such Contributor by ++reason of any such Additional Terms. ++ ++7. Versions of the License. Apple may publish revised and/or new ++versions of this License from time to time. Each version will be given ++a distinguishing version number. Once Original Code has been published ++under a particular version of this License, You may continue to use it ++under the terms of that version. You may also choose to use such ++Original Code under the terms of any subsequent version of this ++License published by Apple. No one other than Apple has the right to ++modify the terms applicable to Covered Code created under this ++License. ++ ++8. NO WARRANTY OR SUPPORT. The Covered Code may contain in whole or in ++part pre-release, untested, or not fully tested works. The Covered ++Code may contain errors that could cause failures or loss of data, and ++may be incomplete or contain inaccuracies. You expressly acknowledge ++and agree that use of the Covered Code, or any portion thereof, is at ++Your sole and entire risk. THE COVERED CODE IS PROVIDED "AS IS" AND ++WITHOUT WARRANTY, UPGRADES OR SUPPORT OF ANY KIND AND APPLE AND ++APPLE'S LICENSOR(S) (COLLECTIVELY REFERRED TO AS "APPLE" FOR THE ++PURPOSES OF SECTIONS 8 AND 9) AND ALL CONTRIBUTORS EXPRESSLY DISCLAIM ++ALL WARRANTIES AND/OR CONDITIONS, EXPRESS OR IMPLIED, INCLUDING, BUT ++NOT LIMITED TO, THE IMPLIED WARRANTIES AND/OR CONDITIONS OF ++MERCHANTABILITY, OF SATISFACTORY QUALITY, OF FITNESS FOR A PARTICULAR ++PURPOSE, OF ACCURACY, OF QUIET ENJOYMENT, AND NONINFRINGEMENT OF THIRD ++PARTY RIGHTS. APPLE AND EACH CONTRIBUTOR DOES NOT WARRANT AGAINST ++INTERFERENCE WITH YOUR ENJOYMENT OF THE COVERED CODE, THAT THE ++FUNCTIONS CONTAINED IN THE COVERED CODE WILL MEET YOUR REQUIREMENTS, ++THAT THE OPERATION OF THE COVERED CODE WILL BE UNINTERRUPTED OR ++ERROR-FREE, OR THAT DEFECTS IN THE COVERED CODE WILL BE CORRECTED. NO ++ORAL OR WRITTEN INFORMATION OR ADVICE GIVEN BY APPLE, AN APPLE ++AUTHORIZED REPRESENTATIVE OR ANY CONTRIBUTOR SHALL CREATE A WARRANTY. ++You acknowledge that the Covered Code is not intended for use in the ++operation of nuclear facilities, aircraft navigation, communication ++systems, or air traffic control machines in which case the failure of ++the Covered Code could lead to death, personal injury, or severe ++physical or environmental damage. ++ ++9. LIMITATION OF LIABILITY. TO THE EXTENT NOT PROHIBITED BY LAW, IN NO ++EVENT SHALL APPLE OR ANY CONTRIBUTOR BE LIABLE FOR ANY INCIDENTAL, ++SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING ++TO THIS LICENSE OR YOUR USE OR INABILITY TO USE THE COVERED CODE, OR ++ANY PORTION THEREOF, WHETHER UNDER A THEORY OF CONTRACT, WARRANTY, ++TORT (INCLUDING NEGLIGENCE), PRODUCTS LIABILITY OR OTHERWISE, EVEN IF ++APPLE OR SUCH CONTRIBUTOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH ++DAMAGES AND NOTWITHSTANDING THE FAILURE OF ESSENTIAL PURPOSE OF ANY ++REMEDY. SOME JURISDICTIONS DO NOT ALLOW THE LIMITATION OF LIABILITY OF ++INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS LIMITATION MAY NOT APPLY ++TO YOU. In no event shall Apple's total liability to You for all ++damages (other than as may be required by applicable law) under this ++License exceed the amount of fifty dollars ($50.00). ++ ++10. Trademarks. This License does not grant any rights to use the ++trademarks or trade names "Apple", "Apple Computer", "Mac", "Mac OS", ++"QuickTime", "QuickTime Streaming Server" or any other trademarks, ++service marks, logos or trade names belonging to Apple (collectively ++"Apple Marks") or to any trademark, service mark, logo or trade name ++belonging to any Contributor. You agree not to use any Apple Marks in ++or as part of the name of products derived from the Original Code or ++to endorse or promote products derived from the Original Code other ++than as expressly permitted by and in strict compliance at all times ++with Apple's third party trademark usage guidelines which are posted ++at http://www.apple.com/legal/guidelinesfor3rdparties.html. ++ ++11. Ownership. Subject to the licenses granted under this License, ++each Contributor retains all rights, title and interest in and to any ++Modifications made by such Contributor. Apple retains all rights, ++title and interest in and to the Original Code and any Modifications ++made by or on behalf of Apple ("Apple Modifications"), and such Apple ++Modifications will not be automatically subject to this License. Apple ++may, at its sole discretion, choose to license such Apple ++Modifications under this License, or on different terms from those ++contained in this License or may choose not to license them at all. ++ ++12. Termination. ++ ++12.1 Termination. This License and the rights granted hereunder will ++terminate: ++ ++(a) automatically without notice from Apple if You fail to comply with ++any term(s) of this License and fail to cure such breach within 30 ++days of becoming aware of such breach; ++ ++(b) immediately in the event of the circumstances described in Section ++13.5(b); or ++ ++(c) automatically without notice from Apple if You, at any time during ++the term of this License, commence an action for patent infringement ++against Apple; provided that Apple did not first commence ++an action for patent infringement against You in that instance. ++ ++12.2 Effect of Termination. Upon termination, You agree to immediately ++stop any further use, reproduction, modification, sublicensing and ++distribution of the Covered Code. All sublicenses to the Covered Code ++which have been properly granted prior to termination shall survive ++any termination of this License. Provisions which, by their nature, ++should remain in effect beyond the termination of this License shall ++survive, including but not limited to Sections 3, 5, 8, 9, 10, 11, ++12.2 and 13. No party will be liable to any other for compensation, ++indemnity or damages of any sort solely as a result of terminating ++this License in accordance with its terms, and termination of this ++License will be without prejudice to any other right or remedy of ++any party. ++ ++13. Miscellaneous. ++ ++13.1 Government End Users. The Covered Code is a "commercial item" as ++defined in FAR 2.101. Government software and technical data rights in ++the Covered Code include only those rights customarily provided to the ++public as defined in this License. This customary commercial license ++in technical data and software is provided in accordance with FAR ++12.211 (Technical Data) and 12.212 (Computer Software) and, for ++Department of Defense purchases, DFAR 252.227-7015 (Technical Data -- ++Commercial Items) and 227.7202-3 (Rights in Commercial Computer ++Software or Computer Software Documentation). Accordingly, all U.S. ++Government End Users acquire Covered Code with only those rights set ++forth herein. ++ ++13.2 Relationship of Parties. This License will not be construed as ++creating an agency, partnership, joint venture or any other form of ++legal association between or among You, Apple or any Contributor, and ++You will not represent to the contrary, whether expressly, by ++implication, appearance or otherwise. ++ ++13.3 Independent Development. Nothing in this License will impair ++Apple's right to acquire, license, develop, have others develop for ++it, market and/or distribute technology or products that perform the ++same or similar functions as, or otherwise compete with, ++Modifications, Larger Works, technology or products that You may ++develop, produce, market or distribute. ++ ++13.4 Waiver; Construction. Failure by Apple or any Contributor to ++enforce any provision of this License will not be deemed a waiver of ++future enforcement of that or any other provision. Any law or ++regulation which provides that the language of a contract shall be ++construed against the drafter will not apply to this License. ++ ++13.5 Severability. (a) If for any reason a court of competent ++jurisdiction finds any provision of this License, or portion thereof, ++to be unenforceable, that provision of the License will be enforced to ++the maximum extent permissible so as to effect the economic benefits ++and intent of the parties, and the remainder of this License will ++continue in full force and effect. (b) Notwithstanding the foregoing, ++if applicable law prohibits or restricts You from fully and/or ++specifically complying with Sections 2 and/or 3 or prevents the ++enforceability of either of those Sections, this License will ++immediately terminate and You must immediately discontinue any use of ++the Covered Code and destroy all copies of it that are in your ++possession or control. ++ ++13.6 Dispute Resolution. Any litigation or other dispute resolution ++between You and Apple relating to this License shall take place in the ++Northern District of California, and You and Apple hereby consent to ++the personal jurisdiction of, and venue in, the state and federal ++courts within that District with respect to this License. The ++application of the United Nations Convention on Contracts for the ++International Sale of Goods is expressly excluded. ++ ++13.7 Entire Agreement; Governing Law. This License constitutes the ++entire agreement between the parties with respect to the subject ++matter hereof. This License shall be governed by the laws of the ++United States and the State of California, except that body of ++California law concerning conflicts of law. ++ ++Where You are located in the province of Quebec, Canada, the following ++clause applies: The parties hereby confirm that they have requested ++that this License and all related documents be drafted in English. Les ++parties ont exige que le present contrat et tous les documents ++connexes soient rediges en anglais. ++ ++EXHIBIT A. ++ ++"Portions Copyright (c) 1999-2003 Apple Computer, Inc. All Rights ++Reserved. ++ ++This file contains Original Code and/or Modifications of Original Code ++as defined in and that are subject to the Apple Public Source License ++Version 2.0 (the 'License'). You may not use this file except in ++compliance with the License. Please obtain a copy of the License at ++http://www.opensource.apple.com/apsl/ and read it before using this ++file. ++ ++The Original Code and all software distributed under the License are ++distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER ++EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, ++INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, ++FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. ++Please see the License for the specific language governing rights and ++limitations under the License." +diff --git a/src/ld/cs_blobs.h b/subprojects/libcodedirectory/cs_blobs.h +similarity index 100% +rename from src/ld/cs_blobs.h +rename to subprojects/libcodedirectory/cs_blobs.h +diff --git a/src/ld/libcodedirectory.c b/subprojects/libcodedirectory/libcodedirectory.c +similarity index 100% +rename from src/ld/libcodedirectory.c +rename to subprojects/libcodedirectory/libcodedirectory.c +diff --git a/src/ld/libcodedirectory.h b/subprojects/libcodedirectory/libcodedirectory.h +similarity index 100% +rename from src/ld/libcodedirectory.h +rename to subprojects/libcodedirectory/libcodedirectory.h +diff --git a/subprojects/libcodedirectory/meson.build b/subprojects/libcodedirectory/meson.build +new file mode 100644 +index 0000000..de8a4ae +--- /dev/null ++++ b/subprojects/libcodedirectory/meson.build +@@ -0,0 +1,33 @@ ++project( ++ 'libcodedirectory', ++ 'c', ++ default_options : {'c_std': 'c23'}, ++ license : 'APSL-2.0', ++ license_files : 'APPLE_LICENSE', ++ meson_version : '>=1.6.0', ++ version : '819.6.1', ++) ++ ++ ++cc = meson.get_compiler('c') ++ ++openssl_dep = dependency('openssl', version : '>=3.0') ++ ++ ++libcodedirectory = library( ++ 'codedirectory', ++ c_args : [ '-Wno-gnu-folding-constant' ], ++ dependencies : [ openssl_dep ], ++ install : true, ++ sources : [ 'libcodedirectory.c' ], ++ soversion : 1, ++) ++install_headers( ++ 'cs_blobs.h', ++ 'libcodedirectory.h', ++) ++ ++libcodedirectory_dep = declare_dependency( ++ include_directories : [ '.' ], ++ link_with : libcodedirectory, ++) +-- +2.47.2 + diff --git a/pkgs/by-name/ld/ld64/patches/0013-Set-the-version-string-in-the-build.patch b/pkgs/by-name/ld/ld64/patches/0013-Set-the-version-string-in-the-build.patch new file mode 100644 index 000000000000..7f515218090c --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0013-Set-the-version-string-in-the-build.patch @@ -0,0 +1,41 @@ +From fb1ec0eeac424d72175b14b08da9c2d85681b245 Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Sun, 17 Nov 2024 10:02:34 -0500 +Subject: [PATCH 13/18] Set the version string in the build + +--- + src/ld/meson.build | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/src/ld/meson.build b/src/ld/meson.build +index 201e891..769ac28 100644 +--- a/src/ld/meson.build ++++ b/src/ld/meson.build +@@ -11,6 +11,16 @@ InputFiles_cpp = configure_file( + output : '@PLAINNAME@', + ) + ++version_string_cpp = configure_file( ++ capture : true, ++ command : [ ++ find_program('bash', native : true), ++ '-c', ++ 'echo \'extern const char ld_classicVersionString[] = "@(#)PROGRAM:ld PROJECT:ld64-' + meson.project_version() + '\\n";\'' ++ ], ++ output : 'version_string.cpp', ++) ++ + executable( + 'ld', + cpp_args : [ +@@ -43,6 +53,7 @@ executable( + sources : [ + configure_h, + InputFiles_cpp, ++ version_string_cpp, + 'FatFile.cpp', + 'Mangling.cpp', + 'Options.cpp', +-- +2.47.2 + diff --git a/pkgs/by-name/ld/ld64/patches/0014-Replace-corecrypto-and-CommonCrypto-with-OpenSSL.patch b/pkgs/by-name/ld/ld64/patches/0014-Replace-corecrypto-and-CommonCrypto-with-OpenSSL.patch new file mode 100644 index 000000000000..bf506c2f6f99 --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0014-Replace-corecrypto-and-CommonCrypto-with-OpenSSL.patch @@ -0,0 +1,341 @@ +From b2cfb2019b79e674a507a8b428bba4b82b2276d0 Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Wed, 13 Nov 2024 13:53:14 -0500 +Subject: [PATCH 14/18] Replace corecrypto and CommonCrypto with OpenSSL + +--- + src/ld/LinkEdit.hpp | 2 - + src/ld/OutputFile.cpp | 78 ++++++++++++---- + subprojects/libcodedirectory/cs_blobs.h | 1 + + .../libcodedirectory/libcodedirectory.c | 90 +++++++++++++------ + 4 files changed, 126 insertions(+), 45 deletions(-) + +diff --git a/src/ld/LinkEdit.hpp b/src/ld/LinkEdit.hpp +index 4a6d5fe..818fcdf 100644 +--- a/src/ld/LinkEdit.hpp ++++ b/src/ld/LinkEdit.hpp +@@ -30,8 +30,6 @@ + #include + #include + #include +-#include +-#include + + #include + #include +diff --git a/src/ld/OutputFile.cpp b/src/ld/OutputFile.cpp +index 2a175a7..69b476f 100644 +--- a/src/ld/OutputFile.cpp ++++ b/src/ld/OutputFile.cpp +@@ -43,10 +43,6 @@ + #include + #include + #include +-#include +-extern "C" { +- #include +-} + + #include + #include +@@ -56,9 +52,10 @@ extern "C" { + #include + #include + +-#include + #include + ++#include ++#include + + #include "ExportsTrie.h" + +@@ -79,6 +76,17 @@ uint32_t sAdrpNA = 0; + uint32_t sAdrpNoped = 0; + uint32_t sAdrpNotNoped = 0; + ++static void ++EVP_MD_cleanup(EVP_MD** digest) { ++ EVP_MD_free(*digest); ++ *digest = nullptr; ++} ++ ++static void ++EVP_MD_CTX_cleanup(EVP_MD_CTX** context) { ++ EVP_MD_CTX_free(*context); ++ *context = nullptr; ++} + + + OutputFile::OutputFile(const Options& opts, ld::Internal& state) +@@ -3834,7 +3842,7 @@ void OutputFile::computeContentUUID(ld::Internal& state, uint8_t* wholeBuffer) + { + const bool log = false; + if ( (_options.outputKind() != Options::kObjectFile) || state.someObjectFileHasDwarf ) { +- uint8_t digest[CCSHA256_OUTPUT_SIZE]; ++ uint8_t digest[CS_SHA256_LEN]; + std::vector> excludeRegions; + uint64_t bitcodeCmdOffset; + uint64_t bitcodeCmdEnd; +@@ -3902,18 +3910,27 @@ void OutputFile::computeContentUUID(ld::Internal& state, uint8_t* wholeBuffer) + excludeRegions.emplace_back(std::pair(symbolTableCmdOffset, symbolTableCmdOffset+symbolTableCmdSize)); + if ( log ) fprintf(stderr, "linkedit SegCmdOffset=0x%08llX, size=0x%08llX\n", symbolTableCmdOffset, symbolTableCmdSize); + } +- const ccdigest_info* di = ccsha256_di(); +- ccdigest_di_decl(di, ctx); +- ccdigest_init(di, ctx); ++ ++ [[gnu::cleanup(EVP_MD_cleanup)]] EVP_MD* sha256_digest = EVP_MD_fetch(nullptr, "SHA-256", nullptr); ++ [[gnu::cleanup(EVP_MD_CTX_cleanup)]] EVP_MD_CTX* context = EVP_MD_CTX_new(); ++ ++ if ( !EVP_DigestInit_ex2(context, sha256_digest, nullptr) ) { ++ ERR_print_errors_fp(stderr); ++ abort(); ++ } ++ + // rdar://problem/19487042 include the output leaf file name in the hash + const char* lastSlash = strrchr(_options.outputFilePath(), '/'); +- if ( lastSlash != NULL ) { +- ccdigest_update(di, ctx, strlen(lastSlash), lastSlash); ++ if ( lastSlash != NULL && !EVP_DigestUpdate(context, lastSlash, strlen(lastSlash)) ) { ++ ERR_print_errors_fp(stderr); ++ abort(); + } ++ + // use train name when calculating a binary's UUID + const char* buildName = _options.buildContextName(); +- if ( buildName != NULL ) { +- ccdigest_update(di, ctx, strlen(buildName), buildName); ++ if ( buildName != NULL && !EVP_DigestUpdate(context, buildName, strlen(buildName)) ) { ++ ERR_print_errors_fp(stderr); ++ abort(); + } + + if ( !excludeRegions.empty() ) { +@@ -3937,22 +3954,47 @@ void OutputFile::computeContentUUID(ld::Internal& state, uint8_t* wholeBuffer) + // Measure the ranges we want in parallel + struct Digest + { +- uint8_t digest[CCSHA256_OUTPUT_SIZE]; ++ uint8_t digest[CS_SHA256_LEN]; + }; + __block std::vector digests(regionsToMeasure.size()); + dispatch_apply(regionsToMeasure.size(), DISPATCH_APPLY_AUTO, ^(size_t index) { + uint64_t startOffset = regionsToMeasure[index].first; + uint64_t size = regionsToMeasure[index].second; +- CCDigest(kCCDigestSHA256, &wholeBuffer[startOffset], size, digests[index].digest); ++ ++ [[gnu::cleanup(EVP_MD_cleanup)]] EVP_MD* sha256_digest = EVP_MD_fetch(nullptr, "SHA-256", nullptr); ++ [[gnu::cleanup(EVP_MD_CTX_cleanup)]] EVP_MD_CTX* context = EVP_MD_CTX_new(); ++ ++ if (!EVP_DigestInit_ex2(context, sha256_digest, nullptr)) { ++ ERR_print_errors_fp(stderr); ++ abort(); ++ } ++ if (!EVP_DigestUpdate(context, &wholeBuffer[startOffset], size)) { ++ ERR_print_errors_fp(stderr); ++ abort(); ++ } ++ if (!EVP_DigestFinal_ex(context, digests[index].digest, nullptr)) { ++ ERR_print_errors_fp(stderr); ++ abort(); ++ } + }); + + // Merge the resuls in serial +- ccdigest_update(di, ctx, digests.size() * sizeof(Digest), digests.data()); ++ if ( !EVP_DigestUpdate(context, digests.data(), digests.size() * sizeof(Digest)) ) { ++ ERR_print_errors_fp(stderr); ++ abort(); ++ } + } else { +- ccdigest_update(di, ctx, _fileSize, wholeBuffer); ++ if ( !EVP_DigestUpdate(context, wholeBuffer, _fileSize) ) { ++ ERR_print_errors_fp(stderr); ++ abort(); ++ } ++ } ++ ++ if ( !EVP_DigestFinal_ex(context, digest, nullptr) ) { ++ ERR_print_errors_fp(stderr); ++ abort(); + } + +- ccdigest_final(di, ctx, digest); + if ( log ) fprintf(stderr, "uuid=%02X, %02X, %02X, %02X, %02X, %02X, %02X, %02X\n", digest[0], digest[1], digest[2], + digest[3], digest[4], digest[5], digest[6], digest[7]); + +diff --git a/subprojects/libcodedirectory/cs_blobs.h b/subprojects/libcodedirectory/cs_blobs.h +index 899a6a2..ce9cac6 100644 +--- a/subprojects/libcodedirectory/cs_blobs.h ++++ b/subprojects/libcodedirectory/cs_blobs.h +@@ -129,6 +129,7 @@ enum { + CS_SHA1_LEN = 20, + CS_SHA256_LEN = 32, + CS_SHA256_TRUNCATED_LEN = 20, ++ CS_SHA384_LEN = 48, + + CS_CDHASH_LEN = 20, /* always - larger hashes are truncated */ + CS_HASH_MAX_SIZE = 48, /* max size of the hash we'll support */ +diff --git a/subprojects/libcodedirectory/libcodedirectory.c b/subprojects/libcodedirectory/libcodedirectory.c +index 583ac96..02e31b1 100644 +--- a/subprojects/libcodedirectory/libcodedirectory.c ++++ b/subprojects/libcodedirectory/libcodedirectory.c +@@ -14,10 +14,6 @@ + #include + #include + +-#include +-#include +-#include +- + #define LIBCD_HAS_PLATFORM_VERSION 1 + #include "libcodedirectory.h" + +@@ -46,6 +42,21 @@ + #include + #endif + ++#include ++#include ++ ++static void ++EVP_MD_cleanup(EVP_MD** digest) { ++ EVP_MD_free(*digest); ++ *digest = NULL; ++} ++ ++static void ++EVP_MD_CTX_cleanup(EVP_MD_CTX** context) { ++ EVP_MD_CTX_free(*context); ++ *context = NULL; ++} ++ + #define MIN(a, b) (((a) < (b)) ? (a) : (b)) + #define MAX(a, b) (((a) > (b)) ? (a) : (b)) + +@@ -459,17 +470,17 @@ void libcd_set_exec_seg (libcd *s, uint64_t base, uint64_t limit, uint64_t flags + + struct _hash_info { + size_t hash_len; +- const struct ccdigest_info *(*di)(void); ++ const char* name; + }; + + static const struct _hash_info _known_hash_types[] = { + { 0, NULL }, +- { CS_SHA1_LEN, ccsha1_di }, // CS_HASHTYPE_SHA1 +- { CS_SHA256_LEN, ccsha256_di }, // CS_HASHTYPE_SHA256 +- // { 0, NULL }, // CS_HASHTYPE_SHA256_TRUNCATED, unsupported +- // { 0, NULL }, // CS_HASHTYPE_SHA384, unsupported ++ { CS_SHA1_LEN, "SHA-1" }, // CS_HASHTYPE_SHA1 ++ { CS_SHA256_LEN, "SHA-256" }, // CS_HASHTYPE_SHA256 ++ { CS_HASHTYPE_SHA256_TRUNCATED, "SHA-256" }, // CS_HASHTYPE_SHA256_TRUNCATED ++ { CS_SHA384_LEN, "SHA-384" }, // CS_HASHTYPE_SHA384 + }; +-static const size_t _max_known_hash_len = CS_SHA256_LEN; ++static const size_t _max_known_hash_len = CS_SHA384_LEN; + static const int _known_hash_types_count = sizeof(_known_hash_types)/sizeof(_known_hash_types[0]); + + static struct _hash_info const * +@@ -781,8 +792,8 @@ _libcd_hash_page(libcd *s, + uint8_t page_hash[_max_known_hash_len] = {0}; + const unsigned int page_no = (unsigned int)page_idx; + +- struct ccdigest_info const *di = hi->di(); +- ccdigest_di_decl(di, ctx); ++ [[gnu::cleanup(EVP_MD_cleanup)]] EVP_MD* digest = EVP_MD_fetch(NULL, hi->name, NULL); ++ [[gnu::cleanup(EVP_MD_CTX_cleanup)]] EVP_MD_CTX* context = EVP_MD_CTX_new(); + + const size_t pos = page_idx * _cs_page_bytes; + uint8_t page[_cs_page_bytes] = {0}; +@@ -794,9 +805,18 @@ _libcd_hash_page(libcd *s, + return LIBCD_SERIALIZE_READ_PAGE_ERROR; + } + +- ccdigest_init(di, ctx); +- ccdigest_update(di, ctx, read_bytes, page); +- ccdigest_final(di, ctx, page_hash); ++ if (!EVP_DigestInit_ex2(context, digest, NULL)) { ++ ERR_print_errors_fp(stderr); ++ abort(); ++ } ++ if (!EVP_DigestUpdate(context, page, read_bytes)) { ++ ERR_print_errors_fp(stderr); ++ abort(); ++ } ++ if (!EVP_DigestFinal_ex(context, page_hash, NULL)) { ++ ERR_print_errors_fp(stderr); ++ abort(); ++ } + + memcpy(hash_destination, page_hash, hi->hash_len); + +@@ -894,16 +914,25 @@ _libcd_serialize_cd (libcd *s, uint32_t hash_type) + //// code directory hashes + { + if (s->special_slot_count > 0) { +- struct ccdigest_info const *di = hi->di(); +- ccdigest_di_decl(di, ctx); ++ [[gnu::cleanup(EVP_MD_cleanup)]] EVP_MD* digest = EVP_MD_fetch(NULL, hi->name, NULL); ++ [[gnu::cleanup(EVP_MD_CTX_cleanup)]] EVP_MD_CTX* context = EVP_MD_CTX_new(); + + uint8_t *special_slot_buf = calloc(s->special_slot_count, hi->hash_len); + + struct _sslot_data *sslot = NULL; + SLIST_FOREACH(sslot, &s->sslot_data, entries) { +- ccdigest_init(di, ctx); +- ccdigest_update(di, ctx, sslot->len, sslot->data); +- ccdigest_final(di, ctx, special_slot_buf + (s->special_slot_count-sslot->slot)*hi->hash_len); ++ if (!EVP_DigestInit_ex2(context, digest, NULL)) { ++ ERR_print_errors_fp(stderr); ++ abort(); ++ } ++ if (!EVP_DigestUpdate(context, sslot->data, sslot->len)) { ++ ERR_print_errors_fp(stderr); ++ abort(); ++ } ++ if (!EVP_DigestFinal_ex(context, special_slot_buf + (s->special_slot_count-sslot->slot)*hi->hash_len, NULL)) { ++ ERR_print_errors_fp(stderr); ++ abort(); ++ } + } + memcpy(cursor, special_slot_buf, s->special_slot_count*hi->hash_len); + cursor += s->special_slot_count*hi->hash_len; +@@ -949,17 +978,28 @@ _libcd_serialize_cd (libcd *s, uint32_t hash_type) + + //Record the cdhash for this codedirectory + { +- struct ccdigest_info const *di = hi->di(); +- ccdigest_di_decl(di, ctx); ++ [[gnu::cleanup(EVP_MD_cleanup)]] EVP_MD* digest = EVP_MD_fetch(NULL, hi->name, NULL); ++ [[gnu::cleanup(EVP_MD_CTX_cleanup)]] EVP_MD_CTX* context = EVP_MD_CTX_new(); ++ + uint8_t *cdhash_buf = calloc(1, hi->hash_len); + if (cdhash_buf == NULL) { + _libcd_err("Failed to allocated memory for cdhash"); + free(cd_mem); + return LIBCD_SERIALIZE_NO_MEM; + } +- ccdigest_init(di, ctx); +- ccdigest_update(di, ctx, cd_size, cd_mem); +- ccdigest_final(di, ctx, cdhash_buf); ++ ++ if (!EVP_DigestInit_ex2(context, digest, NULL)) { ++ ERR_print_errors_fp(stderr); ++ abort(); ++ } ++ if (!EVP_DigestUpdate(context, cd_mem, cd_size)) { ++ ERR_print_errors_fp(stderr); ++ abort(); ++ } ++ if (!EVP_DigestFinal_ex(context, cdhash_buf, NULL)) { ++ ERR_print_errors_fp(stderr); ++ abort(); ++ } + + for (size_t i = 0; i < s->hash_types_count; i++) { + if (s->cdhashes[i].set) { +-- +2.47.2 + diff --git a/pkgs/by-name/ld/ld64/0006-Add-libcd_is_blob_a_linker_signature-implementation.patch b/pkgs/by-name/ld/ld64/patches/0015-Add-libcd_is_blob_a_linker_signature-implementation.patch similarity index 73% rename from pkgs/by-name/ld/ld64/0006-Add-libcd_is_blob_a_linker_signature-implementation.patch rename to pkgs/by-name/ld/ld64/patches/0015-Add-libcd_is_blob_a_linker_signature-implementation.patch index e5485ab4cadc..b3befd74efe9 100644 --- a/pkgs/by-name/ld/ld64/0006-Add-libcd_is_blob_a_linker_signature-implementation.patch +++ b/pkgs/by-name/ld/ld64/patches/0015-Add-libcd_is_blob_a_linker_signature-implementation.patch @@ -1,26 +1,21 @@ -From add8bae5577ebe1c98cf7a711f87a3578a51d313 Mon Sep 17 00:00:00 2001 +From 1894e5752ebfe0572684c235da3cdcdfd10f29a1 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode -Date: Mon, 8 Apr 2024 22:42:40 -0400 -Subject: [PATCH 6/8] Add libcd_is_blob_a_linker_signature implementation +Date: Sat, 16 Nov 2024 16:21:17 -0500 +Subject: [PATCH 15/18] Add libcd_is_blob_a_linker_signature implementation --- - compat/libcodedirectory.c | 74 +++++++++++++++++++++++++++++++++++++++ - src/ld/libcodedirectory.h | 8 +++++ - 2 files changed, 82 insertions(+) - create mode 100644 compat/libcodedirectory.c + .../libcodedirectory/libcodedirectory.c | 68 +++++++++++++++++++ + .../libcodedirectory/libcodedirectory.h | 9 +++ + 2 files changed, 77 insertions(+) -diff --git a/compat/libcodedirectory.c b/compat/libcodedirectory.c -new file mode 100644 -index 0000000..e584dfc ---- /dev/null -+++ b/compat/libcodedirectory.c -@@ -0,0 +1,74 @@ -+// SPDX-License-Identifier: APSL-2.0 -+// libcd_is_blob_a_linker_signature implementation written by Randy Eckenrode © 2024 -+ -+#include -+ -+#include +diff --git a/subprojects/libcodedirectory/libcodedirectory.c b/subprojects/libcodedirectory/libcodedirectory.c +index 02e31b1..89908b9 100644 +--- a/subprojects/libcodedirectory/libcodedirectory.c ++++ b/subprojects/libcodedirectory/libcodedirectory.c +@@ -1221,3 +1221,71 @@ libcd_get_cdhash_for_type(libcd *s, int hash_type, uint8_t* cdhash_buf, size_t c + } + return LIBCD_CDHASH_TYPE_NOT_FOUND; + } + +// References: +// - https://forums.developer.apple.com/forums/thread/702351 @@ -43,7 +38,7 @@ index 0000000..e584dfc + +static inline const uint8_t* find_code_directory(const uint8_t* data, size_t size) { + const uint8_t* index_ptr = data + offsetof(CS_SuperBlob, index); -+ ++ + // There also needs to be space for the actual blobs, but there must be at least enough space + // for the blob indexes. If there’s not, then something’s wrong, and the blob is invalid. + uint32_t count = read32be(data + offsetof(CS_SuperBlob, count)); @@ -89,11 +84,11 @@ index 0000000..e584dfc + + return LIBCD_SIGNATURE_QUERY_SUCCESS; +} -diff --git a/src/ld/libcodedirectory.h b/src/ld/libcodedirectory.h -index 0e989a9..7532648 100644 ---- a/src/ld/libcodedirectory.h -+++ b/src/ld/libcodedirectory.h -@@ -116,6 +116,14 @@ enum libcd_set_linkage_ret { +diff --git a/subprojects/libcodedirectory/libcodedirectory.h b/subprojects/libcodedirectory/libcodedirectory.h +index 0e989a9..67a5a22 100644 +--- a/subprojects/libcodedirectory/libcodedirectory.h ++++ b/subprojects/libcodedirectory/libcodedirectory.h +@@ -116,6 +116,15 @@ enum libcd_set_linkage_ret { enum libcd_set_linkage_ret libcd_set_linkage(libcd *s, int linkage_hash_type, uint8_t *linkage_hash); @@ -104,10 +99,11 @@ index 0e989a9..7532648 100644 +}; + +enum libcd_signature_query_ret libcd_is_blob_a_linker_signature(const uint8_t* data, size_t size, int* linker_signed); ++ + __END_DECLS #endif // H_LIBCODEDIRECTORY -- -2.45.1 +2.47.2 diff --git a/pkgs/by-name/ld/ld64/patches/0016-Add-dyldinfo-to-the-ld64-build.patch b/pkgs/by-name/ld/ld64/patches/0016-Add-dyldinfo-to-the-ld64-build.patch new file mode 100644 index 000000000000..e35a00d393e8 --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0016-Add-dyldinfo-to-the-ld64-build.patch @@ -0,0 +1,35 @@ +From 1bd02ac97fd47d8f7c8f1f21893d7107ae2319b5 Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Sun, 17 Nov 2024 10:02:34 -0500 +Subject: [PATCH 16/18] Add dyldinfo to the ld64 build + +--- + src/other/meson.build | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/src/other/meson.build b/src/other/meson.build +index 067a69c..663b9ee 100644 +--- a/src/other/meson.build ++++ b/src/other/meson.build +@@ -1,3 +1,18 @@ ++dyldinfo = executable( ++ 'dyldinfo', ++ dependencies : [ ++ abstraction_dep, ++ llvm_dep, ++ ], ++ include_directories : [ '../ld' ], ++ install : true, ++ sources : [ ++ configure_h, ++ 'dyldinfo.cpp', ++ ], ++) ++install_man(meson.global_source_root() / 'doc/man/man1/dyldinfo.1') ++ + machocheck = executable( + 'machocheck', + dependencies : [ +-- +2.47.2 + diff --git a/pkgs/by-name/ld/ld64/patches/0017-Fix-dyldinfo-build.patch b/pkgs/by-name/ld/ld64/patches/0017-Fix-dyldinfo-build.patch new file mode 100644 index 000000000000..7e06fd5ac18d --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0017-Fix-dyldinfo-build.patch @@ -0,0 +1,37 @@ +From 477911db0045e8b1925fcd5db523aab2888fdcc9 Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Sun, 17 Nov 2024 10:02:34 -0500 +Subject: [PATCH 17/18] Fix dyldinfo build + +`isSubType` was removed in 907, but the fix is simple. This mirrors the +changes that were made in that update to other parts of ld64. +--- + src/other/dyldinfo.cpp | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/src/other/dyldinfo.cpp b/src/other/dyldinfo.cpp +index dbfd0de..96aa109 100644 +--- a/src/other/dyldinfo.cpp ++++ b/src/other/dyldinfo.cpp +@@ -427,7 +427,7 @@ DyldInfoPrinter::DyldInfoPrinter(const uint8_t* fileContent, uint32_t fileLen + if ( printArch ) { + for (const ArchInfo* t=archInfoArray; t->archName != NULL; ++t) { + if ( (cpu_type_t)fHeader->cputype() == t->cpuType ) { +- if ( t->isSubType && ((cpu_subtype_t)fHeader->cpusubtype() != t->cpuSubType) ) ++ if ( ((cpu_subtype_t)fHeader->cpusubtype() != t->cpuSubType) ) + continue; + printf("for arch %s:\n", t->archName); + } +@@ -2801,8 +2801,7 @@ int main(int argc, const char* argv[]) + for (const ArchInfo* t=archInfoArray; t->archName != NULL; ++t) { + if ( strcmp(t->archName,arch) == 0 ) { + sPreferredArch = t->cpuType; +- if ( t->isSubType ) +- sPreferredSubArch = t->cpuSubType; ++ sPreferredSubArch = t->cpuSubType; + found = true; + break; + } +-- +2.47.2 + diff --git a/pkgs/by-name/ld/ld64/patches/0018-Use-STL-containers-instead-of-LLVM-containers.patch b/pkgs/by-name/ld/ld64/patches/0018-Use-STL-containers-instead-of-LLVM-containers.patch new file mode 100644 index 000000000000..8f3eadb34e23 --- /dev/null +++ b/pkgs/by-name/ld/ld64/patches/0018-Use-STL-containers-instead-of-LLVM-containers.patch @@ -0,0 +1,37 @@ +From 98119b91fc3cf85d65c2e320707324af3c56565d Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Wed, 13 Nov 2024 13:53:14 -0500 +Subject: [PATCH 18/18] Use STL containers instead of LLVM containers +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream LLVM doesn’t support `std::string_view` in `DenseMap`s. +--- + src/abstraction/Containers.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/abstraction/Containers.h b/src/abstraction/Containers.h +index a27dc83..fca312c 100644 +--- a/src/abstraction/Containers.h ++++ b/src/abstraction/Containers.h +@@ -31,14 +31,14 @@ + #include + #include + +-#define USE_LLVM_CONTAINERS 1 ++#define USE_LLVM_CONTAINERS 0 + + #if USE_LLVM_CONTAINERS + #include "../llvm/llvm-DenseSet.h" + #include "../llvm/llvm-DenseMap.h" + #else + // Include DenseMapInfo helpers even when not using LLVM containers. +-#include "../llvm/llvm-DenseMapInfo.h" ++// #include "../llvm/llvm-DenseMapInfo.h" + #endif + + namespace ld { +-- +2.47.2 + diff --git a/pkgs/by-name/ld/ld64/remove-unused-and-incomplete-blob-clone.diff b/pkgs/by-name/ld/ld64/remove-unused-and-incomplete-blob-clone.diff deleted file mode 100644 index 88dd4304f6f7..000000000000 --- a/pkgs/by-name/ld/ld64/remove-unused-and-incomplete-blob-clone.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/ld/code-sign-blobs/blob.h b/src/ld/code-sign-blobs/blob.h -index 19c63a9..1dfb380 100644 ---- a/src/ld/code-sign-blobs/blob.h -+++ b/src/ld/code-sign-blobs/blob.h -@@ -180,9 +180,6 @@ public: - return NULL; - } - -- BlobType *clone() const -- { assert(validateBlob()); return specific(this->BlobCore::clone()); } -- - static BlobType *readBlob(int fd) - { return specific(BlobCore::readBlob(fd, _magic, sizeof(BlobType), 0), true); } - From d91bce4ad55ee81cdb13c294cdab0599d0b96536 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Tue, 14 Jan 2025 18:13:55 -0500 Subject: [PATCH 0142/1107] ld64: 951.9 -> 954.16 https://github.com/apple-oss-distributions/ld64/compare/ld64-951.9...ld64-954.16 --- pkgs/by-name/ld/ld64/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ld/ld64/package.nix b/pkgs/by-name/ld/ld64/package.nix index c5cd1d7b9c1e..8eefeea6d768 100644 --- a/pkgs/by-name/ld/ld64/package.nix +++ b/pkgs/by-name/ld/ld64/package.nix @@ -40,7 +40,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ld64"; - version = "951.9"; + version = "954.16"; outputs = [ "out" @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "apple-oss-distributions"; repo = "ld64"; tag = "ld64-${finalAttrs.version}"; - hash = "sha256-hLkfqgBwVPlO4gfriYOawTO5E1zSD63ZcNetm1E5I70"; + hash = "sha256-CVIyL2J9ISZnI4+r+wp4QtOb3+3Tmz2z2Z7/qeRqHS0="; }; patches = @@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { echo 'static const char compile_stubs[] = "";' >> src/ld/compile_stubs.h ''; - xcodeHash = "sha256-+j7Ed/6aD46SJnr3DWPfWuYWylb2FNJRPmWsUVxZJHM="; + xcodeHash = "sha256-qip/1eiGn8PdLThonhPq3oq2veN4E1zOiamDPBfTeNE="; xcodeProject = "ld64.xcodeproj"; nativeBuildInputs = [ From 324efa8ec7e93f30f038fbee646bbf0eb86c2aa9 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 28 Dec 2024 10:32:44 -0500 Subject: [PATCH 0143/1107] darwin.binutils: link unprefixed ld64 with prefix in binutils ld64 is a cross-linker by default (albeit only to Darwin platforms), so it is built without a prefix in the ld64 package. The linker in the binutils package is expected to be prefixed, so adjust the build command accordingly to make sure the linker is still linked correctly. --- pkgs/os-specific/darwin/binutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index f01b8d43a2be..d45258fff303 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -106,7 +106,7 @@ stdenvNoCC.mkDerivation { makeWrapper "${lib.getBin clang-unwrapped}/bin/clang" "$out/bin/${targetPrefix}as" \ --add-flags "-x assembler -integrated-as -c" - ln -s '${lib.getBin ld64}/bin/${targetPrefix}ld' "$out/bin/${targetPrefix}ld" + ln -s '${lib.getBin ld64}/bin/ld' "$out/bin/${targetPrefix}ld" ${linkManPages (lib.getMan ld64) "ld" "ld"} ${linkManPages (lib.getMan ld64) "ld-classic" "ld-classic"} ${linkManPages (lib.getMan ld64) "ld64" "ld64"} From 93fbc62302af3c0869d32e354704f63961d6c88b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 2 Feb 2025 06:17:54 +0000 Subject: [PATCH 0144/1107] gdb: 16.1 -> 16.2 Changes: https://lists.gnu.org/archive/html/info-gnu/2025-02/msg00000.html --- pkgs/development/tools/misc/gdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index efca72816441..8967827c1168 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -53,11 +53,11 @@ assert pythonSupport -> python3 != null; stdenv.mkDerivation rec { pname = targetPrefix + basename + lib.optionalString hostCpuOnly "-host-cpu-only"; - version = "16.1"; + version = "16.2"; src = fetchurl { url = "mirror://gnu/gdb/${basename}-${version}.tar.xz"; - hash = "sha256-wsxczKApt6fDh5zoqWUo/f0Fa02ITysFEej3vHIzVcY="; + hash = "sha256-QALLfyP0XDfHkFNqE6cglCzkvgQC2SnJCF6S8Q1IARk="; }; postPatch = From 4a06ebaf70e87ff780c1d35dd91b90a4dbaa677f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 26 Jan 2025 07:26:34 +0000 Subject: [PATCH 0145/1107] which: 2.21 -> 2.23 Dropped LARGEFILE support override as it was upstreamed as: https://git.savannah.gnu.org/cgit/which.git/commit/?id=ff99c8a2aa84237e4546078a2b62a7b2798cd53b Changes: - https://git.savannah.gnu.org/cgit/which.git/tree/NEWS?id=a5f8db60de0f5af76b8ef358ce1a5e55b8556e4e - https://git.savannah.gnu.org/cgit/which.git/diff/NEWS?id=3e2c8f8acc3a333b66b06de234bc9324c6fe5500 --- pkgs/by-name/wh/which/package.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/wh/which/package.nix b/pkgs/by-name/wh/which/package.nix index ae9deecdec54..a739a54f474d 100644 --- a/pkgs/by-name/wh/which/package.nix +++ b/pkgs/by-name/wh/which/package.nix @@ -6,23 +6,16 @@ stdenv.mkDerivation rec { pname = "which"; - version = "2.21"; + version = "2.23"; src = fetchurl { url = "mirror://gnu/which/which-${version}.tar.gz"; - hash = "sha256-9KJFuUEks3fYtJZGv0IfkVXTaqdhS26/g3BdP/x26q0="; + hash = "sha256-osVYIm/E2eTOMxvS/Tw/F/lVEV0sAORHYYpO+ZeKKnM="; }; strictDeps = true; enableParallelBuilding = true; - env.NIX_CFLAGS_COMPILE = toString ( - # Enable 64-bit file API. Otherwise `which` fails to find tools - # on filesystems with 64-bit inodes (like `btrfs`) when running - # binaries from 32-bit systems (like `i686-linux`). - lib.optional stdenv.hostPlatform.is32bit "-D_FILE_OFFSET_BITS=64" - ); - meta = { homepage = "https://www.gnu.org/software/which/"; description = "Shows the full path of (shell) commands"; From db161f84c91baab682ac90e6d127283db9abe0f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Feb 2025 07:26:23 +0000 Subject: [PATCH 0146/1107] fizz: 2025.01.06.00 -> 2025.01.27.00 --- pkgs/by-name/fi/fizz/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fi/fizz/package.nix b/pkgs/by-name/fi/fizz/package.nix index 3d09d856ef4f..498061f63041 100644 --- a/pkgs/by-name/fi/fizz/package.nix +++ b/pkgs/by-name/fi/fizz/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fizz"; - version = "2025.01.06.00"; + version = "2025.01.27.00"; outputs = [ "bin" @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebookincubator"; repo = "fizz"; tag = "v${finalAttrs.version}"; - hash = "sha256-ENMWP4CkJHe6Z0qsRNkmgw8NcYQvduAs7jIZLwirsCs="; + hash = "sha256-Gt1DaEcpto25dkT6QsGg3jNp8vvAuWJrzCqelknK+IU="; }; patches = [ From bbae80ff651353c44b9e70c714fcdb1e662e3822 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Feb 2025 10:43:49 +0000 Subject: [PATCH 0147/1107] wangle: 2025.01.06.00 -> 2025.01.27.00 --- pkgs/by-name/wa/wangle/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/wangle/package.nix b/pkgs/by-name/wa/wangle/package.nix index 5d1a723a1b82..ed13b75dd263 100644 --- a/pkgs/by-name/wa/wangle/package.nix +++ b/pkgs/by-name/wa/wangle/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "wangle"; - version = "2025.01.06.00"; + version = "2025.01.27.00"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "wangle"; tag = "v${finalAttrs.version}"; - hash = "sha256-H10BwlKypOuxqrV8BpeJd7gWUqYrCaoW0HwV4I7nxu0="; + hash = "sha256-aZnDqMQ2Xh/v5zhyvR8ovHgISjTy8eGoGXg69Ee3Ejk="; }; patches = [ From 46eecf6113b7a5a82d187a3845b9ffba5e45252c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Feb 2025 12:43:11 +0000 Subject: [PATCH 0148/1107] protobufc: 1.5.0 -> 1.5.1 --- pkgs/by-name/pr/protobufc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/protobufc/package.nix b/pkgs/by-name/pr/protobufc/package.nix index e35fc7ad1aca..7273982206f5 100644 --- a/pkgs/by-name/pr/protobufc/package.nix +++ b/pkgs/by-name/pr/protobufc/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "protobuf-c"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "protobuf-c"; repo = "protobuf-c"; tag = "v${version}"; - hash = "sha256-Dkpcc7ZfvAIVY91trRiHuiRFcUGUbQxbheYKTBcq80I="; + hash = "sha256-usfONVSq0/V9GRrBx9RwO/hCrVJ8d17mvAgTKpKUssQ="; }; outputs = [ From de8a02609c14de8c4d3cd0ec12b4503f19a3aeb2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Feb 2025 12:47:51 +0000 Subject: [PATCH 0149/1107] memcached: 1.6.34 -> 1.6.35 --- pkgs/by-name/me/memcached/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/memcached/package.nix b/pkgs/by-name/me/memcached/package.nix index 6188c9e3a044..b8362c2535a8 100644 --- a/pkgs/by-name/me/memcached/package.nix +++ b/pkgs/by-name/me/memcached/package.nix @@ -1,12 +1,12 @@ {lib, stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.34"; + version = "1.6.35"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-DVOA4uCltPzvHYmjaKEcTwZobGAXwf/3eLO0V48GdOw="; + sha256 = "sha256-60UpMX7sgY78RDUt3R+Vn9IIgr7RrikqV4i9eklm98E="; }; configureFlags = [ From d72d8e0f4736c543ac1c39463c8ff3ad0d8dbc71 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Feb 2025 18:52:41 +0000 Subject: [PATCH 0150/1107] spdlog: 1.15.0 -> 1.15.1 --- pkgs/by-name/sp/spdlog/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/spdlog/package.nix b/pkgs/by-name/sp/spdlog/package.nix index 802c8fe5f0d7..da33fbf60333 100644 --- a/pkgs/by-name/sp/spdlog/package.nix +++ b/pkgs/by-name/sp/spdlog/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "spdlog"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "gabime"; repo = "spdlog"; rev = "v${version}"; - hash = "sha256-HCpnN28qWreg0NvL6Q9pfSSxOTHgV6glHt6P0FbH/Cw="; + hash = "sha256-4QZVCounDbtkP+58fejHGWjquWT3b03b9TNGs45dN7c="; }; nativeBuildInputs = [ cmake ]; From c1907fbbf03ca1b775e7391073a1c55872c9d33d Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 1 Feb 2025 15:20:05 +0300 Subject: [PATCH 0151/1107] gcc: rework, clean up, and document the cursed symlink hack Fixes dangling symlinks. Also flips the direction of symlinks on cross from $lib/$target/lib -> $lib/lib to $lib/lib -> $lib/$target/lib --- .../compilers/gcc/common/builder.nix | 199 ++++++++++-------- .../compilers/gcc/common/libgcc.nix | 13 +- 2 files changed, 120 insertions(+), 92 deletions(-) diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix index 633251910dbe..1cb2933977de 100644 --- a/pkgs/development/compilers/gcc/common/builder.nix +++ b/pkgs/development/compilers/gcc/common/builder.nix @@ -210,110 +210,137 @@ originalAttrs: ''; preInstall = + # What follows is a horribly cursed hack. + # + # GCC will install its libraries to $out/lib, $out/lib32, $out/lib64, + # $out/$targetConfig/lib, $out/$targetConfig/lib32 or $out/$targetConfig/lib64, + # depending on whether it's built as native or cross, and the exact target spec. + # + # We can't predict what it's actually going to do, and we also can't just tell it + # to always install to $out/lib, but we want everything to end up in $out/lib + # for consistency (multilib weirdness aside). + # + # So, we create a bunch of symlinks before we run GCC's install phase, + # redirecting every possible directory it may want to write to to the place + # we actually want things to be installed. + # We will then nuke the symlinks in postInstall. + # + # FIXME: there must be a better way to do this. '' - mkdir -p "$out/''${targetConfig}/lib" - mkdir -p "''${!outputLib}/''${targetConfig}/lib" + declare -ga compatibilitySymlinks=() + + makeCompatibilitySymlink() { + for output in "$out" "''${!outputLib}"; do + local linkTarget="$1" + local linkName="$output/$2" + + echo "Creating compatibility symlink: $linkTarget -> $linkName" + + mkdir -p "$(dirname "$linkName")" + ln -s "$linkTarget" "$linkName" + compatibilitySymlinks+=("$linkName") + done + } '' + - # if cross-compiling, link from $lib/lib to $lib/${targetConfig}. - # since native-compiles have $lib/lib as a directory (not a - # symlink), this ensures that in every case we can assume that - # $lib/lib contains the .so files - lib.optionalString (with stdenv; targetPlatform.config != hostPlatform.config) '' - ln -Ts "''${!outputLib}/''${targetConfig}/lib" $lib/lib + # This will redirect $output/lib{32,64} to $output/lib. + # Multilib is special, because it creates $out/lib (for 32-bit) + # and $out/lib64 (for 64-bit). No other targets can have both. + lib.optionalString (!enableMultilib) '' + makeCompatibilitySymlink lib lib32 + makeCompatibilitySymlink lib lib64 '' + - # Make `lib64` symlinks to `lib`. - lib.optionalString - (!enableMultilib && stdenv.hostPlatform.is64bit && !stdenv.hostPlatform.isMips64n32) - '' - ln -s lib "$out/''${targetConfig}/lib64" - ln -s lib "''${!outputLib}/''${targetConfig}/lib64" - '' - + - # On mips platforms, gcc follows the IRIX naming convention: - # - # $PREFIX/lib = mips32 - # $PREFIX/lib32 = mips64n32 - # $PREFIX/lib64 = mips64 - # - # Make `lib32` symlinks to `lib`. - lib.optionalString (!enableMultilib && stdenv.targetPlatform.isMips64n32) '' - ln -s lib "$out/''${targetConfig}/lib32" - ln -s lib "''${!outputLib}/''${targetConfig}/lib32" + # This will redirect $output/$targetConfig/lib{,32,64} to $output/lib. + lib.optionalString (with stdenv; targetPlatform.config != hostPlatform.config) '' + makeCompatibilitySymlink lib $targetConfig/lib32 + makeCompatibilitySymlink lib $targetConfig/lib64 + makeCompatibilitySymlink ../lib $targetConfig/lib ''; - postInstall = '' - # Move runtime libraries to lib output. - moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.so*" "''${!outputLib}" - moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.la" "''${!outputLib}" - moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.dylib" "''${!outputLib}" - moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.dll.a" "''${!outputLib}" - moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.dll" "''${!outputLib}" - moveToOutput "share/gcc-*/python" "''${!outputLib}" + postInstall = + '' + # Clean up our compatibility symlinks (see above) + for link in "''${compatibilitySymlinks[@]}"; do + echo "Removing compatibility symlink: $link" + rm -f "$link" + done - if [ -z "$enableShared" ]; then - moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.a" "''${!outputLib}" - fi + # Move runtime libraries to lib output. + moveToOutput "lib/lib*.so*" "''${!outputLib}" + moveToOutput "lib/lib*.la" "''${!outputLib}" + moveToOutput "lib/lib*.dylib" "''${!outputLib}" + moveToOutput "lib/lib*.dll.a" "''${!outputLib}" + moveToOutput "lib/lib*.dll" "''${!outputLib}" + moveToOutput "share/gcc-*/python" "''${!outputLib}" - for i in "''${!outputLib}/''${targetConfig}"/lib/*.{la,py}; do - substituteInPlace "$i" --replace "$out" "''${!outputLib}" - done + if [ -z "$enableShared" ]; then + moveToOutput "lib/lib*.a" "''${!outputLib}" + fi - if [ -n "$enableMultilib" ]; then - moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.so*" "''${!outputLib}" - moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.la" "''${!outputLib}" - moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.dylib" "''${!outputLib}" - moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.dll.a" "''${!outputLib}" - moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.dll" "''${!outputLib}" + for i in "''${!outputLib}"/lib/*.{la,py}; do + substituteInPlace "$i" --replace "$out" "''${!outputLib}" + done - for i in "''${!outputLib}/''${targetConfig}"/lib64/*.{la,py}; do - substituteInPlace "$i" --replace "$out" "''${!outputLib}" - done - fi + if [ -n "$enableMultilib" ]; then + moveToOutput "lib64/lib*.so*" "''${!outputLib}" + moveToOutput "lib64/lib*.la" "''${!outputLib}" + moveToOutput "lib64/lib*.dylib" "''${!outputLib}" + moveToOutput "lib64/lib*.dll.a" "''${!outputLib}" + moveToOutput "lib64/lib*.dll" "''${!outputLib}" - # Remove `fixincl' to prevent a retained dependency on the - # previous gcc. - rm -rf $out/libexec/gcc/*/*/install-tools - rm -rf $out/lib/gcc/*/*/install-tools + for i in "''${!outputLib}"/lib64/*.{la,py}; do + substituteInPlace "$i" --replace "$out" "''${!outputLib}" + done + fi - # More dependencies with the previous gcc or some libs (gccbug stores the build command line) - rm -rf $out/bin/gccbug + # Remove `fixincl' to prevent a retained dependency on the + # previous gcc. + rm -rf $out/libexec/gcc/*/*/install-tools + rm -rf $out/lib/gcc/*/*/install-tools - if type "install_name_tool"; then - for i in "''${!outputLib}"/lib/*.*.dylib "''${!outputLib}"/lib/*.so.[0-9]; do - install_name_tool -id "$i" "$i" || true - for old_path in $(otool -L "$i" | grep "$out" | awk '{print $1}'); do - new_path=`echo "$old_path" | sed "s,$out,''${!outputLib},"` - install_name_tool -change "$old_path" "$new_path" "$i" || true - done - done - fi + # More dependencies with the previous gcc or some libs (gccbug stores the build command line) + rm -rf $out/bin/gccbug - # Get rid of some "fixed" header files - rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux,sys/mount.h,bits/statx.h,pthread.h} + if type "install_name_tool"; then + for i in "''${!outputLib}"/lib/*.*.dylib "''${!outputLib}"/lib/*.so.[0-9]; do + install_name_tool -id "$i" "$i" || true + for old_path in $(otool -L "$i" | grep "$out" | awk '{print $1}'); do + new_path=`echo "$old_path" | sed "s,$out,''${!outputLib},"` + install_name_tool -change "$old_path" "$new_path" "$i" || true + done + done + fi - # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks. - for i in $out/bin/*-gcc*; do - if cmp -s $out/bin/gcc $i; then - ln -sfn gcc $i - fi - done + # Get rid of some "fixed" header files + rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux,sys/mount.h,bits/statx.h,pthread.h} - for i in $out/bin/c++ $out/bin/*-c++* $out/bin/*-g++*; do - if cmp -s $out/bin/g++ $i; then - ln -sfn g++ $i - fi - done + # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks. + for i in $out/bin/*-gcc*; do + if cmp -s $out/bin/gcc $i; then + ln -sfn gcc $i + fi + done - # Two identical man pages are shipped (moving and compressing is done later) - for i in "$out"/share/man/man1/*g++.1; do - if test -e "$i"; then - man_prefix=`echo "$i" | sed "s,.*/\(.*\)g++.1,\1,"` - ln -sf "$man_prefix"gcc.1 "$i" - fi - done - ''; + for i in $out/bin/c++ $out/bin/*-c++* $out/bin/*-g++*; do + if cmp -s $out/bin/g++ $i; then + ln -sfn g++ $i + fi + done + + # Two identical man pages are shipped (moving and compressing is done later) + for i in "$out"/share/man/man1/*g++.1; do + if test -e "$i"; then + man_prefix=`echo "$i" | sed "s,.*/\(.*\)g++.1,\1,"` + ln -sf "$man_prefix"gcc.1 "$i" + fi + done + '' + + + # Recreate the target symlink so GCC can find libgcc_s on non-split builds. + lib.optionalString (with stdenv; targetPlatform.config != hostPlatform.config) '' + ln -s $lib/lib $lib/$targetConfig/lib + ''; } // lib.optionalAttrs ((stdenv.targetPlatform.config != stdenv.hostPlatform.config) && withoutTargetLibc) { dontCheckForBrokenSymlinks = true; diff --git a/pkgs/development/compilers/gcc/common/libgcc.nix b/pkgs/development/compilers/gcc/common/libgcc.nix index 3d4bd9067763..d38be2f6b76a 100644 --- a/pkgs/development/compilers/gcc/common/libgcc.nix +++ b/pkgs/development/compilers/gcc/common/libgcc.nix @@ -105,14 +105,15 @@ lib.pipe drv + lib.optionalString enableLibGccOutput ( '' # move libgcc from lib to its own output (libgcc) - mkdir -p $libgcc/${targetPlatformSlash}lib - mv $lib/${targetPlatformSlash}lib/libgcc_s.so $libgcc/${targetPlatformSlash}lib/ - mv $lib/${targetPlatformSlash}lib/libgcc_s.so.${libgcc_s-version-major} $libgcc/${targetPlatformSlash}lib/ - ln -s $libgcc/${targetPlatformSlash}lib/libgcc_s.so $lib/${targetPlatformSlash}lib/ - ln -s $libgcc/${targetPlatformSlash}lib/libgcc_s.so.${libgcc_s-version-major} $lib/${targetPlatformSlash}lib/ + mkdir -p $libgcc/lib + mv $lib/lib/libgcc_s.so $libgcc/lib/ + mv $lib/lib/libgcc_s.so.${libgcc_s-version-major} $libgcc/lib/ + ln -s $libgcc/lib/libgcc_s.so $lib/lib/ + ln -s $libgcc/lib/libgcc_s.so.${libgcc_s-version-major} $lib/lib/ '' + lib.optionalString (targetPlatformSlash != "") '' - ln -s ${targetPlatformSlash}lib $libgcc/lib + mkdir -p $libgcc/${targetPlatformSlash} + ln -s $libgcc/lib $libgcc/${targetPlatformSlash}lib '' # # Nixpkgs ordinarily turns dynamic linking into pseudo-static linking: From 97a3367a330c6648d2bdf6036d960aface807651 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 2 Feb 2025 09:49:23 +0300 Subject: [PATCH 0152/1107] Revert "gcc: disable symlink checks on cross + nolibc for now" This reverts commit 3fd43d5d7494068b2c8a9d904406f64d430dd029. The proper fix is now in. --- pkgs/development/compilers/gcc/common/builder.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix index 1cb2933977de..1a99835aa2bd 100644 --- a/pkgs/development/compilers/gcc/common/builder.nix +++ b/pkgs/development/compilers/gcc/common/builder.nix @@ -3,7 +3,6 @@ stdenv, enableMultilib, targetConfig, - withoutTargetLibc, }: let @@ -342,7 +341,4 @@ originalAttrs: ln -s $lib/lib $lib/$targetConfig/lib ''; } - // lib.optionalAttrs ((stdenv.targetPlatform.config != stdenv.hostPlatform.config) && withoutTargetLibc) { - dontCheckForBrokenSymlinks = true; - } )) From ef8b15027cb12180863e85f1c8f56643f25ef03c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 2 Feb 2025 22:03:13 +0000 Subject: [PATCH 0153/1107] SDL2: 2.30.11 -> 2.30.12 Changes: https://github.com/libsdl-org/SDL/releases/tag/release-2.30.12 --- pkgs/development/libraries/SDL2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index a1db79c06a86..4d4b446af742 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -70,13 +70,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "SDL2"; - version = "2.30.11"; + version = "2.30.12"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "SDL"; rev = "release-${finalAttrs.version}"; - hash = "sha256-2NVZNqYhnAsljuF0BhBSJ5HmE9cS41gJep4Q3VxUGkY="; + hash = "sha256-9f7V15p8Cso1TVxcd7bEFGO3C3oIhQikyLh4pWXLaiA="; }; dontDisableStatic = if withStatic then 1 else 0; outputs = [ From a0cdf6f14ae84237dcea65a3bd964db79ecd938b Mon Sep 17 00:00:00 2001 From: Quentin Boyer Date: Sun, 2 Feb 2025 22:33:42 +0100 Subject: [PATCH 0154/1107] fittrackee: 0.8.12 -> 0.9.1 --- pkgs/by-name/fi/fittrackee/package.nix | 42 ++++++++------------------ 1 file changed, 12 insertions(+), 30 deletions(-) diff --git a/pkgs/by-name/fi/fittrackee/package.nix b/pkgs/by-name/fi/fittrackee/package.nix index 7cd75f7c6c99..ac28150d0c21 100644 --- a/pkgs/by-name/fi/fittrackee/package.nix +++ b/pkgs/by-name/fi/fittrackee/package.nix @@ -1,60 +1,39 @@ { fetchFromGitHub, - fetchPypi, lib, stdenv, postgresql, postgresqlTestHook, - python3, + python3Packages, }: -let - python = python3.override { - self = python; - packageOverrides = self: super: { - sqlalchemy = super.sqlalchemy_1_4; - - flask-sqlalchemy = super.flask-sqlalchemy.overridePythonAttrs (oldAttrs: rec { - version = "3.0.5"; - - src = fetchPypi { - pname = "flask_sqlalchemy"; - inherit version; - hash = "sha256-xXZeWMoUVAG1IQbA9GF4VpJDxdolVWviwjHsxghnxbE="; - }; - }); - }; - }; - -in -python.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "fittrackee"; - version = "0.8.12"; + version = "0.9.1"; pyproject = true; src = fetchFromGitHub { owner = "SamR1"; repo = "FitTrackee"; tag = "v${version}"; - hash = "sha256-knhXFhBb11KWidw6ym8EdZJJ9CDSU4TarupegYJx94A="; + hash = "sha256-ZWSlJijW8vNuUtCHhEhmZPcEygcRrtHQUOQQKZdf868="; }; build-system = [ - python.pkgs.poetry-core + python3Packages.poetry-core ]; pythonRelaxDeps = [ "authlib" "flask-limiter" - "gunicorn" - "pyjwt" + "flask-migrate" + "nh3" "pyopenssl" "pytz" "sqlalchemy" - "ua-parser" ]; dependencies = - with python.pkgs; + with python3Packages; [ authlib babel @@ -69,6 +48,8 @@ python.pkgs.buildPythonApplication rec { gpxpy gunicorn humanize + jsonschema + nh3 psycopg2-binary pyjwt pyopenssl @@ -83,7 +64,7 @@ python.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "fittrackee" ]; - nativeCheckInputs = with python.pkgs; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook freezegun postgresqlTestHook @@ -103,6 +84,7 @@ python.pkgs.buildPythonApplication rec { preCheck = '' export TMP=$TMPDIR + export UI_URL=http://0.0.0.0:5000 ''; meta = { From 3250c94d987c5ebcf24a5bfcd3c7de5ec43e3e84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luka=20Bla=C5=A1kovi=C4=87?= Date: Sun, 2 Feb 2025 10:55:20 +0000 Subject: [PATCH 0155/1107] cargo,clippy,rustfmt,rustc: 1.84.0 -> 1.84.1 --- pkgs/development/compilers/rust/1_84.nix | 32 ++++++++++++------------ 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/development/compilers/rust/1_84.nix b/pkgs/development/compilers/rust/1_84.nix index 6b98d8817bcc..5a076c84c88c 100644 --- a/pkgs/development/compilers/rust/1_84.nix +++ b/pkgs/development/compilers/rust/1_84.nix @@ -47,8 +47,8 @@ let in import ./default.nix { - rustcVersion = "1.84.0"; - rustcSha256 = "Fc7nOVsH/94CIGBFWzFANm7DoSy76o8e8v83GpzKUb8="; + rustcVersion = "1.84.1"; + rustcSha256 = "Xi+11JYopUn3Zxssz5hVqzef1EKDGnwq8W4M3MMbs3U="; llvmSharedForBuild = llvmSharedFor pkgsBuildBuild; llvmSharedForHost = llvmSharedFor pkgsBuildHost; @@ -106,23 +106,23 @@ import ./default.nix # Note: the version MUST be the same version that we are building. Upstream # ensures that each released compiler can compile itself: # https://github.com/NixOS/nixpkgs/pull/351028#issuecomment-2438244363 - bootstrapVersion = "1.84.0"; + bootstrapVersion = "1.84.1"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "3f9fea653bc68139fa1476f9b00ec55a2637650960872029cfc91ea729d0fd82"; - x86_64-unknown-linux-gnu = "de2b041a6e62ec2c37c517eb58518f68fde5fc2f076218393ae06145d92a5682"; - x86_64-unknown-linux-musl = "0e98d242074f566f72bf48dfbd6c8457f6cbc02be7e8e8dac04347ad15ad3f41"; - arm-unknown-linux-gnueabihf = "e571a4e57e60360e0783cd9d4bcc10290394cfd312ede5e4fcc81aebd0625307"; - armv7-unknown-linux-gnueabihf = "b63040017c831aa607d18287d8af6548daca038e9bb95030e0e1f0d45c9c471f"; - aarch64-unknown-linux-gnu = "282d281cb389bdc2c0671c2a74eeda46e010a158810d2137c3a948ae6c713543"; - aarch64-unknown-linux-musl = "1055e2c6f8e3823f5213eb55eb77e63cf6b9bd6eb243897dae7259f4d8ab8c54"; - x86_64-apple-darwin = "eafe087277ad8d7473f978d0779b4504d5b8064a781784aebd3e33c2541a13ce"; - aarch64-apple-darwin = "506dfc14115d2efa96fad9fa542d67027525aa46882a8e1ffb41e891737b689b"; - powerpc64le-unknown-linux-gnu = "26a60519303194e245968b2d34d405a49e20bdb86b240ab230e973e03c283c86"; - riscv64gc-unknown-linux-gnu = "4534d86f55f1851c90097bfc03e38ab88ba6893940a7dcb6dce9139f0aa377fa"; - s390x-unknown-linux-gnu = "76099d34b8e5ae4d47e55e7bd472918cde2c2945b97dca926c739082c051ab2b"; - x86_64-unknown-freebsd = "b484de5908612b3ea132bdd76afde1c980c6bf70cf6f1b27e13d74b3729136b9"; + i686-unknown-linux-gnu = "9a2f107b35ca55439a7de0a74a893ff285766e086f96fb1d7049301b196c5da8"; + x86_64-unknown-linux-gnu = "106c89f23ce1c763fcbea8e2714b2ba869bf7af70804813987a4483896398933"; + x86_64-unknown-linux-musl = "e52236e269ce8f713691d78895365a376002980c011b4bbdd27e4bee0ec1ee9a"; + arm-unknown-linux-gnueabihf = "02273a6326639dedf0c627421851f85b88884d3811de2a7390f189575d23b4b4"; + armv7-unknown-linux-gnueabihf = "434895ed6cf922a3c0fe11a6af7f4e382093cc9edf6c250e49fbfcecd25ada59"; + aarch64-unknown-linux-gnu = "be89f6ad9b70cc4b25182ae299f94ab047a713a51fddf95284823c8afe4aef85"; + aarch64-unknown-linux-musl = "8a80398ed1942e8020599b8f1c53ae9775a6c8bed6af252c48a5fb967accd5f1"; + x86_64-apple-darwin = "c2c80ffef15946abfb08dac6ad54c07f9d95ae56c65fc94c4c10e07b60acb883"; + aarch64-apple-darwin = "49be10fa1a1de14e36d37cc412b7c44e01896c0a86a2d0d35ee26704a59adba7"; + powerpc64le-unknown-linux-gnu = "7c56d9b5e2dfbd6a0a18307d96b703d6d70d1cf7bb337ea8865dfdd5e0a38d84"; + riscv64gc-unknown-linux-gnu = "0e07fe7a0df2220cea37581061ed52576a44dec10866ec8f860f71a98bf41412"; + s390x-unknown-linux-gnu = "9d6ab731c0cb315349cf5cbbeb88149adbd7165dbeec76f7c723d0b9796c4422"; + x86_64-unknown-freebsd = "7aa4089315d3ac9eefd7f885283df99b2c4cb930316f0be3bf867d41217b6d05"; }; selectRustPackage = pkgs: pkgs.rust_1_84; From 0394aa35edc9ed4dcec22d2023a2d4389333a31d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 3 Feb 2025 11:03:06 +0100 Subject: [PATCH 0156/1107] python3Packages.pandas: fix build for musl Since 8ed4a0d4d28d ("ffado: unpin python311"), pandas is necessary to build ffado. This patch will be included in the next release of pandas. --- pkgs/development/python-modules/pandas/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 241f60fa75fe..2a96029a4139 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch, pythonOlder, # build-system @@ -76,6 +77,14 @@ let hash = "sha256-6YUROcqOV2P1AbJF9IMBIqTt7/PSTeXDwGgE4uI9GME="; }; + patches = [ + (fetchpatch { + name = "musl.patch"; + url = "https://github.com/pandas-dev/pandas/commit/1e487982ff7501f07e2bba7a7d924fb92b3d5c7f.patch"; + hash = "sha256-F1pVce1W951Ea82Ux198e5fBFH6kDOG+EeslDTYbjio="; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "meson-python==0.13.1" "meson-python>=0.13.1" \ From 456cfd0fdb482a6b9248a96165bca80f14c91637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 2 Feb 2025 23:51:09 +0100 Subject: [PATCH 0157/1107] spidermonkey_78: drop --- .../interpreters/spidermonkey/78.nix | 4 - .../spidermonkey/add-riscv64-support.patch | 123 ------------------ .../interpreters/spidermonkey/common.nix | 46 +------ pkgs/top-level/aliases.nix | 3 +- pkgs/top-level/all-packages.nix | 4 - 5 files changed, 6 insertions(+), 174 deletions(-) delete mode 100644 pkgs/development/interpreters/spidermonkey/78.nix delete mode 100644 pkgs/development/interpreters/spidermonkey/add-riscv64-support.patch diff --git a/pkgs/development/interpreters/spidermonkey/78.nix b/pkgs/development/interpreters/spidermonkey/78.nix deleted file mode 100644 index 05124a417fef..000000000000 --- a/pkgs/development/interpreters/spidermonkey/78.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./common.nix { - version = "78.15.0"; - hash = "sha512-rD3nNbJGzk8OFhnNJmQyH/o3QkDOaEPnhdeaNQ3DDJZ5lrvMXjswHLPYIsqYHL6hFnWPxBIvFzjXXd/RFltjeA==="; -} diff --git a/pkgs/development/interpreters/spidermonkey/add-riscv64-support.patch b/pkgs/development/interpreters/spidermonkey/add-riscv64-support.patch deleted file mode 100644 index 9d5d7c5507dc..000000000000 --- a/pkgs/development/interpreters/spidermonkey/add-riscv64-support.patch +++ /dev/null @@ -1,123 +0,0 @@ -# HG changeset patch -# User John Paul Adrian Glaubitz -# Date 1592464269 0 -# Thu Jun 18 07:11:09 2020 +0000 -# Node ID 5de7d747a962df5f8aefc016a62d7270ac18879e -# Parent e4b11f027efc1f8c2710ae3f52487a8f10a8fb39 -Bug 1318905 - build: Add riscv64 as target architecture to mozbuild r=glandium - -Adds the basic definitions for riscv64 to mozbuild, allowing to build Spidermonkey. - -Differential Revision: https://phabricator.services.mozilla.com/D78623 - -diff -r e4b11f027efc -r 5de7d747a962 build/moz.configure/init.configure ---- a/build/moz.configure/init.configure Sun May 31 17:11:57 2020 +0000 -+++ b/build/moz.configure/init.configure Thu Jun 18 07:11:09 2020 +0000 -@@ -741,6 +741,9 @@ - elif cpu.startswith('aarch64'): - canonical_cpu = 'aarch64' - endianness = 'little' -+ elif cpu in ('riscv64', 'riscv64gc'): -+ canonical_cpu = 'riscv64' -+ endianness = 'little' - elif cpu == 'sh4': - canonical_cpu = 'sh4' - endianness = 'little' -diff -r e4b11f027efc -r 5de7d747a962 python/mozbuild/mozbuild/configure/constants.py ---- a/python/mozbuild/mozbuild/configure/constants.py Sun May 31 17:11:57 2020 +0000 -+++ b/python/mozbuild/mozbuild/configure/constants.py Thu Jun 18 07:11:09 2020 +0000 -@@ -49,6 +49,7 @@ - 'mips64': 64, - 'ppc': 32, - 'ppc64': 64, -+ 'riscv64': 64, - 's390': 32, - 's390x': 64, - 'sh4': 32, -@@ -87,6 +88,7 @@ - ('sparc', '__sparc__'), - ('mips64', '__mips64'), - ('mips32', '__mips__'), -+ ('riscv64', '__riscv && __riscv_xlen == 64'), - ('sh4', '__sh__'), - )) - -diff -r e4b11f027efc -r 5de7d747a962 python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py ---- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py Sun May 31 17:11:57 2020 +0000 -+++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py Thu Jun 18 07:11:09 2020 +0000 -@@ -1208,6 +1208,10 @@ - 'mips-unknown-linux-gnu': big_endian + { - '__mips__': 1, - }, -+ 'riscv64-unknown-linux-gnu': little_endian + { -+ '__riscv': 1, -+ '__riscv_xlen': 64, -+ }, - 'sh4-unknown-linux-gnu': little_endian + { - '__sh__': 1, - }, -# HG changeset patch -# User John Paul Adrian Glaubitz -# Date 1592464269 0 -# Thu Jun 18 07:11:09 2020 +0000 -# Node ID e3d924797cb2d508ff938414168e98ccf66f07fe -# Parent 5de7d747a962df5f8aefc016a62d7270ac18879e -Bug 1318905 - js:jit: Enable AtomicOperations-feeling-lucky.h on riscv64 r=lth - -This allows the build on riscv64 to use the atomic operations provided by GCC. - -Differential Revision: https://phabricator.services.mozilla.com/D78624 - -diff -r 5de7d747a962 -r e3d924797cb2 js/src/jit/AtomicOperations.h ---- a/js/src/jit/AtomicOperations.h Thu Jun 18 07:11:09 2020 +0000 -+++ b/js/src/jit/AtomicOperations.h Thu Jun 18 07:11:09 2020 +0000 -@@ -391,7 +391,7 @@ - #elif defined(__ppc__) || defined(__PPC__) || defined(__sparc__) || \ - defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \ - defined(__PPC64LE__) || defined(__alpha__) || defined(__hppa__) || \ -- defined(__sh__) || defined(__s390__) || defined(__s390x__) -+ defined(__sh__) || defined(__s390__) || defined(__s390x__) || defined(__riscv) - # include "jit/shared/AtomicOperations-feeling-lucky.h" - #else - # error "No AtomicOperations support provided for this platform" -diff -r 5de7d747a962 -r e3d924797cb2 js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h ---- a/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h Thu Jun 18 07:11:09 2020 +0000 -+++ b/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h Thu Jun 18 07:11:09 2020 +0000 -@@ -63,6 +63,11 @@ - # define HAS_64BIT_LOCKFREE - #endif - -+#if defined(__riscv) && __riscv_xlen == 64 -+# define HAS_64BIT_ATOMICS -+# define HAS_64BIT_LOCKFREE -+#endif -+ - #ifdef __sparc__ - # ifdef __LP64__ - # define HAS_64BIT_ATOMICS -# HG changeset patch -# User John Paul Adrian Glaubitz -# Date 1592464269 0 -# Thu Jun 18 07:11:09 2020 +0000 -# Node ID 3f652d12b8bc0bd213020d488ecb4d3710bb11fa -# Parent e3d924797cb2d508ff938414168e98ccf66f07fe -Bug 1318905 - mfbt:tests: Define RETURN_INSTR for riscv64 in TestPoisonArea r=glandium - -Define RETURN_INSTR for riscv64 in TestPoisonArea, i.e. the riscv64 assembly -opcodes for "ret ; ret". - -Differential Revision: https://phabricator.services.mozilla.com/D78625 - -diff -r e3d924797cb2 -r 3f652d12b8bc mfbt/tests/TestPoisonArea.cpp ---- a/mfbt/tests/TestPoisonArea.cpp Thu Jun 18 07:11:09 2020 +0000 -+++ b/mfbt/tests/TestPoisonArea.cpp Thu Jun 18 07:11:09 2020 +0000 -@@ -132,6 +132,9 @@ - #elif defined _ARCH_PPC || defined _ARCH_PWR || defined _ARCH_PWR2 - # define RETURN_INSTR 0x4E800020 /* blr */ - -+#elif defined __riscv -+# define RETURN_INSTR 0x80828082 /* ret; ret */ -+ - #elif defined __sparc || defined __sparcv9 - # define RETURN_INSTR 0x81c3e008 /* retl */ - diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix index ba6861839386..f4f0024107ba 100644 --- a/pkgs/development/interpreters/spidermonkey/common.nix +++ b/pkgs/development/interpreters/spidermonkey/common.nix @@ -50,24 +50,7 @@ stdenv.mkDerivation (finalAttrs: rec { }; patches = - lib.optionals (lib.versionOlder version "91") [ - # Fix build failure on armv7l using Debian patch - # Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1526653 - (fetchpatch { - url = "https://salsa.debian.org/mozilla-team/firefox/commit/fd6847c9416f9eebde636e21d794d25d1be8791d.patch"; - hash = "sha512-K8U3Qyo7g4si2r/8kJdXyRoTrDHAY48x/YJ7YL+YBwlpfNQcHxX+EZvhRzW8FHYW+f7kOnJu9QykhE8PhSQ9zQ=="; - }) - - # Remove this when updating to 79 - The patches are already applied upstream - # https://bugzilla.mozilla.org/show_bug.cgi?id=1318905 - - # Combination of 3 changesets, modified to apply on 78: - # - https://hg.mozilla.org/mozilla-central/rev/06d7e1b6b7e7 - # - https://hg.mozilla.org/mozilla-central/rev/ec48f15d085c - # - https://hg.mozilla.org/mozilla-central/rev/6803dda74d33 - ./add-riscv64-support.patch - ] - ++ lib.optionals (lib.versionAtLeast version "102" && lib.versionOlder version "128") [ + lib.optionals (lib.versionAtLeast version "102" && lib.versionOlder version "128") [ # use pkg-config at all systems ./always-check-for-pkg-config.patch ./allow-system-s-nspr-and-icu-on-bootstrapped-sysroot.patch @@ -95,17 +78,9 @@ stdenv.mkDerivation (finalAttrs: rec { m4 perl pkg-config - # 78 requires python up to 3.9 # 91 does not build with python 3.12: ModuleNotFoundError: No module named 'six.moves' # 102 does not build with python 3.12: ModuleNotFoundError: No module named 'distutils' - ( - if lib.versionOlder version "91" then - python39 - else if lib.versionOlder version "115" then - python311 - else - python3 - ) + (if lib.versionOlder version "115" then python311 else python3) rustc rustc.llvmPackages.llvm # for llvm-objdump which @@ -115,17 +90,13 @@ stdenv.mkDerivation (finalAttrs: rec { rust-cbindgen rustPlatform.bindgenHook ] - ++ lib.optionals (lib.versionOlder version "91") [ - autoconf213 - yasm # to buid icu? seems weird - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; buildInputs = [ - (if lib.versionOlder version "91" then icu67 else icu) + icu nspr readline zlib @@ -174,12 +145,6 @@ stdenv.mkDerivation (finalAttrs: rec { enableParallelBuilding = true; - # cc-rs insists on using -mabi=lp64 (soft-float) for riscv64, - # while we have a double-float toolchain - env.NIX_CFLAGS_COMPILE = lib.optionalString ( - with stdenv.hostPlatform; isRiscV && is64bit && lib.versionOlder version "91" - ) "-mabi=lp64d"; - postPatch = lib.optionalString (lib.versionOlder version "102") '' # This patch is a manually applied fix of # https://bugzilla.mozilla.org/show_bug.cgi?id=1644600 @@ -194,9 +159,6 @@ stdenv.mkDerivation (finalAttrs: rec { lib.optionalString (lib.versionAtLeast version "128") '' export MOZBUILD_STATE_PATH=$TMPDIR/mozbuild '' - + lib.optionalString (lib.versionOlder version "91") '' - export CXXFLAGS="-fpermissive" - '' + '' export LIBXUL_DIST=$out export PYTHON="${buildPackages.python3.interpreter}" @@ -238,7 +200,7 @@ stdenv.mkDerivation (finalAttrs: rec { meta = with lib; { description = "Mozilla's JavaScript engine written in C/C++"; homepage = "https://spidermonkey.dev/"; - license = licenses.mpl20; # TODO: MPL/GPL/LGPL tri-license for 78. + license = licenses.mpl20; maintainers = with maintainers; [ abbradar lostnet diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e4a46966569c..abaed10fbf9c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1309,7 +1309,8 @@ mapAliases { solana-validator = throw "'solana-validator' is obsoleted by solana-cli, which also includes the validator binary"; # Added 2024-12-20 spectral = throw "'spectral' has been renamed to/replaced by 'neochat'"; # Converted to throw 2024-10-17 # spidermonkey is not ABI upwards-compatible, so only allow this for nix-shell - spidermonkey = throw "'spidermonkey' has been renamed to/replaced by 'spidermonkey_78'"; # Converted to throw 2024-10-17 + spidermonkey = throw "'spidermonkey' has been renamed to/replaced by 'spidermonkey_91'"; # Converted to throw 2024-10-17 + spidermonkey_78 = throw "'spidermonkey_78' has been removed because it was unused."; # Added 2025-02-02 spidermonkey_102 = throw "'spidermonkey_102' is EOL since 2023/03"; # Added 2024-08-07 spotify-unwrapped = spotify; # added 2022-11-06 spring-boot = throw "'spring-boot' has been renamed to/replaced by 'spring-boot-cli'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d77737cb590..ab5d97c9cd7c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7349,9 +7349,6 @@ with pkgs; inherit ({ - spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix { - inherit (darwin) libobjc; - }; spidermonkey_91 = callPackage ../development/interpreters/spidermonkey/91.nix { inherit (darwin) libobjc; }; @@ -7362,7 +7359,6 @@ with pkgs; inherit (darwin) libobjc; }; }) - spidermonkey_78 spidermonkey_91 spidermonkey_115 spidermonkey_128 From 41be7e0a77143e19e0a13d35d847b77c4bd35cae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Feb 2025 15:43:33 +0000 Subject: [PATCH 0158/1107] 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 4f680c2bf76e59a75562d42c4f95c14b25667871 Mon Sep 17 00:00:00 2001 From: Mitchell Pleune Date: Sun, 2 Feb 2025 18:30:38 +0000 Subject: [PATCH 0159/1107] glog: patch /usr/bin/true in tests Tests appear to use `/usr/bin/true` as a fake mailer, which causes an error in the check phase. This does not cause the tests to fail, and this is why the replace is a warn and not fail. Patching it nonetheless. --- pkgs/by-name/gl/glog/package.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gl/glog/package.nix b/pkgs/by-name/gl/glog/package.nix index ed30b55a60f4..e6b0ff6c7795 100644 --- a/pkgs/by-name/gl/glog/package.nix +++ b/pkgs/by-name/gl/glog/package.nix @@ -6,9 +6,10 @@ gflags, gtest, perl, + pkgsBuildHost, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: rec { pname = "glog"; version = "0.7.1"; @@ -19,6 +20,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-+nwWP6VBmhgU7GCPSEGUzvUSCc48wXME181WpJ5ABP4="; }; + postPatch = lib.optionalString finalAttrs.doCheck '' + substituteInPlace src/logging_unittest.cc \ + --replace-warn "/usr/bin/true" "${pkgsBuildHost.coreutils}/bin/true" + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ gtest ]; @@ -90,4 +96,4 @@ stdenv.mkDerivation rec { r-burns ]; }; -} +}) From c540331279eeb13074c6f7a09f83082f6dca112c Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 23 Jan 2025 00:22:22 +0800 Subject: [PATCH 0160/1107] buildPython*: make name-relaed attributes overridable via overrideAttrs Make name, pname and version overridable via overrideAttrs for Python packgaes constructed with buildPython*. --- .../interpreters/python/mk-python-derivation.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 3e0cbdcb4212..fe2e79a72ef4 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -120,8 +120,6 @@ let in { - name ? "${attrs.pname}-${attrs.version}", - # Build-time dependencies for the package nativeBuildInputs ? [ ], @@ -228,7 +226,7 @@ let throwMismatch = attrName: drv: let - myName = "'${namePrefix}${name}'"; + myName = "'${finalAttrs.name}'"; theirName = "'${drv.name}'"; optionalLocation = let @@ -280,7 +278,7 @@ let (cleanAttrs attrs) // { - name = namePrefix + name; + name = namePrefix + attrs.name or "${finalAttrs.pname}-${finalAttrs.version}"; nativeBuildInputs = [ From b61b33ae26ac672ca1709d6e3b76b5de92af307f Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Tue, 21 Jan 2025 22:02:39 +0100 Subject: [PATCH 0161/1107] kas: 4.5 -> 4.6 --- pkgs/by-name/ka/kas/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ka/kas/package.nix b/pkgs/by-name/ka/kas/package.nix index 8e9b74062240..dd1eedf31c5a 100644 --- a/pkgs/by-name/ka/kas/package.nix +++ b/pkgs/by-name/ka/kas/package.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "kas"; - version = "4.5"; + version = "4.6"; src = fetchFromGitHub { owner = "siemens"; repo = pname; tag = version; - hash = "sha256-J64yy2G8+5uT31Vpwhge5R7ZqId+NzE5ykXBHjc0qgQ="; + hash = "sha256-WSK9H3X6t4lgNk+PDGQgzYlheeclz9BjEQcHg7ktDZI="; }; propagatedBuildInputs = with python3.pkgs; [ From 0ae833b2e4ae453709ba60e9760449e10314fcca Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Mon, 3 Feb 2025 21:20:44 +0100 Subject: [PATCH 0162/1107] kas: 4.6 -> 4.7 --- pkgs/by-name/ka/kas/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ka/kas/package.nix b/pkgs/by-name/ka/kas/package.nix index dd1eedf31c5a..e5d9217e636f 100644 --- a/pkgs/by-name/ka/kas/package.nix +++ b/pkgs/by-name/ka/kas/package.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "kas"; - version = "4.6"; + version = "4.7"; src = fetchFromGitHub { owner = "siemens"; repo = pname; tag = version; - hash = "sha256-WSK9H3X6t4lgNk+PDGQgzYlheeclz9BjEQcHg7ktDZI="; + hash = "sha256-P2I3lLa8kuCORdlrwcswrWFwOA8lW2WL4Apv/2T7+f8="; }; propagatedBuildInputs = with python3.pkgs; [ From 83f30e8ab718a8ba6fa3728838e31baac845a79d Mon Sep 17 00:00:00 2001 From: Keenan Weaver Date: Mon, 3 Feb 2025 16:11:55 -0600 Subject: [PATCH 0163/1107] doomrunner: move to by-name --- .../default.nix => by-name/do/doomrunner/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{games/doom-ports/doomrunner/default.nix => by-name/do/doomrunner/package.nix} (100%) diff --git a/pkgs/games/doom-ports/doomrunner/default.nix b/pkgs/by-name/do/doomrunner/package.nix similarity index 100% rename from pkgs/games/doom-ports/doomrunner/default.nix rename to pkgs/by-name/do/doomrunner/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b27d548a1a4..4afc00c1e261 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16091,8 +16091,6 @@ with pkgs; doomseeker = qt5.callPackage ../games/doom-ports/doomseeker { }; - doomrunner = qt5.callPackage ../games/doom-ports/doomrunner { }; - enyo-launcher = libsForQt5.callPackage ../games/doom-ports/enyo-launcher { }; slade = callPackage ../games/doom-ports/slade { From 1d6fd5edf03d3b7d3e4eab7750e1be41477a9ea9 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 3 Feb 2025 22:31:28 +0000 Subject: [PATCH 0164/1107] audit: 4.0.2 -> 4.0.3 Changes: https://github.com/linux-audit/audit-userspace/releases/tag/v4.0.3 --- pkgs/by-name/au/audit/package.nix | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/au/audit/package.nix b/pkgs/by-name/au/audit/package.nix index f68c340e7c2c..0ad9ac9f055a 100644 --- a/pkgs/by-name/au/audit/package.nix +++ b/pkgs/by-name/au/audit/package.nix @@ -1,8 +1,7 @@ { lib, stdenv, - fetchurl, - fetchpatch, + fetchFromGitHub, autoreconfHook, bash, buildPackages, @@ -18,21 +17,15 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "audit"; - version = "4.0.2"; + version = "4.0.3"; - src = fetchurl { - url = "https://people.redhat.com/sgrubb/audit/audit-${finalAttrs.version}.tar.gz"; - hash = "sha256-1dG11Q7kotDReHW8aua9an1bNNlVfqhHo5+uxTH6qgo="; + src = fetchFromGitHub { + owner = "linux-audit"; + repo = "audit-userspace"; + tag = "v${finalAttrs.version}"; + hash = "sha256-+M5Nai/ruK16udsHcMwv1YoVQbCLKNuz/4FCXaLbiCw="; }; - patches = [ - (fetchpatch { - name = "static.patch"; - url = "https://github.com/linux-audit/audit-userspace/commit/a89664b45c30a853a6f80b19730984bd78432142.patch"; - hash = "sha256-HsaL9Bfo1MQ1JBKIS9ckNTapGk5eshjWWKh4M+e+Y9c="; - }) - ]; - postPatch = '' substituteInPlace bindings/swig/src/auditswig.i \ --replace-fail "/usr/include/linux/audit.h" \ From 4134fdc75cae752e1f5ea1843b67650c50ba618b Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Mon, 27 Jan 2025 02:01:28 +0800 Subject: [PATCH 0165/1107] buildPython*: always specify attributes catchConflicts and dontWrapPythonPrograms Always specify catchConflicts and dontWrapPythonPrograms. Make them overrideAttrs-overridable. --- .../interpreters/python/mk-python-derivation.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 3e0cbdcb4212..c3e986872ae4 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -100,8 +100,6 @@ let "nativeCheckInputs" "doCheck" "doInstallCheck" - "dontWrapPythonPrograms" - "catchConflicts" "pyproject" "format" "disabledTestPaths" @@ -282,6 +280,8 @@ let name = namePrefix + name; + inherit catchConflicts; + nativeBuildInputs = [ python @@ -289,7 +289,7 @@ let ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)? pythonRemoveTestsDirHook ] - ++ optionals (catchConflicts && !isBootstrapPackage && !isSetuptoolsDependency) [ + ++ optionals (finalAttrs.catchConflicts && !isBootstrapPackage && !isSetuptoolsDependency) [ # # 1. When building a package that is also part of the bootstrap chain, we # must ignore conflicts after installation, because there will be one with @@ -386,8 +386,10 @@ let nativeInstallCheckInputs = nativeCheckInputs; installCheckInputs = checkInputs; + inherit dontWrapPythonPrograms; + postFixup = - optionalString (!dontWrapPythonPrograms) '' + optionalString (!finalAttrs.dontWrapPythonPrograms) '' wrapPythonPrograms '' + attrs.postFixup or ""; From 9779a3e4ad55bc21f9273737535433c37c92b48f Mon Sep 17 00:00:00 2001 From: Keenan Weaver Date: Mon, 3 Feb 2025 17:48:13 -0600 Subject: [PATCH 0166/1107] doomrunner: 1.8.3 -> 1.9.0, cleanup --- pkgs/by-name/do/doomrunner/package.nix | 53 +++++++++----------------- 1 file changed, 17 insertions(+), 36 deletions(-) diff --git a/pkgs/by-name/do/doomrunner/package.nix b/pkgs/by-name/do/doomrunner/package.nix index c61055e190ab..2bb8b59e6a1a 100644 --- a/pkgs/by-name/do/doomrunner/package.nix +++ b/pkgs/by-name/do/doomrunner/package.nix @@ -1,30 +1,26 @@ { lib, stdenv, - qtbase, - qmake, - makeDesktopItem, - wrapQtAppsHook, - imagemagick, + kdePackages, fetchFromGitHub, }: stdenv.mkDerivation (finalAttrs: { pname = "doomrunner"; - version = "1.8.3"; + version = "1.9.0"; src = fetchFromGitHub { owner = "Youda008"; repo = "DoomRunner"; - rev = "v${finalAttrs.version}"; - hash = "sha256-NpNhl3cGXpxI8Qu4l8PjojCCXCZdGBEkBzz5XxLm/mY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-rCoMTPGjIFAcNncBGg1IMdUahzjH0WlFZBZS0UmNI/g="; }; - buildInputs = [ qtbase ]; + buildInputs = [ kdePackages.qtbase ]; + nativeBuildInputs = [ - qmake - wrapQtAppsHook - imagemagick + kdePackages.qmake + kdePackages.wrapQtAppsHook ]; makeFlags = [ @@ -32,35 +28,20 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = '' - mkdir -p $out/{bin,share/applications} + mkdir -p $out/{bin,share/applications,share/icons/hicolor/128x128/apps} + install -Dm444 $src/Install/XDG/DoomRunner.128x128.png $out/share/icons/hicolor/128x128/apps/DoomRunner.png + install -Dm444 $src/Install/XDG/DoomRunner.desktop $out/share/applications/DoomRunner.desktop install -Dm755 $out/usr/bin/DoomRunner $out/bin/DoomRunner - - for size in 16 24 32 48 64 128; do - mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - convert -background none -resize "$size"x"$size" $PWD/Resources/DoomRunner.ico -flatten $out/share/icons/hicolor/"$size"x"$size"/apps/DoomRunner.png - done; - - install -m 444 -D "$desktopItem/share/applications/"* -t $out/share/applications/ rm -rf $out/usr ''; - desktopItem = makeDesktopItem { - name = "DoomRunner"; - desktopName = "DoomRunner"; - comment = "Preset-oriented graphical launcher of ZDoom and derivatives"; - categories = [ "Game" ]; - icon = "DoomRunner"; - type = "Application"; - exec = "DoomRunner"; - }; - - meta = with lib; { - description = "Graphical launcher of ZDoom and derivatives"; + meta = { + description = "Preset-oriented graphical launcher of various ported Doom engines"; mainProgram = "DoomRunner"; - homepage = "https://github.com/Youda008/DoomRunner/"; + homepage = "https://github.com/Youda008/DoomRunner"; changelog = "https://github.com/Youda008/DoomRunner/blob/${finalAttrs.src.rev}/changelog.txt"; - license = licenses.gpl3Only; - platforms = platforms.linux; - maintainers = with maintainers; [ keenanweaver ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ keenanweaver ]; }; }) From 56f7b2149d9920a302cb81f66eae634c32d02926 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Feb 2025 00:57:44 +0000 Subject: [PATCH 0167/1107] liburing: 2.8 -> 2.9 --- pkgs/by-name/li/liburing/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/liburing/package.nix b/pkgs/by-name/li/liburing/package.nix index 744f05c3be22..ae3683b51b80 100644 --- a/pkgs/by-name/li/liburing/package.nix +++ b/pkgs/by-name/li/liburing/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "liburing"; - version = "2.8"; + version = "2.9"; src = fetchFromGitHub { owner = "axboe"; repo = "liburing"; tag = "liburing-${version}"; - hash = "sha256-10zmoMDzO41oNRVXE/6FzDGPVRVJTJTARVUmc1b7f+o="; + hash = "sha256-zOC53i52YJsH3AQIy4afjTGlX/IvVnW2QnYOppFxKiI="; }; separateDebugInfo = true; From 154f977ac6fd9fda34545f9117bc4724cac8d1bf Mon Sep 17 00:00:00 2001 From: DavHau Date: Tue, 4 Feb 2025 12:02:15 +0700 Subject: [PATCH 0168/1107] rust/hooks: move tests to hooks and add to passthru --- pkgs/build-support/rust/hooks/default.nix | 38 ++++++++++++++++++- .../rust/hooks/test}/default.nix | 10 ++--- .../test/example-rust-project}/Cargo.lock | 0 .../test/example-rust-project}/Cargo.toml | 0 .../test/example-rust-project}/src/hello.rs | 0 .../test/example-rust-project}/src/lib.rs | 0 .../test/example-rust-project}/src/main.rs | 0 .../example-rust-project}/tests/my_test.rs | 0 pkgs/test/default.nix | 2 +- 9 files changed, 43 insertions(+), 7 deletions(-) rename pkgs/{test/rust-hooks => build-support/rust/hooks/test}/default.nix (94%) rename pkgs/{test/rust-hooks/hello => build-support/rust/hooks/test/example-rust-project}/Cargo.lock (100%) rename pkgs/{test/rust-hooks/hello => build-support/rust/hooks/test/example-rust-project}/Cargo.toml (100%) rename pkgs/{test/rust-hooks/hello => build-support/rust/hooks/test/example-rust-project}/src/hello.rs (100%) rename pkgs/{test/rust-hooks/hello => build-support/rust/hooks/test/example-rust-project}/src/lib.rs (100%) rename pkgs/{test/rust-hooks/hello => build-support/rust/hooks/test/example-rust-project}/src/main.rs (100%) rename pkgs/{test/rust-hooks/hello => build-support/rust/hooks/test/example-rust-project}/tests/my_test.rs (100%) diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix index f8feb79000ab..76baa7d18168 100644 --- a/pkgs/build-support/rust/hooks/default.nix +++ b/pkgs/build-support/rust/hooks/default.nix @@ -17,8 +17,9 @@ # `target/` from which to copy the build artifacts. It is derived # from a stdenv platform (or a JSON file). target ? stdenv.targetPlatform.rust.cargoShortTarget, + tests, + pkgsCross, }: - { cargoBuildHook = callPackage ( { }: @@ -27,6 +28,13 @@ substitutions = { inherit (stdenv.targetPlatform.rust) rustcTarget; }; + passthru.tests = + { + test = tests.rust-hooks.cargoBuildHook; + } + // lib.optionalAttrs (stdenv.isLinux) { + testCross = pkgsCross.riscv64.tests.rust-hooks.cargoBuildHook; + }; } ./cargo-build-hook.sh ) { }; @@ -37,6 +45,13 @@ substitutions = { inherit (stdenv.targetPlatform.rust) rustcTarget; }; + passthru.tests = + { + test = tests.rust-hooks.cargoCheckHook; + } + // lib.optionalAttrs (stdenv.isLinux) { + testCross = pkgsCross.riscv64.tests.rust-hooks.cargoCheckHook; + }; } ./cargo-check-hook.sh ) { }; @@ -47,6 +62,13 @@ substitutions = { targetSubdirectory = target; }; + passthru.tests = + { + test = tests.rust-hooks.cargoInstallHook; + } + // lib.optionalAttrs (stdenv.isLinux) { + testCross = pkgsCross.riscv64.tests.rust-hooks.cargoInstallHook; + }; } ./cargo-install-hook.sh ) { }; @@ -58,6 +80,13 @@ substitutions = { inherit (stdenv.targetPlatform.rust) rustcTarget; }; + passthru.tests = + { + test = tests.rust-hooks.cargoNextestHook; + } + // lib.optionalAttrs (stdenv.isLinux) { + testCross = pkgsCross.riscv64.tests.rust-hooks.cargoNextestHook; + }; } ./cargo-nextest-hook.sh ) { }; @@ -86,6 +115,13 @@ }crt-static" ] ''; }; + passthru.tests = + { + test = tests.rust-hooks.cargoSetupHook; + } + // lib.optionalAttrs (stdenv.isLinux) { + testCross = pkgsCross.riscv64.tests.rust-hooks.cargoSetupHook; + }; } ./cargo-setup-hook.sh ) { }; diff --git a/pkgs/test/rust-hooks/default.nix b/pkgs/build-support/rust/hooks/test/default.nix similarity index 94% rename from pkgs/test/rust-hooks/default.nix rename to pkgs/build-support/rust/hooks/test/default.nix index edd2ee29e16d..774f0ee54860 100644 --- a/pkgs/test/rust-hooks/default.nix +++ b/pkgs/build-support/rust/hooks/test/default.nix @@ -11,7 +11,7 @@ */ cargoSetupHook = stdenv.mkDerivation { name = "test-cargoSetupHook"; - src = ./hello; + src = ./example-rust-project; cargoVendorDir = "hello"; nativeBuildInputs = [ rustPlatform.cargoSetupHook @@ -28,7 +28,7 @@ cargoBuildHook = stdenv.mkDerivation { name = "test-cargoBuildHook"; - src = ./hello; + src = ./example-rust-project; cargoBuildType = "release"; "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER" = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; @@ -44,7 +44,7 @@ cargoInstallHook = stdenv.mkDerivation { name = "test-cargoInstallHook"; - src = ./hello; + src = ./example-rust-project; cargoBuildType = "release"; "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER" = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; @@ -60,7 +60,7 @@ cargoCheckHook = stdenv.mkDerivation { name = "test-cargoCheckHook"; - src = ./hello; + src = ./example-rust-project; cargoBuildType = "release"; "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER" = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; @@ -82,7 +82,7 @@ cargoNextestHook = stdenv.mkDerivation { name = "test-cargoNextestHook"; - src = ./hello; + src = ./example-rust-project; cargoBuildType = "release"; "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER" = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; diff --git a/pkgs/test/rust-hooks/hello/Cargo.lock b/pkgs/build-support/rust/hooks/test/example-rust-project/Cargo.lock similarity index 100% rename from pkgs/test/rust-hooks/hello/Cargo.lock rename to pkgs/build-support/rust/hooks/test/example-rust-project/Cargo.lock diff --git a/pkgs/test/rust-hooks/hello/Cargo.toml b/pkgs/build-support/rust/hooks/test/example-rust-project/Cargo.toml similarity index 100% rename from pkgs/test/rust-hooks/hello/Cargo.toml rename to pkgs/build-support/rust/hooks/test/example-rust-project/Cargo.toml diff --git a/pkgs/test/rust-hooks/hello/src/hello.rs b/pkgs/build-support/rust/hooks/test/example-rust-project/src/hello.rs similarity index 100% rename from pkgs/test/rust-hooks/hello/src/hello.rs rename to pkgs/build-support/rust/hooks/test/example-rust-project/src/hello.rs diff --git a/pkgs/test/rust-hooks/hello/src/lib.rs b/pkgs/build-support/rust/hooks/test/example-rust-project/src/lib.rs similarity index 100% rename from pkgs/test/rust-hooks/hello/src/lib.rs rename to pkgs/build-support/rust/hooks/test/example-rust-project/src/lib.rs diff --git a/pkgs/test/rust-hooks/hello/src/main.rs b/pkgs/build-support/rust/hooks/test/example-rust-project/src/main.rs similarity index 100% rename from pkgs/test/rust-hooks/hello/src/main.rs rename to pkgs/build-support/rust/hooks/test/example-rust-project/src/main.rs diff --git a/pkgs/test/rust-hooks/hello/tests/my_test.rs b/pkgs/build-support/rust/hooks/test/example-rust-project/tests/my_test.rs similarity index 100% rename from pkgs/test/rust-hooks/hello/tests/my_test.rs rename to pkgs/build-support/rust/hooks/test/example-rust-project/tests/my_test.rs diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 7fc0943ba44e..dfeeef7fcf4f 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -211,5 +211,5 @@ with pkgs; build-environment-info = callPackage ./build-environment-info { }; - rust-hooks = recurseIntoAttrs (callPackages ./rust-hooks { }); + rust-hooks = recurseIntoAttrs (callPackages ../build-support/rust/hooks/test { }); } From a20a850011be50a2a26f4454ea9317fbe2a71dd6 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 16 Jan 2025 09:16:43 +0100 Subject: [PATCH 0169/1107] opencv: 4.9.0 -> 4.11.0 Diff: https://github.com/opencv/opencv/compare/4.9.0...4.11.0 Changelog: https://github.com/opencv/opencv/wiki/OpenCV-Change-Logs#version4110 --- pkgs/development/libraries/opencv/4.x.nix | 32 +++++++++++------------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index dc7883b27c88..f7b5fc367523 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -44,7 +44,7 @@ , enableCublas ? enableCuda , enableCudnn ? false # NOTE: CUDNN has a large impact on closure size so we disable it by default , enableCufft ? enableCuda -, cudaPackages ? {} +, cudaPackages ? cudaPackages , nvidia-optical-flow-sdk , enableLto ? true @@ -104,7 +104,7 @@ let inherit (lib.strings) cmakeBool cmakeFeature cmakeOptionType concatStrings concatStringsSep optionalString; inherit (lib.trivial) flip; - version = "4.9.0"; + version = "4.11.0"; # It's necessary to consistently use backendStdenv when building with CUDA # support, otherwise we get libstdc++ errors downstream @@ -114,22 +114,22 @@ let src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; - rev = version; - hash = "sha256-3qqu4xlRyMbPKHHTIT+iRRGtpFlcv0NU8GNZpgjdi6k="; + tag = version; + hash = "sha256-oiU4CwoMfuUbpDtujJVTShMCzc5GsnIaprC4DzkSzEM="; }; contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; - rev = version; - hash = "sha256-K74Ghk4uDqj4OWEzDxT2R3ERi+jkAWZszzezRenfuZ8="; + tag = version; + hash = "sha256-YNd96qFJ8SHBgDEEsoNps888myGZdELbbuYCae9pW3M="; }; testDataSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_extra"; - rev = version; - hash = "sha256-pActKi7aN5EOZq2Fpf5mALnZq71c037/R3Q6wJ4uCfQ="; + tag = version; + hash = "sha256-EqlGlemztYlk03MX1LAviArWT+OA3/qL3jfgHYC+SP8="; }; # Contrib must be built in order to enable Tesseract support: @@ -140,16 +140,16 @@ let src = fetchFromGitHub { owner = "opencv"; repo = "opencv_3rdparty"; - rev = "0cc4aa06bf2bef4b05d237c69a5a96b9cd0cb85a"; - hash = "sha256-/kHivOgCkY9YdcRRaVgytXal3ChE9xFfGAB0CfFO5ec="; + rev = "7f55c0c26be418d494615afca15218566775c725"; + hash = ""; } + "/ippicv"; files = let name = platform: "ippicv_2021.10.0_${platform}_20230919_general.tgz"; in if effectiveStdenv.hostPlatform.system == "x86_64-linux" then - { ${name "lnx_intel64"} = "606a19b207ebedfe42d59fd916cc4850"; } + { ${name "lnx_intel64"} = ""; } else if effectiveStdenv.hostPlatform.system == "i686-linux" then - { ${name "lnx_ia32"} = "ea08487b810baad2f68aca87b74a2db9"; } + { ${name "lnx_ia32"} = ""; } else if effectiveStdenv.hostPlatform.system == "x86_64-darwin" then - { ${name "mac_intel64"} = "14f01c5a4780bfae9dde9b0aaf5e56fc"; } + { ${name "mac_intel64"} = ""; } else throw "ICV is not available for this platform (or not yet supported by this package)"; dst = ".cache/ippicv"; @@ -210,10 +210,10 @@ let ade = rec { src = fetchurl { url = "https://github.com/opencv/ade/archive/${name}"; - hash = "sha256-WG/GudVpkO10kOJhoKXFMj672kggvyRYCIpezal3wcE="; + hash = "sha256-O+Yshk3N2Lkl6S9qWxWnoDmBngSms88IiCfwjPLMB78="; }; - name = "v0.1.2d.zip"; - md5 = "dbb095a8bf3008e91edbbf45d8d34885"; + name = "v0.1.2e.zip"; + md5 = ""; dst = ".cache/ade"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 381c4897a294..49d38e8e7fac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10133,8 +10133,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate; pythonPackages = python3Packages; - # TODO(@connorbaker): OpenCV 4.9 only supports up to CUDA 12.3. - cudaPackages = cudaPackages_12_3; # TODO: LTO does not work. # https://github.com/NixOS/nixpkgs/issues/343123 enableLto = false; From c95bddf8dca0ddd9b4236568480f7b968f61246b Mon Sep 17 00:00:00 2001 From: ners Date: Wed, 29 Jan 2025 21:04:34 +0100 Subject: [PATCH 0170/1107] cups-brother-dcp1610wlpr: init at 3.0.1-1 --- .../cu/cups-brother-dcp1610wlpr/package.nix | 122 ++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100644 pkgs/by-name/cu/cups-brother-dcp1610wlpr/package.nix diff --git a/pkgs/by-name/cu/cups-brother-dcp1610wlpr/package.nix b/pkgs/by-name/cu/cups-brother-dcp1610wlpr/package.nix new file mode 100644 index 000000000000..7186712ef7b3 --- /dev/null +++ b/pkgs/by-name/cu/cups-brother-dcp1610wlpr/package.nix @@ -0,0 +1,122 @@ +{ + lib, + stdenvNoCC, + pkgsi686Linux, + fetchurl, + cups, + dpkg, + gnused, + makeWrapper, + ghostscript, + file, + a2ps, + coreutils, + gawk, +}: + +let + version = "3.0.1-1"; + cupsdeb = fetchurl { + url = "https://download.brother.com/welcome/dlf101532/dcp1610wcupswrapper-${version}.i386.deb"; + hash = "sha256-ZgE2o/xU11+MzSnBYakXZE5m+Qa85/KIo31wKWAmsGY="; + }; + lprdeb = fetchurl { + url = "https://download.brother.com/welcome/dlf101533/dcp1610wlpr-${version}.i386.deb"; + hash = "sha256-hi0b23DgSXVT/fNA+Y2aJOdopt7SwjUyYyev81boGlg="; + }; +in +stdenvNoCC.mkDerivation { + pname = "cups-brother-dcp1610wlpr"; + inherit version; + + srcs = [ + cupsdeb + lprdeb + ]; + + nativeBuildInputs = [ + makeWrapper + ]; + + buildInputs = [ + cups + ghostscript + dpkg + a2ps + ]; + + unpackPhase = '' + runHook preUnpack + + dpkg-deb -x ${lprdeb} $out + dpkg-deb -x ${cupsdeb} $out + + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/cups/filter $out/share/cups/model + ln -s $out/opt/brother/Printers/DCP1610W/cupswrapper/brother_lpdwrapper_DCP1610W $out/lib/cups/filter/brother_lpdwrapper_DCP1610W + ln -s $out/opt/brother/Printers/DCP1610W/cupswrapper/brother-DCP1610W-cups-en.ppd $out/share/cups/model/ + ln -s $out/opt/brother/Printers/DCP1610W/cupswrapper/brcupsconfig4 $out/lib/cups/filter/brcupsconfig4 + + runHook postInstall + ''; + + postFixup = '' + substituteInPlace $out/opt/brother/Printers/DCP1610W/lpd/filter_DCP1610W \ + --replace-fail /opt "$out/opt" + + sed -i '/GHOST_SCRIPT=/c\GHOST_SCRIPT=gs' $out/opt/brother/Printers/DCP1610W/lpd/psconvert2 + + patchelf --set-interpreter ${pkgsi686Linux.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/DCP1610W/lpd/brprintconflsr3 + patchelf --set-interpreter ${pkgsi686Linux.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/DCP1610W/lpd/rawtobr3 + patchelf --set-interpreter ${pkgsi686Linux.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/DCP1610W/inf/braddprinter + + wrapProgram $out/opt/brother/Printers/DCP1610W/lpd/psconvert2 \ + --prefix PATH ":" ${ + lib.makeBinPath [ + gnused + coreutils + gawk + ] + } + + wrapProgram $out/opt/brother/Printers/DCP1610W/lpd/filter_DCP1610W \ + --prefix PATH ":" ${ + lib.makeBinPath [ + ghostscript + a2ps + file + gnused + coreutils + ] + } + + substituteInPlace $out/opt/brother/Printers/DCP1610W/cupswrapper/brother_lpdwrapper_DCP1610W \ + --replace-fail /opt "$out/opt" + + wrapProgram $out/opt/brother/Printers/DCP1610W/cupswrapper/brother_lpdwrapper_DCP1610W \ + --prefix PATH ":" ${ + lib.makeBinPath [ + gnused + coreutils + gawk + ] + } + ''; + + meta = { + homepage = "http://www.brother.com/"; + description = "Brother DCP-1610W printer driver"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfreeRedistributable; + platforms = [ + "x86_64-linux" + "i686-linux" + ]; + downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=nz&lang=en&prod=dcp1610w_eu_as&os=128"; + }; +} From 68d77d536567b43c89f74416d1267f2bc0068f7e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Feb 2025 13:37:17 +0000 Subject: [PATCH 0171/1107] hwdata: 0.391 -> 0.392 --- pkgs/by-name/hw/hwdata/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hw/hwdata/package.nix b/pkgs/by-name/hw/hwdata/package.nix index 748727e61fe7..fd1125591b87 100644 --- a/pkgs/by-name/hw/hwdata/package.nix +++ b/pkgs/by-name/hw/hwdata/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "hwdata"; - version = "0.391"; + version = "0.392"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - hash = "sha256-GF3UCx/CE4ByQTsDeRFqlBUoKwGjmTi+7/JE65U7H+o="; + hash = "sha256-DjtPoPZZwFmVRZTOG4A+2KXI6zw68QEwq0iFRoV+5c4="; }; configureFlags = [ "--datadir=${placeholder "out"}/share" ]; From e958740516dbe011823a861a62b16ff6afcf5e22 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 4 Feb 2025 15:38:43 +0200 Subject: [PATCH 0172/1107] python312Packages.pythran: 0.16.1 -> 0.17.0 Diff: https://github.com/serge-sans-paille/pythran/compare/refs/tags/0.16.1...0.17.0 Changelog: https://github.com/serge-sans-paille/pythran/blob/refs/tags/0.17.0/Changelog --- pkgs/development/python-modules/pythran/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pythran/default.nix b/pkgs/development/python-modules/pythran/default.nix index 711c160d1195..c8873f5d3eed 100644 --- a/pkgs/development/python-modules/pythran/default.nix +++ b/pkgs/development/python-modules/pythran/default.nix @@ -25,22 +25,17 @@ let in buildPythonPackage rec { pname = "pythran"; - version = "0.16.1"; + version = "0.17.0"; pyproject = true; src = fetchFromGitHub { owner = "serge-sans-paille"; repo = "pythran"; tag = version; - hash = "sha256-wiQmShniYZmB8hk/MC5FWFf1s5vqEHiYBkXTo4OeZ+E="; + hash = "sha256-JG1FH2UAekFF9Vv7wCn/L7gJlVKv5AxqgGrj8pejqeY="; }; patches = [ - (fetchpatch2 { - name = "bump-gast-to-0.6.0.patch"; - url = "https://github.com/serge-sans-paille/pythran/commit/840a0e706ec39963aec6bcd1f118bf33177c20b4.patch"; - hash = "sha256-FHGXWuAX/Nmn6uEfQgAXfUxIdApDwSfHHtOStxyme/0="; - }) # Hardcode path to mp library (substituteAll { src = ./0001-hardcode-path-to-libgomp.patch; From cfd4f2c85527d644d7bca7924e83e03bff3f9eca Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 4 Feb 2025 16:11:22 +0100 Subject: [PATCH 0173/1107] python3Packages.mako: backport test fix Test has been changed to avoid relying on floats, so no need to disable it any more. --- .../python-modules/mako/default.nix | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/mako/default.nix b/pkgs/development/python-modules/mako/default.nix index caeda4a13dd3..4c2f7ae8c5f3 100644 --- a/pkgs/development/python-modules/mako/default.nix +++ b/pkgs/development/python-modules/mako/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + fetchpatch, isPyPy, # build-system @@ -36,6 +37,14 @@ buildPythonPackage rec { hash = "sha256-7KttExqHxv//q8ol7eOFIrgRHbQySQTvL7Rd9VooX0Y="; }; + patches = [ + (fetchpatch { + name = "float-precision.patch"; + url = "https://github.com/sqlalchemy/mako/commit/188d5431a5c93b937da03e70c4c2c8c42cd9a502.patch"; + hash = "sha256-/ROS6WkSqYXJsX6o1AejUg/faS3lUAimrRJzS74Bwws="; + }) + ]; + build-system = [ setuptools ]; dependencies = [ markupsafe ]; @@ -51,18 +60,15 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); - disabledTests = - lib.optionals isPyPy [ - # https://github.com/sqlalchemy/mako/issues/315 - "test_alternating_file_names" - # https://github.com/sqlalchemy/mako/issues/238 - "test_file_success" - "test_stdin_success" - # fails on pypy2.7 - "test_bytestring_passthru" - ] - # https://github.com/sqlalchemy/mako/issues/408 - ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "test_future_import"; + disabledTests = lib.optionals isPyPy [ + # https://github.com/sqlalchemy/mako/issues/315 + "test_alternating_file_names" + # https://github.com/sqlalchemy/mako/issues/238 + "test_file_success" + "test_stdin_success" + # fails on pypy2.7 + "test_bytestring_passthru" + ]; meta = with lib; { description = "Super-fast templating language"; From 83ccb86861153e02d6301f2f6093488c8409c234 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 4 Feb 2025 10:56:24 +0100 Subject: [PATCH 0174/1107] libtiff: fix static (properly) Fixing this was a very confusing time, and the wrong version of the patch ended up getting applied, which did not actually fix static. Swap it out for the accepted upstream patch. --- pkgs/by-name/li/libtiff/package.nix | 8 ++++++- pkgs/by-name/li/libtiff/static.patch | 36 ---------------------------- 2 files changed, 7 insertions(+), 37 deletions(-) delete mode 100644 pkgs/by-name/li/libtiff/static.patch diff --git a/pkgs/by-name/li/libtiff/package.nix b/pkgs/by-name/li/libtiff/package.nix index 03564fced802..49d39705ef79 100644 --- a/pkgs/by-name/li/libtiff/package.nix +++ b/pkgs/by-name/li/libtiff/package.nix @@ -43,7 +43,13 @@ stdenv.mkDerivation (finalAttrs: { # libc++abi 11 has an `#include `, this picks up files name # `version` in the project's include paths ./rename-version.patch - ./static.patch + + # https://gitlab.com/libtiff/libtiff/-/merge_requests/685 + (fetchpatch { + name = "static.patch"; + url = "https://gitlab.com/libtiff/libtiff/-/commit/e6f3d60187a699507d6c85c5c63a8f258d8b8ebc.patch"; + hash = "sha256-TZE7nyOPojxnR9/jiZbv2LgKS2Yz+Db9lbLgeefrQsc="; + }) ]; postPatch = '' diff --git a/pkgs/by-name/li/libtiff/static.patch b/pkgs/by-name/li/libtiff/static.patch deleted file mode 100644 index 0eecc5d149b8..000000000000 --- a/pkgs/by-name/li/libtiff/static.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ed5fcc718075021fe670daee6dd426a5e12d6842 Mon Sep 17 00:00:00 2001 -From: Alyssa Ross -Date: Thu, 19 Dec 2024 16:51:51 +0100 -Subject: [PATCH] Fix name of Lerc package - -Lerc calls its CMake package "Lerc", not "LERC". This meant that, -even if building libtiff with -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON, -Lerc's CMake files wouldn't be used as intended. - -Link: https://gitlab.com/libtiff/libtiff/-/merge_requests/686 ---- - cmake/{FindLERC.cmake => FindLerc.cmake} | 0 - cmake/LERCCodec.cmake | 2 +- - 2 files changed, 1 insertion(+), 1 deletion(-) - rename cmake/{FindLERC.cmake => FindLerc.cmake} (100%) - -diff --git a/cmake/FindLERC.cmake b/cmake/FindLerc.cmake -similarity index 100% -rename from cmake/FindLERC.cmake -rename to cmake/FindLerc.cmake -diff --git a/cmake/LERCCodec.cmake b/cmake/LERCCodec.cmake -index 54504ca1..237f8d7e 100644 ---- a/cmake/LERCCodec.cmake -+++ b/cmake/LERCCodec.cmake -@@ -25,7 +25,7 @@ - - # libLerc - set(LERC_SUPPORT FALSE) --find_package(LERC) -+find_package(Lerc) - option(lerc "use libLerc (required for LERC compression)" ${LERC_FOUND}) - if (lerc AND LERC_FOUND AND ZIP_SUPPORT) - set(LERC_SUPPORT TRUE) --- -2.47.0 - From bc6ffb69f03c16a739711086daa23c01e80232fb Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 4 Feb 2025 16:45:19 +0100 Subject: [PATCH 0175/1107] haskell.compiler: unify logic determining whether NCG is available This change only consolidates the logic for the source built GHCs which have used the same logic (at least as long as you'd only use the respective supported version ranges of the expressions as inputs). --- pkgs/development/compilers/ghc/8.10.7.nix | 9 ++++++--- pkgs/development/compilers/ghc/common-hadrian.nix | 6 +----- pkgs/development/compilers/ghc/common-have-ncg.nix | 14 ++++++++++++++ .../compilers/ghc/common-make-native-bignum.nix | 9 ++------- 4 files changed, 23 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/compilers/ghc/common-have-ncg.nix diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix index c0d9e2b371f7..ed14b48743b0 100644 --- a/pkgs/development/compilers/ghc/8.10.7.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -1,3 +1,7 @@ +let + version = "8.10.7"; +in + { lib, stdenv, @@ -32,8 +36,7 @@ libffi ? null, libffi_3_3 ? null, - useLLVM ? - !(stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isPower || stdenv.targetPlatform.isSparc), + useLLVM ? !(import ./common-have-ncg.nix { inherit lib stdenv version; }), # LLVM is conceptually a run-time-only dependency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. @@ -271,7 +274,7 @@ in stdenv.mkDerivation ( rec { - version = "8.10.7"; + inherit version; pname = "${targetPrefix}ghc${variantSuffix}"; src = fetchurl { diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 3a6ea450f37e..7974cba0824c 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -39,11 +39,7 @@ , # GHC can be built with system libffi or a bundled one. libffi ? null -, useLLVM ? !(stdenv.targetPlatform.isx86 - || stdenv.targetPlatform.isPower - || stdenv.targetPlatform.isAarch64 - || stdenv.targetPlatform.isGhcjs - || (lib.versionAtLeast version "9.12" && stdenv.targetPlatform.isRiscV64)) +, useLLVM ? !(import ./common-have-ncg.nix { inherit lib stdenv version; }) , # LLVM is conceptually a run-time-only dependency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. diff --git a/pkgs/development/compilers/ghc/common-have-ncg.nix b/pkgs/development/compilers/ghc/common-have-ncg.nix new file mode 100644 index 000000000000..1b92a0700ac2 --- /dev/null +++ b/pkgs/development/compilers/ghc/common-have-ncg.nix @@ -0,0 +1,14 @@ +# Determines whether the Native Code Generation (NCG) backend of the given +# GHC `version` is supported for compiling to `stdenv.targetPlatform`. +{ + version, + stdenv, + lib, +}: + +stdenv.targetPlatform.isx86 +|| stdenv.targetPlatform.isPower +|| (lib.versionOlder version "9.4" && stdenv.targetPlatform.isSparc) +|| (lib.versionAtLeast version "9.2" && stdenv.targetPlatform.isAarch64) +|| (lib.versionAtLeast version "9.6" && stdenv.targetPlatform.isGhcjs) +|| (lib.versionAtLeast version "9.12" && stdenv.targetPlatform.isRiscV64) diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix index 412e8d7d4671..b204a1c70363 100644 --- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix +++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix @@ -34,13 +34,8 @@ # GHC can be built with system libffi or a bundled one. libffi ? null, - useLLVM ? - !( - stdenv.targetPlatform.isx86 - || stdenv.targetPlatform.isPower - || (lib.versionOlder version "9.4" && stdenv.targetPlatform.isSparc) - || (lib.versionAtLeast version "9.2" && stdenv.targetPlatform.isAarch64) - ), + useLLVM ? !(import ./common-have-ncg.nix { inherit lib stdenv version; }), + # LLVM is conceptually a run-time-only dependency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. From d0d7d525be063af2a34f1897cb36fc6aed828a6e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 4 Feb 2025 16:48:54 +0100 Subject: [PATCH 0176/1107] haskell.compiler.ghc*Binary: use common NCG/useLLVM logic See bc6ffb69f03c16a739711086daa23c01e80232fb for context. --- pkgs/development/compilers/ghc/8.10.7-binary.nix | 2 +- pkgs/development/compilers/ghc/9.2.4-binary.nix | 7 +------ pkgs/development/compilers/ghc/9.6.3-binary.nix | 7 +------ 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.10.7-binary.nix b/pkgs/development/compilers/ghc/8.10.7-binary.nix index c4a20e7af4bc..6137777f2747 100644 --- a/pkgs/development/compilers/ghc/8.10.7-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.7-binary.nix @@ -204,7 +204,7 @@ let ghcBinDists.${distSetName}.${stdenv.hostPlatform.system} or (throw "cannot bootstrap GHC on this platform ('${stdenv.hostPlatform.system}' with libc '${distSetName}')"); - useLLVM = !stdenv.targetPlatform.isx86; + useLLVM = !(import ./common-have-ncg.nix { inherit lib stdenv version; }); libPath = lib.makeLibraryPath ( # Add arch-specific libraries. diff --git a/pkgs/development/compilers/ghc/9.2.4-binary.nix b/pkgs/development/compilers/ghc/9.2.4-binary.nix index c5a704e8ad86..e5e21a91b611 100644 --- a/pkgs/development/compilers/ghc/9.2.4-binary.nix +++ b/pkgs/development/compilers/ghc/9.2.4-binary.nix @@ -193,12 +193,7 @@ let ) binDistUsed.archSpecificLibraries )).nixPackage; - # GHC has other native backends (like PowerPC), but here only the ones - # we ship bindists for matter. - useLLVM = - !( - stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin) - ); + useLLVM = !(import ./common-have-ncg.nix { inherit lib stdenv version; }); libPath = lib.makeLibraryPath ( # Add arch-specific libraries. diff --git a/pkgs/development/compilers/ghc/9.6.3-binary.nix b/pkgs/development/compilers/ghc/9.6.3-binary.nix index ef4828814854..e392fdd02f5b 100644 --- a/pkgs/development/compilers/ghc/9.6.3-binary.nix +++ b/pkgs/development/compilers/ghc/9.6.3-binary.nix @@ -192,12 +192,7 @@ let ) binDistUsed.archSpecificLibraries )).nixPackage; - # GHC has other native backends (like PowerPC), but here only the ones - # we ship bindists for matter. - useLLVM = - !( - stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin) - ); + useLLVM = !(import ./common-have-ncg.nix { inherit lib stdenv version; }); libPath = lib.makeLibraryPath ( # Add arch-specific libraries. From 6bd584df1eea99301ed028912b821cc3158cf66f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Feb 2025 20:41:18 +0000 Subject: [PATCH 0177/1107] cowsql: 1.15.6 -> 1.15.8 --- pkgs/by-name/co/cowsql/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/cowsql/package.nix b/pkgs/by-name/co/cowsql/package.nix index ed182bacb7b8..ca9dfb496065 100644 --- a/pkgs/by-name/co/cowsql/package.nix +++ b/pkgs/by-name/co/cowsql/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cowsql"; - version = "1.15.6"; + version = "1.15.8"; src = fetchFromGitHub { owner = "cowsql"; repo = "cowsql"; tag = "v${finalAttrs.version}"; - hash = "sha256-cr6AT/n2/6DuGK53JvGLwCkMi4+fS128qxj3X9SJYuw="; + hash = "sha256-rwTa9owtnkyI9OpUKLk6V7WbAkqlYucpGzPnHHvKW/A="; }; nativeBuildInputs = [ From dab4611ba4715e8854dde6c0187fc50ed2b3847b Mon Sep 17 00:00:00 2001 From: Mitchell Pleune Date: Sat, 1 Feb 2025 05:01:46 +0000 Subject: [PATCH 0178/1107] libuv: disable thread_affinity test fixes NixOS/nixpkgs#378438 --- pkgs/development/libraries/libuv/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 421d2d07e934..37e6c5a90b12 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: { "getaddrinfo_fail" "getaddrinfo_fail_sync" "tcp_connect6_link_local" + "thread_affinity" # else "test must be run with cpu 0 affinity" when affinity is set "threadpool_multiple_event_loops" # times out on slow machines "get_passwd" # passed on NixOS but failed on other Linuxes "tcp_writealot" From 3048cdc6db45d44dc33852175dffb71959bfb3fc Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 4 Feb 2025 22:18:47 +0000 Subject: [PATCH 0179/1107] vcmi: 1.6.4 -> 1.6.5 Changes: https://github.com/vcmi/vcmi/blob/1.6.5/ChangeLog.md --- pkgs/games/vcmi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/vcmi/default.nix b/pkgs/games/vcmi/default.nix index bb5db2ae9644..a1fc7168f0fd 100644 --- a/pkgs/games/vcmi/default.nix +++ b/pkgs/games/vcmi/default.nix @@ -29,14 +29,14 @@ stdenv.mkDerivation rec { pname = "vcmi"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "vcmi"; repo = "vcmi"; rev = version; fetchSubmodules = true; - hash = "sha256-1GNoHNPeSeVGfK9mgXiuaMVxwnAM0n26V56pk5IHEs4="; + hash = "sha256-VUwCo9OTTI8tsX7P1voq/1VVGrNxYM+OXkWhXWqoT60="; }; nativeBuildInputs = [ From 899caf80aade72824f83e0398987df2ad71aff16 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Feb 2025 22:25:07 +0100 Subject: [PATCH 0180/1107] go_1_23: 1.23.5 -> 1.23.6 Signed-off-by: Paul Meyer --- pkgs/development/compilers/go/1.23.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix index 76a3e8548681..514cf806be38 100644 --- a/pkgs/development/compilers/go/1.23.nix +++ b/pkgs/development/compilers/go/1.23.nix @@ -49,11 +49,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.23.5"; + version = "1.23.6"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-pvP0u9PmvdYm95tmjyEvu1ZJ2vdQhPt5tnigrk2XQjs="; + hash = "sha256-A5xbBOZSedrO7opvcecL0Fz1uAF4K293xuGeLtBREiI="; }; strictDeps = true; From 05a564a0d0ee7c9d28988534cba52435ec0f6ffb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Feb 2025 23:35:43 +0100 Subject: [PATCH 0181/1107] cpython: add isPy313, isPy314 helpers --- pkgs/development/interpreters/python/passthrufun.nix | 2 ++ pkgs/development/interpreters/python/python-packages-base.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/development/interpreters/python/passthrufun.nix b/pkgs/development/interpreters/python/passthrufun.nix index fde2bab1e86c..d4e20aa24fc9 100644 --- a/pkgs/development/interpreters/python/passthrufun.nix +++ b/pkgs/development/interpreters/python/passthrufun.nix @@ -119,6 +119,8 @@ rec { isPy310 = pythonVersion == "3.10"; isPy311 = pythonVersion == "3.11"; isPy312 = pythonVersion == "3.12"; + isPy313 = pythonVersion == "3.13"; + isPy314 = pythonVersion == "3.14"; isPy2 = lib.strings.substring 0 1 pythonVersion == "2"; isPy3 = lib.strings.substring 0 1 pythonVersion == "3"; isPy3k = isPy3; diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix index 19c230a0b94e..66a7c823fecc 100644 --- a/pkgs/development/interpreters/python/python-packages-base.nix +++ b/pkgs/development/interpreters/python/python-packages-base.nix @@ -126,6 +126,8 @@ in isPy310 isPy311 isPy312 + isPy313 + isPy314 isPy3k isPyPy pythonAtLeast From 0690e42a7c688c0077c5d335a68672d66a2c715e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Feb 2025 23:41:31 +0100 Subject: [PATCH 0182/1107] python313: 3.13.1 -> 3.13.2 https://docs.python.org/release/3.13.2/whatsnew/changelog.html --- pkgs/development/interpreters/python/cpython/default.nix | 3 ++- pkgs/development/interpreters/python/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 3b249843f4f1..e285959f2378 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -252,6 +252,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { # (since it will do a futile invocation of gcc (!) to find # libuuid, slowing down program startup a lot). noldconfigPatch + ] ++ optionals (!isPy313) [ # https://www.cve.org/CVERecord?id=CVE-2025-0938 ./CVE-2025-0938.patch ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isFreeBSD) [ @@ -296,7 +297,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { ] ++ optionals (pythonOlder "3.12") [ # https://github.com/python/cpython/issues/90656 ./loongarch-support.patch - ] ++ optionals (pythonAtLeast "3.12" && pythonOlder "3.14") [ + ] ++ optionals (isPy312 || isPy314) [ ./3.12/CVE-2024-12254.patch ] ++ optionals (pythonAtLeast "3.11" && pythonOlder "3.13") [ # backport fix for https://github.com/python/cpython/issues/95855 diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 582c37cd2c79..55c662742242 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -87,10 +87,10 @@ in { sourceVersion = { major = "3"; minor = "13"; - patch = "1"; + patch = "2"; suffix = ""; }; - hash = "sha256-nPlCe+6eIkLjh33Q9rZBwYU8pGHznWUDziYKWcgL8Nk="; + hash = "sha256-2YS8xXzWfKqyb33vQuUjscAVu8XcB4Ns9PC2P6FZ61Y="; inherit passthruFun; }; From 5628a3fb23c0485ee6cc553e4e9916ff7b6354b0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Feb 2025 23:53:44 +0100 Subject: [PATCH 0183/1107] python312: 3.12.8 -> 3.12.9 https://docs.python.org/release/3.12.9/whatsnew/changelog.html --- pkgs/development/interpreters/python/cpython/default.nix | 4 ++-- pkgs/development/interpreters/python/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index e285959f2378..d160030a52cb 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -252,7 +252,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { # (since it will do a futile invocation of gcc (!) to find # libuuid, slowing down program startup a lot). noldconfigPatch - ] ++ optionals (!isPy313) [ + ] ++ optionals (!isPy312 && !isPy313) [ # https://www.cve.org/CVERecord?id=CVE-2025-0938 ./CVE-2025-0938.patch ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isFreeBSD) [ @@ -297,7 +297,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { ] ++ optionals (pythonOlder "3.12") [ # https://github.com/python/cpython/issues/90656 ./loongarch-support.patch - ] ++ optionals (isPy312 || isPy314) [ + ] ++ optionals isPy314 [ ./3.12/CVE-2024-12254.patch ] ++ optionals (pythonAtLeast "3.11" && pythonOlder "3.13") [ # backport fix for https://github.com/python/cpython/issues/95855 diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 55c662742242..7c0036ea1b1e 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -20,10 +20,10 @@ sourceVersion = { major = "3"; minor = "12"; - patch = "8"; + patch = "9"; suffix = ""; }; - hash = "sha256-yQkVe7JewRTlhpEkzCqcSk1MHpV8pP9VPx7caSEBFU4="; + hash = "sha256-ciCDXZ+Qs3wAbphCqN/0WAqspDGGdPlHMCuNKPP4ERI="; }; }; From 10053c5dfd67af52347bee51643d8664e28a8f0a Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 4 Feb 2025 12:23:11 +0100 Subject: [PATCH 0184/1107] bash: Deprecate unnecessary withDocs flag Bash is distributing the rendered docs with the source, so no build tools are used or needed anymore. This was not the case originally, see dd91141a06860bea45b0e4a4a33f4c3980965325 --- pkgs/shells/bash/5.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix index 9ca6e396e676..ac172d6da111 100644 --- a/pkgs/shells/bash/5.nix +++ b/pkgs/shells/bash/5.nix @@ -9,8 +9,7 @@ # patch for cygwin requires readline support , interactive ? stdenv.hostPlatform.isCygwin , readline -, withDocs ? false -, texinfo +, withDocs ? null , forFHSEnv ? false , pkgsStatic @@ -22,6 +21,9 @@ let inherit sha256; }); in +lib.warnIf (withDocs != null) '' + bash: `.override { withDocs = true; }` is deprecated, the docs are always included. +'' stdenv.mkDerivation rec { pname = "bash${lib.optionalString interactive "-interactive"}"; version = "5.2${patch_suffix}"; @@ -101,7 +103,6 @@ stdenv.mkDerivation rec { # Note: Bison is needed because the patches above modify parse.y. depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook bison ] - ++ lib.optional withDocs texinfo ++ lib.optional stdenv.hostPlatform.isDarwin stdenv.cc.bintools; buildInputs = lib.optional interactive readline; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30f86fc3ec11..4a201065591c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5592,11 +5592,9 @@ with pkgs; # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed bashInteractive = callPackage ../shells/bash/5.nix { interactive = true; - withDocs = true; }; bashInteractiveFHS = callPackage ../shells/bash/5.nix { interactive = true; - withDocs = true; forFHSEnv = true; }; From e3491c9e40bea9c51414a2c3e81e2854e42fe719 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 4 Feb 2025 13:04:31 +0100 Subject: [PATCH 0185/1107] bash: Make interactive the default The status quo of `bash` not being interactive is frustrating for many users, because trying to use it interactively is just messed up, and `bashInteractive` is not intuitive and barely discoverable. This was brought to my (and many others) attention by @stahnma in his [talk at CfgMgmtCamp 2025](https://cfp.cfgmgmtcamp.org/ghent2025/talk/YUVUTN/), where he highlighted this as one of the frustrations he ran into when learning Nix. Why this is fine: - No reason for not making interactive the default was given in the original commit (6c6ff6f36ff26932aa730875bd237c8e37210f0e), but probably it was due to the increase in closure size - The closure size only increases by 6.9MiB (19.5%) today, with the added dependency on the store paths for readline and ncurses, which are needed on systems in almost all cases anyways - If somebody really needs to get a more minimal system, they can use the newly-introduced `bashNonInteractive` instead now - Though to apply it consistently, they'll need to do that in an overlay like ``` final: prev: { bash = self.bashNonInteractive; } ``` Or alternatively using the `system.replaceDependencies.replacements` NixOS option approach. While there's also other such `*Interactive` packages that could use the same treatment, `bash` is a great start. This was already attempted before in https://github.com/NixOS/nixpkgs/pull/151227, but was not continued for unknown reason. To avoid stdenv becoming bigger, all uses of bash in the (working) stdenv's are changed to the explicitly non-interactive version here. This commit will however still cause a mass rebuild for all packages (and reverse deps) making use of the default bash. --- pkgs/by-name/gr/groff/package.nix | 4 ++-- pkgs/by-name/li/libxo/package.nix | 4 ++-- .../interpreters/python/cpython/default.nix | 8 +++---- .../development/libraries/gettext/default.nix | 4 ++-- .../development/tools/misc/texinfo/common.nix | 4 ++-- .../tools/misc/texinfo/packages.nix | 4 ++-- pkgs/shells/bash/5.nix | 3 +-- pkgs/stdenv/darwin/default.nix | 22 +++++++++---------- pkgs/stdenv/freebsd/default.nix | 8 +++---- pkgs/stdenv/generic/common-path.nix | 2 +- pkgs/stdenv/linux/default.nix | 6 ++--- pkgs/tools/compression/zstd/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 15 +++++++------ 13 files changed, 44 insertions(+), 44 deletions(-) diff --git a/pkgs/by-name/gr/groff/package.nix b/pkgs/by-name/gr/groff/package.nix index bcc71885fd87..fe25d58d66ec 100644 --- a/pkgs/by-name/gr/groff/package.nix +++ b/pkgs/by-name/gr/groff/package.nix @@ -22,7 +22,7 @@ pkg-config, texinfo, bison, - bash, + bashNonInteractive, }: stdenv.mkDerivation rec { @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl - bash + bashNonInteractive ] ++ lib.optionals enableGhostscript [ ghostscript diff --git a/pkgs/by-name/li/libxo/package.nix b/pkgs/by-name/li/libxo/package.nix index 8e20b8edc7b1..f8747a754e0e 100644 --- a/pkgs/by-name/li/libxo/package.nix +++ b/pkgs/by-name/li/libxo/package.nix @@ -1,7 +1,7 @@ { lib, autoreconfHook, - bash, + bashNonInteractive, libtool, fetchFromGitHub, nix-update-script, @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ autoreconfHook # For patchShebangs in postInstall - bash + bashNonInteractive perl ]; diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index d0cb05268d43..917048ca3e94 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -24,7 +24,7 @@ , zlib # platform-specific dependencies -, bash +, bashNonInteractive , darwin , windows @@ -235,7 +235,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { inherit nativeBuildInputs; buildInputs = lib.optionals (!stdenv.hostPlatform.isWindows) [ - bash # only required for patchShebangs + bashNonInteractive # only required for patchShebangs ] ++ buildInputs; prePatch = optionalString stdenv.hostPlatform.isDarwin '' @@ -329,7 +329,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { postPatch = optionalString (!stdenv.hostPlatform.isWindows) '' substituteInPlace Lib/subprocess.py \ - --replace-fail "'/bin/sh'" "'${bash}/bin/sh'" + --replace-fail "'/bin/sh'" "'${bashNonInteractive}/bin/sh'" '' + optionalString mimetypesSupport '' substituteInPlace Lib/mimetypes.py \ --replace-fail "@mime-types@" "${mailcap}" @@ -611,7 +611,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # Ensure we don't have references to build-time packages. # These typically end up in shebangs. - pythonOnBuildForHost buildPackages.bash + pythonOnBuildForHost buildPackages.bashNonInteractive ]; separateDebugInfo = true; diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index d0f937ea038f..9194e93449ed 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -3,7 +3,7 @@ lib, fetchurl, libiconv, - bash, + bashNonInteractive, updateAutotoolsGnuConfigScriptsHook, }: @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { ]; buildInputs = lib.optionals (!stdenv.hostPlatform.isMinGW) [ - bash + bashNonInteractive ] ++ lib.optionals (!stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isCygwin) [ # HACK, see #10874 (and 14664) diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index da9b2c9cbcb0..35b34db5a88b 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -5,7 +5,7 @@ fetchurl, perl, libintl, - bash, + bashNonInteractive, updateAutotoolsGnuConfigScriptsHook, gnulib, gawk, @@ -83,7 +83,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; buildInputs = [ - bash + bashNonInteractive libintl ] ++ optionals stdenv.hostPlatform.isSunOS [ diff --git a/pkgs/development/tools/misc/texinfo/packages.nix b/pkgs/development/tools/misc/texinfo/packages.nix index 1c215819a9a2..b0ff25deebcf 100644 --- a/pkgs/development/tools/misc/texinfo/packages.nix +++ b/pkgs/development/tools/misc/texinfo/packages.nix @@ -6,7 +6,7 @@ fetchurl, perl, libintl, - bash, + bashNonInteractive, updateAutotoolsGnuConfigScriptsHook, gnulib, gawk, @@ -57,7 +57,7 @@ let xz libintl libiconv - bash + bashNonInteractive gnulib gawk freebsd diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix index ac172d6da111..6d758f27878c 100644 --- a/pkgs/shells/bash/5.nix +++ b/pkgs/shells/bash/5.nix @@ -6,8 +6,7 @@ , bison , util-linux - # patch for cygwin requires readline support -, interactive ? stdenv.hostPlatform.isCygwin +, interactive ? true , readline , withDocs ? null , forFHSEnv ? false diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index dd5993b36695..dd1035cc3d53 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -153,7 +153,7 @@ let runtimeShell = prevStage.ccWrapperStdenv.shell; }; - bash = prevStage.bash or bootstrapTools; + bashNonInteractive = prevStage.bashNonInteractive or bootstrapTools; thisStdenv = import ../generic { name = "${name}-stdenv-darwin"; @@ -168,7 +168,7 @@ let inherit extraNativeBuildInputs; preHook = - lib.optionalString (!isBuiltByNixpkgsCompiler bash) '' + lib.optionalString (!isBuiltByNixpkgsCompiler bashNonInteractive) '' # Don't patch #!/interpreter because it leads to retained # dependencies on the bootstrapTools in the final stdenv. dontPatchShebangs=1 @@ -181,9 +181,9 @@ let export PATH_LOCALE=${prevStage.darwin.locale}/share/locale ''; - shell = bash + "/bin/bash"; + shell = bashNonInteractive + "/bin/bash"; initialPath = [ - bash + bashNonInteractive prevStage.file bootstrapTools ]; @@ -328,7 +328,7 @@ let # SDK packages include propagated packages and source release packages built during the bootstrap. sdkPackages = prevStage: { inherit (prevStage) - bash + bashNonInteractive libpng libxml2 libxo @@ -408,7 +408,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check # stage should only access the stage that came before it. ccWrapperStdenv = self.stdenv; - bash = bootstrapTools // { + bashNonInteractive = bootstrapTools // { shellPath = "/bin/bash"; }; @@ -600,7 +600,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check (llvmLibrariesPackages prevStage) { inherit (prevStage) - bash + bashNonInteractive cctools coreutils cpio @@ -847,14 +847,14 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check inherit (prevStage) ccWrapperStdenv; # Avoid an infinite recursion due to the SDK’s including ncurses, which depends on bash in its `dev` output. - bash = super.bash.override { stdenv = self.darwin.bootstrapStdenv; }; + bashNonInteractive = super.bashNonInteractive.override { stdenv = self.darwin.bootstrapStdenv; }; # Avoid pulling in a full python and its extra dependencies for the llvm/clang builds. libxml2 = super.libxml2.override { pythonSupport = false; }; # Use Bash from this stage to avoid propagating Bash from a previous stage to the final stdenv. ncurses = super.ncurses.override { - stdenv = self.darwin.bootstrapStdenv.override { shell = lib.getExe self.bash; }; + stdenv = self.darwin.bootstrapStdenv.override { shell = lib.getExe self.bashNonInteractive; }; }; darwin = super.darwin.overrideScope ( @@ -1162,7 +1162,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check extraAttrs = { inherit bootstrapTools; libc = prevStage.darwin.libSystem; - shellPackage = prevStage.bash; + shellPackage = prevStage.bashNonInteractive; }; disallowedRequisites = [ bootstrapTools.out ]; @@ -1172,7 +1172,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check with prevStage; [ apple-sdk - bash + bashNonInteractive bzip2.bin bzip2.out cc.expand-response-params diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix index 8286b5d6076b..c0a6f7e8ea08 100644 --- a/pkgs/stdenv/freebsd/default.nix +++ b/pkgs/stdenv/freebsd/default.nix @@ -74,7 +74,7 @@ let expand-response-params = ""; bsdcp = linkBootstrap { paths = [ "bin/bsdcp" ]; }; patchelf = linkBootstrap { paths = [ "bin/patchelf" ]; }; - bash = linkBootstrap { + bashNonInteractive = linkBootstrap { paths = [ "bin/bash" "bin/sh" @@ -376,13 +376,13 @@ let gawk diffutils patch - bash + bashNonInteractive xz gzip bzip2 bsdcp ]; - shell = "${prevStage.bash}/bin/bash"; + shell = "${prevStage.bashNonInteractive}/bin/bash"; stdenvNoCC = import ../generic { inherit config @@ -471,7 +471,7 @@ in # we CAN'T import LLVM because the compiler built here is used to build the final compiler and the final compiler must not be built by the bootstrap compiler inherit (bootstrapTools) patchelf - bash + bashNonInteractive curl coreutils diffutils diff --git a/pkgs/stdenv/generic/common-path.nix b/pkgs/stdenv/generic/common-path.nix index 32c8e278ad27..9eeacd91bcbb 100644 --- a/pkgs/stdenv/generic/common-path.nix +++ b/pkgs/stdenv/generic/common-path.nix @@ -10,7 +10,7 @@ pkgs.gzip pkgs.bzip2.bin pkgs.gnumake - pkgs.bash + pkgs.bashNonInteractive pkgs.patch pkgs.xz.bin diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index bae24800471b..01faee1e6924 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -770,7 +770,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check bzip2 xz zlib - bash + bashNonInteractive binutils coreutils diffutils @@ -806,7 +806,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check gzip bzip2 xz - bash + bashNonInteractive binutils.bintools coreutils diffutils @@ -866,7 +866,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check gzip bzip2 xz - bash + bashNonInteractive coreutils diffutils findutils diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 27f66232b7ad..9923adf3e001 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cmake, - bash, + bashNonInteractive, gnugrep, fixDarwinDylibNames, file, @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = lib.optional stdenv.hostPlatform.isUnix bash; + buildInputs = lib.optional stdenv.hostPlatform.isUnix bashNonInteractive; patches = [ # This patches makes sure we do not attempt to use the MD5 implementation diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a201065591c..5d964e35e1b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5586,17 +5586,18 @@ with pkgs; ### SHELLS runtimeShell = "${runtimeShellPackage}${runtimeShellPackage.shellPath}"; - runtimeShellPackage = bash; + runtimeShellPackage = bashNonInteractive; - bash = lowPrio (callPackage ../shells/bash/5.nix { }); + bash = callPackage ../shells/bash/5.nix { }; + bashNonInteractive = lowPrio (callPackage ../shells/bash/5.nix { + interactive = false; + }); # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed - bashInteractive = callPackage ../shells/bash/5.nix { - interactive = true; - }; - bashInteractiveFHS = callPackage ../shells/bash/5.nix { - interactive = true; + bashInteractive = bash; + bashFHS = callPackage ../shells/bash/5.nix { forFHSEnv = true; }; + bashInteractiveFHS = bashFHS; carapace = callPackage ../shells/carapace { buildGoModule = buildGo123Module; From e78debdfa7de0edbe97abf84c01b0a097055b3c5 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 4 Feb 2025 04:00:17 +0800 Subject: [PATCH 0186/1107] emacs: enable strictDeps for elisp packages This is a step towards the goal[1] of enabling strictDeps by default in Nixpkgs. This helps users write better buildInputs/nativeBuildinputs and checkInputs/nativeCheckInputs. It also makes the build faster because it reduces unnecessary runs of hooks added by addEnvHooks. Previously, emacs was only in nativeBuildInputs. After strictDeps is enabled, emacs has to be also in buildInputs to provide a header file needed[2] by dynamic modules from an elisp package. Only some elisp packages contain dynamic modules but we always add emacs to buildInputs since there is no harm. [1]: https://github.com/NixOS/nixpkgs/issues/178468 [2]: info "(elisp) Module Initialization" --- pkgs/applications/editors/emacs/build-support/generic.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix index 282d42d76284..94f791d8f6cd 100644 --- a/pkgs/applications/editors/emacs/build-support/generic.nix +++ b/pkgs/applications/editors/emacs/build-support/generic.nix @@ -67,7 +67,7 @@ libBuildHelper.extendMkDerivation' stdenv.mkDerivation ( ''; inherit packageRequires; - buildInputs = finalAttrs.packageRequires ++ buildInputs; + buildInputs = [ emacs ] ++ finalAttrs.packageRequires ++ buildInputs; nativeBuildInputs = [ emacs texinfo @@ -77,6 +77,8 @@ libBuildHelper.extendMkDerivation' stdenv.mkDerivation ( setupHook = args.setupHook or setupHook; + strictDeps = args.strictDeps or true; + inherit turnCompilationWarningToError ignoreCompilationError; meta = From 1b5f66935d4d4365b89dde6c6407aaab48d83ad1 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 4 Feb 2025 04:07:35 +0800 Subject: [PATCH 0187/1107] emacsPackages.lsp-bridge: fix build when strictDeps is enabled --- .../emacs/elisp-packages/manual-packages/lsp-bridge/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix index cf1c84b3fd8b..e7ae5f90b7a4 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix @@ -56,7 +56,9 @@ melpaBuild { checkInputs = [ # Emacs packages tempel + ]; + nativeCheckInputs = [ # Executables basedpyright git From 544a3883c58abd7a3fc898bab86a4cde2e0c5097 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 4 Feb 2025 04:08:32 +0800 Subject: [PATCH 0188/1107] emacsPackages.erlang: fix build when strictDeps is enabled --- .../editors/emacs/elisp-packages/melpa-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index c632a27869be..0b378079f542 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -214,8 +214,10 @@ let }); erlang = super.erlang.overrideAttrs (attrs: { - buildInputs = attrs.buildInputs ++ [ + nativeBuildInputs = attrs.nativeBuildInputs or [ ] ++ [ pkgs.perl + ]; + buildInputs = attrs.buildInputs or [ ] ++ [ pkgs.ncurses ]; }); From d5f17b0e32d586703100da45db16b16b7c25b5fa Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 4 Feb 2025 04:09:12 +0800 Subject: [PATCH 0189/1107] emacsPackages.zmq: fix build when strictDeps is enabled --- .../editors/emacs/elisp-packages/melpa-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 0b378079f542..1c04ae5c8be7 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -597,11 +597,13 @@ let export EZMQ_LIBDIR=$(mktemp -d) make ''; - nativeBuildInputs = old.nativeBuildInputs ++ [ + nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ pkgs.autoconf pkgs.automake pkgs.pkg-config pkgs.libtool + ]; + buildInputs = old.buildInputs or [ ] ++ [ (pkgs.zeromq.override { enableDrafts = true; }) ]; postInstall = (old.postInstall or "") + "\n" + '' From 76c1961929918a0397b4e111f42674456e8438e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Feb 2025 00:30:26 +0000 Subject: [PATCH 0190/1107] amf-headers: 1.4.35 -> 1.4.36 --- pkgs/by-name/am/amf-headers/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/am/amf-headers/package.nix b/pkgs/by-name/am/amf-headers/package.nix index 1fa67faf9cd8..45ed5afaaedb 100644 --- a/pkgs/by-name/am/amf-headers/package.nix +++ b/pkgs/by-name/am/amf-headers/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "amf-headers"; - version = "1.4.35"; + version = "1.4.36"; src = fetchFromGitHub { owner = "GPUOpen-LibrariesAndSDKs"; repo = "AMF"; rev = "v${version}"; - sha256 = "sha256-QhiM9JMEVbkTiY03hOWj0hYjHbf5lEZUz597+d3zY5E="; + sha256 = "sha256-u6gvdc1acemd01TO5EbuF3H7HkEJX4GUx73xCo71yPY="; }; installPhase = '' From 19cb56507a7103330c6d0e4fa2b36d712ee504f8 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Wed, 5 Feb 2025 11:52:08 +0800 Subject: [PATCH 0191/1107] emacs: stop adding packageRequires to buildInputs According to dependency propagation rules[1], this is redundant since we already add packageRequires to propagatedBuildInputs. [1]: https://github.com/NixOS/nixpkgs/blob/730c3a8ddf044683369f6184e47a23431f19823d/doc/stdenv/stdenv.chapter.md?plain=1#L314-L344 --- pkgs/applications/editors/emacs/build-support/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix index 94f791d8f6cd..3dd047273389 100644 --- a/pkgs/applications/editors/emacs/build-support/generic.nix +++ b/pkgs/applications/editors/emacs/build-support/generic.nix @@ -67,7 +67,7 @@ libBuildHelper.extendMkDerivation' stdenv.mkDerivation ( ''; inherit packageRequires; - buildInputs = [ emacs ] ++ finalAttrs.packageRequires ++ buildInputs; + buildInputs = [ emacs ] ++ buildInputs; nativeBuildInputs = [ emacs texinfo From 67195ad54a58430b47777545b370c20aa713bee5 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Wed, 5 Feb 2025 11:20:09 +0800 Subject: [PATCH 0192/1107] emacs: move the setup hook from elisp build helper to emacs The hook is used to construct EMACSLOADPATH and EMACSNATIVELOADPATH from elisp packages in buildInputs for emacs in nativeBuildInputs to use during the build of an elisp package. Emacs is the right place to set this hook, which is similar to the fact that cc-wrapper[1] is the right place to set a hook[2] constructing NIX_CFLAGS_COMPILE. [1]: https://github.com/NixOS/nixpkgs/blob/17bfa4436fdbee1374b1797c8a9ddc8a3570cf51/pkgs/build-support/cc-wrapper/default.nix#L461 [2]: https://github.com/NixOS/nixpkgs/blob/17bfa4436fdbee1374b1797c8a9ddc8a3570cf51/pkgs/build-support/cc-wrapper/setup-hook.sh#L86 --- .../editors/emacs/build-support/elpa.nix | 2 -- .../editors/emacs/build-support/generic.nix | 18 ------------------ .../editors/emacs/build-support/melpa.nix | 2 -- pkgs/applications/editors/emacs/make-emacs.nix | 3 +++ .../emacs-funcs.sh => setup-hook.sh} | 2 ++ 5 files changed, 5 insertions(+), 22 deletions(-) rename pkgs/applications/editors/emacs/{build-support/emacs-funcs.sh => setup-hook.sh} (94%) diff --git a/pkgs/applications/editors/emacs/build-support/elpa.nix b/pkgs/applications/editors/emacs/build-support/elpa.nix index 1b30a5ac898d..995ed9879387 100644 --- a/pkgs/applications/editors/emacs/build-support/elpa.nix +++ b/pkgs/applications/editors/emacs/build-support/elpa.nix @@ -5,7 +5,6 @@ stdenv, emacs, texinfo, - writeText, }: let @@ -15,7 +14,6 @@ let stdenv emacs texinfo - writeText ; }; libBuildHelper = import ./lib-build-helper.nix; diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix index 94f791d8f6cd..c239d2c864eb 100644 --- a/pkgs/applications/editors/emacs/build-support/generic.nix +++ b/pkgs/applications/editors/emacs/build-support/generic.nix @@ -5,27 +5,12 @@ stdenv, emacs, texinfo, - writeText, ... }: let inherit (lib) optionalAttrs; - setupHook = writeText "setup-hook.sh" '' - source ${./emacs-funcs.sh} - - if [[ ! -v emacsHookDone ]]; then - emacsHookDone=1 - - # If this is for a wrapper derivation, emacs and the dependencies are all - # run-time dependencies. If this is for precompiling packages into bytecode, - # emacs is a compile-time dependency of the package. - addEnvHooks "$hostOffset" addEmacsVars - addEnvHooks "$targetOffset" addEmacsVars - fi - ''; - libBuildHelper = import ./lib-build-helper.nix; in @@ -75,8 +60,6 @@ libBuildHelper.extendMkDerivation' stdenv.mkDerivation ( propagatedBuildInputs = finalAttrs.packageRequires ++ propagatedBuildInputs; propagatedUserEnvPkgs = finalAttrs.packageRequires ++ propagatedUserEnvPkgs; - setupHook = args.setupHook or setupHook; - strictDeps = args.strictDeps or true; inherit turnCompilationWarningToError ignoreCompilationError; @@ -102,7 +85,6 @@ libBuildHelper.extendMkDerivation' stdenv.mkDerivation ( # the current package's elisp files are in the load path, otherwise # (require 'file-b) from file-a.el in the same package will fail. mkdir -p $out/share/emacs/native-lisp - source ${./emacs-funcs.sh} addEmacsVars "$out" # package-activate-all is used to activate packages. In other builder diff --git a/pkgs/applications/editors/emacs/build-support/melpa.nix b/pkgs/applications/editors/emacs/build-support/melpa.nix index 6aa9d2502d76..df0cea7098ef 100644 --- a/pkgs/applications/editors/emacs/build-support/melpa.nix +++ b/pkgs/applications/editors/emacs/build-support/melpa.nix @@ -7,7 +7,6 @@ fetchFromGitHub, emacs, texinfo, - writeText, }: let @@ -17,7 +16,6 @@ let stdenv emacs texinfo - writeText ; }; libBuildHelper = import ./lib-build-helper.nix; diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index 775fc03b4892..6a7dbf488591 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -61,6 +61,7 @@ texinfo, webkitgtk_4_0, wrapGAppsHook3, + writeText, zlib, # Boolean flags @@ -508,6 +509,8 @@ mkDerivation (finalAttrs: { patchelf --add-needed "libXcursor.so.1" "$out/bin/emacs" ''; + setupHook = ./setup-hook.sh; + passthru = { inherit withNativeCompilation; inherit withTreeSitter; diff --git a/pkgs/applications/editors/emacs/build-support/emacs-funcs.sh b/pkgs/applications/editors/emacs/setup-hook.sh similarity index 94% rename from pkgs/applications/editors/emacs/build-support/emacs-funcs.sh rename to pkgs/applications/editors/emacs/setup-hook.sh index b6b2a3bd374d..15b1840de2c1 100644 --- a/pkgs/applications/editors/emacs/build-support/emacs-funcs.sh +++ b/pkgs/applications/editors/emacs/setup-hook.sh @@ -21,3 +21,5 @@ addEmacsVars () { addToEmacsNativeLoadPath "$1/share/emacs/native-lisp" fi } + +addEnvHooks "$targetOffset" addEmacsVars From 1bde8cce944face86f5edfe8b2810d21a91ebbb7 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Wed, 5 Feb 2025 16:49:48 +0800 Subject: [PATCH 0193/1107] emacs: replace ad hoc implementation with lib.extendMkDerivation This causes 0 rebuilds. --- .../editors/emacs/build-support/elpa.nix | 51 ++-- .../editors/emacs/build-support/generic.nix | 166 +++++------ .../emacs/build-support/lib-build-helper.nix | 5 - .../editors/emacs/build-support/melpa.nix | 265 +++++++++--------- .../editors/emacs/build-support/trivial.nix | 54 ++-- 5 files changed, 268 insertions(+), 273 deletions(-) delete mode 100644 pkgs/applications/editors/emacs/build-support/lib-build-helper.nix diff --git a/pkgs/applications/editors/emacs/build-support/elpa.nix b/pkgs/applications/editors/emacs/build-support/elpa.nix index 995ed9879387..fcaef43953ef 100644 --- a/pkgs/applications/editors/emacs/build-support/elpa.nix +++ b/pkgs/applications/editors/emacs/build-support/elpa.nix @@ -16,40 +16,41 @@ let texinfo ; }; - libBuildHelper = import ./lib-build-helper.nix; in -libBuildHelper.extendMkDerivation' genericBuild ( - finalAttrs: +lib.extendMkDerivation { + constructDrv = genericBuild; + extendDrvArgs = + finalAttrs: - { - pname, - dontUnpack ? true, - meta ? { }, - ... - }@args: + { + pname, + dontUnpack ? true, + meta ? { }, + ... + }@args: - { + { - elpa2nix = args.elpa2nix or ./elpa2nix.el; + elpa2nix = args.elpa2nix or ./elpa2nix.el; - inherit dontUnpack; + inherit dontUnpack; - installPhase = - args.installPhase or '' - runHook preInstall + installPhase = + args.installPhase or '' + runHook preInstall - emacs --batch -Q -l "$elpa2nix" \ - -f elpa2nix-install-package \ - "$src" "$out/share/emacs/site-lisp/elpa" + emacs --batch -Q -l "$elpa2nix" \ + -f elpa2nix-install-package \ + "$src" "$out/share/emacs/site-lisp/elpa" - runHook postInstall - ''; + runHook postInstall + ''; - meta = { - homepage = args.src.meta.homepage or "https://elpa.gnu.org/packages/${pname}.html"; - } // meta; - } + meta = { + homepage = args.src.meta.homepage or "https://elpa.gnu.org/packages/${pname}.html"; + } // meta; + }; -) +} diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix index e61fb8bfe074..ddab4bc70a00 100644 --- a/pkgs/applications/editors/emacs/build-support/generic.nix +++ b/pkgs/applications/editors/emacs/build-support/generic.nix @@ -11,100 +11,100 @@ let inherit (lib) optionalAttrs; - libBuildHelper = import ./lib-build-helper.nix; - in -libBuildHelper.extendMkDerivation' stdenv.mkDerivation ( - finalAttrs: +lib.extendMkDerivation { + constructDrv = stdenv.mkDerivation; + extendDrvArgs = + finalAttrs: - { - buildInputs ? [ ], - nativeBuildInputs ? [ ], - packageRequires ? [ ], - propagatedBuildInputs ? [ ], - propagatedUserEnvPkgs ? [ ], - postInstall ? "", - meta ? { }, - turnCompilationWarningToError ? false, - ignoreCompilationError ? false, - ... - }@args: + { + buildInputs ? [ ], + nativeBuildInputs ? [ ], + packageRequires ? [ ], + propagatedBuildInputs ? [ ], + propagatedUserEnvPkgs ? [ ], + postInstall ? "", + meta ? { }, + turnCompilationWarningToError ? false, + ignoreCompilationError ? false, + ... + }@args: - { - name = args.name or "emacs-${finalAttrs.pname}-${finalAttrs.version}"; + { + name = args.name or "emacs-${finalAttrs.pname}-${finalAttrs.version}"; - unpackCmd = - args.unpackCmd or '' - case "$curSrc" in - *.el) - # keep original source filename without the hash - local filename=$(basename "$curSrc") - filename="''${filename:33}" - cp $curSrc $filename - chmod +w $filename - sourceRoot="." - ;; - *) - _defaultUnpack "$curSrc" - ;; - esac - ''; + unpackCmd = + args.unpackCmd or '' + case "$curSrc" in + *.el) + # keep original source filename without the hash + local filename=$(basename "$curSrc") + filename="''${filename:33}" + cp $curSrc $filename + chmod +w $filename + sourceRoot="." + ;; + *) + _defaultUnpack "$curSrc" + ;; + esac + ''; - inherit packageRequires; - buildInputs = [ emacs ] ++ buildInputs; - nativeBuildInputs = [ - emacs - texinfo - ] ++ nativeBuildInputs; - propagatedBuildInputs = finalAttrs.packageRequires ++ propagatedBuildInputs; - propagatedUserEnvPkgs = finalAttrs.packageRequires ++ propagatedUserEnvPkgs; + inherit packageRequires; + buildInputs = [ emacs ] ++ buildInputs; + nativeBuildInputs = [ + emacs + texinfo + ] ++ nativeBuildInputs; + propagatedBuildInputs = finalAttrs.packageRequires ++ propagatedBuildInputs; + propagatedUserEnvPkgs = finalAttrs.packageRequires ++ propagatedUserEnvPkgs; - strictDeps = args.strictDeps or true; + strictDeps = args.strictDeps or true; - inherit turnCompilationWarningToError ignoreCompilationError; + inherit turnCompilationWarningToError ignoreCompilationError; - meta = - { - broken = false; - platforms = emacs.meta.platforms; - } - // optionalAttrs ((args.src.meta.homepage or "") != "") { - homepage = args.src.meta.homepage; - } - // meta; - } + meta = + { + broken = false; + platforms = emacs.meta.platforms; + } + // optionalAttrs ((args.src.meta.homepage or "") != "") { + homepage = args.src.meta.homepage; + } + // meta; + } - // optionalAttrs (emacs.withNativeCompilation or false) { + // optionalAttrs (emacs.withNativeCompilation or false) { - addEmacsNativeLoadPath = args.addEmacsNativeLoadPath or true; + addEmacsNativeLoadPath = args.addEmacsNativeLoadPath or true; - postInstall = - '' - # Besides adding the output directory to the native load path, make sure - # the current package's elisp files are in the load path, otherwise - # (require 'file-b) from file-a.el in the same package will fail. - mkdir -p $out/share/emacs/native-lisp - addEmacsVars "$out" + postInstall = + '' + # Besides adding the output directory to the native load path, make sure + # the current package's elisp files are in the load path, otherwise + # (require 'file-b) from file-a.el in the same package will fail. + mkdir -p $out/share/emacs/native-lisp + addEmacsVars "$out" - # package-activate-all is used to activate packages. In other builder - # helpers, package-initialize is used for this purpose because - # package-activate-all is not available before Emacs 27. - find $out/share/emacs -type f -name '*.el' -not -name ".dir-locals.el" -print0 \ - | xargs --verbose -0 -I {} -n 1 -P $NIX_BUILD_CORES sh -c \ - "emacs \ - --batch \ - -f package-activate-all \ - --eval '(setq native-comp-eln-load-path (cdr native-comp-eln-load-path))' \ - --eval '(let ((default-directory \"$out/share/emacs/site-lisp\")) (normal-top-level-add-subdirs-to-load-path))' \ - --eval '(setq large-file-warning-threshold nil)' \ - --eval '(setq byte-compile-error-on-warn ${ - if finalAttrs.turnCompilationWarningToError then "t" else "nil" - })' \ - -f batch-native-compile {} \ - || exit ${if finalAttrs.ignoreCompilationError then "0" else "\\$?"}" - '' - + postInstall; - } + # package-activate-all is used to activate packages. In other builder + # helpers, package-initialize is used for this purpose because + # package-activate-all is not available before Emacs 27. + find $out/share/emacs -type f -name '*.el' -not -name ".dir-locals.el" -print0 \ + | xargs --verbose -0 -I {} -n 1 -P $NIX_BUILD_CORES sh -c \ + "emacs \ + --batch \ + -f package-activate-all \ + --eval '(setq native-comp-eln-load-path (cdr native-comp-eln-load-path))' \ + --eval '(let ((default-directory \"$out/share/emacs/site-lisp\")) (normal-top-level-add-subdirs-to-load-path))' \ + --eval '(setq large-file-warning-threshold nil)' \ + --eval '(setq byte-compile-error-on-warn ${ + if finalAttrs.turnCompilationWarningToError then "t" else "nil" + })' \ + -f batch-native-compile {} \ + || exit ${if finalAttrs.ignoreCompilationError then "0" else "\\$?"}" + '' + + postInstall; + }; -) +} diff --git a/pkgs/applications/editors/emacs/build-support/lib-build-helper.nix b/pkgs/applications/editors/emacs/build-support/lib-build-helper.nix deleted file mode 100644 index 23267f592359..000000000000 --- a/pkgs/applications/editors/emacs/build-support/lib-build-helper.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - extendMkDerivation' = - mkDerivationBase: attrsOverlay: fpargs: - (mkDerivationBase fpargs).overrideAttrs attrsOverlay; -} diff --git a/pkgs/applications/editors/emacs/build-support/melpa.nix b/pkgs/applications/editors/emacs/build-support/melpa.nix index df0cea7098ef..1258f8b7c26d 100644 --- a/pkgs/applications/editors/emacs/build-support/melpa.nix +++ b/pkgs/applications/editors/emacs/build-support/melpa.nix @@ -18,7 +18,6 @@ let texinfo ; }; - libBuildHelper = import ./lib-build-helper.nix; packageBuild = stdenv.mkDerivation { name = "package-build"; @@ -42,156 +41,158 @@ let in -libBuildHelper.extendMkDerivation' genericBuild ( - finalAttrs: +lib.extendMkDerivation { + constructDrv = genericBuild; + extendDrvArgs = + finalAttrs: - { - /* - pname: Nix package name without special symbols and without version or - "emacs-" prefix. - */ - pname, - /* - ename: Original Emacs package name, possibly containing special symbols. - Default: pname - */ - ename ? pname, - /* - version: Either a stable version such as "1.2" or an unstable version. - An unstable version can use either Nix format (preferred) such as - "1.2-unstable-2024-06-01" or MELPA format such as "20240601.1230". - */ - version, - /* - commit: Optional package history commit. - Default: src.rev or "unknown" - This will be written into the generated package but it is not needed during - the build process. - */ - commit ? (finalAttrs.src.rev or "unknown"), - /* - files: Optional recipe property specifying the files used to build the package. - If null, do not set it in recipe, keeping the default upstream behaviour. - Default: null - */ - files ? null, - /* - recipe: Optional MELPA recipe. - Default: a minimally functional recipe - This can be a path of a recipe file, a string of the recipe content or an empty string. - The default value is used if it is an empty string. - */ - recipe ? "", - preUnpack ? "", - postUnpack ? "", - meta ? { }, - ... - }@args: + { + /* + pname: Nix package name without special symbols and without version or + "emacs-" prefix. + */ + pname, + /* + ename: Original Emacs package name, possibly containing special symbols. + Default: pname + */ + ename ? pname, + /* + version: Either a stable version such as "1.2" or an unstable version. + An unstable version can use either Nix format (preferred) such as + "1.2-unstable-2024-06-01" or MELPA format such as "20240601.1230". + */ + version, + /* + commit: Optional package history commit. + Default: src.rev or "unknown" + This will be written into the generated package but it is not needed during + the build process. + */ + commit ? (finalAttrs.src.rev or "unknown"), + /* + files: Optional recipe property specifying the files used to build the package. + If null, do not set it in recipe, keeping the default upstream behaviour. + Default: null + */ + files ? null, + /* + recipe: Optional MELPA recipe. + Default: a minimally functional recipe + This can be a path of a recipe file, a string of the recipe content or an empty string. + The default value is used if it is an empty string. + */ + recipe ? "", + preUnpack ? "", + postUnpack ? "", + meta ? { }, + ... + }@args: - { + { - elpa2nix = args.elpa2nix or ./elpa2nix.el; - melpa2nix = args.melpa2nix or ./melpa2nix.el; + elpa2nix = args.elpa2nix or ./elpa2nix.el; + melpa2nix = args.melpa2nix or ./melpa2nix.el; - inherit - commit - ename - files - recipe - ; + inherit + commit + ename + files + recipe + ; - packageBuild = args.packageBuild or packageBuild; + packageBuild = args.packageBuild or packageBuild; - melpaVersion = - args.melpaVersion or ( - let - parsed = - lib.flip builtins.match version - # match -unstable-YYYY-MM-DD format - "^.*-unstable-([[:digit:]]{4})-([[:digit:]]{2})-([[:digit:]]{2})$"; - unstableVersionInNixFormat = parsed != null; # heuristics - date = builtins.concatStringsSep "" parsed; - time = "0"; # unstable version in nix format lacks this info - in - if unstableVersionInNixFormat then date + "." + time else finalAttrs.version - ); + melpaVersion = + args.melpaVersion or ( + let + parsed = + lib.flip builtins.match version + # match -unstable-YYYY-MM-DD format + "^.*-unstable-([[:digit:]]{4})-([[:digit:]]{2})-([[:digit:]]{2})$"; + unstableVersionInNixFormat = parsed != null; # heuristics + date = builtins.concatStringsSep "" parsed; + time = "0"; # unstable version in nix format lacks this info + in + if unstableVersionInNixFormat then date + "." + time else finalAttrs.version + ); - preUnpack = - '' - mkdir -p "$NIX_BUILD_TOP/recipes" - recipeFile="$NIX_BUILD_TOP/recipes/$ename" - if [ -r "$recipe" ]; then - ln -s "$recipe" "$recipeFile" - nixInfoLog "link recipe" - elif [ -n "$recipe" ]; then - printf "%s" "$recipe" > "$recipeFile" - nixInfoLog "write recipe" - else - cat > "$recipeFile" <<'EOF' - (${finalAttrs.ename} :fetcher git :url "" ${ - lib.optionalString (finalAttrs.files != null) ":files ${finalAttrs.files}" - }) - EOF - nixInfoLog "use default recipe" - fi - nixInfoLog "recipe content:" "$(< $recipeFile)" - unset -v recipeFile + preUnpack = + '' + mkdir -p "$NIX_BUILD_TOP/recipes" + recipeFile="$NIX_BUILD_TOP/recipes/$ename" + if [ -r "$recipe" ]; then + ln -s "$recipe" "$recipeFile" + nixInfoLog "link recipe" + elif [ -n "$recipe" ]; then + printf "%s" "$recipe" > "$recipeFile" + nixInfoLog "write recipe" + else + cat > "$recipeFile" <<'EOF' + (${finalAttrs.ename} :fetcher git :url "" ${ + lib.optionalString (finalAttrs.files != null) ":files ${finalAttrs.files}" + }) + EOF + nixInfoLog "use default recipe" + fi + nixInfoLog "recipe content:" "$(< $recipeFile)" + unset -v recipeFile - ln -s "$packageBuild" "$NIX_BUILD_TOP/package-build" + ln -s "$packageBuild" "$NIX_BUILD_TOP/package-build" - mkdir -p "$NIX_BUILD_TOP/packages" - '' - + preUnpack; + mkdir -p "$NIX_BUILD_TOP/packages" + '' + + preUnpack; - postUnpack = - '' - mkdir -p "$NIX_BUILD_TOP/working" - ln -s "$NIX_BUILD_TOP/$sourceRoot" "$NIX_BUILD_TOP/working/$ename" - '' - + postUnpack; + postUnpack = + '' + mkdir -p "$NIX_BUILD_TOP/working" + ln -s "$NIX_BUILD_TOP/$sourceRoot" "$NIX_BUILD_TOP/working/$ename" + '' + + postUnpack; - buildPhase = - args.buildPhase or '' - runHook preBuild + buildPhase = + args.buildPhase or '' + runHook preBuild - # This is modified from stdenv buildPhase. foundMakefile is used in stdenv checkPhase. - if [[ ! ( -z "''${makeFlags-}" && -z "''${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ) ]]; then - foundMakefile=1 - fi + # This is modified from stdenv buildPhase. foundMakefile is used in stdenv checkPhase. + if [[ ! ( -z "''${makeFlags-}" && -z "''${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ) ]]; then + foundMakefile=1 + fi - pushd "$NIX_BUILD_TOP" + pushd "$NIX_BUILD_TOP" - emacs --batch -Q \ - -L "$NIX_BUILD_TOP/package-build" \ - -l "$melpa2nix" \ - -f melpa2nix-build-package \ - $ename $melpaVersion $commit + emacs --batch -Q \ + -L "$NIX_BUILD_TOP/package-build" \ + -l "$melpa2nix" \ + -f melpa2nix-build-package \ + $ename $melpaVersion $commit - popd + popd - runHook postBuild - ''; + runHook postBuild + ''; - installPhase = - args.installPhase or '' - runHook preInstall + installPhase = + args.installPhase or '' + runHook preInstall - archive="$NIX_BUILD_TOP/packages/$ename-$melpaVersion.el" - if [ ! -f "$archive" ]; then - archive="$NIX_BUILD_TOP/packages/$ename-$melpaVersion.tar" - fi + archive="$NIX_BUILD_TOP/packages/$ename-$melpaVersion.el" + if [ ! -f "$archive" ]; then + archive="$NIX_BUILD_TOP/packages/$ename-$melpaVersion.tar" + fi - emacs --batch -Q \ - -l "$elpa2nix" \ - -f elpa2nix-install-package \ - "$archive" "$out/share/emacs/site-lisp/elpa" + emacs --batch -Q \ + -l "$elpa2nix" \ + -f elpa2nix-install-package \ + "$archive" "$out/share/emacs/site-lisp/elpa" - runHook postInstall - ''; + runHook postInstall + ''; - meta = { - homepage = args.src.meta.homepage or "https://melpa.org/#/${pname}"; - } // meta; - } + meta = { + homepage = args.src.meta.homepage or "https://melpa.org/#/${pname}"; + } // meta; + }; -) +} diff --git a/pkgs/applications/editors/emacs/build-support/trivial.nix b/pkgs/applications/editors/emacs/build-support/trivial.nix index 9a3b59246497..f95b6f3cdfc3 100644 --- a/pkgs/applications/editors/emacs/build-support/trivial.nix +++ b/pkgs/applications/editors/emacs/build-support/trivial.nix @@ -2,40 +2,38 @@ { callPackage, lib, ... }@envargs: -let - libBuildHelper = import ./lib-build-helper.nix; -in +lib.extendMkDerivation { + constructDrv = callPackage ./generic.nix envargs; + extendDrvArgs = + finalAttrs: -libBuildHelper.extendMkDerivation' (callPackage ./generic.nix envargs) ( - finalAttrs: + args: - args: + { + buildPhase = + args.buildPhase or '' + runHook preBuild - { - buildPhase = - args.buildPhase or '' - runHook preBuild + # This is modified from stdenv buildPhase. foundMakefile is used in stdenv checkPhase. + if [[ ! ( -z "''${makeFlags-}" && -z "''${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ) ]]; then + foundMakefile=1 + fi - # This is modified from stdenv buildPhase. foundMakefile is used in stdenv checkPhase. - if [[ ! ( -z "''${makeFlags-}" && -z "''${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ) ]]; then - foundMakefile=1 - fi + emacs -l package -f package-initialize -L . --batch -f batch-byte-compile *.el - emacs -l package -f package-initialize -L . --batch -f batch-byte-compile *.el + runHook postBuild + ''; - runHook postBuild - ''; + installPhase = + args.installPhase or '' + runHook preInstall - installPhase = - args.installPhase or '' - runHook preInstall + LISPDIR=$out/share/emacs/site-lisp + install -d $LISPDIR + install *.el *.elc $LISPDIR - LISPDIR=$out/share/emacs/site-lisp - install -d $LISPDIR - install *.el *.elc $LISPDIR + runHook postInstall + ''; + }; - runHook postInstall - ''; - } - -) +} From faaacb5ce2c82e80a1a1b5f58267512e90d0577f Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 27 Jan 2025 03:17:27 +0100 Subject: [PATCH 0194/1107] cmake: set CMAKE_BUILD_PARALLEL_LEVEL https://cmake.org/cmake/help/latest/envvar/CMAKE_BUILD_PARALLEL_LEVEL.html --- pkgs/by-name/cm/cmake/setup-hook.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/cm/cmake/setup-hook.sh b/pkgs/by-name/cm/cmake/setup-hook.sh index 3df8b9bd986b..a6f5a4f57a5b 100755 --- a/pkgs/by-name/cm/cmake/setup-hook.sh +++ b/pkgs/by-name/cm/cmake/setup-hook.sh @@ -131,6 +131,9 @@ cmakeConfigurePhase() { enableParallelBuilding=1 echo "cmake: enabled parallel building" fi + if [[ "$enableParallelBuilding" -ne 0 ]]; then + export CMAKE_BUILD_PARALLEL_LEVEL=$NIX_BUILD_CORES + fi if ! [[ -v enableParallelInstalling ]]; then enableParallelInstalling=1 From 5d3a18acc1f71ab276fdea69c743fddd6b9af39e Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 27 Jan 2025 03:19:37 +0100 Subject: [PATCH 0195/1107] python3Packages.pyhepmc: use default CMAKE_BUILD_PARALLEL_LEVEL --- pkgs/development/python-modules/pyhepmc/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/pyhepmc/default.nix b/pkgs/development/python-modules/pyhepmc/default.nix index 427d9ecabeba..44ee5b78be85 100644 --- a/pkgs/development/python-modules/pyhepmc/default.nix +++ b/pkgs/development/python-modules/pyhepmc/default.nix @@ -43,10 +43,6 @@ buildPythonPackage rec { CMAKE_ARGS = [ "-DEXTERNAL_PYBIND11=ON" ]; - preBuild = '' - export CMAKE_BUILD_PARALLEL_LEVEL="$NIX_BUILD_CORES" - ''; - nativeCheckInputs = [ graphviz pytestCheckHook From f8fbe0731d2c10f08f6c7aa6e1632a9bed2d84be Mon Sep 17 00:00:00 2001 From: Simon Hauser Date: Tue, 4 Feb 2025 08:07:26 +0100 Subject: [PATCH 0196/1107] python313Packages.paramiko: 3.5.0 -> 3.5.1 Changelog: https://www.paramiko.org/changelog.html#3.5.1 --- pkgs/development/python-modules/paramiko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index ca46a101158b..2e531c16a2e3 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "paramiko"; - version = "3.5.0"; + version = "3.5.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-rRHlQNpPVc7dpSkx8aP4Eqgjinr39ipg3lOM2AuygSQ="; + hash = "sha256-ssZlvEWyshW9fX8DmQGxSwZ9oA86EeZkCZX9WPJmSCI="; }; patches = [ From 2a2d89fa856efd08930b4d47dc9895f0cb779ab2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 5 Feb 2025 16:54:24 +0100 Subject: [PATCH 0197/1107] cacert: 3.107 -> 3.108 https://github.com/nss-dev/nss/compare/NSS_3_107_BRANCH...NSS_3_108_RTM Adds the D-Trust 2023 TLS Roots. (mozbz#1938245) --- pkgs/data/misc/cacert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 15b1528316f8..3a78ed813f92 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -23,7 +23,7 @@ let lib.concatStringsSep "\n\n" extraCertificateStrings ); - srcVersion = "3.107"; + srcVersion = "3.108"; version = if nssOverride != null then nssOverride.version else srcVersion; meta = with lib; { homepage = "https://curl.haxx.se/docs/caextract.html"; @@ -47,7 +47,7 @@ let owner = "nss-dev"; repo = "nss"; rev = "NSS_${lib.replaceStrings [ "." ] [ "_" ] version}_RTM"; - hash = "sha256-c6ks/pBvZHipNkmBy784s96zMYP+D9q3VlVrPVSohLw="; + hash = "sha256-L2XRj3D8SsS2QYQFDLwGtaPoZ7tN4kz8hGdVKefFSu8="; }; dontBuild = true; From 913528a75d9bcb295e77f1dba9676f6d3157428e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 28 Apr 2024 15:49:10 +0100 Subject: [PATCH 0198/1107] ncurses: 6.4 -> 6.5 Changes: https://lists.gnu.org/archive/html/info-gnu/2024-04/msg00004.html Co-authored-by: Sandro --- pkgs/development/libraries/ncurses/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 0a713f848e52..1a38261db70b 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -16,15 +16,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "6.4.20221231"; + version = "6.5"; pname = "ncurses" + lib.optionalString (abiVersion == "5") "-abi5-compat"; src = fetchurl { - urls = [ - "https://invisible-island.net/archives/ncurses/ncurses-${lib.versions.majorMinor finalAttrs.version}.tar.gz" - "https://ftp.gnu.org/gnu/ncurses/ncurses-${lib.versions.majorMinor finalAttrs.version}.tar.gz" - ]; - hash = "sha256-aTEoPZrIfFBz8wtikMTHXyFjK7T8NgOsgQCBK+0kgVk="; + url = "https://invisible-island.net/archives/ncurses/ncurses-${finalAttrs.version}.tar.gz"; + hash = "sha256-E22RvCaamleF5fnpgLx2q1dCj2BM4+WlqQzrx2eXHMY="; }; outputs = [ "out" "dev" "man" ]; From faf10ffd4d440333bc052c06ca2e0e071b72354a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Feb 2025 01:29:47 +0000 Subject: [PATCH 0199/1107] hdf5-cpp: 1.14.5 -> 1.14.6 --- pkgs/tools/misc/hdf5/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 4ee7101efd53..23e469383adc 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -31,7 +31,7 @@ let in stdenv.mkDerivation rec { - version = "1.14.5"; + version = "1.14.6"; pname = "hdf5" + lib.optionalString cppSupport "-cpp" @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { owner = "HDFGroup"; repo = "hdf5"; rev = "hdf5_${version}"; - hash = "sha256-bvtSeyqqrBXVAMzUtiKOhO9RR4SCO+3GnsLux4Mig6I="; + hash = "sha256-mJTax+VWAL3Amkq3Ij8fxazY2nfpMOTxYMUQlTvY/rg="; }; passthru = { From d2d54d32921c89779c85dedd72e5c6ce907de857 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Feb 2025 07:53:15 +0000 Subject: [PATCH 0200/1107] cargo-chef: 0.1.69 -> 0.1.71 --- pkgs/by-name/ca/cargo-chef/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-chef/package.nix b/pkgs/by-name/ca/cargo-chef/package.nix index 37082715df1e..fa193fa6cc23 100644 --- a/pkgs/by-name/ca/cargo-chef/package.nix +++ b/pkgs/by-name/ca/cargo-chef/package.nix @@ -6,15 +6,15 @@ rustPlatform.buildRustPackage rec { pname = "cargo-chef"; - version = "0.1.69"; + version = "0.1.71"; src = fetchCrate { inherit pname version; - hash = "sha256-zDVolVllWl0DM0AByglKhU8JQpkdcmyVGe1vYo+eamk="; + hash = "sha256-ZbbRo+AAlh7sW1HROxHfmnDxchJRWUId3oh5wgPauuQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-3bjnAQLIO0hHjkRDym2oUzmiMd2gp5gN+iK8NxBC22Q="; + cargoHash = "sha256-/VqFs5wzKbnfZRfKERUGjuCj/H+o1iI/ioMPq/FugDo="; meta = with lib; { description = "Cargo-subcommand to speed up Rust Docker builds using Docker layer caching"; From e006d77174229e53a48a000261c4c4fb19c72032 Mon Sep 17 00:00:00 2001 From: MarcFontaine Date: Wed, 8 Jan 2025 22:25:33 +0100 Subject: [PATCH 0201/1107] hamlib_4: 4.5.5 -> 4.6 --- pkgs/development/libraries/hamlib/4.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/hamlib/4.nix b/pkgs/development/libraries/hamlib/4.nix index 1773620a6097..9ca78f90fb60 100644 --- a/pkgs/development/libraries/hamlib/4.nix +++ b/pkgs/development/libraries/hamlib/4.nix @@ -22,11 +22,11 @@ let in stdenv.mkDerivation rec { pname = "hamlib"; - version = "4.5.5"; + version = "4.6"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-YByJ8y7SJelSet49ZNDQXSMgLAWuIf+nflnXDuRZf80="; + url = "mirror://sourceforge/hamlib/hamlib-${version}.tar.gz"; + hash = "sha256-b4c1ebxODvTlQDE+wqzU8Zi1UQ192Tl6SuaP6P8g0Wc="; }; strictDeps = true; From c04ff867f31bfa03478497f20302a640246a0563 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Thu, 6 Feb 2025 23:51:59 +0800 Subject: [PATCH 0202/1107] emacsPackages.lsp-bridge: fix error introduced by git merge --- .../elisp-packages/manual-packages/lsp-bridge/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix index bbd643c531c1..13d04b7b5a23 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix @@ -66,9 +66,6 @@ melpaBuild { go gopls python - ]; - - nativeCheckInputs = [ writableTmpDirAsHomeHook ]; From a037949fa3b0c78c5a67d804bc96d9275a2a2a0f Mon Sep 17 00:00:00 2001 From: Joao Palharini Date: Tue, 14 Jan 2025 10:27:18 -0300 Subject: [PATCH 0203/1107] libpng: 1.6.43 -> 1.6.46 --- pkgs/development/libraries/libpng/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 9e508efcec84..42846a114cb5 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -10,21 +10,21 @@ assert zlib != null; let - patchVersion = "1.6.43"; + patchVersion = "1.6.46"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz"; - hash = "sha256-0QdXnpDVU4bQDmCG6nUJQvIqBLmrR2u6DGYHcM76/iI="; + hash = "sha256-Kb7C39BG71HVLz5TIPkfr/yWvge0HZy51D2d9Veg0wM="; }; whenPatched = lib.optionalString apngSupport; in stdenv.mkDerivation (finalAttrs: { pname = "libpng" + whenPatched "-apng"; - version = "1.6.43"; + version = "1.6.46"; src = fetchurl { url = "mirror://sourceforge/libpng/libpng-${finalAttrs.version}.tar.xz"; - hash = "sha256-alygZSOSotfJ2yrltAIQhDwLvAgcvUEIJasAzFnxSmw="; + hash = "sha256-86qLcAOZirkqTpkGwY0ZhT6Zn507ypvRZo9U+oFwfLE="; }; postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1" From 12147fbbc666d918a3e1df36be396fca37946424 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 6 Feb 2025 21:43:25 +0100 Subject: [PATCH 0204/1107] python313Packages.types-greenlet: init at 3.1.0.20241221 --- .../python-modules/types-greenlet/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/types-greenlet/default.nix diff --git a/pkgs/development/python-modules/types-greenlet/default.nix b/pkgs/development/python-modules/types-greenlet/default.nix new file mode 100644 index 000000000000..b5cf7e5d0a4a --- /dev/null +++ b/pkgs/development/python-modules/types-greenlet/default.nix @@ -0,0 +1,31 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, +}: + +buildPythonPackage rec { + pname = "types-greenlet"; + version = "3.1.0.20241221"; + pyproject = true; + + src = fetchPypi { + pname = "types_greenlet"; + inherit version; + hash = "sha256-e89X9T4QNsmsuULqh793bDmZXmM1ekUCVB7r5dsLWJc="; + }; + + build-system = [ setuptools ]; + + doCheck = false; + + pythonImportsCheck = [ "greenlet-stubs" ]; + + meta = { + description = "Typing stubs for greenlet"; + homepage = "https://github.com/python/typeshed"; + license = lib.licenses.asl20; + maintainers = [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7e557091f1da..02ffcd8ffbd2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17531,6 +17531,8 @@ self: super: with self; { types-futures = callPackage ../development/python-modules/types-futures { }; + types-greenlet = callPackage ../development/python-modules/types-greenlet { }; + types-html5lib = callPackage ../development/python-modules/types-html5lib { }; types-ipaddress = callPackage ../development/python-modules/types-ipaddress { }; From 706eb97de9da1b73f68a9d47fb6469aa7db2dc99 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 6 Feb 2025 21:56:18 +0100 Subject: [PATCH 0205/1107] python313Packages.sqlalchemy: 2.0.37 -> 2.0.38 https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_2_0_38 --- .../python-modules/sqlalchemy/default.nix | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 44a129176dfe..fff3fe067247 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -15,6 +15,7 @@ # optionals aiomysql, + # TODO: aioodbc aiosqlite, asyncmy, asyncpg, @@ -28,10 +29,11 @@ psycopg, psycopg2, psycopg2cffi, - # TODO: pymssql + pymssql, pymysql, pyodbc, - # TODO: sqlcipher3 + sqlcipher3, + types-greenlet, # tests mock, @@ -41,7 +43,7 @@ buildPythonPackage rec { pname = "sqlalchemy"; - version = "2.0.37"; + version = "2.0.38"; pyproject = true; disabled = pythonOlder "3.7"; @@ -50,27 +52,28 @@ buildPythonPackage rec { owner = "sqlalchemy"; repo = "sqlalchemy"; tag = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-KyYENF0c+Ki3k0Ba8v0quY86Jqi6EN3d0onHmzFnSOw="; + hash = "sha256-If4PEBD67pm0fs1TZkJTKNuFPRfc6SxIEm94ymyDvow="; }; postPatch = '' sed -i '/tag_build = dev/d' setup.cfg ''; - nativeBuildInputs = [ setuptools ] ++ lib.optionals (!isPyPy) [ cython ]; + build-system = [ setuptools ] ++ lib.optionals (!isPyPy) [ cython ]; - propagatedBuildInputs = [ + dependencies = [ greenlet typing-extensions ]; optional-dependencies = lib.fix (self: { asyncio = [ greenlet ]; - mypy = [ mypy ]; - mssql = [ pyodbc ]; - mssql_pymysql = [ - # TODO: pymssql + mypy = [ + mypy + types-greenlet ]; + mssql = [ pyodbc ]; + mssql_pymysql = [ pymssql ]; mssql_pyodbc = [ pyodbc ]; mysql = [ mysqlclient ]; mysql_connector = [ mysql-connector ]; @@ -86,14 +89,10 @@ buildPythonPackage rec { postgresql_psycopgbinary = [ psycopg ]; pymysql = [ pymysql ]; aiomysql = [ aiomysql ] ++ self.asyncio; + # TODO: aioodbc asyncmy = [ asyncmy ] ++ self.asyncio; - aiosqlite = [ - aiosqlite - typing-extensions - ] ++ self.asyncio; - sqlcipher = [ - # TODO: sqlcipher3 - ]; + aiosqlite = [ aiosqlite ] ++ self.asyncio; + sqlcipher = [ sqlcipher3 ]; }); nativeCheckInputs = [ From cd67c04bdb920dec46eea29483cceaed4fe17873 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Feb 2025 11:20:34 +0100 Subject: [PATCH 0206/1107] python313Packages.aiozoneinfo: 0.2.1 -> 0.2.3 Diff: https://github.com/bluetooth-devices/aiozoneinfo/compare/refs/tags/v0.2.1...v0.2.3 Changelog: https://github.com/bluetooth-devices/aiozoneinfo/blob/0.2.3/CHANGELOG.md --- pkgs/development/python-modules/aiozoneinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiozoneinfo/default.nix b/pkgs/development/python-modules/aiozoneinfo/default.nix index 778fe976cae9..f0f0c22aa8b6 100644 --- a/pkgs/development/python-modules/aiozoneinfo/default.nix +++ b/pkgs/development/python-modules/aiozoneinfo/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiozoneinfo"; - version = "0.2.1"; + version = "0.2.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bluetooth-devices"; repo = "aiozoneinfo"; tag = "v${version}"; - hash = "sha256-u7yQiy5xKK1A19cmpXjA4MMK4q7RvtuvwkUECnddzG8="; + hash = "sha256-7qd6Yk/K4BLocu8eQK0hLaw2r1jhWIHBr9W4KsAvmx8="; }; postPatch = '' From cdd502880e9a341250818b84ebda58fa1026163f Mon Sep 17 00:00:00 2001 From: shimun Date: Sun, 8 Dec 2024 18:43:07 +0100 Subject: [PATCH 0207/1107] maintainers: add shimunn --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 246df1773ba8..de4f25243c01 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -21245,6 +21245,12 @@ github = "shikanime"; githubId = 22115108; }; + shimun = { + email = "shimun@shimun.net"; + name = "shimun"; + github = "shimunn"; + githubId = 41011289; + }; shiphan = { email = "timlin940511@gmail.com"; name = "Shiphan"; From 33b5e7511785d5331efaead5d46a2f45547e780c Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Fri, 10 Jan 2025 09:51:30 -0600 Subject: [PATCH 0208/1107] icu: Bump default version from 74 to 76 --- doc/release-notes/rl-2505.section.md | 2 ++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index 9c3a264db53e..ba25fef1bfde 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -12,6 +12,8 @@ It should generally be replaced with `rustPlatform.fetchCargoVendor`, but `rustPlatform.importCargoLock` may also be appropriate in some circumstances. `rustPlatform.buildRustPackage` users must set `useFetchCargoVendor` to `true` and regenerate the `cargoHash`. +- Default ICU version updated from 74 to 76 + ### Titanium removed {#sec-nixpkgs-release-25.05-incompatibilities-titanium-removed} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78c9dc08dfdd..4bb983495e3a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9269,7 +9269,7 @@ with pkgs; # # `icuReal` is provided in case the upstream icu package is needed on Darwin instead of the fork. # Note that the versioned icu packages always correspond to the upstream versions. - icuReal = icu74; + icuReal = icu76; icu = if stdenv.hostPlatform.isDarwin then darwin.ICU else icuReal; idasen = with python3Packages; toPythonApplication idasen; From 7c9ea7233557afb41b95c93590e5fc925449093c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 01:07:55 +0000 Subject: [PATCH 0209/1107] libtasn1: 4.19.0 -> 4.20.0 --- pkgs/by-name/li/libtasn1/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libtasn1/package.nix b/pkgs/by-name/li/libtasn1/package.nix index 21986252b919..cc3ed0716a78 100644 --- a/pkgs/by-name/li/libtasn1/package.nix +++ b/pkgs/by-name/li/libtasn1/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "libtasn1"; - version = "4.19.0"; + version = "4.20.0"; src = fetchurl { url = "mirror://gnu/libtasn1/libtasn1-${version}.tar.gz"; - sha256 = "sha256-FhPwrBz0hNbsDOO4wG1WJjzHJC8cI7MNgtI940WmP3o="; + sha256 = "sha256-kuDjvUwC1K7udgNrLd2D8McyukzaXLcdWDJysjWHp2w="; }; outputs = [ From 1f4629016e312f0daad599d9b08d545763e90e70 Mon Sep 17 00:00:00 2001 From: RAVENz46 Date: Wed, 15 Jan 2025 19:55:26 +0900 Subject: [PATCH 0210/1107] oculante: fix icon, add wayland support wayland linux only --- pkgs/by-name/oc/oculante/package.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/oc/oculante/package.nix b/pkgs/by-name/oc/oculante/package.nix index 643cddcf2aca..e3febb9abccd 100644 --- a/pkgs/by-name/oc/oculante/package.nix +++ b/pkgs/by-name/oc/oculante/package.nix @@ -54,7 +54,6 @@ rustPlatform.buildRustPackage rec { libXi libXrandr gtk3 - libxkbcommon wayland ] @@ -69,20 +68,28 @@ rustPlatform.buildRustPackage rec { ]; postInstall = '' - install -Dm444 $src/res/icons/icon.png -t $out/share/icons/hicolor/128x128/apps/ + install -Dm444 $src/res/icons/icon.png $out/share/icons/hicolor/128x128/apps/oculante.png install -Dm444 $src/res/oculante.desktop -t $out/share/applications wrapProgram $out/bin/oculante \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]} + --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath ( + [ + libGL + libxkbcommon + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland ] + ) + } ''; - meta = with lib; { + meta = { broken = stdenv.hostPlatform.isDarwin; description = "Minimalistic crossplatform image viewer written in Rust"; homepage = "https://github.com/woelper/oculante"; changelog = "https://github.com/woelper/oculante/blob/${version}/CHANGELOG.md"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "oculante"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ dit7ya figsoda ]; From e1f9b54314c32251849622629a47bc2ca75e891a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 7 Feb 2025 02:58:23 +0100 Subject: [PATCH 0211/1107] python313Packages.django_4: 4.2.18 -> 4.2.19 https://docs.djangoproject.com/en/4.2/releases/4.2.19/ --- pkgs/development/python-modules/django/4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index cb833a407c60..1c9ad471581b 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "django"; - version = "4.2.18"; + version = "4.2.19"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "django"; repo = "django"; rev = "refs/tags/${version}"; - hash = "sha256-aOTfZDJsEfWHXxkvTgyc2E9ye3LpzHG1bJTo40Dke4I="; + hash = "sha256-aSTrtZs8WyZ/wr01N7Mi7M3A8MlZ6rB9fBuMdCkKkok="; }; patches = From 71b850c3ec2dc5ccc7f17dff077f73797d8a501e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 7 Feb 2025 04:43:30 +0100 Subject: [PATCH 0212/1107] python313Packages.hypothesis: 6.124.1 -> 6.125.2 https://hypothesis.readthedocs.io/en/latest/changes.html#v6-125-2 --- pkgs/development/python-modules/hypothesis/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 7865b913a813..ceb79e3d04a0 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -13,6 +13,7 @@ python, sortedcontainers, stdenv, + pythonAtLeast, pythonOlder, sphinxHook, sphinx-rtd-theme, @@ -23,7 +24,7 @@ buildPythonPackage rec { pname = "hypothesis"; - version = "6.124.1"; + version = "6.125.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -32,7 +33,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis"; rev = "hypothesis-python-${version}"; - hash = "sha256-d8uvkCiEASP5sF6kvuxqAss/KC0RNgG9n9ZdCcBTPCs="; + hash = "sha256-W+rTh9ymJTvq7KA4w8YrG6Z10tcfrtKGJ1MW716nVHs="; }; # I tried to package sphinx-selective-exclude, but it throws @@ -86,6 +87,9 @@ buildPythonPackage rec { "test_observability" "test_assume_has_status_reason" "test_observability_captures_stateful_reprs" + ] + ++ lib.optionals (pythonAtLeast "3.13") [ + "test_clean_source" ]; pythonImportsCheck = [ "hypothesis" ]; From b158812f3b9f787f3023c5bf207c34a347e55019 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 5 Feb 2025 09:52:36 +0100 Subject: [PATCH 0213/1107] curl: 8.11.1 -> 8.12.0 https://github.com/curl/curl/releases/tag/curl-8_12_0 https://curl.se/ch/8.12.0.html Fixes three low severity vulnerabilities: - CVE-2025-0725: https://curl.se/docs/CVE-2025-0725.html - CVE-2025-0665: https://curl.se/docs/CVE-2025-0665.html - CVE-2025-0167: https://curl.se/docs/CVE-2025-0167.html Signed-off-by: Sefa Eyeoglu --- .../cu/curlMinimal/fix-eventfd-free.patch | 33 ----- .../curlMinimal/fix-password-only-netrc.patch | 123 ------------------ pkgs/by-name/cu/curlMinimal/package.nix | 11 +- 3 files changed, 2 insertions(+), 165 deletions(-) delete mode 100644 pkgs/by-name/cu/curlMinimal/fix-eventfd-free.patch delete mode 100644 pkgs/by-name/cu/curlMinimal/fix-password-only-netrc.patch diff --git a/pkgs/by-name/cu/curlMinimal/fix-eventfd-free.patch b/pkgs/by-name/cu/curlMinimal/fix-eventfd-free.patch deleted file mode 100644 index 5b0979fd4cbd..000000000000 --- a/pkgs/by-name/cu/curlMinimal/fix-eventfd-free.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ff5091aa9f73802e894b1cbdf24ab84e103200e2 Mon Sep 17 00:00:00 2001 -From: Andy Pan -Date: Thu, 12 Dec 2024 12:48:56 +0000 -Subject: [PATCH] async-thread: avoid closing eventfd twice - -When employing eventfd for socketpair, there is only one file -descriptor. Closing that fd twice might result in fd corruption. -Thus, we should avoid closing the eventfd twice, following the -pattern in lib/multi.c. - -Fixes #15725 -Closes #15727 -Reported-by: Christian Heusel ---- - lib/asyn-thread.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/lib/asyn-thread.c b/lib/asyn-thread.c -index a58e4b790494..32d496b107cb 100644 ---- a/lib/asyn-thread.c -+++ b/lib/asyn-thread.c -@@ -195,9 +195,11 @@ void destroy_thread_sync_data(struct thread_sync_data *tsd) - * close one end of the socket pair (may be done in resolver thread); - * the other end (for reading) is always closed in the parent thread. - */ -+#ifndef USE_EVENTFD - if(tsd->sock_pair[1] != CURL_SOCKET_BAD) { - wakeup_close(tsd->sock_pair[1]); - } -+#endif - #endif - memset(tsd, 0, sizeof(*tsd)); - } diff --git a/pkgs/by-name/cu/curlMinimal/fix-password-only-netrc.patch b/pkgs/by-name/cu/curlMinimal/fix-password-only-netrc.patch deleted file mode 100644 index c0a442cc8f69..000000000000 --- a/pkgs/by-name/cu/curlMinimal/fix-password-only-netrc.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 9fce2c55d4b0273ac99b59bd8cb982a6d96b88cf Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg -Date: Tue, 17 Dec 2024 23:56:42 +0100 -Subject: [PATCH] netrc: fix password-only entries - -When a specific hostname matched, and only a password is set before -another machine is specified in the netrc file, the parser would not be -happy and stop there and return the password-only state. It instead -continued and did not return a match. - -Add test 2005 to verify this case - -Regression from e9b9bba, shipped in 8.11.1. - -Reported-by: Ben Zanin -Fixes #15767 -Closes #15768 ---- - lib/netrc.c | 7 +++++- - tests/data/Makefile.am | 2 +- - tests/data/test2005 | 55 ++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 62 insertions(+), 2 deletions(-) - create mode 100644 tests/data/test2005 - -diff --git a/lib/netrc.c b/lib/netrc.c -index cbc86484f6f8..b517c1dfab67 100644 ---- a/lib/netrc.c -+++ b/lib/netrc.c -@@ -267,7 +267,8 @@ static int parsenetrc(struct store_netrc *store, - retcode = NETRC_FAILED; /* allocation failed */ - goto out; - } -- found |= FOUND_PASSWORD; -+ if(!specific_login || our_login) -+ found |= FOUND_PASSWORD; - keyword = NONE; - } - else if(strcasecompare("login", tok)) -@@ -276,6 +277,10 @@ static int parsenetrc(struct store_netrc *store, - keyword = PASSWORD; - else if(strcasecompare("machine", tok)) { - /* a new machine here */ -+ if(found & FOUND_PASSWORD) { -+ done = TRUE; -+ break; -+ } - state = HOSTFOUND; - keyword = NONE; - found = 0; -diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am -index bd9a0bbaaff1..105108309d52 100644 ---- a/tests/data/Makefile.am -+++ b/tests/data/Makefile.am -@@ -238,7 +238,7 @@ test1941 test1942 test1943 test1944 test1945 test1946 test1947 test1948 \ - test1955 test1956 test1957 test1958 test1959 test1960 test1964 \ - test1970 test1971 test1972 test1973 test1974 test1975 test1976 \ - \ --test2000 test2001 test2002 test2003 test2004 \ -+test2000 test2001 test2002 test2003 test2004 test2005 \ - \ - test2023 \ - test2024 test2025 test2026 test2027 test2028 test2029 test2030 test2031 \ -diff --git a/tests/data/test2005 b/tests/data/test2005 -new file mode 100644 -index 000000000000..91e256298a40 ---- /dev/null -+++ b/tests/data/test2005 -@@ -0,0 +1,55 @@ -+ -+ -+ -+HTTP -+netrc -+ -+ -+# -+# Server-side -+ -+ -+HTTP/1.1 200 OK -+Date: Fri, 05 Aug 2022 10:09:00 GMT -+Server: test-server/fake -+Content-Type: text/plain -+Content-Length: 6 -+Connection: close -+ -+-foo- -+ -+ -+ -+# -+# Client-side -+ -+ -+http -+ -+ -+netrc match with password only in file, no username. machine follows -+ -+ -+--netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER http://%HOSTIP:%HTTPPORT/ -+ -+ -+machine %HOSTIP -+password 5up3r53cr37 -+ -+machine example.com -+ -+ -+ -+# -+# Verify data after the test has been "shot" -+ -+ -+GET / HTTP/1.1 -+Host: %HOSTIP:%HTTPPORT -+Authorization: Basic %b64[:5up3r53cr37]b64% -+User-Agent: curl/%VERSION -+Accept: */* -+ -+ -+ -+ diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix index 1c58c12f9860..dc599c841039 100644 --- a/pkgs/by-name/cu/curlMinimal/package.nix +++ b/pkgs/by-name/cu/curlMinimal/package.nix @@ -53,23 +53,16 @@ in stdenv.mkDerivation (finalAttrs: { pname = "curl"; - version = "8.11.1"; + version = "8.12.0"; src = fetchurl { urls = [ "https://curl.haxx.se/download/curl-${finalAttrs.version}.tar.xz" "https://github.com/curl/curl/releases/download/curl-${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}/curl-${finalAttrs.version}.tar.xz" ]; - hash = "sha256-x8p9tIsJCXQ+rvNCUNoCwZvGHU8dzt1mA/EJQJU2q1Y="; + hash = "sha256-mkYox2S+axqZCVZ8E+jncQQWCd9DshWPysTgXqcJfl0="; }; - patches = [ - # https://github.com/curl/curl/issues/15725 - ./fix-eventfd-free.patch - # https://github.com/curl/curl/issues/15767 - ./fix-password-only-netrc.patch - ]; - # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion # necessary for FreeBSD code path in configure postPatch = '' From 4608f17aa64c42756c12d751da6ffacf90d98c19 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 5 Feb 2025 09:55:03 +0100 Subject: [PATCH 0214/1107] curl: add Scrumplex to maintainers Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/cu/curlMinimal/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix index dc599c841039..ee0a8924a6c6 100644 --- a/pkgs/by-name/cu/curlMinimal/package.nix +++ b/pkgs/by-name/cu/curlMinimal/package.nix @@ -222,7 +222,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Command line tool for transferring files with URL syntax"; homepage = "https://curl.se/"; license = lib.licenses.curl; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = with lib.maintainers; [ lovek323 Scrumplex ]; platforms = lib.platforms.all; # Fails to link against static brotli or gss broken = stdenv.hostPlatform.isStatic && (brotliSupport || gssSupport); From 9b93ca3c824b9990b4f742eabef0dce47fc855a2 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 5 Feb 2025 19:50:45 +0100 Subject: [PATCH 0215/1107] gdk-pixbuf: fix static MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We're unfortunately going to have to patch here, because an equivalent of static-deps.patch has been submitted upstream at least 3 times at this point, but these merge requests have all been ignored for more than a year. I have submitted static-lerc.patch upstream as well, but I'm not holding out hope… --- .../libraries/gdk-pixbuf/default.nix | 19 +++-- .../libraries/gdk-pixbuf/static-deps.patch | 31 ++++++++ .../libraries/gdk-pixbuf/static-lerc.patch | 79 +++++++++++++++++++ 3 files changed, 123 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/libraries/gdk-pixbuf/static-deps.patch create mode 100644 pkgs/development/libraries/gdk-pixbuf/static-lerc.patch diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 37e90255a403..8c1d6926bcb9 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -51,6 +51,9 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Move installed tests to a separate output ./installed-tests-path.patch + + ./static-deps.patch + ./static-lerc.patch ]; # gdk-pixbuf-thumbnailer is not wrapped therefore strictDeps will work @@ -88,12 +91,16 @@ stdenv.mkDerivation (finalAttrs: { libpng ]; - mesonFlags = [ - "-Dgio_sniffing=false" - (lib.mesonBool "gtk_doc" withIntrospection) - (lib.mesonEnable "introspection" withIntrospection) - (lib.mesonEnable "others" true) - ]; + mesonFlags = + [ + "-Dgio_sniffing=false" + (lib.mesonBool "gtk_doc" withIntrospection) + (lib.mesonEnable "introspection" withIntrospection) + (lib.mesonEnable "others" true) + ] + ++ lib.optionals stdenv.hostPlatform.isStatic [ + "-Dbuiltin_loaders=all" + ]; postPatch = '' chmod +x build-aux/* # patchShebangs only applies to executables diff --git a/pkgs/development/libraries/gdk-pixbuf/static-deps.patch b/pkgs/development/libraries/gdk-pixbuf/static-deps.patch new file mode 100644 index 000000000000..da52e432b4e7 --- /dev/null +++ b/pkgs/development/libraries/gdk-pixbuf/static-deps.patch @@ -0,0 +1,31 @@ +From 1b7cac1cbdb7078f575a3222be451a9bf1ac35ec Mon Sep 17 00:00:00 2001 +From: Alyssa Ross +Date: Wed, 31 Jan 2024 15:33:02 +0100 +Subject: [PATCH] build: add missing dependency to gdkpixbuf_dep + +This should match the dependencies passed to the library() call that +creates gdkpixbuf. Otherwise, linking the gdkpixbuf_bin executables +will fail if -Ddefault_library=static, because static libraries don't +carry dependency information themselves. +--- +Link: https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/161 + + gdk-pixbuf/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build +index a11926eee..450484d68 100644 +--- a/gdk-pixbuf/meson.build ++++ b/gdk-pixbuf/meson.build +@@ -269,7 +269,7 @@ endif + gdkpixbuf_dep = declare_dependency( + link_with: gdkpixbuf, + include_directories: root_inc, +- dependencies: gdk_pixbuf_deps, ++ dependencies: [ gdk_pixbuf_deps, included_loaders_deps ], + sources: [ gdkpixbuf_enum_h, built_girs ], + ) + meson.override_dependency('gdk-pixbuf-2.0', gdkpixbuf_dep) +-- +GitLab + diff --git a/pkgs/development/libraries/gdk-pixbuf/static-lerc.patch b/pkgs/development/libraries/gdk-pixbuf/static-lerc.patch new file mode 100644 index 000000000000..737844a078ab --- /dev/null +++ b/pkgs/development/libraries/gdk-pixbuf/static-lerc.patch @@ -0,0 +1,79 @@ +From 3bca69d889fe545dda4ed9a8fab8ff3fe38ba487 Mon Sep 17 00:00:00 2001 +From: Alyssa Ross +Date: Wed, 5 Feb 2025 19:37:27 +0100 +Subject: [PATCH] build: fix linking with libtiff with lerc support + +Lerc is written in C++. When C and C++ objects are linked, a C++ +linker should be used to ensure C++-specific things are correctly +handled. See e.g. this comment in the Meson source for reference[1]. +One symptom of using a C linker to link with C++ objects is that +libstdc++ won't be linked when building static executables, causing +link failures. + +Unfortunately, Meson does not know whether dependencies found by +pkg-config are C++, and therefore require a C++ linker, so we have to +tell it ourselves to use a C++ linker. There's no way to check +whether libtiff is built with Lerc support, so we always use a C++ +linker if one is available and libtiff support is enabled. If a C++ +linker ends up being used to link only C objects, it shouldn't do any +harm. + +[1]: https://github.com/mesonbuild/meson/blob/9fd5281befe7881c9d1210c9e6865382bc0f2b08/mesonbuild/build.py#L1558-L1565 +--- +Link: https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/181 + + gdk-pixbuf/meson.build | 6 ++++++ + meson.build | 6 ++++++ + 2 files changed, 12 insertions(+) + +diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build +index 570625bfe..5cc11355f 100644 +--- a/gdk-pixbuf/meson.build ++++ b/gdk-pixbuf/meson.build +@@ -333,6 +333,11 @@ gdkpixbuf_bin = [ + [ 'gdk-pixbuf-query-loaders', [ 'queryloaders.c' ] ], + ] + ++bin_link_language = 'c' ++if loaders_cpp ++ bin_link_language = 'cpp' ++endif ++ + foreach bin: gdkpixbuf_bin + bin_name = bin[0] + bin_source = bin.get(1, bin_name + '.c') +@@ -342,6 +347,7 @@ foreach bin: gdkpixbuf_bin + dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ], + include_directories: [ root_inc, gdk_pixbuf_inc ], + c_args: common_cflags + gdk_pixbuf_cflags, ++ link_language : bin_link_language, + install: true) + meson.override_find_program(bin_name, bin) + +diff --git a/meson.build b/meson.build +index f0d4812f4..31b3197fc 100644 +--- a/meson.build ++++ b/meson.build +@@ -345,6 +345,8 @@ endif + + # Don't check and build the tiff loader if native_windows_loaders is true + tiff_opt = get_option('tiff') ++tiff_dep = dependency('', required: false) ++loaders_cpp = false + if not tiff_opt.disabled() and not native_windows_loaders + # We currently don't have a fallback subproject, but this handles error + # reporting if tiff_opt is enabled. +@@ -353,6 +355,10 @@ if not tiff_opt.disabled() and not native_windows_loaders + if tiff_dep.found() + enabled_loaders += 'tiff' + loaders_deps += tiff_dep ++ ++ # If libtiff is built with LERC support, it should be linked with ++ # a C++ linker. ++ loaders_cpp = loaders_cpp or add_languages('cpp', required: false, native: false) + endif + endif + +-- +GitLab + From f4d78bac18c314c3c19fe8cbbffb7474603a613f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 7 Feb 2025 17:32:23 +0100 Subject: [PATCH 0216/1107] python313Packages.aiohttp: 3.11.11 -> 3.11.12 https://github.com/aio-libs/aiohttp/blob/v3.11.12/CHANGES.rst --- pkgs/development/python-modules/aiohttp/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index b9f1f9e1c72a..bf6a0326ff4e 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch2, substituteAll, isPy310, isPyPy, @@ -45,14 +46,14 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "3.11.11"; + version = "3.11.12"; pyproject = true; src = fetchFromGitHub { owner = "aio-libs"; repo = "aiohttp"; tag = "v${version}"; - hash = "sha256-a4h8oFJxo1TSuhIjdUC0wqJSsepmzq6vjn5mwjw4bIw="; + hash = "sha256-GveluMxw100ZllDF+MT4QkZVD9q7UWHwF7IBK85J/j0="; }; patches = [ @@ -61,6 +62,12 @@ buildPythonPackage rec { llhttpDev = lib.getDev llhttp; llhttpLib = lib.getLib llhttp; }) + (fetchpatch2 { + # https://github.com/aio-libs/aiohttp/issues/10421 + # https://github.com/aio-libs/aiohttp/pull/10423 + url = "https://github.com/aio-libs/aiohttp/commit/51daf7190e7674773c22011a4e443df8b5e66437.patch"; + hash = "sha256-fADetk2tqg92J2sSgzKVTEhbQRSYl6430dxdVZuFx5I="; + }) ]; postPatch = '' From ff585410544889b6f864c04f10c4619f3193689e Mon Sep 17 00:00:00 2001 From: Jonas Fierlings Date: Thu, 23 Jan 2025 16:22:30 +0100 Subject: [PATCH 0217/1107] committed: 1.1.2 -> 1.1.5 --- pkgs/by-name/co/committed/package.nix | 40 +++++++++++++++++++++------ 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/co/committed/package.nix b/pkgs/by-name/co/committed/package.nix index e8b54bb2f08f..8cde17a8e4f3 100644 --- a/pkgs/by-name/co/committed/package.nix +++ b/pkgs/by-name/co/committed/package.nix @@ -3,13 +3,13 @@ stdenv, fetchFromGitHub, rustPlatform, - darwin, - testers, + versionCheckHook, nix-update-script, - committed, + git, + libz, }: let - version = "1.1.2"; + version = "1.1.5"; in rustPlatform.buildRustPackage { pname = "committed"; @@ -19,15 +19,37 @@ rustPlatform.buildRustPackage { owner = "crate-ci"; repo = "committed"; tag = "v${version}"; - hash = "sha256-dBNtzKqaaqJrKMNwamUY0DO9VCVqDyf45lT82nOn8UM="; + hash = "sha256-puv64/btSEkxGNhGGkh2A08gI+EIHWjC+s+QQDKj/ZQ="; }; - useFetchCargoVendor = true; - cargoHash = "sha256-gWMS14945qa6pCe+Olg89gOaoZwRKsqJtG0jKe5/7e0="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + useFetchCargoVendor = true; + cargoHash = "sha256-fW3TqI26xggUKfzI11YCO8bpotd3aO6pdu1CHhtiShs="; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + # Until upstream bumps the libz-sys dependency to >= 1.1.15 the build fails on unstable + # nixpkgs with macOS, because the following commit is not part of libz-sys < 1.1.15: + # https://github.com/madler/zlib/commit/4bd9a71f3539b5ce47f0c67ab5e01f3196dc8ef9 + # Instead, use the nixpkgs libz so that libz-sys does not have to be built. + libz + ]; + + nativeCheckInputs = [ + git + ]; + + # Ensure libgit2 can read user.name and user.email for `git_signature_default`. + # https://github.com/crate-ci/committed/blob/v1.1.5/crates/committed/tests/cmd.rs#L126 + preCheck = '' + export HOME=$(mktemp -d) + git config --global user.name nobody + git config --global user.email no@where + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; passthru = { - tests.version = testers.testVersion { package = committed; }; updateScript = nix-update-script { }; }; From 96d602c653dcf288e87a2105ae03ea3705bcc0a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 7 Feb 2025 18:34:42 +0100 Subject: [PATCH 0218/1107] paperless-ngx: use headless ghostscript in imagemagick --- pkgs/by-name/pa/paperless-ngx/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index d18903d3af1b..81f74f818f6a 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -66,7 +66,7 @@ let path = lib.makeBinPath [ ghostscript_headless - imagemagickBig + (imagemagickBig.override { ghostscript = ghostscript_headless; }) jbig2enc optipng pngquant From bf121f0671cb64337f5631417b94fdb6b2b9ef3a Mon Sep 17 00:00:00 2001 From: Cody Allen Date: Fri, 24 Jan 2025 10:06:07 -0500 Subject: [PATCH 0219/1107] services.restic: use getExe instead of hard-coded path Instead of assuming the restic executable is at `bin/restic`, use `lib.getExe` on the restic package. The main motivation for this is using a security wrapper that has a different name such as `bin/restic-wrapper`. NOTE: In rare cases this could be a breaking change. For example if you are using a wrapper whose executable is at `bin/restic`, `meta.mainProgram` is not set, _and_ your package name is something other than `restic`. See the [discource discussion](https://discourse.nixos.org/t/using-restic-service-with-the-security-wrapper/34547/5) for more details/discussion. --- nixos/modules/services/backup/restic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index cde2107eb3f4..aaddc5d16589 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -345,7 +345,7 @@ in "--what='sleep'" "--why=${lib.escapeShellArg "Scheduled backup ${name}"} " ]; - resticCmd = "${lib.optionalString backup.inhibitsSleep inhibitCmd}${backup.package}/bin/restic${extraOptions}"; + resticCmd = "${lib.optionalString backup.inhibitsSleep inhibitCmd}${lib.getExe backup.package}${extraOptions}"; excludeFlags = lib.optional ( backup.exclude != [ ] ) "--exclude-file=${pkgs.writeText "exclude-patterns" (lib.concatStringsSep "\n" backup.exclude)}"; @@ -455,7 +455,7 @@ in name: backup: let extraOptions = lib.concatMapStrings (arg: " -o ${arg}") backup.extraOptions; - resticCmd = "${backup.package}/bin/restic${extraOptions}"; + resticCmd = "${lib.getExe backup.package}${extraOptions}"; in pkgs.writeShellScriptBin "restic-${name}" '' set -a # automatically export variables From 1a1dbb7191c92ac3460d48b3a2cc995d0185ccb9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 28 Jan 2025 01:10:51 +0100 Subject: [PATCH 0220/1107] librsvg: Fix update script This was missed in cace2b6eae83f813290074bc572ade8dff09c4fe --- pkgs/development/libraries/librsvg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 78f83a9a9d0f..4be391239d5e 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -209,7 +209,7 @@ stdenv.mkDerivation (finalAttrs: { nix ] } - update-source-version librsvg --ignore-same-version --source-key=cargoDeps > /dev/null + update-source-version librsvg --ignore-same-version --source-key=cargoDeps.vendorStaging > /dev/null '' ]; # Experimental feature: do not copy! From c202e21f6445759ce7b46387c4590f07fb0cab8a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 28 Jan 2025 00:12:59 +0000 Subject: [PATCH 0221/1107] =?UTF-8?q?librsvg:=202.58.3=20=E2=86=92=202.59.?= =?UTF-8?q?2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/librsvg/-/compare/2.58.3...2.59.2 - Ported to Meson. - Switched from gdk-pixbuf to Rust image loaders for external images. - Added Avif support. We also enable tests. --- .../development/libraries/librsvg/default.nix | 112 ++++++++---------- pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 50 insertions(+), 65 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 4be391239d5e..1c2b33ec094d 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -3,25 +3,29 @@ stdenv, fetchurl, pkg-config, + meson, + ninja, glib, gdk-pixbuf, installShellFiles, pango, + freetype, + harfbuzz, cairo, libxml2, bzip2, - libintl, - ApplicationServices, + dav1d, Foundation, - libobjc, rustPlatform, rustc, + cargo-c, cargo-auditable-cargo-wrapper, gi-docgen, python3Packages, gnome, vala, - writeScript, + writeShellScript, + shared-mime-info, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages, @@ -45,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "librsvg"; - version = "2.58.3"; + version = "2.59.2"; outputs = [ @@ -58,13 +62,13 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/librsvg/${lib.versions.majorMinor finalAttrs.version}/librsvg-${finalAttrs.version}.tar.xz"; - hash = "sha256-SfKaCpL0wtGaLLQelqsvzn61veQYUMipFPz2VeMRCUQ="; + hash = "sha256-7NKT+wzDOMFwFxu8e8++pnJdBByV8xOF3JNUCZM+RZc="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "librsvg-deps-${finalAttrs.version}"; - hash = "sha256-cO79X3M0B6WN4w0JeBh00EyaIdHcthOkeKhaYdTn2BQ="; + hash = "sha256-M8iNNWpYgLIm0X3sTjAaRIFYLIHnMyrkcsayFrLg25Y="; dontConfigure = true; }; @@ -79,7 +83,10 @@ stdenv.mkDerivation (finalAttrs: { gdk-pixbuf installShellFiles pkg-config + meson + ninja rustc + cargo-c cargo-auditable-cargo-wrapper python3Packages.docutils vala @@ -94,14 +101,13 @@ stdenv.mkDerivation (finalAttrs: { [ libxml2 bzip2 + dav1d pango - libintl - vala # for share/vala/Makefile.vapigen + freetype + vala ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ApplicationServices Foundation - libobjc ]; propagatedBuildInputs = [ @@ -110,65 +116,44 @@ stdenv.mkDerivation (finalAttrs: { cairo ]; - configureFlags = - [ - (lib.enableFeature withIntrospection "introspection") - (lib.enableFeature withIntrospection "vala") + mesonFlags = [ + (lib.mesonEnable "introspection" withIntrospection) + (lib.mesonEnable "vala" withIntrospection) + (lib.mesonBool "tests" finalAttrs.finalPackage.doCheck) + ]; - "--enable-always-build-tests" - ] - ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-Bsymbolic" - ++ lib.optional ( - stdenv.buildPlatform != stdenv.hostPlatform - ) "RUST_TARGET=${stdenv.hostPlatform.rust.rustcTarget}"; + # Probably broken MIME type detection. + doCheck = !stdenv.isDarwin; - doCheck = false; # all tests fail on libtool-generated rsvg-convert not being able to find coreutils + env = { + PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_QUERY_LOADERS = writeShellScript "gdk-pixbuf-loader-loaders-wrapped" '' + ${lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (stdenv.hostPlatform.emulator buildPackages)} ${lib.getDev gdk-pixbuf}/bin/gdk-pixbuf-query-loaders + ''; + }; - GDK_PIXBUF_QUERYLOADERS = writeScript "gdk-pixbuf-loader-loaders-wrapped" '' - ${lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (stdenv.hostPlatform.emulator buildPackages)} ${lib.getDev gdk-pixbuf}/bin/gdk-pixbuf-query-loaders + postPatch = '' + patchShebangs \ + meson/cargo_wrapper.py \ + meson/makedef.py \ + + # Fix thumbnailer path + substituteInPlace gdk-pixbuf-loader/librsvg.thumbnailer.in \ + --replace-fail '@bindir@/gdk-pixbuf-thumbnailer' '${gdk-pixbuf}/bin/gdk-pixbuf-thumbnailer' + + # Fix pkg-config file Requires section. + # https://gitlab.gnome.org/GNOME/librsvg/-/issues/1150 + substituteInPlace rsvg/meson.build \ + --replace-fail 'requires: library_dependencies_sole,' 'requires: [cairo_dep, gio_dep, glib_dep, pixbuf_dep],' ''; - # librsvg only links Foundation, but it also requiers libobjc. - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_LDFLAGS = "-lobjc"; }; + preCheck = '' + # Tests complain: Fontconfig error: No writable cache directories + export HOME=$TMPDIR - preConfigure = '' - PKG_CONFIG_VAPIGEN_VAPIGEN="$(type -p vapigen)" - export PKG_CONFIG_VAPIGEN_VAPIGEN + # https://gitlab.gnome.org/GNOME/librsvg/-/issues/258#note_251789 + export XDG_DATA_DIRS=${shared-mime-info}/share:$XDG_DATA_DIRS ''; - # It wants to add loaders and update the loaders.cache in gdk-pixbuf - # Patching the Makefiles to it creates rsvg specific loaders and the - # relevant loader.cache here. - # The loaders.cache can be used by setting GDK_PIXBUF_MODULE_FILE to - # point to this file in a wrapper. - postConfigure = - '' - GDK_PIXBUF=$out/lib/gdk-pixbuf-2.0/2.10.0 - mkdir -p $GDK_PIXBUF/loaders - sed -i gdk-pixbuf-loader/Makefile \ - -e "s#gdk_pixbuf_moduledir = .*#gdk_pixbuf_moduledir = $GDK_PIXBUF/loaders#" \ - -e "s#gdk_pixbuf_cache_file = .*#gdk_pixbuf_cache_file = $GDK_PIXBUF/loaders.cache#" \ - -e "s#\$(GDK_PIXBUF_QUERYLOADERS)#GDK_PIXBUF_MODULEDIR=$GDK_PIXBUF/loaders \$(GDK_PIXBUF_QUERYLOADERS)#" - - # Fix thumbnailer path - sed -e "s#@bindir@\(/gdk-pixbuf-thumbnailer\)#${gdk-pixbuf}/bin\1#g" \ - -i gdk-pixbuf-loader/librsvg.thumbnailer.in - - # 'error: linker `cc` not found' when cross-compiling - export RUSTFLAGS="-Clinker=$CC" - '' - + - lib.optionalString - ( - (stdenv.buildPlatform != stdenv.hostPlatform) - && (stdenv.hostPlatform.emulatorAvailable buildPackages) - ) - '' - # the replacement is the native conditional - substituteInPlace gdk-pixbuf-loader/Makefile \ - --replace 'RUN_QUERY_LOADER_TEST = false' 'RUN_QUERY_LOADER_TEST = test -z "$(DESTDIR)"' \ - ''; - # Not generated when cross compiling. postInstall = let @@ -176,7 +161,8 @@ stdenv.mkDerivation (finalAttrs: { in lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) '' # Merge gdkpixbuf and librsvg loaders - cat ${lib.getLib gdk-pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache $GDK_PIXBUF/loaders.cache > $GDK_PIXBUF/loaders.cache.tmp + GDK_PIXBUF=$out/${gdk-pixbuf.binaryDir} + cat ${lib.getLib gdk-pixbuf}/${gdk-pixbuf.binaryDir}/loaders.cache $GDK_PIXBUF/loaders.cache > $GDK_PIXBUF/loaders.cache.tmp mv $GDK_PIXBUF/loaders.cache.tmp $GDK_PIXBUF/loaders.cache installShellCompletion --cmd rsvg-convert \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84621c59fda6..55bca0f7aca4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9724,8 +9724,7 @@ with pkgs; }; librsvg = callPackage ../development/libraries/librsvg { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation; + inherit (darwin.apple_sdk.frameworks) Foundation; }; libsigcxx = callPackage ../development/libraries/libsigcxx { }; From 5a3fb974780323d4c3fcce7a60841fc4994611d0 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Fri, 7 Feb 2025 00:01:04 +0800 Subject: [PATCH 0222/1107] emacs: fix string indentation for preUnpack of melpaBuild --- .../editors/emacs/build-support/melpa.nix | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/editors/emacs/build-support/melpa.nix b/pkgs/applications/editors/emacs/build-support/melpa.nix index 1258f8b7c26d..bdca913e865d 100644 --- a/pkgs/applications/editors/emacs/build-support/melpa.nix +++ b/pkgs/applications/editors/emacs/build-support/melpa.nix @@ -119,28 +119,28 @@ lib.extendMkDerivation { preUnpack = '' - mkdir -p "$NIX_BUILD_TOP/recipes" - recipeFile="$NIX_BUILD_TOP/recipes/$ename" - if [ -r "$recipe" ]; then - ln -s "$recipe" "$recipeFile" - nixInfoLog "link recipe" - elif [ -n "$recipe" ]; then - printf "%s" "$recipe" > "$recipeFile" - nixInfoLog "write recipe" - else - cat > "$recipeFile" <<'EOF' + mkdir -p "$NIX_BUILD_TOP/recipes" + recipeFile="$NIX_BUILD_TOP/recipes/$ename" + if [ -r "$recipe" ]; then + ln -s "$recipe" "$recipeFile" + nixInfoLog "link recipe" + elif [ -n "$recipe" ]; then + printf "%s" "$recipe" > "$recipeFile" + nixInfoLog "write recipe" + else + cat > "$recipeFile" <<'EOF' (${finalAttrs.ename} :fetcher git :url "" ${ lib.optionalString (finalAttrs.files != null) ":files ${finalAttrs.files}" }) EOF - nixInfoLog "use default recipe" - fi - nixInfoLog "recipe content:" "$(< $recipeFile)" - unset -v recipeFile + nixInfoLog "use default recipe" + fi + nixInfoLog "recipe content:" "$(< $recipeFile)" + unset -v recipeFile - ln -s "$packageBuild" "$NIX_BUILD_TOP/package-build" + ln -s "$packageBuild" "$NIX_BUILD_TOP/package-build" - mkdir -p "$NIX_BUILD_TOP/packages" + mkdir -p "$NIX_BUILD_TOP/packages" '' + preUnpack; From f0a6620784a99f69c4fa3563b4b219ad9eca9234 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 7 Feb 2025 19:35:03 +0200 Subject: [PATCH 0223/1107] librsvg: Put vala behind gobject-introspection conditional `vala` depends on `gobject-introspection` --- pkgs/development/libraries/librsvg/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 1c2b33ec094d..4f6e93674408 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -89,12 +89,12 @@ stdenv.mkDerivation (finalAttrs: { cargo-c cargo-auditable-cargo-wrapper python3Packages.docutils - vala rustPlatform.cargoSetupHook ] ++ lib.optionals withIntrospection [ gobject-introspection gi-docgen + vala # vala bindings require GObject introspection ]; buildInputs = @@ -104,7 +104,9 @@ stdenv.mkDerivation (finalAttrs: { dav1d pango freetype - vala + ] + ++ lib.optionals withIntrospection [ + vala # for share/vala/Makefile.vapigen ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation From 566feea79e6f2cbab742ac302be086cabc8cdf65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 7 Feb 2025 16:04:24 -0800 Subject: [PATCH 0224/1107] python313Packages.pikepdf: 9.5.1 -> 9.5.2 Diff: https://github.com/pikepdf/pikepdf/compare/refs/tags/v9.5.1...v9.5.2 Changelog: https://github.com/pikepdf/pikepdf/blob/v9.5.2/docs/releasenotes/version9.rst --- pkgs/development/python-modules/pikepdf/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 558d76e1eafe..da0ebb79b504 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -25,11 +25,9 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "9.5.1"; + version = "9.5.2"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "pikepdf"; repo = "pikepdf"; @@ -40,7 +38,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-Tzfzn0P9wGD1BbJ96F5CJXOk2CiLcd5qK+G8gVmkVtE="; + hash = "sha256-VYbfElC4YJFoO5VV4DVQ2Cu91RcFlsnZmRqJaNH8qRw="; }; patches = [ From c28495a152a3bac20bf4110bb2f1cf72ff6cbc73 Mon Sep 17 00:00:00 2001 From: goatastronaut0212 Date: Sat, 8 Feb 2025 07:57:50 +0700 Subject: [PATCH 0225/1107] unciv: 4.15.8 -> 4.15.9-patch1 --- pkgs/by-name/un/unciv/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/un/unciv/package.nix b/pkgs/by-name/un/unciv/package.nix index 39b11f9620de..17ddf1fd0f06 100644 --- a/pkgs/by-name/un/unciv/package.nix +++ b/pkgs/by-name/un/unciv/package.nix @@ -11,7 +11,7 @@ libXxf86vm, }: let - version = "4.15.8"; + version = "4.15.9-patch1"; desktopItem = makeDesktopItem { name = "unciv"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-Ytov2n7XieMQtc0C0uvMzpamLHhhTEtkKSfoU88Mlaw="; + hash = "sha256-HozoaTAKS/pO/xFLCoXUvrvEEd85oMMxkZ6fFDgSfvQ="; }; dontUnpack = true; From 18f8faa9a7490b0a11efae47705722c14f6b7c02 Mon Sep 17 00:00:00 2001 From: Mitchell Pleune Date: Sat, 8 Feb 2025 01:16:39 +0000 Subject: [PATCH 0226/1107] pulseaudio: disable pthread_setaffinity_np test Fails builds in LXC containers where not all cores are enabled, causing the pthread_setaffinity_np call to return EINVAL --- pkgs/servers/pulseaudio/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index fa3333433ebb..e548337948ab 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -95,6 +95,11 @@ stdenv.mkDerivation rec { }) ]; + postPatch = '' + # Fails in LXC containers where not all cores are enabled, where this setaffinity call will return EINVAL + sed -i "/fail_unless(pthread_setaffinity_np/d" src/tests/once-test.c + ''; + outputs = [ "out" "dev" From 5dbfbc05e052e9d0d3e6e5bbbc12d6b48ab779b1 Mon Sep 17 00:00:00 2001 From: Mitchell Pleune Date: Fri, 7 Feb 2025 20:50:25 -0500 Subject: [PATCH 0227/1107] python3Packages.twisted: disable test_cpuCount test (#380245) This test checks for the number of availaible CPU cores using two different methods, and asserts that they are equal. In situations such as LXC containers that do not have all cores availaible, one method can still return the real total CPU core count, and the other will return the number enabled. This causes a needless build fail in LXC. --- pkgs/development/python-modules/twisted/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index e461ba2df163..199944707eb4 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -109,6 +109,10 @@ buildPythonPackage rec { "MulticastTests.test_multicast" "MulticastTests.test_multiListen" ]; + "src/twisted/trial/test/test_script.py" = [ + # Fails in LXC containers with less than all cores availaible (limits.cpu) + "AutoJobsTests.test_cpuCount" + ]; "src/twisted/internet/test/test_unix.py" = [ # flaky? "UNIXTestsBuilder.test_sendFileDescriptorTriggersPauseProducing" From 09549ed17fa0b1e26b15cc6f148102153dc16217 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 8 Feb 2025 11:53:01 +1000 Subject: [PATCH 0228/1107] gtest: 1.15.2 -> 1.16.0 (#380242) https://github.com/google/googletest/releases/tag/v1.16.0 --- pkgs/by-name/gt/gtest/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gt/gtest/package.nix b/pkgs/by-name/gt/gtest/package.nix index db81b1f95792..2678e192a375 100644 --- a/pkgs/by-name/gt/gtest/package.nix +++ b/pkgs/by-name/gt/gtest/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "gtest"; - version = "1.15.2"; + version = "1.16.0"; outputs = [ "out" @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { owner = "google"; repo = "googletest"; rev = "v${version}"; - hash = "sha256-1OJ2SeSscRBNr7zZ/a8bJGIqAnhkg45re0j3DtPfcXM="; + hash = "sha256-01PK9LxqHno89gypd7ze5gDP4V3en2J5g6JZRqohDB0="; }; patches = [ From 536c98cb3283e5697f46c300569d472a7edd46a1 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 8 Feb 2025 11:54:21 +0300 Subject: [PATCH 0229/1107] Revert "gcc: rework, clean up, and document the cursed symlink hack" --- .../compilers/gcc/common/builder.nix | 225 ++++++++---------- .../compilers/gcc/common/libgcc.nix | 13 +- 2 files changed, 107 insertions(+), 131 deletions(-) diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix index 1a99835aa2bd..633251910dbe 100644 --- a/pkgs/development/compilers/gcc/common/builder.nix +++ b/pkgs/development/compilers/gcc/common/builder.nix @@ -3,6 +3,7 @@ stdenv, enableMultilib, targetConfig, + withoutTargetLibc, }: let @@ -209,136 +210,112 @@ originalAttrs: ''; preInstall = - # What follows is a horribly cursed hack. - # - # GCC will install its libraries to $out/lib, $out/lib32, $out/lib64, - # $out/$targetConfig/lib, $out/$targetConfig/lib32 or $out/$targetConfig/lib64, - # depending on whether it's built as native or cross, and the exact target spec. - # - # We can't predict what it's actually going to do, and we also can't just tell it - # to always install to $out/lib, but we want everything to end up in $out/lib - # for consistency (multilib weirdness aside). - # - # So, we create a bunch of symlinks before we run GCC's install phase, - # redirecting every possible directory it may want to write to to the place - # we actually want things to be installed. - # We will then nuke the symlinks in postInstall. - # - # FIXME: there must be a better way to do this. '' - declare -ga compatibilitySymlinks=() - - makeCompatibilitySymlink() { - for output in "$out" "''${!outputLib}"; do - local linkTarget="$1" - local linkName="$output/$2" - - echo "Creating compatibility symlink: $linkTarget -> $linkName" - - mkdir -p "$(dirname "$linkName")" - ln -s "$linkTarget" "$linkName" - compatibilitySymlinks+=("$linkName") - done - } + mkdir -p "$out/''${targetConfig}/lib" + mkdir -p "''${!outputLib}/''${targetConfig}/lib" '' + - # This will redirect $output/lib{32,64} to $output/lib. - # Multilib is special, because it creates $out/lib (for 32-bit) - # and $out/lib64 (for 64-bit). No other targets can have both. - lib.optionalString (!enableMultilib) '' - makeCompatibilitySymlink lib lib32 - makeCompatibilitySymlink lib lib64 + # if cross-compiling, link from $lib/lib to $lib/${targetConfig}. + # since native-compiles have $lib/lib as a directory (not a + # symlink), this ensures that in every case we can assume that + # $lib/lib contains the .so files + lib.optionalString (with stdenv; targetPlatform.config != hostPlatform.config) '' + ln -Ts "''${!outputLib}/''${targetConfig}/lib" $lib/lib '' + - # This will redirect $output/$targetConfig/lib{,32,64} to $output/lib. - lib.optionalString (with stdenv; targetPlatform.config != hostPlatform.config) '' - makeCompatibilitySymlink lib $targetConfig/lib32 - makeCompatibilitySymlink lib $targetConfig/lib64 - makeCompatibilitySymlink ../lib $targetConfig/lib - ''; - - postInstall = - '' - # Clean up our compatibility symlinks (see above) - for link in "''${compatibilitySymlinks[@]}"; do - echo "Removing compatibility symlink: $link" - rm -f "$link" - done - - # Move runtime libraries to lib output. - moveToOutput "lib/lib*.so*" "''${!outputLib}" - moveToOutput "lib/lib*.la" "''${!outputLib}" - moveToOutput "lib/lib*.dylib" "''${!outputLib}" - moveToOutput "lib/lib*.dll.a" "''${!outputLib}" - moveToOutput "lib/lib*.dll" "''${!outputLib}" - moveToOutput "share/gcc-*/python" "''${!outputLib}" - - if [ -z "$enableShared" ]; then - moveToOutput "lib/lib*.a" "''${!outputLib}" - fi - - for i in "''${!outputLib}"/lib/*.{la,py}; do - substituteInPlace "$i" --replace "$out" "''${!outputLib}" - done - - if [ -n "$enableMultilib" ]; then - moveToOutput "lib64/lib*.so*" "''${!outputLib}" - moveToOutput "lib64/lib*.la" "''${!outputLib}" - moveToOutput "lib64/lib*.dylib" "''${!outputLib}" - moveToOutput "lib64/lib*.dll.a" "''${!outputLib}" - moveToOutput "lib64/lib*.dll" "''${!outputLib}" - - for i in "''${!outputLib}"/lib64/*.{la,py}; do - substituteInPlace "$i" --replace "$out" "''${!outputLib}" - done - fi - - # Remove `fixincl' to prevent a retained dependency on the - # previous gcc. - rm -rf $out/libexec/gcc/*/*/install-tools - rm -rf $out/lib/gcc/*/*/install-tools - - # More dependencies with the previous gcc or some libs (gccbug stores the build command line) - rm -rf $out/bin/gccbug - - if type "install_name_tool"; then - for i in "''${!outputLib}"/lib/*.*.dylib "''${!outputLib}"/lib/*.so.[0-9]; do - install_name_tool -id "$i" "$i" || true - for old_path in $(otool -L "$i" | grep "$out" | awk '{print $1}'); do - new_path=`echo "$old_path" | sed "s,$out,''${!outputLib},"` - install_name_tool -change "$old_path" "$new_path" "$i" || true - done - done - fi - - # Get rid of some "fixed" header files - rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux,sys/mount.h,bits/statx.h,pthread.h} - - # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks. - for i in $out/bin/*-gcc*; do - if cmp -s $out/bin/gcc $i; then - ln -sfn gcc $i - fi - done - - for i in $out/bin/c++ $out/bin/*-c++* $out/bin/*-g++*; do - if cmp -s $out/bin/g++ $i; then - ln -sfn g++ $i - fi - done - - # Two identical man pages are shipped (moving and compressing is done later) - for i in "$out"/share/man/man1/*g++.1; do - if test -e "$i"; then - man_prefix=`echo "$i" | sed "s,.*/\(.*\)g++.1,\1,"` - ln -sf "$man_prefix"gcc.1 "$i" - fi - done - '' + # Make `lib64` symlinks to `lib`. + lib.optionalString + (!enableMultilib && stdenv.hostPlatform.is64bit && !stdenv.hostPlatform.isMips64n32) + '' + ln -s lib "$out/''${targetConfig}/lib64" + ln -s lib "''${!outputLib}/''${targetConfig}/lib64" + '' + - # Recreate the target symlink so GCC can find libgcc_s on non-split builds. - lib.optionalString (with stdenv; targetPlatform.config != hostPlatform.config) '' - ln -s $lib/lib $lib/$targetConfig/lib + # On mips platforms, gcc follows the IRIX naming convention: + # + # $PREFIX/lib = mips32 + # $PREFIX/lib32 = mips64n32 + # $PREFIX/lib64 = mips64 + # + # Make `lib32` symlinks to `lib`. + lib.optionalString (!enableMultilib && stdenv.targetPlatform.isMips64n32) '' + ln -s lib "$out/''${targetConfig}/lib32" + ln -s lib "''${!outputLib}/''${targetConfig}/lib32" ''; + + postInstall = '' + # Move runtime libraries to lib output. + moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.so*" "''${!outputLib}" + moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.la" "''${!outputLib}" + moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.dylib" "''${!outputLib}" + moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.dll.a" "''${!outputLib}" + moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.dll" "''${!outputLib}" + moveToOutput "share/gcc-*/python" "''${!outputLib}" + + if [ -z "$enableShared" ]; then + moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.a" "''${!outputLib}" + fi + + for i in "''${!outputLib}/''${targetConfig}"/lib/*.{la,py}; do + substituteInPlace "$i" --replace "$out" "''${!outputLib}" + done + + if [ -n "$enableMultilib" ]; then + moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.so*" "''${!outputLib}" + moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.la" "''${!outputLib}" + moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.dylib" "''${!outputLib}" + moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.dll.a" "''${!outputLib}" + moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.dll" "''${!outputLib}" + + for i in "''${!outputLib}/''${targetConfig}"/lib64/*.{la,py}; do + substituteInPlace "$i" --replace "$out" "''${!outputLib}" + done + fi + + # Remove `fixincl' to prevent a retained dependency on the + # previous gcc. + rm -rf $out/libexec/gcc/*/*/install-tools + rm -rf $out/lib/gcc/*/*/install-tools + + # More dependencies with the previous gcc or some libs (gccbug stores the build command line) + rm -rf $out/bin/gccbug + + if type "install_name_tool"; then + for i in "''${!outputLib}"/lib/*.*.dylib "''${!outputLib}"/lib/*.so.[0-9]; do + install_name_tool -id "$i" "$i" || true + for old_path in $(otool -L "$i" | grep "$out" | awk '{print $1}'); do + new_path=`echo "$old_path" | sed "s,$out,''${!outputLib},"` + install_name_tool -change "$old_path" "$new_path" "$i" || true + done + done + fi + + # Get rid of some "fixed" header files + rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux,sys/mount.h,bits/statx.h,pthread.h} + + # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks. + for i in $out/bin/*-gcc*; do + if cmp -s $out/bin/gcc $i; then + ln -sfn gcc $i + fi + done + + for i in $out/bin/c++ $out/bin/*-c++* $out/bin/*-g++*; do + if cmp -s $out/bin/g++ $i; then + ln -sfn g++ $i + fi + done + + # Two identical man pages are shipped (moving and compressing is done later) + for i in "$out"/share/man/man1/*g++.1; do + if test -e "$i"; then + man_prefix=`echo "$i" | sed "s,.*/\(.*\)g++.1,\1,"` + ln -sf "$man_prefix"gcc.1 "$i" + fi + done + ''; + } + // lib.optionalAttrs ((stdenv.targetPlatform.config != stdenv.hostPlatform.config) && withoutTargetLibc) { + dontCheckForBrokenSymlinks = true; } )) diff --git a/pkgs/development/compilers/gcc/common/libgcc.nix b/pkgs/development/compilers/gcc/common/libgcc.nix index d38be2f6b76a..3d4bd9067763 100644 --- a/pkgs/development/compilers/gcc/common/libgcc.nix +++ b/pkgs/development/compilers/gcc/common/libgcc.nix @@ -105,15 +105,14 @@ lib.pipe drv + lib.optionalString enableLibGccOutput ( '' # move libgcc from lib to its own output (libgcc) - mkdir -p $libgcc/lib - mv $lib/lib/libgcc_s.so $libgcc/lib/ - mv $lib/lib/libgcc_s.so.${libgcc_s-version-major} $libgcc/lib/ - ln -s $libgcc/lib/libgcc_s.so $lib/lib/ - ln -s $libgcc/lib/libgcc_s.so.${libgcc_s-version-major} $lib/lib/ + mkdir -p $libgcc/${targetPlatformSlash}lib + mv $lib/${targetPlatformSlash}lib/libgcc_s.so $libgcc/${targetPlatformSlash}lib/ + mv $lib/${targetPlatformSlash}lib/libgcc_s.so.${libgcc_s-version-major} $libgcc/${targetPlatformSlash}lib/ + ln -s $libgcc/${targetPlatformSlash}lib/libgcc_s.so $lib/${targetPlatformSlash}lib/ + ln -s $libgcc/${targetPlatformSlash}lib/libgcc_s.so.${libgcc_s-version-major} $lib/${targetPlatformSlash}lib/ '' + lib.optionalString (targetPlatformSlash != "") '' - mkdir -p $libgcc/${targetPlatformSlash} - ln -s $libgcc/lib $libgcc/${targetPlatformSlash}lib + ln -s ${targetPlatformSlash}lib $libgcc/lib '' # # Nixpkgs ordinarily turns dynamic linking into pseudo-static linking: From b4b0914097642758bc9754c25e3d6727d595bdca Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Fri, 7 Feb 2025 19:54:41 +0000 Subject: [PATCH 0230/1107] tcl: fix on static architectures This is a bit of a silly one. It's a symbol redefinition problem caused by autoconf being pessimistic, then a funny eval error where `stdenv.hostPlatform.extensions.dynamicLibrary` is not defined, say, when the platform does not support dynamic libraries. Fixes: https://github.com/NixOS/nixpkgs/issues/380168 --- pkgs/development/interpreters/tcl/generic.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index 51519f61b0f2..43b9aefbde20 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -80,7 +80,14 @@ let "--disable-zipfs" ] ++ [ + # During cross compilation, the tcl build system assumes that libc + # functions are broken if it cannot test if they are broken or not and + # then causes a link error on static platforms due to symbol conflict. + # These functions are *checks notes* strtoul and strstr. These are + # never broken on modern platforms! "tcl_cv_strtod_unbroken=ok" + "tcl_cv_strtoul_unbroken=ok" + "tcl_cv_strstr_unbroken=ok" ] ++ lib.optional stdenv.hostPlatform.is64bit "--enable-64bit"; @@ -89,11 +96,17 @@ let postInstall = let dllExtension = stdenv.hostPlatform.extensions.sharedLibrary; + staticExtension = stdenv.hostPlatform.extensions.staticLibrary; in '' make install-private-headers ln -s $out/bin/tclsh${release} $out/bin/tclsh - ln -s $out/lib/libtcl${release}${dllExtension} $out/lib/libtcl${dllExtension} + if [[ -e $out/lib/libtcl${release}${staticExtension} ]]; then + ln -s $out/lib/libtcl${release}${staticExtension} $out/lib/libtcl${staticExtension} + fi + ${lib.optionalString (!stdenv.hostPlatform.isStatic) '' + ln -s $out/lib/libtcl${release}${dllExtension} $out/lib/libtcl${dllExtension} + ''} ''; meta = with lib; { From bf0f3484634ecce9f708f1369b6976beea737382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 8 Feb 2025 10:45:47 +0100 Subject: [PATCH 0231/1107] libtasn1: add meta.changelog It's quite useful for r-ryantm's automatic pull requests. --- pkgs/by-name/li/libtasn1/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/li/libtasn1/package.nix b/pkgs/by-name/li/libtasn1/package.nix index cc3ed0716a78..badcca121580 100644 --- a/pkgs/by-name/li/libtasn1/package.nix +++ b/pkgs/by-name/li/libtasn1/package.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl2Plus; platforms = platforms.all; + changelog = "https://gitlab.com/gnutls/libtasn1/-/blob/v${version}/NEWS"; }; } From aa7d855d6318a039d0af1df507b5bd76179f5b53 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 8 Feb 2025 12:13:36 +0100 Subject: [PATCH 0232/1107] openldap: fix static Closes: https://github.com/NixOS/nixpkgs/pull/235270 --- pkgs/by-name/op/openldap/package.nix | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/op/openldap/package.nix b/pkgs/by-name/op/openldap/package.nix index c353a4422d4c..ccf8dcbc1635 100644 --- a/pkgs/by-name/op/openldap/package.nix +++ b/pkgs/by-name/op/openldap/package.nix @@ -12,6 +12,10 @@ systemdMinimal, libxcrypt, + # options + withModules ? !stdenv.hostPlatform.isStatic, + withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal, + # passthru nixosTests, }: @@ -25,6 +29,14 @@ stdenv.mkDerivation rec { hash = "sha256-LLfcc+nINA3/DZk1f7qleKvzDMZhnwUhlyxVVoHmsv8="; }; + patches = [ + (fetchurl { + name = "test069-sleep.patch"; + url = "https://bugs.openldap.org/attachment.cgi?id=1051"; + hash = "sha256-9LcFTswMQojrwHD+PRvlnSrwrISCFcboHypBwoDIZc0="; + }) + ]; + # TODO: separate "out" and "bin" outputs = [ "out" @@ -46,12 +58,16 @@ stdenv.mkDerivation rec { (cyrus_sasl.override { inherit openssl; }) - libsodium libtool openssl ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ libxcrypt # causes linking issues on *-darwin + ] + ++ lib.optionals withModules [ + libsodium + ] + ++ lib.optionals withSystemd [ systemdMinimal ]; @@ -61,10 +77,10 @@ stdenv.mkDerivation rec { configureFlags = [ - "--enable-argon2" "--enable-crypt" - "--enable-modules" "--enable-overlays" + (lib.enableFeature withModules "argon2") + (lib.enableFeature withModules "modules") ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--with-yielding_select=yes" @@ -126,7 +142,7 @@ stdenv.mkDerivation rec { "INSTALL=install" ]; - postInstall = '' + postInstall = lib.optionalString withModules '' for module in $extraContribModules; do make $installFlags install -C contrib/slapd-modules/$module done From 9040833b3f88f47fd3d92470f0e1ea8e95acee5d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 8 Feb 2025 12:30:14 +0100 Subject: [PATCH 0233/1107] libpsl: backport pkg-config static fix This was merged 9 months ago, and still no release, so let's backport it, because the alternative is adding the same hack as curl in other packages, like libsoup. --- pkgs/by-name/cu/curlMinimal/package.nix | 5 ----- pkgs/by-name/li/libpsl/package.nix | 11 +++++++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix index 1c58c12f9860..90eb467c4df7 100644 --- a/pkgs/by-name/cu/curlMinimal/package.nix +++ b/pkgs/by-name/cu/curlMinimal/package.nix @@ -123,11 +123,6 @@ stdenv.mkDerivation (finalAttrs: { preConfigure = '' sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure rm src/tool_hugehelp.c - '' + lib.optionalString (pslSupport && stdenv.hostPlatform.isStatic) '' - # curl doesn't understand that libpsl2 has deps because it doesn't use - # pkg-config. - # https://github.com/curl/curl/pull/12919 - configureFlagsArray+=("LIBS=-lidn2 -lunistring") ''; configureFlags = [ diff --git a/pkgs/by-name/li/libpsl/package.nix b/pkgs/by-name/li/libpsl/package.nix index 15cfedbdae89..81dd87ded09c 100644 --- a/pkgs/by-name/li/libpsl/package.nix +++ b/pkgs/by-name/li/libpsl/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, autoreconfHook, docbook_xsl, docbook_xml_dtd_43, @@ -25,6 +26,16 @@ stdenv.mkDerivation rec { hash = "sha256-mp9qjG7bplDPnqVUdc0XLdKEhzFoBOnHMgLZdXLNOi0="; }; + patches = [ + # Can be dropped on next release, or if we switch to Meson for + # this package. Test pkgsStatic.curl still builds. + (fetchpatch { + name = "static.patch"; + url = "https://github.com/rockdaboot/libpsl/commit/490bd6f98a2addcade55028ea60c36cce07e21e4.patch"; + hash = "sha256-7Uu9gaVuA9Aly2mmnhUVgv2BYQTSBODJ2rDl5xp0uVY="; + }) + ]; + outputs = [ "out" From 91e2c22089fb24b73e6b78bf17853cb5dc1dcf07 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 8 Feb 2025 14:36:10 +0100 Subject: [PATCH 0234/1107] duktape: fix static Upstream build system has no way to build a shared library, but having the command line tool is better than nothing. --- pkgs/by-name/du/duktape/package.nix | 30 +++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/du/duktape/package.nix b/pkgs/by-name/du/duktape/package.nix index c285f44a5e4a..9cb67506022b 100644 --- a/pkgs/by-name/du/duktape/package.nix +++ b/pkgs/by-name/du/duktape/package.nix @@ -21,19 +21,25 @@ stdenv.mkDerivation (finalAttrs: { validatePkgConfig ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; - buildPhase = '' - make -f Makefile.sharedlibrary - make -f Makefile.cmdline - ''; + buildPhase = + '' + make -f Makefile.cmdline + '' + + lib.optionalString (!stdenv.hostPlatform.isStatic) '' + make -f Makefile.sharedlibrary + ''; - installPhase = '' - install -d $out/bin - install -m755 duk $out/bin/ - install -d $out/lib/pkgconfig - install -d $out/include - make -f Makefile.sharedlibrary install INSTALL_PREFIX=$out - substituteAll ${./duktape.pc.in} $out/lib/pkgconfig/duktape.pc - ''; + installPhase = + '' + install -d $out/bin + install -m755 duk $out/bin/ + '' + + lib.optionalString (!stdenv.hostPlatform.isStatic) '' + install -d $out/lib/pkgconfig + install -d $out/include + make -f Makefile.sharedlibrary install INSTALL_PREFIX=$out + substituteAll ${./duktape.pc.in} $out/lib/pkgconfig/duktape.pc + ''; enableParallelBuilding = true; From efbd153c406e00dd3f300e2a91c686509c6896d5 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 7 Feb 2025 19:44:51 +0200 Subject: [PATCH 0235/1107] xfce.{{libxfce4{util,ui,windowing},xfconf,xfce4-panel,garcon,thunar}}: Conditionalize gobject-introspection and vala gobject-introspection doesn't support static Although the dependencies for these don't build on static this can still be useful in the future or for preventing additional issues being created for xfce packages. Tested on native by changing the conditionals to false. --- pkgs/desktops/xfce/core/garcon/default.nix | 12 ++++++++-- .../desktops/xfce/core/libxfce4ui/default.nix | 22 +++++++++++++------ .../xfce/core/libxfce4util/default.nix | 11 +++++++--- .../xfce/core/libxfce4windowing/default.nix | 12 +++++++--- pkgs/desktops/xfce/core/thunar/default.nix | 10 ++++++--- .../xfce/core/xfce4-panel/default.nix | 15 ++++++++----- pkgs/desktops/xfce/core/xfconf/default.nix | 18 ++++++++++----- 7 files changed, 72 insertions(+), 28 deletions(-) diff --git a/pkgs/desktops/xfce/core/garcon/default.nix b/pkgs/desktops/xfce/core/garcon/default.nix index 6f40696c3d44..9a27b045700a 100644 --- a/pkgs/desktops/xfce/core/garcon/default.nix +++ b/pkgs/desktops/xfce/core/garcon/default.nix @@ -1,4 +1,10 @@ -{ lib, mkXfceDerivation, gobject-introspection, gtk3, libxfce4ui, libxfce4util }: +{ stdenv, lib, mkXfceDerivation, gtk3, libxfce4ui, libxfce4util, + withIntrospection ? + lib.meta.availableOn stdenv.hostPlatform gobject-introspection + && stdenv.hostPlatform.emulatorAvailable buildPackages, + buildPackages, + gobject-introspection, +}: mkXfceDerivation { category = "xfce"; @@ -7,7 +13,9 @@ mkXfceDerivation { sha256 = "sha256-MeZkDb2QgGMaloO6Nwlj9JmZByepd6ERqpAWqrVv1xw="; - nativeBuildInputs = [ gobject-introspection ]; + nativeBuildInputs = lib.optionals withIntrospection [ + gobject-introspection + ]; buildInputs = [ gtk3 libxfce4ui libxfce4util ]; diff --git a/pkgs/desktops/xfce/core/libxfce4ui/default.nix b/pkgs/desktops/xfce/core/libxfce4ui/default.nix index 12c2d2968159..8862c6dffe03 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui/default.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui/default.nix @@ -1,9 +1,8 @@ { + stdenv, mkXfceDerivation, lib, - gobject-introspection, perl, - vala, libICE, libSM, libepoxy, @@ -13,6 +12,12 @@ xfconf, gtk3, libxfce4util, + withIntrospection ? + lib.meta.availableOn stdenv.hostPlatform gobject-introspection + && stdenv.hostPlatform.emulatorAvailable buildPackages, + buildPackages, + gobject-introspection, + vala, }: mkXfceDerivation { @@ -22,11 +27,14 @@ mkXfceDerivation { sha256 = "sha256-M+OapPHQ/WxlkUzHPx+ELstVyGoZanCxCL0N8hDWSN8="; - nativeBuildInputs = [ - gobject-introspection - perl - vala - ]; + nativeBuildInputs = + [ + perl + ] + ++ lib.optionals withIntrospection [ + gobject-introspection + vala # vala bindings require GObject introspection + ]; buildInputs = [ libICE diff --git a/pkgs/desktops/xfce/core/libxfce4util/default.nix b/pkgs/desktops/xfce/core/libxfce4util/default.nix index d2486d2fd256..620141aac698 100644 --- a/pkgs/desktops/xfce/core/libxfce4util/default.nix +++ b/pkgs/desktops/xfce/core/libxfce4util/default.nix @@ -1,9 +1,14 @@ { + stdenv, mkXfceDerivation, lib, - gobject-introspection, vala, glib, + withIntrospection ? + lib.meta.availableOn stdenv.hostPlatform gobject-introspection + && stdenv.hostPlatform.emulatorAvailable buildPackages, + buildPackages, + gobject-introspection, }: mkXfceDerivation { @@ -13,9 +18,9 @@ mkXfceDerivation { sha256 = "sha256-0qbJSCXHsVz3XILHICFhciyz92LgMZiR7XFLAESHRGQ="; - nativeBuildInputs = [ + nativeBuildInputs = lib.optionals withIntrospection [ gobject-introspection - vala + vala # vala bindings require GObject introspection ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/xfce/core/libxfce4windowing/default.nix b/pkgs/desktops/xfce/core/libxfce4windowing/default.nix index 3392ee2a7685..06064785eaf1 100644 --- a/pkgs/desktops/xfce/core/libxfce4windowing/default.nix +++ b/pkgs/desktops/xfce/core/libxfce4windowing/default.nix @@ -1,6 +1,6 @@ -{ lib +{ stdenv +, lib , mkXfceDerivation -, gobject-introspection , wayland-scanner , glib , gtk3 @@ -11,6 +11,11 @@ , wayland , wayland-protocols , wlr-protocols +, withIntrospection ? + lib.meta.availableOn stdenv.hostPlatform gobject-introspection + && stdenv.hostPlatform.emulatorAvailable buildPackages +, buildPackages +, gobject-introspection }: mkXfceDerivation { @@ -21,8 +26,9 @@ mkXfceDerivation { sha256 = "sha256-Xw1hs854K5dZCAYoBMoqJzdSxPRFUYqEpWxg4DLSK5Q="; nativeBuildInputs = [ - gobject-introspection wayland-scanner + ] ++ lib.optionals withIntrospection [ + gobject-introspection ]; buildInputs = [ diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix index 23e6799845ca..31b5b15fa692 100644 --- a/pkgs/desktops/xfce/core/thunar/default.nix +++ b/pkgs/desktops/xfce/core/thunar/default.nix @@ -1,4 +1,5 @@ -{ mkXfceDerivation +{ stdenv +, mkXfceDerivation , lib , docbook_xsl , exo @@ -14,10 +15,12 @@ , pcre2 , xfce4-panel , xfconf -, gobject-introspection , makeWrapper , symlinkJoin , thunarPlugins ? [] +, withIntrospection ? false +, buildPackages +, gobject-introspection }: let unwrapped = mkXfceDerivation { @@ -29,8 +32,9 @@ let unwrapped = mkXfceDerivation { nativeBuildInputs = [ docbook_xsl - gobject-introspection libxslt + ] ++ lib.optionals withIntrospection [ + gobject-introspection ]; buildInputs = [ diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix index 6c924b068441..d686899cd408 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix @@ -1,9 +1,9 @@ -{ lib +{ stdenv +, lib , mkXfceDerivation , cairo , exo , garcon -, gobject-introspection , gtk-layer-shell , gtk3 , libdbusmenu-gtk3 @@ -12,9 +12,14 @@ , libxfce4util , libxfce4windowing , tzdata -, vala , wayland , xfconf +, withIntrospection ? + lib.meta.availableOn stdenv.hostPlatform gobject-introspection + && stdenv.hostPlatform.emulatorAvailable buildPackages +, buildPackages +, gobject-introspection +, vala }: mkXfceDerivation { @@ -24,9 +29,9 @@ mkXfceDerivation { sha256 = "sha256-tLWjU0M7tuE+qqDwaE1CtnOjDiPWno8Mf7hhxYxbvjo="; - nativeBuildInputs = [ + nativeBuildInputs = lib.optionals withIntrospection [ gobject-introspection - vala + vala # vala bindings require GObject introspection ]; buildInputs = [ diff --git a/pkgs/desktops/xfce/core/xfconf/default.nix b/pkgs/desktops/xfce/core/xfconf/default.nix index 8ca8990c17b7..dc97afbba935 100644 --- a/pkgs/desktops/xfce/core/xfconf/default.nix +++ b/pkgs/desktops/xfce/core/xfconf/default.nix @@ -1,4 +1,5 @@ { + stdenv, lib, mkXfceDerivation, gobject-introspection, @@ -6,6 +7,10 @@ vala, libxfce4util, glib, + withIntrospection ? + lib.meta.availableOn stdenv.hostPlatform gobject-introspection + && stdenv.hostPlatform.emulatorAvailable buildPackages, + buildPackages, }: mkXfceDerivation { @@ -15,11 +20,14 @@ mkXfceDerivation { sha256 = "sha256-U+Sk7ubBr1ZD1GLQXlxrx0NQdhV/WpVBbnLcc94Tjcw="; - nativeBuildInputs = [ - gobject-introspection - perl - vala - ]; + nativeBuildInputs = + [ + perl + ] + ++ lib.optionals withIntrospection [ + gobject-introspection + vala # vala bindings require GObject introspection + ]; buildInputs = [ libxfce4util ]; From fe5e11faed6241aacf7220436088789287507494 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 8 Feb 2025 16:28:50 +0000 Subject: [PATCH 0236/1107] stdenv, cmake: drop `--oldincludedir` Without the change the build of upcoming `sqlite-3.49.0` will fail as: > Error: Unknown option --oldincludedir > Try: 'configure --help' for options Looking at https://www.gnu.org/prep/standards/html_node/Directory-Variables.html it feels like it's something that predates gcc and it should be an alias to `--includedir=`. Let's just drop the setting of `--oldincludedir=` (and `cmake` equivalent). --- pkgs/build-support/setup-hooks/multiple-outputs.sh | 2 +- pkgs/by-name/cm/cmake/setup-hook.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh index 45096d833b42..cc3ab4816fa2 100644 --- a/pkgs/build-support/setup-hooks/multiple-outputs.sh +++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh @@ -85,7 +85,7 @@ _multioutConfig() { prependToVar configureFlags \ --bindir="${!outputBin}"/bin --sbindir="${!outputBin}"/sbin \ - --includedir="${!outputInclude}"/include --oldincludedir="${!outputInclude}"/include \ + --includedir="${!outputInclude}"/include \ --mandir="${!outputMan}"/share/man --infodir="${!outputInfo}"/share/info \ --docdir="${!outputDoc}"/share/doc/"${shareDocName}" \ --libdir="${!outputLib}"/lib --libexecdir="${!outputLib}"/libexec \ diff --git a/pkgs/by-name/cm/cmake/setup-hook.sh b/pkgs/by-name/cm/cmake/setup-hook.sh index 3df8b9bd986b..f9db8f0919ac 100755 --- a/pkgs/by-name/cm/cmake/setup-hook.sh +++ b/pkgs/by-name/cm/cmake/setup-hook.sh @@ -93,7 +93,6 @@ cmakeConfigurePhase() { prependToVar cmakeFlags "-DCMAKE_INSTALL_BINDIR=${!outputBin}/bin" prependToVar cmakeFlags "-DCMAKE_INSTALL_SBINDIR=${!outputBin}/sbin" prependToVar cmakeFlags "-DCMAKE_INSTALL_INCLUDEDIR=${!outputInclude}/include" - prependToVar cmakeFlags "-DCMAKE_INSTALL_OLDINCLUDEDIR=${!outputInclude}/include" prependToVar cmakeFlags "-DCMAKE_INSTALL_MANDIR=${!outputMan}/share/man" prependToVar cmakeFlags "-DCMAKE_INSTALL_INFODIR=${!outputInfo}/share/info" prependToVar cmakeFlags "-DCMAKE_INSTALL_DOCDIR=${!outputDoc}/share/doc/${shareDocName}" From 35bb379adf55a0c4e81286868242971027b0883d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 Feb 2025 03:31:44 +1000 Subject: [PATCH 0237/1107] wayland-protocols: 1.39 -> 1.40 (#367753) --- pkgs/development/libraries/wayland/protocols.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 85b9d5fe4f92..9ec92e7ea20c 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "wayland-protocols"; - version = "1.39"; + version = "1.40"; doCheck = stdenv.hostPlatform == stdenv.buildPlatform @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/${finalAttrs.pname}/-/releases/${finalAttrs.version}/downloads/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-4dzcu/COLgqKAu5dmgvjpqr8OaS1H6fg0vGhZBHLcvo="; + hash = "sha256-shcReTJHwsQnY5FDkt+p/LnjcoyktKoRCtuNkV/ABok="; }; postPatch = lib.optionalString finalAttrs.doCheck '' From 4f3317d251b854d9c88d2a9d7d0ad1bbdbe12f42 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 8 Feb 2025 19:13:36 +0100 Subject: [PATCH 0238/1107] python313Packages.seccomp: add imports check --- pkgs/development/python-modules/seccomp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/seccomp/default.nix b/pkgs/development/python-modules/seccomp/default.nix index 2e8830277b94..4e217dab7f8b 100644 --- a/pkgs/development/python-modules/seccomp/default.nix +++ b/pkgs/development/python-modules/seccomp/default.nix @@ -24,6 +24,8 @@ buildPythonPackage rec { 'libraries=["seccomp"]' ''; + pythonImportsCheck = [ "seccomp" ]; + meta = with lib; { description = "Python bindings for libseccomp"; license = with licenses; [ lgpl21 ]; From c8dedb8230ebc24b1aab685b8f687edc89426efa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 8 Feb 2025 19:14:29 +0100 Subject: [PATCH 0239/1107] libseccomp: test python bindings in passthru --- pkgs/by-name/li/libseccomp/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/li/libseccomp/package.nix b/pkgs/by-name/li/libseccomp/package.nix index 2d238f64dc66..a06233a88a64 100644 --- a/pkgs/by-name/li/libseccomp/package.nix +++ b/pkgs/by-name/li/libseccomp/package.nix @@ -7,6 +7,7 @@ which, gperf, nix-update-script, + python3Packages, }: stdenv.mkDerivation rec { @@ -51,6 +52,9 @@ stdenv.mkDerivation rec { passthru = { updateScript = nix-update-script { }; + tests = { + inherit (python3Packages) seccomp; + }; }; meta = with lib; { From 611f4847de16748192a5103dacc15f2657c55fc6 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Thu, 16 Jan 2025 11:14:44 +0100 Subject: [PATCH 0240/1107] nixos/mobilizon: update nginx config --- nixos/modules/services/web-apps/mobilizon.nix | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/nixos/modules/services/web-apps/mobilizon.nix b/nixos/modules/services/web-apps/mobilizon.nix index d70c50d981de..e64fb3766522 100644 --- a/nixos/modules/services/web-apps/mobilizon.nix +++ b/nixos/modules/services/web-apps/mobilizon.nix @@ -424,34 +424,35 @@ in virtualHosts."${hostname}" = { enableACME = lib.mkDefault true; forceSSL = lib.mkDefault true; - extraConfig = '' - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - ''; locations."/" = { inherit proxyPass; + proxyWebsockets = true; + recommendedProxySettings = lib.mkDefault true; + extraConfig = '' + expires off; + add_header Cache-Control "public, max-age=0, s-maxage=0, must-revalidate" always; + ''; }; - locations."~ ^/(js|css|img)" = { + locations."~ ^/(assets|img)" = { root = "${cfg.package}/lib/mobilizon-${cfg.package.version}/priv/static"; extraConfig = '' - etag off; access_log off; - add_header Cache-Control "public, max-age=31536000, immutable"; + add_header Cache-Control "public, max-age=31536000, s-maxage=31536000, immutable"; ''; }; locations."~ ^/(media|proxy)" = { inherit proxyPass; + recommendedProxySettings = lib.mkDefault true; + # Combination of HTTP/1.1 and disabled request buffering is + # needed to directly forward chunked responses extraConfig = '' - etag off; + proxy_http_version 1.1; + proxy_request_buffering off; access_log off; - add_header Cache-Control "public, max-age=31536000, immutable"; + add_header Cache-Control "public, max-age=31536000, s-maxage=31536000, immutable"; ''; }; + }; }; From 142d7c0f8825f85877b51ac9d5d1a76bbd899f37 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Thu, 16 Jan 2025 11:16:38 +0100 Subject: [PATCH 0241/1107] nixos/mobilizon: remove `with lib;` and unused `rec` --- nixos/modules/services/web-apps/mobilizon.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-apps/mobilizon.nix b/nixos/modules/services/web-apps/mobilizon.nix index e64fb3766522..b139fc836125 100644 --- a/nixos/modules/services/web-apps/mobilizon.nix +++ b/nixos/modules/services/web-apps/mobilizon.nix @@ -5,9 +5,17 @@ ... }: -with lib; - let + inherit (lib) + mkEnableOption + mkPackageOption + mkOption + mkDefault + mkIf + types + literalExpression + ; + cfg = config.services.mobilizon; user = "mobilizon"; @@ -20,7 +28,7 @@ let # Make a package containing launchers with the correct envirenment, instead of # setting it with systemd services, so that the user can also use them without # troubles - launchers = pkgs.stdenv.mkDerivation rec { + launchers = pkgs.stdenv.mkDerivation { pname = "${cfg.package.pname}-launchers"; inherit (cfg.package) version; From eb9659fa9b63f7eee1666ac2cf78884eb53fecf0 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Thu, 16 Jan 2025 11:38:53 +0100 Subject: [PATCH 0242/1107] nixosTests.mobilizon: migrate from handleTest to runTest --- nixos/tests/all-tests.nix | 2 +- nixos/tests/mobilizon.nix | 82 +++++++++++++++++++-------------------- 2 files changed, 41 insertions(+), 43 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index dd117cca93b8..3cfd2cd4526b 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -615,7 +615,7 @@ in { misc = handleTest ./misc.nix {}; misskey = handleTest ./misskey.nix {}; mjolnir = handleTest ./matrix/mjolnir.nix {}; - mobilizon = handleTest ./mobilizon.nix {}; + mobilizon = runTest ./mobilizon.nix; mod_perl = handleTest ./mod_perl.nix {}; molly-brown = handleTest ./molly-brown.nix {}; mollysocket = handleTest ./mollysocket.nix { }; diff --git a/nixos/tests/mobilizon.nix b/nixos/tests/mobilizon.nix index c456242e1b31..1a07c5fc2732 100644 --- a/nixos/tests/mobilizon.nix +++ b/nixos/tests/mobilizon.nix @@ -1,49 +1,47 @@ -import ./make-test-python.nix ( - { lib, ... }: - let - certs = import ./common/acme/server/snakeoil-certs.nix; - mobilizonDomain = certs.domain; - port = 41395; - in +{ lib, ... }: +let + certs = import ./common/acme/server/snakeoil-certs.nix; + mobilizonDomain = certs.domain; + port = 41395; +in - { - name = "mobilizon"; - meta.maintainers = with lib.maintainers; [ - minijackson - erictapen - ]; +{ + name = "mobilizon"; + meta.maintainers = with lib.maintainers; [ + minijackson + erictapen + ]; - nodes.server = - { ... }: - { - services.mobilizon = { - enable = true; - settings = { - ":mobilizon" = { - ":instance" = { - name = "Test Mobilizon"; - hostname = mobilizonDomain; - }; - "Mobilizon.Web.Endpoint".http.port = port; + nodes.server = + { ... }: + { + services.mobilizon = { + enable = true; + settings = { + ":mobilizon" = { + ":instance" = { + name = "Test Mobilizon"; + hostname = mobilizonDomain; }; + "Mobilizon.Web.Endpoint".http.port = port; }; }; - - security.pki.certificateFiles = [ certs.ca.cert ]; - - services.nginx.virtualHosts."${mobilizonDomain}" = { - enableACME = lib.mkForce false; - sslCertificate = certs.${mobilizonDomain}.cert; - sslCertificateKey = certs.${mobilizonDomain}.key; - }; - - networking.hosts."::1" = [ mobilizonDomain ]; }; - testScript = '' - server.wait_for_unit("mobilizon.service") - server.wait_for_open_port(${toString port}) - server.succeed("curl --fail https://${mobilizonDomain}/") - ''; - } -) + security.pki.certificateFiles = [ certs.ca.cert ]; + + services.nginx.virtualHosts."${mobilizonDomain}" = { + enableACME = lib.mkForce false; + sslCertificate = certs.${mobilizonDomain}.cert; + sslCertificateKey = certs.${mobilizonDomain}.key; + }; + + networking.hosts."::1" = [ mobilizonDomain ]; + }; + + testScript = '' + server.wait_for_unit("mobilizon.service") + server.wait_for_open_port(${toString port}) + server.succeed("curl --fail https://${mobilizonDomain}/") + ''; +} From 52887dda76c814cdec71b4b87e425ca9cf9c72e0 Mon Sep 17 00:00:00 2001 From: Immae Date: Sat, 8 Feb 2025 23:44:37 +0100 Subject: [PATCH 0243/1107] replace-workspace-values.py: Allow "package" key in Cargo.toml dependencies (#377721) * Allow "package" key in Cargo.toml dependencies * Update replace-workspace-values.py Some dependencies in Cargo.toml have a "package" key, which serves as an alias: ``` foo = { package = "original-name" ... } ``` which with nixpkgs triggered ``` > Copying to /nix/store/jay72vz43afnlymsah7v543zmnv6l7ck-gcli-0.3.0-vendor/subxt-0.37.0 > Patching /nix/store/jay72vz43afnlymsah7v543zmnv6l7ck-gcli-0.3.0-vendor/subxt-0.37.0/Cargo.toml > Traceback (most recent call last): > File "/nix/store/harh7nnnib9896dwqr0xjqrr0l8wdcw7-replace-workspace-values/bin/replace-workspace-values", line 127, in > main() > File "/nix/store/harh7nnnib9896dwqr0xjqrr0l8wdcw7-replace-workspace-values/bin/replace-workspace-values", line 104, in main > changed |= replace_dependencies(workspace_manifest, crate_manifest) > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > File "/nix/store/harh7nnnib9896dwqr0xjqrr0l8wdcw7-replace-workspace-values/bin/replace-workspace-values", line 77, in replace_dependencies > changed |= replace_key(workspace_manifest, root[key], "dependencies", k) > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > File "/nix/store/harh7nnnib9896dwqr0xjqrr0l8wdcw7-replace-workspace-values/bin/replace-workspace-values", line 58, in replace_key > raise Exception(f"Unhandled keys in inherited dependency {key}: {local_dep}") > Exception: Unhandled keys in inherited dependency codec: {'package': 'parity-scale-codec'} > Traceback (most recent call last): > File "/nix/store/qrf1j1w95va92fzv55lxpvw2dpm03bnr-fetch-cargo-vendor-util/bin/fetch-cargo-vendor-util", line 314, in > main() > File "/nix/store/qrf1j1w95va92fzv55lxpvw2dpm03bnr-fetch-cargo-vendor-util/bin/fetch-cargo-vendor-util", line 310, in main > subcommand_func() > File "/nix/store/qrf1j1w95va92fzv55lxpvw2dpm03bnr-fetch-cargo-vendor-util/bin/fetch-cargo-vendor-util", line 302, in > "create-vendor": lambda: create_vendor(vendor_staging_dir=Path(sys.argv[2]), out_dir=Path(sys.argv[3])) > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > File "/nix/store/qrf1j1w95va92fzv55lxpvw2dpm03bnr-fetch-cargo-vendor-util/bin/fetch-cargo-vendor-util", line 259, in create_vendor > copy_and_patch_git_crate_subtree(git_tree, pkg["name"], crate_out_dir) > File "/nix/store/qrf1j1w95va92fzv55lxpvw2dpm03bnr-fetch-cargo-vendor-util/bin/fetch-cargo-vendor-util", line 215, in copy_and_patch_git_crate_subtree > subprocess.check_output(cmd) > File "/nix/store/qrc496n6fsqp4p5m5h8wmw5d5jwyw5mr-python3-3.12.8/lib/python3.12/subprocess.py", line 466, in check_output > return run(*popenargs, stdout=PIPE, timeout=timeout, check=True, > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > File "/nix/store/qrc496n6fsqp4p5m5h8wmw5d5jwyw5mr-python3-3.12.8/lib/python3.12/subprocess.py", line 571, in run > raise CalledProcessError(retcode, process.args, > subprocess.CalledProcessError: Command '['replace-workspace-values', '/nix/store/jay72vz43afnlymsah7v543zmnv6l7ck-gcli-0.3.0-vendor/subxt-0.37.0/Cargo.toml', '/nix/store/c4jdggg9ihgi032pyc7g6ysdpb30xv1r-gcli-0.3.0-vendor-staging/git/00f181c1a5d8986e7146ddc72a745c793a9a1d8e/Cargo.toml']' returned non-zero exit status 1. ``` This fixes that --- pkgs/build-support/rust/replace-workspace-values.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/build-support/rust/replace-workspace-values.py b/pkgs/build-support/rust/replace-workspace-values.py index 003023ff2560..a03bf42eae38 100644 --- a/pkgs/build-support/rust/replace-workspace-values.py +++ b/pkgs/build-support/rust/replace-workspace-values.py @@ -53,6 +53,9 @@ def replace_key( if optional: final["optional"] = True + if "package" in local_dep: + final["package"] = local_dep.pop("package") + if local_dep: raise Exception(f"Unhandled keys in inherited dependency {key}: {local_dep}") From b852513e84c411c1af128a51b3013d3c64e020fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Feb 2025 14:23:11 +0000 Subject: [PATCH 0244/1107] fast-float: 7.0.0 -> 8.0.0 --- pkgs/by-name/fa/fast-float/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/fast-float/package.nix b/pkgs/by-name/fa/fast-float/package.nix index 2bb7cfcd22b8..edebd6278d60 100644 --- a/pkgs/by-name/fa/fast-float/package.nix +++ b/pkgs/by-name/fa/fast-float/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fast-float"; - version = "7.0.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "fastfloat"; repo = "fast_float"; rev = "v${finalAttrs.version}"; - hash = "sha256-CG5je117WYyemTe5PTqznDP0bvY5TeXn8Vu1Xh5yUzQ="; + hash = "sha256-shP+me3iqTRrsPGYrvcbnJNRZouQbW62T24xfkEgGSE="; }; nativeBuildInputs = [ cmake ]; From d298f046edabc84b56bd788e11eaf7ed72f8171c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 11 Dec 2024 21:05:07 +0100 Subject: [PATCH 0245/1107] eigen: 3.4.0 -> 3.4.0-unstable-2022-05-19 Fast forward to a version required by onnxruntime. --- pkgs/development/libraries/eigen/default.nix | 23 ++++---------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index e612add0c7b1..8fe840bea596 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -2,37 +2,22 @@ lib, stdenv, fetchFromGitLab, - fetchpatch, cmake, }: stdenv.mkDerivation rec { pname = "eigen"; - version = "3.4.0"; + version = "3.4.0-unstable-2022-05-19"; src = fetchFromGitLab { owner = "libeigen"; - repo = pname; - rev = version; - hash = "sha256-1/4xMetKMDOgZgzz3WMxfHUEpmdAm52RqZvz6i0mLEw="; + repo = "eigen"; + rev = "e7248b26a1ed53fa030c5c459f7ea095dfd276ac"; + hash = "sha256-uQ1YYV3ojbMVfHdqjXRyUymRPjJZV3WHT36PTxPRius="; }; patches = [ ./include-dir.patch - - # Fixes e.g. onnxruntime on aarch64-darwin: - # https://hydra.nixos.org/build/248915128/nixlog/1, - # originally suggested in https://github.com/NixOS/nixpkgs/pull/258392. - # - # The patch is from - # ["Fix vectorized reductions for Eigen::half"](https://gitlab.com/libeigen/eigen/-/merge_requests/699) - # which is two years old, - # but Eigen hasn't had a release in two years either: - # https://gitlab.com/libeigen/eigen/-/issues/2699. - (fetchpatch { - url = "https://gitlab.com/libeigen/eigen/-/commit/d0e3791b1a0e2db9edd5f1d1befdb2ac5a40efe0.patch"; - hash = "sha256-8qiNpuYehnoiGiqy0c3Mcb45pwrmc6W4rzCxoLDSvj0="; - }) ]; nativeBuildInputs = [ cmake ]; From 1b55dbf9cb1d457cdf128d47ea84ed8b284b2a3a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 02:28:45 +0000 Subject: [PATCH 0246/1107] qpdf: 11.9.1 -> 11.10.0 --- pkgs/by-name/qp/qpdf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qp/qpdf/package.nix b/pkgs/by-name/qp/qpdf/package.nix index aa56c57ab7ff..618e9741370b 100644 --- a/pkgs/by-name/qp/qpdf/package.nix +++ b/pkgs/by-name/qp/qpdf/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qpdf"; - version = "11.9.1"; + version = "11.10.0"; src = fetchFromGitHub { owner = "qpdf"; repo = "qpdf"; rev = "v${finalAttrs.version}"; - hash = "sha256-DhrOKjUPgNo61db8av0OTfM8mCNebQocQWtTWdt002s="; + hash = "sha256-X5VF7kwnpNNWuQ7iA12qh6JwGU/40EKnGxWst0U+T8k="; }; outputs = [ From 7cf1e81bf127e60e8b44f7bb7857f6750bcd5dc4 Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Fri, 7 Feb 2025 13:20:25 -0500 Subject: [PATCH 0247/1107] doc: Improve gradle section --- doc/languages-frameworks/gradle.section.md | 29 ++++++++-------------- 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/doc/languages-frameworks/gradle.section.md b/doc/languages-frameworks/gradle.section.md index b2058ef87491..762c8003a7a7 100644 --- a/doc/languages-frameworks/gradle.section.md +++ b/doc/languages-frameworks/gradle.section.md @@ -17,11 +17,11 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "pdftk-java"; repo = "pdftk"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ciKotTHSEcITfQYKFZ6sY2LZnXGChBJy0+eno8B3YHY="; }; - nativeBuildInputs = [ gradle ]; + nativeBuildInputs = [ gradle makeWrapper ]; # if the package has dependencies, mitmCache must be set mitmCache = gradle.fetchDeps { @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/{bin,share/pdftk} cp build/libs/pdftk-all.jar $out/share/pdftk - makeWrapper ${jre}/bin/java $out/bin/pdftk \ + makeWrapper ${lib.getExe jre} $out/bin/pdftk \ --add-flags "-jar $out/share/pdftk/pdftk-all.jar" cp ${finalAttrs.src}/pdftk.1 $out/share/man/man1 @@ -74,6 +74,7 @@ package. Using the pdftk example above: ```nix { lib , stdenv +, gradle # ... , pdftk }: @@ -87,30 +88,22 @@ stdenv.mkDerivation (finalAttrs: { }) ``` -This allows you to `override` any arguments of the `pkg` used for -the update script (for example, `pkg = pdftk.override { enableSomeFlag = -true };`), so this is the preferred way. +This allows you to `override` any arguments of the `pkg` used for the update script (for example, `pkg = pdftk.override { enableSomeFlag = true };)`. -The second is to create a `let` binding for the package, like this: +The second is to use `finalAttrs.finalPackage` like this: ```nix -let self = stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { # ... mitmCache = gradle.fetchDeps { - pkg = self; + pkg = finalAttrs.finalPackage; data = ./deps.json; }; -}; in self +}) ``` +The limitation of this method is that you cannot override the `pkg` derivations's arguments. -This is useful if you can't easily pass the derivation as its own -argument, or if your `mkDerivation` call is responsible for building -multiple packages. - -In the former case, the update script will stay the same even if the -derivation is called with different arguments. In the latter case, the -update script will change depending on the derivation arguments. It's up -to you to decide which one would work best for your derivation. +In the former case, the update script will stay the same even if the derivation is called with different arguments. In the latter case, the update script will change depending on the derivation arguments. It's up to you to decide which one would work best for your derivation. ## Update Script {#gradle-update-script} From bb92d2bed29a6b759af02aab3fc3303cecbe93bd Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 9 Feb 2025 09:35:20 +0300 Subject: [PATCH 0248/1107] curlMinimal: allow local networking on Darwin Makes tests pass on 8.12.0 Co-authored-by: Martin Weinelt --- pkgs/by-name/cu/curlMinimal/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix index ee0a8924a6c6..bd9f751126ad 100644 --- a/pkgs/by-name/cu/curlMinimal/package.nix +++ b/pkgs/by-name/cu/curlMinimal/package.nix @@ -181,6 +181,8 @@ stdenv.mkDerivation (finalAttrs: { rm tests/data/test1592 ''; + __darwinAllowLocalNetworking = true; + postInstall = '' moveToOutput bin/curl-config "$dev" From 110af7ef47f385c811725c8194a8adc1f06526ab Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 8 Feb 2025 12:50:41 +0100 Subject: [PATCH 0249/1107] Reapply "llvmPackages.openmp: Make OMPD customisable, add missing Python dependency" This reverts commit fa648b2835f6cc0e77bd3b246cf8c80f126f0139. Mass rebuild accidentally merged to master, now being resubmitted to staging. Python had been added as an unconditionial build input on staging in 261db7efdc49 ("llvmPackages.openmp: fix cross build"), but we're keeping it conditional here per discussion with the author of that change. Link: https://github.com/NixOS/nixpkgs/pull/380299#issuecomment-2645492202 --- .../compilers/llvm/common/openmp/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/common/openmp/default.nix b/pkgs/development/compilers/llvm/common/openmp/default.nix index 52e04dd03abc..57ccee5155ff 100644 --- a/pkgs/development/compilers/llvm/common/openmp/default.nix +++ b/pkgs/development/compilers/llvm/common/openmp/default.nix @@ -17,7 +17,12 @@ , python3 , version , devExtraCmakeFlags ? [] +, ompdSupport ? true +, ompdGdbSupport ? ompdSupport }: + +assert lib.assertMsg (ompdGdbSupport -> ompdSupport) "OMPD GDB support requires OMPD support!"; + let pname = "openmp"; src' = @@ -55,10 +60,14 @@ stdenv.mkDerivation (rec { buildInputs = [ (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) + ] ++ lib.optionals (ompdSupport && ompdGdbSupport) [ python3 ]; - cmakeFlags = lib.optionals (lib.versions.major release_version == "13") [ + cmakeFlags = [ + (lib.cmakeBool "LIBOMP_OMPD_SUPPORT" ompdSupport) + (lib.cmakeBool "LIBOMP_OMPD_GDB_SUPPORT" ompdGdbSupport) + ] ++ lib.optionals (lib.versions.major release_version == "13") [ "-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF" # Building the AMDGCN device RTL fails ] ++ lib.optionals (lib.versionAtLeast release_version "14") [ "-DCLANG_TOOL=${clang-unwrapped}/bin/clang" From d570710367a99267f01a6869f4dc7ed27160bae9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 8 Feb 2025 12:50:56 +0100 Subject: [PATCH 0250/1107] Reapply "llvmPackages.openmp: Build static libraries when appropriate" This reverts commit c006d5f0637d9a98d990e80e80b1fd932bb6025e. Mass rebuild accidentally merged to master, now being resubmitted to staging. --- pkgs/development/compilers/llvm/common/openmp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/llvm/common/openmp/default.nix b/pkgs/development/compilers/llvm/common/openmp/default.nix index 57ccee5155ff..d1fc8f74b9d3 100644 --- a/pkgs/development/compilers/llvm/common/openmp/default.nix +++ b/pkgs/development/compilers/llvm/common/openmp/default.nix @@ -65,6 +65,7 @@ stdenv.mkDerivation (rec { ]; cmakeFlags = [ + (lib.cmakeBool "LIBOMP_ENABLE_SHARED" (!stdenv.hostPlatform.isStatic && stdenv.hostPlatform.hasSharedLibraries)) (lib.cmakeBool "LIBOMP_OMPD_SUPPORT" ompdSupport) (lib.cmakeBool "LIBOMP_OMPD_GDB_SUPPORT" ompdGdbSupport) ] ++ lib.optionals (lib.versions.major release_version == "13") [ From fb70653cda9f5f1fad2cd518517bfa1fd12bad55 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Wed, 22 Jan 2025 20:49:30 -0800 Subject: [PATCH 0251/1107] util-linux: 2.39.4 -> 2.40.4 --- .../ut/util-linux/fix-darwin-build.patch | 35 +++++++++++++++++++ pkgs/by-name/ut/util-linux/package.nix | 17 ++++----- 2 files changed, 42 insertions(+), 10 deletions(-) create mode 100644 pkgs/by-name/ut/util-linux/fix-darwin-build.patch diff --git a/pkgs/by-name/ut/util-linux/fix-darwin-build.patch b/pkgs/by-name/ut/util-linux/fix-darwin-build.patch new file mode 100644 index 000000000000..c65266e88690 --- /dev/null +++ b/pkgs/by-name/ut/util-linux/fix-darwin-build.patch @@ -0,0 +1,35 @@ +From e47c6f751a7ef87640c61316ada774e8e9cc6b07 Mon Sep 17 00:00:00 2001 +From: Eugene Gershnik +Date: Mon, 6 May 2024 09:29:39 -0700 +Subject: [PATCH] libuuid: fix uuid_time on macOS without attribute((alias)) + +Weak aliases are not supported by clang on Darwin. +Instead this fix uses inline asm to make `_uuid_time` an alias to +`___uuid_time` + +It appears that on macOS the time API is purely 32 or 64 bit depending +on the build type. There is no ABI issue on that platform and `uuid_time` +can be unconditionally aliased to `_uuid_time`. This is all conjectural, +however, since I have no ability to make 32-bit builds for macOS - the +Apple toolchain doesn't support this since 2019. + +Fixes util-linux/util-linux#2873 +--- + libuuid/src/uuid_time.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/libuuid/src/uuid_time.c b/libuuid/src/uuid_time.c +index 9b415b3ee73..df0478e1909 100644 +--- a/libuuid/src/uuid_time.c ++++ b/libuuid/src/uuid_time.c +@@ -85,6 +85,10 @@ time_t __uuid_time(const uuid_t uu, struct timeval *ret_tv) + } + #if defined(__USE_TIME_BITS64) && defined(__GLIBC__) + extern time_t uuid_time64(const uuid_t uu, struct timeval *ret_tv) __attribute__((weak, alias("__uuid_time"))); ++#elif defined(__clang__) && defined(__APPLE__) ++__asm__(".globl _uuid_time"); ++__asm__(".set _uuid_time, ___uuid_time"); ++extern time_t uuid_time(const uuid_t uu, struct timeval *ret_tv); + #else + extern time_t uuid_time(const uuid_t uu, struct timeval *ret_tv) __attribute__((weak, alias("__uuid_time"))); + #endif diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix index e726ec46d343..c4c0bfa28194 100644 --- a/pkgs/by-name/ut/util-linux/package.nix +++ b/pkgs/by-name/ut/util-linux/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchpatch, pkg-config, zlib, shadow, @@ -15,6 +14,7 @@ pam, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd, + sqlite, nlsSupport ? true, translateManpages ? true, po4a, @@ -27,21 +27,16 @@ stdenv.mkDerivation rec { pname = "util-linux" + lib.optionalString (!nlsSupport && !ncursesSupport && !systemdSupport) "-minimal"; - version = "2.39.4"; + version = "2.40.4"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/util-linux-${version}.tar.xz"; - hash = "sha256-bE+HI9r9QcOdk+y/FlCfyIwzzVvTJ3iArlodl6AU/Q4="; + hash = "sha256-XB2vczsE6YWa/cO9h8xIEYDuD4i1wJRrFv3skxl1+3k="; }; patches = [ ./rtcwake-search-PATH-for-shutdown.patch - - (fetchpatch { - name = "basename.patch"; - url = "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/patch/?id=77454e58d58f904cfdc02d3ca5bb65f1bd8739fc"; - hash = "sha256-ELWC4bYN3rvn9XIN0XgCo55pXNfS2VpbZWuwzRLfO/0="; - }) + ./fix-darwin-build.patch ]; # We separate some of the utilities into their own outputs. This @@ -64,7 +59,7 @@ stdenv.mkDerivation rec { postPatch = '' - patchShebangs tests/run.sh + patchShebangs tests/run.sh tools/all_syscalls substituteInPlace sys-utils/eject.c \ --replace "/bin/umount" "$bin/bin/umount" @@ -95,6 +90,7 @@ stdenv.mkDerivation rec { (lib.withFeature ncursesSupport "ncursesw") (lib.withFeature systemdSupport "systemd") (lib.withFeatureAs systemdSupport "systemdsystemunitdir" "${placeholder "bin"}/lib/systemd/system/") + (lib.withFeatureAs systemdSupport "tmpfilesdir" "${placeholder "out"}/lib/tmpfiles.d") (lib.enableFeature translateManpages "poman") "SYSCONFSTATICDIR=${placeholder "lib"}/lib" ] @@ -121,6 +117,7 @@ stdenv.mkDerivation rec { [ zlib libxcrypt + sqlite ] ++ lib.optionals pamSupport [ pam ] ++ lib.optionals capabilitiesSupport [ libcap_ng ] From 6b365c5befbf823b21dc9279cd6fe607808bf609 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 9 Feb 2025 11:34:56 +0300 Subject: [PATCH 0252/1107] Revert "perl: 5.40.0 -> 5.40.1; perl538: 5.38.2 -> 5.38.3" --- pkgs/development/interpreters/perl/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 5c9034a0472a..8fd99172be10 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -57,16 +57,16 @@ in rec { # Maint version perl538 = callPackage ./interpreter.nix { self = perl538; - version = "5.38.3"; - sha256 = "sha256-ioAzhZ3R116wyRWO7dc4TfGva0aipOhQc7B+bMfFuHM="; + version = "5.38.2"; + sha256 = "sha256-oKMVNEUet7g8fWWUpJdUOlTUiLyQygD140diV39AZV4="; inherit passthruFun; }; # Maint version perl540 = callPackage ./interpreter.nix { self = perl540; - version = "5.40.1"; - sha256 = "sha256-AvjEW7N57Qw951FPrUjHFP1Gvo8LU2v9UyAFAWWh7iY="; + version = "5.40.0"; + sha256 = "sha256-x0A0jzVzljJ6l5XT6DI7r9D+ilx4NfwcuroMyN/nFh8="; inherit passthruFun; }; } From 35c9771eee0ebddbe9dc3eccad81baeb9c149a96 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 9 Feb 2025 11:04:56 +0100 Subject: [PATCH 0253/1107] gnupg: fix static Patch has been submitted upstream, but past experience trying to send patches to GnuPG does not make me optimistic that this will be dealt with any time soon. If it doesn't work out upstream I'll submit it to freepg, whose patchset we're already using. --- pkgs/tools/security/gnupg/24.nix | 3 ++ pkgs/tools/security/gnupg/static.patch | 38 ++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/tools/security/gnupg/static.patch diff --git a/pkgs/tools/security/gnupg/24.nix b/pkgs/tools/security/gnupg/24.nix index 79bb6a5e6a33..439b966ae4e7 100644 --- a/pkgs/tools/security/gnupg/24.nix +++ b/pkgs/tools/security/gnupg/24.nix @@ -4,6 +4,7 @@ fetchurl, fetchFromGitLab, buildPackages, + autoreconfHook, pkg-config, texinfo, gettext, @@ -44,6 +45,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ + autoreconfHook pkg-config texinfo libgpg-error @@ -82,6 +84,7 @@ stdenv.mkDerivation rec { [ ./fix-libusb-include-path.patch ./CVE-2022-3219.patch + ./static.patch ] ++ lib.map (v: "${freepgPatches}/STABLE-BRANCH-2-4-freepg/" + v) [ "0002-gpg-accept-subkeys-with-a-good-revocation-but-no-sel.patch" diff --git a/pkgs/tools/security/gnupg/static.patch b/pkgs/tools/security/gnupg/static.patch new file mode 100644 index 000000000000..851ac7429543 --- /dev/null +++ b/pkgs/tools/security/gnupg/static.patch @@ -0,0 +1,38 @@ +From 440ccccb02ec438b4077b5885e5a1483e12c38b1 Mon Sep 17 00:00:00 2001 +From: Alyssa Ross +Date: Sun, 9 Feb 2025 08:51:32 +0100 +Subject: [PATCH] build: use pkg-config to find tss2-esys + +Otherwise, tss2-esys's dependencies (other tss2 libraries, OpenSSL) +won't be linked when tss2-esys is a static library. +--- +Link: https://dev.gnupg.org/D606 + + configure.ac | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index dc444657f..a60c1820c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1574,8 +1574,8 @@ if test "$build_tpm2d" = "yes"; then + AC_SEARCH_LIBS([TSS_Create],[tss ibmtss],have_libtss=IBM, + [AC_MSG_ERROR([IBM TPM Software Stack requested but not found])]) + elif test "$with_tss" = intel; then +- AC_SEARCH_LIBS([Esys_Initialize],[tss2-esys],have_libtss=Intel, +- [AC_MSG_ERROR([Intel TPM Software Stack requested but not found])]) ++ PKG_CHECK_MODULES([LIBTSS], [tss2-esys tss2-mu tss2-rc tss2-tctildr],have_libtss=Intel, ++ [AC_MSG_ERROR([Intel TPM Software Stack requested but not found])]) + else + AC_MSG_ERROR([Invalid TPM Software Stack requested: $with_tss]) + fi +@@ -1605,7 +1605,6 @@ if test "$build_tpm2d" = "yes"; then + AC_MSG_WARN([Need Esys_TR_GetTpmHandle API (usually requires Intel TSS 2.4.0 or later, disabling TPM support)]) + have_libtss=no + ]) +- LIBTSS_LIBS="$LIBS -ltss2-mu -ltss2-rc -ltss2-tctildr" + AC_DEFINE(HAVE_INTEL_TSS, 1, [Defined if we have the Intel TSS]) + fi + LIBS="$_save_libs" +-- +2.47.0 From 9f46ed39ae9f8e57d04c0c5e0c3d1734da56a196 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 9 Feb 2025 13:15:58 +0300 Subject: [PATCH 0254/1107] perlPackages: remove per-package LD=$CC workarounds Obsoleted by #374962. --- pkgs/top-level/perl-packages.nix | 42 -------------------------------- 1 file changed, 42 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ec75478ec223..f94f49cc9bf9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1334,7 +1334,6 @@ with self; { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Authen-DecHpwd-2.007.tar.gz"; hash = "sha256-9DqTuwK0H3Mn2S+eljtpUF9nNQpS6PUHlvmK/E+z8Xc="; }; - perlPreHook = lib.optionalString stdenv.hostPlatform.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' propagatedBuildInputs = [ DataInteger DigestCRC ScalarString ]; meta = { description = "DEC VMS password hashing"; @@ -1367,7 +1366,6 @@ with self; { url = "mirror://cpan/authors/id/I/IO/IOANR/Authen-Krb5-1.905.tar.gz"; hash = "sha256-13sAuxUBpW9xGOkarAx+Qi2888QY+c6YuAF3HDqg900="; }; - perlPreHook = "export LD=$CC"; propagatedBuildInputs = [ pkgs.libkrb5 ]; buildInputs = [ DevelChecklib FileWhich PkgConfig ]; meta = { @@ -1648,7 +1646,6 @@ with self; { ''; buildInputs =[ ExtUtilsMakeMaker ]; propagatedBuildInputs = [ pkgs.zbar PerlMagick ]; - perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "Perl interface to the ZBar Barcode Reader"; homepage = "https://metacpan.org/pod/Barcode::ZBar"; @@ -1896,7 +1893,6 @@ with self; { # Fix out of memory error on Perl 5.19.4 and later. ../development/perl-modules/boost-geometry-utils-fix-oom.patch ]; - perlPreHook = "export LD=$CC"; buildInputs = [ ExtUtilsCppGuess ExtUtilsTypemapsDefault ExtUtilsXSpp ModuleBuildWithXSpp ]; meta = { description = "Bindings for the Boost Geometry library"; @@ -5116,7 +5112,6 @@ with self; { hash = "sha256-PMcSbVhBEHI3qb4txcf7wWfPPEtM40Z4qESLhQdXAUw="; }; propagatedBuildInputs = [ ClassMix ]; - perlPreHook = lib.optionalString (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isDarwin) "export LD=$CC"; meta = { description = "Eksblowfish block cipher"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -5372,7 +5367,6 @@ with self; { hash = "sha256-k+vfqu/P6atoPwEhyF8kR12Bl/C87EYBghnkERQ03eM="; }; propagatedBuildInputs = [ DigestSHA1 ]; - perlPreHook = lib.optionalString (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isDarwin) "export LD=$CC"; meta = { description = "Emulate MySQL PASSWORD() function"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -5427,7 +5421,6 @@ with self; { hash = "sha256-fRbulczj61TBdGc6cpn0wIb7o6yF+EfQ4TT+7V93YBc="; }; propagatedBuildInputs = [ CryptOpenSSLRandom ]; - perlPreHook = "export LD=$CC"; meta = { description = "Scrypt password based key derivation function"; homepage = "https://github.com/DCIT/perl-Crypt-ScryptKDF"; @@ -5719,7 +5712,6 @@ with self; { url = "mirror://cpan/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-0.13.tar.gz"; hash = "sha256-xBnjCM3IKvHCXWuNB7L/JjR6Yit6Y+wghWq+jbQFH4I="; }; - perlPreHook = lib.optionalString (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isDarwin) "export LD=$CC"; buildInputs = [ TestDiagINC ]; meta = { description = "XS based CSS minifier"; @@ -6348,7 +6340,6 @@ with self; { hash = "sha256-tVypHHafgTN8xrCrIMMmg4eOWyZj8cwljFEamZpd/dM="; }; buildInputs = [ HashUtilFieldHashCompat ModuleBuildXSUtil ScopeGuard TestException ]; - perlPreHook = lib.optionalString stdenv.hostPlatform.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Selection of utilities for data and data types"; homepage = "https://github.com/gfx/Perl-Data-Util"; @@ -7674,7 +7665,6 @@ with self; { hash = "sha256-z/jSTllF45RN6/ITmVprFVuR5YE0aRVrE9Ws819qXZ8="; }; propagatedBuildInputs = [ HashStoredIterator JSONXS PadWalker ]; - perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "Perl side of the Perl debugger for IntelliJ IDEA and other JetBrains IDEs"; license = with lib.licenses; [ mit ]; @@ -9305,7 +9295,6 @@ with self; { url = "mirror://cpan/authors/id/A/AM/AMBS/ExtUtils-LibBuilder-0.08.tar.gz"; hash = "sha256-xRFx4G3lMDnwvKHZemRx7DeUH/Weij0csXDr3SVztdI="; }; - perlPreHook = "export LD=$CC"; meta = { description = "Tool to build C libraries"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -9999,7 +9988,6 @@ with self; { hash = "sha256-oC+/KFQGqKTZOZKE8DLy1VxWl1FUwuFnS9EJg3uAluw="; }; buildInputs = [ ExtUtilsCChecker ]; - perlPreHook = lib.optionalString (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isDarwin) "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Modify attributes of symlinks without dereferencing them"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -10090,7 +10078,6 @@ with self; { url = "mirror://cpan/authors/id/L/LE/LEONT/File-Map-0.71.tar.gz"; hash = "sha256-yOJpM4BOhw1KupJiO3iGrIs8dgyY+/zTvcSyMFxGR1k="; }; - perlPreHook = "export LD=$CC"; propagatedBuildInputs = [ PerlIOLayers SubExporterProgressive ]; buildInputs = [ TestFatal TestWarnings ]; meta = { @@ -10656,7 +10643,6 @@ with self; { }; buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ Future XSParseKeyword XSParseSublike ]; - perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "Deferred subroutine syntax for futures"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -11615,7 +11601,6 @@ with self; { hash = "sha256-ucvE3NgjPo0dfxSB3beaSl+dtxgMs+8CtLy+4F5l6gw="; }; buildInputs = [ Test2Suite ]; - perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "Functions for accessing a hashes internal iterator"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -11699,7 +11684,6 @@ with self; { hash = "sha256-Wl7viWUA0epsJKkIXs++mkOr7mjPxmwD+InSostoml0="; }; buildInputs = [ ModuleBuildPluggablePPPort TestRequires ]; - perlPreHook = lib.optionalString stdenv.hostPlatform.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Extremely fast HTML escaping"; homepage = "https://github.com/tokuhirom/HTML-Escape"; @@ -13392,7 +13376,6 @@ with self; { hash = "sha256-XZsDT1jwtv9bZGR708WpzgWypw7e4zn7wxc67nR8wFA="; }; buildInputs = [ TestDiagINC ]; - perlPreHook = lib.optionalString (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isDarwin) "export LD=$CC"; meta = { description = "XS based JavaScript minifier"; homepage = "https://metacpan.org/release/JavaScript-Minifier-XS"; @@ -14095,7 +14078,6 @@ with self; { }; buildInputs = [ TestException ]; propagatedBuildInputs = [ SubExporter ]; - perlPreHook = lib.optionalString stdenv.hostPlatform.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Linux specific special filehandles"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -14198,9 +14180,6 @@ with self; { url = "mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-XS-0.430.tar.gz"; hash = "sha256-6M5G1XwXnuzYdYKT6UAP8wCq8g/v4KnRW5/iMCucskI="; }; - preConfigure = '' - export LD=$CC - ''; meta = { description = "Provide the stuff missing in List::Util in XS"; homepage = "https://metacpan.org/release/List-MoreUtils-XS"; @@ -16267,7 +16246,6 @@ with self; { }; buildInputs = [ CaptureTiny CwdGuard FileCopyRecursiveReduced ]; propagatedBuildInputs = [ DevelCheckCompiler ]; - perlPreHook = "export LD=$CC"; meta = { description = "Module::Build class for building XS modules"; homepage = "https://github.com/hideo55/Module-Build-XSUtil"; @@ -17147,9 +17125,6 @@ with self; { }; buildInputs = [ DistCheckConflicts CPANMetaCheck TestCleanNamespaces TestFatal TestNeeds TestRequires ]; propagatedBuildInputs = [ ClassLoadXS DataOptList DevelGlobalDestruction DevelOverloadInfo DevelStackTrace EvalClosure MROCompat ModuleRuntimeConflicts PackageDeprecationManager PackageStashXS ParamsUtil SubExporter TryTiny ]; - preConfigure = '' - export LD=$CC - ''; meta = { description = "Postmodern object system for Perl 5"; homepage = "http://moose.perl.org"; @@ -18227,7 +18202,6 @@ with self; { hash = "sha256-zo3COUYVOkZ/8JdlFn7iWQ9cUCEg9IotlEFzPzmqMu4="; }; buildInputs = [ ModuleBuildXSUtil TestException TestFatal TestLeakTrace TestOutput TestRequires TryTiny ]; - perlPreHook = "export LD=$CC"; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isi686 "-fno-stack-protector"; hardeningDisable = lib.optional stdenv.hostPlatform.isi686 "stackprotector"; meta = { @@ -18898,7 +18872,6 @@ with self; { }) ]; buildInputs = [ TestNoWarnings ]; - perlPreHook = "export LD=$CC"; meta = { description = "Internationalizing Domain Names in Applications (UTS #46)"; homepage = "https://metacpan.org/release/Net-IDN-Encode"; @@ -19667,7 +19640,6 @@ with self; { hash = "sha256-EpUKZkwGB+o/ynSA82XfVNF0YpH0XrsO2AkXt0+xXvU="; }; buildInputs = [ Test2Suite TestFatal TestRefcount ]; - perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; propagatedBuildInputs = [ XSParseKeyword XSParseSublike ]; meta = { description = "Simple syntax for lexical field-based objects"; @@ -20026,7 +19998,6 @@ with self; { url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Params-Classify-0.015.tar.gz"; hash = "sha256-OY7BXNiZ/Ni+89ueoXSL9jHxX2wyviA+R1tn31EKWRQ="; }; - perlPreHook = lib.optionalString stdenv.hostPlatform.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Argument type classification"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -20056,7 +20027,6 @@ with self; { }; buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ ModuleImplementation ]; - perlPreHook = "export LD=$CC"; meta = { description = "Validate method/function parameters"; homepage = "https://metacpan.org/release/Params-Validate"; @@ -20636,7 +20606,6 @@ with self; { url = "mirror://cpan/authors/id/L/LE/LEONT/PerlIO-Layers-0.012.tar.gz"; hash = "sha256-VC2lQvo2uz/de4d24jDTzMAqpnRM6bd7Tu9MyufASt8="; }; - perlPreHook = "export LD=$CC"; meta = { description = "Querying your filehandle's capabilities"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -22504,7 +22473,6 @@ with self; { # https://github.com/PerlGameDev/SDL/pull/304 ../development/perl-modules/sdl-modern-perl.patch ]; - perlPreHook = "export LD=$CC"; preCheck = "rm t/core_audiospec.t"; buildInputs = [ pkgs.SDL pkgs.SDL_gfx pkgs.SDL_mixer pkgs.SDL_image pkgs.SDL_ttf pkgs.SDL_Pango pkgs.SDL_net AlienSDL CaptureTiny TestDeep TestDifferences TestException TestMost TestWarn ]; propagatedBuildInputs = [ FileShareDir TieSimple ]; @@ -23826,7 +23794,6 @@ with self; { hash = "sha256-oSfa52RcGpVwzZopcMbcST1SL/BzGKNKOeQJCY9pESU="; }; propagatedBuildInputs = [ LexicalSealRequireHints ]; - perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "Detect undeclared subroutines in compilation"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -23868,7 +23835,6 @@ with self; { url = "mirror://cpan/authors/id/T/TO/TODDR/Safe-Hole-0.14.tar.gz"; hash = "sha256-9PVui70GxP5K4G2xIYbeyt+6wep3XqGMbAKJSB0V7AU="; }; - perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "Lib/Safe/Hole.pm"; homepage = "https://github.com/toddr/Safe-Hole"; @@ -23988,7 +23954,6 @@ with self; { }; buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ XSParseKeyword ]; - perlPreHook = lib.optionalString (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isDarwin) "export LD=$CC"; meta = { description = "Try/catch/finally syntax for perl"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -24133,7 +24098,6 @@ with self; { }; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; - perlPreHook = lib.optionalString stdenv.hostPlatform.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Libvirt Perl API"; homepage = "https://libvirt.org"; @@ -26594,7 +26558,6 @@ with self; { }; # libbtparse.so: cannot open shared object file patches = [ ../development/perl-modules/TextBibTeX-use-lib.patch ]; - perlPreHook = "export LD=$CC"; perlPostHook = lib.optionalString stdenv.hostPlatform.isDarwin '' oldPath="$(pwd)/btparse/src/libbtparse.dylib" newPath="$out/lib/libbtparse.dylib" @@ -26903,7 +26866,6 @@ with self; { hash = "sha256-U6cw/29IgrmavYVW8mqRH1gvZ1tZ8OFnJe0ey8CE7lA="; }; buildInputs = [ Filepushd ]; - perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "Hoedown for Perl5"; homepage = "https://github.com/tokuhirom/Text-Markdown-Hoedown"; @@ -27944,7 +27906,6 @@ with self; { url = "mirror://cpan/authors/id/A/AR/ARODLAND/Unicode-CaseFold-1.01.tar.gz"; hash = "sha256-QYohKAj50Li7MwrJBQltLdNkl2dT1McVNNq5g2pjGU0="; }; - perlPreHook = lib.optionalString stdenv.hostPlatform.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Unicode case-folding for case-insensitive lookups"; homepage = "https://metacpan.org/release/Unicode-CaseFold"; @@ -29194,7 +29155,6 @@ with self; { }; buildInputs = [ ExtUtilsCChecker Test2Suite ]; propagatedBuildInputs = [ FileShareDir ]; - perlPreHook = lib.optionalString (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isDarwin) "export LD=$CC"; meta = { description = "XS functions to assist in parsing keyword syntax"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -29211,7 +29171,6 @@ with self; { }; buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ FileShareDir ]; - perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "XS functions to assist in parsing sub-like syntax"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -29273,7 +29232,6 @@ with self; { url = "mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.34.tar.gz"; hash = "sha256-zJFWzK69p5jr/i8xthnoBld/hg7RcEJi8X/608bjQVk="; }; - perlPreHook = lib.optionalString stdenv.hostPlatform.isDarwin "export LD=$CC"; meta = { description = "Fast, lightweight YAML loader and dumper"; homepage = "https://github.com/toddr/YAML-Syck"; From 455db8c553d4079d8f5a63ec2c8c063753a2f3d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 9 Feb 2025 11:24:40 +0100 Subject: [PATCH 0255/1107] util-linux: add a link to pull request with the patch --- pkgs/by-name/ut/util-linux/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix index c4c0bfa28194..47975dc5c38d 100644 --- a/pkgs/by-name/ut/util-linux/package.nix +++ b/pkgs/by-name/ut/util-linux/package.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { patches = [ ./rtcwake-search-PATH-for-shutdown.patch + # https://github.com/util-linux/util-linux/pull/3013 ./fix-darwin-build.patch ]; From 10c1939467607b9f2eea9c70bd4c2524f6ffe145 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Sat, 11 Jan 2025 01:51:58 +0100 Subject: [PATCH 0256/1107] cudaPackages.cudnn-frontend: init at 1.9.0 --- ...at-out-common-python-bindings-option.patch | 30 + ...-so-headers-can-be-discovered-when-i.patch | 84 +++ ...install-samples-and-tests-when-built.patch | 85 +++ ...fix-instances-of-maybe-uninitialized.patch | 591 ++++++++++++++++++ .../cudnn-frontend/CMakeLists.txt | 133 ++++ .../cudnn_frontend-config.cmake.in | 3 + .../cuda-modules/cudnn-frontend/default.nix | 134 ++++ pkgs/top-level/cuda-packages.nix | 1 + 8 files changed, 1061 insertions(+) create mode 100644 pkgs/development/cuda-modules/cudnn-frontend/0001-cmake-float-out-common-python-bindings-option.patch create mode 100644 pkgs/development/cuda-modules/cudnn-frontend/0002-cmake-add-config-so-headers-can-be-discovered-when-i.patch create mode 100644 pkgs/development/cuda-modules/cudnn-frontend/0003-cmake-install-samples-and-tests-when-built.patch create mode 100644 pkgs/development/cuda-modules/cudnn-frontend/0004-samples-fix-instances-of-maybe-uninitialized.patch create mode 100644 pkgs/development/cuda-modules/cudnn-frontend/CMakeLists.txt create mode 100644 pkgs/development/cuda-modules/cudnn-frontend/cudnn_frontend-config.cmake.in create mode 100644 pkgs/development/cuda-modules/cudnn-frontend/default.nix diff --git a/pkgs/development/cuda-modules/cudnn-frontend/0001-cmake-float-out-common-python-bindings-option.patch b/pkgs/development/cuda-modules/cudnn-frontend/0001-cmake-float-out-common-python-bindings-option.patch new file mode 100644 index 000000000000..76ad1d57ffcd --- /dev/null +++ b/pkgs/development/cuda-modules/cudnn-frontend/0001-cmake-float-out-common-python-bindings-option.patch @@ -0,0 +1,30 @@ +From eeef96e91bd3453160315bf4618b7b91ae7240ba Mon Sep 17 00:00:00 2001 +From: Connor Baker +Date: Sat, 18 Jan 2025 20:48:11 +0000 +Subject: [PATCH 1/4] cmake: float out common python bindings option + +--- + CMakeLists.txt | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9739569..8944621 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,12 +5,11 @@ project(cudnn_frontend VERSION 1.9.0) + option(CUDNN_FRONTEND_SKIP_JSON_LIB "Defines whether FE should not include nlohmann/json.hpp." OFF) + option(CUDNN_FRONTEND_BUILD_SAMPLES "Defines if samples are built or not." ON) + option(CUDNN_FRONTEND_BUILD_TESTS "Defines if unittests are built or not." ON) ++option(CUDNN_FRONTEND_BUILD_PYTHON_BINDINGS "Defines if python bindings are built or not." OFF) + + if(MSVC OR MSYS OR MINGW) +- option(CUDNN_FRONTEND_BUILD_PYTHON_BINDINGS "Defines if python bindings are built or not." OFF) + add_compile_options(/W4 /WX) + else() +- option(CUDNN_FRONTEND_BUILD_PYTHON_BINDINGS "Defines if python bindings are built or not." OFF) + add_compile_options(-Wall -Wextra -Wpedantic -Werror -Wno-error=attributes -Wno-attributes -Wno-error=unused-function -Wno-unused-function) + endif() + +-- +2.47.0 + diff --git a/pkgs/development/cuda-modules/cudnn-frontend/0002-cmake-add-config-so-headers-can-be-discovered-when-i.patch b/pkgs/development/cuda-modules/cudnn-frontend/0002-cmake-add-config-so-headers-can-be-discovered-when-i.patch new file mode 100644 index 000000000000..e3edf4913daa --- /dev/null +++ b/pkgs/development/cuda-modules/cudnn-frontend/0002-cmake-add-config-so-headers-can-be-discovered-when-i.patch @@ -0,0 +1,84 @@ +From da16ec51ea78f88f333ecf3df2a249fcc65ead24 Mon Sep 17 00:00:00 2001 +From: Connor Baker +Date: Sat, 18 Jan 2025 22:01:03 +0000 +Subject: [PATCH 2/4] cmake: add config so headers can be discovered when + installed + +--- + CMakeLists.txt | 39 +++++++++++++++++++++++++++++++--- + cudnn_frontend-config.cmake.in | 3 +++ + 2 files changed, 39 insertions(+), 3 deletions(-) + create mode 100644 cudnn_frontend-config.cmake.in + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8944621..9b1bfba 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.17) ++cmake_minimum_required(VERSION 3.23) + + project(cudnn_frontend VERSION 1.9.0) + +@@ -15,6 +15,15 @@ endif() + + add_library(cudnn_frontend INTERFACE) + ++# Add header files to library ++file(GLOB_RECURSE CUDNN_FRONTEND_INCLUDE_FILES "include/*") ++target_sources( ++ cudnn_frontend PUBLIC FILE_SET HEADERS ++ BASE_DIRS "$" ++ FILES "${CUDNN_FRONTEND_INCLUDE_FILES}" ++) ++unset(CUDNN_FRONTEND_INCLUDE_FILES) ++ + target_compile_definitions( + cudnn_frontend INTERFACE + $<$:CUDNN_FRONTEND_SKIP_JSON_LIB> +@@ -58,7 +67,31 @@ endif() + # * CMAKE_INSTALL_INCLUDEDIR + include(GNUInstallDirs) + ++# See https://cmake.org/cmake/help/latest/module/CMakePackageConfigHelpers.html#example-generating-package-files ++include(CMakePackageConfigHelpers) ++ ++# Install and export the header files ++install( ++ TARGETS cudnn_frontend ++ EXPORT cudnn_frontend_targets FILE_SET HEADERS ++) ++export( ++ EXPORT cudnn_frontend_targets ++ FILE "${CMAKE_CURRENT_BINARY_DIR}/cudnn_frontend/cudnn_frontend-targets.cmake" ++) ++install( ++ EXPORT cudnn_frontend_targets ++ FILE cudnn_frontend-targets.cmake ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cudnn_frontend" ++) ++ ++# Install the CMake configuration file for header discovery ++configure_package_config_file( ++ cudnn_frontend-config.cmake.in ++ "${CMAKE_CURRENT_BINARY_DIR}/cudnn_frontend-config.cmake" ++ INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cudnn_frontend" ++) + install( +- DIRECTORY ${PROJECT_SOURCE_DIR}/include/ +- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ++ FILES "${CMAKE_CURRENT_BINARY_DIR}/cudnn_frontend-config.cmake" ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cudnn_frontend" + ) +diff --git a/cudnn_frontend-config.cmake.in b/cudnn_frontend-config.cmake.in +new file mode 100644 +index 0000000..8b2d843 +--- /dev/null ++++ b/cudnn_frontend-config.cmake.in +@@ -0,0 +1,3 @@ ++@PACKAGE_INIT@ ++ ++include(${CMAKE_CURRENT_LIST_DIR}/cudnn_frontend-targets.cmake) +-- +2.47.0 + diff --git a/pkgs/development/cuda-modules/cudnn-frontend/0003-cmake-install-samples-and-tests-when-built.patch b/pkgs/development/cuda-modules/cudnn-frontend/0003-cmake-install-samples-and-tests-when-built.patch new file mode 100644 index 000000000000..a37e53bab069 --- /dev/null +++ b/pkgs/development/cuda-modules/cudnn-frontend/0003-cmake-install-samples-and-tests-when-built.patch @@ -0,0 +1,85 @@ +From 53d5aaaad09b479cd8c0e148c9428baa33204024 Mon Sep 17 00:00:00 2001 +From: Connor Baker +Date: Sat, 18 Jan 2025 22:10:41 +0000 +Subject: [PATCH 3/4] cmake: install samples and tests when built + +--- + CMakeLists.txt | 12 +++++++++++- + samples/cpp/CMakeLists.txt | 2 ++ + samples/legacy_samples/CMakeLists.txt | 2 ++ + test/cpp/CMakeLists.txt | 2 ++ + 4 files changed, 17 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9b1bfba..f6af111 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -70,11 +70,21 @@ include(GNUInstallDirs) + # See https://cmake.org/cmake/help/latest/module/CMakePackageConfigHelpers.html#example-generating-package-files + include(CMakePackageConfigHelpers) + +-# Install and export the header files ++# Install the components + install( + TARGETS cudnn_frontend + EXPORT cudnn_frontend_targets FILE_SET HEADERS + ) ++ ++if (CUDNN_FRONTEND_BUILD_SAMPLES) ++ install(TARGETS legacy_samples samples RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) ++endif() ++ ++if (CUDNN_FRONTEND_BUILD_TESTS) ++ install(TARGETS tests RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) ++endif() ++ ++# Export the targets + export( + EXPORT cudnn_frontend_targets + FILE "${CMAKE_CURRENT_BINARY_DIR}/cudnn_frontend/cudnn_frontend-targets.cmake" +diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt +index 9b8a5eb..01b09bb 100644 +--- a/samples/cpp/CMakeLists.txt ++++ b/samples/cpp/CMakeLists.txt +@@ -69,8 +69,10 @@ target_link_libraries( + _cudnn_frontend_pch + CUDNN::cudnn + ++ CUDA::cublasLt + CUDA::cudart + CUDA::cuda_driver # Needed as calls all CUDA calls will eventually move to driver ++ CUDA::nvrtc + ) + + # target cmake properties +diff --git a/samples/legacy_samples/CMakeLists.txt b/samples/legacy_samples/CMakeLists.txt +index 019f17c..3b56329 100644 +--- a/samples/legacy_samples/CMakeLists.txt ++++ b/samples/legacy_samples/CMakeLists.txt +@@ -44,7 +44,9 @@ target_link_libraries( + _cudnn_frontend_pch + CUDNN::cudnn + ++ CUDA::cublasLt + CUDA::cudart ++ CUDA::nvrtc + ) + + # target cmake properties +diff --git a/test/cpp/CMakeLists.txt b/test/cpp/CMakeLists.txt +index e244cd0..2750294 100644 +--- a/test/cpp/CMakeLists.txt ++++ b/test/cpp/CMakeLists.txt +@@ -55,7 +55,9 @@ target_link_libraries( + + CUDNN::cudnn + ++ CUDA::cublasLt + CUDA::cudart ++ CUDA::nvrtc + ) + + # cuDNN dlopen's its libraries +-- +2.47.0 + diff --git a/pkgs/development/cuda-modules/cudnn-frontend/0004-samples-fix-instances-of-maybe-uninitialized.patch b/pkgs/development/cuda-modules/cudnn-frontend/0004-samples-fix-instances-of-maybe-uninitialized.patch new file mode 100644 index 000000000000..d9119de87285 --- /dev/null +++ b/pkgs/development/cuda-modules/cudnn-frontend/0004-samples-fix-instances-of-maybe-uninitialized.patch @@ -0,0 +1,591 @@ +From 4ce40a0c3de0e8a7065caf1cf59a90493e084682 Mon Sep 17 00:00:00 2001 +From: Connor Baker +Date: Sat, 18 Jan 2025 22:22:21 +0000 +Subject: [PATCH 4/4] samples: fix instances of maybe-uninitialized + +--- + samples/cpp/convolution/dgrads.cpp | 6 +++--- + samples/cpp/convolution/fp8_fprop.cpp | 2 +- + samples/cpp/convolution/fprop.cpp | 10 +++++----- + samples/cpp/convolution/int8_fprop.cpp | 2 +- + samples/cpp/convolution/wgrads.cpp | 4 ++-- + samples/cpp/matmul/fp8_matmul.cpp | 2 +- + samples/cpp/matmul/int8_matmul.cpp | 2 +- + samples/cpp/matmul/matmuls.cpp | 8 ++++---- + samples/cpp/matmul/mixed_matmul.cpp | 2 +- + samples/cpp/misc/pointwise.cpp | 6 +++--- + samples/cpp/misc/resample.cpp | 6 +++--- + samples/cpp/misc/serialization.cpp | 4 ++-- + samples/cpp/misc/slice.cpp | 2 +- + samples/cpp/misc/sm_carveout.cpp | 2 +- + samples/cpp/norm/batchnorm.cpp | 8 ++++---- + samples/cpp/norm/layernorm.cpp | 8 ++++---- + samples/cpp/norm/rmsnorm.cpp | 6 +++--- + samples/cpp/sdpa/fp16_bwd.cpp | 2 +- + samples/cpp/sdpa/fp16_bwd_with_flexible_graphs.cpp | 2 +- + samples/cpp/sdpa/fp16_cached.cpp | 2 +- + samples/cpp/sdpa/fp16_fwd.cpp | 2 +- + samples/cpp/sdpa/fp16_fwd_with_custom_dropout.cpp | 2 +- + samples/cpp/sdpa/fp16_fwd_with_flexible_graphs.cpp | 2 +- + samples/cpp/sdpa/fp16_fwd_with_paged_caches.cpp | 2 +- + samples/cpp/sdpa/fp8_bwd.cpp | 4 ++-- + samples/cpp/sdpa/fp8_fwd.cpp | 2 +- + 26 files changed, 50 insertions(+), 50 deletions(-) + +diff --git a/samples/cpp/convolution/dgrads.cpp b/samples/cpp/convolution/dgrads.cpp +index 589cb5f..f66abf4 100644 +--- a/samples/cpp/convolution/dgrads.cpp ++++ b/samples/cpp/convolution/dgrads.cpp +@@ -65,7 +65,7 @@ TEST_CASE("Convolution Dgrad", "[dgrad][graph]") { + Surface w_tensor(64 * 32 * 3 * 3, false); + Surface dx_tensor(4 * 32 * 16 * 16, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + + Surface workspace(workspace_size, false); +@@ -122,7 +122,7 @@ TEST_CASE("Dgrad Drelu Graph", "[dgrad][graph]") { + Surface x_tensor(4 * 32 * 16 * 16, false); + Surface dx_tensor(4 * 32 * 16 * 16, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -234,7 +234,7 @@ TEST_CASE("Dgrad Drelu DBNweight Graph", "[dgrad][graph]") { + Surface eq_scale_x_tensor(1 * 32 * 1 * 1, false); + Surface eq_bias_tensor(1 * 32 * 1 * 1, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/convolution/fp8_fprop.cpp b/samples/cpp/convolution/fp8_fprop.cpp +index dfcb7e2..8246ce4 100644 +--- a/samples/cpp/convolution/fp8_fprop.cpp ++++ b/samples/cpp/convolution/fp8_fprop.cpp +@@ -116,7 +116,7 @@ TEST_CASE("Convolution fp8 precision", "[conv][graph]") { + Surface Y_scale_gpu(1, false); + Surface amax_gpu(1, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph->get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/convolution/fprop.cpp b/samples/cpp/convolution/fprop.cpp +index bc1aaf0..d61fa4e 100644 +--- a/samples/cpp/convolution/fprop.cpp ++++ b/samples/cpp/convolution/fprop.cpp +@@ -80,7 +80,7 @@ TEST_CASE("Convolution fprop", "[conv][graph][caching]") { + std::unordered_map variant_pack = { + {X->get_uid(), x_tensor.devPtr}, {W->get_uid(), w_tensor.devPtr}, {Y->get_uid(), y_tensor.devPtr}}; + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph->get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -303,7 +303,7 @@ TEST_CASE("CSBR Graph", "[conv][graph][caching]") { + Surface b_tensor(k, false); + Surface y_tensor(n * k * h * w, false); // Should be p, q. + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph->get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -550,7 +550,7 @@ TEST_CASE("SBRCS", "[conv][genstats][graph]") { + {SUM, sum_tensor.devPtr}, + {SQ_SUM, sq_sum_tensor.devPtr}}; + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph->get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -651,7 +651,7 @@ TEST_CASE("CBR Graph NCHW", "[conv][graph][caching]") { + Surface y_tensor(n * k * h * w, false); // Should be p, q. + Surface z_tensor(n * k * h * w, false); // Should be p, q. + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph->get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -734,7 +734,7 @@ TEST_CASE("Convolution fprop large", "[conv][graph][caching]") { + std::unordered_map variant_pack = { + {X->get_uid(), x_tensor.devPtr}, {W->get_uid(), w_tensor.devPtr}, {Y->get_uid(), y_tensor.devPtr}}; + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph->get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/convolution/int8_fprop.cpp b/samples/cpp/convolution/int8_fprop.cpp +index 3d5ac2f..e9248f5 100644 +--- a/samples/cpp/convolution/int8_fprop.cpp ++++ b/samples/cpp/convolution/int8_fprop.cpp +@@ -94,7 +94,7 @@ TEST_CASE("Conv with Int8 datatypes", "[conv][graph][caching]") { + std::unordered_map, void*> variant_pack = { + {X, x_tensor.devPtr}, {W, w_tensor.devPtr}, {Y, y_tensor.devPtr}}; + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph->get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/convolution/wgrads.cpp b/samples/cpp/convolution/wgrads.cpp +index 2c58b26..26887dc 100644 +--- a/samples/cpp/convolution/wgrads.cpp ++++ b/samples/cpp/convolution/wgrads.cpp +@@ -64,7 +64,7 @@ TEST_CASE("Convolution Wgrad", "[wgrad][graph][wgrad][Conv_wgrad]") { + Surface dy_tensor(4 * 64 * 16 * 16, false); + Surface dw_tensor(64 * 64 * 3 * 3, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -137,7 +137,7 @@ TEST_CASE("scale-bias-relu-wgrad Graph", "[wgrad][graph][scale-bias-relu-wgrad][ + Surface dy_tensor(4 * 64 * 16 * 16, false); + Surface dw_tensor(64 * 64 * 3 * 3, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/matmul/fp8_matmul.cpp b/samples/cpp/matmul/fp8_matmul.cpp +index c6470cd..f32c627 100644 +--- a/samples/cpp/matmul/fp8_matmul.cpp ++++ b/samples/cpp/matmul/fp8_matmul.cpp +@@ -115,7 +115,7 @@ TEST_CASE("Matmul fp8 precision", "[matmul][graph]") { + REQUIRE(graph.build_plans(handle, fe::BuildPlanPolicy_t::HEURISTICS_CHOICE).is_good()); + + Surface C_gpu(b * m * n, false); +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/matmul/int8_matmul.cpp b/samples/cpp/matmul/int8_matmul.cpp +index cf4353a..cb3ce34 100644 +--- a/samples/cpp/matmul/int8_matmul.cpp ++++ b/samples/cpp/matmul/int8_matmul.cpp +@@ -104,7 +104,7 @@ TEST_CASE("Int8 Matmul", "[matmul][graph]") { + // note this is a bf16 tensor, but half is used just for memory allocation + Surface C_gpu(b * m * n, false); + Surface Bias_gpu(b * m * n, false); +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/matmul/matmuls.cpp b/samples/cpp/matmul/matmuls.cpp +index ed0f10b..5c95713 100644 +--- a/samples/cpp/matmul/matmuls.cpp ++++ b/samples/cpp/matmul/matmuls.cpp +@@ -250,7 +250,7 @@ TEST_CASE("Matmul", "[matmul][graph]") { + + // Run cudnn graph + Surface C_gpu(b * m * n, false); +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -319,7 +319,7 @@ TEST_CASE("Abs + Matmul", "[matmul][graph]") { + + // Run cudnn graph + Surface C_gpu(b * m * n, false); +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -539,7 +539,7 @@ TEST_CASE("Matmul SBR Graph", "[matmul][graph]") { + auto [graph, A, B, bias, scale, O] = lookup_cache_or_build_graph( + handle, x_tensor.devPtr, w_tensor.devPtr, s_tensor.devPtr, b_tensor.devPtr, y_tensor.devPtr); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph->get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -606,7 +606,7 @@ TEST_CASE("Matmul with restricted shared memory", "[matmul][graph]") { + + // Run cudnn graph + Surface C_gpu(b * m * n, false); +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/matmul/mixed_matmul.cpp b/samples/cpp/matmul/mixed_matmul.cpp +index ab3e195..a2b05bd 100644 +--- a/samples/cpp/matmul/mixed_matmul.cpp ++++ b/samples/cpp/matmul/mixed_matmul.cpp +@@ -96,7 +96,7 @@ TEST_CASE("Mixed Precision Matmul", "[matmul][graph]") { + //// Run cudnn graph + // note this is a bf16 tensor, but half is used just for memory allocation + Surface C_gpu(b * m * n, false); +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/misc/pointwise.cpp b/samples/cpp/misc/pointwise.cpp +index 8f8d699..e8f4cb1 100644 +--- a/samples/cpp/misc/pointwise.cpp ++++ b/samples/cpp/misc/pointwise.cpp +@@ -51,7 +51,7 @@ TEST_CASE("Reduction", "[reduction]") { + Surface C_gpu(n * n * n * n, false); + std::unordered_map, void*> variant_pack = {{A, A_gpu.devPtr}, + {C, C_gpu.devPtr}}; +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -88,7 +88,7 @@ TEST_CASE("Fused scalar", "[scalar][graph]") { + + std::unordered_map, void*> variant_pack = {{A, A_gpu.devPtr}, + {C, C_gpu.devPtr}}; +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -148,7 +148,7 @@ TEST_CASE("Fused Amax Reduction and type conversion", "[reduction]") { + + std::unordered_map, void*> variant_pack = { + {A, A_gpu.devPtr}, {scale, scale_gpu.devPtr}, {amax, amax_gpu.devPtr}, {C, C_gpu.devPtr}}; +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/misc/resample.cpp b/samples/cpp/misc/resample.cpp +index 3f782e7..21998c3 100644 +--- a/samples/cpp/misc/resample.cpp ++++ b/samples/cpp/misc/resample.cpp +@@ -69,7 +69,7 @@ TEST_CASE("Resample Max Pooling NHWC Inference", "[resample][pooling][max][graph + Surface Y_gpu(N * H * W * C, false); + std::unordered_map, void*> variant_pack = {{X, X_gpu.devPtr}, + {Y, Y_gpu.devPtr}}; +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -132,7 +132,7 @@ TEST_CASE("Resample Max Pooling NHWC Training", "[resample][pooling][max][graph] + Surface Index_gpu(N * H * W * C / 8, false); + std::unordered_map, void*> variant_pack = { + {X, X_gpu.devPtr}, {Y, Y_gpu.devPtr}, {Index, Index_gpu.devPtr}}; +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -186,7 +186,7 @@ TEST_CASE("Resample Avg Pooling", "[resample][pooling][average][graph]") { + Surface Y_gpu(N * H * W * C, false); + std::unordered_map, void*> variant_pack = {{X, X_gpu.devPtr}, + {Y, Y_gpu.devPtr}}; +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/misc/serialization.cpp b/samples/cpp/misc/serialization.cpp +index a130406..278bad8 100644 +--- a/samples/cpp/misc/serialization.cpp ++++ b/samples/cpp/misc/serialization.cpp +@@ -178,7 +178,7 @@ TEST_CASE("CSBR Graph with serialization", "[conv][graph][serialization]") { + Surface b_device_memory(k, false); + Surface y_device_memory(n * k * h * w, false); // Should be p, q. + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph->get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -401,7 +401,7 @@ TEST_CASE("SDPA Graph with serialization", "[sdpa][graph][serialization]") { + Surface dropoutSeed(scaleSize, false, seed_value); + Surface dropoutOffset(scaleSize, false, (int32_t)1); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph->get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/misc/slice.cpp b/samples/cpp/misc/slice.cpp +index 087ba36..78962c6 100644 +--- a/samples/cpp/misc/slice.cpp ++++ b/samples/cpp/misc/slice.cpp +@@ -80,7 +80,7 @@ TEST_CASE("Slice gemm", "[slice][gemm][graph][fusion]") { + Surface C_gpu(B * M * N, false); + std::unordered_map variant_pack = { + {a_uid, A_gpu.devPtr}, {b_uid, B_gpu.devPtr}, {c_uid, C_gpu.devPtr}}; +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/misc/sm_carveout.cpp b/samples/cpp/misc/sm_carveout.cpp +index d6818c0..b0e0651 100644 +--- a/samples/cpp/misc/sm_carveout.cpp ++++ b/samples/cpp/misc/sm_carveout.cpp +@@ -121,7 +121,7 @@ TEST_CASE("SGBN with SM carveout", "[batchnorm][graph][sm_carveout]") { + Surface Peer_stats_0_tensor(2 * 4 * c, false, true); + Surface Peer_stats_1_tensor(2 * 4 * c, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/norm/batchnorm.cpp b/samples/cpp/norm/batchnorm.cpp +index 5949365..a91a9bd 100644 +--- a/samples/cpp/norm/batchnorm.cpp ++++ b/samples/cpp/norm/batchnorm.cpp +@@ -96,7 +96,7 @@ TEST_CASE("BN Finalize Graph", "[batchnorm][graph]") { + Surface eq_scale_tensor(32, false); + Surface eq_bias_tensor(32, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -226,7 +226,7 @@ TEST_CASE("SGBN Add Relu Graph", "[batchnorm][graph]") { + Surface Peer_stats_0_tensor(2 * 4 * 32, false, true); + Surface Peer_stats_1_tensor(2 * 4 * 32, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -346,7 +346,7 @@ TEST_CASE("DBN Add Relu Graph", "[BN][graph][backward]") { + Surface Peer_stats_0_tensor(2 * 4 * 32, false, true); + Surface Peer_stats_1_tensor(2 * 4 * 32, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -454,7 +454,7 @@ TEST_CASE("BN_inference DRelu DBN Graph", "[Batchnorm][graph][backward]") { + Surface Dbias_tensor(32, false); + Surface DX_tensor(4 * 32 * 16 * 16, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/norm/layernorm.cpp b/samples/cpp/norm/layernorm.cpp +index bac996f..7f69f34 100644 +--- a/samples/cpp/norm/layernorm.cpp ++++ b/samples/cpp/norm/layernorm.cpp +@@ -133,7 +133,7 @@ layernorm_fwd_dynamic_shapes(bool train = true) { + Surface Mean_tensor(max_stats_volume, false); + Surface Var_tensor(max_stats_volume, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -232,7 +232,7 @@ TEST_CASE("LayerNorm Training", "[layernorm][graph]") { + Surface Bias_tensor(hidden_size, false); + Surface Y_tensor(batch_size * seq_length * hidden_size, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -310,7 +310,7 @@ TEST_CASE("LayerNorm Inference", "[layernorm][graph]") { + Surface Bias_tensor(hidden_size, false); + Surface Y_tensor(batch_size * seq_length * hidden_size, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -392,7 +392,7 @@ TEST_CASE("LayerNorm Backward", "[layernorm][graph]") { + Surface Dbias_tensor(hidden_size, false); + Surface DX_tensor(batch_size * seq_length * hidden_size, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/norm/rmsnorm.cpp b/samples/cpp/norm/rmsnorm.cpp +index 878086c..d5c919b 100644 +--- a/samples/cpp/norm/rmsnorm.cpp ++++ b/samples/cpp/norm/rmsnorm.cpp +@@ -78,7 +78,7 @@ TEST_CASE("RmsNorm Training", "[rmsnorm][graph]") { + Surface Scale_tensor(hidden_size, false); + Surface Y_tensor(batch_size * seq_length * hidden_size, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -150,7 +150,7 @@ TEST_CASE("RmsNorm Inference", "[rmsnorm][graph]") { + Surface Bias_tensor(hidden_size, false); + Surface Y_tensor(batch_size * seq_length * hidden_size, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -227,7 +227,7 @@ TEST_CASE("RmsNorm Backward", "[rmsnorm][graph]") { + Surface Dbias_tensor(hidden_size, false); + Surface DX_tensor(batch_size * seq_length * hidden_size, false); + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/sdpa/fp16_bwd.cpp b/samples/cpp/sdpa/fp16_bwd.cpp +index 749cbed..1145008 100644 +--- a/samples/cpp/sdpa/fp16_bwd.cpp ++++ b/samples/cpp/sdpa/fp16_bwd.cpp +@@ -275,7 +275,7 @@ TEST_CASE("Toy sdpa backward", "[graph][sdpa][flash][backward]") { + } + + // Allocate workspace +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph->get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/sdpa/fp16_bwd_with_flexible_graphs.cpp b/samples/cpp/sdpa/fp16_bwd_with_flexible_graphs.cpp +index 62d6bb3..50205c3 100644 +--- a/samples/cpp/sdpa/fp16_bwd_with_flexible_graphs.cpp ++++ b/samples/cpp/sdpa/fp16_bwd_with_flexible_graphs.cpp +@@ -195,7 +195,7 @@ TEST_CASE("Toy sdpa backward with flexible graph", "[graph][sdpa][flash][backwar + {DV_UID, dV_tensor.devPtr}}; + + // Allocate workspace +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph->get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/sdpa/fp16_cached.cpp b/samples/cpp/sdpa/fp16_cached.cpp +index d046271..4f0d3f8 100644 +--- a/samples/cpp/sdpa/fp16_cached.cpp ++++ b/samples/cpp/sdpa/fp16_cached.cpp +@@ -146,7 +146,7 @@ TEST_CASE("Cached sdpa", "[graph][sdpa][flash]") { + {O_UID, o_tensor.devPtr}, + {STATS_UID, stats_tensor.devPtr}}; + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(fwd_graph2->get_workspace_size(workspace_size).is_good()); + Surface fwd_workspace(workspace_size, false); + +diff --git a/samples/cpp/sdpa/fp16_fwd.cpp b/samples/cpp/sdpa/fp16_fwd.cpp +index b3acf5e..63697a1 100644 +--- a/samples/cpp/sdpa/fp16_fwd.cpp ++++ b/samples/cpp/sdpa/fp16_fwd.cpp +@@ -210,7 +210,7 @@ TEST_CASE("Toy sdpa forward", "[graph][sdpa][flash][forward]") { + variant_pack[STATS_UID] = statsTensor.devPtr; + } + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph->get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/sdpa/fp16_fwd_with_custom_dropout.cpp b/samples/cpp/sdpa/fp16_fwd_with_custom_dropout.cpp +index 36cfba4..0cb9d2f 100644 +--- a/samples/cpp/sdpa/fp16_fwd_with_custom_dropout.cpp ++++ b/samples/cpp/sdpa/fp16_fwd_with_custom_dropout.cpp +@@ -178,7 +178,7 @@ TEST_CASE("Toy sdpa forward with dropout", "[graph][sdpa][flash][forward]") { + variant_pack[STATS_UID] = statsTensor.devPtr; + } + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph->get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/sdpa/fp16_fwd_with_flexible_graphs.cpp b/samples/cpp/sdpa/fp16_fwd_with_flexible_graphs.cpp +index 810de63..7d81afe 100644 +--- a/samples/cpp/sdpa/fp16_fwd_with_flexible_graphs.cpp ++++ b/samples/cpp/sdpa/fp16_fwd_with_flexible_graphs.cpp +@@ -186,7 +186,7 @@ TEST_CASE("Toy sdpa forward with flexible graph", "[graph][sdpa][flash][forward] + variant_pack[STATS_UID] = statsTensor.devPtr; + } + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph->get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/sdpa/fp16_fwd_with_paged_caches.cpp b/samples/cpp/sdpa/fp16_fwd_with_paged_caches.cpp +index 18dd937..d195f6b 100644 +--- a/samples/cpp/sdpa/fp16_fwd_with_paged_caches.cpp ++++ b/samples/cpp/sdpa/fp16_fwd_with_paged_caches.cpp +@@ -268,7 +268,7 @@ TEST_CASE("Toy sdpa forward with paged caches", "[graph][sdpa][flash][paged][for + variant_pack[STATS_UID] = statsTensor.devPtr; + } + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(graph->get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/sdpa/fp8_bwd.cpp b/samples/cpp/sdpa/fp8_bwd.cpp +index 82e542b..296f2f9 100644 +--- a/samples/cpp/sdpa/fp8_bwd.cpp ++++ b/samples/cpp/sdpa/fp8_bwd.cpp +@@ -214,7 +214,7 @@ TEST_CASE("sdpa_fp8_bprop", "[graph][sdpa][fp8][backward]") { + {Amax_dV, AMax_dV_Tensor.devPtr}, + {Amax_dP, AMax_dP_Tensor.devPtr}}; + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(mha_graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +@@ -385,7 +385,7 @@ TEST_CASE("sdpa_fp8_gqa_bprop", "[graph][sdpa][fp8][backward]") { + {amax_dV, amax_dV_gpu.devPtr}, + {amax_dP, amax_dP_gpu.devPtr}}; + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(mha_graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +diff --git a/samples/cpp/sdpa/fp8_fwd.cpp b/samples/cpp/sdpa/fp8_fwd.cpp +index 6ede98d..23abc3f 100644 +--- a/samples/cpp/sdpa/fp8_fwd.cpp ++++ b/samples/cpp/sdpa/fp8_fwd.cpp +@@ -146,7 +146,7 @@ TEST_CASE("sdpa_fp8_fprop", "[graph][sdpa][fp8][forward]") { + variant_pack[Stats] = stats_tensor.devPtr; + } + +- int64_t workspace_size; ++ int64_t workspace_size = 0; + REQUIRE(mha_graph.get_workspace_size(workspace_size).is_good()); + Surface workspace(workspace_size, false); + +-- +2.47.0 + diff --git a/pkgs/development/cuda-modules/cudnn-frontend/CMakeLists.txt b/pkgs/development/cuda-modules/cudnn-frontend/CMakeLists.txt new file mode 100644 index 000000000000..409d70f76d87 --- /dev/null +++ b/pkgs/development/cuda-modules/cudnn-frontend/CMakeLists.txt @@ -0,0 +1,133 @@ +cmake_minimum_required(VERSION 3.23) + +project(cudnn_frontend VERSION 1.8.0) + +option(CUDNN_FRONTEND_SKIP_JSON_LIB "Defines whether FE should not include nlohmann/json.hpp." OFF) +option(CUDNN_FRONTEND_BUILD_SAMPLES "Defines if samples are built or not." ON) +option(CUDNN_FRONTEND_BUILD_TESTS "Defines if unittests are built or not." ON) +option(CUDNN_FRONTEND_BUILD_PYTHON_BINDINGS "Defines if python bindings are built or not." OFF) + +if(MSVC OR MSYS OR MINGW) + add_compile_options(/W4 /WX) +else() + add_compile_options(-Wall -Wextra -Wpedantic -Werror -Wno-error=attributes -Wno-attributes -Wno-error=unused-function -Wno-unused-function) +endif() + +add_library(cudnn_frontend INTERFACE) + +# Add header files to library +file(GLOB_RECURSE CUDNN_FRONTEND_INCLUDE_FILES "include/*") +target_sources( + cudnn_frontend + PUBLIC + FILE_SET + HEADERS + BASE_DIRS + "$" + FILES + "${CUDNN_FRONTEND_INCLUDE_FILES}" +) +unset(CUDNN_FRONTEND_INCLUDE_FILES) + +target_compile_definitions(cudnn_frontend INTERFACE $<$:CUDNN_FRONTEND_SKIP_JSON_LIB>) + +target_include_directories( + cudnn_frontend + INTERFACE + "$" + "$" +) + +# Find the cuda compiler +find_package(CUDAToolkit REQUIRED) + +target_include_directories(cudnn_frontend INTERFACE ${CUDAToolkit_INCLUDE_DIRS}) + +target_compile_features(cudnn_frontend INTERFACE cxx_std_17) + +# Make PCH for targets to link against +add_library(_cudnn_frontend_pch INTERFACE) +target_precompile_headers(_cudnn_frontend_pch INTERFACE ${PROJECT_SOURCE_DIR}/include/cudnn_frontend.h) + +if (CUDNN_FRONTEND_BUILD_SAMPLES) + add_subdirectory(samples) + target_link_libraries( + samples + PRIVATE + CUDA::cublasLt + CUDA::nvrtc + ) + target_link_libraries( + legacy_samples + PRIVATE + CUDA::cublasLt + CUDA::nvrtc + ) +endif() + +if (CUDNN_FRONTEND_BUILD_TESTS) + add_subdirectory(test) + target_link_libraries( + tests + CUDA::cublasLt + CUDA::nvrtc + ) +endif() + +if (CUDNN_FRONTEND_BUILD_PYTHON_BINDINGS) + add_subdirectory(python) +endif() + +# Introduce variables: +# * CMAKE_INSTALL_LIBDIR +# * CMAKE_INSTALL_BINDIR +# * CMAKE_INSTALL_INCLUDEDIR +include(GNUInstallDirs) + +# Install and export the header files +install( + TARGETS + cudnn_frontend + EXPORT + cudnn_frontend_targets + FILE_SET HEADERS +) + +if (CUDNN_FRONTEND_BUILD_SAMPLES) + install(TARGETS legacy_samples samples RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif() + +if (CUDNN_FRONTEND_BUILD_TESTS) + install(TARGETS tests RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif() + +# See https://cmake.org/cmake/help/latest/module/CMakePackageConfigHelpers.html#example-generating-package-files +include(CMakePackageConfigHelpers) + +export( + EXPORT + cudnn_frontend_targets + FILE + "${CMAKE_CURRENT_BINARY_DIR}/cudnn_frontend/cudnn_frontend-targets.cmake" +) +install( + EXPORT + cudnn_frontend_targets + FILE + cudnn_frontend-targets.cmake + DESTINATION + "${CMAKE_INSTALL_LIBDIR}/cmake/cudnn_frontend" +) + +configure_package_config_file( + cudnn_frontend-config.cmake.in + "${CMAKE_CURRENT_BINARY_DIR}/cudnn_frontend-config.cmake" + INSTALL_DESTINATION + "${CMAKE_INSTALL_LIBDIR}/cmake/cudnn_frontend" +) +install( + FILES + "${CMAKE_CURRENT_BINARY_DIR}/cudnn_frontend-config.cmake" + DESTINATION + "${CMAKE_INSTALL_LIBDIR}/cmake/cudnn_frontend" +) diff --git a/pkgs/development/cuda-modules/cudnn-frontend/cudnn_frontend-config.cmake.in b/pkgs/development/cuda-modules/cudnn-frontend/cudnn_frontend-config.cmake.in new file mode 100644 index 000000000000..8b2d843096f9 --- /dev/null +++ b/pkgs/development/cuda-modules/cudnn-frontend/cudnn_frontend-config.cmake.in @@ -0,0 +1,3 @@ +@PACKAGE_INIT@ + +include(${CMAKE_CURRENT_LIST_DIR}/cudnn_frontend-targets.cmake) diff --git a/pkgs/development/cuda-modules/cudnn-frontend/default.nix b/pkgs/development/cuda-modules/cudnn-frontend/default.nix new file mode 100644 index 000000000000..8b020eae55a0 --- /dev/null +++ b/pkgs/development/cuda-modules/cudnn-frontend/default.nix @@ -0,0 +1,134 @@ +{ + autoAddDriverRunpath, + catch2_3, + cmake, + cudaPackages, + fetchFromGitHub, + gitUpdater, + lib, + ninja, + nlohmann_json, + stdenv, +}: +let + inherit (lib.lists) optionals; + inherit (lib.strings) + cmakeBool + cmakeFeature + optionalString + ; + inherit (cudaPackages) + cuda_cccl + cuda_cudart + cuda_nvcc + cuda_nvrtc + cudnn + libcublas + ; +in + +# TODO(@connorbaker): This should be a hybrid C++/Python package. +stdenv.mkDerivation (finalAttrs: { + pname = "cudnn-frontend"; + version = "1.9.0"; + + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = "cudnn-frontend"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Vc5jqB1XHcJEdKG0nxbWLewW2fDezRVwjUSzPDubSGE="; + }; + + patches = [ + # https://github.com/NVIDIA/cudnn-frontend/pull/125 + ./0001-cmake-float-out-common-python-bindings-option.patch + ./0002-cmake-add-config-so-headers-can-be-discovered-when-i.patch + ./0003-cmake-install-samples-and-tests-when-built.patch + ./0004-samples-fix-instances-of-maybe-uninitialized.patch + ]; + + # nlohmann_json should be the only vendored dependency. + postPatch = '' + echo "patching source to use nlohmann_json from nixpkgs" + rm -rf include/cudnn_frontend/thirdparty/nlohmann + rmdir include/cudnn_frontend/thirdparty + substituteInPlace include/cudnn_frontend_utils.h \ + --replace-fail \ + '#include "cudnn_frontend/thirdparty/nlohmann/json.hpp"' \ + '#include ' + ''; + + # TODO: As a header-only library, we should make sure we have an `include` directory or similar which is not a + # superset of the `out` (`bin`) or `dev` outputs (whih is what the multiple-outputs setup hook does by default). + outputs = + [ + "out" + ] + ++ optionals finalAttrs.doCheck [ + "legacy_samples" + "samples" + "tests" + ]; + + nativeBuildInputs = [ + autoAddDriverRunpath # Needed for samples because it links against CUDA::cuda_driver + cmake + cuda_nvcc + ninja + ]; + + buildInputs = [ + cuda_cccl + cuda_cudart + ]; + + cmakeFlags = [ + (cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true) + (cmakeFeature "FETCHCONTENT_TRY_FIND_PACKAGE_MODE" "ALWAYS") + (cmakeBool "CUDNN_FRONTEND_BUILD_SAMPLES" finalAttrs.doCheck) + (cmakeBool "CUDNN_FRONTEND_BUILD_TESTS" finalAttrs.doCheck) + (cmakeBool "CUDNN_FRONTEND_BUILD_PYTHON_BINDINGS" false) + ]; + + checkInputs = [ + cudnn + cuda_nvrtc + catch2_3 + libcublas + ]; + + enableParallelBuilding = true; + + propagatedBuildInputs = [ + nlohmann_json + ]; + + doCheck = true; + + postInstall = optionalString finalAttrs.doCheck '' + moveToOutput "bin/legacy_samples" "$legacy_samples" + moveToOutput "bin/samples" "$samples" + moveToOutput "bin/tests" "$tests" + if [[ -e "$out/bin" ]] + then + nixErrorLog "The bin directory in \$out should no longer exist." + exit 1 + fi + ''; + + passthru.updateScript = gitUpdater { + inherit (finalAttrs) pname version; + rev-prefix = "v"; + }; + + meta = { + description = "A c++ wrapper for the cudnn backend API"; + homepage = "https://github.com/NVIDIA/cudnn-frontend"; + license = lib.licenses.mit; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; + maintainers = (with lib.maintainers; [ connorbaker ]) ++ lib.teams.cuda.members; + }; +}) diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix index a8146d374c82..5c1c518222ca 100644 --- a/pkgs/top-level/cuda-packages.nix +++ b/pkgs/top-level/cuda-packages.nix @@ -79,6 +79,7 @@ let cudatoolkit = final.callPackage ../development/cuda-modules/cudatoolkit/redist-wrapper.nix { }; cudatoolkit-legacy-runfile = final.callPackage ../development/cuda-modules/cudatoolkit { }; + cudnn-frontend = final.callPackage ../development/cuda-modules/cudnn-frontend/default.nix { }; saxpy = final.callPackage ../development/cuda-modules/saxpy { }; nccl = final.callPackage ../development/cuda-modules/nccl { }; nccl-tests = final.callPackage ../development/cuda-modules/nccl-tests { }; From 63c41873fa82e62729cabdb7ab5810ef85e8d457 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 11 Dec 2024 21:03:45 +0100 Subject: [PATCH 0257/1107] onnxruntime: 1.18.1 -> 1.20.1 https://github.com/microsoft/onnxruntime/releases/tag/v1.19.0 https://github.com/microsoft/onnxruntime/releases/tag/v1.19.2 https://github.com/microsoft/onnxruntime/releases/tag/v1.20.0 https://github.com/microsoft/onnxruntime/releases/tag/v1.20.1 --- .../libraries/onnxruntime/default.nix | 73 ++++------ ...dependency-injection.patch => eigen.patch} | 22 ++- .../libraries/onnxruntime/nvcc-gsl.patch | 26 +--- .../libraries/onnxruntime/update-re2.patch | 132 ------------------ 4 files changed, 50 insertions(+), 203 deletions(-) rename pkgs/development/libraries/onnxruntime/{0001-eigen-allow-dependency-injection.patch => eigen.patch} (50%) delete mode 100644 pkgs/development/libraries/onnxruntime/update-re2.patch diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index 93a8e7c65a1c..8904addf87fa 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -2,9 +2,8 @@ , stdenv , lib , fetchFromGitHub -, fetchpatch2 , Foundation -, abseil-cpp_202401 +, abseil-cpp_202407 , cmake , cpuinfo , eigen @@ -12,6 +11,7 @@ , gbenchmark , glibcLocales , gtest +, howard-hinnant-date , libpng , nlohmann_json , nsync @@ -30,34 +30,33 @@ let - version = "1.18.1"; + version = "1.20.1"; - abseil-cpp = abseil-cpp_202401; + src = fetchFromGitHub { + owner = "microsoft"; + repo = "onnxruntime"; + tag = "v${version}"; + hash = "sha256-xIjR2HsVIqc78ojSXzoTGIxk7VndGYa8o4pVB8U8oXI="; + fetchSubmodules = true; + }; stdenv = throw "Use effectiveStdenv instead"; effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv; cudaArchitecturesString = cudaPackages.flags.cmakeCudaArchitecturesString; - howard-hinnant-date = fetchFromGitHub { - owner = "HowardHinnant"; - repo = "date"; - rev = "v3.0.1"; - sha256 = "sha256-ZSjeJKAcT7mPym/4ViDvIR9nFMQEBCSUtPEuMO27Z+I="; - }; - mp11 = fetchFromGitHub { owner = "boostorg"; repo = "mp11"; - rev = "boost-1.82.0"; + tag = "boost-1.82.0"; hash = "sha256-cLPvjkf2Au+B19PJNrUkTW/VPxybi1MpPxnIl4oo4/o="; }; safeint = fetchFromGitHub { owner = "dcleblanc"; repo = "safeint"; - rev = "ff15c6ada150a5018c5ef2172401cb4529eac9c0"; - hash = "sha256-PK1ce4C0uCR4TzLFg+elZdSk5DdPCRhhwT3LvEwWnPU="; + tag = "3.0.28"; + hash = "sha256-pjwjrqq6dfiVsXIhbBtbolhiysiFlFTnx5XcX77f+C0="; }; pytorch_clog = effectiveStdenv.mkDerivation { @@ -78,28 +77,26 @@ let onnx = fetchFromGitHub { owner = "onnx"; repo = "onnx"; - rev = "refs/tags/v1.16.1"; - hash = "sha256-I1wwfn91hdH3jORIKny0Xc73qW2P04MjkVCgcaNnQUE="; + tag = "v1.16.1"; + hash = "sha256-+NmWoZDXNJ8YQIWlUXV+czHyI8UtJedu2VG+1aR5L7s="; + # Apply backport of https://github.com/onnx/onnx/pull/6195 from 1.17.0 + postFetch = '' + pushd $out + patch -p1 < ${src}/cmake/patches/onnx/onnx.patch + popd + ''; }; cutlass = fetchFromGitHub { owner = "NVIDIA"; repo = "cutlass"; - rev = "v3.1.0"; - hash = "sha256-mpaiCxiYR1WaSSkcEPTzvcREenJWklD+HRdTT5/pD54="; + tag = "v3.5.1"; + hash = "sha256-sTGYN+bjtEqQ7Ootr/wvx3P9f8MCDSSj3qyCWjfdLEA="; }; in effectiveStdenv.mkDerivation rec { pname = "onnxruntime"; - inherit version; - - src = fetchFromGitHub { - owner = "microsoft"; - repo = "onnxruntime"; - rev = "refs/tags/v${version}"; - hash = "sha256-+zWtbLKekGhwdBU3bm1u2F7rYejQ62epE+HcHj05/8A="; - fetchSubmodules = true; - }; + inherit src version; patches = [ # If you stumble on these patches trying to update onnxruntime, check @@ -109,20 +106,7 @@ effectiveStdenv.mkDerivation rec { # - always try find_package first (FIND_PACKAGE_ARGS), # - use MakeAvailable instead of the low-level Populate, # - use Eigen3::Eigen as the target name (as declared by libeigen/eigen). - ./0001-eigen-allow-dependency-injection.patch - # Incorporate a patch that has landed upstream which exposes new - # 'abseil-cpp' libraries & modifies the 're2' CMakeLists to fix a - # configuration error that around missing 'gmock' exports. - # - # TODO: Check if it can be dropped after 1.19.0 - # https://github.com/microsoft/onnxruntime/commit/b522df0ae477e59f60acbe6c92c8a64eda96cace - ./update-re2.patch - # fix `error: template-id not allowed for constructor in C++20` - (fetchpatch2 { - name = "suppress-gcc-warning-in-TreeEnsembleAggregator.patch"; - url = "https://github.com/microsoft/onnxruntime/commit/10883d7997ed4b53f989a49bd4387c5769fbd12f.patch?full_index=1"; - hash = "sha256-NgvuCHE7axaUtZIjtQvDpagr+QtHdyL7xXkPQwZbhvY="; - }) + ./eigen.patch ] ++ lib.optionals cudaSupport [ # We apply the referenced 1064.patch ourselves to our nix dependency. # FIND_PACKAGE_ARGS for CUDA was added in https://github.com/microsoft/onnxruntime/commit/87744e5 so it might be possible to delete this patch after upgrading to 1.17.0 @@ -142,12 +126,14 @@ effectiveStdenv.mkDerivation rec { wheel ]) ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc + cudaPackages.cudnn-frontend ]; buildInputs = [ cpuinfo eigen glibcLocales + howard-hinnant-date libpng nlohmann_json microsoft-gsl @@ -192,10 +178,8 @@ effectiveStdenv.mkDerivation rec { "-DABSL_ENABLE_INSTALL=ON" "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" "-DFETCHCONTENT_QUIET=OFF" - "-DFETCHCONTENT_SOURCE_DIR_ABSEIL_CPP=${abseil-cpp.src}" - "-DFETCHCONTENT_SOURCE_DIR_DATE=${howard-hinnant-date}" + "-DFETCHCONTENT_SOURCE_DIR_ABSEIL_CPP=${abseil-cpp_202407.src}" "-DFETCHCONTENT_SOURCE_DIR_FLATBUFFERS=${flatbuffers_23.src}" - "-DFETCHCONTENT_SOURCE_DIR_GOOGLETEST=${gtest.src}" "-DFETCHCONTENT_SOURCE_DIR_GOOGLE_NSYNC=${nsync.src}" "-DFETCHCONTENT_SOURCE_DIR_MP11=${mp11}" "-DFETCHCONTENT_SOURCE_DIR_ONNX=${onnx}" @@ -229,6 +213,7 @@ effectiveStdenv.mkDerivation rec { postPatch = '' substituteInPlace cmake/libonnxruntime.pc.cmake.in \ --replace-fail '$'{prefix}/@CMAKE_INSTALL_ @CMAKE_INSTALL_ + echo "find_package(cudnn_frontend REQUIRED)" > cmake/external/cudnn_frontend.cmake '' + lib.optionalString (effectiveStdenv.hostPlatform.system == "aarch64-linux") '' # https://github.com/NixOS/nixpkgs/pull/226734#issuecomment-1663028691 rm -v onnxruntime/test/optimizer/nhwc_transformer_test.cc diff --git a/pkgs/development/libraries/onnxruntime/0001-eigen-allow-dependency-injection.patch b/pkgs/development/libraries/onnxruntime/eigen.patch similarity index 50% rename from pkgs/development/libraries/onnxruntime/0001-eigen-allow-dependency-injection.patch rename to pkgs/development/libraries/onnxruntime/eigen.patch index 0092ea4d1e8e..3a58755812d4 100644 --- a/pkgs/development/libraries/onnxruntime/0001-eigen-allow-dependency-injection.patch +++ b/pkgs/development/libraries/onnxruntime/eigen.patch @@ -1,13 +1,21 @@ diff --git a/cmake/external/eigen.cmake b/cmake/external/eigen.cmake -index b123adb..aab2483 100644 +index 339cded091..6264c8da69 100644 --- a/cmake/external/eigen.cmake +++ b/cmake/external/eigen.cmake -@@ -7,8 +7,13 @@ else () - eigen - URL ${DEP_URL_eigen} - URL_HASH SHA1=${DEP_SHA1_eigen} -+ FIND_PACKAGE_ARGS NAMES Eigen3 - ) +@@ -9,15 +9,21 @@ else () + URL ${DEP_URL_eigen} + URL_HASH SHA1=${DEP_SHA1_eigen} + PATCH_COMMAND ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/patches/eigen/eigen-aix.patch ++ FIND_PACKAGE_ARGS NAMES Eigen3 + ) + else() + FetchContent_Declare( + eigen + URL ${DEP_URL_eigen} + URL_HASH SHA1=${DEP_SHA1_eigen} ++ FIND_PACKAGE_ARGS NAMES Eigen3 + ) + endif() - FetchContent_Populate(eigen) - set(eigen_INCLUDE_DIRS "${eigen_SOURCE_DIR}") diff --git a/pkgs/development/libraries/onnxruntime/nvcc-gsl.patch b/pkgs/development/libraries/onnxruntime/nvcc-gsl.patch index ca94faab9394..c6ac77602fca 100644 --- a/pkgs/development/libraries/onnxruntime/nvcc-gsl.patch +++ b/pkgs/development/libraries/onnxruntime/nvcc-gsl.patch @@ -1,12 +1,11 @@ diff --git a/cmake/external/onnxruntime_external_deps.cmake b/cmake/external/onnxruntime_external_deps.cmake -index 775576a..ccea13c 100644 +index 85746027d4..346ac37a54 100644 --- a/cmake/external/onnxruntime_external_deps.cmake +++ b/cmake/external/onnxruntime_external_deps.cmake -@@ -367,22 +367,12 @@ if (NOT WIN32) - endif() +@@ -422,14 +422,6 @@ if ((CPUINFO_SUPPORTED OR onnxruntime_USE_XNNPACK) AND NOT ANDROID) endif() --if(onnxruntime_USE_CUDA) + if(onnxruntime_USE_CUDA) - FetchContent_Declare( - GSL - URL ${DEP_URL_microsoft_gsl} @@ -15,19 +14,6 @@ index 775576a..ccea13c 100644 - FIND_PACKAGE_ARGS 4.0 NAMES Microsoft.GSL - ) -else() -- FetchContent_Declare( -- GSL -- URL ${DEP_URL_microsoft_gsl} -- URL_HASH SHA1=${DEP_SHA1_microsoft_gsl} -- FIND_PACKAGE_ARGS 4.0 NAMES Microsoft.GSL -- ) --endif() -+FetchContent_Declare( -+ GSL -+ URL ${DEP_URL_microsoft_gsl} -+ URL_HASH SHA1=${DEP_SHA1_microsoft_gsl} -+ FIND_PACKAGE_ARGS 4.0 NAMES Microsoft.GSL -+) - - FetchContent_Declare( - safeint + FetchContent_Declare( + GSL + URL ${DEP_URL_microsoft_gsl} diff --git a/pkgs/development/libraries/onnxruntime/update-re2.patch b/pkgs/development/libraries/onnxruntime/update-re2.patch deleted file mode 100644 index 7996721f8e11..000000000000 --- a/pkgs/development/libraries/onnxruntime/update-re2.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 0d1e631c365944d54e87bdce39beb13b225ba8f8 Mon Sep 17 00:00:00 2001 -From: Changming Sun -Date: Thu, 23 May 2024 14:30:15 -0700 -Subject: [PATCH] Update RE2 to the latest (#20775) - -Update RE2 to the latest. - -To keep the components up to date. - -(cherry picked from commit b522df0ae477e59f60acbe6c92c8a64eda96cace) ---- - cgmanifests/generated/cgmanifest.json | 2 +- - cmake/deps.txt | 4 +-- - cmake/external/abseil-cpp.cmake | 35 ++++++++++++++++++++++----- - cmake/external/helper_functions.cmake | 6 +++++ - 4 files changed, 38 insertions(+), 9 deletions(-) - -diff --git a/cgmanifests/generated/cgmanifest.json b/cgmanifests/generated/cgmanifest.json -index eb74178b3e..e3e9be67ae 100644 ---- a/cgmanifests/generated/cgmanifest.json -+++ b/cgmanifests/generated/cgmanifest.json -@@ -276,7 +276,7 @@ - "component": { - "type": "git", - "git": { -- "commitHash": "5723bb8950318135ed9cf4fc76bed988a087f536", -+ "commitHash": "2b354c6ad0d0479dcff68dab23fb0d1143a482c2", - "repositoryUrl": "https://github.com/google/re2.git" - }, - "comments": "re2" -diff --git a/cmake/deps.txt b/cmake/deps.txt -index d213b09034..d4d19dea08 100644 ---- a/cmake/deps.txt -+++ b/cmake/deps.txt -@@ -50,11 +50,11 @@ psimd;https://github.com/Maratyszcza/psimd/archive/072586a71b55b7f8c584153d223e9 - pthreadpool;https://github.com/Maratyszcza/pthreadpool/archive/4fe0e1e183925bf8cfa6aae24237e724a96479b8.zip;07a0aa91dd9bf86f31b95497e00f31d8a261a4bd - pybind11;https://github.com/pybind/pybind11/archive/refs/tags/v2.10.1.zip;769b6aa67a77f17a770960f604b727645b6f6a13 - pytorch_cpuinfo;https://github.com/pytorch/cpuinfo/archive/959002f82d7962a473d8bf301845f2af720e0aa4.zip;85da3caa60eb2b148613b443fbc2bfdc30689965 --re2;https://github.com/google/re2/archive/refs/tags/2022-06-01.zip;aa77313b76e91b531ee7f3e45f004c6a502a5374 -+re2;https://github.com/google/re2/archive/refs/tags/2024-05-01.tar.gz;206cfee5ee0b4c6844680ba66275e9e8faa77405 - safeint;https://github.com/dcleblanc/SafeInt/archive/refs/tags/3.0.28.zip;23f252040ff6cb9f1fd18575b32fa8fb5928daac - tensorboard;https://github.com/tensorflow/tensorboard/archive/373eb09e4c5d2b3cc2493f0949dc4be6b6a45e81.zip;67b833913605a4f3f499894ab11528a702c2b381 - cutlass;https://github.com/NVIDIA/cutlass/archive/refs/tags/v3.1.0.zip;757f90a795034a89d4f48a79d1f009f7a04c8dee - utf8_range;https://github.com/protocolbuffers/utf8_range/archive/72c943dea2b9240cd09efde15191e144bc7c7d38.zip;9925739c9debc0efa2adcb194d371a35b6a03156 - extensions;https://github.com/microsoft/onnxruntime-extensions/archive/94142d8391c9791ec71c38336436319a2d4ac7a0.zip;4365ac5140338b4cb75a39944a4be276e3829b3c - composable_kernel;https://github.com/ROCmSoftwarePlatform/composable_kernel/archive/5356c4a943a35e74d7cdc69486afcb8703b9a59a.zip;522382c2af437e09124287e5879ab64af5b2e299 --directx_headers;https://github.com/microsoft/DirectX-Headers/archive/refs/tags/v1.613.1.zip;47653509a3371eabb156360f42faf582f314bf2e -\ No newline at end of file -+directx_headers;https://github.com/microsoft/DirectX-Headers/archive/refs/tags/v1.613.1.zip;47653509a3371eabb156360f42faf582f314bf2e -diff --git a/cmake/external/abseil-cpp.cmake b/cmake/external/abseil-cpp.cmake -index 57cfbee464..c01195c99e 100644 ---- a/cmake/external/abseil-cpp.cmake -+++ b/cmake/external/abseil-cpp.cmake -@@ -45,10 +45,8 @@ endif() - - # TODO: since multiple ORT's dependencies depend on Abseil, the list below would vary from version to version. - # We'd better to not manually manage the list. --set(ABSEIL_LIBS absl::base -+set(ABSEIL_LIBS - absl::city --absl::core_headers --absl::fixed_array - absl::flags - absl::flat_hash_map - absl::flat_hash_set -@@ -60,9 +58,34 @@ absl::node_hash_set - absl::optional - absl::raw_hash_set - absl::raw_logging_internal --absl::span - absl::str_format --absl::strings -+absl::str_format_internal -+absl::bits -+absl::fixed_array -+absl::numeric_representation -+absl::utility -+absl::type_traits -+absl::string_view -+absl::core_headers -+absl::nullability -+absl::span -+absl::config - absl::synchronization -+absl::base -+absl::civil_time -+absl::debugging_internal -+absl::demangle_internal -+absl::graphcycles_internal -+absl::int128 -+absl::kernel_timeout_internal -+absl::log_severity -+absl::malloc_internal -+absl::spinlock_wait -+absl::stacktrace -+absl::string_view -+absl::strings -+absl::strings_internal -+absl::symbolize - absl::throw_delegate --absl::time) -+absl::time -+absl::time_zone) -\ No newline at end of file -diff --git a/cmake/external/helper_functions.cmake b/cmake/external/helper_functions.cmake -index 768e807b40..eefb3ba2e8 100644 ---- a/cmake/external/helper_functions.cmake -+++ b/cmake/external/helper_functions.cmake -@@ -159,7 +159,12 @@ macro(onnxruntime_fetchcontent_makeavailable) - endif() - - if(EXISTS ${__cmake_srcdir}/CMakeLists.txt) -+ set(CMAKE_SKIP_INSTALL_RULES TRUE) -+ if (__cmake_arg_SYSTEM) -+ add_subdirectory(${__cmake_srcdir} ${${__cmake_contentNameLower}_BINARY_DIR} SYSTEM) -+ else() - add_subdirectory(${__cmake_srcdir} ${${__cmake_contentNameLower}_BINARY_DIR} EXCLUDE_FROM_ALL) -+ endif() - get_property(subdir_import_targets DIRECTORY "${__cmake_srcdir}" PROPERTY BUILDSYSTEM_TARGETS) - foreach(subdir_target ${subdir_import_targets}) - if(TARGET ${subdir_target}) -@@ -176,6 +181,7 @@ macro(onnxruntime_fetchcontent_makeavailable) - set_target_properties(${subdir_target} PROPERTIES COMPILE_WARNING_AS_ERROR OFF) - endif() - endforeach() -+ set(CMAKE_SKIP_INSTALL_RULES FALSE) - endif() - - unset(__cmake_srcdir) --- -2.45.2 - From 47194d73ca6979f9e93fdab946c0db1ce6b826aa Mon Sep 17 00:00:00 2001 From: Peter Kling Date: Sun, 12 Jan 2025 03:48:27 +0100 Subject: [PATCH 0258/1107] onnxruntime: fix aarch64-darwin build --- pkgs/development/libraries/onnxruntime/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index 8904addf87fa..2b91cf0315c1 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -186,6 +186,8 @@ effectiveStdenv.mkDerivation rec { "-DFETCHCONTENT_SOURCE_DIR_RE2=${re2.src}" "-DFETCHCONTENT_SOURCE_DIR_SAFEINT=${safeint}" "-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS" + # fails to find protoc on darwin, so specify it + "-DONNX_CUSTOM_PROTOC_EXECUTABLE=${protobuf_21}/bin/protoc" "-Donnxruntime_BUILD_SHARED_LIB=ON" (lib.cmakeBool "onnxruntime_BUILD_UNIT_TESTS" doCheck) "-Donnxruntime_ENABLE_LTO=ON" From 5fea61163408370fa6adadb8d039d717539bd730 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 9 Feb 2025 10:58:59 +0000 Subject: [PATCH 0259/1107] docs: mention promotion of `stackclashprotection` hardening flag to default enabled --- doc/stdenv/stdenv.chapter.md | 8 ++++---- nixos/doc/manual/release-notes/rl-2505.section.md | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index cd20185b8ffc..80059a78733c 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -1560,6 +1560,10 @@ intel_drv.so: undefined symbol: vgaHWFreeHWRec Adds the `-fzero-call-used-regs=used-gpr` compiler option. This causes the general-purpose registers that an architecture's calling convention considers "call-used" to be zeroed on return from the function. This can make it harder for attackers to construct useful ROP gadgets and also reduces the chance of data leakage from a function call. +#### `stackclashprotection` {#stackclashprotection} + +This flag adds the `-fstack-clash-protection` compiler option, which causes growth of a program's stack to access each successive page in order. This should force the guard page to be accessed and cause an attempt to "jump over" this guard page to crash. + ### Hardening flags disabled by default {#sec-hardening-flags-disabled-by-default} The following flags are disabled by default and should be enabled with `hardeningEnable` for packages that take untrusted input like network services. @@ -1599,10 +1603,6 @@ This should be turned off or fixed for build errors such as: sorry, unimplemented: __builtin_clear_padding not supported for variable length aggregates ``` -#### `stackclashprotection` {#stackclashprotection} - -This flag adds the `-fstack-clash-protection` compiler option, which causes growth of a program's stack to access each successive page in order. This should force the guard page to be accessed and cause an attempt to "jump over" this guard page to crash. - #### `pacret` {#pacret} This flag adds the `-mbranch-protection=pac-ret` compiler option on aarch64-linux targets. This uses ARM v8.3's Pointer Authentication feature to sign function return pointers before adding them to the stack. The pointer's authenticity is then validated before returning to its destination. This dramatically increases the difficulty of ROP exploitation techniques. diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 8067b2aad670..d62c6914a6c9 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -460,6 +460,8 @@ - `networking.wireguard` now has an optional networkd backend. It is enabled by default when `networking.useNetworkd` is enabled, and it can be enabled alongside scripted networking with `networking.wireguard.useNetworkd`. Some `networking.wireguard` options have slightly different behavior with the networkd and script-based backends, documented in each option. +- The `stackclashprotection` hardening flag has been enabled by default on compilers that support it. + - `services.avahi.ipv6` now defaults to true. - The Home Assistant module has new options {option}`services.home-assistant.blueprints.automation`, `services.home-assistant.blueprints.script`, and {option}`services.home-assistant.blueprints.template` that allow for the declarative installation of [blueprints](https://www.home-assistant.io/docs/blueprint/) into the appropriate configuration directories. From a7e4b22c912de8549bb489d021852d5a5448b607 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sun, 9 Feb 2025 13:11:10 -0300 Subject: [PATCH 0260/1107] vinegar: 1.7.8 -> 1.8.0 --- pkgs/by-name/vi/vinegar/package.nix | 157 +++++++++++++++++++++------- 1 file changed, 119 insertions(+), 38 deletions(-) diff --git a/pkgs/by-name/vi/vinegar/package.nix b/pkgs/by-name/vi/vinegar/package.nix index b88e26336c06..68cfa1ae0974 100644 --- a/pkgs/by-name/vi/vinegar/package.nix +++ b/pkgs/by-name/vi/vinegar/package.nix @@ -1,81 +1,162 @@ { lib, buildGoModule, - fetchFromGitHub, - fetchurl, - pkg-config, - xorg, - wayland, - vulkan-headers, wine64Packages, + fetchpatch, + fetchFromGitHub, + glib, + makeBinaryWrapper, + pkg-config, + gtk4, + libadwaita, libGL, libxkbcommon, - makeBinaryWrapper, + vulkan-headers, + vulkan-loader, + wayland, + winetricks, + xorg, + symlinkJoin, + cairo, + gdk-pixbuf, + graphene, + pango, nix-update-script, }: let - wine = (wine64Packages.staging.override { embedInstallers = true; }).overrideAttrs (oldAttrs: { - patches = oldAttrs.patches or [ ] ++ [ - (fetchurl { - name = "loader-prefer-winedllpath.patch"; - url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/3e07606350d803fa386eb4c358836a230819380d/patches/wine/loader-prefer-winedllpath.patch"; - hash = "sha256-89wnr2rIbyw490hHwckB9g1GKCXm6BERnplfwEUlNOg="; - }) - ]; - }); + wine = + (wine64Packages.staging.override { + dbusSupport = true; + embedInstallers = true; + pulseaudioSupport = true; + x11Support = true; + waylandSupport = true; + }).overrideAttrs + (oldAttrs: { + # https://github.com/flathub/org.vinegarhq.Vinegar/blob/1a42384ff0c5670504415190301c20e89601bbad/wine.yml#L31 + # --with-wayland is added by waylandSupport = true; + configureFlags = oldAttrs.configureFlags or [ ] ++ [ + "--disable-tests" + "--disable-win16" + "--with-dbus" + "--with-pulse" + "--with-x" + "--without-oss" + ]; + + patches = oldAttrs.patches or [ ] ++ [ + (fetchpatch { + name = "loader-prefer-winedllpath.patch"; + url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/3e07606350d803fa386eb4c358836a230819380d/patches/wine/loader-prefer-winedllpath.patch"; + hash = "sha256-89wnr2rIbyw490hHwckB9g1GKCXm6BERnplfwEUlNOg="; + }) + ]; + }); in buildGoModule rec { pname = "vinegar"; - version = "1.7.8"; + version = "1.8.0"; src = fetchFromGitHub { owner = "vinegarhq"; repo = "vinegar"; - rev = "v${version}"; - hash = "sha256-qyBYPBXQgjnGA2LnghPFOd0AO6+sQcZPzPI0rlJvGHE="; + tag = "v${version}"; + hash = "sha256-eAQ5qlBY1PmpijEu7mPmCBFbAIA30ABcbirdBljAmTQ="; }; - vendorHash = "sha256-SDJIoZf/Doa/NrEBRL1WXvz+fyTDGRyG0bvQ0S8A+KA="; + vendorHash = "sha256-NLNAUf99psBq8PayorBH1DT6o9wZyKwx9ab+TtpKU50="; nativeBuildInputs = [ - pkg-config + glib makeBinaryWrapper + pkg-config ]; buildInputs = [ + gtk4 + libadwaita + libGL + libxkbcommon + vulkan-headers + vulkan-loader + wayland + wine + winetricks xorg.libX11 xorg.libXcursor xorg.libXfixes - wayland - vulkan-headers - wine - libGL - libxkbcommon ]; - ldflags = [ - "-s" - "-w" - ]; + buildPhase = '' + runHook preBuild - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; + make PREFIX=$out + + runHook postBuild + ''; + + # Add getGoDirs to checkPhase since it is not being provided by the buildPhase + preCheck = '' + getGoDirs() { + local type; + type="$1" + if [ -n "$subPackages" ]; then + echo "$subPackages" | sed "s,\(^\| \),\1./,g" + else + find . -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort --unique | grep -v "$exclude" + fi + } + ''; + + preInstall = '' + substituteInPlace Makefile --replace-fail 'gtk-update-icon-cache' '${lib.getExe' gtk4 "gtk4-update-icon-cache"}' + ''; + + installPhase = '' + runHook preInstall + + make PREFIX=$out install + + runHook postInstall + ''; postInstall = '' wrapProgram $out/bin/vinegar \ - --prefix PATH : ${lib.makeBinPath [ wine ]} + --prefix PATH : ${ + lib.makeBinPath [ + wine + winetricks + ] + } \ + --prefix PUREGOTK_LIB_FOLDER : ${passthru.libraryPath}/lib ''; - passthru.updateScript = nix-update-script { }; + passthru = { + libraryPath = symlinkJoin { + name = "vinegar-puregotk-lib-folder"; + paths = [ + cairo + glib.out + graphene + gdk-pixbuf + gtk4 + libadwaita + pango.out + vulkan-loader + ]; + }; + + updateScript = nix-update-script { }; + }; meta = { - description = "Open-source, minimal, configurable, fast bootstrapper for running Roblox on Linux"; - homepage = "https://github.com/vinegarhq/vinegar"; changelog = "https://github.com/vinegarhq/vinegar/releases/tag/v${version}"; + description = "Open-source, minimal, configurable, fast bootstrapper for running Roblox Studio on Linux"; + homepage = "https://github.com/vinegarhq/vinegar"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ HeitorAugustoLN ]; mainProgram = "vinegar"; + maintainers = with lib.maintainers; [ HeitorAugustoLN ]; platforms = [ "x86_64-linux" ]; + sourceProvenance = [ lib.sourceTypes.fromSource ]; }; } From 7a3530c8dc478fe497369c93a713de587dc651fb Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 9 Feb 2025 18:50:17 +0100 Subject: [PATCH 0261/1107] libproxy: fix build with introspection unavailable Fixes e.g. cross build for s390-linux. --- .../libraries/libproxy/default.nix | 38 ++++++++++++------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index bb9d490b6fc7..2bf13ebe1758 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -17,17 +17,24 @@ stdenv, substituteAll, vala, + buildPackages, + withIntrospection ? + lib.meta.availableOn stdenv.hostPlatform gobject-introspection + && stdenv.hostPlatform.emulatorAvailable buildPackages, }: stdenv.mkDerivation (finalAttrs: { pname = "libproxy"; version = "0.5.9"; - outputs = [ - "out" - "dev" - "devdoc" - ]; + outputs = + [ + "out" + "dev" + ] + ++ lib.optionals withIntrospection [ + "devdoc" + ]; src = fetchFromGitHub { owner = "libproxy"; @@ -65,14 +72,17 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "requires_private: 'gobject-2.0'" "requires: 'gobject-2.0'" ''; - nativeBuildInputs = [ - gi-docgen - gobject-introspection - meson - ninja - pkg-config - vala - ]; + nativeBuildInputs = + [ + meson + ninja + pkg-config + ] + ++ lib.optionals withIntrospection [ + gi-docgen + gobject-introspection + vala + ]; buildInputs = [ @@ -95,6 +105,8 @@ stdenv.mkDerivation (finalAttrs: { [ # Prevent installing commit hook. "-Drelease=true" + (lib.mesonBool "docs" withIntrospection) + (lib.mesonBool "introspection" withIntrospection) ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-Dconfig-gnome=false" From ed379bf876c433283ec7a07e55fc1cf464dea0d5 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 10 Feb 2025 01:54:48 +0800 Subject: [PATCH 0262/1107] elpa-packages: updated 2025-02-10 (from overlay) --- .../emacs/elisp-packages/elpa-generated.nix | 124 +++++++++++++----- 1 file changed, 94 insertions(+), 30 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 4450fb78c465..733a37e3c1b7 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -1,5 +1,26 @@ { callPackage }: { + a68-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "a68-mode"; + ename = "a68-mode"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/a68-mode-1.0.tar"; + sha256 = "1fhmsix14wmysbp3w0zaywlf3m5wqmgydw2377zsgbaz7k3s3y8x"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/a68-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; ace-window = callPackage ( { avy, @@ -496,6 +517,28 @@ }; } ) { }; + auth-source-xoauth2-plugin = callPackage ( + { + elpaBuild, + fetchurl, + lib, + oauth2, + }: + elpaBuild { + pname = "auth-source-xoauth2-plugin"; + ename = "auth-source-xoauth2-plugin"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/auth-source-xoauth2-plugin-0.1.tar"; + sha256 = "1mni58ckvcs33jnp78y39pg6rfnm4908iz6g7l7d9y8hbjwin4xm"; + }; + packageRequires = [ oauth2 ]; + meta = { + homepage = "https://elpa.gnu.org/packages/auth-source-xoauth2-plugin.html"; + license = lib.licenses.free; + }; + } + ) { }; auto-correct = callPackage ( { elpaBuild, @@ -581,6 +624,27 @@ }; } ) { }; + autorevert-tail-truncate = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "autorevert-tail-truncate"; + ename = "autorevert-tail-truncate"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/autorevert-tail-truncate-1.0.0.tar"; + sha256 = "0p8gbcgmra4av4c0sbrazfb56vp564m2cyjrspkmsjlzwgl3634r"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/autorevert-tail-truncate.html"; + license = lib.licenses.free; + }; + } + ) { }; avy = callPackage ( { cl-lib ? null, @@ -1234,10 +1298,10 @@ elpaBuild { pname = "colorful-mode"; ename = "colorful-mode"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/colorful-mode-1.0.4.tar"; - sha256 = "0vy1rqv9aknns81v97j6dwr621hbs0489p7bhpg7k7qva39i97vs"; + url = "https://elpa.gnu.org/packages/colorful-mode-1.1.0.tar"; + sha256 = "1rq9jsa6imj6bw8s63sg7v6xc1zgrr4afrm4pydl280ly6cmp5bv"; }; packageRequires = [ compat ]; meta = { @@ -1511,10 +1575,10 @@ elpaBuild { pname = "consult-recoll"; ename = "consult-recoll"; - version = "0.8.1"; + version = "1.0.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-recoll-0.8.1.tar"; - sha256 = "1zdmkq9cjb6kb0hf3ngm07r3mhrjal27x34i1bm7ri3089wbsp8v"; + url = "https://elpa.gnu.org/packages/consult-recoll-1.0.0.tar"; + sha256 = "1fjc5s1xn15vglmaqywnrpqnjb46w15xysk7n18ifqapcya5g0x0"; }; packageRequires = [ consult ]; meta = { @@ -2715,10 +2779,10 @@ elpaBuild { pname = "elisa"; ename = "elisa"; - version = "1.1.5"; + version = "1.1.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/elisa-1.1.5.tar"; - sha256 = "1ab8mvnsvip6ws4wflwkdpn8bilcqfryrcr0ps66v8dh80ws4iyh"; + url = "https://elpa.gnu.org/packages/elisa-1.1.7.tar"; + sha256 = "042bdbaxz521xs4ra89mn408vaqax0f0dn6xl6823f4vv1spq6k7"; }; packageRequires = [ async @@ -2766,10 +2830,10 @@ elpaBuild { pname = "ellama"; ename = "ellama"; - version = "0.13.4"; + version = "0.13.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ellama-0.13.4.tar"; - sha256 = "1dsd9xj21x9v5wajzqvx1n4jbrnz29j3na9sz7l2hik7g090498f"; + url = "https://elpa.gnu.org/packages/ellama-0.13.7.tar"; + sha256 = "1nlav89rb1xdrjj4kb9pvz3wjvlvwyz7h11fm098g8s81r703hcx"; }; packageRequires = [ compat @@ -4899,10 +4963,10 @@ elpaBuild { pname = "llm"; ename = "llm"; - version = "0.22.0"; + version = "0.23.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/llm-0.22.0.tar"; - sha256 = "191chymh1ykngvwznb75ial3fnr98k3p3379gl6v8r55gic14byh"; + url = "https://elpa.gnu.org/packages/llm-0.23.0.tar"; + sha256 = "0a277fvi28xxjkr0884pdq23alk6rs3m42vs75r5ivv6ggznjzz9"; }; packageRequires = [ plz @@ -6011,10 +6075,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.7.20"; + version = "9.7.21"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.7.20.tar"; - sha256 = "06pp3092mzrn5fqs0rzhrsa3k8sknx96bwn7vr7w1y0n1m81s0ln"; + url = "https://elpa.gnu.org/packages/org-9.7.21.tar"; + sha256 = "0g2zwzidf4wzw0f120445a5j2297l9xgjbr0szhacspkfrxgjxg5"; }; packageRequires = [ ]; meta = { @@ -7550,10 +7614,10 @@ elpaBuild { pname = "scanner"; ename = "scanner"; - version = "0.2"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/scanner-0.2.tar"; - sha256 = "1c42mg7m6fa7xw3svv741sgrc9zjl1zcq0vg45k61iqmnx8d44vp"; + url = "https://elpa.gnu.org/packages/scanner-0.3.tar"; + sha256 = "07cqbphpgcqz2bb204c26mh3pc4h4z792dz9pxh1fjwh4d0iasqy"; }; packageRequires = [ dash ]; meta = { @@ -8843,10 +8907,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.8.3"; + version = "0.8.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/transient-0.8.3.tar"; - sha256 = "0cx9h7knkyzalkyvbvl762mnl2mslcfxh899mf5wgqfavwkzgqp7"; + url = "https://elpa.gnu.org/packages/transient-0.8.4.tar"; + sha256 = "1dc636j9194i9pfj4rxxfy33f5rwsqp5qkf1c7a06yazblvgaqxi"; }; packageRequires = [ compat @@ -9679,10 +9743,10 @@ elpaBuild { pname = "window-tool-bar"; ename = "window-tool-bar"; - version = "0.2.1"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/window-tool-bar-0.2.1.tar"; - sha256 = "06wf3kwc4sjd14ihagmahxjvk35skb28rh9yclpzbrvjqk0ss35v"; + url = "https://elpa.gnu.org/packages/window-tool-bar-0.3.tar"; + sha256 = "00kggfpfi1nj05mzy5zig0fs4as7qh99wqgvya3xj2kw8141cvd6"; }; packageRequires = [ compat ]; meta = { @@ -9985,10 +10049,10 @@ elpaBuild { pname = "yaml"; ename = "yaml"; - version = "1.0.0"; + version = "1.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/yaml-1.0.0.tar"; - sha256 = "0yvfrijjjm17qidyi50nrsvw2m3bqw6p72za7w8v4ywxfl7b59c6"; + url = "https://elpa.gnu.org/packages/yaml-1.2.0.tar"; + sha256 = "1j1shz85vdj7w7bslpmpfws92fi3afp44533irq8caf7zj9masph"; }; packageRequires = [ ]; meta = { From a8445ceb1b40f2f13c3472282edcb15c17aca277 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 10 Feb 2025 01:54:50 +0800 Subject: [PATCH 0263/1107] elpa-devel-packages: updated 2025-02-10 (from overlay) --- .../elisp-packages/elpa-devel-generated.nix | 300 +++++++++++------- 1 file changed, 182 insertions(+), 118 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix index 3552b5c42143..999fbb5f43fa 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix @@ -1,5 +1,26 @@ { callPackage }: { + a68-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "a68-mode"; + ename = "a68-mode"; + version = "1.0.0.20250205.220528"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/a68-mode-1.0.0.20250205.220528.tar"; + sha256 = "0ds8kifvc3557xvb1vas7ivc4kn8wkjaqqj5h3azbh1bcbdj1xnp"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/a68-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; ace-window = callPackage ( { avy, @@ -440,10 +461,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "14.0.8.0.20250122.201658"; + version = "14.0.8.0.20250207.132239"; src = fetchurl { - url = "https://elpa.gnu.org/devel/auctex-14.0.8.0.20250122.201658.tar"; - sha256 = "1j6jnwkpv6m9zv159zg251zgxk1h7xy2fpnnwkn9d1y5yqvrzcaq"; + url = "https://elpa.gnu.org/devel/auctex-14.0.8.0.20250207.132239.tar"; + sha256 = "07x57jz5hpgky62h3rljrxbfcv850qfbm0nkny2bjg7cjhm97ih7"; }; packageRequires = [ ]; meta = { @@ -517,6 +538,28 @@ }; } ) { }; + auth-source-xoauth2-plugin = callPackage ( + { + elpaBuild, + fetchurl, + lib, + oauth2, + }: + elpaBuild { + pname = "auth-source-xoauth2-plugin"; + ename = "auth-source-xoauth2-plugin"; + version = "0.1.0.20250201.220645"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/auth-source-xoauth2-plugin-0.1.0.20250201.220645.tar"; + sha256 = "05rf750b9isjmwp9ys0g17njmd0428fqdl6sa8wakn286gpx2910"; + }; + packageRequires = [ oauth2 ]; + meta = { + homepage = "https://elpa.gnu.org/devel/auth-source-xoauth2-plugin.html"; + license = lib.licenses.free; + }; + } + ) { }; auto-correct = callPackage ( { elpaBuild, @@ -602,6 +645,27 @@ }; } ) { }; + autorevert-tail-truncate = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "autorevert-tail-truncate"; + ename = "autorevert-tail-truncate"; + version = "1.0.0.0.20250208.61538"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/autorevert-tail-truncate-1.0.0.0.20250208.61538.tar"; + sha256 = "1m00rr3mnv79vbczs7dg0fvqz1l0zyrbsqqz54gaqyl6r27hlwfl"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/autorevert-tail-truncate.html"; + license = lib.licenses.free; + }; + } + ) { }; avy = callPackage ( { cl-lib ? null, @@ -740,10 +804,10 @@ elpaBuild { pname = "blist"; ename = "blist"; - version = "0.4.0.20240807.40202"; + version = "0.4.0.20250207.24413"; src = fetchurl { - url = "https://elpa.gnu.org/devel/blist-0.4.0.20240807.40202.tar"; - sha256 = "1y1sfyvxca5g2rsh579lly1drr9qs1czb1z692fysir7l48p3y3w"; + url = "https://elpa.gnu.org/devel/blist-0.4.0.20250207.24413.tar"; + sha256 = "1raw8rvj3kghf4hpcz13c1jk8kpgjr9jlpq3y08aqh1k1y2y01w1"; }; packageRequires = [ ilist ]; meta = { @@ -859,10 +923,10 @@ elpaBuild { pname = "breadcrumb"; ename = "breadcrumb"; - version = "1.0.1.0.20231126.221621"; + version = "1.0.1.0.20250208.145328"; src = fetchurl { - url = "https://elpa.gnu.org/devel/breadcrumb-1.0.1.0.20231126.221621.tar"; - sha256 = "11qx345ggpm78dcvlrnji50b50wh3cv3i0ihxwxsw55n86kv9x0k"; + url = "https://elpa.gnu.org/devel/breadcrumb-1.0.1.0.20250208.145328.tar"; + sha256 = "1bj75faninnkm2cdy1x4c6f9kamf8wkwc1rf4il5khi6gyr0ki2z"; }; packageRequires = [ project ]; meta = { @@ -1254,10 +1318,10 @@ elpaBuild { pname = "colorful-mode"; ename = "colorful-mode"; - version = "1.0.4.0.20240924.193317"; + version = "1.1.0.0.20250208.162726"; src = fetchurl { - url = "https://elpa.gnu.org/devel/colorful-mode-1.0.4.0.20240924.193317.tar"; - sha256 = "06rzr4g2qv7d8hgil46v1vipq6rw4518sf5vqf22n8g893blcvjm"; + url = "https://elpa.gnu.org/devel/colorful-mode-1.1.0.0.20250208.162726.tar"; + sha256 = "1qdwl82shxgnds6131zlyhqgg0h2szqwj376pfvk450gmvmnk7g9"; }; packageRequires = [ compat ]; meta = { @@ -1461,10 +1525,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "2.0.0.20250128.173030"; + version = "2.0.0.20250207.161222"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-2.0.0.20250128.173030.tar"; - sha256 = "15c7s2yv23k3qw19fn4kq7ngrkvxpd3vzrz1jd37sd6cdf067zzi"; + url = "https://elpa.gnu.org/devel/consult-2.0.0.20250207.161222.tar"; + sha256 = "150xaqhpz3awimsnpclky6gpn84j9fw3vsjhzwqqlpp5v3spb0kc"; }; packageRequires = [ compat ]; meta = { @@ -1512,7 +1576,7 @@ version = "0.4.1.0.20250202.52435"; src = fetchurl { url = "https://elpa.gnu.org/devel/consult-hoogle-0.4.1.0.20250202.52435.tar"; - sha256 = "sha256-9ywpFbFtrGZG52Qxp5dN8HxA3I+gjnHxlGUh31gUjto="; + sha256 = "1nlf2icdy8b5jkqp33m0izf40z7h9nbsfcb4wx36db3dn4ajjb7p"; }; packageRequires = [ consult ]; meta = { @@ -1531,10 +1595,10 @@ elpaBuild { pname = "consult-recoll"; ename = "consult-recoll"; - version = "0.8.1.0.20250106.172405"; + version = "1.0.0.0.20250205.171239"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-recoll-0.8.1.0.20250106.172405.tar"; - sha256 = "178vlkdbjkjp6h2zcnwdfilnmk91rz41lbyrhy6xpjxz3s0jqdsx"; + url = "https://elpa.gnu.org/devel/consult-recoll-1.0.0.0.20250205.171239.tar"; + sha256 = "1mpvf601nyb8wz0brcxs2dvzf87s66wg83k9q6c605brnkg23cyb"; }; packageRequires = [ consult ]; meta = { @@ -1834,10 +1898,10 @@ elpaBuild { pname = "dape"; ename = "dape"; - version = "0.22.0.0.20250129.191028"; + version = "0.22.0.0.20250202.141832"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dape-0.22.0.0.20250129.191028.tar"; - sha256 = "0xbcwfzscl1fnns8j4sg4xv6ynssxjz3bh6wr7d841wd9294ayim"; + url = "https://elpa.gnu.org/devel/dape-0.22.0.0.20250202.141832.tar"; + sha256 = "0z4c30v13z51hcpvbr2w18fj73f2rgvvjwwb0yn7vn0xrvlgsyap"; }; packageRequires = [ jsonrpc ]; meta = { @@ -1921,10 +1985,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.43.0.20250128.92424"; + version = "0.43.0.20250208.110220"; src = fetchurl { - url = "https://elpa.gnu.org/devel/debbugs-0.43.0.20250128.92424.tar"; - sha256 = "1nabm7k6r1qj1x48api5dpcaxm557xdmywbb5g851kyzvrbp8k1w"; + url = "https://elpa.gnu.org/devel/debbugs-0.43.0.20250208.110220.tar"; + sha256 = "1hwvdlx9gwm52vc3yddd58iwa1m69lr6wclwcc848ic8ag001zk2"; }; packageRequires = [ soap-client ]; meta = { @@ -1968,10 +2032,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "3.1.0.0.20250131.84208"; + version = "3.1.0.0.20250205.61207"; src = fetchurl { - url = "https://elpa.gnu.org/devel/denote-3.1.0.0.20250131.84208.tar"; - sha256 = "0krffkyisfmwfd19q2sdnvms2lf4iyadmab233ymzrskr1ai38sx"; + url = "https://elpa.gnu.org/devel/denote-3.1.0.0.20250205.61207.tar"; + sha256 = "0196s2jy08cf7pbysxlxzfziysm7sq87xkr19z1dxbd4284ad9qk"; }; packageRequires = [ ]; meta = { @@ -2257,10 +2321,10 @@ elpaBuild { pname = "dired-preview"; ename = "dired-preview"; - version = "0.3.0.0.20250127.85349"; + version = "0.3.0.0.20250205.94505"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dired-preview-0.3.0.0.20250127.85349.tar"; - sha256 = "1b047qk02kbjkcqhaj74wyhw080f99kyx6d6yis4hazxlzxzh77k"; + url = "https://elpa.gnu.org/devel/dired-preview-0.3.0.0.20250205.94505.tar"; + sha256 = "1z9wg3z3kgmx3xv300r61ss5af23zs4cmhjn3xl7acn7ym6mpg33"; }; packageRequires = [ ]; meta = { @@ -2342,10 +2406,10 @@ elpaBuild { pname = "do-at-point"; ename = "do-at-point"; - version = "0.1.2.0.20241220.111054"; + version = "0.1.2.0.20250131.91127"; src = fetchurl { - url = "https://elpa.gnu.org/devel/do-at-point-0.1.2.0.20241220.111054.tar"; - sha256 = "0y9rgxnrar6gwqj3w622xdavi5gnb748kbym25q19a4vsjdazvi1"; + url = "https://elpa.gnu.org/devel/do-at-point-0.1.2.0.20250131.91127.tar"; + sha256 = "0bjw91hrv4d5vqrgkx9bas3nwgqyfpbar7b5d07m3agw436yafqf"; }; packageRequires = [ ]; meta = { @@ -2607,10 +2671,10 @@ elpaBuild { pname = "ef-themes"; ename = "ef-themes"; - version = "1.9.0.0.20250127.85559"; + version = "1.9.0.0.20250208.100006"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ef-themes-1.9.0.0.20250127.85559.tar"; - sha256 = "10ifzbhb203gr93s03l9rqb9x467bmw3nz9062i5z6q4qycv33cz"; + url = "https://elpa.gnu.org/devel/ef-themes-1.9.0.0.20250208.100006.tar"; + sha256 = "0wns13m6cqxjh4kp8kmz3x0yicf4a48mbn962bdm3vgwy1wlhhyp"; }; packageRequires = [ ]; meta = { @@ -2635,10 +2699,10 @@ elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.18.0.20250129.85907"; + version = "1.18.0.20250208.134208"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eglot-1.18.0.20250129.85907.tar"; - sha256 = "0456xa4ms9qjd5z90l61zd9jg68z26kf1y59gkaz153a63pary47"; + url = "https://elpa.gnu.org/devel/eglot-1.18.0.20250208.134208.tar"; + sha256 = "0sqm6z9phbdhy6f4dzcbk5w44j4kpxnk3hgd0y233v0nhxz80ahs"; }; packageRequires = [ eldoc @@ -2690,10 +2754,10 @@ elpaBuild { pname = "eldoc"; ename = "eldoc"; - version = "1.15.0.0.20250101.73917"; + version = "1.15.0.0.20250201.35652"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eldoc-1.15.0.0.20250101.73917.tar"; - sha256 = "0pwicn9r2v85hpkxk7dibmxzy7iaj41r16lrybhm0kcw74lwhkkd"; + url = "https://elpa.gnu.org/devel/eldoc-1.15.0.0.20250201.35652.tar"; + sha256 = "1y2if2f1azw92qxlv5hxyjlhs95ysghwb7xxa5vl5wsn4drgc5pz"; }; packageRequires = [ ]; meta = { @@ -2736,10 +2800,10 @@ elpaBuild { pname = "elisa"; ename = "elisa"; - version = "1.1.5.0.20250128.73617"; + version = "1.1.7.0.20250202.204048"; src = fetchurl { - url = "https://elpa.gnu.org/devel/elisa-1.1.5.0.20250128.73617.tar"; - sha256 = "1cyh4d3v16lspjldzsni282smjx9icvdkly0qcwkhxn90mgfzxqm"; + url = "https://elpa.gnu.org/devel/elisa-1.1.7.0.20250202.204048.tar"; + sha256 = "0bs2cb2i18afd1vnrfszdj9kxqmr678l01a8l4rz19yv7iril299"; }; packageRequires = [ async @@ -2787,10 +2851,10 @@ elpaBuild { pname = "ellama"; ename = "ellama"; - version = "0.13.4.0.20250126.204518"; + version = "0.13.7.0.20250208.110313"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ellama-0.13.4.0.20250126.204518.tar"; - sha256 = "05pcyswrnv138wpqigaiif3x95gwcb16kvl3s84czyz5ypgidl7w"; + url = "https://elpa.gnu.org/devel/ellama-0.13.7.0.20250208.110313.tar"; + sha256 = "0mglzqh4pjwzjqrrpkrg8296c32nv0ja778nmb27r6zdig9ss5zj"; }; packageRequires = [ compat @@ -2835,10 +2899,10 @@ elpaBuild { pname = "embark"; ename = "embark"; - version = "1.1.0.20250127.71505"; + version = "1.1.0.20250131.230144"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-1.1.0.20250127.71505.tar"; - sha256 = "1drhc5sjvg5l17xqws889aggp1zw80zvj9vlh5j2m5m56szqnzgz"; + url = "https://elpa.gnu.org/devel/embark-1.1.0.20250131.230144.tar"; + sha256 = "0ky3cm9dn8hwms3nmzfkm339v859wc6qgchkqn4i7p2206bp4cqj"; }; packageRequires = [ compat ]; meta = { @@ -2859,10 +2923,10 @@ elpaBuild { pname = "embark-consult"; ename = "embark-consult"; - version = "1.1.0.20250127.71505"; + version = "1.1.0.20250131.230144"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-consult-1.1.0.20250127.71505.tar"; - sha256 = "0kprj6wkd8qyg2fcb0an0sp8gxg38zb7aps8a97lmls50klk1v4m"; + url = "https://elpa.gnu.org/devel/embark-consult-1.1.0.20250131.230144.tar"; + sha256 = "1ggk135338cbxkhvzc4g9wyyvz2sxxqyx5yqwzsffx9yprp618ng"; }; packageRequires = [ compat @@ -2923,10 +2987,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "21.0.20250120.141327"; + version = "21.0.20250204.152247"; src = fetchurl { - url = "https://elpa.gnu.org/devel/emms-21.0.20250120.141327.tar"; - sha256 = "1vcpp171rgvgm3mf04z0ayha7avfvjkp17ybs98fjl09160ih3ny"; + url = "https://elpa.gnu.org/devel/emms-21.0.20250204.152247.tar"; + sha256 = "00m56k9j69xh03agj5xsw61brz69r54n2qqkyg0gs1ahaqcf52cc"; }; packageRequires = [ cl-lib @@ -3012,10 +3076,10 @@ elpaBuild { pname = "erc"; ename = "erc"; - version = "5.6.1snapshot0.20250125.100619"; + version = "5.6.1snapshot0.20250207.202136"; src = fetchurl { - url = "https://elpa.gnu.org/devel/erc-5.6.1snapshot0.20250125.100619.tar"; - sha256 = "0aj9bh1j752357ac50qgvs5yp90gfbzng4wri3d90x8nldxlnq33"; + url = "https://elpa.gnu.org/devel/erc-5.6.1snapshot0.20250207.202136.tar"; + sha256 = "1qdbq8yx10cfvids88vmvi3q8481fvypfpdx5490b4sbjkpsryqr"; }; packageRequires = [ compat ]; meta = { @@ -3708,10 +3772,10 @@ elpaBuild { pname = "gnugo"; ename = "gnugo"; - version = "3.1.2.0.20230911.4426"; + version = "3.1.2.0.20250131.151403"; src = fetchurl { - url = "https://elpa.gnu.org/devel/gnugo-3.1.2.0.20230911.4426.tar"; - sha256 = "0pxw1z6inw0ikagcfvi14i83sg6affii277mbyzh5liv655hn9rj"; + url = "https://elpa.gnu.org/devel/gnugo-3.1.2.0.20250131.151403.tar"; + sha256 = "1afx15bab0zx5iykx9fjn0k32m8rj58n2998kgvpmnyxwl449v77"; }; packageRequires = [ ascii-art-to-unicode @@ -4090,10 +4154,10 @@ elpaBuild { pname = "hyperbole"; ename = "hyperbole"; - version = "9.0.2pre0.20250130.145450"; + version = "9.0.2pre0.20250208.215943"; src = fetchurl { - url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20250130.145450.tar"; - sha256 = "0z30yxv5945iipj7x8zjbzh65y9ymhrk7ws2a7slfhdmci998jzb"; + url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20250208.215943.tar"; + sha256 = "1bqc2zvch5aldyjy6ncsyvw034rhxrpk9r27qrq706n3n3b140b8"; }; packageRequires = [ ]; meta = { @@ -4154,10 +4218,10 @@ elpaBuild { pname = "indent-bars"; ename = "indent-bars"; - version = "0.8.2.0.20250123.153037"; + version = "0.8.2.0.20250201.115728"; src = fetchurl { - url = "https://elpa.gnu.org/devel/indent-bars-0.8.2.0.20250123.153037.tar"; - sha256 = "1affd306vy71v6krn17wl0z7cq3305skksyxiq2h78fn8l1g4mc6"; + url = "https://elpa.gnu.org/devel/indent-bars-0.8.2.0.20250201.115728.tar"; + sha256 = "1xp9lhk1yz842b3z6j181ziql99b0pj1wy7nnpjlqxnga0pcf8z9"; }; packageRequires = [ compat ]; meta = { @@ -4467,10 +4531,10 @@ elpaBuild { pname = "jinx"; ename = "jinx"; - version = "1.12.0.20250128.70732"; + version = "1.12.0.20250207.140139"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jinx-1.12.0.20250128.70732.tar"; - sha256 = "05ys8v3pdkg9058lx5rga6qrzp3d2vhzxwrmd1faazpc3j4h5bhm"; + url = "https://elpa.gnu.org/devel/jinx-1.12.0.20250207.140139.tar"; + sha256 = "0lankxybmh4d7vkyaadrm53ph4w165mnjmfmr8kfnsy7k16hqc41"; }; packageRequires = [ compat ]; meta = { @@ -4801,10 +4865,10 @@ elpaBuild { pname = "let-alist"; ename = "let-alist"; - version = "1.0.6.0.20250101.73917"; + version = "1.0.6.0.20250201.73956"; src = fetchurl { - url = "https://elpa.gnu.org/devel/let-alist-1.0.6.0.20250101.73917.tar"; - sha256 = "0lr22q8crlk160j38y5dyla1i3h882yv5zjh7f9rbfaqqs6w5xqm"; + url = "https://elpa.gnu.org/devel/let-alist-1.0.6.0.20250201.73956.tar"; + sha256 = "0qnp9dnnjmygirg8qncnc3mdi6kj08x63njsj6qwbb3276rr18w8"; }; packageRequires = [ ]; meta = { @@ -4918,10 +4982,10 @@ elpaBuild { pname = "llm"; ename = "llm"; - version = "0.22.0.0.20250129.233328"; + version = "0.23.0.0.20250208.202943"; src = fetchurl { - url = "https://elpa.gnu.org/devel/llm-0.22.0.0.20250129.233328.tar"; - sha256 = "0wflw00w13q8aifzgh137vmd7i7mfrv7nz6m103q9i68pz001z3n"; + url = "https://elpa.gnu.org/devel/llm-0.23.0.0.20250208.202943.tar"; + sha256 = "0mxrhq3vch02asbj7v4xfmi8n953byy5bc1s3g9nwb75cjlvrcvz"; }; packageRequires = [ plz @@ -5157,10 +5221,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "1.8.0.20250128.172920"; + version = "1.8.0.20250203.101833"; src = fetchurl { - url = "https://elpa.gnu.org/devel/marginalia-1.8.0.20250128.172920.tar"; - sha256 = "1kl9b91aqcjf969mkpvf2lc47xxlc2qzqkmjzdvvwdyzvqdcnfmn"; + url = "https://elpa.gnu.org/devel/marginalia-1.8.0.20250203.101833.tar"; + sha256 = "0yphb9wkg04c6fqb5cbblbk5vmnn15njhp774kivxhxjr7p282n3"; }; packageRequires = [ compat ]; meta = { @@ -5454,10 +5518,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "4.6.0.0.20250127.85644"; + version = "4.6.0.0.20250208.95815"; src = fetchurl { - url = "https://elpa.gnu.org/devel/modus-themes-4.6.0.0.20250127.85644.tar"; - sha256 = "197swh4imyz6y9q66nxlsh2sv23w92knq98wasq1qxywkqi5lrz8"; + url = "https://elpa.gnu.org/devel/modus-themes-4.6.0.0.20250208.95815.tar"; + sha256 = "1sg46vcysbffqjq0wcrsv7z80qv39yw6nl4clsga4il8wkph5n21"; }; packageRequires = [ ]; meta = { @@ -6014,10 +6078,10 @@ elpaBuild { pname = "orderless"; ename = "orderless"; - version = "1.3.0.20250101.92243"; + version = "1.3.0.20250201.234121"; src = fetchurl { - url = "https://elpa.gnu.org/devel/orderless-1.3.0.20250101.92243.tar"; - sha256 = "1n28izngnqs2xy2iw7s0mw78mx7b4ahwf8yirr1jlv00vc51qiab"; + url = "https://elpa.gnu.org/devel/orderless-1.3.0.20250201.234121.tar"; + sha256 = "1skvlpvn49qivvn33c3y9nx0v3mn8ds1cagddd070ykpqyccrihp"; }; packageRequires = [ compat ]; meta = { @@ -6035,10 +6099,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.8pre0.20250119.115347"; + version = "9.8pre0.20250202.170245"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-9.8pre0.20250119.115347.tar"; - sha256 = "0wjbfg93yqpkfyxdvpcpg3l98b054h9hkdl3kjcmxyvah8bas0zd"; + url = "https://elpa.gnu.org/devel/org-9.8pre0.20250202.170245.tar"; + sha256 = "13ipl0crx6n896084shax8i2j6cp7xc1x1acpvarjfwk7cix6s04"; }; packageRequires = [ ]; meta = { @@ -7014,10 +7078,10 @@ elpaBuild { pname = "python"; ename = "python"; - version = "0.28.0.20250130.120320"; + version = "0.28.0.20250204.222800"; src = fetchurl { - url = "https://elpa.gnu.org/devel/python-0.28.0.20250130.120320.tar"; - sha256 = "195j49w0m9ndp6c256dqz94my6wk7hpd29sg8qxh9h24lc9zyjzg"; + url = "https://elpa.gnu.org/devel/python-0.28.0.20250204.222800.tar"; + sha256 = "0ljnj4k793i53z9hgg148443x3q2yvmfp8f8kgjc0p0kz95d7m6m"; }; packageRequires = [ compat @@ -7621,10 +7685,10 @@ elpaBuild { pname = "scanner"; ename = "scanner"; - version = "0.2.0.20210104.105054"; + version = "0.3.0.20250208.195044"; src = fetchurl { - url = "https://elpa.gnu.org/devel/scanner-0.2.0.20210104.105054.tar"; - sha256 = "1ah74y9ragw3kycqwgxkmnxrzl7s2n43cjpw6r25hmbyzjnhdppm"; + url = "https://elpa.gnu.org/devel/scanner-0.3.0.20250208.195044.tar"; + sha256 = "0fxq0lylgdzsk398q2658gsd3xlr8wd63wlpvnx0vakzj824x2cb"; }; packageRequires = [ dash ]; meta = { @@ -8283,10 +8347,10 @@ elpaBuild { pname = "standard-themes"; ename = "standard-themes"; - version = "2.2.0.0.20250127.85517"; + version = "2.2.0.0.20250208.100140"; src = fetchurl { - url = "https://elpa.gnu.org/devel/standard-themes-2.2.0.0.20250127.85517.tar"; - sha256 = "00f0ph4gz1r0m9v489dvq2whvmjp82lapg7lhbsb2w871bk625jv"; + url = "https://elpa.gnu.org/devel/standard-themes-2.2.0.0.20250208.100140.tar"; + sha256 = "1g79nlv3csgd4qprv6gfb4pijlpcsypz24lij40szf53y325p7vl"; }; packageRequires = [ ]; meta = { @@ -8873,10 +8937,10 @@ elpaBuild { pname = "track-changes"; ename = "track-changes"; - version = "1.2.0.20250101.73917"; + version = "1.2.0.20250205.202103"; src = fetchurl { - url = "https://elpa.gnu.org/devel/track-changes-1.2.0.20250101.73917.tar"; - sha256 = "0w93lrbnpv567j9zn1vbw5h63d331ddi6n7cnhqi4c25kx55dzpw"; + url = "https://elpa.gnu.org/devel/track-changes-1.2.0.20250205.202103.tar"; + sha256 = "1hiaphb20cng08b806w68a24fy00yfpp2kpmwn1aw5xywxkqsgi7"; }; packageRequires = [ ]; meta = { @@ -8980,10 +9044,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.8.3.0.20250122.121927"; + version = "0.8.4.0.20250201.131431"; src = fetchurl { - url = "https://elpa.gnu.org/devel/transient-0.8.3.0.20250122.121927.tar"; - sha256 = "1cf0dmgw1ghi2z0k6a2a1hbpdfm29ddg5np7492dn55xlggmjlny"; + url = "https://elpa.gnu.org/devel/transient-0.8.4.0.20250201.131431.tar"; + sha256 = "1micgh8w9x0x95wis581f5p3mbhmiq5q3mg8rz1fn3xnjjiqr8a3"; }; packageRequires = [ compat @@ -9516,10 +9580,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "1.11.0.20250128.172940"; + version = "1.11.0.20250203.105541"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vertico-1.11.0.20250128.172940.tar"; - sha256 = "0804xncv740vcb5kcg8i0mrpiha2j63f10dm3mcfy33kwbfafnba"; + url = "https://elpa.gnu.org/devel/vertico-1.11.0.20250203.105541.tar"; + sha256 = "14mykwn0wypd6h5s6l175q8ibsvqc6mnrnws6plmqzlpghir1ipk"; }; packageRequires = [ compat ]; meta = { @@ -9775,10 +9839,10 @@ elpaBuild { pname = "which-key"; ename = "which-key"; - version = "3.6.1.0.20250101.73917"; + version = "3.6.1.0.20250205.202103"; src = fetchurl { - url = "https://elpa.gnu.org/devel/which-key-3.6.1.0.20250101.73917.tar"; - sha256 = "05d6dbh0l7lb70rqqgqlwp1q32i4kr4lqkdgg4ngimyqnmm2xy5h"; + url = "https://elpa.gnu.org/devel/which-key-3.6.1.0.20250205.202103.tar"; + sha256 = "0n5f6r1kfiycmd96419yfr7vg65aq3g0hhgafhkwi73n6cbd9209"; }; packageRequires = [ ]; meta = { @@ -9818,10 +9882,10 @@ elpaBuild { pname = "window-tool-bar"; ename = "window-tool-bar"; - version = "0.2.1.0.20250101.73917"; + version = "0.3.0.20250208.111330"; src = fetchurl { - url = "https://elpa.gnu.org/devel/window-tool-bar-0.2.1.0.20250101.73917.tar"; - sha256 = "0cc1s4jrz9zy9986v27hlm6aj9iq11vd7xc4i2wymy47fkmqfbhl"; + url = "https://elpa.gnu.org/devel/window-tool-bar-0.3.0.20250208.111330.tar"; + sha256 = "1xg1jkb08hw0a1q9rfd3fvdkwmcd04syzj9lihlyww2am8ki286v"; }; packageRequires = [ compat ]; meta = { @@ -10124,10 +10188,10 @@ elpaBuild { pname = "yaml"; ename = "yaml"; - version = "1.0.0.0.20241129.211417"; + version = "1.2.0.0.20250208.153456"; src = fetchurl { - url = "https://elpa.gnu.org/devel/yaml-1.0.0.0.20241129.211417.tar"; - sha256 = "0wvyq8hwh10ldpd56xw7n6z4w2zhn4nyk949pyf78vigvr7rv8ll"; + url = "https://elpa.gnu.org/devel/yaml-1.2.0.0.20250208.153456.tar"; + sha256 = "13awmzwcmgs7ciinhr0crcw70zabj7lpxgk6afizcsdd0fahgg4m"; }; packageRequires = [ ]; meta = { From eb379b525a273506488c2f68addfe88776311fb2 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 10 Feb 2025 01:54:50 +0800 Subject: [PATCH 0264/1107] melpa-packages: updated 2025-02-10 (from overlay) --- .../elisp-packages/recipes-archive-melpa.json | 1410 +++++++++-------- 1 file changed, 734 insertions(+), 676 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index bee4e57a74a5..cd6e6924f000 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -1880,11 +1880,11 @@ "repo": "bbatsov/adoc-mode", "unstable": { "version": [ - 20240218, - 1035 + 20250206, + 838 ], - "commit": "2c2eb8043623aa99d35aacbad2ee39188bf1bad3", - "sha256": "0ahvb703hgar9lm2zcikmjc5yqdg4lvw0f314isbww3479dlm5l2" + "commit": "20772277b8a5b8c08d49bd03043d5d4dd7a815e9", + "sha256": "0ln8xfvsdmr5p1axlk25gvnis2h8wh4ry74gglg02fwkrkqbs6w9" }, "stable": { "version": [ @@ -2096,19 +2096,19 @@ "repo": "t4ccer/agenix.el", "unstable": { "version": [ - 20240601, - 1304 + 20250209, + 551 ], - "commit": "b9c7ad33b534d80af207949cc06c0bcd1e60fd63", - "sha256": "0pibky4ndm765xwz6964yihl0v5pmfdj90rnalb5zld1bfv4dv1x" + "commit": "36ad60f0b7f2a12b730c6f568fcfd4daf2581158", + "sha256": "17l6j83i2xm3agrrbmg2pwccim6y9f65b1vsripv95fyxhp6l1mm" }, "stable": { "version": [ 1, - 2 + 3 ], - "commit": "c3afc8d109dc19bfe2f97ce47184ca748dbe4816", - "sha256": "0h7lk050c7arhnvv2anlgqq39r3690fw9l0n8bjk5qh38dsgwmah" + "commit": "36ad60f0b7f2a12b730c6f568fcfd4daf2581158", + "sha256": "17l6j83i2xm3agrrbmg2pwccim6y9f65b1vsripv95fyxhp6l1mm" } }, { @@ -3544,15 +3544,15 @@ "repo": "emacs-ansible/emacs-ansible", "unstable": { "version": [ - 20241129, - 309 + 20250208, + 241 ], "deps": [ "f", "s" ], - "commit": "03e285bb54a687e3fd9e21026b088fdac46679a0", - "sha256": "0hpb8bcpyynzkc90jygp284l79vfgl5xb2hig0h5j7n5xvjcg1g9" + "commit": "4601ff31f56af19c71e86fcc7a2d52b7c17e8abd", + "sha256": "001w2fqr5sajy3wpjzqp239hfc6dlbg2hhgz51sjq3a5lmh3cq5l" }, "stable": { "version": [ @@ -3841,11 +3841,11 @@ "repo": "radian-software/apheleia", "unstable": { "version": [ - 20250122, - 624 + 20250207, + 2227 ], - "commit": "049325e7734603e3c7ba05f26016beccafefb473", - "sha256": "14awhjd5l3azx68v6i3kfsbn6bns3y2y89zfbk9xmg59b87755bf" + "commit": "ba333e7ddce49fcbb34b7ad6e37ed880a90e4f4d", + "sha256": "08kmf0dm420f7k81q5jj1i2p15p481z0gg01lq07w4hq1nw6a0kk" }, "stable": { "version": [ @@ -4128,11 +4128,11 @@ "repo": "motform/arduino-cli-mode", "unstable": { "version": [ - 20250114, - 1011 + 20250207, + 1753 ], - "commit": "f4a26fcd9f0d4909a0f1e96db91b67a0a66bf2e5", - "sha256": "05irfiv32ksja0fiivlcv91j3bd2d8n1sr22lmrx099zipbf0xfp" + "commit": "de4721f11a82d33539f2552ce8942ed5158485c1", + "sha256": "1zfkr5v3d17sqp39b0dl39rmmqgjw1rv6vr0nix6mqsldc0hcl6d" } }, { @@ -6125,14 +6125,14 @@ "repo": "nameiwillforget/avy-act", "unstable": { "version": [ - 20250120, - 2336 + 20250201, + 1311 ], "deps": [ "avy" ], - "commit": "2e646ed82ebdb62eeb3224fcb26dea03b827bdcf", - "sha256": "02xpjiggk4n5yzsp418n57p2bzn3g6gmnz40n35h1p6gwq4drs1f" + "commit": "eb3be5667b5d1ae024910faf997a12456bca6aa8", + "sha256": "1np3dhv3sik04p7k3qbbnmhz5hx919whxiqdj2i6shiqfmidcygy" } }, { @@ -11258,26 +11258,26 @@ "repo": "kickingvegas/casual", "unstable": { "version": [ - 20250130, - 2100 + 20250204, + 1934 ], "deps": [ "transient" ], - "commit": "6d1ab1b23d7481fe4ebfdce3ebafb97dbb20c561", - "sha256": "0kpnv4mkzl03fx7h8cdrxd8qx1d99nywbn41f11zdgzvy4fr7mm0" + "commit": "0ba181cbef1abdd45f9504c62f71212d64113e77", + "sha256": "0cvz98zqmrzbyjx4azc100bpa6f0cxgwyj4ky0932kjl89h6kwh2" }, "stable": { "version": [ 2, 3, - 0 + 1 ], "deps": [ "transient" ], - "commit": "6d1ab1b23d7481fe4ebfdce3ebafb97dbb20c561", - "sha256": "0kpnv4mkzl03fx7h8cdrxd8qx1d99nywbn41f11zdgzvy4fr7mm0" + "commit": "0ba181cbef1abdd45f9504c62f71212d64113e77", + "sha256": "0cvz98zqmrzbyjx4azc100bpa6f0cxgwyj4ky0932kjl89h6kwh2" } }, { @@ -11410,11 +11410,11 @@ "repo": "catppuccin/emacs", "unstable": { "version": [ - 20241211, - 322 + 20250204, + 2016 ], - "commit": "893981bb3d7aff4c6e41427e92dc514164fdfb59", - "sha256": "0d9cykz6pw1i2iil1vyz9njqabfkli4fgrk97kl4wqggdvxahlc9" + "commit": "8d14c1968580f9aa66a84929fc8a9daf1e1e2b90", + "sha256": "1vl0ws6gmm26j1f98myzkhy7m1fzyxpaspdv7f5hsilmlx7mk35h" }, "stable": { "version": [ @@ -11899,7 +11899,7 @@ "repo": "worr/cfn-mode", "unstable": { "version": [ - 20250119, + 20250202, 904 ], "deps": [ @@ -11907,8 +11907,8 @@ "s", "yaml-mode" ], - "commit": "b59ec41be0abc8c9c3453c00a7a936c8d6588eef", - "sha256": "142z3b5zp2by0w5flr097bjmjzfvz78adnzcn9akpzdgp824vcja" + "commit": "fb15f876722350c87bf4fc5cc26e16aa4d1bf2c7", + "sha256": "0pr92p7sw8lh4glawbw97dzvfq7s8jsq0ylqjmc1xl3jws6aniy4" }, "stable": { "version": [ @@ -12172,14 +12172,14 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20250116, - 1203 + 20250207, + 926 ], "deps": [ "shell-maker" ], - "commit": "9c896feda89a2a879de807a5bd652beec7d6a3f6", - "sha256": "16idd626621q4ykwwgvgc77hqy02vh7lrw8w9l5c4vn030s3cvd2" + "commit": "be81dd78fd1a6e7f0e50a0e7d67c0542d47783a8", + "sha256": "1lb6bg3wr3p3l03p3imrk8f6fp5mnvqbgd6aafb9vzfqp81xqgly" }, "stable": { "version": [ @@ -13203,16 +13203,16 @@ "repo": "pprevos/citar-denote", "unstable": { "version": [ - 20250127, - 235 + 20250202, + 854 ], "deps": [ "citar", "dash", "denote" ], - "commit": "d030a2fa25dc1ae2e0733a86791503d661ec2fe0", - "sha256": "08s8f68bc33kk4r1x524y3n7psizirmb8x050wjh7yn0ksn7xs13" + "commit": "47f1ed2fbdd6ce88e65dd5ec77e984dfa4f72d49", + "sha256": "1lb8gy9gf4jdq5mfbkdmv4gwg1rw6h5vk3zn4mhly9p39baq69dv" }, "stable": { "version": [ @@ -15412,14 +15412,14 @@ "repo": "NicholasBHubbard/comint-histories", "unstable": { "version": [ - 20250123, - 327 + 20250204, + 222 ], "deps": [ "f" ], - "commit": "bb5d2332299d49837ec230b9a218e056b8305b7c", - "sha256": "114p6jka3m55yw79k5yv6azyn0skvdj6ibza4vi87683874wkfbs" + "commit": "15a2e3c89814927fce0cc01ab01824b09881c652", + "sha256": "0vcpw674gcpn5p0swy9sgwmfn1rsi2cd7nj92y9glc8paky3p3m0" } }, { @@ -16313,16 +16313,16 @@ "repo": "jcs-elpa/company-fuzzy", "unstable": { "version": [ - 20250101, - 1006 + 20250207, + 140 ], "deps": [ "company", "ht", "s" ], - "commit": "6b7f4bc22dff085961dc51799d0674e58eb1af0d", - "sha256": "06y5si2chn4h51i1wy44kq4kmbzl680gi8jx4fnmfm0pmbf9c86k" + "commit": "cc144309cecb9d0b913f182a7c9a85ea1089db31", + "sha256": "0dg6l12dg5frh6lg6jmis5rzjj7ibfhs7ar1vjyhs3z8vmz49w05" }, "stable": { "version": [ @@ -17658,11 +17658,11 @@ "repo": "jamescherti/compile-angel.el", "unstable": { "version": [ - 20250124, - 302 + 20250204, + 1654 ], - "commit": "ebf66bbcd25141762351a75e8122cffa4f235e19", - "sha256": "0y8r2bd3ly8pl1xzkjah74wii9507mm0bc8c4j7ixzwdrbi6alb9" + "commit": "71f6cae711c943354dea34d35b435f84f6607129", + "sha256": "1vy4bhjw2f9b2s194nz4bcmlhbibfhhn7dj7n0fk53ky03xs54cn" }, "stable": { "version": [ @@ -18142,14 +18142,14 @@ "repo": "minad/consult", "unstable": { "version": [ - 20250128, - 1730 + 20250207, + 1612 ], "deps": [ "compat" ], - "commit": "5b0c682d7092e02a0e8e0f047370be8c61ad3b4e", - "sha256": "0aryd22lcg2c0fq6ir5ajmjp81rc6kdv88z2q62pv46vmfwwm61h" + "commit": "c74ae6149172e3429b844c22d67e02b01abea1e4", + "sha256": "0fxcprca5p0ld95828mw49fz90cg127yal7nbdhk2gk133k3l1fa" }, "stable": { "version": [ @@ -18444,16 +18444,16 @@ "repo": "armindarvish/consult-gh", "unstable": { "version": [ - 20250126, - 1937 + 20250202, + 2110 ], "deps": [ "consult", "markdown-mode", "ox-gfm" ], - "commit": "efde6c64324e763caf2f4c79c7c9e1bc3913c04f", - "sha256": "1zw8lmxg5irldha01q7kpv41lqypya5wbz04y8xwdjm4x8lvpr3s" + "commit": "f2a4498d0a5aa9e03adc406c5013f9318385e57c", + "sha256": "0yv22iggcvjdvpv16sqblbcp761ksn2gf78zh0x1lss03vgivfap" }, "stable": { "version": [ @@ -18477,16 +18477,16 @@ "repo": "armindarvish/consult-gh", "unstable": { "version": [ - 20250126, - 1937 + 20250201, + 1318 ], "deps": [ "consult", "consult-gh", "embark-consult" ], - "commit": "efde6c64324e763caf2f4c79c7c9e1bc3913c04f", - "sha256": "1zw8lmxg5irldha01q7kpv41lqypya5wbz04y8xwdjm4x8lvpr3s" + "commit": "8a5c7ea1e732b01634c5f3533f72c002135c3421", + "sha256": "19cby16vmq3bj6m3s4mjrl65vdwjbhxjww0s9b2dg9fsfy70dlbx" }, "stable": { "version": [ @@ -18509,16 +18509,16 @@ "repo": "armindarvish/consult-gh", "unstable": { "version": [ - 20250126, - 1937 + 20250202, + 1941 ], "deps": [ "consult", "consult-gh", "forge" ], - "commit": "efde6c64324e763caf2f4c79c7c9e1bc3913c04f", - "sha256": "1zw8lmxg5irldha01q7kpv41lqypya5wbz04y8xwdjm4x8lvpr3s" + "commit": "2b3d90783583ef44006aea9552314e0b5ab2e47a", + "sha256": "1q7n6z2rw31jszn7nq1i68c6h0qiavygf7r94izvkrpywdy65m7w" }, "stable": { "version": [ @@ -18693,28 +18693,28 @@ "repo": "jao/consult-notmuch", "unstable": { "version": [ - 20250106, - 1511 + 20250205, + 1714 ], "deps": [ "consult", "notmuch" ], - "commit": "f7efa07ecc87aa63a76887fffc9796329a09a685", - "sha256": "1ynna4nqdzb9g735vxymchm503f01i4zcxwrdszk9nrazbcx651r" + "commit": "17d2a4ea8c180acd4fb805dcc1b17d9c6a1a4044", + "sha256": "1kgi3y1lkp1jd784ncyysr5yimyq6bjpvgx9wxfca14ylb8my37a" }, "stable": { "version": [ + 1, 0, - 8, - 1 + 0 ], "deps": [ "consult", "notmuch" ], - "commit": "d0d4129d45ccceddaeeaa3631eb42d5dd09a758b", - "sha256": "0gcd69i99prnskh1na7clydqgh1y9rbzkdc6dy9zmin9hfdrw1yd" + "commit": "17d2a4ea8c180acd4fb805dcc1b17d9c6a1a4044", + "sha256": "1kgi3y1lkp1jd784ncyysr5yimyq6bjpvgx9wxfca14ylb8my37a" } }, { @@ -18793,26 +18793,26 @@ "repo": "jao/consult-recoll", "unstable": { "version": [ - 20250106, - 1724 + 20250205, + 1712 ], "deps": [ "consult" ], - "commit": "93f37e139405368d44d7cb831d343045b63dfa96", - "sha256": "03znj61qwh2is07jgprkw79il72qrvk5pjd9l4p23zrcg7l05lc2" + "commit": "eddbc7ba70439881e4781fa73fb0fb240e02fd3b", + "sha256": "0w7c41fz6mm0i8annxr68icrcdmindafkvd3fnnnyw3ncm8vsygb" }, "stable": { "version": [ + 1, 0, - 8, - 1 + 0 ], "deps": [ "consult" ], - "commit": "ba68d052d9479aeaa5dda15a57a2c070df7d9bca", - "sha256": "02igkdhqpl3zylh5v3aw0a93krr2rzdy5kb6azvf4s461jpmwgqv" + "commit": "eddbc7ba70439881e4781fa73fb0fb240e02fd3b", + "sha256": "0w7c41fz6mm0i8annxr68icrcdmindafkvd3fnnnyw3ncm8vsygb" } }, { @@ -18872,15 +18872,15 @@ "repo": "eki3z/consult-todo", "unstable": { "version": [ - 20250131, - 1447 + 20250201, + 1342 ], "deps": [ "consult", "hl-todo" ], - "commit": "f661eed4d5eac1f08db499e23a3dd15c15f0dd62", - "sha256": "1l1qm6zi8cas1wjqpaf2qqnrq59mrxmxr0qxyqfywl730a6yw0l3" + "commit": "b50df0da6243d7a91016e1b8c9a208fb167695be", + "sha256": "1cj25n54dglj8frfb23w576yfn7rcv149xf2anjyv7w45mfgspnn" }, "stable": { "version": [ @@ -19103,8 +19103,8 @@ "repo": "chep/copilot-chat.el", "unstable": { "version": [ - 20250129, - 811 + 20250205, + 1106 ], "deps": [ "chatgpt-shell", @@ -19115,8 +19115,8 @@ "shell-maker", "transient" ], - "commit": "b7648e2f117403f2e12e00e0232a0953799cea24", - "sha256": "063lhwm84p06g47c4908imy1r9myjpdx9hzxra8ycj7vigrfpwkj" + "commit": "a3a9f13506f6bb8105c625bbd731e6c0e741eec2", + "sha256": "0igjhnz9447c0x3431l1f5k142v3bqcm5wzjppbhdx7gqf9i1cs6" }, "stable": { "version": [ @@ -20653,11 +20653,11 @@ "repo": "crystal-lang-tools/emacs-crystal-mode", "unstable": { "version": [ - 20231205, - 1943 + 20250203, + 1157 ], - "commit": "ea89b108fa4222df94ffb99e6e7eaec5d7aa4fea", - "sha256": "0h7nj0lwb90va0z1j3p2i14vggkn4j2hmnf3jknig5dfn39wwbpm" + "commit": "39993f821e6d7ca1da125d0ceba6218c3ca4c5b7", + "sha256": "09097r4l4gzasg7zcamdbmd5rgmw1piz5z9wfhmvfxp65gwv25cl" }, "stable": { "version": [ @@ -20875,15 +20875,15 @@ "repo": "neeasade/ct.el", "unstable": { "version": [ - 20250129, - 153 + 20250205, + 1258 ], "deps": [ "dash", "hsluv" ], - "commit": "87276ddb75663a20d629ace5e321f614583e8f71", - "sha256": "1iq4rvfgx83vvvmildfj76sjih3grrnm7l3qmr0gmp7cx62xfdvi" + "commit": "5dce87360e5a8c22e2ffde970ff4189cd7fa4138", + "sha256": "0czzbbnwmbpzcrf6m0wcqxj3nsc7vk5bb9x157gcwrip68g7gzyn" } }, { @@ -21835,8 +21835,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20241216, - 1315 + 20250131, + 1624 ], "deps": [ "bui", @@ -21849,8 +21849,8 @@ "posframe", "s" ], - "commit": "ffb795761273e1bdc3d0cd1ebdd43e36b7c08921", - "sha256": "1vzb3hhdlicy087faqlwm6r9kpmiypb9pacmyad7wk4i0q60ywdd" + "commit": "2a5524bef1528945311dd8557b18c53d6e95fa3d", + "sha256": "1xsl621bax8g4aq4m890b31f4mpsh9nywxazqxnlki52mv6a4m5d" }, "stable": { "version": [ @@ -22387,26 +22387,26 @@ "repo": "doublep/datetime", "unstable": { "version": [ - 20240418, - 1601 + 20250203, + 2047 ], "deps": [ "extmap" ], - "commit": "38f0e180ae36257d77ce9612dfca8404f39ddcfc", - "sha256": "114x0ldzczafil5f33g8m1clibakmy2kwmmwbs49ryn35hh60fg7" + "commit": "2601120d4d2857cdbad1cf8d4b84d77308920835", + "sha256": "0g5jplmhrm294zhwf8s3inhrqhnvlc2smhpp7qnqp926rjn48lmk" }, "stable": { "version": [ 0, 10, - 1 + 2 ], "deps": [ "extmap" ], - "commit": "41d0221ee2fc7b9f9c57cf930f0011edf977a2a8", - "sha256": "13fvpp9aashmlv9pc12fvf540f9s36wrcfskcx2hcm6r3kv91d54" + "commit": "b8e5fc2b7338f26ee816a3b03322c585dbd3b686", + "sha256": "1cihsn81fkp0bf62358kssk77wzlk3kngz1a1bfvpp2szpvgwbc7" } }, { @@ -23241,15 +23241,15 @@ "repo": "pprevos/denote-explore", "unstable": { "version": [ - 20250126, - 525 + 20250202, + 924 ], "deps": [ "dash", "denote" ], - "commit": "0fb807bd22a2cd031ef74c14904d760181749b96", - "sha256": "0ifpqwydjsb7cp1nmm6m73waamv407x02zbrg9ghk6g3gc70lasl" + "commit": "4dbc3441c9d6ae340aabc1e80ae9c86ca781d72e", + "sha256": "0jmldsizqiq5ldwk16j98dmyvn65wi6c37gkvljb40aj5gpbm83l" }, "stable": { "version": [ @@ -23759,11 +23759,11 @@ "repo": "ideasman42/emacs-diff-ansi", "unstable": { "version": [ - 20241208, - 511 + 20250208, + 2317 ], - "commit": "13f5938a087362776dd0e883734d48c610a0b379", - "sha256": "052gil83w9pylf63sqq2c3984gwy8jbr8a78ipyflwyas1l3yn80" + "commit": "463efc61b44bb34f34e44a1cb028f5f69ac1bed4", + "sha256": "1sbcmpgvd1c1qvv8iq7w2mvk00ndx2dzhsmkwmcfiwk75bb17hnv" } }, { @@ -25428,14 +25428,14 @@ "repo": "alexluigit/dirvish", "unstable": { "version": [ - 20250117, - 1539 + 20250209, + 1504 ], "deps": [ "transient" ], - "commit": "1bc2f93a9dc12a5a5a72b13fbb3ed9374a3b2ab7", - "sha256": "1hw9vhja8bhzb0j7qyv6r4wy1gq3km1ya4jm7mggm1lfjq0zhzmd" + "commit": "2eb0118681dd65836bfa7e3442f5ed152615b533", + "sha256": "0c207mz2naqhdcl93wjy958akv2yqlmxqripgvqlawzbaqaf5qjy" }, "stable": { "version": [ @@ -26149,11 +26149,11 @@ "repo": "ideasman42/emacs-doc-show-inline", "unstable": { "version": [ - 20241208, - 505 + 20250209, + 607 ], - "commit": "cc9d6b1d0dc0776331daa2d612c17473f1ddd337", - "sha256": "0hswfj09mrcjnl8f3px0glpjghl49z0g37i3s2kl428xaixdnfgf" + "commit": "2c23259d400d618018952581a22db5bdbac4768d", + "sha256": "1pgqx1wykq57p3gf3j51cx17cxwj1pxv18n3qbrigi0hdqmldh8s" } }, { @@ -27611,11 +27611,11 @@ "repo": "dylan-lang/dylan-emacs-support", "unstable": { "version": [ - 20241102, - 2315 + 20250209, + 721 ], - "commit": "21e5953e2b1832f6a2c72012bd13795dc1ede52f", - "sha256": "01jkk7gq6pqls6yvc6j77zmnppm2qpx876s596y7vz1q1c5i2fii" + "commit": "8cf635979a2233e14a2a72071d44ddb47109edef", + "sha256": "0jghp6b8n27dw62qzqz6afrny2a5gyj7ml2r9z0cazgxx4gbz34j" }, "stable": { "version": [ @@ -28348,14 +28348,14 @@ "repo": "jamescherti/easysession.el", "unstable": { "version": [ - 20250131, - 1341 + 20250207, + 127 ], "deps": [ "f" ], - "commit": "5325fd02e391504fc6edd93152150261718f22f1", - "sha256": "08vxmk0c6bkkj6393pijqwzbfahwmr99p4ccgdf8lwaa2nvljb01" + "commit": "bf955796138c155e7ecf62acbde465c3908f1691", + "sha256": "038gm369i790c8qyfifs5db2cm1g8vvxglbck16bxvmwvk2w4f6v" }, "stable": { "version": [ @@ -31165,8 +31165,8 @@ "repo": "s-kostyaev/elisa", "unstable": { "version": [ - 20250128, - 736 + 20250202, + 2040 ], "deps": [ "async", @@ -31174,14 +31174,14 @@ "llm", "plz" ], - "commit": "bfd4f2a2dab054adc788d82447432e059fbd0f8c", - "sha256": "08qsd0h6xs1j04mfkgjgwxgq2vlyn6jqcr0h59z69cmhps417jvp" + "commit": "b655b59d371639d357dcabe48f1c2cd1694ee8de", + "sha256": "1jwv4blhf9021758g212q8cf68a4hipj8nqgad00f54dxrr4s2h5" }, "stable": { "version": [ 1, 1, - 5 + 7 ], "deps": [ "async", @@ -31189,8 +31189,8 @@ "llm", "plz" ], - "commit": "bfd4f2a2dab054adc788d82447432e059fbd0f8c", - "sha256": "08qsd0h6xs1j04mfkgjgwxgq2vlyn6jqcr0h59z69cmhps417jvp" + "commit": "b655b59d371639d357dcabe48f1c2cd1694ee8de", + "sha256": "1jwv4blhf9021758g212q8cf68a4hipj8nqgad00f54dxrr4s2h5" } }, { @@ -31515,8 +31515,8 @@ "repo": "s-kostyaev/ellama", "unstable": { "version": [ - 20250126, - 2045 + 20250209, + 1407 ], "deps": [ "compat", @@ -31524,14 +31524,14 @@ "spinner", "transient" ], - "commit": "77ad1e2c38fbd205407eea48a4ccb56a8a2e18e3", - "sha256": "0qkdhgzlwav17jn46vsd001sj1h452vf6acng2nw0295zl8hdjsm" + "commit": "e037bbd213a0441c1aa37a72a4c9cb7039df38ef", + "sha256": "01bzcd8sk26rkz3aj9v1dxp9p0wjvivvl9xxxj0hlzar79w5ayki" }, "stable": { "version": [ 0, 13, - 4 + 9 ], "deps": [ "compat", @@ -31539,8 +31539,8 @@ "spinner", "transient" ], - "commit": "77ad1e2c38fbd205407eea48a4ccb56a8a2e18e3", - "sha256": "0qkdhgzlwav17jn46vsd001sj1h452vf6acng2nw0295zl8hdjsm" + "commit": "e037bbd213a0441c1aa37a72a4c9cb7039df38ef", + "sha256": "01bzcd8sk26rkz3aj9v1dxp9p0wjvivvl9xxxj0hlzar79w5ayki" } }, { @@ -32547,16 +32547,16 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20250127, - 1315 + 20250201, + 501 ], "deps": [ "compat", "consult", "embark" ], - "commit": "755cb49b59801ff420193cc0e3b1a7aa12bf22e3", - "sha256": "0n8khkgk3mnm48b9426radzmrgda0k6zcc0c0ws8yl2gpnkblkxn" + "commit": "d5df0eff182b014ab49328a4dbb1d69eb7faafbd", + "sha256": "0yirl32za3lx1spppckcdwx53hbyyrnnf8ry5wd2kx75j3nbirba" }, "stable": { "version": [ @@ -32756,16 +32756,16 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20250120, - 1913 + 20250204, + 2022 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "6fe8f7a69807326255e514b024315e8d9f206a43", - "sha256": "09v4mhdc2zaxqlhrjz7587vglzva8lv5jv6wkbyi1if5vgj6ghrh" + "commit": "5e9922f2a45fc4b869bd4947540903ea15acfeb2", + "sha256": "004riskycjkj9c305yf0rkfkkbl95rwsxp6jpcb2ivaw5kn2ai5p" }, "stable": { "version": [ @@ -33670,14 +33670,14 @@ }, { "ename": "epkg", - "commit": "a74629656e9a23133219a0bd805982f1497b35d7", - "sha256": "0k9gx778ladcybyspfhbbzyzas1k6cad0f9sr9chbag01cn1jj1p", + "commit": "822cd8b6f44d8404c7f50b547f35f84d95b4b07e", + "sha256": "1bm8mxc4kwmrg8g38c4fyvmf4i50ky3xdv81dlxbpvqkyw9pda47", "fetcher": "github", "repo": "emacscollective/epkg", "unstable": { "version": [ - 20250101, - 1751 + 20250205, + 1933 ], "deps": [ "closql", @@ -33685,8 +33685,8 @@ "emacsql", "llama" ], - "commit": "d28ce2f7d57c2f082506d25e653b68673daf33c2", - "sha256": "0zdlymx44jgrzm68cnh636mpdazihqiakf5m3v1c2rhvh6cb6yg6" + "commit": "dad7206206f9d329695b5559a601591a2037709f", + "sha256": "18n5w378mx863dbsg7p64n613bp36swdmjl5ff3jdfrjirx78vr6" }, "stable": { "version": [ @@ -34403,10 +34403,10 @@ "version": [ 27, 2, - 1 + 2 ], - "commit": "4726e39654c7a7412f7c2f66c7eb567c978a9947", - "sha256": "0czalhx15g0sg5468pn7hhm2fqpcb8whd488d64vcywqddlgimfz" + "commit": "8a4e04e9c48d94ef1216b0426fa71ccfdd78f7d3", + "sha256": "0y287gvbl0zw7i2j27pp0lkcn8q408qv3fmxw669wm14q0q83yak" } }, { @@ -36113,20 +36113,20 @@ "repo": "mekeor/evenok", "unstable": { "version": [ - 20250126, - 2129 + 20250204, + 2341 ], - "commit": "591d06ab2d5bb7d145b2fbde182041a7fabd5c3a", - "sha256": "1cbyxb7y1s2bp9l9b1v1xa4n6xrrrrv63g8bapr36b2i9kpxjih5" + "commit": "473aa509a3d4135d5b2bebe978476a3d96779072", + "sha256": "0b58gsz32r3srbcr5jjqm2b9bhdnvfqy8xzgglvqjiy5cs489vpb" }, "stable": { "version": [ 0, - 11, - 1 + 12, + 0 ], - "commit": "1cdd8f8d09473bc8fb1c5157bd3a2129883701bc", - "sha256": "1qnncjdd2jc65zz2slm8pjgg64nqyvc9v8p6m0zl15xhh7kdavi3" + "commit": "d6600fc808e54dce44d3f8eb2b4e56a60c946c90", + "sha256": "0q587f56i8wdaj53dx9vyd0bd00skxjsascqirx7j1fc56bcfbrh" } }, { @@ -36137,11 +36137,11 @@ "repo": "beacoder/everlasting-scratch", "unstable": { "version": [ - 20240612, - 814 + 20250206, + 628 ], - "commit": "fa1b2af29e8bb463400bbea912ab4dfaa2b0c890", - "sha256": "10zckrrz0mh6alrmav8lbzyz4imh7966m7524jzm2576pn6mxf04" + "commit": "a990e8d2261e5ac109729eb8c2c8e1947e45c8ed", + "sha256": "0lhyaqwxwm54rw9lvhk6vqpnz4350dx45gxc4qgm0g6qgdzn78dk" }, "stable": { "version": [ @@ -39175,19 +39175,19 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20240619, - 1314 + 20250206, + 1617 ], - "commit": "763d524b5dd6273843256810e8531954335583bd", - "sha256": "117hbybdlcvgmisiagf247myww5b2q38yhi47fmlf9dqmpzfw4fz" + "commit": "b2e7072cd3bcfa47a55a1d45579373c988c1f8a4", + "sha256": "1i2qncwsd2i3zba673sa0vaqxq2mswflqwldjxxca7720yf1k6ng" }, "stable": { "version": [ 3, - 5 + 7 ], - "commit": "763d524b5dd6273843256810e8531954335583bd", - "sha256": "117hbybdlcvgmisiagf247myww5b2q38yhi47fmlf9dqmpzfw4fz" + "commit": "1ef3ec33c7605895d1fdd4755640ce929a778c81", + "sha256": "12y4l4q7kmknqckcc4j6rj681271q6agnd85zv4x885pizdy49fm" } }, { @@ -41223,11 +41223,11 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20250109, - 714 + 20250201, + 759 ], - "commit": "87ad201889b2055d0c4b0839d2f8b80eeccae59e", - "sha256": "0xv1vpyvsic51ndpqq2aqvr95hfvdwdfc22az9j8v2mdjwh3y1n7" + "commit": "af1e8ca7257298dd6c51ed4424c09283b4fedb7a", + "sha256": "1r5w7b4v4vk0b5dw07yz9mq27ngz4m55yl4a7ih7s252a9kca4dk" }, "stable": { "version": [ @@ -46279,14 +46279,14 @@ }, { "ename": "forge", - "commit": "5fad9ce9c4e730fd6073d479ce0d3aca9b2f18b9", - "sha256": "024yjicddxjkgqwia82rvi7zfnbbwjyb0ba7slri9fjhxkgcag71", + "commit": "37e21947bfaa74a6e941e886b302a87fb45b3fb3", + "sha256": "12h6f35wbrfcy2n9p4llwlwqv5b0p5lckci0zag2ig6f69f1p4ik", "fetcher": "github", "repo": "magit/forge", "unstable": { "version": [ - 20250129, - 2012 + 20250205, + 1920 ], "deps": [ "closql", @@ -46301,30 +46301,30 @@ "transient", "yaml" ], - "commit": "0e1579b49fd65bd2bba34487c03cec1dd977313d", - "sha256": "1ywkxx9k5m6bwfsn37v1cm6qqggsw7x6y3a4sk7sf5kaa44lqivc" + "commit": "add7868aaf7b8538f086d3a007c412419d08ead9", + "sha256": "0q0w6jv5aq5fc9ii710z32961vg1rmsrr750p9gg9qvqk82csm3g" }, "stable": { "version": [ 0, 4, - 6 + 7 ], "deps": [ "closql", "compat", - "dash", "emacsql", "ghub", "let-alist", + "llama", "magit", "markdown-mode", "seq", "transient", "yaml" ], - "commit": "0c9060626200902f7b0078a85566ef0eea8cc0b6", - "sha256": "0mh542c9hy401jcvammd89v9ja3zxc16k7zhfflq67x90987mwhp" + "commit": "33e240d360b8e3950e9c8b7024e3e763465c0c13", + "sha256": "1576ic28h5nanab092r2w7id66jv2wf3vw8fkhsbvm6fi4l6g4vg" } }, { @@ -47174,8 +47174,8 @@ "repo": "FStarLang/fstar-mode.el", "unstable": { "version": [ - 20240312, - 1632 + 20250201, + 28 ], "deps": [ "company", @@ -47185,8 +47185,8 @@ "quick-peek", "yasnippet" ], - "commit": "6e5d3ea858f3c8a9d01161d9089909c2b22fdfca", - "sha256": "1z1mcmmrfx1nx3d3374wb7qykzdc3qh9ssgs2wz7b5vnv9cbdfn6" + "commit": "36ffb46259a7bb67e5bfac977aae57d52a4915de", + "sha256": "1f2s5nm4rr7v793fa46cqkmijb9fzn0fxn3vywj83bsva3hqsf9z" }, "stable": { "version": [ @@ -47655,11 +47655,11 @@ "repo": "ShiroTakeda/gams-mode", "unstable": { "version": [ - 20241024, - 448 + 20250127, + 1458 ], - "commit": "0bbce5fd884960f7d797dbae4d2b27b0c6dc2241", - "sha256": "09xh3ymx7agh4vg46dkmyzhkh2ck9a464gg57r3vf4qn343jbv73" + "commit": "638656ed0c3a87c68d4afefe7686fa061bbcc0cf", + "sha256": "1kvl694h81f0dc97y9vgl8w1fspz6rivis8b6blcinnqr3622r1y" }, "stable": { "version": [ @@ -48735,14 +48735,14 @@ }, { "ename": "ghub", - "commit": "5fad9ce9c4e730fd6073d479ce0d3aca9b2f18b9", - "sha256": "1kdgwcjzrimfn44yf98pk6jy1cr95mh91mi977yfjhwvk7dhk5gr", + "commit": "8ab3f3fe146ef694110eeeae9b478ca1942cefa9", + "sha256": "1w6a40ryg3xiq0bh5hpkvp59hmkrnzbg7acpwxia2sjwzris7v2p", "fetcher": "github", "repo": "magit/ghub", "unstable": { "version": [ - 20250123, - 1204 + 20250204, + 1422 ], "deps": [ "compat", @@ -48750,22 +48750,23 @@ "llama", "treepy" ], - "commit": "02a83b5560114a18e7c3f79c7f3b356c11d46ee7", - "sha256": "1x1k3lyq63gynalx7parmz5x4qk8ls9gywwlpb1jz764kwz34nr8" + "commit": "077e339bd714a0b8cafcb4ce2b9ec684b0509022", + "sha256": "0fh6yyj0ya77sg65q8akqllvyracwgpp5cx8dr6pv5fp860c2w0d" }, "stable": { "version": [ 4, 2, - 0 + 1 ], "deps": [ "compat", "let-alist", + "llama", "treepy" ], - "commit": "97edaf450ef74f40e6c0bd6a35ebd3fcb710ca4d", - "sha256": "1dlvhpwz4i2z70xh4rzkq8d1wfhbc6n0hp17kdwsy5x5d891dczi" + "commit": "c5003950b5efd065a20983546a12ffcd079b4a93", + "sha256": "05jmljhf9g191rsjkrsirjr7qkm02yfprd43dq79nbflz7z615ss" } }, { @@ -50332,11 +50333,11 @@ "repo": "gleam-lang/gleam-mode", "unstable": { "version": [ - 20240819, - 1355 + 20250209, + 426 ], - "commit": "8d2f1cf6d4b7850bb8fa66cf26b7365f0ad1e925", - "sha256": "0cra6mivfgzhizb1nv448jkr6js39blb74hfyckg3l2yf0fdhjxj" + "commit": "8656c4080dd2bb7dd6d6167953d6463d090509b0", + "sha256": "09649yp39qdipvkw430mcilc9lpdg1bbbjgjgr4g9w5q9ma277fj" } }, { @@ -52330,15 +52331,15 @@ "repo": "karthink/gptel", "unstable": { "version": [ - 20250131, - 803 + 20250209, + 344 ], "deps": [ "compat", "transient" ], - "commit": "e1c01f86e602be606915ce18440fb775f8384e77", - "sha256": "1sg3vn4j03h7m7djdfxkw30d1mfj4pbr5a4a3wj5as312i712dj8" + "commit": "2dd3e317bf4af82cddfa1d1b127c04c17589c878", + "sha256": "13c88f2j03fdwhyl19j9r6lvgczb31v0q0nn79vhhsxw9bp22xzh" }, "stable": { "version": [ @@ -54227,11 +54228,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20250116, - 1954 + 20250205, + 1440 ], - "commit": "4cec530008ef4054826eb1b55d6b26ae8e2807c0", - "sha256": "1h8sba2jyypd9g4wc84c8mmdbx2b0gcvzpxbxvjj12i427qs1fhw" + "commit": "495fb9688e12ed1bf945b4876f124ee38b84c039", + "sha256": "15yqaq6jblrj47h1fj11lmz05glgg40r5am6ynggwjipghchl817" }, "stable": { "version": [ @@ -54546,15 +54547,15 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20250130, - 1100 + 20250208, + 1033 ], "deps": [ "helm-core", "wfnames" ], - "commit": "9a75f112a1b8a1853bdd01f351595d8981547d26", - "sha256": "12y8hal4s4i5x5jhay9xmynq56s0cqibpygv2nsj9n0388shhdp1" + "commit": "80d5c9e68f7ce162967f0818ea8c9abb7d24594f", + "sha256": "1s4svjfw1x302s0hybby4y0rspdxx92drh8l7y1zhygdzsjb7bj5" }, "stable": { "version": [ @@ -55435,14 +55436,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20250128, - 1528 + 20250203, + 533 ], "deps": [ "async" ], - "commit": "474bb0cd74fa73076371f3b91f0d122c1d2d459e", - "sha256": "1vnwq84hil385xzswfnqb5i7ng301wmx9a37jp56bdlyyzgkahlh" + "commit": "23fd81de2ad895dec73b8f6a332483b64c4c6396", + "sha256": "1c23k43kgzavkl66bjq0l8sjpdyf29b4wh31a9dqk8dkxg99i4bs" }, "stable": { "version": [ @@ -55569,14 +55570,14 @@ "repo": "emacs-helm/helm-descbinds", "unstable": { "version": [ - 20240216, - 1154 + 20250204, + 451 ], "deps": [ "helm" ], - "commit": "ca03f02da4e54a1d0a2d5498b86e1639aa808d8c", - "sha256": "0rl0935pni1vi5v9wd7w19i214iiysxixcjkdvqk1plsaqnb3dag" + "commit": "c12bc85ef3ce342fe1c78cdd86117c05d5310789", + "sha256": "0dfm8a8dc3a75pizkjl6304aqx2m9yaqcjk8j0d802ad0zk31g64" }, "stable": { "version": [ @@ -57828,16 +57829,16 @@ "repo": "bbatsov/helm-projectile", "unstable": { "version": [ - 20250127, - 1601 + 20250207, + 2201 ], "deps": [ "cl-lib", "helm", "projectile" ], - "commit": "52ee6ad725d6a82adccb64849f5b7aa2c3aa769c", - "sha256": "0cs5wigpnqw3kn718xvkcc7f0zqdd9pijkiv46pi3c832zxa9r9w" + "commit": "8bfd2c58085036dd5dcdffa8283e6fcdc689a358", + "sha256": "08pdfkm43sqiyfsmqz0q617qrklw7qlag1lq05pipg501zh4p1k3" }, "stable": { "version": [ @@ -59240,8 +59241,8 @@ "repo": "Wilfred/helpful", "unstable": { "version": [ - 20240613, - 1523 + 20250131, + 1645 ], "deps": [ "dash", @@ -59249,8 +59250,8 @@ "f", "s" ], - "commit": "4ba24cac9fb14d5fdc32582cd947572040e82b2c", - "sha256": "1xhhm7avgv9iqnc9pdx8dzcx8p5xaqk81j5zp96qbv035mqkpzrx" + "commit": "34328c639ed7aad371a3f57209acad2a5bb66401", + "sha256": "127q15nnqzwa5a6rwlcg7srcrqdibs3ivzvdf7cw51sxgr11cwzb" }, "stable": { "version": [ @@ -60799,14 +60800,14 @@ "repo": "kaorahi/howm", "unstable": { "version": [ - 20250130, - 1113 + 20250202, + 1244 ], "deps": [ "cl-lib" ], - "commit": "7243d124161ad312a6dd115d7b8195593c9bf24f", - "sha256": "1q1srqb852537l4x3acch9k8d5mgmzm35k5jy1kbhjmvmr2kmi09" + "commit": "83e41a06994b92598eeefe78a23ba794b5474924", + "sha256": "1k3nldh00z1vzjrr8x733mfj1zx6n880gzm997cgrrr10vwap6zr" }, "stable": { "version": [ @@ -61426,11 +61427,11 @@ "url": "https://git.savannah.gnu.org/git/hyperbole.git", "unstable": { "version": [ - 20250130, - 1454 + 20250208, + 2159 ], - "commit": "7a7f039b696e428554babe369691f98399f5176a", - "sha256": "0z0yjg2gi0gh7kas6lg3qvaawjdbqqc1l5x28m73js7hyhb1pd50" + "commit": "c3ff71d9ce31a333470ab8d73fe13ab84ad8af66", + "sha256": "1b199h2j0yl6a30dyakqs97723wskxzwq2qvjnidgv2s713f63jf" }, "stable": { "version": [ @@ -65029,19 +65030,19 @@ "repo": "doublep/iter2", "unstable": { "version": [ - 20250110, - 2005 + 20250209, + 1516 ], - "commit": "727cdbc0b8a3c7e59d00c7e2ddd61694110be943", - "sha256": "05acp6rm98jsxf5j426xd22f4p2mrwipa5wdf9pv9mbnig6l9mjg" + "commit": "632232b5ee627bf5d299db0b7714b3b687a0124c", + "sha256": "176mj7f6wng4n62p39l56ni14mapr7a58nsaczv91xpry8bk1wsx" }, "stable": { "version": [ 2, - 0 + 1 ], - "commit": "8b3fb215d22161f303ecd6c96c0693b96bda3c4c", - "sha256": "17rraqidypxypmvqrh8k0ja57is178q72p6fxj3wlp7mbld1hcp3" + "commit": "4b5b33244a029a81679951bcf8bcda71012ed1c8", + "sha256": "09wypwp0fcj5m3gmh0ipkv6fqlad20iyb2g3952iz5yjdhapva9k" } }, { @@ -66845,14 +66846,14 @@ "repo": "minad/jinx", "unstable": { "version": [ - 20250128, - 707 + 20250207, + 1401 ], "deps": [ "compat" ], - "commit": "2144d03f7bcc3f461b4e67f913dfc0055e4ad7e2", - "sha256": "1cxnxwbxfq29793r6f8pvvw2mb9mj7pa7g7z5k46abplkq65ds3g" + "commit": "e1a5a8921e42cd4ae7cb0dba95fe968d04359ee0", + "sha256": "05n1354w733170wgv2m2r3516a7cax5k0k2z9gc66z16pmacwici" }, "stable": { "version": [ @@ -68785,15 +68786,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20250122, - 1521 + 20250207, + 1100 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "0411236811220cad845b8f80ebe73e4a0317af05", - "sha256": "1f6wd5vm9p9nwa8km72g8c4g5q2cz915qxrjyjrjhgpp32pfq33d" + "commit": "95ef38ab680fecddd8141702b533f9a0a1577797", + "sha256": "0cqa704hbrfvqp1qf37w5vrpycn4ch8d0q5vvx5wgp6i4kv702fp" }, "stable": { "version": [ @@ -69537,28 +69538,28 @@ "repo": "khoj-ai/khoj", "unstable": { "version": [ - 20250130, - 1948 + 20250207, + 50 ], "deps": [ "dash", "transient" ], - "commit": "b111a9d6c6e1c2bf3564fe13747999ff88725b3e", - "sha256": "02f8pjav9gn3zipgjxw5j1ix47xm8qxw3lq4nl4g4dcndkx450a9" + "commit": "ff6cb80c84a690cc589d9f16c1fb9fe2ad22bf7d", + "sha256": "1zdfg22n8b7s6401hfr7aww5kqiiadrvplgf7qbya1s723y8vmxg" }, "stable": { "version": [ 1, - 35, - 3 + 36, + 4 ], "deps": [ "dash", "transient" ], - "commit": "b111a9d6c6e1c2bf3564fe13747999ff88725b3e", - "sha256": "02f8pjav9gn3zipgjxw5j1ix47xm8qxw3lq4nl4g4dcndkx450a9" + "commit": "ff6cb80c84a690cc589d9f16c1fb9fe2ad22bf7d", + "sha256": "1zdfg22n8b7s6401hfr7aww5kqiiadrvplgf7qbya1s723y8vmxg" } }, { @@ -69807,14 +69808,14 @@ "repo": "benjaminor/kkp", "unstable": { "version": [ - 20240227, - 1145 + 20250206, + 2000 ], "deps": [ "compat" ], - "commit": "ed9214329f11b095fc7bad06feb329b9f232258d", - "sha256": "1l9fcz0hj0z88rzamwwrslzkm8gpbpqvvghr3bpxjln8i0qgkasc" + "commit": "ad23d961c3a5dce83b1c9a6b4c65b48809c7af9a", + "sha256": "1yx2bambn4m16awndpqh0qp9hqc2mkawzc34sx07cragk1qhz8l2" } }, { @@ -72375,11 +72376,11 @@ "repo": "martianh/lingva.el", "unstable": { "version": [ - 20250130, - 1849 + 20250208, + 753 ], - "commit": "08dd55ae5c220bd2afc918ee8ef42c9387c9575c", - "sha256": "0q65a10f3kyyq8yk7mxj92rghdcdcacnj4bzc3hc137n654r5dfx" + "commit": "de11bdbd90c73106ce272e60ac030d2a9a2d5f5b", + "sha256": "0j534kxn00iyfvv8lghf3dzmsmhqw7svfxam4yyw3jrgbj4kjgas" } }, { @@ -73225,32 +73226,32 @@ }, { "ename": "llama", - "commit": "572e92d1737bf72a1b8d399ef847d9c34862a680", - "sha256": "0gw02dcpwm1v4qz123d7p1sifcjgvg1wf8zw6si91hslrskkicw0", + "commit": "8ab3f3fe146ef694110eeeae9b478ca1942cefa9", + "sha256": "1hmgmx332wcngg0lirbxzz0d7dzv64s7069w5g4xb5xw4iiaa5da", "fetcher": "github", "repo": "tarsius/llama", "unstable": { "version": [ - 20250120, - 2046 + 20250201, + 1300 ], "deps": [ "compat" ], - "commit": "0b6d79826f2cdc78fd7a0dcc4e59a4baca8c025b", - "sha256": "1zb3iqb1nks2y9i1033x4pa0kb7nb4jqwrcrkqrsq3w612213hkd" + "commit": "9802c215a3eea748d9d7f81a1465850388006897", + "sha256": "0f2v1fw5iahlh0ypbwxfpav48h43h0zqqmicgs2hg7r251ss2j8j" }, "stable": { "version": [ 0, - 5, + 6, 0 ], "deps": [ "compat" ], - "commit": "0b6d79826f2cdc78fd7a0dcc4e59a4baca8c025b", - "sha256": "1zb3iqb1nks2y9i1033x4pa0kb7nb4jqwrcrkqrsq3w612213hkd" + "commit": "9802c215a3eea748d9d7f81a1465850388006897", + "sha256": "0f2v1fw5iahlh0ypbwxfpav48h43h0zqqmicgs2hg7r251ss2j8j" } }, { @@ -73696,16 +73697,16 @@ "repo": "doublep/logview", "unstable": { "version": [ - 20241225, - 1410 + 20250203, + 1956 ], "deps": [ "compat", "datetime", "extmap" ], - "commit": "034c240c816188bf8be7441c9b0925abb92e861c", - "sha256": "12sh9mrpgff4sm1yr3zc2crpwiq3zrj3md0hd0mr69gdkq07xfw3" + "commit": "cac74558ed8f363f222d2e0d52eab5562436347a", + "sha256": "0kw8asfsv3pbjkzi55skibp94hrji80hxrankgnkrsl7dzq556qm" }, "stable": { "version": [ @@ -74376,14 +74377,14 @@ "repo": "emacs-languagetool/lsp-ltex", "unstable": { "version": [ - 20250101, - 852 + 20250131, + 1652 ], "deps": [ "lsp-mode" ], - "commit": "98435127e24719a398c41ebaf14d26928de4632a", - "sha256": "0jwn3869dwjw2nyfmhg6dkaz4fslwmb2k2h54gpiwzwv5a1pg03j" + "commit": "fc394cf8779e86e2d14c7ed209dafe225be90a6f", + "sha256": "1vhd9pm4445nf068g600dlnpnriq0a3ks69r5xj3wdic5l34yfvi" }, "stable": { "version": [ @@ -74452,8 +74453,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20250129, - 2023 + 20250203, + 2137 ], "deps": [ "dash", @@ -74464,8 +74465,8 @@ "markdown-mode", "spinner" ], - "commit": "9a218948a4febea66c2609654a1b89dfd0e2b7d4", - "sha256": "0vyphmlld3jrxzqwvwcfxwhr4ni3i0jyiqylznn2m9ivlhnni9mh" + "commit": "230608ad65809806481adab40ecf41d3780e7b8d", + "sha256": "1196swvh0z3qw1iv7jgpjmwp72nnz6q6hpsy4pjldj5bjxx1lfac" }, "stable": { "version": [ @@ -75279,28 +75280,28 @@ "repo": "emacsorphanage/macrostep", "unstable": { "version": [ - 20241224, - 1752 + 20250202, + 2205 ], "deps": [ "cl-lib", "compat" ], - "commit": "02967fef0bcf114ab6439fdfb06e4af571d68799", - "sha256": "1c4lvipi1bjn56m4m69aq7x7agqzal3x04wwvnmibpgpbjkm8wnn" + "commit": "d0928626b4711dcf9f8f90439d23701118724199", + "sha256": "08l6sg7cj5hqp7j1y9w53k3m3fmzljb2d4rvjsfq4p63lgaam2qd" }, "stable": { "version": [ 0, 9, - 4 + 5 ], "deps": [ "cl-lib", "compat" ], - "commit": "31d4adcca4f08cfd7a45f85e691aaa7a9316b355", - "sha256": "0f0rjpjwzpw6hxqbh8ghr7838slf7w22z7szy68bbg3bbnrjjlai" + "commit": "8e8487712d150178be7297604d0f47fd036a6d8d", + "sha256": "1sdi8kmcvf39p1m6bahnzi3h0djg23lppb2hf1y1snihcf3ibwi9" } }, { @@ -75441,36 +75442,36 @@ "repo": "magit/magit", "unstable": { "version": [ - 20250131, - 1314 + 20250208, + 1839 ], "deps": [ "compat", - "dash", + "llama", "magit-section", "seq", "transient", "with-editor" ], - "commit": "c06dd3ff49b9a6ff76f56addd3ff248003a3affd", - "sha256": "0ackg09h7wrgzpfgrw5mhk8jcbl5bjsxwgdx477p515h8nn8qba8" + "commit": "085baa2ac96df90bdb2a1bedd3598df19919d731", + "sha256": "0w6phljp6l4fn7sa17n6jhfq8r0q03lv2xl5pqyrbdg8q373v1d7" }, "stable": { "version": [ 4, - 2, + 3, 0 ], "deps": [ "compat", - "dash", + "llama", "magit-section", "seq", "transient", "with-editor" ], - "commit": "7dfebba55bf687a25049882c2316166d968048ea", - "sha256": "0zmrd6xlrvlr0i1a75xwlknmyx4hvpfxaqjkl61n12gd8598ji1j" + "commit": "f52dfada8fa0fa6cd70886819868d84e198773a3", + "sha256": "1xz68154qmik4xs3ldl1gv87rb3famgd73k0174xbsr48d40ccyg" } }, { @@ -75568,30 +75569,28 @@ "repo": "gekoke/magit-file-icons", "unstable": { "version": [ - 20240627, - 1228 + 20250204, + 811 ], "deps": [ "el-patch", - "magit", "nerd-icons" ], - "commit": "861670d448df4fba6fb993941d41953cee230a7b", - "sha256": "0zldfmx9vx6fnaadx0q0vmgdsarfs284ffsj0b6qmcgxsbl2z67b" + "commit": "85e4bc0184eb34cd2a799c3749889c6f74f80bea", + "sha256": "1yjm2xy00vsq2d14w4xcpriiaraav07i389vbx6g8i79bajgln25" }, "stable": { "version": [ - 2, + 3, 0, - 0 + 1 ], "deps": [ "el-patch", - "magit", "nerd-icons" ], - "commit": "861670d448df4fba6fb993941d41953cee230a7b", - "sha256": "0zldfmx9vx6fnaadx0q0vmgdsarfs284ffsj0b6qmcgxsbl2z67b" + "commit": "85e4bc0184eb34cd2a799c3749889c6f74f80bea", + "sha256": "1yjm2xy00vsq2d14w4xcpriiaraav07i389vbx6g8i79bajgln25" } }, { @@ -75796,16 +75795,16 @@ "repo": "douo/magit-gptcommit", "unstable": { "version": [ - 20241127, - 131 + 20250209, + 903 ], "deps": [ "dash", "llm", "magit" ], - "commit": "dfec4f9a13af50b5506f375749f5d822ec7be71d", - "sha256": "0kwpi6wrdgvwamllf41k0amczw1d0m8djql9zfflzc2mgr95rfbc" + "commit": "2c3af41c40fb9fd849945b43f744bd788d3aa6f5", + "sha256": "140gcmdfkasf3rkgkal4a4j3kj1ni7b97y20bj7kja1rslcqrk48" } }, { @@ -76030,30 +76029,30 @@ "repo": "magit/magit", "unstable": { "version": [ - 20250126, - 2059 + 20250206, + 2317 ], "deps": [ "compat", - "dash", + "llama", "seq" ], - "commit": "a5962c0b916c1caf211a4f87fb85023068ab50b9", - "sha256": "0vyjdamws4505dwna3j60vzmc1v5b3smaykicp7hs9ksllr0j3sb" + "commit": "3f2a501ec8c327da166e000c5bd9dd77e139aa65", + "sha256": "0wjcmv075zd4z053cq1r80prmyiam9nnxvk487ydr6iy81slr6pm" }, "stable": { "version": [ 4, - 2, + 3, 0 ], "deps": [ "compat", - "dash", + "llama", "seq" ], - "commit": "7dfebba55bf687a25049882c2316166d968048ea", - "sha256": "0zmrd6xlrvlr0i1a75xwlknmyx4hvpfxaqjkl61n12gd8598ji1j" + "commit": "f52dfada8fa0fa6cd70886819868d84e198773a3", + "sha256": "1xz68154qmik4xs3ldl1gv87rb3famgd73k0174xbsr48d40ccyg" } }, { @@ -76822,14 +76821,14 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20250128, - 1729 + 20250203, + 1018 ], "deps": [ "compat" ], - "commit": "5282d5755ad1098c1f06113bf9180fd26450b92a", - "sha256": "1xr24wsxp7p4r3ycb2jqfsq7vagjwmjr5i13jb9qgwcq9wxmcgp4" + "commit": "a527fb03b76a2bce1e360c6e73a095e06922c3f3", + "sha256": "0q6n426yplj6iijsfx11lnlaz4l5iddav2dxml1p2zxvc4k2njy5" }, "stable": { "version": [ @@ -77309,30 +77308,30 @@ "repo": "martianh/mastodon.el", "unstable": { "version": [ - 20241223, - 1040 + 20250204, + 1902 ], "deps": [ "persist", "request", "tp" ], - "commit": "e2443f1cd425b31228e87739d1fc5035640bba06", - "sha256": "0jc6fyqrc0ygd00vq9ga1d9srawm2c0f1l64xg31dbbmhq2js8li" + "commit": "1dfe4368488d2b0539b7626b0c105343ca92322e", + "sha256": "0ry329cnbmb43xdh51xjgdx3mghrvyw221884vmyrnhh8fb3wnz9" }, "stable": { "version": [ 1, 1, - 8 + 9 ], "deps": [ "persist", "request", "tp" ], - "commit": "e2443f1cd425b31228e87739d1fc5035640bba06", - "sha256": "0jc6fyqrc0ygd00vq9ga1d9srawm2c0f1l64xg31dbbmhq2js8li" + "commit": "1dfe4368488d2b0539b7626b0c105343ca92322e", + "sha256": "0ry329cnbmb43xdh51xjgdx3mghrvyw221884vmyrnhh8fb3wnz9" } }, { @@ -78064,11 +78063,11 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20250129, - 1800 + 20250201, + 1911 ], - "commit": "33414b9b1cd3207002a5b94d1300f2f4947e8126", - "sha256": "0bwimgrxbknl2f1q9vsdb8g35by7lfil0zqwyljcxpz6mb679zml" + "commit": "0314cd1bc661c8900bae5ef65d55f67a9ddc7193", + "sha256": "0knd02sx26cv76lci2w63fzvmvql30i052y2c15j1c9lhn7nz3pq" }, "stable": { "version": [ @@ -78519,11 +78518,14 @@ "repo": "org2blog/org2blog", "unstable": { "version": [ - 20250126, - 517 + 20250207, + 2147 ], - "commit": "175244a0b7dae8211cf42c17a51c35e9236eda71", - "sha256": "1fdx2zhszskkfff4qzcqs2xgqdyhq62hiqdfcc7130fxvqxxqv3k" + "deps": [ + "xml-rpc" + ], + "commit": "2310990794c80de8c01bba8c8a7ad5b012c0705d", + "sha256": "0b9h9wjazqrd0wjjf4fpwxgg9gpfcm8pab83ymmm1m9x7cdq4ps8" }, "stable": { "version": [ @@ -78709,11 +78711,11 @@ "repo": "daut/miasma-theme.el", "unstable": { "version": [ - 20241225, - 1559 + 20250202, + 950 ], - "commit": "251408da3b7243035c773c5c299353ab36bd2ec0", - "sha256": "0pb2caf4bj1aynj8mf1cy5syw0v3bf8xjxv78krpa6h9j3zpy7nb" + "commit": "56eff6ff70c41ea5a86641770f917ea622dce19f", + "sha256": "1iiwr8ly8cn8aw0gmwk9hdcapclkcr1nskdw5ndzqci41lp1hxbz" }, "stable": { "version": [ @@ -78953,15 +78955,15 @@ "repo": "eki3z/mini-echo.el", "unstable": { "version": [ - 20250123, - 1917 + 20250209, + 1407 ], "deps": [ "dash", "hide-mode-line" ], - "commit": "fe1fe43b3ad616a29288c82d8d7fe189dd2eccff", - "sha256": "1fgh93xzf4y3fhi7nby0h1vnay78sc2hv06ai5x3j972qz5b0v5v" + "commit": "197260e3e7121d60aa6f6d8f86de9a921fa1230c", + "sha256": "0dzj538cfdgpb5ca82nnfgwg7wiyahk81nav7gh4zijqzqiixkhi" }, "stable": { "version": [ @@ -79328,15 +79330,15 @@ "repo": "milanglacier/minuet-ai.el", "unstable": { "version": [ - 20250128, - 250 + 20250205, + 1919 ], "deps": [ "dash", "plz" ], - "commit": "cbc9e5a2658a0161eaaab3cfd4d8de7c7f04954f", - "sha256": "0qvy8k2fqsfk9h05nvigbiii08kcyzx9wcc8zz7s3pzs119f995z" + "commit": "034317580d67f5eb3113a0d597c509ccbcc57adc", + "sha256": "1hlzkn5qgv9dpis5y6vdi8ncyw3yl227cr5nf5k9y6mpkrxlyycm" }, "stable": { "version": [ @@ -80059,11 +80061,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20250127, - 856 + 20250208, + 958 ], - "commit": "4b10426687d2b417a93ccffbe8d05b2039aa7d7c", - "sha256": "06cmgqfmnjcin209s5jhmw9a4h7d5v84jbfqaxbbrw34bsdhwk4k" + "commit": "610ae60123707c4669651b8da3308e9c54b83620", + "sha256": "0wv8vyjpnmdqmwhizk35x9zz624zygx77ca659rigybmaczjk3ag" }, "stable": { "version": [ @@ -80083,11 +80085,11 @@ "repo": "kuanyui/moe-theme.el", "unstable": { "version": [ - 20240716, - 854 + 20250203, + 1808 ], - "commit": "4b3642157bfe9a9268310d321cfe67c8c236b5e1", - "sha256": "1smhp76aimy192s930d5pxpz4awbp1y0400vdzhqd5ii3q69ssb3" + "commit": "19a20cf08c0c72db97b8e1382a0ceba59f5f27c5", + "sha256": "0j07sxcb6mrdwl1w2jf117m3asvzlm8ld8bgvw82vx7lzh9aijpv" }, "stable": { "version": [ @@ -80714,14 +80716,14 @@ "repo": "alexispurslane/motion-selection-mode", "unstable": { "version": [ - 20250122, - 313 + 20250204, + 30 ], "deps": [ "god-mode" ], - "commit": "0349287a95418276d7868a8840a21eeaf8cb6a13", - "sha256": "1ki34nkgglgkn5x9wjil38ik3zqbl19impfbpky8y0azmbq1axry" + "commit": "96b8cbf18beb528f32cabdf77808b8db596f30be", + "sha256": "06yma18h3wlj2y5rg5kmpbrfyr7lhn7la9l8f6l467iw8smq8wn7" } }, { @@ -81337,11 +81339,11 @@ "repo": "Alexander-Miller/mu4e-column-faces", "unstable": { "version": [ - 20240318, - 2050 + 20250205, + 2118 ], - "commit": "d0387f277c1572160b3e80471252ff0305409988", - "sha256": "0xcbbinhh6r7larg3r3mgid1f2lf49z0hq1hy2ri3wj8zld6iyl3" + "commit": "b3586a9bf61f0cddd8a9f4cb214458f13d37955a", + "sha256": "0cvfyywygqm61j640j5nfv83dkcc5mg4zk8jrfn7176b3jvw7y4k" }, "stable": { "version": [ @@ -83437,8 +83439,8 @@ "repo": "ewantown/nice-org-html", "unstable": { "version": [ - 20250118, - 656 + 20250203, + 848 ], "deps": [ "dash", @@ -83446,8 +83448,8 @@ "s", "uuidgen" ], - "commit": "43925176313d7a2d7c7d89cbd8bc55a5bc7ad73a", - "sha256": "1mih36bjc923x56bnkry2s5j92fxnfwi0miz922iy6qqkd5fp2fr" + "commit": "8f35b640cf8335aa40ce9bb6e471e76b79192774", + "sha256": "1rsvl74d3amp5nsgdsjpyzrkywbaq1h6zshbs28kxxnc4da85nck" } }, { @@ -84442,11 +84444,11 @@ "repo": "ashton314/nordic-night", "unstable": { "version": [ - 20241204, - 2203 + 20250206, + 2258 ], - "commit": "bc7264f14461197919b434f7a30a319873404147", - "sha256": "13gy1si8jylsf45hkigvgplwi110x2jb3fpxih3jg81ili7909xy" + "commit": "7d37878b7e216dc28e4e00f2ecaad413c8712536", + "sha256": "1r2083fcxcf9mrvzxvfsm2j5cyidslvbspgj70lxf23wip5w5d7r" }, "stable": { "version": [ @@ -88153,14 +88155,14 @@ "repo": "abo-abo/orca", "unstable": { "version": [ - 20220828, - 4 + 20250205, + 1726 ], "deps": [ "zoutline" ], - "commit": "0687f416a5573f63b691d384454f5a793266ed97", - "sha256": "00a363vkqvryw5s7pj0kh8pqq5vvbf1pmbzz0b1z1fckwr49sv0f" + "commit": "c6105df2ff6cec9f7d109a4348cc16e62bb0feef", + "sha256": "1zl5gfdx96frla6r31iw1xwajdns86j9jccch6dhzvp0ikq3b1z9" } }, { @@ -88171,14 +88173,14 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20250101, - 922 + 20250201, + 2341 ], "deps": [ "compat" ], - "commit": "411051c3257d60f0492cf88065193bb443b6ca0d", - "sha256": "05n5h53z3siz2ks9zb3k2p070mzzi7m2shrdjyxvylyxl1nybl5n" + "commit": "c7cb04499d94ee1c17affb29b1cfcd2a45116c97", + "sha256": "1g0qf17fmpabmi7ap057fy1rinqvvb0wa7famnakinhxw96l479d" }, "stable": { "version": [ @@ -88333,26 +88335,26 @@ "repo": "rksm/org-ai", "unstable": { "version": [ - 20241020, - 644 + 20250131, + 2236 ], "deps": [ "websocket" ], - "commit": "5adfde1bc7db9026747fbfae4c154eeac4ef8e59", - "sha256": "1h7cmrvj64zfdxx28a4ajmbibf30ff5a680s5hvlv5lmn13isg12" + "commit": "5a906fd4ecc4ff4d8ad561da14346a9d8b1d17db", + "sha256": "0agxq903w35ci144jr378ynaxl20hri3a42xl3m8h08a50x5s87j" }, "stable": { "version": [ 0, 5, - 4 + 5 ], "deps": [ "websocket" ], - "commit": "5adfde1bc7db9026747fbfae4c154eeac4ef8e59", - "sha256": "1h7cmrvj64zfdxx28a4ajmbibf30ff5a680s5hvlv5lmn13isg12" + "commit": "5a906fd4ecc4ff4d8ad561da14346a9d8b1d17db", + "sha256": "0agxq903w35ci144jr378ynaxl20hri3a42xl3m8h08a50x5s87j" } }, { @@ -90559,16 +90561,15 @@ "url": "https://repo.or.cz/org-link-beautify.git", "unstable": { "version": [ - 20250125, - 1539 + 20250204, + 1618 ], "deps": [ "nerd-icons", - "org", "qrencode" ], - "commit": "8f8bdb65a32cf6fd09b7dddf2f84d96934620cf4", - "sha256": "181qcrhs3r21pdzvpha4dab3rzx015y8pw5h6n8ikgwcspz7mvbn" + "commit": "1d088d4ea6efd4ccaf6b1efaaee2bb85dd73f98f", + "sha256": "1l1gw3987fd2xri1byvj1jx26gksc9a5adjr71c5zkva0gl2zhlq" }, "stable": { "version": [ @@ -91058,30 +91059,30 @@ "repo": "meedstrom/org-node", "unstable": { "version": [ - 20250131, - 957 + 20250203, + 1402 ], "deps": [ "compat", "el-job", "llama" ], - "commit": "884a5e2136591e41d20ee16b4f0aea7b6918adb9", - "sha256": "1vkprf35nvaqy8h7msi821j7jlbn4a8fgk690ib8czy2kbpp6pir" + "commit": "0f58a8e584e036a97aaa023813c273b9fc83f41e", + "sha256": "0h2kmpki4c8c87lm3wzpl23adilfrrg9vbcv2yf4s034r4bvd949" }, "stable": { "version": [ 1, 9, - 34 + 35 ], "deps": [ "compat", "el-job", "llama" ], - "commit": "884a5e2136591e41d20ee16b4f0aea7b6918adb9", - "sha256": "1vkprf35nvaqy8h7msi821j7jlbn4a8fgk690ib8czy2kbpp6pir" + "commit": "0f58a8e584e036a97aaa023813c273b9fc83f41e", + "sha256": "0h2kmpki4c8c87lm3wzpl23adilfrrg9vbcv2yf4s034r4bvd949" } }, { @@ -93735,8 +93736,8 @@ "repo": "org2blog/org2blog", "unstable": { "version": [ - 20250126, - 517 + 20250204, + 1933 ], "deps": [ "htmlize", @@ -93745,8 +93746,8 @@ "writegood-mode", "xml-rpc" ], - "commit": "175244a0b7dae8211cf42c17a51c35e9236eda71", - "sha256": "1fdx2zhszskkfff4qzcqs2xgqdyhq62hiqdfcc7130fxvqxxqv3k" + "commit": "f0b4d73e0aa531f508d979ba2365880f064700f9", + "sha256": "136i9xrnx0xr6bpa51yjhrr28r9zmi2q22442w9cc1xahwd8b7ia" }, "stable": { "version": [ @@ -97034,19 +97035,19 @@ "repo": "joostkremers/parsebib", "unstable": { "version": [ - 20250116, - 1521 + 20250208, + 2251 ], - "commit": "6843ecc22073484e0e48dbd63735b9b4ba103539", - "sha256": "0f3kssvyxjw75g3d5039zznbx3lr7hrcc8ma0gwd2fj0y8a63bjz" + "commit": "a25621930e67e267133b08698a72fa80a42edfc8", + "sha256": "0gh8bv6q9041q0b9spw7glj3lfvkj8yl743b4xc1y5mjj8alb466" }, "stable": { "version": [ 6, - 4 + 6 ], - "commit": "f0e57a3606d615a54a05d82edb94058a0a6d92a9", - "sha256": "1mx47gkn3l7hvknksfcl9r36hhm2hlskibvbkxd31sgzhzgjaxdr" + "commit": "a25621930e67e267133b08698a72fa80a42edfc8", + "sha256": "0gh8bv6q9041q0b9spw7glj3lfvkj8yl743b4xc1y5mjj8alb466" } }, { @@ -98546,14 +98547,14 @@ "repo": "emarsden/pg-el", "unstable": { "version": [ - 20250125, - 1305 + 20250208, + 1320 ], "deps": [ "peg" ], - "commit": "a945e203f4f2ca734ddebeaf96b0382c8770a383", - "sha256": "1fi6w24jhqdj114y75ncl42202d65sg3n97b5az61l74kgbx55fj" + "commit": "1f3cd5f9ee473c367040a2523dde0dfa852725c9", + "sha256": "1dq8h9b8n6s11nsdav2hlnwcppswy2ccfz18dhp2lvkd48dw469f" }, "stable": { "version": [ @@ -98779,10 +98780,10 @@ }, { "ename": "phoenix-dark-mono-theme", - "commit": "87e3b036fbcc96b047bbb141345a7b51f19d6951", - "sha256": "15in299j170n0wxmkg3cx1zzx1n7r1ifraqqzfqhcnk8i8lmc939", - "fetcher": "github", - "repo": "j0ni/phoenix-dark-mono", + "commit": "c5357c53a42f30b9c9c9872c27c141c5d6d91a8d", + "sha256": "1ixvsjdbmk6f63zdlgjdrw2z7mjvbf96cyw62c3wqlzsa6x78d1w", + "fetcher": "sourcehut", + "repo": "mhcat/phoenix-dark-mono", "unstable": { "version": [ 20170729, @@ -98794,10 +98795,10 @@ }, { "ename": "phoenix-dark-pink-theme", - "commit": "87e3b036fbcc96b047bbb141345a7b51f19d6951", - "sha256": "0bz6iw73d85bi12qqx6fdw3paqknrxvn0asbwjmgdcrlqrfczjlr", - "fetcher": "github", - "repo": "j0ni/phoenix-dark-pink", + "commit": "d98b48afa4ee2a5afbc22a226d3673d6d9641f12", + "sha256": "1i1p9h0ny0v1m90biiwy09qm41y35zzmv3f11j045c9qnc24bskx", + "fetcher": "sourcehut", + "repo": "mhcat/emacs-phoenix-dark-pink-theme", "unstable": { "version": [ 20190821, @@ -99194,6 +99195,30 @@ "sha256": "0a6jnnl74z1nr1w4qkllil4vv5k669vkjl5z6zc42b4sb5qrksw7" } }, + { + "ename": "pif", + "commit": "20aa5104c58dd78185ce1d9efb089ff67a8ce0d6", + "sha256": "186dv6bdrrj7sjdnp9bp0zfcq83w86x9y983klc8zqhmy9ssry31", + "fetcher": "github", + "repo": "oliverepper/pif", + "unstable": { + "version": [ + 20250207, + 1624 + ], + "commit": "c993c1446ff3460a2f599b84ac81e9f00c4c7333", + "sha256": "02ywbxfg7s1hsiwi2zqvhlqd8wfhfzasb3n6gsj0rl5ix8c7gsmw" + }, + "stable": { + "version": [ + 0, + 0, + 6 + ], + "commit": "c993c1446ff3460a2f599b84ac81e9f00c4c7333", + "sha256": "02ywbxfg7s1hsiwi2zqvhlqd8wfhfzasb3n6gsj0rl5ix8c7gsmw" + } + }, { "ename": "pig-mode", "commit": "a0d7c07d28e2f229b281201a781ebaceed6465ed", @@ -100886,16 +100911,16 @@ "repo": "SqrtMinusOne/pomm.el", "unstable": { "version": [ - 20240709, - 2156 + 20250202, + 1202 ], "deps": [ "alert", "seq", "transient" ], - "commit": "ba0b30888614a8dc932bd0ab198e08f78950c0e1", - "sha256": "1zd351gx3k31vmrs4g4q8fcqdwxp8zlqch40z4vhqy80alzlg88g" + "commit": "ee7b60c65e3d15e0fcf2169ff3ba4b43ebaa65d6", + "sha256": "1q8rak8gbmwbnm3r4cvd92bkdbwp5x28jk8vyw1sgpif71wizm01" }, "stable": { "version": [ @@ -101024,28 +101049,28 @@ "repo": "aki2o/emacs-pophint", "unstable": { "version": [ - 20240107, - 1043 + 20250202, + 713 ], "deps": [ "log4e", "yaxception" ], - "commit": "92854bb12c275980c89c9f6f33eaa36b633db6d7", - "sha256": "110lgic3r04q1xlw35vgmdi1ncafm8cp0a3zl5v9z3r5hmxghjv4" + "commit": "c37195caec62a56af77432a8bd92ac720689b5fe", + "sha256": "1gj3hhd6vdlzk9y60491w9y083273ajnv93n056h4f2iv9d2g10q" }, "stable": { "version": [ 1, - 4, + 5, 0 ], "deps": [ "log4e", "yaxception" ], - "commit": "92854bb12c275980c89c9f6f33eaa36b633db6d7", - "sha256": "110lgic3r04q1xlw35vgmdi1ncafm8cp0a3zl5v9z3r5hmxghjv4" + "commit": "c37195caec62a56af77432a8bd92ac720689b5fe", + "sha256": "1gj3hhd6vdlzk9y60491w9y083273ajnv93n056h4f2iv9d2g10q" } }, { @@ -101259,19 +101284,19 @@ "repo": "OpenSauce04/portage-modes", "unstable": { "version": [ - 20250112, - 1959 + 20250207, + 1057 ], - "commit": "05863001fb528ed737c3ba6b7872dbfe1646debd", - "sha256": "04l2kx21d6gsgpq5xf6jk3p5j51ci2lr8p77dzhgpagvpbp6lvgw" + "commit": "10ac263d717ec771e79fdfc1309ea822ec4ba501", + "sha256": "04qmdm8zdnnpq5qk0l3gn6465q1i0lhlxjrrdax2jpkf7hy9xr4m" }, "stable": { "version": [ 0, - 4 + 5 ], - "commit": "05863001fb528ed737c3ba6b7872dbfe1646debd", - "sha256": "04l2kx21d6gsgpq5xf6jk3p5j51ci2lr8p77dzhgpagvpbp6lvgw" + "commit": "10ac263d717ec771e79fdfc1309ea822ec4ba501", + "sha256": "04qmdm8zdnnpq5qk0l3gn6465q1i0lhlxjrrdax2jpkf7hy9xr4m" } }, { @@ -101637,6 +101662,21 @@ ], "commit": "9fa4ef4d1922cbd6dd37b631ea05aed0ef358178", "sha256": "1cm92263jqvq2lg378xqi8ikbqw98lxjpsl29sja2xg2wf6p7gml" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "ghub", + "magit", + "magit-section", + "markdown-mode" + ], + "commit": "9fa4ef4d1922cbd6dd37b631ea05aed0ef358178", + "sha256": "1cm92263jqvq2lg378xqi8ikbqw98lxjpsl29sja2xg2wf6p7gml" } }, { @@ -102595,11 +102635,11 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20250131, - 1015 + 20250209, + 605 ], - "commit": "00ec14cadabfceea59f8124fa540058059bc3562", - "sha256": "005dlkk0y2q7gaf8bhqvh30m975k3wnfrln6syd3xx8q03x4rdjw" + "commit": "cdb22f6b588c8ffa508f6fda586ee1253c73490b", + "sha256": "0h38f64c2dfayjakwlj8xf86jnybclb8d9xj4v72fprssfp8vm55" }, "stable": { "version": [ @@ -103790,11 +103830,11 @@ "repo": "purescript-emacs/purescript-mode", "unstable": { "version": [ - 20241210, - 1117 + 20250204, + 1410 ], - "commit": "07e4d6ecfe677d595ed3759c912c0b262d886b98", - "sha256": "12g1mrfs6b07n0w3w41w32p5n7j4h5k5g69nymh5zyxjn207nif0" + "commit": "e0de552627487e4c6613318e42d4402563362d28", + "sha256": "0afrcaxrj2ih822s41l6cbdzn3acfmm0ajc2j1c82cmbwbh8xga3" } }, { @@ -104805,11 +104845,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20240911, - 1346 + 20250206, + 947 ], - "commit": "16affa2f0f1a3b918547d665235a24bd57d4b9b2", - "sha256": "19w9w7pzmsq01gzbkdcv0shdh2b44ka5ql564d23hq1ly5wk3rkd" + "commit": "4162b0dc8359a50ea322a4a3874150d9b16a7cb5", + "sha256": "1qd0lzr4iq8gnaq1ssi632bw7cfhsdp5i2br3kcgxdykd5wxqkf7" }, "stable": { "version": [ @@ -104913,16 +104953,16 @@ "repo": "wavexx/python-x.el", "unstable": { "version": [ - 20241230, - 943 + 20250207, + 2008 ], "deps": [ "cl-lib", "folding", "python" ], - "commit": "122cc32c1e4c312b0c793788aca03eb20cdebc91", - "sha256": "01y9ac0c2qf0x6a8qwdxbsz7a8vfkjg7pmigbj5xgh06icfisi3z" + "commit": "6d98ab5fb46e93aece4320b509878fd078e2ba88", + "sha256": "0s3gq3mp6ig65qg0i49i6ynkgwpf6gdy14c246sr6zski69n59qd" }, "stable": { "version": [ @@ -105588,11 +105628,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20250125, - 2036 + 20250205, + 2128 ], - "commit": "a3bcfd2e25bb0e79a5d33b113e12a4375d99de76", - "sha256": "12vkhgwbwcqwb8gkahv4mdapr4qn0y15zqcik1krcf1pqf03vdrh" + "commit": "d9e66c7571722101a87a86ef611056c47b791ad4", + "sha256": "1basymv6r8aaq858s9ffniy0zi03hlzy4j6ffipilns2hf1ylgsp" } }, { @@ -106328,11 +106368,11 @@ "repo": "xenodium/ready-player", "unstable": { "version": [ - 20250130, - 742 + 20250204, + 2355 ], - "commit": "bb0752ebb760116d1205c4b7b71d4fc4e699c252", - "sha256": "1v2m5mrn7drp3dvipmiswy2s4jfqdc7cpa06hklp0vj5f5ljd08y" + "commit": "25355ab197e8a7c63196bf672719276093adc132", + "sha256": "199v2yry0jhjijzkhxcfg1h5wy24mvqq8wb1nlxmd1rs3z4563m2" }, "stable": { "version": [ @@ -109934,8 +109974,8 @@ "repo": "emacs-rustic/rustic", "unstable": { "version": [ - 20250130, - 1903 + 20250202, + 336 ], "deps": [ "dash", @@ -109949,8 +109989,8 @@ "spinner", "xterm-color" ], - "commit": "4404bdbf77a82f4d201d9bc4cb80d2a6c4a280b5", - "sha256": "0v3k6plxns1zpb21k4a0af4hg3v3x5y1fl6apz0lrlzw24pk852d" + "commit": "31ecd5582cd8f54c736a3ee5f0b0ec1f6d128dcf", + "sha256": "1mw7i98fkg3mqjp5g4sik1fhpmazz9igfyq5si7b86wdranvavds" }, "stable": { "version": [ @@ -110428,20 +110468,20 @@ "repo": "nicolaisingh/saveplace-pdf-view", "unstable": { "version": [ - 20240816, - 1351 + 20250207, + 1811 ], - "commit": "70e9ec40565021f4b5d51e4523f4c716183a8eef", - "sha256": "000xhr0f2hbdykycm7d5l1nc9knhh65dfnm307y39k236nwy4msc" + "commit": "79e76562bc5ef94c12837035fe504f07be8a8f25", + "sha256": "15799sqw8h2iasnlkcwnjdjmj9ssa9a9pvpyr6fqj0dw4g7056m5" }, "stable": { "version": [ 1, 0, - 7 + 8 ], - "commit": "70e9ec40565021f4b5d51e4523f4c716183a8eef", - "sha256": "000xhr0f2hbdykycm7d5l1nc9knhh65dfnm307y39k236nwy4msc" + "commit": "79e76562bc5ef94c12837035fe504f07be8a8f25", + "sha256": "15799sqw8h2iasnlkcwnjdjmj9ssa9a9pvpyr6fqj0dw4g7056m5" } }, { @@ -112901,15 +112941,15 @@ "repo": "chenyanming/shrface", "unstable": { "version": [ - 20250131, - 950 + 20250201, + 903 ], "deps": [ "language-detection", "org" ], - "commit": "899c7a074859b1e847bebde42f4edf68d7092958", - "sha256": "1l2v33z5d1fb51qb5mv0mx347x5q1ssbwr5dryhvsq8ln1lq06m4" + "commit": "e13af9a9f165b2a68277cdb8e868f9f5070cd608", + "sha256": "18wxw9rzajynvlqz0wa9f473drzv3nflh326z824vlsh8xjjwzg6" }, "stable": { "version": [ @@ -113180,14 +113220,14 @@ "repo": "emacs-sideline/sideline", "unstable": { "version": [ - 20250101, - 856 + 20250131, + 2055 ], "deps": [ "ht" ], - "commit": "709095ca022dd4ea4ceeb6ab18ce9b9dbda0d6a5", - "sha256": "01ccmmnizi2wakkb92zp922idcfsmmcspac1shf7lxjqfbbrpr0n" + "commit": "06565011f7f91fb819567f0a7b9974ba2c256199", + "sha256": "0a8z3pzapdrm248rrczbl35ggpl517fg9y6f5x7g8g6xdr918abs" }, "stable": { "version": [ @@ -113242,29 +113282,30 @@ "repo": "emacs-sideline/sideline-flycheck", "unstable": { "version": [ - 20250101, - 857 + 20250201, + 1746 ], "deps": [ "flycheck", "ht", "sideline" ], - "commit": "bce7bbc90edc3cdeb3144a8fb8d59f5529e3391b", - "sha256": "0mfznzv254rdam67vsdq7nbhiq97cilccbgh14ckq5f2v10sfpil" + "commit": "886b0d923aeaac5e6e4cd4ab42ee6a6a18553907", + "sha256": "1x23any4bdgwfwd10d68cjb8ymka5z8q7wfp3mmmg7461718vrz2" }, "stable": { "version": [ 0, - 1, + 2, 0 ], "deps": [ "flycheck", + "ht", "sideline" ], - "commit": "91d7f2d43cc8abbf96bcae389553b6d722c8bad9", - "sha256": "1lrjrp47h2crj7df4npvwpmd53amz37z37byp13nczxcq1yzw806" + "commit": "886b0d923aeaac5e6e4cd4ab42ee6a6a18553907", + "sha256": "1x23any4bdgwfwd10d68cjb8ymka5z8q7wfp3mmmg7461718vrz2" } }, { @@ -113275,26 +113316,26 @@ "repo": "emacs-sideline/sideline-flymake", "unstable": { "version": [ - 20250101, - 857 + 20250201, + 1749 ], "deps": [ "sideline" ], - "commit": "c3099660040fb360f4c02a74e50612aefdfe7999", - "sha256": "07882x0mxc95liqql873yil4s3cmv6hvf8aswxj3qq0kz0l9bv76" + "commit": "87459e2b083674520d7fc4ee36b6b04c990b2e4f", + "sha256": "0cncgf404ckcilhgzyr79wsr0bgkhklcdcd0scbnmfrn72dyzq9p" }, "stable": { "version": [ 0, - 1, + 2, 0 ], "deps": [ "sideline" ], - "commit": "97d6922b3101eb97fdca4c5516d3dc4c4ccd75a5", - "sha256": "11cy2yxdsjxa5np6hh6vk9rc8mfghsly1j7q28l8zz4990w2g27a" + "commit": "87459e2b083674520d7fc4ee36b6b04c990b2e4f", + "sha256": "0cncgf404ckcilhgzyr79wsr0bgkhklcdcd0scbnmfrn72dyzq9p" } }, { @@ -113774,11 +113815,11 @@ "repo": "laishulu/emacs-smart-input-source", "unstable": { "version": [ - 20250120, - 852 + 20250207, + 1321 ], - "commit": "16cde9e5c0a262933ff22e1e56d872b2cb64fa06", - "sha256": "1i3zqx730q442q1r6v74q1s8jpqaafllln5xba4961cpcn3nxqvx" + "commit": "e09728891a99a078470cc29a30a6e32f814682fe", + "sha256": "02r8z2dng0ian1qig5c1g5xwfa4azpkja9r5lwi4qyd9mkw5cjzy" } }, { @@ -114042,8 +114083,8 @@ "repo": "emacs-slack/emacs-slack", "unstable": { "version": [ - 20250130, - 1303 + 20250208, + 1653 ], "deps": [ "alert", @@ -114055,8 +114096,8 @@ "ts", "websocket" ], - "commit": "292a40a194bf6580d41f2cfd200911d5793817d7", - "sha256": "1r32blfa18n8xmn88pc7vjv955dq63l3n9n1l24kf49whdykkw2r" + "commit": "d81c18a90cec42bea58c74e902cfad27900f8de6", + "sha256": "0qmviqv67qzfl7w8sdl3l0ds6g7fhz58vx41d2mjm6ny0qd6ksq5" } }, { @@ -114114,14 +114155,14 @@ "repo": "slime/slime", "unstable": { "version": [ - 20250126, - 2243 + 20250203, + 1829 ], "deps": [ "macrostep" ], - "commit": "5006caa5b44665b53431ece0baa298f2ffc521eb", - "sha256": "12wxaa0r8jly16ng0r76qbla3slpsw3lavv85ad48jwzwsf65ws0" + "commit": "95b722de9f59b2af2d2b42d38669d43230e7af69", + "sha256": "17lhgjygpjrlpch7shimp7yami8vb18y1zsmhg66s7gimabgxqhm" }, "stable": { "version": [ @@ -114381,11 +114422,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20240809, - 2119 + 20250203, + 2040 ], - "commit": "742355f7554ab6c46e5c1c9bdb89068f55359eaa", - "sha256": "1mxkcgh7g76mqn148zm2mhsh09whwh89wldlyfhq0d9h96zch451" + "commit": "c48defcf58596e035d473f3a125fdd1485593146", + "sha256": "0nzbsby7nliq6lfm3pqbqjrd3z51k71dck9alq3kr9mvirp2vw8q" }, "stable": { "version": [ @@ -115408,14 +115449,14 @@ "repo": "kyleam/snakemake-mode", "unstable": { "version": [ - 20231210, - 2008 + 20250204, + 207 ], "deps": [ "transient" ], - "commit": "5c47042e088d69375b6407a7eded166403d6fd81", - "sha256": "0spgvnsl8kpqq49flnwih3cnmdbmj45sc6czygiai4gwl6drambb" + "commit": "e4751a951a53c4d4610b2eb17469a21177cab6bc", + "sha256": "0b19bfk2d29v6ckh0sxyrrl8mzqqpmnxbs9rp58rf7ipk4rp6xwl" }, "stable": { "version": [ @@ -115528,15 +115569,15 @@ "repo": "SpringHan/sniem", "unstable": { "version": [ - 20250124, - 733 + 20250204, + 1138 ], "deps": [ "dash", "s" ], - "commit": "24c5279b4dc031755fb4ad7d64dbebd476d65750", - "sha256": "1442hv3qvfp11hs14mhpg0xkiay9x3yqrz795g61f9lv7wpm4gna" + "commit": "89161d8b3c19ffba8b52411de36f28aec1e401f2", + "sha256": "1ip0n50ja1gky3rdqc0y7fgm9f8ihakc48y8rqbhcq439m278jpv" } }, { @@ -115772,11 +115813,11 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20240725, - 1617 + 20250209, + 905 ], - "commit": "80ee6b99b022b20c27ffb44fb146f5878c9b5776", - "sha256": "0cb12zwndvlilhfnhq0yh0ygp86xhb04fgb807a1rwf3mgzrw57n" + "commit": "ac09b782f26936d72f0cf1bbe1ff8d589ca49b04", + "sha256": "0l8pzld3pwx5p74sc7amxfii0q7wh1pgnjzljy2ls43wxd2phrd2" }, "stable": { "version": [ @@ -115972,20 +116013,20 @@ "repo": "djgoku/sops", "unstable": { "version": [ - 20240907, - 1739 + 20250206, + 1651 ], - "commit": "46548b854b35983b2e9e5eb4276634dfc41abfa0", - "sha256": "0h2x5ngbf7pi82l5p0h6fm8jc98r3mx37rd7pj52qjyzq0x6nsqs" + "commit": "afeb1232b89335d77a3f4b6639ebe8a2b70fae3f", + "sha256": "1n49p86sfvhaig7mp17zm9mrsp14mmvgvprp1n16r6kgfx52wxzq" }, "stable": { "version": [ 0, 1, - 5 + 7 ], - "commit": "46548b854b35983b2e9e5eb4276634dfc41abfa0", - "sha256": "0h2x5ngbf7pi82l5p0h6fm8jc98r3mx37rd7pj52qjyzq0x6nsqs" + "commit": "afeb1232b89335d77a3f4b6639ebe8a2b70fae3f", + "sha256": "1n49p86sfvhaig7mp17zm9mrsp14mmvgvprp1n16r6kgfx52wxzq" } }, { @@ -117336,11 +117377,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20250127, - 2243 + 20250208, + 2126 ], - "commit": "f81391ab05ae1d4ea34ef1244b36f4961d3cfe83", - "sha256": "1yv0gc5bh11cn8pm6yxvq1np3zrn5jarhamyg0ny8vay5wdcnjnc" + "commit": "53196f48d35ea745a14573ab5ee4f3725728ebdc", + "sha256": "1ibbv82513za7vd6cm1cynxank78yq423rygrdbycfj8c5h03q4r" }, "stable": { "version": [ @@ -117613,8 +117654,8 @@ "repo": "daanturo/starhugger.el", "unstable": { "version": [ - 20241223, - 1047 + 20250204, + 1630 ], "deps": [ "compat", @@ -117623,13 +117664,13 @@ "s", "spinner" ], - "commit": "92ecc8e99a9bfaa19bf1a7581eb1d44d565c10a5", - "sha256": "1b8ms769030cnhblva31bgb4rp0h6zirmwgfgx0rh8xxzp2y0p1d" + "commit": "46f32d4444d4cf6a8937e89538371c97eb0a65dd", + "sha256": "19v8gaj1msnn94kmxrrapsb1ldrwjqf7hkw9wm25mv6f9h0lxjs8" }, "stable": { "version": [ 0, - 5, + 6, 0 ], "deps": [ @@ -117639,8 +117680,8 @@ "s", "spinner" ], - "commit": "22eceb806947edc1ad35e10fb99bdfc65fe26ca3", - "sha256": "1c0xc5sbpgp4nfs4rr1zrzqpxd4jl3cjjpkp43zifahal3gm0am7" + "commit": "46f32d4444d4cf6a8937e89538371c97eb0a65dd", + "sha256": "19v8gaj1msnn94kmxrrapsb1ldrwjqf7hkw9wm25mv6f9h0lxjs8" } }, { @@ -117895,6 +117936,24 @@ "sha256": "16dxjsr5nj20blww4xpd4jzgjprzzh1nwvb810ggdmp9paf4iy0g" } }, + { + "ename": "stillness-mode", + "commit": "2527dc2b23239afe460cbad78664729117506eab", + "sha256": "1pfsh47wprh0dphwr68n6ywcirs52ss217j3qlp9nfdl0m7z0ini", + "fetcher": "github", + "repo": "neeasade/stillness-mode.el", + "unstable": { + "version": [ + 20250126, + 2133 + ], + "deps": [ + "dash" + ], + "commit": "b7bdde04529126a0b4fba263efd7b4786fd24682", + "sha256": "0m8yslpvpgzaqj85wawqwzmvnsgdzwi1m9y6i1yndcka52pvk7kx" + } + }, { "ename": "stimmung-themes", "commit": "ded562018552f74bcf1a346858c0a93089a4359e", @@ -117937,15 +117996,15 @@ "repo": "beacoder/stock-tracker", "unstable": { "version": [ - 20250128, - 1643 + 20250206, + 814 ], "deps": [ "async", "dash" ], - "commit": "94b97ee1c1dad0e7048c980e214e4f52b89bb591", - "sha256": "0j7zhz22hfpfpwynr21fgk1wcndldi0kb109mh1zwm3fhavykc95" + "commit": "51963a654a1199ec23f0938c247b1411fee85c6f", + "sha256": "12aipdqhx2pfgas0c3m4i1z0p45vrrld4c6ahnx9qgp4nig9b2bh" }, "stable": { "version": [ @@ -120040,25 +120099,25 @@ "repo": "lucius-martius/tab-line-nerd-icons", "unstable": { "version": [ - 20241125, - 1048 + 20250208, + 1059 ], "deps": [ "nerd-icons" ], - "commit": "7a49880f3ae39a8709d6887b26ec84ba2b92360c", - "sha256": "0iwxiixdhc5j4gx6mqplav4jcik1kvc0dnai84vdxiii7222zfq7" + "commit": "902a7bef60c64b58da9c6af028a0cb89f70b7684", + "sha256": "1pc6i9hyy1pnzf873fqvdr0akcalni1ms5ddwdnwag3d0d5ay2lq" }, "stable": { "version": [ 0, - 1 + 2 ], "deps": [ "nerd-icons" ], - "commit": "7a49880f3ae39a8709d6887b26ec84ba2b92360c", - "sha256": "0iwxiixdhc5j4gx6mqplav4jcik1kvc0dnai84vdxiii7222zfq7" + "commit": "902a7bef60c64b58da9c6af028a0cb89f70b7684", + "sha256": "1pc6i9hyy1pnzf873fqvdr0akcalni1ms5ddwdnwag3d0d5ay2lq" } }, { @@ -120621,15 +120680,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20250124, - 1508 + 20250203, + 1232 ], "deps": [ "transient", "visual-fill-column" ], - "commit": "d724ded7b83b52af1b9ab1ea34ca208c5e71b7bd", - "sha256": "1q325gf99v82qhz0gp3dvsdcn4vj8bn8crnxmmhlz4339k1pllag" + "commit": "85ad1717de4a47ebeb293e836e5a89e901b55dbd", + "sha256": "099a9269fb9p4hj9v8lqgij9cnc2zr0ayzxws4bh3w82qz5hvi22" }, "stable": { "version": [ @@ -121490,15 +121549,15 @@ "repo": "johannes-mueller/test-cockpit.el", "unstable": { "version": [ - 20240604, - 1943 + 20250208, + 2126 ], "deps": [ "projectile", "toml" ], - "commit": "068d3a393cebdc871236b8d1e45e06f997e2b0d0", - "sha256": "1dhnvymy00f2h039v1cp4fq8fxhybswwsx4qnpvdjilf1lbcvxiw" + "commit": "56e52623ed302d307a2aa6b0ee9e828297cb20e6", + "sha256": "0wbnf4bh739za194709m51f98l5cwn1352021q6f3nv6km5y0if9" } }, { @@ -121962,21 +122021,21 @@ "repo": "facebook/fbthrift", "unstable": { "version": [ - 20250127, - 754 + 20250130, + 2231 ], - "commit": "889b195802c131ddd0bd2f36f83e10f86978997d", - "sha256": "0gzsglrbng6s9is6rfj3h4ykn64sa91g1m81pffp953hcjkch8qy" + "commit": "0b1692802fd3a95daad427b3aced684837fdb3bd", + "sha256": "1s7p8iqgn05j4xh67pdbajf57sb37g2fvj6n9xsqs3h5hlfh2zfp" }, "stable": { "version": [ 2025, - 1, - 27, + 2, + 3, 0 ], - "commit": "889b195802c131ddd0bd2f36f83e10f86978997d", - "sha256": "0gzsglrbng6s9is6rfj3h4ykn64sa91g1m81pffp953hcjkch8qy" + "commit": "0b1692802fd3a95daad427b3aced684837fdb3bd", + "sha256": "1s7p8iqgn05j4xh67pdbajf57sb37g2fvj6n9xsqs3h5hlfh2zfp" } }, { @@ -123242,25 +123301,25 @@ "repo": "martianh/tp.el", "unstable": { "version": [ - 20250103, - 1428 + 20250206, + 812 ], "deps": [ "transient" ], - "commit": "32f4e7492aa041afff8190d06edbf0343c4bf6a7", - "sha256": "1q8pw5lxjl1ahr24dy7shvn03fck8wsdkffgra7xwqsa5vsl1lib" + "commit": "cce2dfe0ec2b5c070cb13a7bdf95695eeb6e3caf", + "sha256": "1hv0j4dzwamhm2gp5123j415mq13347v5lsbxlrksha5nw9h7kds" }, "stable": { "version": [ 0, - 6 + 7 ], "deps": [ "transient" ], - "commit": "df6490d86f24fff22f5ea4f7d887fc60caed1163", - "sha256": "14vdn5syv7jghxvqlih9gvh82755r5gd8yxskq8bv6wkm4b0y0cs" + "commit": "cce2dfe0ec2b5c070cb13a7bdf95695eeb6e3caf", + "sha256": "1hv0j4dzwamhm2gp5123j415mq13347v5lsbxlrksha5nw9h7kds" } }, { @@ -123447,11 +123506,11 @@ "repo": "fosskers/transducers.el", "unstable": { "version": [ - 20250113, - 1054 + 20250205, + 1149 ], - "commit": "18f61af19d9187bebe4d4cbd95ed855618a81668", - "sha256": "00kb7fq1ljms0mwr1m0kq9dy7f6hah5g7x57f93fnhaf769bsc2j" + "commit": "7019f7e4d26afbb601f660ed959eb88257f23f6d", + "sha256": "13pz16w06rnjj939x2my0pvqqjcprywg35hcbnj1ggzry7q5673s" }, "stable": { "version": [ @@ -123508,28 +123567,28 @@ "repo": "magit/transient", "unstable": { "version": [ - 20250131, - 1332 + 20250205, + 2244 ], "deps": [ "compat", "seq" ], - "commit": "f6c249c7f68deec44ed63d18e35aa112b0b294be", - "sha256": "1fcaa503sxn97q3mh4mwpakz36yab5gskm89fj5fgx3wwfbkb2q7" + "commit": "32a7e256aab281bada5db8569e0871c8c3ad2115", + "sha256": "01704zjh94km5nhc60kcgy22hwb1g74llb5kdqjwsz7q1nrad8h7" }, "stable": { "version": [ 0, 8, - 3 + 4 ], "deps": [ "compat", "seq" ], - "commit": "000ff15942878aa1108abaa020da86ada675fea9", - "sha256": "137h1m67dyrnb9l3lm90xfwsl56ih8rc0vahw38fm6ny87sl64sd" + "commit": "e5cb1fd7e8d35e264313436f47972acae0819764", + "sha256": "01g6r5pmprkg75n23zr27nml7dg0ncsrwgbpfnjf0snhjwb4cbhx" } }, { @@ -123603,21 +123662,21 @@ }, { "ename": "transient-posframe", - "commit": "616910997097f08d49004809cac3d995dcfe4bdc", - "sha256": "1dgcv51ychr575ckykwbz9cvnh6q9li4j11gg0mkqdd0x3srxfsf", + "commit": "7bc2b8493e890e272c3e5a2a06b181fd32e16d24", + "sha256": "1dww5786ai3spkrjsq47k2yc02m61i476g7qaa4c4y8d2hkhk8kb", "fetcher": "github", - "repo": "yanghaoxie/transient-posframe", + "repo": "emacsorphanage/transient-posframe", "unstable": { "version": [ - 20210102, - 130 + 20241212, + 940 ], "deps": [ "posframe", "transient" ], - "commit": "5f0874ac3ce6f50968ed5e088d6538a07bdfd11f", - "sha256": "01h7v323xpra2npgc2inyjqjfaz3kkaqk2dlh5li2gzi9gvkzs7g" + "commit": "1eb4ed61ad9f0272a887e05f00708f85f2d9efc5", + "sha256": "0bmcnnp43gsdhdcil3ny4sr4a4110gidssc80r0d162qhvf6kil3" } }, { @@ -123984,26 +124043,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20250127, - 444 + 20250206, + 19 ], "deps": [ "tree-sitter" ], - "commit": "0b91637e22182f2102903ca7203909f1a0d16d3d", - "sha256": "1fv91sd9amy2q176q78kmlmjkfs14v67plgv6g0nnjxa1dhjmz7h" + "commit": "2ff446b4b813543b7a90015808d38f362f039b10", + "sha256": "0dnm1iph0ysa797npc9flinyh7vc55lqgv7k5k2gsn3bibm85blc" }, "stable": { "version": [ 0, 12, - 249 + 255 ], "deps": [ "tree-sitter" ], - "commit": "0b91637e22182f2102903ca7203909f1a0d16d3d", - "sha256": "1fv91sd9amy2q176q78kmlmjkfs14v67plgv6g0nnjxa1dhjmz7h" + "commit": "2ff446b4b813543b7a90015808d38f362f039b10", + "sha256": "0dnm1iph0ysa797npc9flinyh7vc55lqgv7k5k2gsn3bibm85blc" } }, { @@ -125135,14 +125194,14 @@ "repo": "deadblackclover/twtxt-el", "unstable": { "version": [ - 20250127, - 1521 + 20250208, + 1103 ], "deps": [ "request" ], - "commit": "61285bbce14b82a587737db1eefd3439dc83eb65", - "sha256": "0dsiyw7rggjy7w29wxlgsnbdz3ishk40is7jf6vmjwwfbr0z9ch4" + "commit": "401f8c8371855396a530dbe98ac7f0adf58fe40c", + "sha256": "0ci3zynrhpibxlvyzsbyjcg2mync0h3f6811wamz2b2m0q9fxb8x" } }, { @@ -126162,14 +126221,14 @@ "repo": "tbanel/uniline", "unstable": { "version": [ - 20250129, - 750 + 20250207, + 810 ], "deps": [ "hydra" ], - "commit": "3dd0f62e98a79f3d45670adc5369cb47812b09ff", - "sha256": "1fi12la3im819ig1fnhx8ckzdivm1f04apik17hd4aj56x427m73" + "commit": "a5781dc09035faf81e404578f8834d3ee11af0e5", + "sha256": "0r83nwf23kd4ash4pyy65x1pcmb53c464r891nwmfa52lg0br29h" } }, { @@ -127926,14 +127985,14 @@ "repo": "minad/vertico", "unstable": { "version": [ - 20250128, - 1729 + 20250203, + 1055 ], "deps": [ "compat" ], - "commit": "5679dfd6aa05fb38773cf5551aef1b657b73ac78", - "sha256": "1cqcxw5cjf0r7npdx69h78xn374j0r8r6bz4a2ybpk9bdzj2m9bm" + "commit": "e69ef62ffa4bc42dd42437881c251ecdcae0e0c5", + "sha256": "1s0m38nxrlgcmr4nd02p33hi6bf60jswmysvlv1q5vvpygq4j84z" }, "stable": { "version": [ @@ -128561,8 +128620,7 @@ }, { "ename": "vlf", - "commit": "9116b11eb513dd9e1dc9542d274dd60f183b24c4", - "sha256": "1ipkv5kmda0l39xwbf7ns9p0mx3kb781mxsm9vmbkhr5x577s2j8", + "error": "No recipe info", "fetcher": "github", "repo": "m00natic/vlfi", "unstable": { @@ -128974,8 +129032,8 @@ "repo": "d12frosted/vulpea", "unstable": { "version": [ - 20250123, - 1936 + 20250207, + 1910 ], "deps": [ "dash", @@ -128983,8 +129041,8 @@ "org-roam", "s" ], - "commit": "70b99251321e2c8b4dc04409e06a8a68875357e8", - "sha256": "07f726m2qbwn7yh1q0p3qj3r4vjrah82wc5dblxw8mfrsl7yc6l9" + "commit": "15d5451cd51a88cc4241391466ad4a6d5eb61951", + "sha256": "1npgw0akgj2liga8ii9xxfb9gv9zfvwj8zf8saih3bpaw4bginj7" }, "stable": { "version": [ @@ -132815,20 +132873,20 @@ "repo": "zkry/yaml.el", "unstable": { "version": [ - 20241129, - 2114 + 20250208, + 1534 ], - "commit": "cd3edfc02cb12514426c00e07160b87bd8340f4a", - "sha256": "1018s84pdvr8s4dg1g827w0ss78fbs5xj41vglnm5p9np29gfafz" + "commit": "09e46d563f1f3ff948852e08360c7d3c76e2acba", + "sha256": "131g2nv18fjcqgc9v17b0a7zyw2m6ydbhj6riahihd340bci2s6w" }, "stable": { "version": [ - 0, - 5, - 5 + 1, + 2, + 0 ], - "commit": "70c4fcead97e9bd6594e418c922ae769818f4245", - "sha256": "0qq9jr1ihk1b5wfvppyvb8c2pq2gma9wysggd22iln4nqz2mjc81" + "commit": "09e46d563f1f3ff948852e08360c7d3c76e2acba", + "sha256": "131g2nv18fjcqgc9v17b0a7zyw2m6ydbhj6riahihd340bci2s6w" } }, { @@ -132941,11 +132999,11 @@ "repo": "mbj4668/yang-mode", "unstable": { "version": [ - 20190507, - 724 + 20250202, + 1003 ], - "commit": "4b4ab4d4a79d37d6c31c6ea7cccbc425e0b1eded", - "sha256": "0sqp8vwlymwl2dp6bh1gf8725j1fd9sqj4qfgva09rmkq8fdivfm" + "commit": "b7a4c1734a60f70d80d5752ae058232df0b18336", + "sha256": "17y5378w7i7sn3r8wp2dfllncmsbq53ah5nkjrjjcbrlk8k2qxqz" }, "stable": { "version": [ @@ -134887,14 +134945,14 @@ "repo": "fourier/ztree", "unstable": { "version": [ - 20210415, - 1947 + 20250209, + 109 ], "deps": [ "cl-lib" ], - "commit": "f05677f9696e573c8c607e8876fb4a0cccbc491f", - "sha256": "1kav7xiarm0dgvgxf49qqcy2jp388b51x3qb92dyd3i73n6bk09j" + "commit": "a13ea87e2845644211b8f5912b5cb3dfa8627630", + "sha256": "1ldd8nij22v6zi3d8idsv85c33vzb230r6lx0hmjhqy0lqn2dgq3" } }, { From 6aab9e66cb7aec84527be698330bb63406c650a9 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 10 Feb 2025 01:54:51 +0800 Subject: [PATCH 0265/1107] nongnu-packages: updated 2025-02-10 (from overlay) --- .../emacs/elisp-packages/nongnu-generated.nix | 211 +++++++++++++++--- 1 file changed, 180 insertions(+), 31 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index 120bd656f5cc..3e9ac5c7a8dc 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -830,6 +830,28 @@ }; } ) { }; + datetime = callPackage ( + { + elpaBuild, + extmap, + fetchurl, + lib, + }: + elpaBuild { + pname = "datetime"; + ename = "datetime"; + version = "0.10.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/datetime-0.10.2.tar"; + sha256 = "1mpsk5zrl7kja0pk6fw1qw2drq3laphmnnj8ppr0ahinyrqy05kw"; + }; + packageRequires = [ extmap ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/datetime.html"; + license = lib.licenses.free; + }; + } + ) { }; denote-refs = callPackage ( { denote, @@ -1613,6 +1635,27 @@ }; } ) { }; + extmap = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "extmap"; + ename = "extmap"; + version = "1.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/extmap-1.3.tar"; + sha256 = "0k4xh101wi3jby74a44mlqsqinsfsjdrv2k19aanp6xvl60smb04"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/extmap.html"; + license = lib.licenses.free; + }; + } + ) { }; flx = callPackage ( { cl-lib ? null, @@ -3008,6 +3051,112 @@ }; } ) { }; + llama = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "llama"; + ename = "llama"; + version = "0.6.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/llama-0.6.0.tar"; + sha256 = "14rfpi40rhn906s4glj565v1b1kd7fa668sq7b7hh83pq47iylyr"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/llama.html"; + license = lib.licenses.free; + }; + } + ) { }; + logview = callPackage ( + { + compat, + datetime, + elpaBuild, + extmap, + fetchurl, + lib, + }: + elpaBuild { + pname = "logview"; + ename = "logview"; + version = "0.19.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/logview-0.19.1.tar"; + sha256 = "0gg393ygrqyghmaa0ykml9dfkxj13bh5pw82hiahmngy5lrygb26"; + }; + packageRequires = [ + compat + datetime + extmap + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/logview.html"; + license = lib.licenses.free; + }; + } + ) { }; + loopy = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + map, + seq, + stream, + }: + elpaBuild { + pname = "loopy"; + ename = "loopy"; + version = "0.14.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/loopy-0.14.0.tar"; + sha256 = "0kfa4rqmnc26nzwff4bd50rkpclmxpmw9r5hhnfasmm6k2m7fmpj"; + }; + packageRequires = [ + compat + map + seq + stream + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/loopy.html"; + license = lib.licenses.free; + }; + } + ) { }; + loopy-dash = callPackage ( + { + dash, + elpaBuild, + fetchurl, + lib, + loopy, + }: + elpaBuild { + pname = "loopy-dash"; + ename = "loopy-dash"; + version = "0.13.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/loopy-dash-0.13.0.tar"; + sha256 = "1hylniv839x8cl4nbdl64s4h1cnmbwfl47138z32bgdmcv1kbxqi"; + }; + packageRequires = [ + dash + loopy + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/loopy-dash.html"; + license = lib.licenses.free; + }; + } + ) { }; lorem-ipsum = callPackage ( { elpaBuild, @@ -3061,10 +3210,10 @@ elpaBuild { pname = "macrostep"; ename = "macrostep"; - version = "0.9.4"; + version = "0.9.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/macrostep-0.9.4.tar"; - sha256 = "01n3qhxfjd9vg93ddrhnm275v24ih5qczkphc232m0csswxghpdk"; + url = "https://elpa.nongnu.org/nongnu/macrostep-0.9.5.tar"; + sha256 = "16nl81hsbkiwwsy7gcg150xpf8k1899afcsnr1h25z2z6qz3bp9l"; }; packageRequires = [ cl-lib @@ -3079,10 +3228,10 @@ magit = callPackage ( { compat, - dash, elpaBuild, fetchurl, lib, + llama, magit-section, seq, transient, @@ -3091,14 +3240,14 @@ elpaBuild { pname = "magit"; ename = "magit"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/magit-4.2.0.tar"; - sha256 = "04nf4ff7a11z65mcw6qnkxwk9srpi248f1k0li947i4264gl3prd"; + url = "https://elpa.nongnu.org/nongnu/magit-4.3.0.tar"; + sha256 = "0s9i6pn7j36yvd6nhrnkj7amrgywv02bxhxyg2ac56gsf9bwgqas"; }; packageRequires = [ compat - dash + llama magit-section seq transient @@ -3113,23 +3262,23 @@ magit-section = callPackage ( { compat, - dash, elpaBuild, fetchurl, lib, + llama, seq, }: elpaBuild { pname = "magit-section"; ename = "magit-section"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/magit-section-4.2.0.tar"; - sha256 = "05wlc327x45vfsphwz9bf1hl8w46ychqkp6j7wsngjzwzsifxmb4"; + url = "https://elpa.nongnu.org/nongnu/magit-section-4.3.0.tar"; + sha256 = "0f6axq5iqfwlbzllzvqd6yk3p8l7ny624qlmnidrynij53rycy0n"; }; packageRequires = [ compat - dash + llama seq ]; meta = { @@ -3171,10 +3320,10 @@ elpaBuild { pname = "mastodon"; ename = "mastodon"; - version = "1.1.8"; + version = "1.1.9"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/mastodon-1.1.8.tar"; - sha256 = "06jy1n7ikz4xdpw4rkma596pqgkxcmh7qfkz93584rjfqav88anl"; + url = "https://elpa.nongnu.org/nongnu/mastodon-1.1.9.tar"; + sha256 = "01csrqkbjch7cxvmsp8lp3ipaijsqbr230nmk0ss2q19rkmh4sc9"; }; packageRequires = [ persist @@ -3289,10 +3438,10 @@ elpaBuild { pname = "moe-theme"; ename = "moe-theme"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/moe-theme-1.0.2.tar"; - sha256 = "13c4rj0c9fi4nipzsrmvgb8ddvk3dckijga07yxp71x5ba6mrp2n"; + url = "https://elpa.nongnu.org/nongnu/moe-theme-1.1.0.tar"; + sha256 = "103xs821rvq3dq886jy53rc3lycv7xzyr69x1a4yn4lbyf5q4bp6"; }; packageRequires = [ ]; meta = { @@ -4073,10 +4222,10 @@ elpaBuild { pname = "racket-mode"; ename = "racket-mode"; - version = "1.0.20250125.153651"; + version = "1.0.20250205.162816"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20250125.153651.tar"; - sha256 = "0sr2m99mnkjh2byxmy3pgn3gbzyrj64xjkcgwrjd5g4hyci7pdvq"; + url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20250205.162816.tar"; + sha256 = "0mzm7qd89z6y5ivc7qfsahmlhamxr9rpxzm9arbx2hbnqlhj1il5"; }; packageRequires = [ ]; meta = { @@ -4475,10 +4624,10 @@ elpaBuild { pname = "solarized-theme"; ename = "solarized-theme"; - version = "2.0.1"; + version = "2.0.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/solarized-theme-2.0.1.tar"; - sha256 = "1lk1g8v2chjrbbxplw3pd7yn3syjgywxkbdc7dbd76x168qz54qx"; + url = "https://elpa.nongnu.org/nongnu/solarized-theme-2.0.4.tar"; + sha256 = "03vrgs29ifpvsxd4278fx7rmpd0d5ilwl8v1qgrz9gk6bnzphb9f"; }; packageRequires = [ ]; meta = { @@ -4887,10 +5036,10 @@ elpaBuild { pname = "tp"; ename = "tp"; - version = "0.6"; + version = "0.7"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/tp-0.6.tar"; - sha256 = "1a4n6bhaxiiwy11ig09w7p1jxrsl5gfk7ikma9jzv2z54f2p97kz"; + url = "https://elpa.nongnu.org/nongnu/tp-0.7.tar"; + sha256 = "048z3g0gv7brsl546s530b6si2rjhy3mm8y0jdcp14fza4srpliv"; }; packageRequires = [ transient ]; meta = { @@ -5319,10 +5468,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "26.9.20250124153828"; + version = "26.9.20250205172500"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-26.9.20250124153828.tar"; - sha256 = "1c10mlrwnchaf1rpchjglxbd6llh10v1cqg2980kwd7jx56zajm3"; + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-26.9.20250205172500.tar"; + sha256 = "1la0chy12vbm4wcmgc6iwbmbn9zaiz8xfpp1c11lp3dsv1w5gfj3"; }; packageRequires = [ ]; meta = { From 615d2b02a8a482c3a8c22ba94a270adee92156a9 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 10 Feb 2025 01:54:51 +0800 Subject: [PATCH 0266/1107] nongnu-devel-packages: updated 2025-02-10 (from overlay) --- .../elisp-packages/nongnu-devel-generated.nix | 313 +++++++++++++----- 1 file changed, 231 insertions(+), 82 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix index 5ba234026584..a27a50dda1fc 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix @@ -9,10 +9,10 @@ elpaBuild { pname = "adoc-mode"; ename = "adoc-mode"; - version = "0.8.0snapshot0.20240218.103518"; + version = "0.8.0snapshot0.20250206.83825"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/adoc-mode-0.8.0snapshot0.20240218.103518.tar"; - sha256 = "149cj68amidnb9pgg3xh6bpfaxbcqlv5wnacajp4pr4cn5byr0sy"; + url = "https://elpa.nongnu.org/nongnu-devel/adoc-mode-0.8.0snapshot0.20250206.83825.tar"; + sha256 = "0b9lbxk5q0hr7j86wpxrkbg626srkc9jhycqi7qb3yqsn1pr4khc"; }; packageRequires = [ ]; meta = { @@ -807,6 +807,28 @@ }; } ) { }; + datetime = callPackage ( + { + elpaBuild, + extmap, + fetchurl, + lib, + }: + elpaBuild { + pname = "datetime"; + ename = "datetime"; + version = "0.10.3snapshot0.20250203.204701"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/datetime-0.10.3snapshot0.20250203.204701.tar"; + sha256 = "0l9z5bqbxbn456rin27x4zfa5pjvqjr2vhzxpgssrndm7bprm614"; + }; + packageRequires = [ extmap ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/datetime.html"; + license = lib.licenses.free; + }; + } + ) { }; denote-refs = callPackage ( { denote, @@ -880,10 +902,10 @@ elpaBuild { pname = "diff-ansi"; ename = "diff-ansi"; - version = "0.2.0.20241208.51148"; + version = "0.2.0.20250208.231709"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/diff-ansi-0.2.0.20241208.51148.tar"; - sha256 = "08fvdzs2qmd4mbcz52bhmng2wz2pxn9x06w5sg9fjq744005p7dd"; + url = "https://elpa.nongnu.org/nongnu-devel/diff-ansi-0.2.0.20250208.231709.tar"; + sha256 = "0cpnac241jsz5zrwyhyrx6m9qk09bcc1c9xphh9ss0y04rkmdghn"; }; packageRequires = [ ]; meta = { @@ -902,10 +924,10 @@ elpaBuild { pname = "dirvish"; ename = "dirvish"; - version = "2.0.53.0.20250117.153934"; + version = "2.0.53.0.20250206.25042"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/dirvish-2.0.53.0.20250117.153934.tar"; - sha256 = "1k886i4l7qcrdxdhm0arc2fg796fa4gz75vkp4q5fnvvbirwlqvc"; + url = "https://elpa.nongnu.org/nongnu-devel/dirvish-2.0.53.0.20250206.25042.tar"; + sha256 = "0nvwss3ckcqnfmq8mk3zxrbvg5d71h4zxbf2x7hlgd79izmyqpkb"; }; packageRequires = [ transient ]; meta = { @@ -923,10 +945,10 @@ elpaBuild { pname = "doc-show-inline"; ename = "doc-show-inline"; - version = "0.1.0.20241208.50508"; + version = "0.1.0.20250209.60743"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/doc-show-inline-0.1.0.20241208.50508.tar"; - sha256 = "1k98b8d0bxiz7i4n4r46zxy14jszskfmvxavwriig59p2g5gx1yb"; + url = "https://elpa.nongnu.org/nongnu-devel/doc-show-inline-0.1.0.20250209.60743.tar"; + sha256 = "172shyhapbfllc2pv5wrbp58qxfp10gmz49ny5av4yf3ayqd6cm5"; }; packageRequires = [ ]; meta = { @@ -1030,10 +1052,10 @@ elpaBuild { pname = "eat"; ename = "eat"; - version = "0.9.4.0.20240314.193241"; + version = "0.9.4.0.20250206.4447"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/eat-0.9.4.0.20240314.193241.tar"; - sha256 = "1ry5mlg9wmdr4n5zjq1n45z0xhnrpgjyr6611xd9j43i6dnldb38"; + url = "https://elpa.nongnu.org/nongnu-devel/eat-0.9.4.0.20250206.4447.tar"; + sha256 = "1fhj3bi2hdgclgb4b74yqzhxw77k30nrnww4phgzkngyxwp11xcm"; }; packageRequires = [ compat ]; meta = { @@ -1595,6 +1617,27 @@ }; } ) { }; + extmap = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "extmap"; + ename = "extmap"; + version = "1.3.1snapshot0.20250203.193959"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/extmap-1.3.1snapshot0.20250203.193959.tar"; + sha256 = "16sfa2zv0g7dz1zflg848dh643c8vfrb93blqvnd1vmlmf3bsyqy"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/extmap.html"; + license = lib.licenses.free; + }; + } + ) { }; flx = callPackage ( { cl-lib ? null, @@ -1652,10 +1695,10 @@ elpaBuild { pname = "flycheck"; ename = "flycheck"; - version = "35.0snapshot0.20250109.71404"; + version = "35.0snapshot0.20250201.75945"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/flycheck-35.0snapshot0.20250109.71404.tar"; - sha256 = "1rm45wl7cpsr9h98xc2k1j628sdkpp9b9fy6bn9axnpxhl0kzsfi"; + url = "https://elpa.nongnu.org/nongnu-devel/flycheck-35.0snapshot0.20250201.75945.tar"; + sha256 = "1sd7ayqw1jv86yy84jvw708kzxmx1js754yx7l4ijp76dgb7pwsm"; }; packageRequires = [ ]; meta = { @@ -2306,10 +2349,10 @@ elpaBuild { pname = "gptel"; ename = "gptel"; - version = "0.9.7.0.20250131.323"; + version = "0.9.7.0.20250208.194452"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.7.0.20250131.323.tar"; - sha256 = "0s9k7p40dbmfirvhv1bzf0pd08f3j507gszrs99wdpx4ihikayfj"; + url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.7.0.20250208.194452.tar"; + sha256 = "0j2czjinfzpp0ra3c1l9gkhhw65k9kgjbkgqkdf9a1f0szxsjlck"; }; packageRequires = [ compat @@ -2437,10 +2480,10 @@ elpaBuild { pname = "haskell-mode"; ename = "haskell-mode"; - version = "17.5.0.20250116.195415"; + version = "17.5.0.20250205.144004"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/haskell-mode-17.5.0.20250116.195415.tar"; - sha256 = "1fy2fk0is5f1a5k6fm70c3gmbc6nn50c2bfs8nk23105l5y6cdvk"; + url = "https://elpa.nongnu.org/nongnu-devel/haskell-mode-17.5.0.20250205.144004.tar"; + sha256 = "1p3dgr8zyv3ir34x9nbgbz67bpb491kd45haplvk8c32xddli8c3"; }; packageRequires = [ ]; meta = { @@ -2480,10 +2523,10 @@ elpaBuild { pname = "haskell-ts-mode"; ename = "haskell-ts-mode"; - version = "1.0.20250126.114656"; + version = "1.0.20250202.61612"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/haskell-ts-mode-1.0.20250126.114656.tar"; - sha256 = "07jscrfjw3wm6ra9pikr3n6md7j4qsgfnzi3lflja196pxg93z7j"; + url = "https://elpa.nongnu.org/nongnu-devel/haskell-ts-mode-1.0.20250202.61612.tar"; + sha256 = "1i3is0js2sjr61bd7w1jz05a9gl4aj5b0ivar5iq1l0kmnhq7w54"; }; packageRequires = [ ]; meta = { @@ -2503,10 +2546,10 @@ elpaBuild { pname = "helm"; ename = "helm"; - version = "4.0.0.20250130.110027"; + version = "4.0.0.20250208.103323"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/helm-4.0.0.20250130.110027.tar"; - sha256 = "1hqzi6a9lb11qqr5g1p5az1albjcl3cl3ihsffbkr0z6bqsqhxmq"; + url = "https://elpa.nongnu.org/nongnu-devel/helm-4.0.0.20250208.103323.tar"; + sha256 = "0gs5n6qfhq6b8mgqfmiaqaziw4p5r4w22m9fcj2dxvp3vm2nrk5m"; }; packageRequires = [ helm-core @@ -2528,10 +2571,10 @@ elpaBuild { pname = "helm-core"; ename = "helm-core"; - version = "4.0.0.20250130.110027"; + version = "4.0.0.20250208.103323"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/helm-core-4.0.0.20250130.110027.tar"; - sha256 = "0gim7bjf1xmx1jflxb56dwv9wfijmcq7adyiz1zqqvyk2r9s2hwa"; + url = "https://elpa.nongnu.org/nongnu-devel/helm-core-4.0.0.20250208.103323.tar"; + sha256 = "14h1kh1ng6dfhgg062civsh0r6gsnsaw48h5h1b726ypdd5lgh4c"; }; packageRequires = [ async ]; meta = { @@ -2992,6 +3035,112 @@ }; } ) { }; + llama = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "llama"; + ename = "llama"; + version = "0.6.0.0.20250201.130026"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/llama-0.6.0.0.20250201.130026.tar"; + sha256 = "09z94xb9hm4769fsw91aiw2lp1lv3siqa6gk3ik77591bzbax2l0"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/llama.html"; + license = lib.licenses.free; + }; + } + ) { }; + logview = callPackage ( + { + compat, + datetime, + elpaBuild, + extmap, + fetchurl, + lib, + }: + elpaBuild { + pname = "logview"; + ename = "logview"; + version = "0.19.2snapshot0.20250203.195605"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/logview-0.19.2snapshot0.20250203.195605.tar"; + sha256 = "16mr8ki4xg2yqday18x3a3fcbj8krcmwrj09xww43c8rhkixnk4k"; + }; + packageRequires = [ + compat + datetime + extmap + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/logview.html"; + license = lib.licenses.free; + }; + } + ) { }; + loopy = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + map, + seq, + stream, + }: + elpaBuild { + pname = "loopy"; + ename = "loopy"; + version = "0.14.0.0.20250208.155652"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/loopy-0.14.0.0.20250208.155652.tar"; + sha256 = "0sg2kkggg8sb5dmydglka6g84ljlj393yv5vbz51ysjc74cfvcxz"; + }; + packageRequires = [ + compat + map + seq + stream + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/loopy.html"; + license = lib.licenses.free; + }; + } + ) { }; + loopy-dash = callPackage ( + { + dash, + elpaBuild, + fetchurl, + lib, + loopy, + }: + elpaBuild { + pname = "loopy-dash"; + ename = "loopy-dash"; + version = "0.13.0.0.20250114.23438"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/loopy-dash-0.13.0.0.20250114.23438.tar"; + sha256 = "1gbhs3agzf5pg6x3c87ccwxwfppg27jh6zpjc12hv9fgj5pajir3"; + }; + packageRequires = [ + dash + loopy + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/loopy-dash.html"; + license = lib.licenses.free; + }; + } + ) { }; lorem-ipsum = callPackage ( { elpaBuild, @@ -3045,10 +3194,10 @@ elpaBuild { pname = "macrostep"; ename = "macrostep"; - version = "0.9.4.0.20241228.221506"; + version = "0.9.5.0.20250202.220532"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/macrostep-0.9.4.0.20241228.221506.tar"; - sha256 = "0yza9ms8i3nq4fh42s475r0m77b2phq8sx41p6irywi0clc33m0y"; + url = "https://elpa.nongnu.org/nongnu-devel/macrostep-0.9.5.0.20250202.220532.tar"; + sha256 = "089kw24sl8dm1dk45r0gj2h2y0pxazwcp7z5z0pvmnln98mgy4i1"; }; packageRequires = [ cl-lib @@ -3063,10 +3212,10 @@ magit = callPackage ( { compat, - dash, elpaBuild, fetchurl, lib, + llama, magit-section, seq, transient, @@ -3075,14 +3224,14 @@ elpaBuild { pname = "magit"; ename = "magit"; - version = "4.2.0.0.20250130.203401"; + version = "4.3.0.0.20250204.133404"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/magit-4.2.0.0.20250130.203401.tar"; - sha256 = "08lmpmnm6fxlfyildvc5i7ds2y917k104hplxxygj9k36h3nsxpx"; + url = "https://elpa.nongnu.org/nongnu-devel/magit-4.3.0.0.20250204.133404.tar"; + sha256 = "1bj6sqb54lzdnk31lwxmgzgwgy5j55i29z8ad5m9sxjxxzlg700m"; }; packageRequires = [ compat - dash + llama magit-section seq transient @@ -3097,23 +3246,23 @@ magit-section = callPackage ( { compat, - dash, elpaBuild, fetchurl, lib, + llama, seq, }: elpaBuild { pname = "magit-section"; ename = "magit-section"; - version = "4.2.0.0.20250130.203401"; + version = "4.3.0.0.20250204.133404"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.2.0.0.20250130.203401.tar"; - sha256 = "0d6mj4is9gq1acr62kcxn48i4qxrr1fxaihl2k4lvn400i3n7n1n"; + url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.3.0.0.20250204.133404.tar"; + sha256 = "1c7zmjpvqqgybmws7wr7bh1nhp26r3v3mr7a7yhdhaij1xwxjjj2"; }; packageRequires = [ compat - dash + llama seq ]; meta = { @@ -3155,10 +3304,10 @@ elpaBuild { pname = "mastodon"; ename = "mastodon"; - version = "1.1.8.0.20241223.104057"; + version = "1.1.9.0.20250204.190250"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/mastodon-1.1.8.0.20241223.104057.tar"; - sha256 = "13iyzv0gyad07215zvvs9q52ikqf97qn851qgjqqhq9k4p07a22q"; + url = "https://elpa.nongnu.org/nongnu-devel/mastodon-1.1.9.0.20250204.190250.tar"; + sha256 = "1gw9gihf6wsgzaj4waf10blj9gm1iipfmrxawr7idsv4i91crrky"; }; packageRequires = [ persist @@ -3231,10 +3380,10 @@ elpaBuild { pname = "meow"; ename = "meow"; - version = "1.5.0.0.20250129.180058"; + version = "1.5.0.0.20250201.191149"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/meow-1.5.0.0.20250129.180058.tar"; - sha256 = "1wz5bnwqmnd0mc9i3lfhlx756ndr99zzk3r2c3xhl1zq77ya5x9i"; + url = "https://elpa.nongnu.org/nongnu-devel/meow-1.5.0.0.20250201.191149.tar"; + sha256 = "0vvss5l1j1wa6brwlsskdgq11j4vr36i5cl2sfdzafiza4qbh56l"; }; packageRequires = [ ]; meta = { @@ -3273,10 +3422,10 @@ elpaBuild { pname = "moe-theme"; ename = "moe-theme"; - version = "1.0.2.0.20240716.85432"; + version = "1.1.0.0.20250203.180833"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/moe-theme-1.0.2.0.20240716.85432.tar"; - sha256 = "0xcqpdw7p6mphgrjl93cv25zj63r8bi1zi8jzd65k5s6sxlvz7bs"; + url = "https://elpa.nongnu.org/nongnu-devel/moe-theme-1.1.0.0.20250203.180833.tar"; + sha256 = "1vazqmwvn0cpzni1hyjilcdq2zynl4gijkrkhdgaqnskzqp437rm"; }; packageRequires = [ ]; meta = { @@ -3986,10 +4135,10 @@ elpaBuild { pname = "projectile"; ename = "projectile"; - version = "2.9.0snapshot0.20250131.82243"; + version = "2.9.0snapshot0.20250209.60525"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/projectile-2.9.0snapshot0.20250131.82243.tar"; - sha256 = "08wqqxacsaclqlprvb0y67qivrx3zlhkhp033rc1845xc25cca7j"; + url = "https://elpa.nongnu.org/nongnu-devel/projectile-2.9.0snapshot0.20250209.60525.tar"; + sha256 = "00x2xilxzgckv8i0bjq8zpwm6l7j8ac55hld7vf4iyzv100jhf9g"; }; packageRequires = [ ]; meta = { @@ -4050,10 +4199,10 @@ elpaBuild { pname = "racket-mode"; ename = "racket-mode"; - version = "1.0.20250125.153651"; + version = "1.0.20250205.162816"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20250125.153651.tar"; - sha256 = "15idfhphnm7sqk03arvb6nqm0kc26c9plx6lc39y26pngbnphwy7"; + url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20250205.162816.tar"; + sha256 = "1cq7yl4g7s4gvzfqfkxnx0k507xws5d8iy1lnawwclw7gsc4y9hk"; }; packageRequires = [ ]; meta = { @@ -4393,10 +4542,10 @@ elpaBuild { pname = "slime"; ename = "slime"; - version = "2.31snapshot0.20250126.224330"; + version = "2.31snapshot0.20250203.182938"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/slime-2.31snapshot0.20250126.224330.tar"; - sha256 = "1x5q759n06f499ivzplb16wxrid5kjnwnf6yia8rbp9dp09ksada"; + url = "https://elpa.nongnu.org/nongnu-devel/slime-2.31snapshot0.20250203.182938.tar"; + sha256 = "179h8fk5hkdcbq4w9gdcqc8gs4pafl5kdy3818vsmvgvfy6rvzq6"; }; packageRequires = [ macrostep ]; meta = { @@ -4414,10 +4563,10 @@ elpaBuild { pname = "sly"; ename = "sly"; - version = "1.0.43.0.20240809.211904"; + version = "1.0.43.0.20250203.154027"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/sly-1.0.43.0.20240809.211904.tar"; - sha256 = "1np4rciwcijr6bv13s5vvl95wl28ad60snr6wdbjh7ya922x37rv"; + url = "https://elpa.nongnu.org/nongnu-devel/sly-1.0.43.0.20250203.154027.tar"; + sha256 = "1w1h6zh5r1b2q1m01jbw92x5mdnq7g97g282899crqzfbirj4xds"; }; packageRequires = [ ]; meta = { @@ -4457,10 +4606,10 @@ elpaBuild { pname = "solarized-theme"; ename = "solarized-theme"; - version = "2.0.1.0.20240725.161711"; + version = "2.0.4.0.20250204.123251"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/solarized-theme-2.0.1.0.20240725.161711.tar"; - sha256 = "1d3m6h00awq2az6vkal631k9l1jpqm2qxr1067rzd1q2qdlaf2ji"; + url = "https://elpa.nongnu.org/nongnu-devel/solarized-theme-2.0.4.0.20250204.123251.tar"; + sha256 = "1vhzxz5nlx59kmxscf1jxwkb3bsjp0h0yk2dr777inyi5dqpi8gl"; }; packageRequires = [ ]; meta = { @@ -4847,10 +4996,10 @@ elpaBuild { pname = "tp"; ename = "tp"; - version = "0.6.0.20250103.142809"; + version = "0.7.0.20250206.81229"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/tp-0.6.0.20250103.142809.tar"; - sha256 = "19mrjhi7qxwxp1shqqvkpmj49kari9g74wym3v2k80586kj2j0cm"; + url = "https://elpa.nongnu.org/nongnu-devel/tp-0.7.0.20250206.81229.tar"; + sha256 = "14zhky7jf0afmsxrhkyvgzqh4k2yf1p829j77ryw741swj75z3av"; }; packageRequires = [ transient ]; meta = { @@ -4868,10 +5017,10 @@ elpaBuild { pname = "treesit-fold"; ename = "treesit-fold"; - version = "0.1.0.0.20240630.204821"; + version = "0.1.0.0.20250118.220609"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/treesit-fold-0.1.0.0.20240630.204821.tar"; - sha256 = "1h99gh11xhmzs7ix94y609sijdchz692ixkxxsmnxbrniybpfcsv"; + url = "https://elpa.nongnu.org/nongnu-devel/treesit-fold-0.1.0.0.20250118.220609.tar"; + sha256 = "02fr515bjn6l9pn54gqx3v1vp88fh5i0l03gaqfwja0kmfvyf9k1"; }; packageRequires = [ ]; meta = { @@ -5081,10 +5230,10 @@ elpaBuild { pname = "vm"; ename = "vm"; - version = "8.3.0snapshot0.20250130.63839"; + version = "8.3.0snapshot0.20250208.60553"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/vm-8.3.0snapshot0.20250130.63839.tar"; - sha256 = "1irvc02mr9ik4ib565sn3dwhxmihrlj3dz7bhgi16126gaai19j7"; + url = "https://elpa.nongnu.org/nongnu-devel/vm-8.3.0snapshot0.20250208.60553.tar"; + sha256 = "0d2m9q8zwpd2i0zvcmkasp59ihsymmqyg8c0a1wp72akffxh3if1"; }; packageRequires = [ cl-lib @@ -5326,10 +5475,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "26.9.20250124153828.0.20250124.154020"; + version = "26.9.20250205172500.0.20250205.172824"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-26.9.20250124153828.0.20250124.154020.tar"; - sha256 = "0mhpjml1zx8vha0grmaw9xx08sx5h5kh33sb1i0w00r4bpw56dzq"; + url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-26.9.20250205172500.0.20250205.172824.tar"; + sha256 = "0229g7p910515dysr0pv4cxgzk2nmcc4yx1f7vdz78qqppfv7qfa"; }; packageRequires = [ ]; meta = { From c1dc9af8778d7a250149dde8ac2449e3e8ee3ad8 Mon Sep 17 00:00:00 2001 From: Jacob Koziej Date: Sun, 9 Feb 2025 14:00:07 -0500 Subject: [PATCH 0267/1107] python3Packages.miss-hit-core: init at 0.9.44 --- .../python-modules/miss-hit-core/default.nix | 66 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 68 insertions(+) create mode 100644 pkgs/development/python-modules/miss-hit-core/default.nix diff --git a/pkgs/development/python-modules/miss-hit-core/default.nix b/pkgs/development/python-modules/miss-hit-core/default.nix new file mode 100644 index 000000000000..16791600d35b --- /dev/null +++ b/pkgs/development/python-modules/miss-hit-core/default.nix @@ -0,0 +1,66 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + pytestCheckHook, + coverage, + python, + setuptools, +}: + +buildPythonPackage rec { + pname = "miss-hit-core"; + version = "0.9.44"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "florianschanda"; + repo = "miss_hit"; + tag = version; + hash = "sha256-dJZIleDWmdarhmxoKvQxWvI/Tmx9pSCNlgFXj5NFIUc="; + }; + + build-system = [ setuptools ]; + + configurePhase = '' + runHook preConfigure + + cp setup_gpl.py setup.py + mkdir -p miss_hit_core/resources/assets + cp docs/style.css miss_hit_core/resources + cp docs/assets/* miss_hit_core/resources/assets + + runHook postConfigure + ''; + + nativeCheckInputs = [ + coverage + ]; + + checkPhase = '' + runHook preCheck + + cd tests + ${python.interpreter} ./run.py --suite=style + ${python.interpreter} ./run.py --suite=metrics + + runHook postCheck + ''; + + pythonImportsCheck = [ + "miss_hit_core" + ]; + + meta = { + description = "Code formatting and code metrics for programs written in the MATLAB/Simulink and Octave languages"; + homepage = "https://misshit.org/"; + changelog = "https://github.com/florianschanda/miss_hit/releases/tag/${version}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + jacobkoziej + ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ff3cd8bb7b51..5b77a3ae1d33 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8254,6 +8254,8 @@ self: super: with self; { misoc = callPackage ../development/python-modules/misoc { }; + miss-hit-core = callPackage ../development/python-modules/miss-hit-core { }; + mistletoe = callPackage ../development/python-modules/mistletoe { }; mistune = callPackage ../development/python-modules/mistune { }; From de86157b276b626504a661b4b30df7d7cd15a70b Mon Sep 17 00:00:00 2001 From: Jacob Koziej Date: Sun, 9 Feb 2025 14:01:01 -0500 Subject: [PATCH 0268/1107] python3Packages.miss-hit: init at 0.9.44 --- .../python-modules/miss-hit/default.nix | 67 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 69 insertions(+) create mode 100644 pkgs/development/python-modules/miss-hit/default.nix diff --git a/pkgs/development/python-modules/miss-hit/default.nix b/pkgs/development/python-modules/miss-hit/default.nix new file mode 100644 index 000000000000..9bd34bb606e8 --- /dev/null +++ b/pkgs/development/python-modules/miss-hit/default.nix @@ -0,0 +1,67 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + pytestCheckHook, + coverage, + miss-hit-core, + python, + setuptools, +}: + +buildPythonPackage rec { + pname = "miss-hit"; + version = "0.9.44"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "florianschanda"; + repo = "miss_hit"; + tag = version; + hash = "sha256-dJZIleDWmdarhmxoKvQxWvI/Tmx9pSCNlgFXj5NFIUc="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + miss-hit-core + ]; + + configurePhase = '' + runHook preConfigure + + cp setup_agpl.py setup.py + + runHook postConfigure + ''; + + nativeCheckInputs = [ + coverage + ]; + + checkPhase = '' + runHook preCheck + + cd tests + ${python.interpreter} ./run.py + + runHook postCheck + ''; + + pythonImportsCheck = [ + "miss_hit" + ]; + + meta = { + description = "Static analysis and other utilities for programs written in the MATLAB/Simulink and Octave languages"; + homepage = "https://misshit.org/"; + changelog = "https://github.com/florianschanda/miss_hit/releases/tag/${version}"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ + jacobkoziej + ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5b77a3ae1d33..e6063f70c8ee 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8254,6 +8254,8 @@ self: super: with self; { misoc = callPackage ../development/python-modules/misoc { }; + miss-hit = callPackage ../development/python-modules/miss-hit { }; + miss-hit-core = callPackage ../development/python-modules/miss-hit-core { }; mistletoe = callPackage ../development/python-modules/mistletoe { }; From 555cce646552384f2851128e77178c27b04c66ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Kurucz?= Date: Sun, 9 Feb 2025 20:11:18 +0100 Subject: [PATCH 0269/1107] fex: 2501 -> 2502 --- pkgs/by-name/fe/fex/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix index cc01318bfb1f..6aea2949863f 100644 --- a/pkgs/by-name/fe/fex/package.nix +++ b/pkgs/by-name/fe/fex/package.nix @@ -12,13 +12,13 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: rec { pname = "fex"; - version = "2501"; + version = "2502"; src = fetchFromGitHub { owner = "FEX-Emu"; repo = "FEX"; tag = "FEX-${version}"; - hash = "sha256-9YOKLck4LIhTiAz+aCkOR3Eo1v02GK/YTQ98MuBSihI="; + hash = "sha256-w+Kqk+IQsVNbOqYDTpxDeoPyeIgqX2IfZv9zqAJEMVc="; fetchSubmodules = true; }; From c84f2307832dcde0afc5a341facd0616cc4659de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 13:09:21 -0800 Subject: [PATCH 0270/1107] selenium-manager: disable telemetry --- .../se/selenium-manager/disable-telemetry.patch | 13 +++++++++++++ pkgs/by-name/se/selenium-manager/package.nix | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/se/selenium-manager/disable-telemetry.patch diff --git a/pkgs/by-name/se/selenium-manager/disable-telemetry.patch b/pkgs/by-name/se/selenium-manager/disable-telemetry.patch new file mode 100644 index 000000000000..0591c5b2d438 --- /dev/null +++ b/pkgs/by-name/se/selenium-manager/disable-telemetry.patch @@ -0,0 +1,13 @@ +diff --git a/rust/src/config.rs b/rust/src/config.rs +index f7cd4f32ec..ec454127be 100644 +--- a/rust/src/config.rs ++++ b/rust/src/config.rs +@@ -120,7 +120,7 @@ impl ManagerConfig { + avoid_browser_download: BooleanKey("avoid-browser-download", false).get_value(), + language_binding: StringKey(vec!["language-binding"], "").get_value(), + selenium_version: StringKey(vec!["selenium-version"], "").get_value(), +- avoid_stats: BooleanKey("avoid-stats", false).get_value(), ++ avoid_stats: BooleanKey("avoid-stats", true).get_value(), + skip_driver_in_path: BooleanKey("skip-driver-in-path", false).get_value(), + skip_browser_in_path: BooleanKey("skip-browser-in-path", false).get_value(), + } diff --git a/pkgs/by-name/se/selenium-manager/package.nix b/pkgs/by-name/se/selenium-manager/package.nix index 1b236e269b39..9b33ee7b7672 100644 --- a/pkgs/by-name/se/selenium-manager/package.nix +++ b/pkgs/by-name/se/selenium-manager/package.nix @@ -16,7 +16,13 @@ rustPlatform.buildRustPackage rec { hash = "sha256-b5xwuZ4lcwLbGhJuEmHYrFXoaTW/M0ABdK3dvbpj8oM="; }; - sourceRoot = "${src.name}/rust"; + patches = [ + ./disable-telemetry.patch + ]; + + postPatch = '' + cd rust + ''; useFetchCargoVendor = true; cargoHash = "sha256-hXtF3qFzzM2TqpEP9JWdi7uU5TgFHF9lZO5bmZcEuDk="; From b86432cf5fe4736af60ca9d21afe83f5c55e6a8c Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 9 Feb 2025 22:09:40 +0100 Subject: [PATCH 0271/1107] bpftools: fix build --- .../include-asm-types-for-ppc64le.patch | 13 ---------- pkgs/by-name/bp/bpftools/package.nix | 24 ------------------- 2 files changed, 37 deletions(-) delete mode 100644 pkgs/by-name/bp/bpftools/include-asm-types-for-ppc64le.patch diff --git a/pkgs/by-name/bp/bpftools/include-asm-types-for-ppc64le.patch b/pkgs/by-name/bp/bpftools/include-asm-types-for-ppc64le.patch deleted file mode 100644 index 47c8f8077a5a..000000000000 --- a/pkgs/by-name/bp/bpftools/include-asm-types-for-ppc64le.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tools/include/uapi/linux/types.h b/tools/include/uapi/linux/types.h -index 91fa51a9c31d..bfbd9b47277f 100644 ---- a/tools/include/uapi/linux/types.h -+++ b/tools/include/uapi/linux/types.h -@@ -2,7 +2,7 @@ - #ifndef _UAPI_LINUX_TYPES_H - #define _UAPI_LINUX_TYPES_H - --#include -+#include - - /* copied from linux:include/uapi/linux/types.h */ - #define __bitwise diff --git a/pkgs/by-name/bp/bpftools/package.nix b/pkgs/by-name/bp/bpftools/package.nix index 6c3badae4411..19841f776862 100644 --- a/pkgs/by-name/bp/bpftools/package.nix +++ b/pkgs/by-name/bp/bpftools/package.nix @@ -23,30 +23,6 @@ stdenv.mkDerivation rec { separateDebugInfo = true; - patches = [ - # fix unknown type name '__vector128' on ppc64le - ./include-asm-types-for-ppc64le.patch - # fix build for riscv64 - (fetchpatch { - # libbpf: Add missing per-arch include path - # https://patchwork.kernel.org/project/linux-riscv/patch/20240927131355.350918-1-bjorn@kernel.org/ - url = "https://patchwork.kernel.org/project/linux-riscv/patch/20240927131355.350918-1-bjorn@kernel.org/raw/"; - hash = "sha256-edXY/ejHW5L7rGgY5B2GmVZxUgnLdBadNhBOSAgcL7M="; - }) - (fetchpatch { - # selftests: bpf: Add missing per-arch include path - # https://patchwork.kernel.org/project/linux-riscv/patch/20240927131355.350918-2-bjorn@kernel.org/ - url = "https://patchwork.kernel.org/project/linux-riscv/patch/20240927131355.350918-2-bjorn@kernel.org/raw/"; - hash = "sha256-7yNWE/L/qd3vcLtJYoSyGxB3ytySlr20R0D3t5ni2Fc="; - }) - (fetchpatch { - # tools: Override makefile ARCH variable if defined, but empty - # https://patchwork.kernel.org/project/linux-riscv/patch/20241127101748.165693-1-bjorn@kernel.org/ - url = "https://patchwork.kernel.org/project/linux-riscv/patch/20241127101748.165693-1-bjorn@kernel.org/raw/"; - hash = "sha256-y8N71Hm1XfX9g3S6PzW2m7Lxp6wQQMfQE9L0QNt8cYY="; - }) - ]; - depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ python3 From a89d1312990957d86d8b1e0798eb95e29af21b4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Feb 2025 14:30:07 -0800 Subject: [PATCH 0272/1107] python313Packages.av: 13.1.0 -> 14.1.0 Diff: https://github.com/PyAV-Org/PyAV/compare/refs/tags/v13.1.0...v14.1.0 Changelog: https://github.com/PyAV-Org/PyAV/blob/v14.1.0/CHANGELOG.rst --- pkgs/development/python-modules/av/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index 3681904179e9..f123d3ccdd50 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "av"; - version = "13.1.0"; + version = "14.1.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "PyAV-Org"; repo = "PyAV"; tag = "v${version}"; - hash = "sha256-x2a9SC4uRplC6p0cD7fZcepFpRidbr6JJEEOaGSWl60="; + hash = "sha256-GYdt6KMMmDSyby447MbShL2GbrH8R1UuOeiVlztGuS4="; }; build-system = [ @@ -57,11 +57,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # av.error.InvalidDataError: [Errno 1094995529] Invalid data found when processing input: 'custom_io_output.mpd' - "test_writing_to_custom_io_dash" - ]; - # `__darwinAllowLocalNetworking` doesn’t work for these; not sure why. disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_timeout.py" @@ -78,7 +73,6 @@ buildPythonPackage rec { "av.datasets" "av.descriptor" "av.dictionary" - "av.enum" "av.error" "av.filter" "av.format" From 37372eb227a7324a1b03900d8776b013076d87dd Mon Sep 17 00:00:00 2001 From: Julien Langlois Date: Thu, 6 Feb 2025 01:40:10 -0500 Subject: [PATCH 0273/1107] nixos/postgresql/citus: fix syscall filter and add test --- .../modules/services/databases/postgresql.nix | 14 +++- nixos/tests/postgresql/citus.nix | 73 +++++++++++++++++++ nixos/tests/postgresql/default.nix | 1 + 3 files changed, 84 insertions(+), 4 deletions(-) create mode 100644 nixos/tests/postgresql/citus.nix diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 51d707c6594b..7963b4152fe6 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -727,10 +727,16 @@ in RestrictRealtime = true; RestrictSUIDSGID = true; SystemCallArchitectures = "native"; - SystemCallFilter = [ - "@system-service" - "~@privileged @resources" - ] ++ lib.optionals (any extensionInstalled [ "plv8" ]) [ "@pkey" ]; + SystemCallFilter = + [ + "@system-service" + "~@privileged @resources" + ] + ++ lib.optionals (any extensionInstalled [ "plv8" ]) [ "@pkey" ] + ++ lib.optionals (any extensionInstalled [ "citus" ]) [ + "getpriority" + "setpriority" + ]; UMask = if groupAccessAvailable then "0027" else "0077"; } (mkIf (cfg.dataDir != "/var/lib/postgresql/${cfg.package.psqlSchema}") { diff --git a/nixos/tests/postgresql/citus.nix b/nixos/tests/postgresql/citus.nix new file mode 100644 index 000000000000..6739b32d5642 --- /dev/null +++ b/nixos/tests/postgresql/citus.nix @@ -0,0 +1,73 @@ +{ + pkgs, + makeTest, + genTests, +}: + +let + inherit (pkgs) lib; + + test-sql = pkgs.writeText "postgresql-test" '' + CREATE EXTENSION citus; + + CREATE TABLE examples ( + id bigserial, + shard_key int, + PRIMARY KEY (id, shard_key) + ); + + SELECT create_distributed_table('examples', 'shard_key'); + + INSERT INTO examples (shard_key) SELECT shard % 10 FROM generate_series(1,1000) shard; + ''; + + makeTestFor = + package: + makeTest { + name = "citus-${package.name}"; + meta = with lib.maintainers; { + maintainers = [ typetetris ]; + }; + + nodes.machine = + { ... }: + { + services.postgresql = { + inherit package; + enable = true; + enableJIT = lib.hasInfix "-jit-" package.name; + extensions = + ps: with ps; [ + citus + ]; + settings = { + shared_preload_libraries = "citus"; + }; + }; + }; + + testScript = '' + def check_count(statement, lines): + return 'test $(sudo -u postgres psql postgres -tAc "{}") -eq {}'.format( + statement, lines + ) + + + machine.start() + machine.wait_for_unit("postgresql") + + with subtest("Postgresql with extension citus is available just after unit start"): + machine.succeed( + "sudo -u postgres psql -f ${test-sql}" + ) + + machine.succeed(check_count("SELECT count(*) FROM examples;", 1000)) + + machine.shutdown() + ''; + }; +in +genTests { + inherit makeTestFor; + filter = _: p: !p.pkgs.citus.meta.broken; +} diff --git a/nixos/tests/postgresql/default.nix b/nixos/tests/postgresql/default.nix index 91f7694208b1..474f54a17201 100644 --- a/nixos/tests/postgresql/default.nix +++ b/nixos/tests/postgresql/default.nix @@ -36,6 +36,7 @@ in # extensions anonymizer = importWithArgs ./anonymizer.nix; + citus = importWithArgs ./citus.nix; pgjwt = importWithArgs ./pgjwt.nix; pgvecto-rs = importWithArgs ./pgvecto-rs.nix; timescaledb = importWithArgs ./timescaledb.nix; From d2551f49bfa403f81ce6e9c3c1a1b3a74f65460c Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 9 Feb 2025 22:09:40 +0100 Subject: [PATCH 0274/1107] bpftools: fix build --- .../include-asm-types-for-ppc64le.patch | 13 ---------- pkgs/by-name/bp/bpftools/package.nix | 24 ------------------- 2 files changed, 37 deletions(-) delete mode 100644 pkgs/by-name/bp/bpftools/include-asm-types-for-ppc64le.patch diff --git a/pkgs/by-name/bp/bpftools/include-asm-types-for-ppc64le.patch b/pkgs/by-name/bp/bpftools/include-asm-types-for-ppc64le.patch deleted file mode 100644 index 47c8f8077a5a..000000000000 --- a/pkgs/by-name/bp/bpftools/include-asm-types-for-ppc64le.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tools/include/uapi/linux/types.h b/tools/include/uapi/linux/types.h -index 91fa51a9c31d..bfbd9b47277f 100644 ---- a/tools/include/uapi/linux/types.h -+++ b/tools/include/uapi/linux/types.h -@@ -2,7 +2,7 @@ - #ifndef _UAPI_LINUX_TYPES_H - #define _UAPI_LINUX_TYPES_H - --#include -+#include - - /* copied from linux:include/uapi/linux/types.h */ - #define __bitwise diff --git a/pkgs/by-name/bp/bpftools/package.nix b/pkgs/by-name/bp/bpftools/package.nix index 6c3badae4411..19841f776862 100644 --- a/pkgs/by-name/bp/bpftools/package.nix +++ b/pkgs/by-name/bp/bpftools/package.nix @@ -23,30 +23,6 @@ stdenv.mkDerivation rec { separateDebugInfo = true; - patches = [ - # fix unknown type name '__vector128' on ppc64le - ./include-asm-types-for-ppc64le.patch - # fix build for riscv64 - (fetchpatch { - # libbpf: Add missing per-arch include path - # https://patchwork.kernel.org/project/linux-riscv/patch/20240927131355.350918-1-bjorn@kernel.org/ - url = "https://patchwork.kernel.org/project/linux-riscv/patch/20240927131355.350918-1-bjorn@kernel.org/raw/"; - hash = "sha256-edXY/ejHW5L7rGgY5B2GmVZxUgnLdBadNhBOSAgcL7M="; - }) - (fetchpatch { - # selftests: bpf: Add missing per-arch include path - # https://patchwork.kernel.org/project/linux-riscv/patch/20240927131355.350918-2-bjorn@kernel.org/ - url = "https://patchwork.kernel.org/project/linux-riscv/patch/20240927131355.350918-2-bjorn@kernel.org/raw/"; - hash = "sha256-7yNWE/L/qd3vcLtJYoSyGxB3ytySlr20R0D3t5ni2Fc="; - }) - (fetchpatch { - # tools: Override makefile ARCH variable if defined, but empty - # https://patchwork.kernel.org/project/linux-riscv/patch/20241127101748.165693-1-bjorn@kernel.org/ - url = "https://patchwork.kernel.org/project/linux-riscv/patch/20241127101748.165693-1-bjorn@kernel.org/raw/"; - hash = "sha256-y8N71Hm1XfX9g3S6PzW2m7Lxp6wQQMfQE9L0QNt8cYY="; - }) - ]; - depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ python3 From fe5312cd441714a518c3585297ba0f1915e899b8 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 10 Feb 2025 12:44:59 +0800 Subject: [PATCH 0275/1107] emacsPackages.dap-mode: fix build https://hydra.nix-community.org/build/2991612 --- .../emacs/elisp-packages/melpa-packages.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 9cd779140cb1..0428b95f013e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -981,14 +981,19 @@ let cssh = ignoreCompilationError super.cssh; # elisp error - dap-mode = super.dap-mode.overrideAttrs (old: { - # empty file causing native-compiler-error-empty-byte - preBuild = - '' - rm --verbose dapui.el - '' - + old.preBuild or ""; - }); + dap-mode = super.dap-mode.overrideAttrs ( + finalAttrs: previousAttrs: { + # empty file causing native-compiler-error-empty-byte + preBuild = + if lib.versionOlder finalAttrs.version "20250131.1624" then + '' + rm --verbose dapui.el + '' + + previousAttrs.preBuild or "" + else + previousAttrs.preBuild or null; + } + ); db-pg = ignoreCompilationError super.db-pg; # elisp error From ffb911e9c23d6443bd1a9969b11599e89b283371 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 10 Feb 2025 13:12:50 +0800 Subject: [PATCH 0276/1107] emacsPackages.magit-delta: fix build https://hydra.nix-community.org/build/3134403 --- .../editors/emacs/elisp-packages/melpa-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 0428b95f013e..62f476dc5440 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -447,7 +447,8 @@ let magit-circleci = buildWithGit super.magit-circleci; - magit-delta = buildWithGit super.magit-delta; + # https://github.com/dandavison/magit-delta/issues/30 + magit-delta = addPackageRequires (buildWithGit super.magit-delta) [ self.dash ]; orgit = buildWithGit super.orgit; From 88dd549f57bb0dc79c67ee11948904bfc48ca750 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 08:41:19 +0300 Subject: [PATCH 0277/1107] util-linux: don't build lastlog2 on Darwin It doesn't build, and it uses PAM, which doesn't work properly on Darwin to begin with. --- pkgs/by-name/ut/util-linux/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix index 47975dc5c38d..5917e2909be5 100644 --- a/pkgs/by-name/ut/util-linux/package.nix +++ b/pkgs/by-name/ut/util-linux/package.nix @@ -101,6 +101,10 @@ stdenv.mkDerivation rec { "--disable-nls" "--disable-ipcrm" "--disable-ipcs" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Doesn't build on Darwin, also doesn't really make sense on Darwin + "--disable-liblastlog2" ]; makeFlags = [ From 3cb939f7350ffff9ef0e67eb99fde224a4d49912 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 08:42:15 +0300 Subject: [PATCH 0278/1107] util-linux: declare whether we have col See https://github.com/util-linux/util-linux/commit/8886d84e25a457702b45194d69a47313f76dc6bc --- pkgs/by-name/ut/util-linux/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix index 5917e2909be5..076c9316c158 100644 --- a/pkgs/by-name/ut/util-linux/package.nix +++ b/pkgs/by-name/ut/util-linux/package.nix @@ -168,6 +168,10 @@ stdenv.mkDerivation rec { rev-prefix = "v"; ignoredVersions = "(-rc).*"; }; + + # encode upstream assumption to be used in man-db + # https://github.com/util-linux/util-linux/commit/8886d84e25a457702b45194d69a47313f76dc6bc + hasCol = stdenv.hostPlatform.libc == "glibc"; }; meta = with lib; { From e1e171fde85913f7b3850b0bb7327b24bf48574b Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 08:43:02 +0300 Subject: [PATCH 0279/1107] man-db: only build --with-col if we have col --- pkgs/by-name/ma/man-db/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ma/man-db/package.nix b/pkgs/by-name/ma/man-db/package.nix index 29be3e9e87bf..d8d645113287 100644 --- a/pkgs/by-name/ma/man-db/package.nix +++ b/pkgs/by-name/ma/man-db/package.nix @@ -75,6 +75,8 @@ stdenv.mkDerivation rec { "--with-systemdtmpfilesdir=${placeholder "out"}/lib/tmpfiles.d" "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" "--with-pager=less" + ] + ++ lib.optionals util-linuxMinimal.hasCol [ "--with-col=${util-linuxMinimal}/bin/col" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ From 9f2a89f948f19c473c23d8ec358087a9e51f67d8 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 08:57:27 +0300 Subject: [PATCH 0280/1107] buildPerlPackage: export some things harder Those may be used by the later stages of the build. Co-authored-by: Tristan Ross --- pkgs/development/perl-modules/generic/builder.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh index c95b5cbb7d54..97d0bbcce7ac 100644 --- a/pkgs/development/perl-modules/generic/builder.sh +++ b/pkgs/development/perl-modules/generic/builder.sh @@ -23,7 +23,12 @@ preConfigure() { local flagsArray=() concatTo flagsArray makeMakerFlags - perl Makefile.PL AR=$AR FULL_AR=$AR CC=$CC LD=$CC CPPRUN="$CC -E" \ + # Perl expect these to be exported + export CPPRUN="$CC -E" + export FULL_AR=$AR + # Requires to be $CC since it tries adding "-Wl" + export LD=$CC + perl Makefile.PL AR="$AR" FULL_AR="$AR" CC="$CC" LD="$CC" CPPRUN="$CPPRUN" \ PREFIX=$out INSTALLDIRS=site "${flagsArray[@]}" \ PERL=$(type -P perl) FULLPERL=\"$fullperl/bin/perl\" } From a0bec4edc7512d89127f41114d5e6bbe5689e720 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 10 Feb 2025 08:55:23 +0100 Subject: [PATCH 0281/1107] spdlog: format --- pkgs/by-name/sp/spdlog/package.nix | 43 +++++++++++++++++------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/sp/spdlog/package.nix b/pkgs/by-name/sp/spdlog/package.nix index da33fbf60333..08e906ca66ef 100644 --- a/pkgs/by-name/sp/spdlog/package.nix +++ b/pkgs/by-name/sp/spdlog/package.nix @@ -1,14 +1,15 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, fmt -, catch2_3 -, staticBuild ? stdenv.hostPlatform.isStatic +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + fmt, + catch2_3, + staticBuild ? stdenv.hostPlatform.isStatic, -# tests -, bear -, tiledb + # tests + bear, + tiledb, }: stdenv.mkDerivation rec { @@ -17,9 +18,9 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "gabime"; - repo = "spdlog"; - rev = "v${version}"; - hash = "sha256-4QZVCounDbtkP+58fejHGWjquWT3b03b9TNGs45dN7c="; + repo = "spdlog"; + rev = "v${version}"; + hash = "sha256-HCpnN28qWreg0NvL6Q9pfSSxOTHgV6glHt6P0FbH/Cw="; }; nativeBuildInputs = [ cmake ]; @@ -36,7 +37,11 @@ stdenv.mkDerivation rec { "-DSPDLOG_FMT_EXTERNAL=ON" ]; - outputs = [ "out" "doc" "dev" ] ; + outputs = [ + "out" + "doc" + "dev" + ]; postInstall = '' mkdir -p $out/share/doc/spdlog @@ -55,10 +60,10 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "Very fast, header only, C++ logging library"; - homepage = "https://github.com/gabime/spdlog"; - license = licenses.mit; - maintainers = with maintainers; [ obadz ]; - platforms = platforms.all; + description = "Very fast, header only, C++ logging library"; + homepage = "https://github.com/gabime/spdlog"; + license = licenses.mit; + maintainers = with maintainers; [ obadz ]; + platforms = platforms.all; }; } From 9f60b06f5e7e27870c1bf75538ac9fdb8bebc31c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 10 Feb 2025 08:57:17 +0100 Subject: [PATCH 0282/1107] spdlog: 1.15.0 -> 1.15.1 Diff: https://github.com/gabime/spdlog/compare/refs/tags/v1.15.0...v1.15.1 Changelog: https://github.com/gabime/spdlog/releases/tag/v1.15.1 --- pkgs/by-name/sp/spdlog/package.nix | 39 +++++++++++++++++------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/sp/spdlog/package.nix b/pkgs/by-name/sp/spdlog/package.nix index 08e906ca66ef..8ed1455206c4 100644 --- a/pkgs/by-name/sp/spdlog/package.nix +++ b/pkgs/by-name/sp/spdlog/package.nix @@ -7,20 +7,21 @@ catch2_3, staticBuild ? stdenv.hostPlatform.isStatic, - # tests + # passthru bear, tiledb, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "spdlog"; version = "1.15.1"; src = fetchFromGitHub { owner = "gabime"; repo = "spdlog"; - rev = "v${version}"; - hash = "sha256-HCpnN28qWreg0NvL6Q9pfSSxOTHgV6glHt6P0FbH/Cw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-4QZVCounDbtkP+58fejHGWjquWT3b03b9TNGs45dN7c="; }; nativeBuildInputs = [ cmake ]; @@ -29,12 +30,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ fmt ]; cmakeFlags = [ - "-DSPDLOG_BUILD_SHARED=${if staticBuild then "OFF" else "ON"}" - "-DSPDLOG_BUILD_STATIC=${if staticBuild then "ON" else "OFF"}" - "-DSPDLOG_BUILD_EXAMPLE=OFF" - "-DSPDLOG_BUILD_BENCH=OFF" - "-DSPDLOG_BUILD_TESTS=ON" - "-DSPDLOG_FMT_EXTERNAL=ON" + (lib.cmakeBool "SPDLOG_BUILD_SHARED" (!staticBuild)) + (lib.cmakeBool "SPDLOG_BUILD_STATIC" staticBuild) + (lib.cmakeBool "SPDLOG_BUILD_EXAMPLE" false) + (lib.cmakeBool "SPDLOG_BUILD_BENCH" false) + (lib.cmakeBool "SPDLOG_BUILD_TESTS" true) + (lib.cmakeBool "SPDLOG_FMT_EXTERNAL" true) ]; outputs = [ @@ -55,15 +56,19 @@ stdenv.mkDerivation rec { doCheck = true; - passthru.tests = { - inherit bear tiledb; + passthru = { + tests = { + inherit bear tiledb; + }; + updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Very fast, header only, C++ logging library"; homepage = "https://github.com/gabime/spdlog"; - license = licenses.mit; - maintainers = with maintainers; [ obadz ]; - platforms = platforms.all; + changelog = "https://github.com/gabime/spdlog/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ obadz ]; + platforms = lib.platforms.all; }; -} +}) From 7055614287697179b024e94f7199b834cddab54f Mon Sep 17 00:00:00 2001 From: misilelaboratory Date: Mon, 10 Feb 2025 18:18:13 +0900 Subject: [PATCH 0283/1107] temurin-bin: minor updates Signed-off-by: misilelaboratory --- .../compilers/temurin-bin/sources.json | 612 +++++++++--------- 1 file changed, 306 insertions(+), 306 deletions(-) diff --git a/pkgs/development/compilers/temurin-bin/sources.json b/pkgs/development/compilers/temurin-bin/sources.json index 225c244e3cfc..ab1757d9dc8d 100644 --- a/pkgs/development/compilers/temurin-bin/sources.json +++ b/pkgs/development/compilers/temurin-bin/sources.json @@ -6,52 +6,52 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "0a431310ccccc36c85b1274b5d31e368fdc8cf62cb7c2ed98d7b59eb5a13dc82", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.25_9.tar.gz", - "version": "11.0.25" + "build": "4", + "sha256": "2e1f667395cdb1e872bd7320e3eda96c0f0978e29e574e75f9cdf61160e8974a", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.26_4.tar.gz", + "version": "11.0.26" } }, "openjdk17": { "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "67632ee4563e9827b56f62ab6da95bce200d9e82092b211988c0d2113abc4071", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "259c85e16f7bbfdfb3e0a2ec1c5d6e2063300d413422286583265a9d8a882358", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" } }, "openjdk21": { "aarch64": { - "build": "11", - "sha256": "f22e32b869dd0e5e3f248646f62bffaa307b360299488ac8764e622923d7e747", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.5_11.tar.gz", - "version": "21.0.5" + "build": "7", + "sha256": "2798990401d9c47eaeddb7d5148f577770e4c1013b9223290a43765463204ae4", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.6_7.tar.gz", + "version": "21.0.6" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "8da7da49101d45f646272616f20e8b10d57472bbf5961d64ffb07d7ba93c6909", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.5_11.tar.gz", - "version": "21.0.5" + "build": "7", + "sha256": "6c66470a9143ad562570a34c1583d9fa50bf904f6f9ced642e9d800ce043a0f3", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.6_7.tar.gz", + "version": "21.0.6" } }, "openjdk23": { "aarch64": { - "build": "11", - "sha256": "ebdd6602d27bd7535bf06f21e8a0c3d563be7b790a90bef00cb6ac4123c66f86", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_aarch64_alpine-linux_hotspot_23.0.1_11.tar.gz", - "version": "23.0.1" + "build": "7", + "sha256": "b55c5c881a2fed17ec5a59feaa33d9263703b399d1bfae3a5eaed3f140aa4570", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_aarch64_alpine-linux_hotspot_23.0.2_7.tar.gz", + "version": "23.0.2" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "4c37a9e885c4e099b049c3ba9baa073de1525e28cd5ffca016c5c5bd7ed385a6", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_x64_alpine-linux_hotspot_23.0.1_11.tar.gz", - "version": "23.0.1" + "build": "7", + "sha256": "2c05c6dfea23a83fdbfaf5b03cc3cfd8d998c8069e930e0e585a39d4a99f3d99", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_x64_alpine-linux_hotspot_23.0.2_7.tar.gz", + "version": "23.0.2" } }, "openjdk8": { @@ -59,9 +59,9 @@ "vmType": "hotspot", "x86_64": { "build": "6", - "sha256": "86071bc98901cae80c62745a64bb4486212985fe5b66b5aec36ce92e8a036a9d", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u432b06.tar.gz", - "version": "8.0.432" + "sha256": "9fcb96380b25c1d1caec65b7606c387716a7ae51caf359f5f3ff0dcca40f231f", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u442b06.tar.gz", + "version": "8.0.442" } } }, @@ -70,52 +70,52 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "905e35f14228904d67a7a56f9f0b8ede58e9b15f9af3a3d54fb86f78c8e47a34", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.25_9.tar.gz", - "version": "11.0.25" + "build": "4", + "sha256": "69031fc68d41189691dbeca73447ca543040d26995f61cef83fd7aed8fb4dbd2", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.26_4.tar.gz", + "version": "11.0.26" } }, "openjdk17": { "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "7a2df4e2f86eca649af1e17d990ab8e354cb6dee389606025b9d05f75623c388", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "9dcc53a30676692e604571a6e0bd13ac0c1b15f4bc2b78d19f88bd316075f84a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" } }, "openjdk21": { "aarch64": { - "build": "11", - "sha256": "12b988a3d934e3eb89c6a981a93f8e2adf0a62cc9030487dee76c0c29b93714d", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_aarch64_alpine-linux_hotspot_21.0.5_11.tar.gz", - "version": "21.0.5" + "build": "7", + "sha256": "bcd459e70cdddaa6ada0d855ce944c592814042f1e12d53aa08fa89eedcdf893", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_aarch64_alpine-linux_hotspot_21.0.6_7.tar.gz", + "version": "21.0.6" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "2dfa33fb8e9474e6967c6cf17964abb5ddce9c17fa6a9f8d7aa221a0ae295df9", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_x64_alpine-linux_hotspot_21.0.5_11.tar.gz", - "version": "21.0.5" + "build": "7", + "sha256": "2330f38feb59ab7af0e2fffc12d5500005d35f7f53f49dd8a9f9aa1ae68aee5f", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_x64_alpine-linux_hotspot_21.0.6_7.tar.gz", + "version": "21.0.6" } }, "openjdk23": { "aarch64": { - "build": "11", - "sha256": "b56eaedc094cb9107be2d5be9ad34c3dd9492c45aa671d102b5829a488cfc744", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_aarch64_alpine-linux_hotspot_23.0.1_11.tar.gz", - "version": "23.0.1" + "build": "7", + "sha256": "248a2ffb3abcb0cee7841ce648af7af415c96ee88cba4f8bf676c0115d38de5e", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_aarch64_alpine-linux_hotspot_23.0.2_7.tar.gz", + "version": "23.0.2" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "38a1b20b5ee8869b20e9f9aefdc91eedf245584d35287842a66540f0745dd3d0", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_x64_alpine-linux_hotspot_23.0.1_11.tar.gz", - "version": "23.0.1" + "build": "7", + "sha256": "4513750bd10cc6c38f0c19d335dac7dcc112bba64e52010f81ba29e7a71e2a76", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_x64_alpine-linux_hotspot_23.0.2_7.tar.gz", + "version": "23.0.2" } }, "openjdk8": { @@ -123,9 +123,9 @@ "vmType": "hotspot", "x86_64": { "build": "6", - "sha256": "7f7c265560dd5a42533bf282831d7d2f044a7ff7f4c310b40a0f9f8e19ff12e5", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u432b06.tar.gz", - "version": "8.0.432" + "sha256": "4fb0636534b0cd4534a3cdcbbe7cf2e937523d6376d9cef00cc6cfd5d19537e8", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u442b06.tar.gz", + "version": "8.0.442" } } } @@ -134,332 +134,332 @@ "jdk": { "openjdk11": { "aarch64": { - "build": "9", - "sha256": "f2087cc3abdd509b74facf8e43e81e36244d14c70dec080b8f3a662695417ca7", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.25_9.tar.gz", - "version": "11.0.25" + "build": "4", + "sha256": "e7b3d37c347fe7af2a53711f16da8b9b164748ce4a84e47bb0739c3be7f1c421", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.26_4.tar.gz", + "version": "11.0.26" }, "armv6l": { - "build": "9", - "sha256": "6bdd7da08c9f8fedded8da0411b6566c16cb9a904d164b68a0b7f11c8376673a", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.25_9.tar.gz", - "version": "11.0.25" + "build": "4", + "sha256": "79d574328f6960d40349996ef8c5949581f9e533dc76f134857c4125c78558ff", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_arm_linux_hotspot_11.0.26_4.tar.gz", + "version": "11.0.26" }, "armv7l": { - "build": "9", - "sha256": "6bdd7da08c9f8fedded8da0411b6566c16cb9a904d164b68a0b7f11c8376673a", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.25_9.tar.gz", - "version": "11.0.25" + "build": "4", + "sha256": "79d574328f6960d40349996ef8c5949581f9e533dc76f134857c4125c78558ff", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_arm_linux_hotspot_11.0.26_4.tar.gz", + "version": "11.0.26" }, "packageType": "jdk", "powerpc64le": { - "build": "9", - "sha256": "0014ffdae26d2b8f840b4842e3f9d4edc3576b4a961770708273d8ecc86ba5b6", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.25_9.tar.gz", - "version": "11.0.25" + "build": "4", + "sha256": "42c63651125a149cee2ba781300d75ffa67a25032f95038d50ee6d6177cb2e41", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.26_4.tar.gz", + "version": "11.0.26" }, "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "191baa2e052627614022171400a917d28f0987dc54da48aaf07b06f552bb9884", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.25_9.tar.gz", - "version": "11.0.25" + "build": "4", + "sha256": "7def4c5807b38ef1a7bb30a86572a795ca604127cc8d1f5b370abf23618104e6", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_x64_linux_hotspot_11.0.26_4.tar.gz", + "version": "11.0.26" } }, "openjdk17": { "aarch64": { - "build": "11", - "sha256": "0c17fa4f14c0d2cc9e9334f996fccdddc5da4459d768f3105c7ff0283c47bf62", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "62efc3e83fc9bcd08db7c4f02977328cb3559a54519078d8337314cf025d19b7", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" }, "armv6l": { - "build": "11", - "sha256": "e69d43be937e05dbccae4cc98f732ed86aa11993234bf5ad6e81c30475a78ce7", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_arm_linux_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "f43986385403c0f08bd3512c9d11a51c49044a7c8a0a39cf4e2e3731ca0db229", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" }, "armv7l": { - "build": "11", - "sha256": "e69d43be937e05dbccae4cc98f732ed86aa11993234bf5ad6e81c30475a78ce7", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_arm_linux_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "f43986385403c0f08bd3512c9d11a51c49044a7c8a0a39cf4e2e3731ca0db229", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" }, "packageType": "jdk", "powerpc64le": { - "build": "11", - "sha256": "d4e553c6fa7afdfe2577420c6e77a558db8113a3cef84e755384148f5610834e", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "f4cb9ee5906a44d110fa381310cd7181d95498d27087d449e7e9b74bddd9def2", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" }, "riscv64": { - "build": "11", - "sha256": "e7c82833a7381a05cae2be0e947c08e971bbae4f2e4142c6ec87bbd7530a5646", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_riscv64_linux_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "d7ba818b1417b67f1f3cdcf7c5fac5e179998469dce7448349f24175eb9b2871", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_riscv64_linux_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" }, "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "8682892fc02965930b9022c066fa164dd6f458ef4a5dc262016aa28333b30f49", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_x64_linux_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "a3af83983fb94dd7d11b13ba2dba0fb6819dc2caaf87e6937afd22ad4680ae9a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" } }, "openjdk21": { "aarch64": { - "build": "11", - "sha256": "6482639ed9fd22aa2e704cc366848b1b3e1586d2bf1213869c43e80bca58fe5c", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.5_11.tar.gz", - "version": "21.0.5" + "build": "7", + "sha256": "04fe1273f624187d927f1b466e8cdb630d70786db07bee7599bfa5153060afd3", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.6_7.tar.gz", + "version": "21.0.6" }, "packageType": "jdk", "powerpc64le": { - "build": "11", - "sha256": "3c6f4c358facfb6c19d90faf02bfe0fc7512d6b0e80ac18146bbd7e0d01deeef", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.5_11.tar.gz", - "version": "21.0.5" + "build": "7", + "sha256": "163724b70b86d5a8461f85092165a9cc5a098ed900fee90d1b0c0be9607ae3d2", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.6_7.tar.gz", + "version": "21.0.6" }, "riscv64": { - "build": "11", - "sha256": "2f1b3e401e36de803398dfb9818861f9f14ca8ae7db650ea0946ab048fefe3b9", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.5_11.tar.gz", - "version": "21.0.5" + "build": "7", + "sha256": "203796e4ba2689aa921b5e0cdc9e02984d88622f80fcb9acb05a118b05007be8", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.6_7.tar.gz", + "version": "21.0.6" }, "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "3c654d98404c073b8a7e66bffb27f4ae3e7ede47d13284c132d40a83144bfd8c", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_x64_linux_hotspot_21.0.5_11.tar.gz", - "version": "21.0.5" + "build": "7", + "sha256": "a2650fba422283fbed20d936ce5d2a52906a5414ec17b2f7676dddb87201dbae", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_x64_linux_hotspot_21.0.6_7.tar.gz", + "version": "21.0.6" } }, "openjdk23": { "aarch64": { - "build": "11", - "sha256": "808e3843293e50515bf02ad2f956e543da65e32dac82ae7a266a147b3485c61a", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_aarch64_linux_hotspot_23.0.1_11.tar.gz", - "version": "23.0.1" + "build": "7", + "sha256": "fb43ae1202402842559cb6223886ec1663b90ffbec48479abbcb92c92c9012eb", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_aarch64_linux_hotspot_23.0.2_7.tar.gz", + "version": "23.0.2" }, "packageType": "jdk", "powerpc64le": { - "build": "11", - "sha256": "1885ab141fe7b8ed6beb77b814b1c1c99fd54713399bf917edb6a4020545adde", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_ppc64le_linux_hotspot_23.0.1_11.tar.gz", - "version": "23.0.1" + "build": "7", + "sha256": "548fd82af4eb0802fe20b0b61a4664a69c7f03cd963540908f30dbf73636dafe", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_ppc64le_linux_hotspot_23.0.2_7.tar.gz", + "version": "23.0.2" }, "riscv64": { - "build": "11", - "sha256": "80d7bab9f9614bdf934c6bc441031bd1fead3aea85f16770123bd8a6bcdc52b6", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_riscv64_linux_hotspot_23.0.1_11.tar.gz", - "version": "23.0.1" + "build": "7", + "sha256": "1e102e1e6653f8810ef6c275b0d38ea7036abd4a8709f0f916b339f65e76bb56", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_riscv64_linux_hotspot_23.0.2_7.tar.gz", + "version": "23.0.2" }, "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "2400267e4e9c0f6ae880a4d763af6caf18c673714bdee5debf8388b0b5d52886", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_x64_linux_hotspot_23.0.1_11.tar.gz", - "version": "23.0.1" + "build": "7", + "sha256": "870ac8c05c6fe563e7a3878a47d0234b83c050e83651d2c47e8b822ec74512dd", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_x64_linux_hotspot_23.0.2_7.tar.gz", + "version": "23.0.2" } }, "openjdk8": { "aarch64": { "build": "6", - "sha256": "383caabc20428e9500f2e07965317ed4387a0e336104483e29a9e06eeffbf26b", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_aarch64_linux_hotspot_8u432b06.tar.gz", - "version": "8.0.432" + "sha256": "1d1662bd8ca7edc9281c723d9eebafea940e6a41464bdc43a83b564bc974c7e5", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_aarch64_linux_hotspot_8u442b06.tar.gz", + "version": "8.0.442" }, "armv6l": { "build": "6", - "sha256": "ff1ce3f6f1cf11987ab63f278b29cf1aae799652606c547f8a590e7acbd16b61", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_arm_linux_hotspot_8u432b06.tar.gz", - "version": "8.0.432" + "sha256": "c555750ee41799d30553bd9744c1ab9b8e6b2a2ea83195619a11ef30cc4154f4", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_arm_linux_hotspot_8u442b06.tar.gz", + "version": "8.0.442" }, "armv7l": { "build": "6", - "sha256": "ff1ce3f6f1cf11987ab63f278b29cf1aae799652606c547f8a590e7acbd16b61", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_arm_linux_hotspot_8u432b06.tar.gz", - "version": "8.0.432" + "sha256": "c555750ee41799d30553bd9744c1ab9b8e6b2a2ea83195619a11ef30cc4154f4", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_arm_linux_hotspot_8u442b06.tar.gz", + "version": "8.0.442" }, "packageType": "jdk", "powerpc64le": { "build": "6", - "sha256": "64fb17e83b79f9ad41dc18351a408bfe90324fd6360903ca5c0a740006c81be3", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u432b06.tar.gz", - "version": "8.0.432" + "sha256": "7eac77deb8fc6c6130f9445c9a68af0bcc40bf6736b5672ef5c3d737c025e84d", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u442b06.tar.gz", + "version": "8.0.442" }, "vmType": "hotspot", "x86_64": { "build": "6", - "sha256": "abaaa90deadf51bd28921453baf2992b3dff6171bb7142f5bdd14ef269f7b245", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_x64_linux_hotspot_8u432b06.tar.gz", - "version": "8.0.432" + "sha256": "5b0a0145e7790552a9c8767b4680074c4628ec276e5bb278b61d85cf90facafa", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_x64_linux_hotspot_8u442b06.tar.gz", + "version": "8.0.442" } } }, "jre": { "openjdk11": { "aarch64": { - "build": "9", - "sha256": "e37ba6636e31f3c9191ac7e3fd0ab7fb354a2f3b320d68bfb95efd1e053134c9", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.25_9.tar.gz", - "version": "11.0.25" + "build": "4", + "sha256": "4ececb5c229763107e9e4acf3b7035db38cf18a98a47176fa5ed1be3f3d15518", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.26_4.tar.gz", + "version": "11.0.26" }, "armv6l": { - "build": "9", - "sha256": "6b7b1297da762cf2b1eb4834073e6a45cda82a359efb17a89eba3fc6b59b4d26", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.25_9.tar.gz", - "version": "11.0.25" + "build": "4", + "sha256": "e4a00a3ea318a63ba97236633f34c8a5477f6cdb643cf6883788840818110f5f", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_arm_linux_hotspot_11.0.26_4.tar.gz", + "version": "11.0.26" }, "armv7l": { - "build": "9", - "sha256": "6b7b1297da762cf2b1eb4834073e6a45cda82a359efb17a89eba3fc6b59b4d26", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.25_9.tar.gz", - "version": "11.0.25" + "build": "4", + "sha256": "e4a00a3ea318a63ba97236633f34c8a5477f6cdb643cf6883788840818110f5f", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_arm_linux_hotspot_11.0.26_4.tar.gz", + "version": "11.0.26" }, "packageType": "jre", "powerpc64le": { - "build": "9", - "sha256": "7e7edaf34c29c304514d60f40f6c9ce58eb3e32b0dec20bb6ccd1cfbb4456698", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.25_9.tar.gz", - "version": "11.0.25" + "build": "4", + "sha256": "69b38f0dde128d8c606012335cd60f1f55afa09b4135582188943bee699ebf03", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.26_4.tar.gz", + "version": "11.0.26" }, "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "84cd7101f39172a4db085fb52940595bb14dad6bc3afb5bf82ee497eceaf86d3", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.25_9.tar.gz", - "version": "11.0.25" + "build": "4", + "sha256": "d26c566a7010d1303d3979b6f076e7911b49419a609c9e4d81f27262bf47f87c", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_x64_linux_hotspot_11.0.26_4.tar.gz", + "version": "11.0.26" } }, "openjdk17": { "aarch64": { - "build": "11", - "sha256": "97c4fb748eaa1292fb2f28fec90a3eba23e35974ef67f8b3aa304ad4db2ba162", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "bab3f352fc7144ac1435924f056872d16f4b32c8bcda58b9a77b636eb1c664f4", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" }, "armv6l": { - "build": "11", - "sha256": "f9c4008680db016c9cab26cc2739d4553898911522f6a78a611fafa1f5270c88", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_arm_linux_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "7ac439bce4d5ecddb250b31401b1c1a6da2762f51652eafedd53584a0d9e3130", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" }, "armv7l": { - "build": "11", - "sha256": "f9c4008680db016c9cab26cc2739d4553898911522f6a78a611fafa1f5270c88", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_arm_linux_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "7ac439bce4d5ecddb250b31401b1c1a6da2762f51652eafedd53584a0d9e3130", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" }, "packageType": "jre", "powerpc64le": { - "build": "11", - "sha256": "790f53fcc95cc76ed8f27d3146cf789fc354a2afb7148cffd197ca61a643212f", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "2a730e9d34cce4d588739b626a034ed68c065a2db61048ee7886be48ec9fe460", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" }, "riscv64": { - "build": "11", - "sha256": "f6f3e71e5452b764aad47e6ffa4f0b26fcfe69bd9eb07fbd468343f9dd5f17b5", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_riscv64_linux_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "2f77e44aa9fec9cf35b0b1fd492055e7fec0a3ea4d4338def6b42bd46d485e02", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_riscv64_linux_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" }, "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "4086cc7cb2d9e7810141f255063caad10a8a018db5e6b47fa5394c506ab65bff", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_x64_linux_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "a4b0015872758aac6a5d17139e952a3951ee536ae6d9a99828823a80a71add56", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_x64_linux_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" } }, "openjdk21": { "aarch64": { - "build": "11", - "sha256": "e4d02c33aeaf8e1148c1c505e129a709c5bc1889e855d4fb4f001b1780db42b4", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.5_11.tar.gz", - "version": "21.0.5" + "build": "7", + "sha256": "f1b78f2bd6d505d5e0539261737740ad11ade3233376b4ca52e6c72fbefd2bf6", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.6_7.tar.gz", + "version": "21.0.6" }, "packageType": "jre", "powerpc64le": { - "build": "11", - "sha256": "ae9ad61578da420fa7aeb01d3f6909da8a74d54a31bb8ba090a263cfadf221cc", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.5_11.tar.gz", - "version": "21.0.5" + "build": "7", + "sha256": "381e31581af3858d4c471829c3da3263e83dfe8ac5d36b58403babb57f6e202c", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.6_7.tar.gz", + "version": "21.0.6" }, "riscv64": { - "build": "11", - "sha256": "c6fe71bb6ce61366242073e3904c4f51613252a885d54be81c65d3fadd2c5b7c", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_riscv64_linux_hotspot_21.0.5_11.tar.gz", - "version": "21.0.5" + "build": "7", + "sha256": "a8d219a4a97f9c53ba88cb8927910005d4f3d08a87ab1bdebff921ef41afa93d", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_riscv64_linux_hotspot_21.0.6_7.tar.gz", + "version": "21.0.6" }, "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "553dda64b3b1c3c16f8afe402377ffebe64fb4a1721a46ed426a91fd18185e62", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_x64_linux_hotspot_21.0.5_11.tar.gz", - "version": "21.0.5" + "build": "7", + "sha256": "7fc9d6837da5fa1f12e0f41901fd70a73154914b8c8ecbbcad2d44176a989937", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_x64_linux_hotspot_21.0.6_7.tar.gz", + "version": "21.0.6" } }, "openjdk23": { "aarch64": { - "build": "11", - "sha256": "0b498a5b673cb50fe9cfd0a13bd39c7259b4fad4d930d614e1563aeb8bca7f0e", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_aarch64_linux_hotspot_23.0.1_11.tar.gz", - "version": "23.0.1" + "build": "7", + "sha256": "b2a8a287ebd2d2a1d5d32eb6b79768cf2b5e02f1b4d6d4791297feb8636b9e2f", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_aarch64_linux_hotspot_23.0.2_7.tar.gz", + "version": "23.0.2" }, "packageType": "jre", "powerpc64le": { - "build": "11", - "sha256": "ae5d49932f7d9b182c2d9ededa18bd4defc61873f1d717caa3d905bba870a683", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_ppc64le_linux_hotspot_23.0.1_11.tar.gz", - "version": "23.0.1" + "build": "7", + "sha256": "a21355923fdcdcc49fcf6359f2763f49f001bd4caeb970f7313f18aeaa61b588", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_ppc64le_linux_hotspot_23.0.2_7.tar.gz", + "version": "23.0.2" }, "riscv64": { - "build": "11", - "sha256": "cf65a926c2d7cbdbaa63242a8d20ce747335e7260eaaabd7bb52d51c099fda9a", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_riscv64_linux_hotspot_23.0.1_11.tar.gz", - "version": "23.0.1" + "build": "7", + "sha256": "c2c8f8add6af6518cfc565ec0a7410e031301b91f2d8bd594303d7f04680da4e", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_riscv64_linux_hotspot_23.0.2_7.tar.gz", + "version": "23.0.2" }, "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "1233cbec40f05c76ad926b68521ae78c6ae4f454996ef549602be6987069fa77", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_x64_linux_hotspot_23.0.1_11.tar.gz", - "version": "23.0.1" + "build": "7", + "sha256": "1a16c654e67a72dadfa632969a457404ad1cc30c6375857fdcb393e0592ce3ba", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_x64_linux_hotspot_23.0.2_7.tar.gz", + "version": "23.0.2" } }, "openjdk8": { "aarch64": { "build": "6", - "sha256": "786522da4c761104dd8274c81edc90126a25acaafbbbc5da886b3fb51f33cba2", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_aarch64_linux_hotspot_8u432b06.tar.gz", - "version": "8.0.432" + "sha256": "730ed649ee973b7408cf7107e90576b67e8ed4b3aebb9e3e8a1056151f373152", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_aarch64_linux_hotspot_8u442b06.tar.gz", + "version": "8.0.442" }, "armv6l": { "build": "6", - "sha256": "49894dbe2f915dfad026cf7b4013118c0284e88359172499b1b25a4dac195ff1", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_arm_linux_hotspot_8u432b06.tar.gz", - "version": "8.0.432" + "sha256": "055c47c5c1dfe8c9c135d87fed7a3745c17374618bc8d5acb9316d1b812c0e6d", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_arm_linux_hotspot_8u442b06.tar.gz", + "version": "8.0.442" }, "armv7l": { "build": "6", - "sha256": "49894dbe2f915dfad026cf7b4013118c0284e88359172499b1b25a4dac195ff1", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_arm_linux_hotspot_8u432b06.tar.gz", - "version": "8.0.432" + "sha256": "055c47c5c1dfe8c9c135d87fed7a3745c17374618bc8d5acb9316d1b812c0e6d", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_arm_linux_hotspot_8u442b06.tar.gz", + "version": "8.0.442" }, "packageType": "jre", "powerpc64le": { "build": "6", - "sha256": "c573f33f9e5ba49a4838847d0d34efc9c1dc57a9ba71b926599530bbcda87f65", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_ppc64le_linux_hotspot_8u432b06.tar.gz", - "version": "8.0.432" + "sha256": "812ebf110f1d1cfc26a135368850064f96689e7918aa6bbac1c8f210fad5752f", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_ppc64le_linux_hotspot_8u442b06.tar.gz", + "version": "8.0.442" }, "vmType": "hotspot", "x86_64": { "build": "6", - "sha256": "bb8c8cc575b69e68e12a213674ec2e3848baff4f1955d2973d98e67666ab94d7", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_x64_linux_hotspot_8u432b06.tar.gz", - "version": "8.0.432" + "sha256": "730fe33b1fc1f7da1e325d007b475d25a063850a167b548ea4bf689d4fcd867d", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_x64_linux_hotspot_8u442b06.tar.gz", + "version": "8.0.442" } } } @@ -468,66 +468,66 @@ "jdk": { "openjdk11": { "aarch64": { - "build": "9", - "sha256": "658f73050ab168109862d4e25eefeedb587063cc01128a78ea4081e8ec62edcf", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.25_9.tar.gz", - "version": "11.0.25" + "build": "4", + "sha256": "c970e5917964da1b50c0029ba88a6fbe962783def4de6a8a2835af6a6859002c", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.26_4.tar.gz", + "version": "11.0.26" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "fa6f88ebd8c3d2b4f5146cd45e4ef875cb2d073b6e95b60de86a1ce0bfdb463a", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_x64_mac_hotspot_11.0.25_9.tar.gz", - "version": "11.0.25" + "build": "4", + "sha256": "b0142c2c85da43bb3565321164e8129b1166de5d6a43c88e567a92c39128c003", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jdk_x64_mac_hotspot_11.0.26_4.tar.gz", + "version": "11.0.26" } }, "openjdk17": { "aarch64": { - "build": "11", - "sha256": "d8b2f77f755d06e81a540834c5be22ed86f3c8a51a20396606c074303f8f9e2d", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "95bcc8052340394b87644d71a60fb26f31857f4090a7dfee57113e9e0f2dfacb", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "840535070200a944a6b582d258ee84608bd25c9f2b5d1cdddb58dfadb019675a", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_x64_mac_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "bc2e9225d156d27149fc7a91817e6b64f76132b2b81d1f44cb8c90d7497b6ea7", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jdk_x64_mac_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" } }, "openjdk21": { "aarch64": { - "build": "11", - "sha256": "dc6db7347907d23743d13af935d3c10e8b3490acdf542115f578838227da0dab", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.5_11.tar.gz", - "version": "21.0.5" + "build": "7", + "sha256": "4ef4083919126a3d93e603284b405c7493905497485a92b375f5d6c3e8f7e8f2", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.6_7.tar.gz", + "version": "21.0.6" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "b9b46f396ab5f3658fa5569af963896167c7f735cfec816359c04101fae38bdf", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_x64_mac_hotspot_21.0.5_11.tar.gz", - "version": "21.0.5" + "build": "7", + "sha256": "7aacfc400078ad65b7c7de3ec75ff74bf5c2077d6740b350f85ae10be4f71e76", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jdk_x64_mac_hotspot_21.0.6_7.tar.gz", + "version": "21.0.6" } }, "openjdk23": { "aarch64": { - "build": "11", - "sha256": "9e69810a50c8183e01429243d0bb112e381a122c6e7be936b7c13c3cfe7b29a0", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_aarch64_mac_hotspot_23.0.1_11.tar.gz", - "version": "23.0.1" + "build": "7", + "sha256": "749993e751f085c7ae713140066a90800075e4aeedfac50a5ed0c5457131c5a0", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_aarch64_mac_hotspot_23.0.2_7.tar.gz", + "version": "23.0.2" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "055a5b9c27991ad955c8207a20b549ac3254d479aa8a4fc199b6b02d56b1875e", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_x64_mac_hotspot_23.0.1_11.tar.gz", - "version": "23.0.1" + "build": "7", + "sha256": "97fca2e90668351f248f149d4e96e16875094eba6716a8dd1dcf163be9e19085", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_x64_mac_hotspot_23.0.2_7.tar.gz", + "version": "23.0.2" } }, "openjdk8": { @@ -535,75 +535,75 @@ "vmType": "hotspot", "x86_64": { "build": "6", - "sha256": "e5cc78b704cf96f7a6c4ad677048f79331f38cd37fbef6c86dce75e1bfe28895", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_x64_mac_hotspot_8u432b06.tar.gz", - "version": "8.0.432" + "sha256": "2f70725e032fe55629a2659d53646b14c538b12cdcedc2d3c9fa342e1b401cf1", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jdk_x64_mac_hotspot_8u442b06.tar.gz", + "version": "8.0.442" } } }, "jre": { "openjdk11": { "aarch64": { - "build": "9", - "sha256": "f1d602b478269c7def552d4a01c5ba3ac91cc34f5d66b5313da3aa0b72d670e7", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.25_9.tar.gz", - "version": "11.0.25" + "build": "4", + "sha256": "ea341e15094e8e892a2d9ff1d4960d1fd05937385278912618905d4b9e7c88e8", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.26_4.tar.gz", + "version": "11.0.26" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "9", - "sha256": "97e0e32b12460e92e3b4632492b3ccd648cf03a6023ca2ee7dc81f7cfa3bd275", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_x64_mac_hotspot_11.0.25_9.tar.gz", - "version": "11.0.25" + "build": "4", + "sha256": "6d184fbcfa659675f52a7d789d4db05b9c9873c18ad9975a7b3c31e20ee4c878", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_x64_mac_hotspot_11.0.26_4.tar.gz", + "version": "11.0.26" } }, "openjdk17": { "aarch64": { - "build": "11", - "sha256": "a886b8f2a50eca2e59b45ea59f5a2e8e9d27ff5b5b3b069443a70cda7f27c907", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "9fb89125d5807f42cec588824fde487be42273a89c55ccfc5f44efda64e03e2c", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "bf9faf4540001a251e6bfb52b99c7ec5b1f36d3ebe94e104f61a30f173ba8c78", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jre_x64_mac_hotspot_17.0.13_11.tar.gz", - "version": "17.0.13" + "build": "7", + "sha256": "f2c7454f7aba076cd414887b31da92e4a50fda7a13d97f6e295c911af60de0b6", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14%2B7/OpenJDK17U-jre_x64_mac_hotspot_17.0.14_7.tar.gz", + "version": "17.0.14" } }, "openjdk21": { "aarch64": { - "build": "11", - "sha256": "12249a1c5386957c93fc372260c483ae921b1ec6248a5136725eabd0abc07f93", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_aarch64_mac_hotspot_21.0.5_11.tar.gz", - "version": "21.0.5" + "build": "7", + "sha256": "9b792bbd408676483caaeb619439190abf1552fe11ab05b19c80d408e5f49c25", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_aarch64_mac_hotspot_21.0.6_7.tar.gz", + "version": "21.0.6" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "0e0dcb571f7bf7786c111fe066932066d9eab080c9f86d8178da3e564324ee81", - "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_x64_mac_hotspot_21.0.5_11.tar.gz", - "version": "21.0.5" + "build": "7", + "sha256": "632f7cba1aa752ae4108eccf3abc8b7e51b75d262e11e0cb9077b847438e5549", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6%2B7/OpenJDK21U-jre_x64_mac_hotspot_21.0.6_7.tar.gz", + "version": "21.0.6" } }, "openjdk23": { "aarch64": { - "build": "11", - "sha256": "e29029d35608f4e415e49c7990ebe0f42d0ecb7dc2d4d444e41adf3e3287f922", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_aarch64_mac_hotspot_23.0.1_11.tar.gz", - "version": "23.0.1" + "build": "7", + "sha256": "56b86d4f5745ba44894310c3417755e4b4aaa62d4a17a5cb4dab6200c14c56fe", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_aarch64_mac_hotspot_23.0.2_7.tar.gz", + "version": "23.0.2" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "11", - "sha256": "87e532fda02327e0f2766650223b6bd63a4407c4907f82790edb5862a5285116", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_x64_mac_hotspot_23.0.1_11.tar.gz", - "version": "23.0.1" + "build": "7", + "sha256": "2c5b81ce3234d6bef0ec352734aa2de19c0950020c55a1cbfc21ae5fda7690b8", + "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_x64_mac_hotspot_23.0.2_7.tar.gz", + "version": "23.0.2" } }, "openjdk8": { @@ -611,9 +611,9 @@ "vmType": "hotspot", "x86_64": { "build": "6", - "sha256": "55aac241ad7cb7c1903d4810ad705ffe2f2536a88b6a88efabb4942a9f09db33", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jre_x64_mac_hotspot_8u432b06.tar.gz", - "version": "8.0.432" + "sha256": "e2658d0808fd2f4d5ad261a8954366a9b277eabd55a404452674b56abc325fec", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u442-b06/OpenJDK8U-jre_x64_mac_hotspot_8u442b06.tar.gz", + "version": "8.0.442" } } } From 15e556ff0b9686aabb723f1696a65a2445d8906f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 10 Feb 2025 09:27:08 +0000 Subject: [PATCH 0284/1107] SDL2: 2.30.12 -> 2.32.0 Changes: https://github.com/libsdl-org/SDL/releases/tag/release-2.32.0 --- pkgs/development/libraries/SDL2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 4d4b446af742..d88431bca7df 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -70,13 +70,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "SDL2"; - version = "2.30.12"; + version = "2.32.0"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "SDL"; rev = "release-${finalAttrs.version}"; - hash = "sha256-9f7V15p8Cso1TVxcd7bEFGO3C3oIhQikyLh4pWXLaiA="; + hash = "sha256-BdyMlttrDwQMoz+bO6bfU3bh0xKnT8yQF6nb6OGRbHw="; }; dontDisableStatic = if withStatic then 1 else 0; outputs = [ From c16ff506a27e2340e5946dcef4c3bb30a16e4572 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 10 Feb 2025 09:47:05 +0000 Subject: [PATCH 0285/1107] xorg.libX11: 1.8.10 -> 1.8.11 Changes: https://lists.x.org/archives/xorg-announce/2025-February/003582.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/overrides.nix | 8 -------- pkgs/servers/x11/xorg/tarballs.list | 2 +- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 83a61ee2529d..d5abf4a41382 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1123,11 +1123,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libX11 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpthreadstubs, libxcb, xtrans, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libX11"; - version = "1.8.10"; + version = "1.8.11"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libX11-1.8.10.tar.xz"; - sha256 = "0lywvwsz92j7isglvw2227g3na4ghyspvsvblpf43ns7jfnksfrb"; + url = "mirror://xorg/individual/lib/libX11-1.8.11.tar.xz"; + sha256 = "120f716wl7ay33yshicl1l0w62b9jx16ik3qnyh4ajwj8clyhx1v"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 54d8bfedf011..2dc81662f425 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -149,14 +149,6 @@ self: super: libX11 = super.libX11.overrideAttrs (attrs: { outputs = [ "out" "dev" "man" ]; - patches = [ - # Fix spurious Xerror when running synchronized - # https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/264 - (fetchpatch { - url = "https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/f3d6ebac35301d4ad068e307f0fbe6aa12ccbccb.patch"; - hash = "sha256-wQNMsbQ+h9VlNiWr+r34AxvViC8fq02ZhcARRnw7O9k="; - }) - ]; configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "ac_cv_path_RAWCPP=cpp"; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 0c7378869811..cdc5d789dff3 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -172,7 +172,7 @@ mirror://xorg/individual/lib/libICE-1.1.2.tar.xz mirror://xorg/individual/lib/libpciaccess-0.18.1.tar.xz mirror://xorg/individual/lib/libSM-1.2.5.tar.xz mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/individual/lib/libX11-1.8.10.tar.xz +mirror://xorg/individual/lib/libX11-1.8.11.tar.xz mirror://xorg/individual/lib/libXau-1.0.12.tar.xz mirror://xorg/individual/lib/libXaw-1.0.16.tar.xz mirror://xorg/individual/lib/libxcb-1.17.0.tar.xz From b8c6b4d87bae81688e37fa85fca2a57cbadd93e5 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 13:37:48 +0300 Subject: [PATCH 0286/1107] python3Packages.django_{4,5}: backport patch fixing builds on bcachefs --- pkgs/development/python-modules/django/4.nix | 8 ++++++++ pkgs/development/python-modules/django/5.nix | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 1c9ad471581b..e7deafc63271 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch, pythonAtLeast, pythonOlder, substituteAll, @@ -65,6 +66,13 @@ buildPythonPackage rec { # make sure the tests don't remove packages from our pythonpath # and disable failing tests ./django_4_tests.patch + + # fix filename length limit tests on bcachefs + # FIXME: remove if ever backported + (fetchpatch { + url = "https://github.com/django/django/commit/12f4f95405c7857cbf2f4bf4d0261154aac31676.patch"; + hash = "sha256-+K20/V8sh036Ox9U7CSPgfxue7f28Sdhr3MsB7erVOk="; + }) ] ++ lib.optionals withGdal [ (substituteAll { diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix index ba1f376de165..0a46ca3e1e7e 100644 --- a/pkgs/development/python-modules/django/5.nix +++ b/pkgs/development/python-modules/django/5.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch, pythonOlder, substituteAll, @@ -65,6 +66,13 @@ buildPythonPackage rec { ./django_5_tests_pythonpath.patch # disable test that excpects timezone issues ./django_5_disable_failing_tests.patch + + # fix filename length limit tests on bcachefs + # FIXME: remove in 5.2 + (fetchpatch { + url = "https://github.com/django/django/commit/12f4f95405c7857cbf2f4bf4d0261154aac31676.patch"; + hash = "sha256-+K20/V8sh036Ox9U7CSPgfxue7f28Sdhr3MsB7erVOk="; + }) ] ++ lib.optionals withGdal [ (substituteAll { From d56e20e7099fa4e88cccea64229356918a435d6d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 12:32:32 +0000 Subject: [PATCH 0287/1107] lcms: 2.16 -> 2.17 --- pkgs/by-name/lc/lcms2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lc/lcms2/package.nix b/pkgs/by-name/lc/lcms2/package.nix index 17af27ccd36b..e5fe6136e7da 100644 --- a/pkgs/by-name/lc/lcms2/package.nix +++ b/pkgs/by-name/lc/lcms2/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "lcms2"; - version = "2.16"; + version = "2.17"; src = fetchurl { url = "mirror://sourceforge/lcms/${pname}-${version}.tar.gz"; - hash = "sha256-2HPTSti5tM6gEGMfGmIo0gh0deTcXnY+uBrMI9nUWlE="; + hash = "sha256-0Rr1aeQqG6oWUNIK1h0S5Br0/q1Kp5ZKAfk7CLU6sHQ="; }; outputs = [ From fe08a6f87bc866fed6dc25edf7b762a7295bc21f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 12:33:01 +0000 Subject: [PATCH 0288/1107] waf: 2.1.4 -> 2.1.5 --- pkgs/by-name/wa/waf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/waf/package.nix b/pkgs/by-name/wa/waf/package.nix index 77423091ed7a..7a2e4298a0d8 100644 --- a/pkgs/by-name/wa/waf/package.nix +++ b/pkgs/by-name/wa/waf/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "waf"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitLab { owner = "ita1024"; repo = "waf"; rev = "waf-${finalAttrs.version}"; - hash = "sha256-Dt8eo/rY6JRu6teTQM0y7bjMzQjOv3WSL6bcF9g0B8o="; + hash = "sha256-cZ8tt17m1KUGxYPJf+cHf9j8rzNCrGyY8rcZcSvebyY="; }; nativeBuildInputs = [ From 227ee089f6f50f0e021155874031d345590df582 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 10 Feb 2025 11:20:17 +0100 Subject: [PATCH 0289/1107] librsvg: fix cross MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some things have changed with the switch to Meson: • The pixbuf stuff is only generated when build = host, even if an emulator would be available. • -Dtriplet needs to be passed when cross compiling. • This version of librsvg does not allow gobject-introspection to be enabled when cross compiling. Backport the fix for that. Fixes: c202e21f6445 ("librsvg: 2.58.3 → 2.59.2") --- .../development/libraries/librsvg/default.nix | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 4f6e93674408..d78cac09cb41 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, pkg-config, meson, ninja, @@ -31,6 +32,7 @@ && stdenv.hostPlatform.emulatorAvailable buildPackages, buildPackages, gobject-introspection, + mesonEmulatorHook, _experimental-update-script-combinators, common-updater-scripts, jq, @@ -65,6 +67,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-7NKT+wzDOMFwFxu8e8++pnJdBByV8xOF3JNUCZM+RZc="; }; + patches = [ + (fetchpatch { + name = "cross-introspection.patch"; + url = "https://gitlab.gnome.org/GNOME/librsvg/-/commit/84f24b1f5767f807f8d0442bbf3f149a0defcf78.patch"; + hash = "sha256-FRyAYCCP3eu7YDUS6g7sKCdbq2nU8yQdbdVaQwLrlhE="; + }) + ]; + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "librsvg-deps-${finalAttrs.version}"; @@ -95,6 +105,9 @@ stdenv.mkDerivation (finalAttrs: { gobject-introspection gi-docgen vala # vala bindings require GObject introspection + ] + ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = @@ -119,6 +132,7 @@ stdenv.mkDerivation (finalAttrs: { ]; mesonFlags = [ + "-Dtriplet=${stdenv.hostPlatform.rust.rustcTarget}" (lib.mesonEnable "introspection" withIntrospection) (lib.mesonEnable "vala" withIntrospection) (lib.mesonBool "tests" finalAttrs.finalPackage.doCheck) @@ -156,17 +170,18 @@ stdenv.mkDerivation (finalAttrs: { export XDG_DATA_DIRS=${shared-mime-info}/share:$XDG_DATA_DIRS ''; - # Not generated when cross compiling. postInstall = let emulator = stdenv.hostPlatform.emulator buildPackages; in - lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) '' + # Not generated when cross compiling. + lib.optionalString (lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) '' # Merge gdkpixbuf and librsvg loaders GDK_PIXBUF=$out/${gdk-pixbuf.binaryDir} cat ${lib.getLib gdk-pixbuf}/${gdk-pixbuf.binaryDir}/loaders.cache $GDK_PIXBUF/loaders.cache > $GDK_PIXBUF/loaders.cache.tmp mv $GDK_PIXBUF/loaders.cache.tmp $GDK_PIXBUF/loaders.cache - + '' + + lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) '' installShellCompletion --cmd rsvg-convert \ --bash <(${emulator} $out/bin/rsvg-convert --completion bash) \ --fish <(${emulator} $out/bin/rsvg-convert --completion fish) \ From 70c7526514c3d3323c3262211aa7ab9e0e0edb07 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 10 Feb 2025 22:46:57 +0800 Subject: [PATCH 0290/1107] emacsPackages.magit-svn: fix build https://hydra.nix-community.org/build/3134861 --- .../elisp-packages/recipes-archive-melpa.json | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index cd6e6924f000..7eaeaeef87d1 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -76110,28 +76110,30 @@ "repo": "emacsorphanage/magit-svn", "unstable": { "version": [ - 20220314, - 1451 + 20250210, + 1141 ], "deps": [ + "dash", "magit", "transient" ], - "commit": "b8277081db90977247ae3900ea6afeb0ca644d36", - "sha256": "1ywwylxasgyk6gldypvbn6hlbmkp24rx6kcd0qvxsp39bbd0in50" + "commit": "ca637c648835eddbeb277cc8089d3ffd6f75ae13", + "sha256": "sha256-p+uDl+TUStmtbiPk64oRAbvni0LADklStClHgD5OgXQ=" }, "stable": { "version": [ 2, 2, - 3 + 4 ], "deps": [ + "dash", "magit", "transient" ], - "commit": "350493217afdb7637564e089f475909adecd9208", - "sha256": "1v1y4fir1plz4kj0cvkcd29wibli4dw7vp4fmbxq4df76d8iy8yd" + "commit": "ca637c648835eddbeb277cc8089d3ffd6f75ae13", + "sha256": "0x419qz80ir9ni94j3n08a5ygfq1265fpr13dsnxjjnlwjbq7sx7" } }, { From 3964fde0b0ca73637f4e9499de04faa84737a7b7 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 10 Feb 2025 16:07:05 +0100 Subject: [PATCH 0291/1107] librsvg: fix static --- pkgs/development/libraries/librsvg/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index d78cac09cb41..fcd46738c997 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -27,6 +27,8 @@ vala, writeShellScript, shared-mime-info, + # Requires building a cdylib. + withPixbufLoader ? !stdenv.hostPlatform.isStatic, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages, @@ -134,12 +136,23 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Dtriplet=${stdenv.hostPlatform.rust.rustcTarget}" (lib.mesonEnable "introspection" withIntrospection) + (lib.mesonEnable "pixbuf-loader" withPixbufLoader) (lib.mesonEnable "vala" withIntrospection) (lib.mesonBool "tests" finalAttrs.finalPackage.doCheck) ]; - # Probably broken MIME type detection. - doCheck = !stdenv.isDarwin; + doCheck = + # Probably broken MIME type detection. + !stdenv.isDarwin + && + # Could be made to work, but requires the C API test to be linked + # with a C++ linker because + # librsvg -> gdk-pixbuf -> libtiff -> lerc (C++). + # + # Doesn't make sense to pursue this upstream until gdk-pixbuf + # itself is fixed: + # https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/181 + !stdenv.hostPlatform.isStatic; env = { PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_QUERY_LOADERS = writeShellScript "gdk-pixbuf-loader-loaders-wrapped" '' From a56f556e08b104bb6bf0a4f37ce43d2afa346847 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 17:58:06 +0300 Subject: [PATCH 0292/1107] watchman: add update script to bulk update all the Facebook stuff --- pkgs/by-name/wa/watchman/package.nix | 2 +- pkgs/by-name/wa/watchman/update.sh | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100755 pkgs/by-name/wa/watchman/update.sh diff --git a/pkgs/by-name/wa/watchman/package.nix b/pkgs/by-name/wa/watchman/package.nix index 7e662f24b40e..66d86f6b8e31 100644 --- a/pkgs/by-name/wa/watchman/package.nix +++ b/pkgs/by-name/wa/watchman/package.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { remove-references-to -t ${folly.fmt.dev} $out/bin/* ''; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = ./update.sh; meta = { description = "Watches files and takes action when they change"; diff --git a/pkgs/by-name/wa/watchman/update.sh b/pkgs/by-name/wa/watchman/update.sh new file mode 100755 index 000000000000..33be4da4b092 --- /dev/null +++ b/pkgs/by-name/wa/watchman/update.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-update cargo +# shellcheck shell=bash + +set -euf -o pipefail + +# toposorted manually, please keep in order +PACKAGES=( + "folly" + "fizz" + "mvfst" + "wangle" + "fbthrift" + "fb303" + "edencommon" +) + +for P in "${PACKAGES[@]}"; do + nix-update "$P" --commit +done + +nix-update watchman --commit --generate-lockfile --lockfile-metadata-path "watchman/cli" From 9f438130dd2ad5c550155d14937ba92f123ceb69 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 17:59:17 +0300 Subject: [PATCH 0293/1107] folly: 2025.01.06.00 -> 2025.02.03.00 Diff: https://github.com/facebook/folly/compare/refs/tags/v2025.01.06.00...v2025.02.03.00 --- pkgs/by-name/fo/folly/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix index 0ee9b228d6ea..4e7022ba3fbb 100644 --- a/pkgs/by-name/fo/folly/package.nix +++ b/pkgs/by-name/fo/folly/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "folly"; - version = "2025.01.06.00"; + version = "2025.02.03.00"; # split outputs to reduce downstream closure sizes outputs = [ @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "folly"; tag = "v${finalAttrs.version}"; - hash = "sha256-GxHOs6jfjiKQWWFs03O/sI92OvpPsf+Xilnawb8Nygs="; + hash = "sha256-OuMbxZ9sl9KPDHFae503R0AqzDYFdyuaGK1BospRtfs="; }; nativeBuildInputs = [ From 072c37534ba890c1191c598958cfb0a9bce19dd1 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 17:59:22 +0300 Subject: [PATCH 0294/1107] fizz: 2025.01.27.00 -> 2025.02.03.00 Diff: https://github.com/facebookincubator/fizz/compare/refs/tags/v2025.01.27.00...v2025.02.03.00 Changelog: https://github.com/facebookincubator/fizz/releases/tag/v2025.02.03.00 --- pkgs/by-name/fi/fizz/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fi/fizz/package.nix b/pkgs/by-name/fi/fizz/package.nix index 498061f63041..6d9b9ee9ebce 100644 --- a/pkgs/by-name/fi/fizz/package.nix +++ b/pkgs/by-name/fi/fizz/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fizz"; - version = "2025.01.27.00"; + version = "2025.02.03.00"; outputs = [ "bin" @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebookincubator"; repo = "fizz"; tag = "v${finalAttrs.version}"; - hash = "sha256-Gt1DaEcpto25dkT6QsGg3jNp8vvAuWJrzCqelknK+IU="; + hash = "sha256-czGCQNigLveQu0lvu1Dbamk6Upngr2i3njvLSNKSNj0="; }; patches = [ From 18da458f1c5ddf4a21745f5dbf0e81eaa7c7d2f1 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 17:59:26 +0300 Subject: [PATCH 0295/1107] mvfst: 2025.01.27.00 -> 2025.02.03.00 Diff: https://github.com/facebook/mvfst/compare/refs/tags/v2025.01.27.00...v2025.02.03.00 --- pkgs/by-name/mv/mvfst/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mv/mvfst/package.nix b/pkgs/by-name/mv/mvfst/package.nix index 96a182cdf63d..b9f957d6e725 100644 --- a/pkgs/by-name/mv/mvfst/package.nix +++ b/pkgs/by-name/mv/mvfst/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mvfst"; - version = "2025.01.27.00"; + version = "2025.02.03.00"; outputs = [ "bin" @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "mvfst"; tag = "v${finalAttrs.version}"; - hash = "sha256-8qYybElhtZyx87aZnR6r5exrLewsInS1U2m+zVPXSyw="; + hash = "sha256-IsBydt1T33yedlaoyKl43fB7Dsuu4RPPiJuUtwZIUGg="; }; patches = [ From 023fa67b3f5bb1243333ff1e74ce265e8efab8bd Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 17:59:29 +0300 Subject: [PATCH 0296/1107] wangle: 2025.01.27.00 -> 2025.02.03.00 Diff: https://github.com/facebook/wangle/compare/refs/tags/v2025.01.27.00...v2025.02.03.00 --- pkgs/by-name/wa/wangle/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/wangle/package.nix b/pkgs/by-name/wa/wangle/package.nix index ed13b75dd263..3ad368828ebf 100644 --- a/pkgs/by-name/wa/wangle/package.nix +++ b/pkgs/by-name/wa/wangle/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "wangle"; - version = "2025.01.27.00"; + version = "2025.02.03.00"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "wangle"; tag = "v${finalAttrs.version}"; - hash = "sha256-aZnDqMQ2Xh/v5zhyvR8ovHgISjTy8eGoGXg69Ee3Ejk="; + hash = "sha256-IlMdYOQH0iqxObyFM1F4cZqOgSbCs4cOFtcsPWG8cWk="; }; patches = [ From c916433300d7789ac5f5a7c24b2ed0a0b462c50a Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 17:59:48 +0300 Subject: [PATCH 0297/1107] fbthrift: 2025.01.27.00 -> 2025.02.03.00 Diff: https://github.com/facebook/fbthrift/compare/refs/tags/v2025.01.27.00...v2025.02.03.00 --- pkgs/by-name/fb/fbthrift/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fb/fbthrift/package.nix b/pkgs/by-name/fb/fbthrift/package.nix index a070d5273b1a..afef7eefb4e3 100644 --- a/pkgs/by-name/fb/fbthrift/package.nix +++ b/pkgs/by-name/fb/fbthrift/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fbthrift"; - version = "2025.01.27.00"; + version = "2025.02.03.00"; outputs = [ # Trying to split this up further into `bin`, `out`, and `dev` @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "fbthrift"; tag = "v${finalAttrs.version}"; - hash = "sha256-HiPIpmRwlHSduwHV8EJSmhg7PYFDumx0TNo8uzJ9+j8="; + hash = "sha256-130BHYUFDo11T9bI7cQ7Y+lTnFSr3WNgJ7IA+3BE9+g="; }; patches = [ From c07476dd6f787538c09f99f0d35309cc7e545a2c Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 17:59:52 +0300 Subject: [PATCH 0298/1107] fb303: 2025.01.27.00 -> 2025.02.03.00 Diff: https://github.com/facebook/fb303/compare/refs/tags/v2025.01.27.00...v2025.02.03.00 --- pkgs/by-name/fb/fb303/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fb/fb303/package.nix b/pkgs/by-name/fb/fb303/package.nix index ff773b58e27b..78aa0be2c535 100644 --- a/pkgs/by-name/fb/fb303/package.nix +++ b/pkgs/by-name/fb/fb303/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fb303"; - version = "2025.01.27.00"; + version = "2025.02.03.00"; outputs = [ "out" @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "fb303"; tag = "v${finalAttrs.version}"; - hash = "sha256-xSE+3fJiwNJT3tzZWighX/Qe/sCXg18arMR2csUAPbs="; + hash = "sha256-ofQshSBWjL02Z9iQVJu86eet1ULANYzUUcOLBfKJip0="; }; patches = [ From 850984168b29f9e933fd5e9adfc497d140c2821a Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 17:59:55 +0300 Subject: [PATCH 0299/1107] edencommon: 2025.01.06.00 -> 2025.02.03.00 Diff: https://github.com/facebookexperimental/edencommon/compare/refs/tags/v2025.01.06.00...v2025.02.03.00 --- pkgs/by-name/ed/edencommon/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ed/edencommon/package.nix b/pkgs/by-name/ed/edencommon/package.nix index 77cc3653952d..c2664d663b85 100644 --- a/pkgs/by-name/ed/edencommon/package.nix +++ b/pkgs/by-name/ed/edencommon/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "edencommon"; - version = "2025.01.06.00"; + version = "2025.02.03.00"; outputs = [ "out" @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebookexperimental"; repo = "edencommon"; tag = "v${finalAttrs.version}"; - hash = "sha256-9JCyXFWglnIuDw5jSSqcnuMfQ2JXMdNwFVyyBccjoag="; + hash = "sha256-wY6HEIQZdyyglXADxq9zaCrRCneqQEBs+EqoY3mNY3E="; }; patches = From aaca3d7f4fffc2b36fc569e9ac3af293d76f8968 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 18:41:18 +0300 Subject: [PATCH 0300/1107] watchman: 2025.01.06.00 -> 2025.02.03.00 Diff: https://github.com/facebook/watchman/compare/refs/tags/v2025.01.06.00...v2025.02.03.00 --- pkgs/by-name/wa/watchman/Cargo.lock | 62 ++++++++++++++-------------- pkgs/by-name/wa/watchman/package.nix | 4 +- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/pkgs/by-name/wa/watchman/Cargo.lock b/pkgs/by-name/wa/watchman/Cargo.lock index 8e5f4543a1fc..720cbbfaa865 100644 --- a/pkgs/by-name/wa/watchman/Cargo.lock +++ b/pkgs/by-name/wa/watchman/Cargo.lock @@ -85,9 +85,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 = "byteorder" @@ -97,9 +97,9 @@ 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" dependencies = [ "serde", ] @@ -273,7 +273,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -382,9 +382,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" [[package]] name = "maplit" @@ -409,9 +409,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394" +checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" dependencies = [ "adler2", ] @@ -433,7 +433,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "cfg-if", "cfg_aliases", "libc", @@ -460,9 +460,9 @@ 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 = "os_pipe" @@ -535,9 +535,9 @@ 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", ] @@ -577,7 +577,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]] @@ -588,9 +588,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[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 = "scopeguard" @@ -636,14 +636,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", @@ -738,9 +738,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", @@ -797,14 +797,14 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] name = "tokio" -version = "1.42.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" +checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" dependencies = [ "backtrace", "bytes", @@ -821,13 +821,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -867,9 +867,9 @@ dependencies = [ [[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-segmentation" @@ -1075,5 +1075,5 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] diff --git a/pkgs/by-name/wa/watchman/package.nix b/pkgs/by-name/wa/watchman/package.nix index 66d86f6b8e31..0e5309b26951 100644 --- a/pkgs/by-name/wa/watchman/package.nix +++ b/pkgs/by-name/wa/watchman/package.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "watchman"; - version = "2025.01.06.00"; + version = "2025.02.03.00"; src = fetchFromGitHub { owner = "facebook"; repo = "watchman"; tag = "v${finalAttrs.version}"; - hash = "sha256-W37+xs+Fj2yL9KzR9CugfgbFl+g3f+2Dx+xL9MpQEQ4="; + hash = "sha256-fR5SOCRc77vtKUIRJvl7pgRjUPwakQCzGTvIF4Ye2/I="; }; patches = [ From bd09ba63125cd05054ff3c67477e2a4a4f887061 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 19:24:53 +0300 Subject: [PATCH 0301/1107] folly: 2025.02.03.00 -> 2025.02.10.00 Diff: https://github.com/facebook/folly/compare/refs/tags/v2025.02.03.00...v2025.02.10.00 --- pkgs/by-name/fo/folly/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix index 4e7022ba3fbb..6d9313acbe0a 100644 --- a/pkgs/by-name/fo/folly/package.nix +++ b/pkgs/by-name/fo/folly/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "folly"; - version = "2025.02.03.00"; + version = "2025.02.10.00"; # split outputs to reduce downstream closure sizes outputs = [ From 62312139ec644601e9da9f9455e91f2273105e39 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 19:25:00 +0300 Subject: [PATCH 0302/1107] fizz: 2025.02.03.00 -> 2025.02.10.00 Diff: https://github.com/facebookincubator/fizz/compare/refs/tags/v2025.02.03.00...v2025.02.10.00 Changelog: https://github.com/facebookincubator/fizz/releases/tag/v2025.02.10.00 --- pkgs/by-name/fi/fizz/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fi/fizz/package.nix b/pkgs/by-name/fi/fizz/package.nix index 6d9b9ee9ebce..44edf61ea221 100644 --- a/pkgs/by-name/fi/fizz/package.nix +++ b/pkgs/by-name/fi/fizz/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fizz"; - version = "2025.02.03.00"; + version = "2025.02.10.00"; outputs = [ "bin" From d88b6f86de3e497ba3563c0ff4561095fc507bd2 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 19:25:04 +0300 Subject: [PATCH 0303/1107] mvfst: 2025.02.03.00 -> 2025.02.10.00 Diff: https://github.com/facebook/mvfst/compare/refs/tags/v2025.02.03.00...v2025.02.10.00 --- pkgs/by-name/mv/mvfst/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mv/mvfst/package.nix b/pkgs/by-name/mv/mvfst/package.nix index b9f957d6e725..edc2a6808b6f 100644 --- a/pkgs/by-name/mv/mvfst/package.nix +++ b/pkgs/by-name/mv/mvfst/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mvfst"; - version = "2025.02.03.00"; + version = "2025.02.10.00"; outputs = [ "bin" From 5a60362342d17e2464762010be25d02ae827b835 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 19:25:07 +0300 Subject: [PATCH 0304/1107] wangle: 2025.02.03.00 -> 2025.02.10.00 Diff: https://github.com/facebook/wangle/compare/refs/tags/v2025.02.03.00...v2025.02.10.00 --- pkgs/by-name/wa/wangle/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/wa/wangle/package.nix b/pkgs/by-name/wa/wangle/package.nix index 3ad368828ebf..fbf0705e3cef 100644 --- a/pkgs/by-name/wa/wangle/package.nix +++ b/pkgs/by-name/wa/wangle/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "wangle"; - version = "2025.02.03.00"; + version = "2025.02.10.00"; outputs = [ "out" From d63e9f2366780240313dc0cf7dc47db86b5cfe1e Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 19:25:35 +0300 Subject: [PATCH 0305/1107] fbthrift: 2025.02.03.00 -> 2025.02.10.00 Diff: https://github.com/facebook/fbthrift/compare/refs/tags/v2025.02.03.00...v2025.02.10.00 --- pkgs/by-name/fb/fbthrift/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fb/fbthrift/package.nix b/pkgs/by-name/fb/fbthrift/package.nix index afef7eefb4e3..c69aeb48bd97 100644 --- a/pkgs/by-name/fb/fbthrift/package.nix +++ b/pkgs/by-name/fb/fbthrift/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fbthrift"; - version = "2025.02.03.00"; + version = "2025.02.10.00"; outputs = [ # Trying to split this up further into `bin`, `out`, and `dev` From d0c70b4cfd8a43a8e96aadd62613d0487cd65496 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 19:25:39 +0300 Subject: [PATCH 0306/1107] fb303: 2025.02.03.00 -> 2025.02.10.00 Diff: https://github.com/facebook/fb303/compare/refs/tags/v2025.02.03.00...v2025.02.10.00 --- pkgs/by-name/fb/fb303/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fb/fb303/package.nix b/pkgs/by-name/fb/fb303/package.nix index 78aa0be2c535..82ece3cd5621 100644 --- a/pkgs/by-name/fb/fb303/package.nix +++ b/pkgs/by-name/fb/fb303/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fb303"; - version = "2025.02.03.00"; + version = "2025.02.10.00"; outputs = [ "out" From 372ef2c340fc0d5bde082a351f73431c10b729c3 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 19:25:43 +0300 Subject: [PATCH 0307/1107] edencommon: 2025.02.03.00 -> 2025.02.10.00 Diff: https://github.com/facebookexperimental/edencommon/compare/refs/tags/v2025.02.03.00...v2025.02.10.00 --- pkgs/by-name/ed/edencommon/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ed/edencommon/package.nix b/pkgs/by-name/ed/edencommon/package.nix index c2664d663b85..95e31de10e53 100644 --- a/pkgs/by-name/ed/edencommon/package.nix +++ b/pkgs/by-name/ed/edencommon/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "edencommon"; - version = "2025.02.03.00"; + version = "2025.02.10.00"; outputs = [ "out" From 5dcdb291ebc1e49bce8ad146a401e3a891aca02c Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 19:57:32 +0300 Subject: [PATCH 0308/1107] watchman: 2025.02.03.00 -> 2025.02.10.00 Diff: https://github.com/facebook/watchman/compare/refs/tags/v2025.02.03.00...v2025.02.10.00 --- pkgs/by-name/wa/watchman/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/watchman/package.nix b/pkgs/by-name/wa/watchman/package.nix index 0e5309b26951..a46cc591d87f 100644 --- a/pkgs/by-name/wa/watchman/package.nix +++ b/pkgs/by-name/wa/watchman/package.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "watchman"; - version = "2025.02.03.00"; + version = "2025.02.10.00"; src = fetchFromGitHub { owner = "facebook"; repo = "watchman"; tag = "v${finalAttrs.version}"; - hash = "sha256-fR5SOCRc77vtKUIRJvl7pgRjUPwakQCzGTvIF4Ye2/I="; + hash = "sha256-X9cUiMrUeuuJT+0gJa9cL2mpeSEWS/DkTx7eQu8u7oY="; }; patches = [ From e2afb89c2a112ba5dedd03c6163a70949fb8837e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 10 Feb 2025 09:42:55 -0800 Subject: [PATCH 0309/1107] python313Packages.manim: mark broken with PyAV v14 --- pkgs/development/python-modules/manim/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/manim/default.nix b/pkgs/development/python-modules/manim/default.nix index 0fb223a910ca..5bdef09abcbb 100644 --- a/pkgs/development/python-modules/manim/default.nix +++ b/pkgs/development/python-modules/manim/default.nix @@ -266,6 +266,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "manim" ]; meta = { + # https://github.com/ManimCommunity/manim/pull/4037 + broken = lib.versionAtLeast av.version "14"; description = "Animation engine for explanatory math videos - Community version"; longDescription = '' Manim is an animation engine for explanatory math videos. It's used to From cbcd3121c93c65458fa1ead496e77056510cad58 Mon Sep 17 00:00:00 2001 From: shimun Date: Sun, 8 Dec 2024 18:34:41 +0100 Subject: [PATCH 0310/1107] bmputil: init at 0.1.3 --- pkgs/by-name/bm/bmputil/package.nix | 40 +++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/bm/bmputil/package.nix diff --git a/pkgs/by-name/bm/bmputil/package.nix b/pkgs/by-name/bm/bmputil/package.nix new file mode 100644 index 000000000000..0bee84d8ed26 --- /dev/null +++ b/pkgs/by-name/bm/bmputil/package.nix @@ -0,0 +1,40 @@ +{ + blackmagic, + lib, + fetchFromGitHub, + rustPlatform, + versionCheckHook, +}: +rustPlatform.buildRustPackage rec { + pname = "bmputil"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "blackmagic-debug"; + repo = "bmputil"; + tag = "v${version}"; + hash = "sha256-LKtdwQbsPNEu3EDTowOXeFmi5OHOU3kq5f5xxevBjtM="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-32dTB5gOMgy6Fn62p68tAZB8AYwh1BAW+kwwuZPGJyM="; + + postInstall = '' + install -Dm 444 ${blackmagic.src}/driver/99-blackmagic.rules $out/lib/udev/rules.d/99-blackmagic.rules + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + meta = { + description = "Black Magic Probe Firmware Manager"; + homepage = "https://github.com/blackmagic-debug/bmputil"; + license = with lib.licenses; [ + mit + asl20 + ]; + mainProgram = "bmputil"; + maintainers = [ lib.maintainers.shimun ]; + }; +} From 2e43b87c62a2c2f179293ec3645a3688fc1e34a0 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 8 Feb 2025 11:11:42 +0100 Subject: [PATCH 0311/1107] replaceVars: fail when exemption can't be found This also changes stdenv's substitute --replace-fail to error out when the replacement is the same as the search pattern, but can't be found. This should not cause any problems in existing code, from what I can tell from grepping nixpkgs. The exception for pattern==replacement was previously introduced all the way back in 5ff872aa24983cf3e1cf28bb990042846c1a97ee, but this was apparently only used to make the check for the warning "simpler". --- .../replace-vars/replace-vars-with.nix | 12 ++++------ pkgs/stdenv/generic/setup.sh | 18 ++++++-------- pkgs/test/replace-vars/default.nix | 24 +++++++++++++++++++ 3 files changed, 36 insertions(+), 18 deletions(-) diff --git a/pkgs/build-support/replace-vars/replace-vars-with.nix b/pkgs/build-support/replace-vars/replace-vars-with.nix index 14a1e6a8e1e3..42be45b6dcf1 100644 --- a/pkgs/build-support/replace-vars/replace-vars-with.nix +++ b/pkgs/build-support/replace-vars/replace-vars-with.nix @@ -58,13 +58,11 @@ let # We use `--replace-fail` instead of `--subst-var-by` so that if the thing isn't there, we fail. - subst-var-by = - name: value: - lib.optionals (value != null) [ - "--replace-fail" - (lib.escapeShellArg "@${name}@") - (lib.escapeShellArg value) - ]; + subst-var-by = name: value: [ + "--replace-fail" + (lib.escapeShellArg "@${name}@") + (lib.escapeShellArg (lib.defaultTo "@${name}@" value)) + ]; substitutions = lib.concatLists (lib.mapAttrsToList subst-var-by replacements); diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 4198f41aadde..958fc54f277f 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1042,19 +1042,15 @@ substituteStream() { pattern="$2" replacement="$3" shift 3 - local savedvar - savedvar="${!var}" - eval "$var"'=${'"$var"'//"$pattern"/"$replacement"}' - if [ "$pattern" != "$replacement" ]; then - if [ "${!var}" == "$savedvar" ]; then - if [ "$replace_mode" == --replace-warn ]; then - printf "substituteStream() in derivation $name: WARNING: pattern %q doesn't match anything in %s\n" "$pattern" "$description" >&2 - elif [ "$replace_mode" == --replace-fail ]; then - printf "substituteStream() in derivation $name: ERROR: pattern %q doesn't match anything in %s\n" "$pattern" "$description" >&2 - return 1 - fi + if ! [[ "${!var}" == *"$pattern"* ]]; then + if [ "$replace_mode" == --replace-warn ]; then + printf "substituteStream() in derivation $name: WARNING: pattern %q doesn't match anything in %s\n" "$pattern" "$description" >&2 + elif [ "$replace_mode" == --replace-fail ]; then + printf "substituteStream() in derivation $name: ERROR: pattern %q doesn't match anything in %s\n" "$pattern" "$description" >&2 + return 1 fi fi + eval "$var"'=${'"$var"'//"$pattern"/"$replacement"}' ;; --subst-var) diff --git a/pkgs/test/replace-vars/default.nix b/pkgs/test/replace-vars/default.nix index 7d9200a2cf08..e1cc2bf1c13d 100644 --- a/pkgs/test/replace-vars/default.nix +++ b/pkgs/test/replace-vars/default.nix @@ -119,6 +119,30 @@ let grep -F "@c@" $failed/testBuildFailure.log ! grep -F "@b@" $failed/testBuildFailure.log + touch $out + ''; + + fails-in-check-phase-with-bad-exemption = + runCommand "replaceVars-fails" + { + failed = + let + src = builtins.toFile "source.txt" '' + @a@ + @b@ + ''; + in + testBuildFailure ( + callReplaceVars src { + a = "a"; + b = null; + c = null; + } + ); + } + '' + grep -e "ERROR: pattern @c@ doesn't match anything in file.*source.txt" $failed/testBuildFailure.log + touch $out ''; }; From 2439ae5b91e27d188175edf79bed4629f9e322d7 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 10 Feb 2025 20:48:30 +0100 Subject: [PATCH 0312/1107] libtiff: just disable lerc for static builds There isn't really another feasible option here. Maybe one day build systems will have figured out how to handle this, but it isn't going to be soon. --- pkgs/by-name/li/libtiff/package.nix | 30 +++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/li/libtiff/package.nix b/pkgs/by-name/li/libtiff/package.nix index 49d39705ef79..7dea25c62d01 100644 --- a/pkgs/by-name/li/libtiff/package.nix +++ b/pkgs/by-name/li/libtiff/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitLab, - fetchpatch, nix-update-script, cmake, @@ -17,6 +16,17 @@ zlib, zstd, + # Because lerc is C++ and static libraries don't track dependencies, + # that every downstream dependent of libtiff has to link with a C++ + # compiler, or the C++ standard library won't be linked, resulting + # in undefined symbol errors. Without systematic support for this + # in build systems, fixing this would require modifying the build + # system of every libtiff user. Hopefully at some point build + # systems will figure this out, and then we can enable this. + # + # See https://github.com/mesonbuild/meson/issues/14234 + withLerc ? !stdenv.hostPlatform.isStatic, + # for passthru.tests libgeotiff, python3Packages, @@ -43,13 +53,6 @@ stdenv.mkDerivation (finalAttrs: { # libc++abi 11 has an `#include `, this picks up files name # `version` in the project's include paths ./rename-version.patch - - # https://gitlab.com/libtiff/libtiff/-/merge_requests/685 - (fetchpatch { - name = "static.patch"; - url = "https://gitlab.com/libtiff/libtiff/-/commit/e6f3d60187a699507d6c85c5c63a8f258d8b8ebc.patch"; - hash = "sha256-TZE7nyOPojxnR9/jiZbv2LgKS2Yz+Db9lbLgeefrQsc="; - }) ]; postPatch = '' @@ -80,10 +83,13 @@ stdenv.mkDerivation (finalAttrs: { sphinx ]; - buildInputs = [ - lerc - zstd - ]; + buildInputs = + [ + zstd + ] + ++ lib.optionals withLerc [ + lerc + ]; # TODO: opengl support (bogus configure detection) propagatedBuildInputs = [ From 6e5e934a358104bc9a3aa4e249c6c6ffd4ad6e8a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 10 Feb 2025 20:49:52 +0100 Subject: [PATCH 0313/1107] gdk-pixbuf: drop static-lerc.patch This is no longer necessary since static libtiff no longer links with lerc. --- .../libraries/gdk-pixbuf/default.nix | 1 - .../libraries/gdk-pixbuf/static-lerc.patch | 79 ------------------- 2 files changed, 80 deletions(-) delete mode 100644 pkgs/development/libraries/gdk-pixbuf/static-lerc.patch diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 8c1d6926bcb9..95a8e14497d9 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -53,7 +53,6 @@ stdenv.mkDerivation (finalAttrs: { ./installed-tests-path.patch ./static-deps.patch - ./static-lerc.patch ]; # gdk-pixbuf-thumbnailer is not wrapped therefore strictDeps will work diff --git a/pkgs/development/libraries/gdk-pixbuf/static-lerc.patch b/pkgs/development/libraries/gdk-pixbuf/static-lerc.patch deleted file mode 100644 index 737844a078ab..000000000000 --- a/pkgs/development/libraries/gdk-pixbuf/static-lerc.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 3bca69d889fe545dda4ed9a8fab8ff3fe38ba487 Mon Sep 17 00:00:00 2001 -From: Alyssa Ross -Date: Wed, 5 Feb 2025 19:37:27 +0100 -Subject: [PATCH] build: fix linking with libtiff with lerc support - -Lerc is written in C++. When C and C++ objects are linked, a C++ -linker should be used to ensure C++-specific things are correctly -handled. See e.g. this comment in the Meson source for reference[1]. -One symptom of using a C linker to link with C++ objects is that -libstdc++ won't be linked when building static executables, causing -link failures. - -Unfortunately, Meson does not know whether dependencies found by -pkg-config are C++, and therefore require a C++ linker, so we have to -tell it ourselves to use a C++ linker. There's no way to check -whether libtiff is built with Lerc support, so we always use a C++ -linker if one is available and libtiff support is enabled. If a C++ -linker ends up being used to link only C objects, it shouldn't do any -harm. - -[1]: https://github.com/mesonbuild/meson/blob/9fd5281befe7881c9d1210c9e6865382bc0f2b08/mesonbuild/build.py#L1558-L1565 ---- -Link: https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/181 - - gdk-pixbuf/meson.build | 6 ++++++ - meson.build | 6 ++++++ - 2 files changed, 12 insertions(+) - -diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build -index 570625bfe..5cc11355f 100644 ---- a/gdk-pixbuf/meson.build -+++ b/gdk-pixbuf/meson.build -@@ -333,6 +333,11 @@ gdkpixbuf_bin = [ - [ 'gdk-pixbuf-query-loaders', [ 'queryloaders.c' ] ], - ] - -+bin_link_language = 'c' -+if loaders_cpp -+ bin_link_language = 'cpp' -+endif -+ - foreach bin: gdkpixbuf_bin - bin_name = bin[0] - bin_source = bin.get(1, bin_name + '.c') -@@ -342,6 +347,7 @@ foreach bin: gdkpixbuf_bin - dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ], - include_directories: [ root_inc, gdk_pixbuf_inc ], - c_args: common_cflags + gdk_pixbuf_cflags, -+ link_language : bin_link_language, - install: true) - meson.override_find_program(bin_name, bin) - -diff --git a/meson.build b/meson.build -index f0d4812f4..31b3197fc 100644 ---- a/meson.build -+++ b/meson.build -@@ -345,6 +345,8 @@ endif - - # Don't check and build the tiff loader if native_windows_loaders is true - tiff_opt = get_option('tiff') -+tiff_dep = dependency('', required: false) -+loaders_cpp = false - if not tiff_opt.disabled() and not native_windows_loaders - # We currently don't have a fallback subproject, but this handles error - # reporting if tiff_opt is enabled. -@@ -353,6 +355,10 @@ if not tiff_opt.disabled() and not native_windows_loaders - if tiff_dep.found() - enabled_loaders += 'tiff' - loaders_deps += tiff_dep -+ -+ # If libtiff is built with LERC support, it should be linked with -+ # a C++ linker. -+ loaders_cpp = loaders_cpp or add_languages('cpp', required: false, native: false) - endif - endif - --- -GitLab - From 0298e5de03a7f98d4f31b97f0acf3dd231f209a2 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 10 Feb 2025 20:50:46 +0100 Subject: [PATCH 0314/1107] librsvg: run tests for static builds Static libtiff no longer links with LERC, so this works now. --- pkgs/development/libraries/librsvg/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index fcd46738c997..11b9919ecdb6 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -141,18 +141,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonBool "tests" finalAttrs.finalPackage.doCheck) ]; - doCheck = - # Probably broken MIME type detection. - !stdenv.isDarwin - && - # Could be made to work, but requires the C API test to be linked - # with a C++ linker because - # librsvg -> gdk-pixbuf -> libtiff -> lerc (C++). - # - # Doesn't make sense to pursue this upstream until gdk-pixbuf - # itself is fixed: - # https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/181 - !stdenv.hostPlatform.isStatic; + # Probably broken MIME type detection. + doCheck = !stdenv.isDarwin; env = { PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_QUERY_LOADERS = writeShellScript "gdk-pixbuf-loader-loaders-wrapped" '' From 01296c3907f044bacf5fbfec7e67af622469d298 Mon Sep 17 00:00:00 2001 From: Nico Felbinger Date: Mon, 10 Feb 2025 21:16:19 +0100 Subject: [PATCH 0315/1107] nixos/profiles/hardened: add to module list --- nixos/modules/module-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 6408c97d222f..8c1e6f32c277 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -144,6 +144,7 @@ ./misc/passthru.nix ./misc/version.nix ./misc/wordlist.nix + ./profiles/hardened.nix ./programs/_1password-gui.nix ./programs/_1password.nix ./programs/adb.nix From b19d0f6d3d46970dc97012a7a2964aa73d647114 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 25 Jan 2025 16:28:57 +0100 Subject: [PATCH 0316/1107] treewide: replace substituteAll with replaceVars --- .../scripts/incus/incus-container-image.nix | 3 +- .../incus/incus-virtual-machine-image.nix | 3 +- .../scripts/lxd/lxd-container-image.nix | 3 +- .../scripts/lxd/lxd-virtual-machine-image.nix | 3 +- nixos/modules/installer/cd-dvd/iso-image.nix | 6 +--- .../services/misc/taskserver/default.nix | 3 +- .../modules/system/boot/loader/grub/grub.nix | 6 ++-- .../applications/editors/emacs/make-emacs.nix | 1 - pkgs/applications/networking/dropbox/cli.nix | 7 +++-- .../applications/science/logic/z3/default.nix | 2 +- .../ar/arma3-unix-launcher/package.nix | 5 ++-- pkgs/by-name/br/brillo/package.nix | 7 +++-- .../bu/budgie-control-center/package.nix | 6 ++-- ...001-Do-not-download-sources-in-cmake.patch | 2 +- pkgs/by-name/cb/cbmc/package.nix | 7 ++--- pkgs/by-name/fb/fbmenugen/package.nix | 7 +++-- pkgs/by-name/fr/freenet/package.nix | 7 +++-- pkgs/by-name/in/iniparser/package.nix | 1 - pkgs/by-name/me/meson/package.nix | 5 ++-- pkgs/by-name/nu/nuget-to-json/package.nix | 26 +++++++++-------- pkgs/by-name/nu/nuget-to-nix/package.nix | 28 ++++++++++--------- pkgs/by-name/sp/speechd/package.nix | 12 ++++---- pkgs/by-name/us/usbutils/package.nix | 5 ++-- .../stylesheets/xslt/docbook-xsl/default.nix | 5 ++-- .../gnome/extensions/extensionOverrides.nix | 4 +-- .../gnome/extensions/gsconnect/default.nix | 7 +++-- .../extensions/taskwhisperer/default.nix | 6 ++-- .../lomiri/qml/lomiri-ui-toolkit/default.nix | 6 ++-- pkgs/desktops/mate/caja-dropbox/default.nix | 7 +++-- .../development/compilers/crystal/default.nix | 5 ++-- .../compilers/dotnet/sign-apphost.nix | 5 ++-- pkgs/development/compilers/dotnet/wrapper.nix | 11 ++++---- .../compilers/emscripten/default.nix | 5 ++-- pkgs/development/compilers/go/1.22.nix | 11 +++----- pkgs/development/compilers/go/1.23.nix | 11 +++----- pkgs/development/compilers/go/1.24.nix | 11 +++----- pkgs/development/compilers/ponyc/default.nix | 5 ++-- .../compilers/swift/compiler/default.nix | 8 ++---- .../compilers/swift/swift-driver/default.nix | 5 ++-- .../compilers/swift/swiftpm/default.nix | 8 ++---- pkgs/development/compilers/vala/default.nix | 5 ++-- pkgs/development/embedded/platformio/core.nix | 8 ++---- .../haskell-modules/configuration-nix.nix | 6 ++-- .../development/interpreters/acl2/default.nix | 5 ++-- .../interpreters/python/pypy/default.nix | 8 ++---- .../libraries/appstream/default.nix | 5 ++-- pkgs/development/libraries/gssdp/tools.nix | 5 ++-- .../libraries/gstreamer/bad/default.nix | 5 ++-- .../libraries/gstreamer/good/default.nix | 5 ++-- pkgs/development/libraries/gtk/2.x.nix | 5 ++-- pkgs/development/libraries/gtk/3.x.nix | 5 ++-- pkgs/development/libraries/gtk/4.x.nix | 5 ++-- .../libraries/libextractor/default.nix | 5 ++-- pkgs/development/libraries/libpeas/2.x.nix | 5 ++-- .../development/libraries/libpeas/default.nix | 5 ++-- .../libraries/libproxy/default.nix | 5 ++-- .../libraries/libqofono/default.nix | 5 ++-- .../development/libraries/libsbsms/common.nix | 5 ++-- .../development/libraries/libvirt/default.nix | 5 ++-- .../libraries/qgnomeplatform/default.nix | 5 ++-- .../libraries/qt-5/modules/qttools.nix | 8 ++---- .../science/math/or-tools/default.nix | 5 ++-- pkgs/development/libraries/wayqt/default.nix | 5 ++-- .../libraries/webkitgtk/default.nix | 5 ++-- pkgs/development/lisp-modules/nix-cl.nix | 5 ++-- pkgs/development/lua-modules/nfd/default.nix | 5 ++-- .../ocaml-modules/carton/default.nix | 5 ++-- .../ocaml-modules/menhir/default.nix | 5 ++-- .../ocaml-modules/plotkicadsch/default.nix | 5 ++-- .../php-packages/couchbase/default.nix | 5 ++-- .../python-modules/aiohttp/default.nix | 5 ++-- .../python-modules/anytree/default.nix | 5 ++-- .../python-modules/attrs/default.nix | 5 ++-- .../python-modules/bash-kernel/default.nix | 5 ++-- .../python-modules/bokeh/default.nix | 5 ++-- .../python-modules/cairocffi/default.nix | 5 ++-- .../python-modules/cmdstanpy/default.nix | 5 ++-- .../python-modules/debugpy/default.nix | 11 +++----- .../python-modules/deltachat2/default.nix | 5 ++-- pkgs/development/python-modules/django/3.nix | 18 ++++++------ pkgs/development/python-modules/django/4.nix | 8 ++---- pkgs/development/python-modules/django/5.nix | 8 ++---- .../python-modules/dot2tex/default.nix | 5 ++-- .../espeak-phonemizer/default.nix | 5 ++-- .../python-modules/flit-gettext/default.nix | 5 ++-- .../python-modules/gattlib/default.nix | 7 +++-- .../git-annex-adapter/default.nix | 5 ++-- .../python-modules/glymur/default.nix | 5 ++-- .../python-modules/gpuctypes/default.nix | 5 ++-- .../python-modules/graphviz/default.nix | 5 ++-- .../python-modules/hydra-core/default.nix | 5 ++-- .../python-modules/imageio-ffmpeg/default.nix | 5 ++-- .../python-modules/imageio/default.nix | 5 ++-- .../python-modules/img2pdf/default.nix | 5 ++-- .../python-modules/iniconfig/default.nix | 5 ++-- .../python-modules/isal/default.nix | 5 ++-- .../python-modules/k5test/default.nix | 5 ++-- .../kaldi-active-grammar/default.nix | 5 ++-- .../python-modules/kornia-rs/default.nix | 5 ++-- .../python-modules/libevdev/default.nix | 5 ++-- .../python-modules/libusb1/default.nix | 5 ++-- .../python-modules/mido/default.nix | 5 ++-- .../python-modules/mss/default.nix | 5 ++-- .../python-modules/netmap/default.nix | 5 ++-- .../python-modules/nextcord/default.nix | 5 ++-- .../python-modules/nocturne/default.nix | 5 ++-- .../python-modules/notify-py/default.nix | 8 ++---- .../python-modules/numba/default.nix | 5 ++-- .../python-modules/nvidia-ml-py/default.nix | 5 ++-- .../python-modules/objgraph/default.nix | 5 ++-- .../python-modules/ocrmypdf/default.nix | 5 ++-- .../python-modules/omegaconf/default.nix | 5 ++-- .../python-modules/openai-whisper/default.nix | 5 ++-- .../python-modules/opuslib/default.nix | 5 ++-- .../python-modules/ots-python/default.nix | 5 ++-- .../python-modules/pdfminer-six/default.nix | 5 ++-- .../python-modules/phonemizer/default.nix | 5 ++-- .../python-modules/pikepdf/default.nix | 5 ++-- .../development/python-modules/protobuf/4.nix | 5 ++-- .../python-modules/proton-client/default.nix | 5 ++-- .../protonvpn-nm-lib/default.nix | 5 ++-- .../python-modules/pulsectl/default.nix | 5 ++-- .../python-modules/pydot/default.nix | 5 ++-- .../python-modules/pygame-ce/default.nix | 5 ++-- .../python-modules/pygame/default.nix | 5 ++-- .../python-modules/pygraphviz/default.nix | 5 ++-- .../python-modules/pylama/default.nix | 5 ++-- .../python-modules/pylddwrap/default.nix | 5 ++-- .../python-modules/pyocr/default.nix | 22 ++++++++------- .../python-modules/pyogg/default.nix | 5 ++-- .../python-modules/pypandoc/default.nix | 5 ++-- .../python-modules/pyproj/default.nix | 5 ++-- .../python-modules/pysaml2/default.nix | 5 ++-- .../python-modules/pytesseract/default.nix | 5 ++-- .../python-modules/python-magic/default.nix | 5 ++-- .../python-modules/python-mapnik/default.nix | 5 ++-- .../python-matter-server/default.nix | 5 ++-- .../python-rapidjson/default.nix | 5 ++-- .../python-modules/python3-gnutls/default.nix | 5 ++-- .../python-modules/pythran/default.nix | 5 ++-- .../python-modules/pyturbojpeg/default.nix | 5 ++-- .../pyvirtualdisplay/default.nix | 5 ++-- .../python-modules/slixmpp/default.nix | 5 ++-- .../python-modules/sounddevice/default.nix | 5 ++-- .../python-modules/streamdeck/default.nix | 5 ++-- .../python-modules/termplotlib/default.nix | 5 ++-- .../python-modules/tinygrad/default.nix | 5 ++-- .../python-modules/tpm2-pytss/default.nix | 5 ++-- .../python-modules/vispy/default.nix | 5 ++-- .../python-modules/wallet-py3k/default.nix | 5 ++-- .../python-modules/wandb/default.nix | 5 ++-- .../python-modules/wavefile/default.nix | 5 ++-- .../python-modules/weasyprint/default.nix | 6 ++-- .../python-modules/wxpython/4.2.nix | 5 ++-- .../python-modules/xsdata/default.nix | 5 ++-- .../python-modules/youseedee/default.nix | 5 ++-- .../development/python-modules/yq/default.nix | 5 ++-- .../python-modules/zlib-ng/default.nix | 5 ++-- .../rocm-modules/5/rocprofiler/default.nix | 5 ++-- .../rocm-modules/6/rocprofiler/default.nix | 5 ++-- .../tcl-modules/by-name/ex/expect/package.nix | 5 ++-- .../build-managers/bazel/bazel_5/default.nix | 14 ++++------ .../build-managers/bazel/bazel_6/default.nix | 14 ++++------ .../build-managers/bazel/bazel_7/default.nix | 8 ++---- pkgs/development/tools/ocaml/merlin/4.x.nix | 1 - .../tools/ocaml/merlin/default.nix | 7 ++--- .../dwarf-therapist/wrapper.nix | 7 +++-- pkgs/games/dwarf-fortress/wrapper/default.nix | 7 ++--- pkgs/kde/plasma/kinfocenter/default.nix | 7 +++-- pkgs/kde/plasma/plasma-workspace/default.nix | 7 +++-- pkgs/os-specific/linux/udisks/2-default.nix | 11 ++------ pkgs/servers/home-assistant/default.nix | 5 ++-- pkgs/tools/inputmethods/ibus/default.nix | 11 ++++++-- pkgs/tools/misc/ckb-next/default.nix | 6 ++-- .../networking/networkmanager/default.nix | 9 +++--- 175 files changed, 444 insertions(+), 608 deletions(-) diff --git a/nixos/maintainers/scripts/incus/incus-container-image.nix b/nixos/maintainers/scripts/incus/incus-container-image.nix index 63b9353f7ee3..9faf6a5d87ad 100644 --- a/nixos/maintainers/scripts/incus/incus-container-image.nix +++ b/nixos/maintainers/scripts/incus/incus-container-image.nix @@ -16,8 +16,7 @@ # copy the config for nixos-rebuild system.activationScripts.config = let - config = pkgs.substituteAll { - src = ./incus-container-image-inner.nix; + config = pkgs.replaceVars ./incus-container-image-inner.nix { stateVersion = lib.trivial.release; }; in diff --git a/nixos/maintainers/scripts/incus/incus-virtual-machine-image.nix b/nixos/maintainers/scripts/incus/incus-virtual-machine-image.nix index 0742e7d75ac9..db60160c9c77 100644 --- a/nixos/maintainers/scripts/incus/incus-virtual-machine-image.nix +++ b/nixos/maintainers/scripts/incus/incus-virtual-machine-image.nix @@ -16,8 +16,7 @@ # copy the config for nixos-rebuild system.activationScripts.config = let - config = pkgs.substituteAll { - src = ./incus-virtual-machine-image-inner.nix; + config = pkgs.replaceVars ./incus-virtual-machine-image-inner.nix { stateVersion = lib.trivial.release; }; in diff --git a/nixos/maintainers/scripts/lxd/lxd-container-image.nix b/nixos/maintainers/scripts/lxd/lxd-container-image.nix index 5913ed69a6db..0ccc6308b96b 100644 --- a/nixos/maintainers/scripts/lxd/lxd-container-image.nix +++ b/nixos/maintainers/scripts/lxd/lxd-container-image.nix @@ -18,8 +18,7 @@ # copy the config for nixos-rebuild system.activationScripts.config = let - config = pkgs.substituteAll { - src = ./lxd-container-image-inner.nix; + config = pkgs.replaceVars ./lxd-container-image-inner.nix { stateVersion = lib.trivial.release; }; in diff --git a/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix b/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix index 1ccecc4c351d..19582e2c0d5d 100644 --- a/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix +++ b/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix @@ -18,8 +18,7 @@ # copy the config for nixos-rebuild system.activationScripts.config = let - config = pkgs.substituteAll { - src = ./lxd-virtual-machine-image-inner.nix; + config = pkgs.replaceVars ./lxd-virtual-machine-image-inner.nix { stateVersion = lib.trivial.release; }; in diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 5a700f070b62..665b968c9d1d 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -832,11 +832,7 @@ in { source = config.isoImage.splashImage; target = "/isolinux/background.png"; } - { source = pkgs.substituteAll { - name = "isolinux.cfg"; - src = pkgs.writeText "isolinux.cfg-in" isolinuxCfg; - bootRoot = "/boot"; - }; + { source = isolinuxCfg; target = "/isolinux/isolinux.cfg"; } { source = "${pkgs.syslinux}/share/syslinux"; diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix index 592514718940..dc9033b5a23b 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -142,8 +142,7 @@ let src = pkgs.runCommand "nixos-taskserver-src" { preferLocalBuild = true; } '' mkdir -p "$out" cat "${ - pkgs.substituteAll { - src = ./helper-tool.py; + pkgs.replaceVars ./helper-tool.py { inherit taskd certtool; inherit (cfg) dataDir diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 81f94e8639d9..72e8e4c0d081 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -727,11 +727,13 @@ in system.build.installBootLoader = let - install-grub-pl = pkgs.substituteAll { - src = ./install-grub.pl; + install-grub-pl = pkgs.replaceVars ./install-grub.pl { utillinux = pkgs.util-linux; btrfsprogs = pkgs.btrfs-progs; inherit (config.system.nixos) distroName; + # targets of a replacement in code + bootPath = null; + bootRoot = null; }; perl = pkgs.perl.withPackages (p: with p; [ FileSlurp FileCopyRecursive diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index 6a7dbf488591..c50c3a66bd60 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -185,7 +185,6 @@ mkDerivation (finalAttrs: { ./native-comp-driver-options-30.patch ) { - backendPath = ( lib.concatStringsSep " " ( builtins.map (x: ''"-B${x}"'') ( diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix index 31eda100eb97..aeb89f52a6da 100644 --- a/pkgs/applications/networking/dropbox/cli.nix +++ b/pkgs/applications/networking/dropbox/cli.nix @@ -1,7 +1,7 @@ { lib, stdenv, - substituteAll, + replaceVars, autoreconfHook, pkg-config, fetchurl, @@ -34,9 +34,10 @@ stdenv.mkDerivation { strictDeps = true; patches = [ - (substituteAll { - src = ./fix-cli-paths.patch; + (replaceVars ./fix-cli-paths.patch { inherit dropboxd; + # patch context + DESKTOP_FILE_DIR = null; }) ]; diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 1c874934adbd..20be36ebda6c 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -150,7 +150,7 @@ let }; # replace @dir@ in the path of the given list of patches - fixupPatches = dir: map (patch: replaceVars patch { dir = dir; }); + fixupPatches = dir: map (patch: replaceVars patch { inherit dir; }); in { z3_4_13 = common { diff --git a/pkgs/by-name/ar/arma3-unix-launcher/package.nix b/pkgs/by-name/ar/arma3-unix-launcher/package.nix index 6c15df4cd33a..44c3fa908eab 100644 --- a/pkgs/by-name/ar/arma3-unix-launcher/package.nix +++ b/pkgs/by-name/ar/arma3-unix-launcher/package.nix @@ -11,7 +11,7 @@ nlohmann_json, qt5, spdlog, - substituteAll, + replaceVars, buildDayZLauncher ? false, }: stdenv.mkDerivation (finalAttrs: { @@ -27,8 +27,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # prevent CMake from trying to get libraries on the internet - (substituteAll { - src = ./dont_fetch_dependencies.patch; + (replaceVars ./dont_fetch_dependencies.patch { argparse_src = fetchFromGitHub { owner = "p-ranav"; repo = "argparse"; diff --git a/pkgs/by-name/br/brillo/package.nix b/pkgs/by-name/br/brillo/package.nix index fb4358628cdb..3d642154c028 100644 --- a/pkgs/by-name/br/brillo/package.nix +++ b/pkgs/by-name/br/brillo/package.nix @@ -4,7 +4,7 @@ fetchFromGitLab, go-md2man, coreutils, - substituteAll, + replaceVars, }: stdenv.mkDerivation rec { @@ -19,9 +19,10 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./udev-rule.patch; + (replaceVars ./udev-rule.patch { inherit coreutils; + # patch context + group = null; }) ]; diff --git a/pkgs/by-name/bu/budgie-control-center/package.nix b/pkgs/by-name/bu/budgie-control-center/package.nix index 622d46eafa83..1e97c87364d8 100644 --- a/pkgs/by-name/bu/budgie-control-center/package.nix +++ b/pkgs/by-name/bu/budgie-control-center/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - substituteAll, + replaceVars, accountsservice, adwaita-icon-theme, budgie-desktop, @@ -81,13 +81,11 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ - (substituteAll { - src = ./paths.patch; + (replaceVars ./paths.patch { budgie_desktop = budgie-desktop; gcm = gnome-color-manager; inherit cups - glibc libgnomekbd shadow ; diff --git a/pkgs/by-name/cb/cbmc/0001-Do-not-download-sources-in-cmake.patch b/pkgs/by-name/cb/cbmc/0001-Do-not-download-sources-in-cmake.patch index 324fd2adc04a..18a22340b11a 100644 --- a/pkgs/by-name/cb/cbmc/0001-Do-not-download-sources-in-cmake.patch +++ b/pkgs/by-name/cb/cbmc/0001-Do-not-download-sources-in-cmake.patch @@ -17,7 +17,7 @@ index 2c1289a..8128362 100644 download_project(PROJ cudd - URL https://sourceforge.net/projects/cudd-mirror/files/cudd-3.0.0.tar.gz/download - URL_MD5 4fdafe4924b81648b908881c81fe6c30 -+ SOURCE_DIR @cudd.src@ ++ SOURCE_DIR @cudd@ ) if(NOT EXISTS ${cudd_SOURCE_DIR}/Makefile) diff --git a/pkgs/by-name/cb/cbmc/package.nix b/pkgs/by-name/cb/cbmc/package.nix index fe86380d9b6f..9f43b14131de 100644 --- a/pkgs/by-name/cb/cbmc/package.nix +++ b/pkgs/by-name/cb/cbmc/package.nix @@ -8,7 +8,7 @@ flex, makeWrapper, perl, - substituteAll, + replaceVars, cudd, nix-update-script, fetchpatch, @@ -47,9 +47,8 @@ stdenv.mkDerivation (finalAttrs: { ]; patches = [ - (substituteAll { - src = ./0001-Do-not-download-sources-in-cmake.patch; - inherit cudd; + (replaceVars ./0001-Do-not-download-sources-in-cmake.patch { + cudd = cudd.src; }) ./0002-Do-not-download-sources-in-cmake.patch # Fixes build with libc++ >= 19 due to the removal of std::char_traits. diff --git a/pkgs/by-name/fb/fbmenugen/package.nix b/pkgs/by-name/fb/fbmenugen/package.nix index 1b6d303f07dd..018a5a2a1689 100644 --- a/pkgs/by-name/fb/fbmenugen/package.nix +++ b/pkgs/by-name/fb/fbmenugen/package.nix @@ -5,7 +5,7 @@ gnused, makeWrapper, perlPackages, - substituteAll, + replaceVars, xorg, wrapGAppsHook3, gitUpdater, @@ -23,10 +23,11 @@ perlPackages.buildPerlPackage rec { }; patches = [ - (substituteAll { - src = ./0001-Fix-paths.patch; + (replaceVars ./0001-Fix-paths.patch { xmessage = xorg.xmessage; inherit fluxbox gnused; + # replaced in postPatch + fbmenugen = null; }) ]; diff --git a/pkgs/by-name/fr/freenet/package.nix b/pkgs/by-name/fr/freenet/package.nix index 4046a270c3e7..3d9bdb6dac8a 100644 --- a/pkgs/by-name/fr/freenet/package.nix +++ b/pkgs/by-name/fr/freenet/package.nix @@ -8,7 +8,7 @@ gradle_8, bash, coreutils, - substituteAll, + replaceVars, nixosTests, writeText, }: @@ -50,14 +50,15 @@ stdenv.mkDerivation rec { jdk ]; - wrapper = substituteAll { - src = ./freenetWrapper; + wrapper = replaceVars ./freenetWrapper { inherit bash coreutils jre seednodes ; + # replaced in installPhase + CLASSPATH = null; }; mitmCache = gradle.fetchDeps { diff --git a/pkgs/by-name/in/iniparser/package.nix b/pkgs/by-name/in/iniparser/package.nix index ca36474af0d9..b04a3fbf48e7 100644 --- a/pkgs/by-name/in/iniparser/package.nix +++ b/pkgs/by-name/in/iniparser/package.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation (finalAttrs: { (replaceVars ./remove-fetchcontent-usage.patch { # Do not let cmake's fetchContent download unity unitySrc = symlinkJoin { - name = "unity-with-iniparser-config"; paths = [ (fetchFromGitHub { owner = "throwtheswitch"; diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index 79d0e5b7eb54..581f844c8b6c 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -12,7 +12,7 @@ ninja, pkg-config, python3, - substituteAll, + replaceVars, zlib, }: @@ -46,8 +46,7 @@ python3.pkgs.buildPythonApplication rec { # are not as predictable, therefore we need to keep them in the RPATH. # At the moment we are keeping the paths starting with /nix/store. # https://github.com/NixOS/nixpkgs/issues/31222#issuecomment-365811634 - (substituteAll { - src = ./001-fix-rpath.patch; + (replaceVars ./001-fix-rpath.patch { inherit (builtins) storeDir; }) diff --git a/pkgs/by-name/nu/nuget-to-json/package.nix b/pkgs/by-name/nu/nuget-to-json/package.nix index 6a2be3060576..7691a503dcb9 100644 --- a/pkgs/by-name/nu/nuget-to-json/package.nix +++ b/pkgs/by-name/nu/nuget-to-json/package.nix @@ -1,7 +1,7 @@ { lib, runtimeShell, - substituteAll, + replaceVarsWith, nix, coreutils, jq, @@ -12,23 +12,25 @@ cacert, }: -substituteAll { +replaceVarsWith { name = "nuget-to-json"; dir = "bin"; src = ./nuget-to-json.sh; isExecutable = true; - inherit runtimeShell cacert; - binPath = lib.makeBinPath [ - nix - coreutils - jq - xmlstarlet - curl - gnugrep - gawk - ]; + replacements = { + inherit runtimeShell cacert; + binPath = lib.makeBinPath [ + nix + coreutils + jq + xmlstarlet + curl + gnugrep + gawk + ]; + }; meta = { description = "Convert a nuget packages directory to a lockfile for buildDotnetModule"; diff --git a/pkgs/by-name/nu/nuget-to-nix/package.nix b/pkgs/by-name/nu/nuget-to-nix/package.nix index dcd51fa81457..118ca77cc3c6 100644 --- a/pkgs/by-name/nu/nuget-to-nix/package.nix +++ b/pkgs/by-name/nu/nuget-to-nix/package.nix @@ -1,7 +1,7 @@ { lib, runtimeShell, - substituteAll, + replaceVarsWith, nix, coreutils, jq, @@ -13,24 +13,26 @@ cacert, }: -substituteAll { +replaceVarsWith { name = "nuget-to-nix"; dir = "bin"; src = ./nuget-to-nix.sh; isExecutable = true; - inherit runtimeShell cacert; - binPath = lib.makeBinPath [ - nix - coreutils - jq - xmlstarlet - curl - gnugrep - gawk - nuget-to-json - ]; + replacements = { + inherit runtimeShell cacert; + binPath = lib.makeBinPath [ + nix + coreutils + jq + xmlstarlet + curl + gnugrep + gawk + nuget-to-json + ]; + }; meta = { description = "Convert a nuget packages directory to a lockfile for buildDotnetModule"; diff --git a/pkgs/by-name/sp/speechd/package.nix b/pkgs/by-name/sp/speechd/package.nix index 58bee929bfab..2947cf31bdb7 100644 --- a/pkgs/by-name/sp/speechd/package.nix +++ b/pkgs/by-name/sp/speechd/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - substituteAll, + replaceVars, pkg-config, fetchurl, python3Packages, @@ -47,16 +47,16 @@ stdenv.mkDerivation rec { patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { utillinux = util-linux; + # patch context + bindir = null; }) ] ++ lib.optionals (withEspeak && espeak.mbrolaSupport) [ # Replace FHS paths. - (substituteAll { - src = ./fix-mbrola-paths.patch; - inherit espeak mbrola; + (replaceVars ./fix-mbrola-paths.patch { + inherit mbrola; }) ]; diff --git a/pkgs/by-name/us/usbutils/package.nix b/pkgs/by-name/us/usbutils/package.nix index 72a557c931f0..49a7d88925ea 100644 --- a/pkgs/by-name/us/usbutils/package.nix +++ b/pkgs/by-name/us/usbutils/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - substituteAll, + replaceVars, fetchpatch, meson, ninja, @@ -23,8 +23,7 @@ stdenv.mkDerivation rec { patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { inherit hwdata; }) ] diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix index 8d839427a2fe..49beba0de955 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, - substituteAll, + replaceVars, fetchurl, fetchpatch, findXMLCatalogs, @@ -50,8 +50,7 @@ let }) # Add legacy sourceforge.net URIs to the catalog - (substituteAll { - src = ./catalog-legacy-uris.patch; + (replaceVars ./catalog-legacy-uris.patch { inherit legacySuffix suffix version; }) ] diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix index b3f1929c3cef..c4bd7f0880b4 100644 --- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -21,7 +21,6 @@ , smartmontools , replaceVars , stdenvNoCC -, substituteAll , touchegg , util-linux , vte @@ -136,8 +135,7 @@ super: lib.trivial.pipe super [ }); in { patches = [ - (substituteAll { - src = ./extensionOverridesPatches/lunarcal_at_ailin.nemui.patch; + (replaceVars ./extensionOverridesPatches/lunarcal_at_ailin.nemui.patch { chinese_calendar_path = chinese-calendar; }) ]; diff --git a/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix index c4db5afa5771..3a029b6519f1 100644 --- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchFromGitHub -, substituteAll +, replaceVars , openssl , gsound , meson @@ -35,9 +35,10 @@ stdenv.mkDerivation rec { patches = [ # Make typelibs available in the extension - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { gapplication = "${glib.bin}/bin/gapplication"; + # Replaced in postPatch + typelibPath = null; }) # Allow installing installed tests to a separate output diff --git a/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix index fc37e6875820..32b920fce9c0 100644 --- a/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix +++ b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, - substituteAll, + replaceVars, fetchFromGitHub, taskwarrior2, gettext, @@ -37,10 +37,8 @@ stdenv.mkDerivation rec { ]; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { task = "${taskwarrior2}/bin/task"; - shell = runtimeShell; }) ]; diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix index 3ad337e3dd80..ca2dece93391 100644 --- a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix +++ b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix @@ -3,7 +3,7 @@ lib, fetchFromGitLab, gitUpdater, - substituteAll, + replaceVars, testers, dbus-test-runner, dpkg, @@ -63,9 +63,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./2001-Mark-problematic-tests.patch - (substituteAll { - src = ./2002-Nixpkgs-versioned-QML-path.patch.in; - name = "2002-Nixpkgs-versioned-QML-path.patch"; + (replaceVars ./2002-Nixpkgs-versioned-QML-path.patch.in { qtVersion = lib.versions.major qtbase.version; }) ]; diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix index 00ee31898376..9bce1b56f531 100644 --- a/pkgs/desktops/mate/caja-dropbox/default.nix +++ b/pkgs/desktops/mate/caja-dropbox/default.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - substituteAll, + replaceVars, pkg-config, gobject-introspection, gdk-pixbuf, @@ -26,9 +26,10 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./fix-cli-paths.patch; + (replaceVars ./fix-cli-paths.patch { inherit dropboxd; + # patch context + DESKTOP_FILE_DIR = null; }) ]; diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 52557ca4a64a..f83ac656dcf8 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -4,7 +4,7 @@ , fetchurl , fetchpatch , lib -, substituteAll +, replaceVars # Dependencies , boehmgc , coreutils @@ -95,8 +95,7 @@ let }; patches = [ - (substituteAll { - src = ./tzdata.patch; + (replaceVars ./tzdata.patch { inherit tzdata; }) ] diff --git a/pkgs/development/compilers/dotnet/sign-apphost.nix b/pkgs/development/compilers/dotnet/sign-apphost.nix index 021d9ef61a90..e69adc5f3660 100644 --- a/pkgs/development/compilers/dotnet/sign-apphost.nix +++ b/pkgs/development/compilers/dotnet/sign-apphost.nix @@ -1,12 +1,11 @@ { - substituteAll, + replaceVars, callPackage, }: let sigtool = callPackage ./sigtool.nix { }; in -substituteAll { - src = ./sign-apphost.proj; +replaceVars ./sign-apphost.proj { codesign = "${sigtool}/bin/codesign"; } diff --git a/pkgs/development/compilers/dotnet/wrapper.nix b/pkgs/development/compilers/dotnet/wrapper.nix index d268476c2c14..2ac14b665fea 100644 --- a/pkgs/development/compilers/dotnet/wrapper.nix +++ b/pkgs/development/compilers/dotnet/wrapper.nix @@ -15,7 +15,7 @@ darwin, icu, lndir, - substituteAll, + replaceVars, nugetPackageHook, xmlstarlet, }: @@ -42,10 +42,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { [ ./dotnet-setup-hook.sh ] - ++ lib.optional (type == "sdk") (substituteAll { - src = ./dotnet-sdk-setup-hook.sh; - inherit lndir xmlstarlet; - }); + ++ lib.optional (type == "sdk") ( + replaceVars ./dotnet-sdk-setup-hook.sh { + inherit lndir xmlstarlet; + } + ); propagatedSandboxProfile = toString unwrapped.__propagatedSandboxProfile; diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 6a3e7738fc1d..54386a3ca24e 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -10,7 +10,7 @@ llvmPackages, symlinkJoin, makeWrapper, - substituteAll, + replaceVars, buildNpmPackage, emscripten, }: @@ -57,8 +57,7 @@ stdenv.mkDerivation rec { ]; patches = [ - (substituteAll { - src = ./0001-emulate-clang-sysroot-include-logic.patch; + (replaceVars ./0001-emulate-clang-sysroot-include-logic.patch { resourceDir = "${llvmEnv}/lib/clang/${lib.versions.major llvmPackages.llvm.version}/"; }) ]; diff --git a/pkgs/development/compilers/go/1.22.nix b/pkgs/development/compilers/go/1.22.nix index b64be8d90a71..471d398358a8 100644 --- a/pkgs/development/compilers/go/1.22.nix +++ b/pkgs/development/compilers/go/1.22.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, tzdata, - substituteAll, + replaceVars, iana-etc, xcbuild, mailcap, @@ -75,20 +75,17 @@ stdenv.mkDerivation (finalAttrs: { ''; patches = [ - (substituteAll { - src = ./iana-etc-1.17.patch; + (replaceVars ./iana-etc-1.17.patch { iana = iana-etc; }) # Patch the mimetype database location which is missing on NixOS. # but also allow static binaries built with NixOS to run outside nix - (substituteAll { - src = ./mailcap-1.17.patch; + (replaceVars ./mailcap-1.17.patch { inherit mailcap; }) # prepend the nix path to the zoneinfo files but also leave the original value for static binaries # that run outside a nix server - (substituteAll { - src = ./tzdata-1.19.patch; + (replaceVars ./tzdata-1.19.patch { inherit tzdata; }) ./remove-tools-1.11.patch diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix index 514cf806be38..dfeffaac7784 100644 --- a/pkgs/development/compilers/go/1.23.nix +++ b/pkgs/development/compilers/go/1.23.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, tzdata, - substituteAll, + replaceVars, iana-etc, xcbuild, mailcap, @@ -75,20 +75,17 @@ stdenv.mkDerivation (finalAttrs: { ''; patches = [ - (substituteAll { - src = ./iana-etc-1.17.patch; + (replaceVars ./iana-etc-1.17.patch { iana = iana-etc; }) # Patch the mimetype database location which is missing on NixOS. # but also allow static binaries built with NixOS to run outside nix - (substituteAll { - src = ./mailcap-1.17.patch; + (replaceVars ./mailcap-1.17.patch { inherit mailcap; }) # prepend the nix path to the zoneinfo files but also leave the original value for static binaries # that run outside a nix server - (substituteAll { - src = ./tzdata-1.19.patch; + (replaceVars ./tzdata-1.19.patch { inherit tzdata; }) ./remove-tools-1.11.patch diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix index 75a4cb6c8475..a563cbcd85a2 100644 --- a/pkgs/development/compilers/go/1.24.nix +++ b/pkgs/development/compilers/go/1.24.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, tzdata, - substituteAll, + replaceVars, iana-etc, xcbuild, mailcap, @@ -75,20 +75,17 @@ stdenv.mkDerivation (finalAttrs: { ''; patches = [ - (substituteAll { - src = ./iana-etc-1.17.patch; + (replaceVars ./iana-etc-1.17.patch { iana = iana-etc; }) # Patch the mimetype database location which is missing on NixOS. # but also allow static binaries built with NixOS to run outside nix - (substituteAll { - src = ./mailcap-1.17.patch; + (replaceVars ./mailcap-1.17.patch { inherit mailcap; }) # prepend the nix path to the zoneinfo files but also leave the original value for static binaries # that run outside a nix server - (substituteAll { - src = ./tzdata-1.19.patch; + (replaceVars ./tzdata-1.19.patch { inherit tzdata; }) ./remove-tools-1.11.patch diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 005605e9095a..a78cd863dabd 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -13,7 +13,7 @@ python3, # Not really used for anything real, just at build time. git, - substituteAll, + replaceVars, which, z3, cctools, @@ -67,8 +67,7 @@ stdenv.mkDerivation (rec { ./disable-networking-tests.patch ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - (substituteAll { - src = ./fix-darwin-build.patch; + (replaceVars ./fix-darwin-build.patch { libSystem = darwin.Libsystem; }) ]; diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix index 09a9e59eff3d..8e21e0d0e166 100644 --- a/pkgs/development/compilers/swift/compiler/default.nix +++ b/pkgs/development/compilers/swift/compiler/default.nix @@ -28,7 +28,7 @@ , glibc , libuuid # Darwin-specific -, substituteAll +, replaceVars , fixDarwinDylibNames , xcbuild , cctools # libtool @@ -300,12 +300,10 @@ in stdenv.mkDerivation { patch -p1 -d swift -i ${./patches/swift-linux-fix-libc-paths.patch} patch -p1 -d swift -i ${./patches/swift-linux-fix-linking.patch} patch -p1 -d swift -i ${./patches/swift-darwin-libcxx-flags.patch} - patch -p1 -d swift -i ${substituteAll { - src = ./patches/swift-darwin-plistbuddy-workaround.patch; + patch -p1 -d swift -i ${replaceVars ./patches/swift-darwin-plistbuddy-workaround.patch { inherit swiftArch; }} - patch -p1 -d swift -i ${substituteAll { - src = ./patches/swift-prevent-sdk-dirs-warning.patch; + patch -p1 -d swift -i ${replaceVars ./patches/swift-prevent-sdk-dirs-warning.patch { inherit (builtins) storeDir; }} diff --git a/pkgs/development/compilers/swift/swift-driver/default.nix b/pkgs/development/compilers/swift/swift-driver/default.nix index 52567304af31..1872e9f6a875 100644 --- a/pkgs/development/compilers/swift/swift-driver/default.nix +++ b/pkgs/development/compilers/swift/swift-driver/default.nix @@ -10,7 +10,7 @@ XCTest, sqlite, ncurses, - substituteAll, + replaceVars, }: let sources = callPackage ../sources.nix { }; @@ -50,8 +50,7 @@ stdenv.mkDerivation { hash = "sha256-eVBaKN6uzj48ZnHtwGV0k5ChKjak1tDCyE+wTdyGq2c="; }) # Prevent a warning about SDK directories we don't have. - (substituteAll { - src = ./patches/prevent-sdk-dirs-warnings.patch; + (replaceVars ./patches/prevent-sdk-dirs-warnings.patch { inherit (builtins) storeDir; }) ]; diff --git a/pkgs/development/compilers/swift/swiftpm/default.nix b/pkgs/development/compilers/swift/swiftpm/default.nix index 53fd9fcb8ac9..48f8b49a8df4 100644 --- a/pkgs/development/compilers/swift/swiftpm/default.nix +++ b/pkgs/development/compilers/swift/swiftpm/default.nix @@ -13,7 +13,7 @@ pkg-config, sqlite, ncurses, - substituteAll, + replaceVars, runCommandLocal, makeWrapper, DarwinTools, # sw_vers @@ -45,8 +45,7 @@ let ./patches/disable-xctest.patch ./patches/fix-clang-cxx.patch ./patches/nix-pkgconfig-vars.patch - (substituteAll { - src = ./patches/fix-stdlib-path.patch; + (replaceVars ./patches/fix-stdlib-path.patch { inherit (builtins) storeDir; swiftLib = swift.swift.lib; }) @@ -429,8 +428,7 @@ stdenv.mkDerivation ( # Prevent a warning about SDK directories we don't have. swiftpmMakeMutable swift-driver patch -p1 -d .build/checkouts/swift-driver -i ${ - substituteAll { - src = ../swift-driver/patches/prevent-sdk-dirs-warnings.patch; + replaceVars ../swift-driver/patches/prevent-sdk-dirs-warnings.patch { inherit (builtins) storeDir; } } diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 0285a5355461..0c5c18277e2a 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -15,7 +15,7 @@ libintl, libtool, expat, - substituteAll, + replaceVars, vala, gobject-introspection, }: @@ -45,8 +45,7 @@ let pname = "vala"; inherit version; - setupHook = substituteAll { - src = ./setup-hook.sh; + setupHook = replaceVars ./setup-hook.sh { apiVersion = lib.versions.majorMinor version; }; diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index e9071fa1ab24..1e5cdce702c1 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -6,7 +6,7 @@ installShellFiles, git, spdx-license-list-data, - substituteAll, + replaceVars, }: with python3Packages; @@ -29,12 +29,10 @@ buildPythonApplication rec { ]; patches = [ - (substituteAll { - src = ./interpreter.patch; + (replaceVars ./interpreter.patch { interpreter = (python3Packages.python.withPackages (_: propagatedBuildInputs)).interpreter; }) - (substituteAll { - src = ./use-local-spdx-license-list.patch; + (replaceVars ./use-local-spdx-license-list.patch { spdx_license_list_data = spdx-license-list-data.json; }) ./missing-udev-rules-nixos.patch diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index c0ff75b80800..c098a042b3ab 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1325,9 +1325,11 @@ self: super: builtins.intersectAttrs super { # whatever graphviz is in PATH. graphviz = overrideCabal (drv: { patches = [ - (pkgs.substituteAll { - src = ./patches/graphviz-hardcode-graphviz-store-path.patch; + (pkgs.replaceVars ./patches/graphviz-hardcode-graphviz-store-path.patch { inherit (pkgs) graphviz; + # patch context + dot = null; + PATH = null; }) ] ++ (drv.patches or []); }) super.graphviz; diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index 6be3b9a865c5..3f6fbe627898 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -6,7 +6,7 @@ fetchpatch, runCommandLocal, makeWrapper, - substituteAll, + replaceVars, sbcl, bash, which, @@ -52,8 +52,7 @@ stdenv.mkDerivation rec { libipasir = callPackage ./libipasirglucose4 { }; patches = [ - (substituteAll { - src = ./0001-Fix-some-paths-for-Nix-build.patch; + (replaceVars ./0001-Fix-some-paths-for-Nix-build.patch { libipasir = "${libipasir}/lib/${libipasir.libname}"; libssl = "${lib.getLib openssl}/lib/libssl${stdenv.hostPlatform.extensions.sharedLibrary}"; libcrypto = "${lib.getLib openssl}/lib/libcrypto${stdenv.hostPlatform.extensions.sharedLibrary}"; diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 795bceede768..f40efde427ee 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, substituteAll, fetchurl +{ lib, stdenv, replaceVars, fetchurl , zlibSupport ? true, zlib , bzip2, pkg-config, libffi , sqlite, openssl, ncurses, python, expat, tcl, tk, tclPackages, libX11 @@ -76,8 +76,7 @@ in with passthru; stdenv.mkDerivation rec { patches = [ ./dont_fetch_vendored_deps.patch - (substituteAll { - src = ./tk_tcl_paths.patch; + (replaceVars ./tk_tcl_paths.patch { inherit tk tcl; tk_dev = tk.dev; tcl_dev = tcl; @@ -85,8 +84,7 @@ in with passthru; stdenv.mkDerivation rec { tcl_libprefix = tcl.libPrefix; }) - (substituteAll { - src = ./sqlite_paths.patch; + (replaceVars ./sqlite_paths.patch { inherit (sqlite) out dev; }) ]; diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index a0ea85c83543..d4d0e26adb08 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, substituteAll +, replaceVars , fetchFromGitHub , meson , mesonEmulatorHook @@ -50,8 +50,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Fix hardcoded paths - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { libstemmer_includedir = "${lib.getDev libstemmer}/include"; }) diff --git a/pkgs/development/libraries/gssdp/tools.nix b/pkgs/development/libraries/gssdp/tools.nix index 7708bb6991a2..37fa43f91990 100644 --- a/pkgs/development/libraries/gssdp/tools.nix +++ b/pkgs/development/libraries/gssdp/tools.nix @@ -1,7 +1,7 @@ { stdenv, lib, - substituteAll, + replaceVars, meson, ninja, pkg-config, @@ -18,8 +18,7 @@ stdenv.mkDerivation rec { patches = [ # Allow building tools separately from the library. # This is needed to break the depenency cycle. - (substituteAll { - src = ./standalone-tools.patch; + (replaceVars ./standalone-tools.patch { inherit version; }) ]; diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 3231bb6c649f..7e756b976b21 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , fetchpatch -, substituteAll +, replaceVars , meson , ninja , gettext @@ -127,8 +127,7 @@ stdenv.mkDerivation rec { patches = [ # Add fallback paths for nvidia userspace libraries - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { inherit (addDriverRunpath) driverLink; }) # Add support for newer AJA SDK from next GStreamer release diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index f9da5f6ba128..dd8abf8a8b99 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, substituteAll +, replaceVars , meson , nasm , ninja @@ -71,8 +71,7 @@ stdenv.mkDerivation rec { # Reenable dynamic loading of libsoup on Darwin and use a different approach to do it. ./souploader-darwin.diff # dlopen libsoup_3 with an absolute path - (substituteAll { - src = ./souploader.diff; + (replaceVars ./souploader.diff { nixLibSoup3Path = "${lib.getLib libsoup_3}/lib"; }) ]; diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index d1abe9b8e035..87b638ad76a4 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -22,7 +22,7 @@ pango, perl, pkg-config, - substituteAll, + replaceVars, testers, AppKit, Cocoa, @@ -32,8 +32,7 @@ }: let - gtkCleanImmodulesCache = substituteAll { - src = ./hooks/clean-immodules-cache.sh; + gtkCleanImmodulesCache = replaceVars ./hooks/clean-immodules-cache.sh { gtk_module_path = "gtk-2.0"; gtk_binary_version = "2.10.0"; }; diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index e995b48a1557..4f7ff70764c5 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -1,6 +1,6 @@ { lib , stdenv -, substituteAll +, replaceVars , fetchurl , pkg-config , gettext @@ -53,8 +53,7 @@ let - gtkCleanImmodulesCache = substituteAll { - src = ./hooks/clean-immodules-cache.sh; + gtkCleanImmodulesCache = replaceVars ./hooks/clean-immodules-cache.sh { gtk_module_path = "gtk-3.0"; gtk_binary_version = "3.0.0"; }; diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index c89cbce621a1..3c5cb9e863c1 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -1,7 +1,7 @@ { lib , stdenv , buildPackages -, substituteAll +, replaceVars , fetchurl , pkg-config , docutils @@ -58,8 +58,7 @@ let - gtkCleanImmodulesCache = substituteAll { - src = ./hooks/clean-immodules-cache.sh; + gtkCleanImmodulesCache = replaceVars ./hooks/clean-immodules-cache.sh { gtk_module_path = "gtk-4.0"; gtk_binary_version = "4.0.0"; }; diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index b46d4d8d1975..c8a545239846 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, fetchpatch2, - substituteAll, + replaceVars, libtool, gettext, zlib, @@ -60,8 +60,7 @@ stdenv.mkDerivation rec { ++ lib.optionals gstreamerSupport [ # Libraries cannot be wrapped so we need to hardcode the plug-in paths. - (substituteAll { - src = ./gst-hardcode-plugins.patch; + (replaceVars ./gst-hardcode-plugins.patch { load_gst_plugins = lib.concatMapStrings ( plugin: ''gst_registry_scan_path(gst_registry_get(), "${lib.getLib plugin}/lib/gstreamer-1.0");'' ) (gstPlugins gst_all_1); diff --git a/pkgs/development/libraries/libpeas/2.x.nix b/pkgs/development/libraries/libpeas/2.x.nix index 35f204a1d5b4..c318f57be718 100644 --- a/pkgs/development/libraries/libpeas/2.x.nix +++ b/pkgs/development/libraries/libpeas/2.x.nix @@ -3,7 +3,7 @@ , buildPackages , fetchurl , pkgsCross -, substituteAll +, replaceVars , pkg-config , gi-docgen , gobject-introspection @@ -34,8 +34,7 @@ stdenv.mkDerivation rec { patches = [ # Make PyGObject’s gi library available. - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { pythonPaths = lib.concatMapStringsSep ", " (pkg: "'${pkg}/${python3.sitePackages}'") [ python3.pkgs.pygobject3 ]; diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index df0398797df0..2958f8f31b55 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -2,7 +2,7 @@ stdenv, lib, fetchurl, - substituteAll, + replaceVars, meson, ninja, pkg-config, @@ -34,8 +34,7 @@ stdenv.mkDerivation rec { patches = [ # Make PyGObject’s gi library available. - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { pythonPaths = lib.concatMapStringsSep ", " (pkg: "'${pkg}/${python3.sitePackages}'") [ python3.pkgs.pygobject3 ]; diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index fe65c9d3bc1e..ad0c8d343fb6 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -15,7 +15,7 @@ ninja, pkg-config, stdenv, - substituteAll, + replaceVars, vala, }: @@ -46,8 +46,7 @@ stdenv.mkDerivation (finalAttrs: { # Hardcode path to Settings schemas for GNOME & related desktops. # Otherwise every app using libproxy would need to be wrapped individually. - (substituteAll { - src = ./hardcode-gsettings.patch; + (replaceVars ./hardcode-gsettings.patch { gds = glib.getSchemaPath gsettings-desktop-schemas; }) ]; diff --git a/pkgs/development/libraries/libqofono/default.nix b/pkgs/development/libraries/libqofono/default.nix index 04acf0639767..4b67650d3541 100644 --- a/pkgs/development/libraries/libqofono/default.nix +++ b/pkgs/development/libraries/libqofono/default.nix @@ -1,6 +1,6 @@ { lib, - substituteAll, + replaceVars, mkDerivation, fetchFromGitHub, gitUpdater, @@ -22,8 +22,7 @@ mkDerivation rec { }; patches = [ - (substituteAll { - src = ./0001-NixOS-provide-mobile-broadband-provider-info-path.patch; + (replaceVars ./0001-NixOS-provide-mobile-broadband-provider-info-path.patch { mobileBroadbandProviderInfo = mobile-broadband-provider-info; }) ./0001-NixOS-Skip-tests-they-re-shock-full-of-hardcoded-FHS.patch diff --git a/pkgs/development/libraries/libsbsms/common.nix b/pkgs/development/libraries/libsbsms/common.nix index 358710b79501..71c7114b296c 100644 --- a/pkgs/development/libraries/libsbsms/common.nix +++ b/pkgs/development/libraries/libsbsms/common.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - substituteAll, + replaceVars, pname, version, url, @@ -19,8 +19,7 @@ stdenv.mkDerivation rec { patches = [ # Fix buidling on platforms other than x86 - (substituteAll { - src = ./configure.patch; + (replaceVars ./configure.patch { msse = lib.optionalString stdenv.hostPlatform.isx86_64 "-msse"; }) ]; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 4de3f7887bc8..00856f3ef29d 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -32,7 +32,7 @@ , readline , rpcsvc-proto , stdenv -, substituteAll +, replaceVars , xhtml1 , json_c , writeScript @@ -127,8 +127,7 @@ stdenv.mkDerivation rec { patches = [ ./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch ] ++ lib.optionals enableZfs [ - (substituteAll { - src = ./0002-substitute-zfs-and-zpool-commands.patch; + (replaceVars ./0002-substitute-zfs-and-zpool-commands.patch { zfs = "${zfs}/bin/zfs"; zpool = "${zfs}/bin/zpool"; }) diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix index 187236621730..270a6593c740 100644 --- a/pkgs/development/libraries/qgnomeplatform/default.nix +++ b/pkgs/development/libraries/qgnomeplatform/default.nix @@ -11,7 +11,7 @@ gtk3, qtbase, qtwayland, - substituteAll, + replaceVars, gsettings-desktop-schemas, useQt6 ? false, }: @@ -29,8 +29,7 @@ stdenv.mkDerivation rec { patches = [ # Hardcode GSettings schema path to avoid crashes from missing schemas - (substituteAll { - src = ./hardcode-gsettings.patch; + (replaceVars ./hardcode-gsettings.patch { gds_gsettings_path = glib.getSchemaPath gsettings-desktop-schemas; }) diff --git a/pkgs/development/libraries/qt-5/modules/qttools.nix b/pkgs/development/libraries/qt-5/modules/qttools.nix index 52be15d64e8a..e4b95207fe92 100644 --- a/pkgs/development/libraries/qt-5/modules/qttools.nix +++ b/pkgs/development/libraries/qt-5/modules/qttools.nix @@ -4,7 +4,7 @@ lib, qtbase, qtdeclarative, - substituteAll, + replaceVars, llvmPackages, }: @@ -29,13 +29,11 @@ qtModule { patches = [ # fixQtBuiltinPaths overwrites builtin paths we should keep - (substituteAll { - src = ./qttools-QT_HOST_DATA-refs.patch; + (replaceVars ./qttools-QT_HOST_DATA-refs.patch { qtbaseDev = lib.getDev qtbase; }) - (substituteAll { - src = ./qttools-libclang-main-header.patch; + (replaceVars ./qttools-libclang-main-header.patch { libclangDev = lib.getDev llvmPackages.libclang; }) ]; diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index c460694da0fe..3c3fac71a1e4 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -7,7 +7,7 @@ eigen, ensureNewerSourcesForZipFilesHook, fetchFromGitHub, - substituteAll, + replaceVars, glpk, lib, pkg-config, @@ -40,8 +40,7 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./offline.patch; + (replaceVars ./offline.patch { pybind11_protobuf = "../../pybind11_protobuf"; }) ]; diff --git a/pkgs/development/libraries/wayqt/default.nix b/pkgs/development/libraries/wayqt/default.nix index 86fa6cd20325..3bed9f6fc7bb 100644 --- a/pkgs/development/libraries/wayqt/default.nix +++ b/pkgs/development/libraries/wayqt/default.nix @@ -2,7 +2,7 @@ stdenv, lib, fetchFromGitLab, - substituteAll, + replaceVars, meson, pkg-config, qttools, @@ -25,8 +25,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # qmake get qtbase's path, but wayqt need qtwayland - (substituteAll { - src = ./fix-qtwayland-header-path.diff; + (replaceVars ./fix-qtwayland-header-path.diff { qtWaylandPath = "${qtwayland}/include"; }) ]; diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 1469dd6d6429..e1609e6f2ed3 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -65,7 +65,7 @@ libbacktrace, systemd, xdg-dbus-proxy, - substituteAll, + replaceVars, glib, unifdef, addDriverRunpath, @@ -103,8 +103,7 @@ clangStdenv.mkDerivation (finalAttrs: { }; patches = lib.optionals clangStdenv.hostPlatform.isLinux [ - (substituteAll { - src = ./fix-bubblewrap-paths.patch; + (replaceVars ./fix-bubblewrap-paths.patch { inherit (builtins) storeDir; inherit (addDriverRunpath) driverLink; }) diff --git a/pkgs/development/lisp-modules/nix-cl.nix b/pkgs/development/lisp-modules/nix-cl.nix index 773372d25afa..1357dafe3df3 100644 --- a/pkgs/development/lisp-modules/nix-cl.nix +++ b/pkgs/development/lisp-modules/nix-cl.nix @@ -59,7 +59,7 @@ let ; inherit (pkgs) - substituteAll + replaceVars ; # Stolen from python-packages.nix @@ -209,8 +209,7 @@ let ; }; - buildScript = substituteAll { - src = ./builder.lisp; + buildScript = replaceVars ./builder.lisp { asdf = "${asdfFasl}/asdf.${faslExt}"; }; diff --git a/pkgs/development/lua-modules/nfd/default.nix b/pkgs/development/lua-modules/nfd/default.nix index 1b34c1bd1803..a9b7aaef9e77 100644 --- a/pkgs/development/lua-modules/nfd/default.nix +++ b/pkgs/development/lua-modules/nfd/default.nix @@ -5,7 +5,7 @@ lua, pkg-config, lib, - substituteAll, + replaceVars, zenity, AppKit, }: @@ -24,8 +24,7 @@ buildLuarocksPackage { # use zenity because default gtk impl just crashes patches = [ - (substituteAll { - src = ./zenity.patch; + (replaceVars ./zenity.patch { inherit zenity; }) ]; diff --git a/pkgs/development/ocaml-modules/carton/default.nix b/pkgs/development/ocaml-modules/carton/default.nix index b1f35bea8fa5..ea9eb4f06462 100644 --- a/pkgs/development/ocaml-modules/carton/default.nix +++ b/pkgs/development/ocaml-modules/carton/default.nix @@ -27,7 +27,7 @@ cmdliner, hxd, getconf, - substituteAll, + replaceVars, }: buildDunePackage rec { @@ -42,8 +42,7 @@ buildDunePackage rec { }; patches = [ - (substituteAll { - src = ./carton-find-getconf.patch; + (replaceVars ./carton-find-getconf.patch { getconf = "${getconf}"; }) ]; diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix index ae0f15843b30..c465e0fc6d32 100644 --- a/pkgs/development/ocaml-modules/menhir/default.nix +++ b/pkgs/development/ocaml-modules/menhir/default.nix @@ -1,6 +1,6 @@ { buildDunePackage, - substituteAll, + replaceVars, ocaml, menhirLib, menhirSdk, @@ -19,8 +19,7 @@ buildDunePackage rec { ]; patches = [ - (substituteAll { - src = ./menhir-suggest-menhirLib.patch; + (replaceVars ./menhir-suggest-menhirLib.patch { libdir = "${menhirLib}/lib/ocaml/${ocaml.version}/site-lib/menhirLib"; }) ]; diff --git a/pkgs/development/ocaml-modules/plotkicadsch/default.nix b/pkgs/development/ocaml-modules/plotkicadsch/default.nix index 69f67ae580a6..3497dd0771a3 100644 --- a/pkgs/development/ocaml-modules/plotkicadsch/default.nix +++ b/pkgs/development/ocaml-modules/plotkicadsch/default.nix @@ -1,7 +1,7 @@ { lib, buildDunePackage, - substituteAll, + replaceVars, base64, cmdliner, digestif, @@ -24,8 +24,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.09"; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { inherit coreutils imagemagick; }) ]; diff --git a/pkgs/development/php-packages/couchbase/default.nix b/pkgs/development/php-packages/couchbase/default.nix index 381ec3734243..fb98e4846d83 100644 --- a/pkgs/development/php-packages/couchbase/default.nix +++ b/pkgs/development/php-packages/couchbase/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, libcouchbase, zlib, - substituteAll, + replaceVars, php, }: let @@ -29,8 +29,7 @@ buildPecl { ]; patches = [ - (substituteAll { - src = ./libcouchbase.patch; + (replaceVars ./libcouchbase.patch { inherit libcouchbase; }) ]; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index bf6a0326ff4e..028cceefc363 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, fetchFromGitHub, fetchpatch2, - substituteAll, + replaceVars, isPy310, isPyPy, @@ -57,8 +57,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./unvendor-llhttp.patch; + (replaceVars ./unvendor-llhttp.patch { llhttpDev = lib.getDev llhttp; llhttpLib = lib.getLib llhttp; }) diff --git a/pkgs/development/python-modules/anytree/default.nix b/pkgs/development/python-modules/anytree/default.nix index 55f1b8d9ac13..9483bf12dadc 100644 --- a/pkgs/development/python-modules/anytree/default.nix +++ b/pkgs/development/python-modules/anytree/default.nix @@ -8,7 +8,7 @@ pytest7CheckHook, pythonOlder, six, - substituteAll, + replaceVars, withGraphviz ? true, }: @@ -27,8 +27,7 @@ buildPythonPackage rec { }; patches = lib.optionals withGraphviz [ - (substituteAll { - src = ./graphviz.patch; + (replaceVars ./graphviz.patch { inherit graphviz; }) ]; diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix index 5f14d0b149a6..f8824a6fef31 100644 --- a/pkgs/development/python-modules/attrs/default.nix +++ b/pkgs/development/python-modules/attrs/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, fetchPypi, pythonOlder, - substituteAll, + replaceVars, hatchling, }: @@ -20,9 +20,8 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { + (replaceVars ./remove-hatch-plugins.patch { # hatch-vcs and hatch-fancy-pypi-readme depend on pytest, which depends on attrs - src = ./remove-hatch-plugins.patch; inherit version; }) ]; diff --git a/pkgs/development/python-modules/bash-kernel/default.nix b/pkgs/development/python-modules/bash-kernel/default.nix index ff088a618e1d..6e546b311d3f 100644 --- a/pkgs/development/python-modules/bash-kernel/default.nix +++ b/pkgs/development/python-modules/bash-kernel/default.nix @@ -8,7 +8,7 @@ python, pexpect, bashInteractive, - substituteAll, + replaceVars, }: buildPythonPackage rec { @@ -23,8 +23,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./bash-path.patch; + (replaceVars ./bash-path.patch { bash = lib.getExe bashInteractive; }) ]; diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 9ed21c339dee..9f7ac29dd5ec 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -4,7 +4,7 @@ fetchPypi, fetchFromGitHub, pythonOlder, - substituteAll, + replaceVars, colorama, contourpy, jinja2, @@ -64,8 +64,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./hardcode-nodejs-npmjs-paths.patch; + (replaceVars ./hardcode-nodejs-npmjs-paths.patch { node_bin = "${nodejs}/bin/node"; npm_bin = "${nodejs}/bin/npm"; }) diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix index b871515bc42a..0779eae1c92d 100644 --- a/pkgs/development/python-modules/cairocffi/default.nix +++ b/pkgs/development/python-modules/cairocffi/default.nix @@ -5,7 +5,7 @@ pythonOlder, fetchPypi, lib, - substituteAll, + replaceVars, pikepdf, pytestCheckHook, cairo, @@ -32,8 +32,7 @@ buildPythonPackage rec { patches = [ # OSError: dlopen() failed to load a library: gdk-pixbuf-2.0 / gdk-pixbuf-2.0-0 - (substituteAll { - src = ./dlopen-paths.patch; + (replaceVars ./dlopen-paths.patch { ext = stdenv.hostPlatform.extensions.sharedLibrary; cairo = cairo.out; glib = glib.out; diff --git a/pkgs/development/python-modules/cmdstanpy/default.nix b/pkgs/development/python-modules/cmdstanpy/default.nix index c03c2cf8403c..439b1c255307 100644 --- a/pkgs/development/python-modules/cmdstanpy/default.nix +++ b/pkgs/development/python-modules/cmdstanpy/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - substituteAll, + replaceVars, cmdstan, setuptools, pandas, @@ -27,8 +27,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./use-nix-cmdstan-path.patch; + (replaceVars ./use-nix-cmdstan-path.patch { cmdstan = "${cmdstan}/opt/cmdstan"; }) ]; diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index d87103d4d0a1..a2b42176966b 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -5,7 +5,7 @@ pythonOlder, pythonAtLeast, fetchFromGitHub, - substituteAll, + replaceVars, gdb, lldb, pytestCheckHook, @@ -39,8 +39,7 @@ buildPythonPackage rec { patches = [ # Use nixpkgs version instead of versioneer - (substituteAll { - src = ./hardcode-version.patch; + (replaceVars ./hardcode-version.patch { inherit version; }) @@ -62,15 +61,13 @@ buildPythonPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # Hard code GDB path (used to attach to process) - (substituteAll { - src = ./hardcode-gdb.patch; + (replaceVars ./hardcode-gdb.patch { inherit gdb; }) ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Hard code LLDB path (used to attach to process) - (substituteAll { - src = ./hardcode-lldb.patch; + (replaceVars ./hardcode-lldb.patch { inherit lldb; }) ]; diff --git a/pkgs/development/python-modules/deltachat2/default.nix b/pkgs/development/python-modules/deltachat2/default.nix index a2dcc68076f0..021e4f73fb10 100644 --- a/pkgs/development/python-modules/deltachat2/default.nix +++ b/pkgs/development/python-modules/deltachat2/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, deltachat-rpc-server, setuptools-scm, - substituteAll, + replaceVars, }: buildPythonPackage rec { @@ -20,8 +20,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./paths.patch; + (replaceVars ./paths.patch { deltachatrpcserver = lib.getExe deltachat-rpc-server; }) ]; diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index b4d478e3d8bd..d8520e33e97c 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -3,7 +3,7 @@ stdenv, buildPythonPackage, fetchPypi, - substituteAll, + replaceVars, geos_3_9, gdal, asgiref, @@ -28,17 +28,17 @@ buildPythonPackage rec { patches = [ - (substituteAll { - src = ./django_3_set_zoneinfo_dir.patch; + (replaceVars ./django_3_set_zoneinfo_dir.patch { zoneinfo = tzdata + "/share/zoneinfo"; }) ] - ++ lib.optional withGdal (substituteAll { - src = ./django_3_set_geos_gdal_lib.patch; - inherit geos_3_9; - inherit gdal; - extension = stdenv.hostPlatform.extensions.sharedLibrary; - }); + ++ lib.optional withGdal ( + replaceVars ./django_3_set_geos_gdal_lib.patch { + inherit geos_3_9; + inherit gdal; + extension = stdenv.hostPlatform.extensions.sharedLibrary; + } + ); propagatedBuildInputs = [ asgiref diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index e7deafc63271..b5183c00d9dd 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -6,7 +6,7 @@ fetchpatch, pythonAtLeast, pythonOlder, - substituteAll, + replaceVars, # build setuptools, @@ -59,8 +59,7 @@ buildPythonPackage rec { patches = [ - (substituteAll { - src = ./django_4_set_zoneinfo_dir.patch; + (replaceVars ./django_4_set_zoneinfo_dir.patch { zoneinfo = tzdata + "/share/zoneinfo"; }) # make sure the tests don't remove packages from our pythonpath @@ -75,8 +74,7 @@ buildPythonPackage rec { }) ] ++ lib.optionals withGdal [ - (substituteAll { - src = ./django_4_set_geos_gdal_lib.patch; + (replaceVars ./django_4_set_geos_gdal_lib.patch { geos = geos; gdal = gdal; extension = stdenv.hostPlatform.extensions.sharedLibrary; diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix index 0a46ca3e1e7e..d04533cbf4a0 100644 --- a/pkgs/development/python-modules/django/5.nix +++ b/pkgs/development/python-modules/django/5.nix @@ -5,7 +5,7 @@ fetchFromGitHub, fetchpatch, pythonOlder, - substituteAll, + replaceVars, # build-system setuptools, @@ -58,8 +58,7 @@ buildPythonPackage rec { patches = [ - (substituteAll { - src = ./django_5_set_zoneinfo_dir.patch; + (replaceVars ./django_5_set_zoneinfo_dir.patch { zoneinfo = tzdata + "/share/zoneinfo"; }) # prevent tests from messing with our pythonpath @@ -75,8 +74,7 @@ buildPythonPackage rec { }) ] ++ lib.optionals withGdal [ - (substituteAll { - src = ./django_5_set_geos_gdal_lib.patch; + (replaceVars ./django_5_set_geos_gdal_lib.patch { geos = geos; gdal = gdal; extension = stdenv.hostPlatform.extensions.sharedLibrary; diff --git a/pkgs/development/python-modules/dot2tex/default.nix b/pkgs/development/python-modules/dot2tex/default.nix index acd9bbc34a1f..fc593d8a5871 100644 --- a/pkgs/development/python-modules/dot2tex/default.nix +++ b/pkgs/development/python-modules/dot2tex/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchPypi, - substituteAll, + replaceVars, pyparsing, graphviz, pytestCheckHook, @@ -20,8 +20,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./path.patch; + (replaceVars ./path.patch { inherit graphviz; }) ./test.patch # https://github.com/kjellmf/dot2tex/issues/5 diff --git a/pkgs/development/python-modules/espeak-phonemizer/default.nix b/pkgs/development/python-modules/espeak-phonemizer/default.nix index 4ecae59fbc58..6b7304a7c895 100644 --- a/pkgs/development/python-modules/espeak-phonemizer/default.nix +++ b/pkgs/development/python-modules/espeak-phonemizer/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - substituteAll, + replaceVars, espeak-ng, pytestCheckHook, }: @@ -20,8 +20,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./cdll.patch; + (replaceVars ./cdll.patch { libespeak_ng = "${lib.getLib espeak-ng}/lib/libespeak-ng.so"; }) ]; diff --git a/pkgs/development/python-modules/flit-gettext/default.nix b/pkgs/development/python-modules/flit-gettext/default.nix index 311861da7f71..cdf3dadf14ed 100644 --- a/pkgs/development/python-modules/flit-gettext/default.nix +++ b/pkgs/development/python-modules/flit-gettext/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - substituteAll, + replaceVars, # build-system flit-scm, @@ -30,8 +30,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./msgfmt-path.patch; + (replaceVars ./msgfmt-path.patch { msgfmt = lib.getExe' gettext "msgfmt"; }) ]; diff --git a/pkgs/development/python-modules/gattlib/default.nix b/pkgs/development/python-modules/gattlib/default.nix index bb961a993a13..a3f3a0d16e90 100644 --- a/pkgs/development/python-modules/gattlib/default.nix +++ b/pkgs/development/python-modules/gattlib/default.nix @@ -3,7 +3,9 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, - substituteAll, + replaceVars, + + # build pkg-config, glibc, python, @@ -31,8 +33,7 @@ buildPythonPackage rec { url = "https://github.com/oscaracena/pygattlib/commit/73a73b71cfc139e1e0a08816fb976ff330c77ea5.patch"; hash = "sha256-/Y/CZNdN/jcxWroqRfdCH2rPUxZUbug668MIAow0scs="; }) - (substituteAll { - src = ./setup.patch; + (replaceVars ./setup.patch { boost_version = let pythonVersion = with lib.versions; "${major python.version}${minor python.version}"; diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix index cd1dc62261f9..de88fb53556c 100644 --- a/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -10,7 +10,7 @@ pytestCheckHook, pythonOlder, setuptools, - substituteAll, + replaceVars, util-linux, }: @@ -42,8 +42,7 @@ buildPythonPackage rec { url = "https://github.com/alpernebbi/git-annex-adapter/commit/d0d8905965a3659ce95cbd8f8b1e8598f0faf76b.patch"; hash = "sha256-UcRTKzD3sbXGIuxj4JzZDnvjTYyWVkfeWgKiZ1rAlus="; }) - (substituteAll { - src = ./git-annex-path.patch; + (replaceVars ./git-annex-path.patch { gitAnnex = "${git-annex}/bin/git-annex"; }) ]; diff --git a/pkgs/development/python-modules/glymur/default.nix b/pkgs/development/python-modules/glymur/default.nix index d5fdb4fd0242..ebc6d0134203 100644 --- a/pkgs/development/python-modules/glymur/default.nix +++ b/pkgs/development/python-modules/glymur/default.nix @@ -13,7 +13,7 @@ pythonOlder, scikit-image, setuptools, - substituteAll, + replaceVars, }: buildPythonPackage rec { @@ -37,8 +37,7 @@ buildPythonPackage rec { url = "https://github.com/quintusdias/glymur/commit/89b159299035ebb05776c3b90278f410ca6dba64.patch"; hash = "sha256-C/Q5WZmW5YtN3U8fxKljfqwKHtFLfR2LQ69Tj8SuIWg="; }) - (substituteAll { - src = ./set-lib-paths.patch; + (replaceVars ./set-lib-paths.patch { openjp2_lib = "${lib.getLib openjpeg}/lib/libopenjp2${stdenv.hostPlatform.extensions.sharedLibrary}"; tiff_lib = "${lib.getLib libtiff}/lib/libtiff${stdenv.hostPlatform.extensions.sharedLibrary}"; }) diff --git a/pkgs/development/python-modules/gpuctypes/default.nix b/pkgs/development/python-modules/gpuctypes/default.nix index f8c8f1111160..9b3bb75434f9 100644 --- a/pkgs/development/python-modules/gpuctypes/default.nix +++ b/pkgs/development/python-modules/gpuctypes/default.nix @@ -3,7 +3,7 @@ config, buildPythonPackage, fetchFromGitHub, - substituteAll, + replaceVars, addDriverRunpath, cudaSupport ? config.cudaSupport, rocmSupport ? config.rocmSupport, @@ -33,8 +33,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./0001-fix-dlopen-cuda.patch; + (replaceVars ./0001-fix-dlopen-cuda.patch { inherit (addDriverRunpath) driverLink; libnvrtc = if cudaSupport then diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix index 99a78b6d7661..9af39497f215 100644 --- a/pkgs/development/python-modules/graphviz/default.nix +++ b/pkgs/development/python-modules/graphviz/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - substituteAll, + replaceVars, graphviz-nox, xdg-utils, makeFontsConf, @@ -32,8 +32,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./paths.patch; + (replaceVars ./paths.patch { graphviz = graphviz-nox; xdgutils = xdg-utils; }) diff --git a/pkgs/development/python-modules/hydra-core/default.nix b/pkgs/development/python-modules/hydra-core/default.nix index 0518e523d3d9..6264ff89d6c7 100644 --- a/pkgs/development/python-modules/hydra-core/default.nix +++ b/pkgs/development/python-modules/hydra-core/default.nix @@ -11,7 +11,7 @@ packaging, pytestCheckHook, pythonOlder, - substituteAll, + replaceVars, }: buildPythonPackage rec { @@ -29,8 +29,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./antlr4.patch; + (replaceVars ./antlr4.patch { antlr_jar = "${antlr4.out}/share/java/antlr-${antlr4.version}-complete.jar"; }) # https://github.com/facebookresearch/hydra/pull/2731 diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix index c10d435da7bc..a49ac3e344a0 100644 --- a/pkgs/development/python-modules/imageio-ffmpeg/default.nix +++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - substituteAll, + replaceVars, ffmpeg, # build-system @@ -27,8 +27,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./ffmpeg-path.patch; + (replaceVars ./ffmpeg-path.patch { ffmpeg = lib.getExe ffmpeg; }) ]; diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index d19c5579e25a..b0ec295e10a7 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, fetchFromGitHub, isPyPy, - substituteAll, + replaceVars, # build-system setuptools, @@ -42,8 +42,7 @@ buildPythonPackage rec { }; patches = lib.optionals (!stdenv.hostPlatform.isDarwin) [ - (substituteAll { - src = ./libgl-path.patch; + (replaceVars ./libgl-path.patch { libgl = "${libGL.out}/lib/libGL${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix index 4e49d01ad8b6..913e8a913acc 100644 --- a/pkgs/development/python-modules/img2pdf/default.nix +++ b/pkgs/development/python-modules/img2pdf/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, isPy27, fetchFromGitea, - substituteAll, + replaceVars, fetchpatch, colord, setuptools, @@ -38,8 +38,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./default-icc-profile.patch; + (replaceVars ./default-icc-profile.patch { srgbProfile = if stdenv.hostPlatform.isDarwin then "/System/Library/ColorSync/Profiles/sRGB Profile.icc" diff --git a/pkgs/development/python-modules/iniconfig/default.nix b/pkgs/development/python-modules/iniconfig/default.nix index fcf045c94411..206faab7ae1d 100644 --- a/pkgs/development/python-modules/iniconfig/default.nix +++ b/pkgs/development/python-modules/iniconfig/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - substituteAll, + replaceVars, fetchPypi, hatchling, }: @@ -20,8 +20,7 @@ buildPythonPackage rec { patches = [ # Cannot use hatch-vcs, due to an inifinite recursion - (substituteAll { - src = ./version.patch; + (replaceVars ./version.patch { inherit version; }) ]; diff --git a/pkgs/development/python-modules/isal/default.nix b/pkgs/development/python-modules/isal/default.nix index 0594330edaf8..2626fe2e4ef5 100644 --- a/pkgs/development/python-modules/isal/default.nix +++ b/pkgs/development/python-modules/isal/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - substituteAll, + replaceVars, # build-system setuptools, @@ -29,8 +29,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./version.patch; + (replaceVars ./version.patch { inherit version; }) ]; diff --git a/pkgs/development/python-modules/k5test/default.nix b/pkgs/development/python-modules/k5test/default.nix index 208f24c2b2bf..f1bfd4097c78 100644 --- a/pkgs/development/python-modules/k5test/default.nix +++ b/pkgs/development/python-modules/k5test/default.nix @@ -6,7 +6,7 @@ krb5-c, pythonOlder, setuptools, - substituteAll, + replaceVars, }: buildPythonPackage rec { @@ -22,8 +22,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { inherit findutils; krb5 = krb5-c; # krb5-config is in dev output diff --git a/pkgs/development/python-modules/kaldi-active-grammar/default.nix b/pkgs/development/python-modules/kaldi-active-grammar/default.nix index 14795b0c1268..c26bbabb60c7 100644 --- a/pkgs/development/python-modules/kaldi-active-grammar/default.nix +++ b/pkgs/development/python-modules/kaldi-active-grammar/default.nix @@ -10,7 +10,7 @@ numpy, cffi, openfst, - substituteAll, + replaceVars, callPackage, }: @@ -43,8 +43,7 @@ buildPythonPackage rec { # Uses the dependencies' binaries from $PATH instead of a specific directory ./0002-exec-path.patch # Makes it dynamically link to the correct Kaldi library - (substituteAll { - src = ./0003-ffi-path.patch; + (replaceVars ./0003-ffi-path.patch { kaldiFork = "${kaldi}/lib"; }) ]; diff --git a/pkgs/development/python-modules/kornia-rs/default.nix b/pkgs/development/python-modules/kornia-rs/default.nix index b5311998abf9..e4b7bbd2a17e 100644 --- a/pkgs/development/python-modules/kornia-rs/default.nix +++ b/pkgs/development/python-modules/kornia-rs/default.nix @@ -6,7 +6,7 @@ rustPlatform, cmake, nasm, - substituteAll, + replaceVars, libiconv, }: @@ -36,8 +36,7 @@ buildPythonPackage rec { # The path dependency doesn't vendor the dependencies correctly, so get kornia-rs from crates instead. patches = [ - (substituteAll { - src = ./kornia-rs-from-crates.patch; + (replaceVars ./kornia-rs-from-crates.patch { inherit version; }) ]; diff --git a/pkgs/development/python-modules/libevdev/default.nix b/pkgs/development/python-modules/libevdev/default.nix index e7be644cdd5a..1d511b3afae5 100644 --- a/pkgs/development/python-modules/libevdev/default.nix +++ b/pkgs/development/python-modules/libevdev/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, isPy27, fetchPypi, - substituteAll, + replaceVars, pkgs, pytestCheckHook, }: @@ -20,8 +20,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { libevdev = lib.getLib pkgs.libevdev; }) ]; diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix index 34f6c1b7636f..18a9603b0625 100644 --- a/pkgs/development/python-modules/libusb1/default.nix +++ b/pkgs/development/python-modules/libusb1/default.nix @@ -3,7 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, - substituteAll, + replaceVars, setuptools, libusb1, pytestCheckHook, @@ -22,8 +22,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./ctypes.patch; + (replaceVars ./ctypes.patch { libusb = "${lib.getLib libusb1}/lib/libusb-1.0${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; diff --git a/pkgs/development/python-modules/mido/default.nix b/pkgs/development/python-modules/mido/default.nix index 34227c595d3f..0a4547b1fd1f 100644 --- a/pkgs/development/python-modules/mido/default.nix +++ b/pkgs/development/python-modules/mido/default.nix @@ -3,7 +3,7 @@ lib, buildPythonPackage, fetchPypi, - substituteAll, + replaceVars, # build-system setuptools, @@ -39,8 +39,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./libportmidi-cdll.patch; + (replaceVars ./libportmidi-cdll.patch { libportmidi = "${portmidi.out}/lib/libportmidi${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; diff --git a/pkgs/development/python-modules/mss/default.nix b/pkgs/development/python-modules/mss/default.nix index f7b5a590b1ba..d7585caecb68 100644 --- a/pkgs/development/python-modules/mss/default.nix +++ b/pkgs/development/python-modules/mss/default.nix @@ -4,7 +4,7 @@ fetchPypi, pythonOlder, stdenv, - substituteAll, + replaceVars, # build-system hatchling, @@ -34,8 +34,7 @@ buildPythonPackage rec { }; patches = lib.optionals stdenv.hostPlatform.isLinux [ - (substituteAll { - src = ./linux-paths.patch; + (replaceVars ./linux-paths.patch { x11 = "${xorg.libX11}/lib/libX11.so"; xfixes = "${xorg.libXfixes}/lib/libXfixes.so"; xrandr = "${xorg.libXrandr}/lib/libXrandr.so"; diff --git a/pkgs/development/python-modules/netmap/default.nix b/pkgs/development/python-modules/netmap/default.nix index c863ae189dcb..81d326f50e41 100644 --- a/pkgs/development/python-modules/netmap/default.nix +++ b/pkgs/development/python-modules/netmap/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - substituteAll, + replaceVars, nmap, python, }: @@ -20,8 +20,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./nmap-path.patch; + (replaceVars ./nmap-path.patch { nmap = "${lib.getBin nmap}/bin/nmap"; }) ]; diff --git a/pkgs/development/python-modules/nextcord/default.nix b/pkgs/development/python-modules/nextcord/default.nix index 10aff1066fbc..c5e023027877 100644 --- a/pkgs/development/python-modules/nextcord/default.nix +++ b/pkgs/development/python-modules/nextcord/default.nix @@ -5,7 +5,7 @@ pythonAtLeast, pythonOlder, fetchFromGitHub, - substituteAll, + replaceVars, ffmpeg, libopus, aiohttp, @@ -34,8 +34,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./paths.patch; + (replaceVars ./paths.patch { ffmpeg = "${ffmpeg}/bin/ffmpeg"; libopus = "${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}"; }) diff --git a/pkgs/development/python-modules/nocturne/default.nix b/pkgs/development/python-modules/nocturne/default.nix index 0934e6fd2535..2d105972419e 100644 --- a/pkgs/development/python-modules/nocturne/default.nix +++ b/pkgs/development/python-modules/nocturne/default.nix @@ -9,7 +9,7 @@ pybind11, pyvirtualdisplay, sfml, - substituteAll, + replaceVars, }: buildPythonPackage rec { @@ -32,8 +32,7 @@ buildPythonPackage rec { ''; patches = [ - (substituteAll { - src = ./dependencies.patch; + (replaceVars ./dependencies.patch { gtest_src = gtest.src; }) ]; diff --git a/pkgs/development/python-modules/notify-py/default.nix b/pkgs/development/python-modules/notify-py/default.nix index 45893825139b..16f48f3725e7 100644 --- a/pkgs/development/python-modules/notify-py/default.nix +++ b/pkgs/development/python-modules/notify-py/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - substituteAll, + replaceVars, alsa-utils, libnotify, which, @@ -33,16 +33,14 @@ buildPythonPackage rec { patches = lib.optionals stdenv.hostPlatform.isLinux [ # hardcode paths to aplay and notify-send - (substituteAll { - src = ./linux-paths.patch; + (replaceVars ./linux-paths.patch { aplay = "${alsa-utils}/bin/aplay"; notifysend = "${libnotify}/bin/notify-send"; }) ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # hardcode path to which - (substituteAll { - src = ./darwin-paths.patch; + (replaceVars ./darwin-paths.patch { which = "${which}/bin/which"; }) ]; diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index fa72fbab6021..16df1272c82b 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -11,7 +11,7 @@ numpy_1, llvmlite, libcxx, - substituteAll, + replaceVars, writers, numba, pytestCheckHook, @@ -96,8 +96,7 @@ buildPythonPackage rec { ]; patches = lib.optionals cudaSupport [ - (substituteAll { - src = ./cuda_path.patch; + (replaceVars ./cuda_path.patch { cuda_toolkit_path = cudatoolkit; cuda_toolkit_lib_path = lib.getLib cudatoolkit; }) diff --git a/pkgs/development/python-modules/nvidia-ml-py/default.nix b/pkgs/development/python-modules/nvidia-ml-py/default.nix index f5b4ea48a75d..e48b8b7d43e2 100644 --- a/pkgs/development/python-modules/nvidia-ml-py/default.nix +++ b/pkgs/development/python-modules/nvidia-ml-py/default.nix @@ -2,7 +2,7 @@ lib, fetchPypi, buildPythonPackage, - substituteAll, + replaceVars, addDriverRunpath, setuptools, cudaPackages, @@ -22,8 +22,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./0001-locate-libnvidia-ml.so.1-on-NixOS.patch; + (replaceVars ./0001-locate-libnvidia-ml.so.1-on-NixOS.patch { inherit (addDriverRunpath) driverLink; }) ]; diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix index de84c59b59b8..9f4cf86fa761 100644 --- a/pkgs/development/python-modules/objgraph/default.nix +++ b/pkgs/development/python-modules/objgraph/default.nix @@ -7,7 +7,7 @@ isPyPy, python, pythonOlder, - substituteAll, + replaceVars, setuptools, }: @@ -24,8 +24,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./hardcode-graphviz-path.patch; + (replaceVars ./hardcode-graphviz-path.patch { graphviz = graphvizPkgs; }) ]; diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 5d75f8a829fc..dc87c6f4edfe 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -21,7 +21,7 @@ pythonOlder, rich, reportlab, - substituteAll, + replaceVars, tesseract, unpaper, installShellFiles, @@ -50,8 +50,7 @@ buildPythonPackage rec { patches = [ ./use-pillow-heif.patch - (substituteAll { - src = ./paths.patch; + (replaceVars ./paths.patch { gs = lib.getExe ghostscript_headless; jbig2 = lib.getExe jbig2enc; pngquant = lib.getExe pngquant; diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/pkgs/development/python-modules/omegaconf/default.nix index e0f551cbc4a6..0c9e7ab833fe 100644 --- a/pkgs/development/python-modules/omegaconf/default.nix +++ b/pkgs/development/python-modules/omegaconf/default.nix @@ -13,7 +13,7 @@ pythonAtLeast, pythonOlder, pyyaml, - substituteAll, + replaceVars, }: buildPythonPackage rec { @@ -31,8 +31,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./antlr4.patch; + (replaceVars ./antlr4.patch { antlr_jar = "${antlr4.out}/share/java/antlr-${antlr4.version}-complete.jar"; }) diff --git a/pkgs/development/python-modules/openai-whisper/default.nix b/pkgs/development/python-modules/openai-whisper/default.nix index 4c0327558971..634f8677be2c 100644 --- a/pkgs/development/python-modules/openai-whisper/default.nix +++ b/pkgs/development/python-modules/openai-whisper/default.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, buildPythonPackage, - substituteAll, + replaceVars, # build-system setuptools, @@ -38,8 +38,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./ffmpeg-path.patch; + (replaceVars ./ffmpeg-path.patch { ffmpeg = ffmpeg-headless; }) ]; diff --git a/pkgs/development/python-modules/opuslib/default.nix b/pkgs/development/python-modules/opuslib/default.nix index 4f7c86d2a481..b645a2d1b1d0 100644 --- a/pkgs/development/python-modules/opuslib/default.nix +++ b/pkgs/development/python-modules/opuslib/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, lib, stdenv, - substituteAll, + replaceVars, setuptools, }: @@ -38,8 +38,7 @@ buildPythonPackage rec { url = "https://github.com/orion-labs/opuslib/commit/87a214fc98c1dcae38035e99fe8e279a160c4a52.patch"; hash = "sha256-UoOafyTFvWLY7ErtBhkXTZSgbMZFrg5DGxjbhqEI7wo="; }) - (substituteAll { - src = ./opuslib-paths.patch; + (replaceVars ./opuslib-paths.patch { opusLibPath = "${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; diff --git a/pkgs/development/python-modules/ots-python/default.nix b/pkgs/development/python-modules/ots-python/default.nix index 9c0ae3625c21..ca91bfeaacee 100644 --- a/pkgs/development/python-modules/ots-python/default.nix +++ b/pkgs/development/python-modules/ots-python/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchPypi, - substituteAll, + replaceVars, opentype-sanitizer, setuptools-scm, pytestCheckHook, @@ -23,8 +23,7 @@ buildPythonPackage rec { # Invoke ots-sanitize from the opentype-sanitizer package instead of # downloading precompiled binaries from the internet. # (nixpkgs-specific, not upstreamable) - (substituteAll { - src = ./0001-use-packaged-ots.patch; + (replaceVars ./0001-use-packaged-ots.patch { ots_sanitize = "${opentype-sanitizer}/bin/ots-sanitize"; }) ]; diff --git a/pkgs/development/python-modules/pdfminer-six/default.nix b/pkgs/development/python-modules/pdfminer-six/default.nix index be653431e2a5..0fd59cbd4aec 100644 --- a/pkgs/development/python-modules/pdfminer-six/default.nix +++ b/pkgs/development/python-modules/pdfminer-six/default.nix @@ -8,7 +8,7 @@ pythonOlder, pytestCheckHook, setuptools, - substituteAll, + replaceVars, ocrmypdf, }: @@ -34,8 +34,7 @@ buildPythonPackage rec { excludes = [ "CHANGELOG.md" ]; hash = "sha256-fsSXvN92MVtNFpAst0ctvGrbxVvoe4Nyz4wMZqJ1aw8="; }) - (substituteAll { - src = ./disable-setuptools-git-versioning.patch; + (replaceVars ./disable-setuptools-git-versioning.patch { inherit version; }) ]; diff --git a/pkgs/development/python-modules/phonemizer/default.nix b/pkgs/development/python-modules/phonemizer/default.nix index 561088b606d8..9b4a69a67876 100644 --- a/pkgs/development/python-modules/phonemizer/default.nix +++ b/pkgs/development/python-modules/phonemizer/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, - substituteAll, + replaceVars, buildPythonPackage, fetchPypi, joblib, @@ -27,8 +27,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./backend-paths.patch; + (replaceVars ./backend-paths.patch { libespeak = "${lib.getLib espeak-ng}/lib/libespeak-ng${stdenv.hostPlatform.extensions.sharedLibrary}"; # FIXME package festival }) diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index da0ebb79b504..f05ed913e313 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -20,7 +20,7 @@ python-xmp-toolkit, qpdf, setuptools, - substituteAll, + replaceVars, }: buildPythonPackage rec { @@ -42,8 +42,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./paths.patch; + (replaceVars ./paths.patch { jbig2dec = lib.getExe' jbig2dec "jbig2dec"; mutool = lib.getExe' mupdf-headless "mutool"; }) diff --git a/pkgs/development/python-modules/protobuf/4.nix b/pkgs/development/python-modules/protobuf/4.nix index c4db1b86e164..48af41c206ec 100644 --- a/pkgs/development/python-modules/protobuf/4.nix +++ b/pkgs/development/python-modules/protobuf/4.nix @@ -9,7 +9,7 @@ protobuf, pytestCheckHook, pythonAtLeast, - substituteAll, + replaceVars, tzdata, }: @@ -31,8 +31,7 @@ buildPythonPackage { patches = lib.optionals (lib.versionAtLeast protobuf.version "22") [ # Replace the vendored abseil-cpp with nixpkgs' - (substituteAll { - src = ./use-nixpkgs-abseil-cpp.patch; + (replaceVars ./use-nixpkgs-abseil-cpp.patch { abseil_cpp_include_path = "${lib.getDev protobuf.abseil-cpp}/include"; }) ] diff --git a/pkgs/development/python-modules/proton-client/default.nix b/pkgs/development/python-modules/proton-client/default.nix index 4e178ce26c92..b7a4db2ae9b0 100644 --- a/pkgs/development/python-modules/proton-client/default.nix +++ b/pkgs/development/python-modules/proton-client/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - substituteAll, + replaceVars, bcrypt, pyopenssl, python-gnupg, @@ -37,8 +37,7 @@ buildPythonPackage rec { patches = [ # Patches library by fixing the openssl path - (substituteAll { - src = ./0001-OpenSSL-path-fix.patch; + (replaceVars ./0001-OpenSSL-path-fix.patch { openssl = openssl.out; ext = stdenv.hostPlatform.extensions.sharedLibrary; }) diff --git a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix index ff647a2582bd..2b679015e6bd 100644 --- a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix +++ b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - substituteAll, + replaceVars, dbus-python, distro, jinja2, @@ -48,8 +48,7 @@ buildPythonPackage rec { ]; patches = [ - (substituteAll { - src = ./0001-Patching-GIRepository.patch; + (replaceVars ./0001-Patching-GIRepository.patch { networkmanager_path = "${networkmanager}/lib/girepository-1.0"; }) ]; diff --git a/pkgs/development/python-modules/pulsectl/default.nix b/pkgs/development/python-modules/pulsectl/default.nix index 485acd9f7880..a4340c4a7fc8 100644 --- a/pkgs/development/python-modules/pulsectl/default.nix +++ b/pkgs/development/python-modules/pulsectl/default.nix @@ -4,7 +4,7 @@ fetchPypi, libpulseaudio, glibc, - substituteAll, + replaceVars, stdenv, pulseaudio, unittestCheckHook, @@ -22,8 +22,7 @@ buildPythonPackage rec { patches = [ # substitute library paths for libpulse and librt - (substituteAll { - src = ./library-paths.patch; + (replaceVars ./library-paths.patch { libpulse = "${libpulseaudio.out}/lib/libpulse${stdenv.hostPlatform.extensions.sharedLibrary}"; librt = "${glibc.out}/lib/librt${stdenv.hostPlatform.extensions.sharedLibrary}"; }) diff --git a/pkgs/development/python-modules/pydot/default.nix b/pkgs/development/python-modules/pydot/default.nix index a8756cab87a1..bdbabe92c715 100644 --- a/pkgs/development/python-modules/pydot/default.nix +++ b/pkgs/development/python-modules/pydot/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchPypi, setuptools, - substituteAll, + replaceVars, graphviz, pytestCheckHook, chardet, @@ -37,8 +37,7 @@ buildPythonPackage rec { ]; patches = [ - (substituteAll { - src = ./hardcode-graphviz-path.patch; + (replaceVars ./hardcode-graphviz-path.patch { inherit graphviz; }) ]; diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix index 470ece383353..cd288f7184f9 100644 --- a/pkgs/development/python-modules/pygame-ce/default.nix +++ b/pkgs/development/python-modules/pygame-ce/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, - substituteAll, + replaceVars, fetchFromGitHub, buildPythonPackage, pythonOlder, @@ -45,8 +45,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./fix-dependency-finding.patch; + (replaceVars ./fix-dependency-finding.patch { buildinputs_include = builtins.toJSON ( builtins.concatMap (dep: [ "${lib.getDev dep}/" diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index f4da6a9f001c..c5c6ac9175eb 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -3,7 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, - substituteAll, + replaceVars, fontconfig, python, @@ -44,8 +44,7 @@ buildPythonPackage rec { patches = [ # Patch pygame's dependency resolution to let it find build inputs - (substituteAll { - src = ./fix-dependency-finding.patch; + (replaceVars ./fix-dependency-finding.patch { buildinputs_include = builtins.toJSON ( builtins.concatMap (dep: [ "${lib.getDev dep}/" diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix index f6cf8b1a1595..f0a218a7883c 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - substituteAll, + replaceVars, graphviz, coreutils, pkg-config, @@ -27,8 +27,7 @@ buildPythonPackage rec { patches = [ # pygraphviz depends on graphviz executables and wc being in PATH - (substituteAll { - src = ./path.patch; + (replaceVars ./path.patch { path = lib.makeBinPath [ graphviz coreutils diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix index 112d9392d80d..39b5657819ad 100644 --- a/pkgs/development/python-modules/pylama/default.nix +++ b/pkgs/development/python-modules/pylama/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - substituteAll, + replaceVars, git, eradicate, mccabe, @@ -32,8 +32,7 @@ let }; patches = [ - (substituteAll { - src = ./paths.patch; + (replaceVars ./paths.patch { git = "${lib.getBin git}/bin/git"; }) ]; diff --git a/pkgs/development/python-modules/pylddwrap/default.nix b/pkgs/development/python-modules/pylddwrap/default.nix index b24700cee2c8..cb68291f27e6 100644 --- a/pkgs/development/python-modules/pylddwrap/default.nix +++ b/pkgs/development/python-modules/pylddwrap/default.nix @@ -6,7 +6,7 @@ icontract, pytestCheckHook, pythonOlder, - substituteAll, + replaceVars, typing-extensions, }: @@ -24,8 +24,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./replace_env_with_placeholder.patch; + (replaceVars ./replace_env_with_placeholder.patch { ldd_bin = "${stdenv.cc.bintools.libc_bin}/bin/ldd"; }) ]; diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix index 7df733b680a0..8305e308918e 100644 --- a/pkgs/development/python-modules/pyocr/default.nix +++ b/pkgs/development/python-modules/pyocr/default.nix @@ -7,7 +7,7 @@ tesseract, cuneiform, isPy3k, - substituteAll, + replaceVars, pytestCheckHook, setuptools, setuptools-scm, @@ -33,15 +33,17 @@ buildPythonPackage rec { patches = [ ] - ++ (lib.optional withTesseractSupport (substituteAll { - src = ./paths-tesseract.patch; - inherit tesseract; - tesseractLibraryLocation = "${tesseract}/lib/libtesseract${stdenv.hostPlatform.extensions.sharedLibrary}"; - })) - ++ (lib.optional stdenv.hostPlatform.isLinux (substituteAll { - src = ./paths-cuneiform.patch; - inherit cuneiform; - })); + ++ (lib.optional withTesseractSupport ( + replaceVars ./paths-tesseract.patch { + inherit tesseract; + tesseractLibraryLocation = "${tesseract}/lib/libtesseract${stdenv.hostPlatform.extensions.sharedLibrary}"; + } + )) + ++ (lib.optional stdenv.hostPlatform.isLinux ( + replaceVars ./paths-cuneiform.patch { + inherit cuneiform; + } + )); propagatedBuildInputs = [ pillow ]; diff --git a/pkgs/development/python-modules/pyogg/default.nix b/pkgs/development/python-modules/pyogg/default.nix index 03d51fef67fa..220777cd3609 100644 --- a/pkgs/development/python-modules/pyogg/default.nix +++ b/pkgs/development/python-modules/pyogg/default.nix @@ -8,7 +8,7 @@ libogg, libopus, opusfile, - substituteAll, + replaceVars, }: buildPythonPackage rec { @@ -45,8 +45,7 @@ buildPythonPackage rec { "--binary" ]; patches = [ - (substituteAll { - src = ./pyogg-paths.patch; + (replaceVars ./pyogg-paths.patch { flacLibPath = "${flac.out}/lib/libFLAC${stdenv.hostPlatform.extensions.sharedLibrary}"; oggLibPath = "${libogg}/lib/libogg${stdenv.hostPlatform.extensions.sharedLibrary}"; vorbisLibPath = "${libvorbis}/lib/libvorbis${stdenv.hostPlatform.extensions.sharedLibrary}"; diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix index 0aad26e59cb6..102750113157 100644 --- a/pkgs/development/python-modules/pypandoc/default.nix +++ b/pkgs/development/python-modules/pypandoc/default.nix @@ -6,7 +6,7 @@ pandocfilters, poetry-core, pythonOlder, - substituteAll, + replaceVars, texliveSmall, }: @@ -25,8 +25,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./static-pandoc-path.patch; + (replaceVars ./static-pandoc-path.patch { pandoc = "${lib.getBin pandoc}/bin/pandoc"; pandocVersion = pandoc.version; }) diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index d419fbb76949..77f863139ed5 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, pytestCheckHook, pythonOlder, - substituteAll, + replaceVars, certifi, cython, @@ -31,8 +31,7 @@ buildPythonPackage rec { # force pyproj to use ${proj} patches = [ - (substituteAll { - src = ./001.proj.patch; + (replaceVars ./001.proj.patch { proj = proj; projdev = proj.dev; }) diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix index 8fb26fb9f5f2..dca55176f162 100644 --- a/pkgs/development/python-modules/pysaml2/default.nix +++ b/pkgs/development/python-modules/pysaml2/default.nix @@ -17,7 +17,7 @@ requests, responses, setuptools, - substituteAll, + replaceVars, xmlschema, xmlsec, zope-interface, @@ -38,8 +38,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./hardcode-xmlsec1-path.patch; + (replaceVars ./hardcode-xmlsec1-path.patch { inherit xmlsec; }) ]; diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix index e64c3e28a2b6..502bb3dd2465 100644 --- a/pkgs/development/python-modules/pytesseract/default.nix +++ b/pkgs/development/python-modules/pytesseract/default.nix @@ -5,7 +5,7 @@ packaging, pillow, tesseract, - substituteAll, + replaceVars, pytestCheckHook, setuptools, }: @@ -23,8 +23,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./tesseract-binary.patch; + (replaceVars ./tesseract-binary.patch { drv = tesseract; }) ]; diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix index 942f4562d9db..c84659014b71 100644 --- a/pkgs/development/python-modules/python-magic/default.nix +++ b/pkgs/development/python-modules/python-magic/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, - substituteAll, + replaceVars, file, pytestCheckHook, }: @@ -22,8 +22,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./libmagic-path.patch; + (replaceVars ./libmagic-path.patch { libmagic = "${file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}"; }) (fetchpatch { diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index 6e0b93a60907..2ce7bff0593d 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - substituteAll, + replaceVars, isPyPy, python, setuptools, @@ -43,8 +43,7 @@ buildPythonPackage rec { patches = [ # python-mapnik seems to depend on having the mapnik src directory # structure available at build time. We just hardcode the paths. - (substituteAll { - src = ./find-libmapnik.patch; + (replaceVars ./find-libmapnik.patch { libmapnik = "${mapnik}/lib"; }) # Use `std::optional` rather than `boost::optional` diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix index 9f860cdf7b54..90563f8b101f 100644 --- a/pkgs/development/python-modules/python-matter-server/default.nix +++ b/pkgs/development/python-modules/python-matter-server/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, pythonOlder, stdenvNoCC, - substituteAll, + replaceVars, # build setuptools, @@ -69,8 +69,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./link-paa-root-certs.patch; + (replaceVars ./link-paa-root-certs.patch { paacerts = paaCerts; }) ]; diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index 32153ca9f8c3..2c686ca2d8d4 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, pytz, setuptools, - substituteAll, + replaceVars, }: buildPythonPackage rec { @@ -25,8 +25,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./rapidjson-include-dir.patch; + (replaceVars ./rapidjson-include-dir.patch { rapidjson = lib.getDev rapidjson; }) ]; diff --git a/pkgs/development/python-modules/python3-gnutls/default.nix b/pkgs/development/python-modules/python3-gnutls/default.nix index 60bf464cb510..88958200c0ec 100644 --- a/pkgs/development/python-modules/python3-gnutls/default.nix +++ b/pkgs/development/python-modules/python3-gnutls/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, - substituteAll, + replaceVars, buildPythonPackage, isPy3k, gnutls, @@ -34,8 +34,7 @@ buildPythonPackage rec { ]; patches = [ - (substituteAll { - src = ./libgnutls-path.patch; + (replaceVars ./libgnutls-path.patch { gnutlslib = "${lib.getLib gnutls}/lib"; }) ]; diff --git a/pkgs/development/python-modules/pythran/default.nix b/pkgs/development/python-modules/pythran/default.nix index c8873f5d3eed..9f041f3374cf 100644 --- a/pkgs/development/python-modules/pythran/default.nix +++ b/pkgs/development/python-modules/pythran/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, fetchFromGitHub, fetchpatch2, - substituteAll, + replaceVars, # build-system setuptools, @@ -37,8 +37,7 @@ buildPythonPackage rec { patches = [ # Hardcode path to mp library - (substituteAll { - src = ./0001-hardcode-path-to-libgomp.patch; + (replaceVars ./0001-hardcode-path-to-libgomp.patch { gomp = "${ if stdenv.cc.isClang then openmp else (lib.getLib stdenv.cc.cc) }/lib/libgomp${stdenv.hostPlatform.extensions.sharedLibrary}"; diff --git a/pkgs/development/python-modules/pyturbojpeg/default.nix b/pkgs/development/python-modules/pyturbojpeg/default.nix index d91e446e5d7a..735f0a928c81 100644 --- a/pkgs/development/python-modules/pyturbojpeg/default.nix +++ b/pkgs/development/python-modules/pyturbojpeg/default.nix @@ -7,7 +7,7 @@ setuptools, numpy, python, - substituteAll, + replaceVars, }: buildPythonPackage rec { @@ -23,8 +23,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./lib-path.patch; + (replaceVars ./lib-path.patch { libturbojpeg = "${lib.getLib libjpeg_turbo}/lib/libturbojpeg${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; diff --git a/pkgs/development/python-modules/pyvirtualdisplay/default.nix b/pkgs/development/python-modules/pyvirtualdisplay/default.nix index ac2a3bf68f69..dca19a30340c 100644 --- a/pkgs/development/python-modules/pyvirtualdisplay/default.nix +++ b/pkgs/development/python-modules/pyvirtualdisplay/default.nix @@ -3,7 +3,7 @@ stdenv, buildPythonPackage, fetchPypi, - substituteAll, + replaceVars, xorg, # build-system @@ -32,8 +32,7 @@ buildPythonPackage rec { }; patches = lib.optionals stdenv.hostPlatform.isLinux [ - (substituteAll { - src = ./paths.patch; + (replaceVars ./paths.patch { xauth = lib.getExe xorg.xauth; xdpyinfo = lib.getExe xorg.xdpyinfo; }) diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix index 02070116ebda..0d1cb77e17c2 100644 --- a/pkgs/development/python-modules/slixmpp/default.nix +++ b/pkgs/development/python-modules/slixmpp/default.nix @@ -8,7 +8,7 @@ pyasn1, pyasn1-modules, pytestCheckHook, - substituteAll, + replaceVars, pythonOlder, }: @@ -34,8 +34,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; patches = [ - (substituteAll { - src = ./hardcode-gnupg-path.patch; + (replaceVars ./hardcode-gnupg-path.patch { inherit gnupg; }) ]; diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix index f90e2f7a3064..8784657600b9 100644 --- a/pkgs/development/python-modules/sounddevice/default.nix +++ b/pkgs/development/python-modules/sounddevice/default.nix @@ -8,7 +8,7 @@ cffi, numpy, portaudio, - substituteAll, + replaceVars, }: buildPythonPackage rec { @@ -38,8 +38,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "sounddevice" ]; patches = [ - (substituteAll { - src = ./fix-portaudio-library-path.patch; + (replaceVars ./fix-portaudio-library-path.patch { portaudio = "${portaudio}/lib/libportaudio${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; diff --git a/pkgs/development/python-modules/streamdeck/default.nix b/pkgs/development/python-modules/streamdeck/default.nix index e921659e2284..2d4009c57c7e 100644 --- a/pkgs/development/python-modules/streamdeck/default.nix +++ b/pkgs/development/python-modules/streamdeck/default.nix @@ -3,7 +3,7 @@ stdenv, buildPythonPackage, fetchPypi, - substituteAll, + replaceVars, pkgs, }: @@ -19,8 +19,7 @@ buildPythonPackage rec { patches = [ # substitute libusb path - (substituteAll { - src = ./hardcode-libusb.patch; + (replaceVars ./hardcode-libusb.patch { libusb = "${pkgs.hidapi}/lib/libhidapi-libusb${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; diff --git a/pkgs/development/python-modules/termplotlib/default.nix b/pkgs/development/python-modules/termplotlib/default.nix index c4112b3e1629..d690ad1aa5a9 100644 --- a/pkgs/development/python-modules/termplotlib/default.nix +++ b/pkgs/development/python-modules/termplotlib/default.nix @@ -1,6 +1,6 @@ { lib, - substituteAll, + replaceVars, buildPythonPackage, fetchFromGitHub, pytestCheckHook, @@ -33,8 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; patches = [ - (substituteAll { - src = ./gnuplot-subprocess.patch; + (replaceVars ./gnuplot-subprocess.patch { gnuplot = "${gnuplot.out}/bin/gnuplot"; }) ]; diff --git a/pkgs/development/python-modules/tinygrad/default.nix b/pkgs/development/python-modules/tinygrad/default.nix index b7826c8c01f2..e979b7991281 100644 --- a/pkgs/development/python-modules/tinygrad/default.nix +++ b/pkgs/development/python-modules/tinygrad/default.nix @@ -3,7 +3,7 @@ config, buildPythonPackage, fetchFromGitHub, - substituteAll, + replaceVars, addDriverRunpath, cudaSupport ? config.cudaSupport, rocmSupport ? config.rocmSupport, @@ -56,8 +56,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./fix-dlopen-cuda.patch; + (replaceVars ./fix-dlopen-cuda.patch { inherit (addDriverRunpath) driverLink; libnvrtc = if cudaSupport then diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix index 7ca0bb688a41..807f51dabe42 100644 --- a/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, - substituteAll, + replaceVars, buildPythonPackage, fetchPypi, fetchpatch, @@ -53,8 +53,7 @@ buildPythonPackage rec { # when cross-compiling is turned on. # This patch changes the call to pycparser.preprocess_file to provide the name # of the cross-compiling cpp - (substituteAll { - src = ./cross.patch; + (replaceVars ./cross.patch { crossPrefix = stdenv.hostPlatform.config; }) ]; diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix index eb3b16c0a3ea..875c06b5fe71 100644 --- a/pkgs/development/python-modules/vispy/default.nix +++ b/pkgs/development/python-modules/vispy/default.nix @@ -2,7 +2,7 @@ lib, stdenv, buildPythonPackage, - substituteAll, + replaceVars, fetchPypi, cython, fontconfig, @@ -32,8 +32,7 @@ buildPythonPackage rec { }; patches = lib.optionals (!stdenv.hostPlatform.isDarwin) [ - (substituteAll { - src = ./library-paths.patch; + (replaceVars ./library-paths.patch { fontconfig = "${fontconfig.lib}/lib/libfontconfig${stdenv.hostPlatform.extensions.sharedLibrary}"; gl = "${libGL.out}/lib/libGL${stdenv.hostPlatform.extensions.sharedLibrary}"; }) diff --git a/pkgs/development/python-modules/wallet-py3k/default.nix b/pkgs/development/python-modules/wallet-py3k/default.nix index fb50398d5be4..1237dafc3396 100644 --- a/pkgs/development/python-modules/wallet-py3k/default.nix +++ b/pkgs/development/python-modules/wallet-py3k/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchPypi, - substituteAll, + replaceVars, openssl, setuptools, six, @@ -19,8 +19,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./openssl-path.patch; + (replaceVars ./openssl-path.patch { openssl = lib.getExe openssl; }) ]; diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index 9636de89d64a..d724cc4afd6b 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -13,7 +13,7 @@ ## wandb buildPythonPackage, - substituteAll, + replaceVars, # build-system hatchling, @@ -150,8 +150,7 @@ buildPythonPackage rec { patches = [ # Replace git paths - (substituteAll { - src = ./hardcode-git-path.patch; + (replaceVars ./hardcode-git-path.patch { git = lib.getExe git; }) ]; diff --git a/pkgs/development/python-modules/wavefile/default.nix b/pkgs/development/python-modules/wavefile/default.nix index 9711e2684038..c36b099f26d0 100644 --- a/pkgs/development/python-modules/wavefile/default.nix +++ b/pkgs/development/python-modules/wavefile/default.nix @@ -7,7 +7,7 @@ pyaudio, numpy, libsndfile, - substituteAll, + replaceVars, }: buildPythonPackage rec { @@ -40,8 +40,7 @@ buildPythonPackage rec { patches = [ # Fix check error # OSError: libsndfile.so.1: cannot open shared object file: No such file or directory - (substituteAll { - src = ./libsndfile.py.patch; + (replaceVars ./libsndfile.py.patch { libsndfile = "${lib.getLib libsndfile}/lib/libsndfile${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index e50d4f3d921a..d9deb72e8266 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -18,7 +18,7 @@ pytest-cov-stub, pytestCheckHook, pythonOlder, - substituteAll, + replaceVars, tinycss2, tinyhtml5, }: @@ -37,13 +37,11 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./library-paths.patch; + (replaceVars ./library-paths.patch { fontconfig = "${fontconfig.lib}/lib/libfontconfig${stdenv.hostPlatform.extensions.sharedLibrary}"; pangoft2 = "${pango.out}/lib/libpangoft2-1.0${stdenv.hostPlatform.extensions.sharedLibrary}"; gobject = "${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}"; pango = "${pango.out}/lib/libpango-1.0${stdenv.hostPlatform.extensions.sharedLibrary}"; - pangocairo = "${pango.out}/lib/libpangocairo-1.0${stdenv.hostPlatform.extensions.sharedLibrary}"; harfbuzz = "${harfbuzz.out}/lib/libharfbuzz${stdenv.hostPlatform.extensions.sharedLibrary}"; harfbuzz_subset = "${harfbuzz.out}/lib/libharfbuzz-subset${stdenv.hostPlatform.extensions.sharedLibrary}"; }) diff --git a/pkgs/development/python-modules/wxpython/4.2.nix b/pkgs/development/python-modules/wxpython/4.2.nix index 8fd324dff01f..6a5d3debaf40 100644 --- a/pkgs/development/python-modules/wxpython/4.2.nix +++ b/pkgs/development/python-modules/wxpython/4.2.nix @@ -4,7 +4,7 @@ buildPythonPackage, setuptools, fetchPypi, - substituteAll, + replaceVars, # build autoPatchelfHook, @@ -52,8 +52,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./4.2-ctypes.patch; + (replaceVars ./4.2-ctypes.patch { libgdk = "${gtk3.out}/lib/libgdk-3.so"; libpangocairo = "${pango}/lib/libpangocairo-1.0.so"; libcairo = "${cairo}/lib/libcairo.so"; diff --git a/pkgs/development/python-modules/xsdata/default.nix b/pkgs/development/python-modules/xsdata/default.nix index 97d0d64a3b4b..3d4f21b9d1cd 100644 --- a/pkgs/development/python-modules/xsdata/default.nix +++ b/pkgs/development/python-modules/xsdata/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - substituteAll, + replaceVars, ruff, click, click-default-group, @@ -32,8 +32,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./paths.patch; + (replaceVars ./paths.patch { ruff = lib.getExe ruff; }) ]; diff --git a/pkgs/development/python-modules/youseedee/default.nix b/pkgs/development/python-modules/youseedee/default.nix index e35be6b56568..6117e329d62a 100644 --- a/pkgs/development/python-modules/youseedee/default.nix +++ b/pkgs/development/python-modules/youseedee/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchPypi, - substituteAll, + replaceVars, setuptools, setuptools-scm, filelock, @@ -23,8 +23,7 @@ buildPythonPackage rec { patches = [ # Load data files from the unicode-character-database package instead of # downloading them from the internet. (nixpkgs-specific, not upstreamable) - (substituteAll { - src = ./0001-use-packaged-unicode-data.patch; + (replaceVars ./0001-use-packaged-unicode-data.patch { ucd_dir = "${unicode-character-database}/share/unicode"; }) ]; diff --git a/pkgs/development/python-modules/yq/default.nix b/pkgs/development/python-modules/yq/default.nix index dfc1ae08903e..a0e3a27ac169 100644 --- a/pkgs/development/python-modules/yq/default.nix +++ b/pkgs/development/python-modules/yq/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, pyyaml, setuptools-scm, - substituteAll, + replaceVars, tomlkit, xmltodict, }: @@ -23,8 +23,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./jq-path.patch; + (replaceVars ./jq-path.patch { jq = "${lib.getBin jq}/bin/jq"; }) ]; diff --git a/pkgs/development/python-modules/zlib-ng/default.nix b/pkgs/development/python-modules/zlib-ng/default.nix index 77b3743c0137..15380edc65fa 100644 --- a/pkgs/development/python-modules/zlib-ng/default.nix +++ b/pkgs/development/python-modules/zlib-ng/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - substituteAll, + replaceVars, # build-system cmake, @@ -29,8 +29,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./version.patch; + (replaceVars ./version.patch { inherit version; }) ]; diff --git a/pkgs/development/rocm-modules/5/rocprofiler/default.nix b/pkgs/development/rocm-modules/5/rocprofiler/default.nix index 10397e8b9e7a..2948a7c03686 100644 --- a/pkgs/development/rocm-modules/5/rocprofiler/default.nix +++ b/pkgs/development/rocm-modules/5/rocprofiler/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, rocmUpdateScript, symlinkJoin, - substituteAll, + replaceVars, cmake, clang, clr, @@ -62,8 +62,7 @@ stdenv.mkDerivation (finalAttrs: { ./0000-dont-install-tests-hsaco.patch # Fix bad paths - (substituteAll { - src = ./0001-fix-shell-scripts.patch; + (replaceVars ./0001-fix-shell-scripts.patch { rocmtoolkit_merged = rocmtoolkit-merged; }) ]; diff --git a/pkgs/development/rocm-modules/6/rocprofiler/default.nix b/pkgs/development/rocm-modules/6/rocprofiler/default.nix index c3a0bf7112a6..a80c6e90f132 100644 --- a/pkgs/development/rocm-modules/6/rocprofiler/default.nix +++ b/pkgs/development/rocm-modules/6/rocprofiler/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, rocmUpdateScript, symlinkJoin, - substituteAll, + replaceVars, cmake, clang, clr, @@ -62,8 +62,7 @@ stdenv.mkDerivation (finalAttrs: { ./0000-dont-install-tests-hsaco.patch # Fix bad paths - (substituteAll { - src = ./0001-fix-shell-scripts.patch; + (replaceVars ./0001-fix-shell-scripts.patch { rocmtoolkit_merged = rocmtoolkit-merged; }) diff --git a/pkgs/development/tcl-modules/by-name/ex/expect/package.nix b/pkgs/development/tcl-modules/by-name/ex/expect/package.nix index ae1c8ae21cc1..f2d0c6d4bf63 100644 --- a/pkgs/development/tcl-modules/by-name/ex/expect/package.nix +++ b/pkgs/development/tcl-modules/by-name/ex/expect/package.nix @@ -7,7 +7,7 @@ makeWrapper, autoreconfHook, fetchpatch, - substituteAll, + replaceVars, }: tcl.mkTclDerivation rec { @@ -20,8 +20,7 @@ tcl.mkTclDerivation rec { }; patches = [ - (substituteAll { - src = ./fix-build-time-run-tcl.patch; + (replaceVars ./fix-build-time-run-tcl.patch { tcl = "${buildPackages.tcl}/bin/tclsh"; }) # The following patches fix compilation with clang 15+ diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index 5fd35f3cb914..79c6726806ea 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -38,7 +38,7 @@ # Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers). enableNixHacks ? false, file, - substituteAll, + replaceVars, writeTextFile, }: @@ -203,8 +203,7 @@ stdenv.mkDerivation rec { # This patch removes using the -fobjc-arc compiler option and makes the code # compile without automatic reference counting. Caveat: this leaks memory, but # we accept this fact because xcode_locator is only a short-lived process used during the build. - (substituteAll { - src = ./no-arc.patch; + (replaceVars ./no-arc.patch { multiBinPatch = if stdenv.hostPlatform.system == "aarch64-darwin" then "arm64" else "x86_64"; }) @@ -214,20 +213,17 @@ stdenv.mkDerivation rec { # This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries. # So we are replacing this bazel paths by defaultShellPath, # improving hermeticity and making it work in nixos. - (substituteAll { - src = ../strict_action_env.patch; + (replaceVars ../strict_action_env.patch { strictActionEnvPatch = defaultShellPath; }) - (substituteAll { - src = ./actions_path.patch; + (replaceVars ./actions_path.patch { actionsPathPatch = defaultShellPath; }) # bazel reads its system bazelrc in /etc # override this path to a builtin one - (substituteAll { - src = ../bazel_rc.patch; + (replaceVars ../bazel_rc.patch { bazelSystemBazelRCPath = bazelRC; }) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix index 7d339dec2c96..e941d53395c0 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix @@ -16,7 +16,7 @@ # Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers). , enableNixHacks ? false , file -, substituteAll +, replaceVars , writeTextFile , writeShellApplication , makeBinaryWrapper @@ -239,8 +239,7 @@ stdenv.mkDerivation rec { # This patch removes using the -fobjc-arc compiler option and makes the code # compile without automatic reference counting. Caveat: this leaks memory, but # we accept this fact because xcode_locator is only a short-lived process used during the build. - (substituteAll { - src = ./no-arc.patch; + (replaceVars ./no-arc.patch { multiBinPatch = if stdenv.hostPlatform.system == "aarch64-darwin" then "arm64" else "x86_64"; }) @@ -250,20 +249,17 @@ stdenv.mkDerivation rec { # This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries. # So we are replacing this bazel paths by defaultShellPath, # improving hermeticity and making it work in nixos. - (substituteAll { - src = ../strict_action_env.patch; + (replaceVars ../strict_action_env.patch { strictActionEnvPatch = defaultShellPath; }) - (substituteAll { - src = ./actions_path.patch; + (replaceVars ./actions_path.patch { actionsPathPatch = defaultShellPath; }) # bazel reads its system bazelrc in /etc # override this path to a builtin one - (substituteAll { - src = ../bazel_rc.patch; + (replaceVars ../bazel_rc.patch { bazelSystemBazelRCPath = bazelRC; }) ] ++ lib.optional enableNixHacks ./nix-hacks.patch; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix index cd9acfcfc723..11da64513cbf 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix @@ -5,7 +5,7 @@ fetchurl, makeWrapper, writeTextFile, - substituteAll, + replaceVars, writeShellApplication, makeBinaryWrapper, autoPatchelfHook, @@ -377,15 +377,13 @@ stdenv.mkDerivation rec { # This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries. # So we are replacing this bazel paths by defaultShellPath, # improving hermeticity and making it work in nixos. - (substituteAll { - src = ../strict_action_env.patch; + (replaceVars ../strict_action_env.patch { strictActionEnvPatch = defaultShellPath; }) # bazel reads its system bazelrc in /etc # override this path to a builtin one - (substituteAll { - src = ../bazel_rc.patch; + (replaceVars ../bazel_rc.patch { bazelSystemBazelRCPath = bazelRC; }) ] diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix index 2a230cd8039e..660fe6671625 100644 --- a/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -64,7 +64,6 @@ buildDunePackage { in [ (replaceVars (if old-patch then ./fix-paths.patch else ./fix-paths2.patch) { - dot-merlin-reader = "${dot-merlin-reader}/bin/dot-merlin-reader"; dune = "${dune_3}/bin/dune"; }) diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index 12aaeac1fddd..858520d5b891 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -3,7 +3,7 @@ fetchurl, fetchpatch, buildDunePackage, - substituteAll, + replaceVars, dot-merlin-reader, dune_2, yojson, @@ -24,9 +24,8 @@ buildDunePackage rec { minimalOCamlVersion = "4.02.3"; patches = [ - (substituteAll { - src = ./fix-paths.patch; - dot_merlin_reader = "${dot-merlin-reader}/bin/dot-merlin-reader"; + (replaceVars ./fix-paths.patch { + dot-merlin-reader = "${dot-merlin-reader}/bin/dot-merlin-reader"; dune = "${dune_2}/bin/dune"; }) # https://github.com/ocaml/merlin/pull/1798 diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index 503dff90cd45..d7c966ef5630 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, dwarf-therapist, dwarf-fortress, substituteAll, coreutils, wrapQtAppsHook +{ stdenv, dwarf-therapist, dwarf-fortress, replaceVars, coreutils, wrapQtAppsHook }: let @@ -14,8 +14,7 @@ stdenv.mkDerivation { pname = "dwarf-therapist"; inherit (dwarf-therapist) version meta; - wrapper = substituteAll { - src = ./dwarf-therapist.in; + wrapper = replaceVars ./dwarf-therapist.in { stdenv_shell = "${stdenv.shell}"; rm = "${coreutils}/bin/rm"; ln = "${coreutils}/bin/ln"; @@ -23,6 +22,8 @@ stdenv.mkDerivation { mkdir = "${coreutils}/bin/mkdir"; dirname = "${coreutils}/bin/dirname"; therapist = "${dwarf-therapist}"; + # replaced in buildCommand + install = null; }; paths = [ dwarf-therapist ]; diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index b1a6555f6cb4..55f08c328558 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -2,7 +2,7 @@ stdenv, lib, buildEnv, - substituteAll, + replaceVars, makeWrapper, runCommand, coreutils, @@ -185,11 +185,8 @@ lib.throwIf (enableTWBT' && !enableDFHack) "dwarf-fortress: TWBT requires DFHack pname = "dwarf-fortress"; version = dwarf-fortress.dfVersion; - dfInit = substituteAll { - name = "dwarf-fortress-init"; - src = ./dwarf-fortress-init.in; + dfInit = replaceVars ./dwarf-fortress-init.in { inherit env; - inherit (dwarf-fortress) exe; stdenv_shell = "${stdenv.shell}"; cp = "${coreutils}/bin/cp"; rm = "${coreutils}/bin/rm"; diff --git a/pkgs/kde/plasma/kinfocenter/default.nix b/pkgs/kde/plasma/kinfocenter/default.nix index 8911e77cf452..ce85b92bfc12 100644 --- a/pkgs/kde/plasma/kinfocenter/default.nix +++ b/pkgs/kde/plasma/kinfocenter/default.nix @@ -10,7 +10,7 @@ pciutils, pulseaudio, qttools, - substituteAll, + replaceVars, systemsettings, util-linux, vulkan-tools, @@ -40,9 +40,10 @@ mkKdeDerivation { patches = [ # fwupdmgr is provided through NixOS' module - (substituteAll ( + (replaceVars ./0001-tool-paths.patch ( { - src = ./0001-tool-paths.patch; + # @QtBinariesDir@ only appears in the *removed* lines of the diff + QtBinariesDir = null; } // tools )) diff --git a/pkgs/kde/plasma/plasma-workspace/default.nix b/pkgs/kde/plasma/plasma-workspace/default.nix index 6225f7c3b77c..6aa092b2a757 100644 --- a/pkgs/kde/plasma/plasma-workspace/default.nix +++ b/pkgs/kde/plasma/plasma-workspace/default.nix @@ -1,7 +1,7 @@ { lib, mkKdeDerivation, - substituteAll, + replaceVars, dbus, fontconfig, xorg, @@ -22,8 +22,7 @@ mkKdeDerivation { pname = "plasma-workspace"; patches = [ - (substituteAll { - src = ./dependency-paths.patch; + (replaceVars ./dependency-paths.patch { dbusSend = lib.getExe' dbus "dbus-send"; fcMatch = lib.getExe' fontconfig "fc-match"; lsof = lib.getExe lsof; @@ -31,6 +30,8 @@ mkKdeDerivation { xmessage = lib.getExe xorg.xmessage; xrdb = lib.getExe xorg.xrdb; xsetroot = lib.getExe xorg.xsetroot; + # @QtBinariesDir@ only appears in the *removed* lines of the diff + QtBinariesDir = null; }) ]; diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 9672e7761542..c3eac48f118f 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - substituteAll, + replaceVars, pkg-config, gnused, autoreconfHook, @@ -55,20 +55,15 @@ stdenv.mkDerivation rec { ] ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "devdoc"; patches = [ - (substituteAll { - src = ./fix-paths.patch; - bash = "${bash}/bin/bash"; + (replaceVars ./fix-paths.patch { false = "${coreutils}/bin/false"; mdadm = "${mdadm}/bin/mdadm"; - mkswap = "${util-linux}/bin/mkswap"; sed = "${gnused}/bin/sed"; sh = "${bash}/bin/sh"; sleep = "${coreutils}/bin/sleep"; - swapon = "${util-linux}/bin/swapon"; true = "${coreutils}/bin/true"; }) - (substituteAll { - src = ./force-path.patch; + (replaceVars ./force-path.patch { path = lib.makeBinPath [ btrfs-progs coreutils diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 23f28b18597d..05c8a4f89acb 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, fetchPypi, python313, - substituteAll, + replaceVars, ffmpeg-headless, inetutils, nixosTests, @@ -440,8 +440,7 @@ python.pkgs.buildPythonApplication rec { ./patches/static-follow-symlinks.patch # Patch path to ffmpeg binary - (substituteAll { - src = ./patches/ffmpeg-path.patch; + (replaceVars ./patches/ffmpeg-path.patch { ffmpeg = "${lib.getExe ffmpeg-headless}"; }) ]; diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index d3161f748743..8e2f0bfbbc80 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, - substituteAll, + replaceVars, fetchFromGitHub, autoreconfHook, gettext, @@ -71,10 +71,15 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { pythonInterpreter = python3Runtime.interpreter; pythonSitePackages = python3.sitePackages; + # patch context + prefix = null; + datarootdir = null; + localedir = null; + # removed line only + PYTHON = null; }) ./build-without-dbus-launch.patch ]; diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix index f33ada649a34..9f3daa919e0f 100644 --- a/pkgs/tools/misc/ckb-next/default.nix +++ b/pkgs/tools/misc/ckb-next/default.nix @@ -2,7 +2,7 @@ lib, wrapQtAppsHook, fetchFromGitHub, - substituteAll, + replaceVars, udev, stdenv, pkg-config, @@ -57,9 +57,7 @@ stdenv.mkDerivation rec { patches = [ ./install-dirs.patch - (substituteAll { - name = "ckb-next-modprobe.patch"; - src = ./modprobe.patch; + (replaceVars ./modprobe.patch { inherit kmod; }) ]; diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index fa91b2c64dca..bdb0cf2a7659 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, substituteAll +, replaceVars , gettext , pkg-config , dbus @@ -122,10 +122,11 @@ stdenv.mkDerivation rec { ]; patches = [ - (substituteAll { - src = ./fix-paths.patch; - inherit iputils openconnect ethtool gnused systemd; + (replaceVars ./fix-paths.patch { + inherit iputils openconnect ethtool gnused; inherit runtimeShell; + # patch context + OUTPUT = null; }) # Meson does not support using different directories during build and From 97c880aa78d4d6d37314069ad9287313b7b50e99 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 9 Feb 2025 11:50:20 +0100 Subject: [PATCH 0317/1107] gjs: mark unsupported on static --- pkgs/by-name/gj/gjs/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/gj/gjs/package.nix b/pkgs/by-name/gj/gjs/package.nix index 55342995339d..367396d89431 100644 --- a/pkgs/by-name/gj/gjs/package.nix +++ b/pkgs/by-name/gj/gjs/package.nix @@ -166,6 +166,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.lgpl2Plus; mainProgram = "gjs"; maintainers = teams.gnome.members; - platforms = platforms.unix; + inherit (gobject-introspection.meta) platforms badPlatforms; }; }) From 42eb935d1e81ed97ce0420647edf2b765be09ee5 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 9 Feb 2025 11:50:30 +0100 Subject: [PATCH 0318/1107] glib-networking: mark unsupported on static --- pkgs/by-name/gl/glib-networking/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/gl/glib-networking/package.nix b/pkgs/by-name/gl/glib-networking/package.nix index dd5b234d3dbe..13bf9c1b5b82 100644 --- a/pkgs/by-name/gl/glib-networking/package.nix +++ b/pkgs/by-name/gl/glib-networking/package.nix @@ -96,5 +96,9 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; maintainers = teams.gnome.members; platforms = platforms.unix; + badPlatforms = [ + # GIO shared modules are mandatory. + lib.systems.inspect.platformPatterns.isStatic + ]; }; } From 2e1dc0c979600d269690483fd53e73737c089490 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 9 Feb 2025 11:48:54 +0100 Subject: [PATCH 0319/1107] dconf: mark unsupported on static --- pkgs/by-name/dc/dconf/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/dc/dconf/package.nix b/pkgs/by-name/dc/dconf/package.nix index e98add24382e..0984e2d5eed3 100644 --- a/pkgs/by-name/dc/dconf/package.nix +++ b/pkgs/by-name/dc/dconf/package.nix @@ -97,6 +97,10 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/dconf"; license = licenses.lgpl21Plus; platforms = platforms.unix; + badPlatforms = [ + # Mandatory libdconfsettings shared library. + lib.systems.inspect.platformPatterns.isStatic + ]; maintainers = teams.gnome.members; mainProgram = "dconf"; }; From 160c79845e7ace59f2c6f3efc7f29f8684be341f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 9 Feb 2025 11:49:17 +0100 Subject: [PATCH 0320/1107] wrapGAppsNoGuiHook: only use dconf if available Better have as much as possible working than an eval failure. --- pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix b/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix index df134ddd63cc..0ff6305fe5de 100644 --- a/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix +++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix @@ -8,6 +8,7 @@ gtk3, librsvg, dconf, + withDconf ? !stdenv.targetPlatform.isDarwin && lib.meta.availableOn stdenv.targetPlatform dconf, callPackage, wrapGAppsHook3, targetPackages, @@ -41,7 +42,7 @@ makeSetupHook { # TODO: remove this, packages should depend on GTK explicitly. gtk3 ] - ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + ++ lib.optionals withDconf [ # It is highly probable that a program will use GSettings, # at minimum through GTK file chooser dialogue. # Let’s add a GIO module for “dconf” GSettings backend From 87adf3ef9f29f096f9571ed806203c2806fdd638 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 9 Feb 2025 11:51:22 +0100 Subject: [PATCH 0321/1107] ostree: fix static --- pkgs/by-name/os/ostree/package.nix | 32 ++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/os/ostree/package.nix b/pkgs/by-name/os/ostree/package.nix index bab231271d53..b6d1f6edaa37 100644 --- a/pkgs/by-name/os/ostree/package.nix +++ b/pkgs/by-name/os/ostree/package.nix @@ -3,17 +3,13 @@ , fetchurl , pkg-config , gtk-doc -, gobject-introspection -, gjs , nixosTests , pkgsCross , curl , glib -, systemd , xz , e2fsprogs , libsoup_2_4 -, glib-networking , wrapGAppsNoGuiHook , gpgme , which @@ -33,10 +29,19 @@ , docbook-xsl-nons , docbook_xml_dtd_42 , python3 - - # Optional ComposeFS support +, buildPackages , withComposefs ? false , composefs +, withGjs ? lib.meta.availableOn stdenv.hostPlatform gjs +, gjs +, withGlibNetworking ? lib.meta.availableOn stdenv.hostPlatform glib-networking +, glib-networking +, withIntrospection ? + lib.meta.availableOn stdenv.hostPlatform gobject-introspection + && stdenv.hostPlatform.emulatorAvailable buildPackages +, gobject-introspection +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd +, systemd }: let @@ -60,8 +65,8 @@ in stdenv.mkDerivation rec { automake libtool pkg-config + glib gtk-doc - gobject-introspection which makeWrapper bison @@ -69,15 +74,15 @@ in stdenv.mkDerivation rec { docbook-xsl-nons docbook_xml_dtd_42 wrapGAppsNoGuiHook + ] ++ lib.optionals withIntrospection [ + gobject-introspection ]; buildInputs = [ curl glib - systemd e2fsprogs libsoup_2_4 - glib-networking gpgme fuse3 libselinux @@ -90,9 +95,14 @@ in stdenv.mkDerivation rec { # for installed tests testPython - gjs ] ++ lib.optionals withComposefs [ (lib.getDev composefs) + ] ++ lib.optionals withGjs [ + gjs + ] ++ lib.optionals withGlibNetworking [ + glib-networking + ] ++ lib.optionals withSystemd [ + systemd ]; enableParallelBuilding = true; @@ -125,7 +135,7 @@ in stdenv.mkDerivation rec { (placeholder "out") gobject-introspection ]; - in '' + in lib.optionalString withIntrospection '' for test in $installedTests/libexec/installed-tests/libostree/*.js; do wrapProgram "$test" --prefix GI_TYPELIB_PATH : "${typelibPath}" done From 8f6d2b14efe41b6bbed6be180d4487ace1c84bb5 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 00:37:39 +0000 Subject: [PATCH 0322/1107] apple-sdk_{11,12,13,14}: use Wayback Machine URLs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apple like to remove old minor releases of the SDK when bumping to a new one. Our current 15.0 SDK is already gone. Since these are all the last minor version of their major version, they’re probably not at risk of imminent deletion, but given their general practices it makes sense to guard against, especially as we can’t be sure ahead of time what the last minor version will be. --- pkgs/by-name/ap/apple-sdk/metadata/versions.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ap/apple-sdk/metadata/versions.json b/pkgs/by-name/ap/apple-sdk/metadata/versions.json index 5a444c2c4eaa..153b31d39afa 100644 --- a/pkgs/by-name/ap/apple-sdk/metadata/versions.json +++ b/pkgs/by-name/ap/apple-sdk/metadata/versions.json @@ -1,21 +1,21 @@ { "11": { - "url": "https://swcdn.apple.com/content/downloads/02/62/071-54303-A_EU2CL1YVT7/943i95dpeyi2ghlnj2mgyq3t202t5gf18b/CLTools_macOSNMOS_SDK.pkg", + "url": "https://web.archive.org/web/20250210235110/https://swcdn.apple.com/content/downloads/02/62/071-54303-A_EU2CL1YVT7/943i95dpeyi2ghlnj2mgyq3t202t5gf18b/CLTools_macOSNMOS_SDK.pkg", "version": "11.3", "hash": "sha256-/go8utcx3jprf6c8V/DUbXwsmNYSFchOAai1OaJs3Bg=" }, "12": { - "url": "https://swcdn.apple.com/content/downloads/24/42/002-83793-A_74JRE8GVAT/rlnkct919wgc5c0pjq986z5bb9h62uvni2/CLTools_macOSNMOS_SDK.pkg", + "url": "https://web.archive.org/web/20250210235341/https://swcdn.apple.com/content/downloads/24/42/002-83793-A_74JRE8GVAT/rlnkct919wgc5c0pjq986z5bb9h62uvni2/CLTools_macOSNMOS_SDK.pkg", "version": "12.3", "hash": "sha256-qG21ssNUmkqxPLTXALGP2N/RBHu8NMlI1dWvGlV+Wm8=" }, "13": { - "url": "https://swcdn.apple.com/content/downloads/15/62/032-84673-A_7A1TG1RF8Z/xpc8q44ggn2pkn82iwr0fi1zeb9cxi8ath/CLTools_macOSNMOS_SDK.pkg", + "url": "https://web.archive.org/web/20250210235949/https://swcdn.apple.com/content/downloads/15/62/032-84673-A_7A1TG1RF8Z/xpc8q44ggn2pkn82iwr0fi1zeb9cxi8ath/CLTools_macOSNMOS_SDK.pkg", "version": "13.3", "hash": "sha256-zZ4pbgoXunLGwdYDemxOfyH4CE5WGfMy2s5jN+0q4B4=" }, "14": { - "url": "https://swcdn.apple.com/content/downloads/14/48/052-59890-A_I0F5YGAY0Y/p9n40hio7892gou31o1v031ng6fnm9sb3c/CLTools_macOSNMOS_SDK.pkg", + "url": "https://web.archive.org/web/20250211001355/https://swcdn.apple.com/content/downloads/14/48/052-59890-A_I0F5YGAY0Y/p9n40hio7892gou31o1v031ng6fnm9sb3c/CLTools_macOSNMOS_SDK.pkg", "version": "14.4", "hash": "sha256-QozDiwY0Czc0g45vPD7G4v4Ra+3DujCJbSads3fJjjM=" }, From e8ad14c5a2c745eadfa5add729d11846ec96f3a3 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 00:51:10 +0000 Subject: [PATCH 0323/1107] apple-sdk_15: 15.0 -> 15.2 --- .../metadata/apple-oss-lockfile.json | 78 +++++++++---------- .../ap/apple-sdk/metadata/versions.json | 6 +- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json b/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json index e68c2643ab7c..5157b58ce3df 100644 --- a/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json +++ b/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json @@ -711,14 +711,14 @@ "version": "10063.101.15" } }, - "15.0": { + "15.2": { "CarbonHeaders": { "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=", "version": "18.1" }, "CommonCrypto": { - "hash": "sha256-qwQEFoycAw+YLwqpZgJB1Ppg8mrWFnRPDj4I5f2Ggns=", - "version": "600032" + "hash": "sha256-+qAwL6+s7di9cX/qXtapLkjCFoDuZaSYltRJEG4qekM=", + "version": "600033.60.1" }, "IOAudioFamily": { "hash": "sha256-VSk3jvsITJugtL67Qt0m4qJ879i7Fj6B/NGBFVCwpiU=", @@ -761,12 +761,12 @@ "version": "598" }, "IOHIDFamily": { - "hash": "sha256-4hIztdbKpoC0VrRVwZkoCZuByyTGw02lrrcFDBAXyko=", - "version": "2102.0.6" + "hash": "sha256-utWAwmn9jss/6fc4flDHXeJR5ZBymO0ZFbDFIFVBnt4=", + "version": "2104.61.1" }, "IOKitUser": { - "hash": "sha256-ytMma1ft1fKjCvP0SKdwnVonPEixzthoCR7ML94/pLE=", - "version": "100140.0.6" + "hash": "sha256-vfz/kLZlVyoHKOlrNdNrf2HcUOB6bY+mpbCvEEg2sus=", + "version": "100140.60.14" }, "IONetworkingFamily": { "hash": "sha256-gZ7Dkk4Iu7AV9K2ioqSeJ1W7bTNxv77bmT18iv3ljLg=", @@ -777,16 +777,16 @@ "version": "93" }, "IOStorageFamily": { - "hash": "sha256-W9H3jzaXLvAb0cziHBpNo5Iom7c7H5bg4MxQIhIsefc=", - "version": "317" + "hash": "sha256-tjzvlJYVjSTG7oF3AhHgCASKax1fYjOBAxcsrKh/urY=", + "version": "317.40.2" }, "IOUSBFamily": { "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=", "version": "630.4.5" }, "Libc": { - "hash": "sha256-1t+e8DQUmsrmr1f6QUU4uUm/el3G7EOL+vUO28srPAM=", - "version": "1669.0.4" + "hash": "sha256-/J1Oawa+cMbcAlMlpr6ce32KQQp2lMGnfbRi/2Oc1cY=", + "version": "1669.60.4" }, "Libinfo": { "hash": "sha256-D7JMCakQVCQ9j2zUHQSGB8zZcHD6azwYY3bsJU0JfEE=", @@ -797,8 +797,8 @@ "version": "2026" }, "Libnotify": { - "hash": "sha256-qYox9iQUnU0AGVfPK2p61/2zlNAJmixCE5K7WojMQ3I=", - "version": "327.0.5" + "hash": "sha256-XwVB4sYXPLAHDuLv8mxAWlC1ia17V4cf73DEJDDm4ck=", + "version": "327.60.1" }, "Librpcsvc": { "hash": "sha256-UWYdCQ9QsBqwM01bWr+igINAHSdSluB/FrOclC5AjTI=", @@ -813,68 +813,68 @@ "version": "146" }, "Security": { - "hash": "sha256-ptS/IESkJmbcO3H+v6mmN2jvH2mfLXi+fMQfGCLSt7M=", - "version": "61439.1.1" + "hash": "sha256-sRpFQyMk3x4kRthXpqeAnfQ9dE5RMxiSFUiUKRCneck=", + "version": "61439.60.117" }, "architecture": { "hash": "sha256-PRNUrhzSOrwmxSPkKmV0LV7yEIik65sdkfKdBqcwFhU=", "version": "282" }, "configd": { - "hash": "sha256-Wks7d0Kere6YYPJar593ZSC5bbkyKcaTxrHK6Ah6u0c=", - "version": "1345" + "hash": "sha256-xRaEzq/OOMBi7lvi2bV2/ObN5JJJ5vcFy8DGHLItUWM=", + "version": "1351" }, "copyfile": { - "hash": "sha256-lIhl5sr1gewIHkh10hD+H/I7MVPzlHlONGRMOO7OZuA=", - "version": "213" + "hash": "sha256-Vz1fo4p2b6S8xfyDPu1FNgMkH1aX0tkpXCZkdzkRdq0=", + "version": "213.40.2" }, "dtrace": { - "hash": "sha256-S0gI+9eTcuZkh0FWmTmZ+AhZ4qoSdnUb5GTp1melk9A=", - "version": "409" + "hash": "sha256-iNEZyxK3DmEwO3gzrfvCaVZSEuuOMQm5IG/6FodPNdI=", + "version": "411" }, "dyld": { - "hash": "sha256-q0GN5+4mW8Yxer0XxhlLK7JRM4JDoxeSFDRzbZ738lw=", - "version": "1231.3" + "hash": "sha256-DDhV7X81nhd3oeJuICEvF8FU43yE/afQ/LYgDNtXswA=", + "version": "1241.17" }, "eap8021x": { "hash": "sha256-2FdEb76KBbCAl2iwly4c1Xstar53O8qgGdN/3WXO23U=", "version": "364" }, "hfs": { - "hash": "sha256-utmIFAW7Gdbbj71oZnHSaTUse9cIN3ZSfXyFTmuxnc4=", - "version": "672" + "hash": "sha256-isTLSBDxh12W10I5KY6O6SsygqnOvqJ0TfdWIKSK3pM=", + "version": "677.60.1" }, "launchd": { "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=", "version": "842.1.4" }, "libclosure": { - "hash": "sha256-21OuQearKTN75OgHN+RPLR1VGdf3ZffPYpV51Kj6LYE=", - "version": "94" + "hash": "sha256-I0PKQFnoJVRMA7H3yT+inHS0454/FXHhQB6nwmHFvFs=", + "version": "95" }, "libdispatch": { - "hash": "sha256-q2oyaEdt8clVLjLwBjAAvLKodpuYThscK3VcQotCmIM=", - "version": "1502.0.1" + "hash": "sha256-f2ex/53OFeSR5A0nMapxC6AocqBSweecNtEhp4bWjhE=", + "version": "1504.60.7" }, "libmalloc": { - "hash": "sha256-tFaYSvebk4uIIPu/46eMp6QnwiO/SmShjUoFnJjnmsc=", - "version": "646.0.13" + "hash": "sha256-Rw/9s7yY3qPtKfDhP+p+0z+aaCsxgwvdUyRG2V1N6D8=", + "version": "657.60.21" }, "libplatform": { - "hash": "sha256-U3TRUGBxuspEPfzdsd+53Kh8E9GmceMhsxxXuQbcdcc=", - "version": "340" + "hash": "sha256-o/W1pQ9yGTE8HQlGcggM+XiJbEyqgc/s0uiY3+yBtnA=", + "version": "340.60.2" }, "libpthread": { "hash": "sha256-eYHDAt2wNk7hJZJxsC7Y9w4ASKdexidu613kPo7TAKs=", "version": "535" }, "mDNSResponder": { - "hash": "sha256-w+Pw/VsHl8hkDiS7EEEYKp9P2NVwu8NSVPSn2U15vHM=", - "version": "2559.1.1" + "hash": "sha256-mDyY/2S4EHbGh02J6VWZVxhNXXZmWGX+NjUjPfMZgZA=", + "version": "2559.60.39.0.1" }, "objc4": { - "hash": "sha256-Z9UAm/hjjO2K0c7ag/ws4e/Y2nKOWnObPgp4HUZe+W4=", - "version": "928.2" + "hash": "sha256-uBFS5extMQkXAXJfPtPlBYAQpz+zsRHQnEaLpDOcYGM=", + "version": "928.3" }, "ppp": { "hash": "sha256-8+QUA79sHf85yvGSPE9qCmGsrZDT3NZnbgZVroJw/Hg=", @@ -885,8 +885,8 @@ "version": "75" }, "xnu": { - "hash": "sha256-9cFPrWtTpCb02YrvKX1KWoExoH2VjPdOBU4dscmKL4A=", - "version": "11215.1.10" + "hash": "sha256-o8CxHvM2OXiAWJmnFe5ERQYnrNyJ+Bpdb9H0sjd6L10=", + "version": "11215.61.5" } } } diff --git a/pkgs/by-name/ap/apple-sdk/metadata/versions.json b/pkgs/by-name/ap/apple-sdk/metadata/versions.json index 153b31d39afa..b5f2dc7f5a19 100644 --- a/pkgs/by-name/ap/apple-sdk/metadata/versions.json +++ b/pkgs/by-name/ap/apple-sdk/metadata/versions.json @@ -20,8 +20,8 @@ "hash": "sha256-QozDiwY0Czc0g45vPD7G4v4Ra+3DujCJbSads3fJjjM=" }, "15": { - "url": "https://swcdn.apple.com/content/downloads/33/46/042-32691-A_3MH7S3118O/3dblccqo9ws17dc5lk3hojfbt3s74q0ql6/CLTools_macOSNMOS_SDK.pkg", - "version": "15.0", - "hash": "sha256-JhaAPyfX46D+9sematdAYAORw40JP3xvleWRz7Hj/1s=" + "url": "https://web.archive.org/web/20250210234739/https://swcdn.apple.com/content/downloads/36/33/072-44426-A_G1AII30AST/ddbss9h6gse6a32rg6luosbrm6vgniu033/CLTools_macOSNMOS_SDK.pkg", + "version": "15.2", + "hash": "sha256-OP5Ah/JnSZ6sD42BD5vGDmikgFzjsfFBmz1hvQD1dOI=" } } From d5a73874afb7378343d7d1bf82af542d826518c2 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 0324/1107] darwin.AvailabilityVersions: 143.3 -> 143.6 --- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 8a4a26ba956e..fc8bbdb16aa6 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -1,7 +1,7 @@ { "AvailabilityVersions": { - "hash": "sha256-CmFrmbk3XJXhGStc+prNoFTDJiFu4n2wVP3OvMfQwOU=", - "version": "143.3" + "hash": "sha256-PT54BPSRkQiIHrpxZCdjo6XvNuWxESabLndCBYjulfs=", + "version": "143.6" }, "Csu": { "hash": "sha256-l8RI8aiin7ovZuoDh54thDmd/b502w+dtjN5ZoISZBg=", From 072f8e0c4d366343ae3baf7eba9bedd2b90b2731 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 0325/1107] darwin.ICU: 74221 -> 74222.203 --- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index fc8bbdb16aa6..3c0fe6ea508f 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -8,8 +8,8 @@ "version": "88" }, "ICU": { - "hash": "sha256-CvpMLFNCEQ05t3nkzDyA9nsm3cmRgXG/QxbyiLpSpIs=", - "version": "74221" + "hash": "sha256-7ImBX4SlrFaLnHdQ4bm4F8q9IpHhQMaeVOO6pnnhyzQ=", + "version": "74222.203" }, "IOKitTools": { "hash": "sha256-Oknsvzn4nv77WU7f0WPS446iwR2BM2q4iw46r/qctAE=", From 596efc83794acb0fcf2204365ace8b84a112f298 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 11 Feb 2025 12:17:39 +0800 Subject: [PATCH 0326/1107] emacsPackages.cask: remove strictDeps It is true by default[1] now. [1]: https://github.com/NixOS/nixpkgs/pull/379256 --- .../emacs/elisp-packages/manual-packages/cask/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix index 1ec482d5d794..a344978ebf33 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix @@ -45,8 +45,6 @@ melpaBuild (finalAttrs: { shut-up ]; - strictDeps = true; - # use melpaVersion so that it works for unstable releases too postPatch = '' lispdir=$out/share/emacs/site-lisp/elpa/cask-${finalAttrs.melpaVersion} \ From 6abb29dfed9e481f32c0ebaa0dd971208c84b870 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 11 Feb 2025 12:18:32 +0800 Subject: [PATCH 0327/1107] emacsPackages.notdeft: remove strictDeps It is true by default[1] now. [1]: https://github.com/NixOS/nixpkgs/pull/379256 --- .../emacs/elisp-packages/manual-packages/notdeft/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix index 055c09a05f61..1e9a634f447f 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix @@ -42,8 +42,6 @@ melpaBuild { ${lib.optionalString withIvy ''"extras/notdeft-ivy.el"''}) ''; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ From 6a2d3a9b146c6bf471c616257e968e939ea61d2f Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 11 Feb 2025 12:21:54 +0800 Subject: [PATCH 0328/1107] Revert "emacsPackages.dap-mode: fix build" This reverts commit fe5312cd441714a518c3585297ba0f1915e899b8. To make this fix reach users sooner, we revert it on the staging-next branch and reapply it to the master branch. --- .../emacs/elisp-packages/melpa-packages.nix | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 62f476dc5440..d3e294d70b16 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -982,19 +982,14 @@ let cssh = ignoreCompilationError super.cssh; # elisp error - dap-mode = super.dap-mode.overrideAttrs ( - finalAttrs: previousAttrs: { - # empty file causing native-compiler-error-empty-byte - preBuild = - if lib.versionOlder finalAttrs.version "20250131.1624" then - '' - rm --verbose dapui.el - '' - + previousAttrs.preBuild or "" - else - previousAttrs.preBuild or null; - } - ); + dap-mode = super.dap-mode.overrideAttrs (old: { + # empty file causing native-compiler-error-empty-byte + preBuild = + '' + rm --verbose dapui.el + '' + + old.preBuild or ""; + }); db-pg = ignoreCompilationError super.db-pg; # elisp error From 2339b13d54b58a9435848c9b641d7f60a4a5bb0a Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Mon, 10 Feb 2025 18:10:46 +0100 Subject: [PATCH 0329/1107] qt6.qtbase: unconditionally enable Vulkan and libGL support --- .../libraries/qt-6/modules/qtbase/default.nix | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix index e5ae77bd522c..2fec3fff2a6c 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix @@ -64,7 +64,9 @@ at-spi2-core, unixODBC, unixODBCDrivers, + libGL, # darwin + moltenvk, moveBuildTree, darwinVersionInputs, xcbuild, @@ -79,8 +81,6 @@ withLibinput ? false, libinput, # options - libGLSupported ? stdenv.hostPlatform.isLinux, - libGL, qttranslations ? null, fetchpatch, }: @@ -100,6 +100,9 @@ stdenv.mkDerivation rec { openssl sqlite zlib + libGL + vulkan-headers + vulkan-loader # Text rendering harfbuzz icu @@ -133,8 +136,6 @@ stdenv.mkDerivation rec { libselinux libsepol lttng-ust - vulkan-headers - vulkan-loader libthai libdrm libdatrie @@ -160,20 +161,13 @@ stdenv.mkDerivation rec { xorg.xcbutilcursor libepoxy ] - ++ lib.optionals libGLSupported [ - libGL - ] - ++ lib.optionals stdenv.hostPlatform.isMinGW [ - vulkan-headers - vulkan-loader - ] ++ lib.optional (cups != null && lib.meta.availableOn stdenv.hostPlatform cups) cups; buildInputs = lib.optionals (lib.meta.availableOn stdenv.hostPlatform at-spi2-core) [ at-spi2-core ] - ++ lib.optionals stdenv.hostPlatform.isDarwin darwinVersionInputs + ++ lib.optionals stdenv.hostPlatform.isDarwin (darwinVersionInputs ++ [ moltenvk ]) ++ lib.optional withGtk3 gtk3 ++ lib.optional withLibinput libinput ++ lib.optional (libmysqlclient != null && !stdenv.hostPlatform.isMinGW) libmysqlclient @@ -282,11 +276,11 @@ stdenv.mkDerivation rec { "-DQT_FEATURE_libproxy=ON" "-DQT_FEATURE_system_sqlite=ON" "-DQT_FEATURE_openssl_linked=ON" + "-DQT_FEATURE_vulkan=ON" ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "-DQT_FEATURE_sctp=ON" "-DQT_FEATURE_journald=${if systemdSupport then "ON" else "OFF"}" - "-DQT_FEATURE_vulkan=ON" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DQT_FEATURE_rpath=OFF" From 4a2271743367814d072f955bde2406925658cd8d Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Feb 2025 22:18:52 +0300 Subject: [PATCH 0330/1107] libical: 3.0.18 -> 3.0.19 --- pkgs/by-name/li/libical/fix-cmake.patch | 30 +++++++++++++++++++++++++ pkgs/by-name/li/libical/package.nix | 20 +++++++---------- 2 files changed, 38 insertions(+), 12 deletions(-) create mode 100644 pkgs/by-name/li/libical/fix-cmake.patch diff --git a/pkgs/by-name/li/libical/fix-cmake.patch b/pkgs/by-name/li/libical/fix-cmake.patch new file mode 100644 index 000000000000..f0e3d002feb7 --- /dev/null +++ b/pkgs/by-name/li/libical/fix-cmake.patch @@ -0,0 +1,30 @@ +diff --git a/src/test/libical-glib/CMakeLists.txt b/src/test/libical-glib/CMakeLists.txt +index 01a0894a1..d7d2af5bb 100644 +--- a/src/test/libical-glib/CMakeLists.txt ++++ b/src/test/libical-glib/CMakeLists.txt +@@ -36,19 +36,19 @@ list( + + if(PYTHON3) + set(GI_TYPELIB_PATH_STR "${PROJECT_BINARY_DIR}/src/libical-glib") +- if(DEFINED GI_TYPELIB_PATH) +- if($ENV{GI_TYPELIB_PATH}) ++ if(DEFINED ENV{GI_TYPELIB_PATH}) ++ if(NOT ENV{GI_TYPELIB_PATH} STREQUAL "") + set(GI_TYPELIB_PATH_STR "${GI_TYPELIB_PATH_STR}:$ENV{GI_TYPELIB_PATH}") + endif() + endif() + set(LIBRARY_PATH_STR "${LIBRARY_OUTPUT_PATH}") +- if(DEFINED LD_LIBRARY_PATH) +- if($ENV{LD_LIBRARY_PATH}) ++ if(DEFINED ENV{LD_LIBRARY_PATH}) ++ if(NOT ENV{LD_LIBRARY_PATH} STREQUAL "") + set(LIBRARY_PATH_STR "${LIBRARY_PATH_STR}:$ENV{LD_LIBRARY_PATH}") + endif() + endif() +- if(DEFINED DYLD_LIBRARY_PATH) +- if($ENV{DYLD_LIBRARY_PATH}) ++ if(DEFINED ENV{DYLD_LIBRARY_PATH}) ++ if(NOT ENV{DYLD_LIBRARY_PATH} STREQUAL "") + set(LIBRARY_PATH_STR "${LIBRARY_PATH_STR}:$ENV{DYLD_LIBRARY_PATH}") + endif() + endif() diff --git a/pkgs/by-name/li/libical/package.nix b/pkgs/by-name/li/libical/package.nix index ef92eddd1011..b3f5a63ab6f1 100644 --- a/pkgs/by-name/li/libical/package.nix +++ b/pkgs/by-name/li/libical/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { pname = "libical"; - version = "3.0.18"; + version = "3.0.19"; outputs = [ "out" @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { owner = "libical"; repo = "libical"; rev = "v${version}"; - sha256 = "sha256-32FNnCybXO67Vtg1LM6miJUaK+r0mlfjxgLQg1LD8Es="; + sha256 = "sha256-ZJXxi1LOZyEpgdcmoK0pe5IA3+l9WY0zLu6Ttzy1QSc="; }; strictDeps = true; @@ -91,18 +91,14 @@ stdenv.mkDerivation rec { # Will appear in 3.1.0 # https://github.com/libical/libical/issues/350 ./respect-env-tzdir.patch + + # CMake setup fix for tests + # Submitted upstream: https://github.com/libical/libical/pull/885 + # FIXME: remove when merged + ./fix-cmake.patch ]; - postPatch = '' - # Fix typo in test env setup - # https://github.com/libical/libical/commit/03c02ced21494413920744a400c638b0cb5d493f - substituteInPlace src/test/libical-glib/CMakeLists.txt \ - --replace-fail "''${CMAKE_BINARY_DIR}/src/libical-glib;\$ENV{GI_TYPELIB_PATH}" "''${CMAKE_BINARY_DIR}/src/libical-glib:\$ENV{GI_TYPELIB_PATH}" \ - --replace-fail "''${LIBRARY_OUTPUT_PATH};\$ENV{LD_LIBRARY_PATH}" "''${LIBRARY_OUTPUT_PATH}:\$ENV{LD_LIBRARY_PATH}" - ''; - - # Using install check so we do not have to manually set - # LD_LIBRARY_PATH and GI_TYPELIB_PATH variables + # Using install check so we do not have to manually set GI_TYPELIB_PATH # Musl does not support TZDIR. doInstallCheck = !stdenv.hostPlatform.isMusl; enableParallelChecking = false; From 21797f9368ca6fc0830560a32bd494dceb2c6253 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Tue, 11 Feb 2025 06:57:44 +0000 Subject: [PATCH 0331/1107] maturin: 1.8.1 -> 1.8.2 Diff: https://github.com/PyO3/maturin/compare/v1.8.1...v1.8.2 Changelog: https://github.com/PyO3/maturin/releases/tag/v1.8.2 --- pkgs/by-name/ma/maturin/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix index 24f40f987082..5f8ae3cdb2d3 100644 --- a/pkgs/by-name/ma/maturin/package.nix +++ b/pkgs/by-name/ma/maturin/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-Ix1UTVYJRPTii/LqJQto+und+BrSAIZeHlTA6biysm0="; + hash = "sha256-k4s0kh68kycc8MSVkD64X547mWmFW4UuToDIcZ87OSc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-vgMzl3Kx1OqHSkVdykgwoMn+XNrjg93OmVgDc6I7AV0="; + cargoHash = "sha256-6aLWkphWLScUz6l0RJj9LmNad6aPxLz2iVxXVOXq7pg="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security From 61001472b462eba319151fbbc5e4fb7fc8ca4327 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 11 Feb 2025 10:45:59 +0300 Subject: [PATCH 0332/1107] separateDebugInfo: fix cleanup, refactor a little - cleanup with --ignore-fail-on-non-empty - extract destDir and destFile variables - unnest all the subshells --- .../setup-hooks/separate-debug-info.sh | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/pkgs/build-support/setup-hooks/separate-debug-info.sh index 9cec77b9b0cd..4208aa481d0d 100644 --- a/pkgs/build-support/setup-hooks/separate-debug-info.sh +++ b/pkgs/build-support/setup-hooks/separate-debug-info.sh @@ -33,21 +33,25 @@ _separateDebugInfo() { # Extract the debug info. echo "separating debug info from $i (build ID $id)" - mkdir -p "$dst/${id:0:2}" + + destDir=$dst/${id:0:2} + destFile=$dst/${id:0:2}/${id:2}.debug + + mkdir -p "$destDir" + + if [ -f "$destFile" ]; then + echo "separate-debug-info: warning: multiple files with build id $id found, overwriting" + fi # This may fail, e.g. if the binary is for a different # architecture than we're building for. (This happens with # firmware blobs in QEMU.) - ( - if [ -f "$dst/${id:0:2}/${id:2}.debug" ] - then - echo "separate-debug-info: warning: multiple files with build id $id found, overwriting" - fi - ( - $OBJCOPY --only-keep-debug "$i" "$dst/${id:0:2}/${id:2}.debug" && - # Also a create a symlink .debug. - ln -sfn ".build-id/${id:0:2}/${id:2}.debug" "$dst/../$(basename "$i")" - ) - ) || rmdir -p "$dst/${id:0:2}" + if $OBJCOPY --only-keep-debug "$i" "$destFile"; then + # If we succeeded, also a create a symlink .debug. + ln -sfn ".build-id/${id:0:2}/${id:2}.debug" "$dst/../$(basename "$i")" + else + # If we failed, try to clean up unnecessary directories + rmdir -p "$dst/${id:0:2}" --ignore-fail-on-non-empty + fi done < <(find "$prefix" -type f -print0 | sort -z) } From c3b1bffd9124d1ef3bc262b5f390c056cdfdebd8 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 11 Feb 2025 10:01:56 +0000 Subject: [PATCH 0333/1107] xorg.xkeyboardconfig: 2.43 -> 2.44 Changes: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/blob/xkeyboard-config-2.44/ChangeLog.md --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 83a61ee2529d..3fc2c5b4ae42 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -3883,11 +3883,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xkeyboardconfig = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xkeyboard-config"; - version = "2.43"; + version = "2.44"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.43.tar.xz"; - sha256 = "00bcs1yj57jbgw1zcilz6f4rgjaj2k6k87m8kpl4x0rar1ig6468"; + url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.44.tar.xz"; + sha256 = "0aillh6pmx5ji5jbqviq007vvg69ahz5832rz941s0xvxqzc7ljl"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 0c7378869811..fc4c1026b084 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -72,7 +72,7 @@ mirror://xorg/individual/app/xwininfo-1.1.6.tar.xz mirror://xorg/individual/app/xwud-1.0.7.tar.xz mirror://xorg/individual/data/xbitmaps-1.1.3.tar.xz mirror://xorg/individual/data/xcursor-themes-1.0.7.tar.xz -mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.43.tar.xz +mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.44.tar.xz mirror://xorg/individual/doc/xorg-docs-1.7.3.tar.xz mirror://xorg/individual/doc/xorg-sgml-doctools-1.12.1.tar.xz mirror://xorg/individual/driver/xf86-input-evdev-2.11.0.tar.xz From 757d2836919966eef06ed5c4af0647a6f2c297f4 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Tue, 11 Feb 2025 11:45:25 +0100 Subject: [PATCH 0334/1107] nodejs_22: 22.13.1 -> 22.14.0 --- pkgs/development/web/nodejs/v22.nix | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index 78a842c395ad..5c0c3f3d7279 100644 --- a/pkgs/development/web/nodejs/v22.nix +++ b/pkgs/development/web/nodejs/v22.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "22.13.1"; - sha256 = "cfce282119390f7e0c2220410924428e90dadcb2df1744c0c4a0e7baae387cc2"; + version = "22.14.0"; + sha256 = "c609946bf793b55c7954c26582760808d54c16185d79cb2fb88065e52de21914"; patches = [ ./configure-emulator.patch ./configure-armv6-vfpv2.patch @@ -18,22 +18,5 @@ buildNodejs { ./node-npm-build-npm-package-logic.patch ./use-correct-env-in-tests.patch ./bin-sh-node-run-v22.patch - - # FIXME: remove after a minor point release - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/49acdc8748fe9fe83bc1b444e24c456dff00ecc5.patch?full_index=1"; - hash = "sha256-iK7bj4KswTeQ9I3jJ22ZPTsvCU8xeGGXEOo43dxg3Mk="; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/d0ff34f4b690ad49c86b6df8fd424f39d183e1a6.patch?full_index=1"; - hash = "sha256-ezcCrg7UwK091pqYxXJn4ay9smQwsrYeMO/NBE7VaM8="; - }) - # test-icu-env is failing on ICU 74.2 - # FIXME: remove once https://github.com/nodejs/node/pull/56661 is included in a next release - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/a364ec1d1cbbd5a6d20ee54d4f8648dd7592ebcd.patch?full_index=1"; - hash = "sha256-EL1NgCBzz5O1spwHgocLm5mkORAiqGFst0N6pc3JvFg="; - revert = true; - }) ]; } From 74cc66d52afc8a11d47614bfa4575b85ffda4c6c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 4 Feb 2025 14:52:04 +0100 Subject: [PATCH 0335/1107] libxmlb: fix static --- pkgs/by-name/li/libxmlb/package.nix | 49 ++++++++++++++++++----------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/li/libxmlb/package.nix b/pkgs/by-name/li/libxmlb/package.nix index 79937718941c..d814ee010450 100644 --- a/pkgs/by-name/li/libxmlb/package.nix +++ b/pkgs/by-name/li/libxmlb/package.nix @@ -15,19 +15,26 @@ nixosTests, xz, zstd, + buildPackages, + withIntrospection ? + lib.meta.availableOn stdenv.hostPlatform gobject-introspection + && stdenv.hostPlatform.emulatorAvailable buildPackages, }: stdenv.mkDerivation rec { pname = "libxmlb"; version = "0.3.21"; - outputs = [ - "out" - "lib" - "dev" - "devdoc" - "installedTests" - ]; + outputs = + [ + "out" + "lib" + "dev" + "installedTests" + ] + ++ lib.optionals withIntrospection [ + "devdoc" + ]; src = fetchFromGitHub { owner = "hughsie"; @@ -40,17 +47,20 @@ stdenv.mkDerivation rec { ./installed-tests-path.patch ]; - nativeBuildInputs = [ - docbook_xml_dtd_43 - docbook-xsl-nons - gobject-introspection - gtk-doc - meson - ninja - pkg-config - python3 - shared-mime-info - ]; + nativeBuildInputs = + [ + docbook_xml_dtd_43 + docbook-xsl-nons + meson + ninja + pkg-config + python3 + shared-mime-info + ] + ++ lib.optionals withIntrospection [ + gobject-introspection + gtk-doc + ]; buildInputs = [ glib @@ -60,7 +70,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "--libexecdir=${placeholder "out"}/libexec" - "-Dgtkdoc=true" + (lib.mesonBool "gtkdoc" withIntrospection) + (lib.mesonBool "introspection" withIntrospection) "-Dinstalled_test_prefix=${placeholder "installedTests"}" ]; From 2b1fe000cdadedff0af13492a361369b5d878bc4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Feb 2025 13:00:10 +0000 Subject: [PATCH 0336/1107] zlib-ng: 2.2.3 -> 2.2.4 --- pkgs/by-name/zl/zlib-ng/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zl/zlib-ng/package.nix b/pkgs/by-name/zl/zlib-ng/package.nix index 6b80713075de..70935d20f519 100644 --- a/pkgs/by-name/zl/zlib-ng/package.nix +++ b/pkgs/by-name/zl/zlib-ng/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "zlib-ng"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitHub { owner = "zlib-ng"; repo = "zlib-ng"; rev = version; - hash = "sha256-22JX7diwhPaAhqErUdFymeSMzEGQkOp7LdBFwCnx5oc="; + hash = "sha256-Khmrhp5qy4vvoQe4WgoogpjWrgcUB/q8zZeqIydthYg="; }; outputs = [ From db43d077d2e149e6fa99394405b8412387fdb421 Mon Sep 17 00:00:00 2001 From: misilelab Date: Tue, 11 Feb 2025 19:54:55 +0900 Subject: [PATCH 0337/1107] glance: 0.6.4 -> 0.7.1 Signed-off-by: misilelab --- pkgs/by-name/gl/glance/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gl/glance/package.nix b/pkgs/by-name/gl/glance/package.nix index 2f9f14fbc117..70690be2f87a 100644 --- a/pkgs/by-name/gl/glance/package.nix +++ b/pkgs/by-name/gl/glance/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "glance"; - version = "0.6.4"; + version = "0.7.1"; src = fetchFromGitHub { owner = "glanceapp"; repo = "glance"; rev = "v${version}"; - hash = "sha256-L3IBCh4pDeaErxl89s/1yMHoU8dYtRcmqcIgFiyGq2U="; + hash = "sha256-Ef3Kf7rYmkWqOUpde7P46IRs1x/+jMW3lmN13hfTCNs="; }; - vendorHash = "sha256-6PDcUb2Rv+Shqb+wtsit8Yt9RSgN5tz+MeXrujZXDCo="; + vendorHash = "sha256-lURRHlZoxbuW1SXxrxy2BkMndcEllGFmVCB4pXBad8Q="; excludedPackages = [ "scripts/build-and-ship" ]; From c05c515eff3cb57822df6399e923d05b24c4ede7 Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Fri, 10 Jan 2025 18:27:20 +0100 Subject: [PATCH 0338/1107] openssl_3_4: init at 3.4.1; openssl_3_3: remove Updates OpenSSL 3.x latest to 3.4.1 Security Fixes in 3.4.1: * Fixed RFC7250 handshakes with unauthenticated servers don't abort as expected. ([CVE-2024-12797]) * Fixed timing side-channel in ECDSA signature computation. ([CVE-2024-13176](https://www.openssl.org/news/vulnerabilities.html#CVE-2024-13176)) Release notes: https://github.com/openssl/openssl/blob/openssl-3.4.0/NEWS.md#openssl-34 Some significant changes: * Deprecation of TS_VERIFY_CTX_set_* functions and addition of replacement TS_VERIFY_CTX_set0_* functions with improved semantics * SHAKE-128 and SHAKE-256 implementations have no default digest length anymore. That means these algorithms cannot be used with EVP_DigestFinal/_ex() unless the xoflen param is set before. * An empty renegotiate extension will be used in TLS client hellos instead of the empty renegotiation SCSV, for all connections with a minimum TLS version > 1.0. * Deprecation of SSL_SESSION_get_time(), SSL_SESSION_set_time() and SSL_CTX_flush_sessions() functions in favor of their respective _ex functions which are Y2038-safe on platforms with Y2038-safe time_t Some new features: * Support for directly fetched composite signature algorithms such as RSA-SHA2-256 including new API functions * New options -not_before and -not_after for explicit setting start and end dates of certificates created with the req and x509 apps * Support for attribute certificates * Support for pkeyutl in combination with key encapsulation (e.q. PQC-KEMs): -encap/-decap Signed-off-by: Markus Theil --- .../{3.3 => 3.4}/use-etc-ssl-certs-darwin.patch | 0 .../openssl/{3.3 => 3.4}/use-etc-ssl-certs.patch | 0 pkgs/development/libraries/openssl/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) rename pkgs/development/libraries/openssl/{3.3 => 3.4}/use-etc-ssl-certs-darwin.patch (100%) rename pkgs/development/libraries/openssl/{3.3 => 3.4}/use-etc-ssl-certs.patch (100%) diff --git a/pkgs/development/libraries/openssl/3.3/use-etc-ssl-certs-darwin.patch b/pkgs/development/libraries/openssl/3.4/use-etc-ssl-certs-darwin.patch similarity index 100% rename from pkgs/development/libraries/openssl/3.3/use-etc-ssl-certs-darwin.patch rename to pkgs/development/libraries/openssl/3.4/use-etc-ssl-certs-darwin.patch diff --git a/pkgs/development/libraries/openssl/3.3/use-etc-ssl-certs.patch b/pkgs/development/libraries/openssl/3.4/use-etc-ssl-certs.patch similarity index 100% rename from pkgs/development/libraries/openssl/3.3/use-etc-ssl-certs.patch rename to pkgs/development/libraries/openssl/3.4/use-etc-ssl-certs.patch diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index f0cf68f8b6aa..51e71d15368e 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -366,9 +366,9 @@ in }; }; - openssl_3_3 = common { - version = "3.3.2"; - hash = "sha256-LopAsBl5r+i+C7+z3l3BxnCf7bRtbInBDaEUq1/D0oE="; + openssl_3_4 = common { + version = "3.4.1"; + hash = "sha256-1LIlJ6ZFrPdrU+REh6jbaHxu7WIdckaJHQJeOLqMllE="; patches = [ ./3.0/nix-ssl-cert-file.patch @@ -379,9 +379,9 @@ in ( if stdenv.hostPlatform.isDarwin then - ./3.3/use-etc-ssl-certs-darwin.patch + ./3.4/use-etc-ssl-certs-darwin.patch else - ./3.3/use-etc-ssl-certs.patch + ./3.4/use-etc-ssl-certs.patch ) ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 43d90812ebe1..fd2b75bb5c47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10196,7 +10196,7 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) Security; }; - openssl = openssl_3_3; + openssl = openssl_3_4; openssl_legacy = openssl.override { conf = ../development/libraries/openssl/3.0/legacy.cnf; @@ -10205,7 +10205,7 @@ with pkgs; inherit (callPackages ../development/libraries/openssl { }) openssl_1_1 openssl_3 - openssl_3_3; + openssl_3_4; openwebrx = callPackage ../applications/radio/openwebrx { inherit (python3Packages) From 7a64edd4dfaf3583f7e5621fc4679a157f768444 Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Fri, 10 Jan 2025 21:03:51 +0100 Subject: [PATCH 0339/1107] quictls: fix openssl patch paths for 3.4 Fix paths related to OpenSSL 3.4.x patches. Signed-off-by: Markus Theil --- pkgs/development/libraries/quictls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/quictls/default.nix b/pkgs/development/libraries/quictls/default.nix index 63ddc6313d6a..a36d230fcbbc 100644 --- a/pkgs/development/libraries/quictls/default.nix +++ b/pkgs/development/libraries/quictls/default.nix @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { ../openssl/3.0/openssl-disable-kernel-detection.patch (if stdenv.hostPlatform.isDarwin - then ../openssl/3.3/use-etc-ssl-certs-darwin.patch - else ../openssl/3.3/use-etc-ssl-certs.patch) + then ../openssl/3.4/use-etc-ssl-certs-darwin.patch + else ../openssl/3.4/use-etc-ssl-certs.patch) ]; postPatch = '' From 9a706eda06d4d5848af16359875df4fa1311cfb8 Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Tue, 11 Feb 2025 16:02:03 +0100 Subject: [PATCH 0340/1107] openssl_3: 3.0.15 -> 3.0.16 Security Fixes in 3.0.16: * Fixed timing side-channel in ECDSA signature computation. (CVE-2024-13176) * Fixed possible OOB memory access with invalid low-level GF(2^m) elliptic curve parameters. (CVE-2024-9143) Signed-off-by: Markus Theil --- pkgs/development/libraries/openssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 51e71d15368e..624904c170bb 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -344,8 +344,8 @@ in }; openssl_3 = common { - version = "3.0.15"; - hash = "sha256-I8Zm0O3yDxQkmz2PA2isrumrWFsJ4d6CEHxm4fPslTM="; + version = "3.0.16"; + hash = "sha256-V+A8UP6rXTGxUq8rdk8QN5rs2O6S8WyYWYPOSpn374Y="; patches = [ ./3.0/nix-ssl-cert-file.patch From a0b46893d8fbe0438e6a6257ff0f7cedf4180cdc Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 11 Feb 2025 16:47:38 +0100 Subject: [PATCH 0341/1107] sqlite: fix Libs.private --- pkgs/development/libraries/sqlite/Libs.private.patch | 11 +++++++++++ pkgs/development/libraries/sqlite/default.nix | 7 +++++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/sqlite/Libs.private.patch diff --git a/pkgs/development/libraries/sqlite/Libs.private.patch b/pkgs/development/libraries/sqlite/Libs.private.patch new file mode 100644 index 000000000000..e20d7ff18cc5 --- /dev/null +++ b/pkgs/development/libraries/sqlite/Libs.private.patch @@ -0,0 +1,11 @@ +diff --git a/sqlite3.pc.in b/sqlite3.pc.in +index a9f941b..3799671 100644 +--- a/sqlite3.pc.in ++++ b/sqlite3.pc.in +@@ -9,5 +9,5 @@ Name: SQLite + Description: SQL database engine + Version: @PACKAGE_VERSION@ + Libs: -L${libdir} -lsqlite3 +-Libs.private: @LDFLAGS_MATH@ @LDFLAGS_ZLIB@ @LDFLAGS_ICU@ ++Libs.private: @LIBS@ + Cflags: -I${includedir} diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 5522cab569ab..670fad6e538d 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -29,6 +29,13 @@ stdenv.mkDerivation rec { hash = "sha256-PcE3/NfGrLMmr2CmG5hE3RXTdzywXnqc4nbEH3E9dlo="; }; + patches = [ + # https://sqlite.org/forum/forumpost/3380558ea82c8a3e + # Can be removed with the next release. + # Test: pkgsStatic.gnupg + ./Libs.private.patch + ]; + outputs = [ "bin" "dev" "man" "doc" "out" ]; separateDebugInfo = stdenv.hostPlatform.isLinux; From b09f1cd54ab40647adce4d9d8b614ef39a4dd086 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 11 Feb 2025 17:43:04 +0100 Subject: [PATCH 0342/1107] openssl: fix hash This is the hash for the GitHub snapshot of the 3.4.1 tag, not the official tarball we're using. When the PR doing this update was updated after the tarballs came out, updating the hash was forgotten. I've checked the hashes of the other OpenSSL versions and they're fine. Fixes: c05c515eff3c ("openssl_3_4: init at 3.4.1; openssl_3_3: remove") --- pkgs/development/libraries/openssl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 624904c170bb..3fb0961c6d38 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -368,7 +368,7 @@ in openssl_3_4 = common { version = "3.4.1"; - hash = "sha256-1LIlJ6ZFrPdrU+REh6jbaHxu7WIdckaJHQJeOLqMllE="; + hash = "sha256-ACotazC1i/S+pGxDvdljZar42qbEKHgqpP7uBtoZffM="; patches = [ ./3.0/nix-ssl-cert-file.patch From 2f705bc10e677b53e2f7bcd4a428a68f7a871395 Mon Sep 17 00:00:00 2001 From: Guillaume Racicot Date: Tue, 11 Feb 2025 14:00:10 -0500 Subject: [PATCH 0343/1107] vcpkg-tool: 2024-07-10 -> 2025-01-29 --- pkgs/by-name/vc/vcpkg-tool/package.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vc/vcpkg-tool/package.nix b/pkgs/by-name/vc/vcpkg-tool/package.nix index d67d50871d11..a5204fbbf2fd 100644 --- a/pkgs/by-name/vc/vcpkg-tool/package.nix +++ b/pkgs/by-name/vc/vcpkg-tool/package.nix @@ -24,13 +24,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vcpkg-tool"; - version = "2024-07-10"; + version = "2025-01-29"; src = fetchFromGitHub { owner = "microsoft"; repo = "vcpkg-tool"; rev = finalAttrs.version; - hash = "sha256-P/ARKMfZdrfO+24rBrRm9k8tkBPSJJBqH509+iarNkw="; + hash = "sha256-eCeq7HKjK0aTsPqFP8jP6gIrzcF6YBEJG1MdbQse42Y="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4bd5e4cf7f83..e64fcd868850 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -357,7 +357,7 @@ with pkgs; }; vcpkg-tool = callPackage ../by-name/vc/vcpkg-tool/package.nix { - fmt = fmt_10; + fmt = fmt_11; }; r3ctl = qt5.callPackage ../tools/misc/r3ctl { }; From df3ffb239df3783eb69423bd2eacc4babf8f9a54 Mon Sep 17 00:00:00 2001 From: Guillaume Racicot Date: Tue, 11 Feb 2025 14:00:32 -0500 Subject: [PATCH 0344/1107] vcpkg: 2024.12.16 -> 2025.01.13 --- pkgs/by-name/vc/vcpkg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vc/vcpkg/package.nix b/pkgs/by-name/vc/vcpkg/package.nix index 14bc32e5cc2c..41116767cbcb 100644 --- a/pkgs/by-name/vc/vcpkg/package.nix +++ b/pkgs/by-name/vc/vcpkg/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "vcpkg"; - version = "2024.12.16"; + version = "2025.01.13"; src = fetchFromGitHub { owner = "microsoft"; repo = "vcpkg"; rev = finalAttrs.version; - hash = "sha256-4Xk71JPklq7qwYXPE+EzNvD5rTfPvgyV/O7nSvgjKVo="; + hash = "sha256-T4ihf3PC53Ch33E/MF5VR3DWKHty4PryInnkiQdHdGM="; leaveDotGit = true; postFetch = '' cd "$out" From 2b5899382f6cb897c8a48409c12a886a7fd66ac4 Mon Sep 17 00:00:00 2001 From: Adam Dinwoodie Date: Fri, 3 Jan 2025 10:35:39 +0000 Subject: [PATCH 0345/1107] git: build documentation in build phase For build process clarity, build documentation during the build phase. Without this change, the docs are built during the install phase as that's when `make` realises they're not yet present. This also means that the main Git documentation is built before the contrib/subtree documentation, which is necessary for the subtree documentation to build successfully in Git v2.48.0-rc0 and -rc1 (and presumably therefore in v2.48.0 when it is released). --- pkgs/applications/version-management/git/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 4dd0f9c7c888..55862f97067a 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -138,8 +138,13 @@ stdenv.mkDerivation (finalAttrs: { ]; - postBuild = '' - make -C contrib/subtree + postBuild = (lib.optionalString withManual '' + # Need to build the main Git documentation before building the + # contrib/subtree documentation, as the latter depends on the + # asciidoc.conf file created by the former. + make -C Documentation + '') + '' + make -C contrib/subtree all ${lib.optionalString withManual "doc"} '' + (lib.optionalString perlSupport '' make -C contrib/diff-highlight '') + (lib.optionalString osxkeychainSupport '' From 5a847c0878cf9cb19e49144a5d126aa35d6ef509 Mon Sep 17 00:00:00 2001 From: Adam Dinwoodie Date: Fri, 10 Jan 2025 21:13:57 +0000 Subject: [PATCH 0346/1107] git: 2.47.2 -> 2.48.1 This version change includes a change to the contents of the .git directory, which results in changes to hashes for any fetchgit invocations that set leaveDotGit to true. Per the fetchgit documentation and discussions in #372784, the contents of the .git directory are not stable, so anyone using that should either only be using it for temporary testing purposes, or should be removing the .git directory in fetchgit's postFetch phase, so before the hash is calculated. That means there's no need to do any other handling here to avoid compatibility problems, and can just update the relevant hashes in the fetchgit tests. There's still a chance this will break some other builds because of the change to the contents of the .git directory. If so, whoever's responsible for those other derivations should either stop using leaveDotGit, or should follow the documented advice to remove the .git directory in the postFetch phase. --- pkgs/applications/version-management/git/default.nix | 4 ++-- pkgs/build-support/fetchgit/tests.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 55862f97067a..a28d370cf85e 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -30,7 +30,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.47.2"; + version = "2.48.1"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - hash = "sha256-sZJovmtvFVa0ep3YNCcuFn06dXQM3NKDzzgS7f/jkw8="; + hash = "sha256-HF1UX13B61HpXSxQ2Y/fiLGja6H6MOmuXVOFxgJPgq0="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; diff --git a/pkgs/build-support/fetchgit/tests.nix b/pkgs/build-support/fetchgit/tests.nix index f3fcd9a578de..a9185a72693f 100644 --- a/pkgs/build-support/fetchgit/tests.nix +++ b/pkgs/build-support/fetchgit/tests.nix @@ -33,7 +33,7 @@ name = "leave-git-nix-source"; url = "https://github.com/NixOS/nix"; rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a"; - sha256 = "sha256-zZxDxqaeWvuWuzwPizBLR7d59zP24+zqnWllNICenko="; + sha256 = "sha256-3YYVIeaeu6zO7bBkZxF+1d5VS0K2GHYEZwChB3tPJ4s="; leaveDotGit = true; }; @@ -49,7 +49,7 @@ name = "submodule-leave-git-source"; url = "https://github.com/pineapplehunter/nix-test-repo-with-submodule"; rev = "26473335b84ead88ee0a3b649b1c7fa4a91cfd4a"; - sha256 = "sha256-+uXIClcRJ4S1rdgx2Oyww+Jv4h1VXp8tfeh9lb07Fhk="; + sha256 = "sha256-0pwleO/m4Iws3BF9ewyWbYMcGfEJLS3BYzWfDSYtXs8="; leaveDotGit = true; fetchSubmodules = true; }; @@ -58,7 +58,7 @@ name = "submodule-deep-source"; url = "https://github.com/pineapplehunter/nix-test-repo-with-submodule"; rev = "26473335b84ead88ee0a3b649b1c7fa4a91cfd4a"; - sha256 = "sha256-LL7uhXQk3N3DcvBBxwjmfVx55tTXCGQ19T91tknopzw="; + sha256 = "sha256-eRHOwolRZDJS/5zk88e7SdoO7nKKtjDXMLVsyFPFgk8="; deepClone = true; fetchSubmodules = true; }; @@ -67,7 +67,7 @@ name = "submodule-leave-git-deep-source"; url = "https://github.com/pineapplehunter/nix-test-repo-with-submodule"; rev = "26473335b84ead88ee0a3b649b1c7fa4a91cfd4a"; - sha256 = "sha256-LL7uhXQk3N3DcvBBxwjmfVx55tTXCGQ19T91tknopzw="; + sha256 = "sha256-eRHOwolRZDJS/5zk88e7SdoO7nKKtjDXMLVsyFPFgk8="; deepClone = true; leaveDotGit = true; fetchSubmodules = true; From 49b67490f840e04446ecc967391688b74deafb9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 20 Jan 2025 14:08:52 +0100 Subject: [PATCH 0347/1107] git: drop optional brackets --- .../version-management/git/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index a28d370cf85e..ded7316167c7 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -138,20 +138,20 @@ stdenv.mkDerivation (finalAttrs: { ]; - postBuild = (lib.optionalString withManual '' + postBuild = lib.optionalString withManual '' # Need to build the main Git documentation before building the # contrib/subtree documentation, as the latter depends on the # asciidoc.conf file created by the former. make -C Documentation - '') + '' + '' + '' make -C contrib/subtree all ${lib.optionalString withManual "doc"} - '' + (lib.optionalString perlSupport '' + '' + lib.optionalString perlSupport '' make -C contrib/diff-highlight - '') + (lib.optionalString osxkeychainSupport '' + '' + lib.optionalString osxkeychainSupport '' make -C contrib/credential/osxkeychain - '') + (lib.optionalString withLibsecret '' + '' + lib.optionalString withLibsecret '' make -C contrib/credential/libsecret - ''); + ''; ## Install @@ -161,15 +161,15 @@ stdenv.mkDerivation (finalAttrs: { installFlags = [ "NO_INSTALL_HARDLINKS=1" ]; - preInstall = (lib.optionalString osxkeychainSupport '' + preInstall = lib.optionalString osxkeychainSupport '' mkdir -p $out/bin ln -s $out/share/git/contrib/credential/osxkeychain/git-credential-osxkeychain $out/bin/ rm -f $PWD/contrib/credential/osxkeychain/git-credential-osxkeychain.o - '') + (lib.optionalString withLibsecret '' + '' + lib.optionalString withLibsecret '' mkdir -p $out/bin ln -s $out/share/git/contrib/credential/libsecret/git-credential-libsecret $out/bin/ rm -f $PWD/contrib/credential/libsecret/git-credential-libsecret.o - ''); + ''; postInstall = '' From edaf97fe9bec59dec8d2e00c793ef44afb8e7504 Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Tue, 11 Feb 2025 21:56:48 +0100 Subject: [PATCH 0348/1107] stalwart-mail-webadmin: top-level alias for hydra build --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f625b4590645..f5e9611dfcc0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11801,6 +11801,8 @@ with pkgs; showoff = callPackage ../servers/http/showoff { }; + stalwart-mail-webadmin = stalwart-mail.webadmin; + ruby-zoom = callPackage ../tools/text/ruby-zoom { }; inherit (callPackages ../servers/monitoring/sensu-go { }) From ff6fa7faae5b9b8198fc598e3a76e49c8f008504 Mon Sep 17 00:00:00 2001 From: Guillaume Racicot Date: Tue, 11 Feb 2025 16:56:37 -0500 Subject: [PATCH 0349/1107] vcpkg-tool: set VCPKG_ROOT in testWrapper --- pkgs/by-name/vc/vcpkg-tool/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/vc/vcpkg-tool/package.nix b/pkgs/by-name/vc/vcpkg-tool/package.nix index a5204fbbf2fd..5dc50afcfce6 100644 --- a/pkgs/by-name/vc/vcpkg-tool/package.nix +++ b/pkgs/by-name/vc/vcpkg-tool/package.nix @@ -178,6 +178,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests = { testWrapper = runCommand "vcpkg-tool-test-wrapper" { buildInputs = [ finalAttrs.finalPackage ]; } '' export NIX_VCPKG_DEBUG_PRINT_ENVVARS=true + export VCPKG_ROOT=. vcpkg --x-packages-root="test" --x-install-root="test2" contact > "$out" cat "$out" | head -n 4 | diff - ${writeText "vcpkg-tool-test-wrapper-expected" '' From c7cfdadc2e2f424a814f0d9f7e338e32b9fdade8 Mon Sep 17 00:00:00 2001 From: laalsaas Date: Mon, 10 Feb 2025 16:37:04 +0100 Subject: [PATCH 0350/1107] matomo: update patch --- .../ma/matomo/make-localhost-default-database-host.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/matomo/make-localhost-default-database-host.patch b/pkgs/by-name/ma/matomo/make-localhost-default-database-host.patch index 5af8ef860b2f..a716586bcf4e 100644 --- a/pkgs/by-name/ma/matomo/make-localhost-default-database-host.patch +++ b/pkgs/by-name/ma/matomo/make-localhost-default-database-host.patch @@ -1,8 +1,8 @@ diff --git a/plugins/Installation/FormDatabaseSetup.php b/plugins/Installation/FormDatabaseSetup.php -index 74de2535b4..bc172ad0eb 100644 +index 97c7e74460..d70e83d155 100644 --- a/plugins/Installation/FormDatabaseSetup.php +++ b/plugins/Installation/FormDatabaseSetup.php -@@ -82,7 +82,7 @@ class FormDatabaseSetup extends QuickForm2 +@@ -96,7 +96,7 @@ class FormDatabaseSetup extends QuickForm2 $defaults = array( @@ -10,4 +10,4 @@ index 74de2535b4..bc172ad0eb 100644 + 'host' => 'localhost', 'type' => $defaultDatabaseType, 'tables_prefix' => 'matomo_', - ); + 'schema' => 'Mysql', From abb123fed9aa2eeb808b0e879d7cb605c2939dea Mon Sep 17 00:00:00 2001 From: laalsaas Date: Mon, 10 Feb 2025 16:37:21 +0100 Subject: [PATCH 0351/1107] matomo: fix postFixup matomo started to use sha265 hashes upstream --- pkgs/by-name/ma/matomo/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/matomo/package.nix b/pkgs/by-name/ma/matomo/package.nix index ba607cbd1c1f..ac0cc2633fc8 100644 --- a/pkgs/by-name/ma/matomo/package.nix +++ b/pkgs/by-name/ma/matomo/package.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { for f in $filesToFix; do if [ -f "$f" ]; then length="$(wc -c "$f" | cut -d' ' -f1)" - hash="$(md5sum "$f" | cut -d' ' -f1)" + hash="$(sha256sum "$f" | cut -d' ' -f1)" sed -i "s:\\(\"$f\"[^(]*(\\).*:\\1\"$length\", \"$hash\"),:g" config/manifest.inc.php else echo "INFO(files-to-fix): $f does not exist in this version" From 8904f5127f5b3a7d306f02d40de94da980d82769 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 11 Feb 2025 13:47:23 -0500 Subject: [PATCH 0352/1107] go_1_24: 1.24rc3 -> 1.24.0 --- pkgs/development/compilers/go/1.24.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix index a563cbcd85a2..4afafbdbc747 100644 --- a/pkgs/development/compilers/go/1.24.nix +++ b/pkgs/development/compilers/go/1.24.nix @@ -49,11 +49,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.24rc3"; + version = "1.24.0"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-LHEopY9iz9706vaOe5vxh/P/6i7AZ1SmTW7ja/6j1pE="; + hash = "sha256-0UEgYUrLKdEryrcr1onyV+tL6eC2+IqPt+Qaxl+FVuU="; }; strictDeps = true; From bea823e65c4b98254963933b51115a0035e94385 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 0353/1107] darwin.PowerManagement: 1740.0.7 -> 1740.60.27 --- .../darwin/apple-source-releases/PowerManagement/package.nix | 2 +- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/package.nix b/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/package.nix index 91319a49644d..231d0ffb562f 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/package.nix @@ -20,7 +20,7 @@ in mkAppleDerivation { releaseName = "PowerManagement"; - xcodeHash = "sha256-yonvCPa4lJZ9VOO5BIcd0fLsnr0n2v/SHrLTlAJq+q0="; + xcodeHash = "sha256-l6lm8aaiJg4H2BQVCjlFldpfhnmPAlsiMK7Cghzuh1E="; env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include"; diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 3c0fe6ea508f..c8fdfff14d20 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -16,8 +16,8 @@ "version": "125" }, "PowerManagement": { - "hash": "sha256-BBEh2+ldmT+8tFvKcTp+4A253hxbUrmY3j7omBXRYf0=", - "version": "1740.0.7" + "hash": "sha256-APkvbp0FhNrypQcDUuREUYOnNLOZGOKhsj5JLcDgvAU=", + "version": "1740.60.27" }, "adv_cmds": { "hash": "sha256-alJOcKeHmIh67ZmN7/YdIouCP/qzakkhimsuZaOkr+c=", From c7377d3a15c000f81e96ba9d109ebbe5077e922a Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 0354/1107] darwin.copyfile: 213 -> 213.40.2 --- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index c8fdfff14d20..aba76661f6a2 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -32,8 +32,8 @@ "version": "136" }, "copyfile": { - "hash": "sha256-lIhl5sr1gewIHkh10hD+H/I7MVPzlHlONGRMOO7OZuA=", - "version": "213" + "hash": "sha256-Vz1fo4p2b6S8xfyDPu1FNgMkH1aX0tkpXCZkdzkRdq0=", + "version": "213.40.2" }, "developer_cmds": { "hash": "sha256-rgmmPHxlKPb84BHVs8oY99E8iGWbqEjS4B8H7+JK7NY=", From 51e7288bd3ac6c1969e4c6760f89ed9ffdb12c8c Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 0355/1107] darwin.developer_cmds: 79 -> 83 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It seems like `unifdefall(1)` was omitted from this package previously; I’m not sure why. --- .../developer_cmds/meson.build.in | 12 ++++++++++++ .../apple-source-releases/developer_cmds/package.nix | 2 +- .../darwin/apple-source-releases/versions.json | 4 ++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/meson.build.in index 2c6b9ca720a0..ad9c49cd6d3c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/meson.build.in +++ b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/meson.build.in @@ -78,3 +78,15 @@ executable( sources : [ 'unifdef/unifdef.c' ], ) install_man('unifdef/unifdef.1') + +install_data( + 'unifdef/unifdefall.sh', + install_dir : get_option('bindir'), + install_mode : 'r-xr-xr-x', + rename : 'unifdefall', +) +install_symlink( + 'unifdefall.1', + install_dir : get_option('mandir') / 'man1', + pointing_to : 'unifdef.1', +) diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/package.nix index adb16f58652c..4de6fb9938e6 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/package.nix @@ -14,7 +14,7 @@ mkAppleDerivation { "man" ]; - xcodeHash = "sha256-oE1GJF/M4vXLTM7BBjezKqrMu9iTUlEKDBKgwyFqu3k="; + xcodeHash = "sha256-NurkF9AnPuaQ7Ev36PCknuTNV6z622yFi2bXZsow+xA="; postPatch = '' substituteInPlace rpcgen/rpc_main.c \ diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index aba76661f6a2..df358bc6e9d2 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -36,8 +36,8 @@ "version": "213.40.2" }, "developer_cmds": { - "hash": "sha256-rgmmPHxlKPb84BHVs8oY99E8iGWbqEjS4B8H7+JK7NY=", - "version": "79" + "hash": "sha256-jgQUjN9zmqi0/7XpqzbRsJjZIYeMrxXT1Zf3qi7+o+8=", + "version": "83" }, "diskdev_cmds": { "hash": "sha256-TebggzBS/HwEP3W2w2p+XvPDxsQtdTbtKEn9wik653Q=", From 5e0bf4044651ac8d3ebf663667651e4a761a7ada Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 0356/1107] darwin.diskdev_cmds: 735 -> 737.60.1 --- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index df358bc6e9d2..121355d71912 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -40,8 +40,8 @@ "version": "83" }, "diskdev_cmds": { - "hash": "sha256-TebggzBS/HwEP3W2w2p+XvPDxsQtdTbtKEn9wik653Q=", - "version": "735" + "hash": "sha256-v3TFHLUlumt/sHxkOTyxDA4iG8ci5ZmMn7HCb4+9Uo0=", + "version": "737.60.1" }, "doc_cmds": { "hash": "sha256-/Mf+RhaTU9O5i95gddZ2h9eDjLezwj3nP6FvryMF54E=", From f51133dded7ff55a3bf30dabe63531ae8f37d10d Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 0357/1107] darwin.libffi: 35 -> 39 --- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 121355d71912..871588a4d477 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -52,8 +52,8 @@ "version": "448.0.3" }, "libffi": { - "hash": "sha256-tQJdKCz2OIwVtorHQapq9Xs2e1Ac96lGEzIWUXmsasY=", - "version": "35" + "hash": "sha256-YjRMS3H3hIEfQm5MVSxGNTBtFc/9al7iQGDeZy6m/0U=", + "version": "39" }, "libiconv": { "hash": "sha256-4I70hci8SUQ5QERbImP3htjYCGXdZZ0a6RM7ggUnVa4=", From 1db08b9f1e751417352baf3a559d039aca7298cd Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 0358/1107] darwin.libiconv: 107 -> 109 --- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 871588a4d477..fed5025dc248 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -56,8 +56,8 @@ "version": "39" }, "libiconv": { - "hash": "sha256-4I70hci8SUQ5QERbImP3htjYCGXdZZ0a6RM7ggUnVa4=", - "version": "107" + "hash": "sha256-eaUp0z7HqX0AW2C90gDVFeiJnmGRxPDuzyb1Jlm1pNc=", + "version": "109" }, "libpcap": { "hash": "sha256-x5mKK6LXGS3LBRUVNZwxA750a0NoRScTpoDUsumlg+s=", From dab00cce78f9f4d5a8d5b497b301d5169f455a72 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 0359/1107] darwin.libpcap: 135 -> 137 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was unhappy about missing BPF `struct` stuff. I’m not sure why the private header thing was like that previously but it builds fine like this. --- .../apple-source-releases/libpcap/package.nix | 21 +------------------ .../apple-source-releases/versions.json | 4 ++-- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libpcap/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libpcap/package.nix index 4ad2619face8..aba3fc53a4f7 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libpcap/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libpcap/package.nix @@ -26,26 +26,7 @@ let unifdef -x 1 -DPRIVATE -o "$out/include/net/droptap.h" '${xnu}/bsd/net/droptap.h' unifdef -x 1 -DPRIVATE -o "$out/include/net/iptap.h" '${xnu}/bsd/net/iptap.h' unifdef -x 1 -DPRIVATE -o "$out/include/net/pktap.h" '${xnu}/bsd/net/pktap.h' - - cat < "$out/include/net/bpf.h" - #pragma once - #include_next - $(sed -n \ - -e '/^struct bpf_comp_stats\s*{/,/};/p' \ - -e '/^struct bpf_hdr_ext\s*{/,/};/p' \ - -e '/^#define BIOCGBATCHWRITE\s/p' \ - -e '/^#define BIOCGHDRCOMPSTATS\s/p' \ - -e '/^#define BIOCGIFATTACHCOUNT\s/p' \ - -e '/^#define BIOCGWRITEMAX\s/p' \ - -e '/^#define BIOCSBATCHWRITE\s/p' \ - -e '/^#define BIOCSEXTHDR\s/p' \ - -e '/^#define BIOCSHEADDROP\s/p' \ - -e '/^#define BIOCSPKTHDRV2\s/p' \ - -e '/^#define BIOCSTRUNCATE\s/p' \ - -e '/^#define BIOCSWANTPKTAP\s/p' \ - -e '/^#define BIOCSWRITEMAX\s/p' \ - '${xnu}/bsd/net/bpf.h') - EOF + unifdef -x 1 -DPRIVATE -o "$out/include/net/bpf.h" '${xnu}/bsd/net/bpf.h' cat < "$out/include/net/if.h" #pragma once diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index fed5025dc248..907c5797a929 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -60,8 +60,8 @@ "version": "109" }, "libpcap": { - "hash": "sha256-x5mKK6LXGS3LBRUVNZwxA750a0NoRScTpoDUsumlg+s=", - "version": "135" + "hash": "sha256-RViIXv5zP2Bcive5qrcfb9vNWwhSe6fGCaToSgDYNxU=", + "version": "137" }, "libresolv": { "hash": "sha256-ndGcicbHizPazTCB0P3aioDOv7IJPmTOgLnioFHH2+o=", From b9dd1e6d908ec4b2882e06430201ae78aa7ac159 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 0360/1107] darwin.network_cmds: 696 -> 698.60.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apple removed the `spray.x` source and replaced it with vendored `rpcgen(1)` output for some reason. Not sure it’s worth trying to undo that. --- .../network_cmds/meson.build.in | 18 +----------------- .../network_cmds/package.nix | 4 +--- .../darwin/apple-source-releases/versions.json | 4 ++-- 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/meson.build.in index 9e15c7c5c154..d0d0d08e559e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/meson.build.in +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/meson.build.in @@ -19,21 +19,6 @@ add_global_arguments( ) -# Generators -rpcgen_bin = find_program('rpcgen') -rpcgen = generator( - rpcgen_bin, - arguments : [ '-c', '-o', '@OUTPUT@', '@INPUT@' ], - output : '@BASENAME@_xdr.c', -) - -rpcgen_header = generator( - rpcgen_bin, - arguments : [ '-h', '-o', '@OUTPUT@', '@INPUT@' ], - output : '@BASENAME@.h', -) - - # Dependencies cc = meson.get_compiler('c') @@ -340,8 +325,7 @@ executable( install : true, sources : [ 'spray.tproj/spray.c', - rpcgen_header.process('spray.tproj/spray.x'), - rpcgen.process('spray.tproj/spray.x'), + 'spray.tproj/spray_xdr.c', ], ) install_man('spray.tproj/spray.8') diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix index 58defd296f18..f6bb8f551c9b 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix @@ -1,7 +1,6 @@ { lib, apple-sdk, - developer_cmds, fetchurl, libpcap, libresolv, @@ -405,7 +404,7 @@ mkAppleDerivation { "man" ]; - xcodeHash = "sha256-L5upfoE6uHsdFOzylTTH+UPftA96qdpnvgFcK5dmhgY="; + xcodeHash = "sha256-HkcIvKB4ektuk+3J/Sque8Pr5dMeNFZRlENuiu3KdsA="; patches = [ # Some private headers depend on corecrypto, which we can’t use. @@ -444,7 +443,6 @@ mkAppleDerivation { env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include"; nativeBuildInputs = [ - developer_cmds pkg-config ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 907c5797a929..4d8b142d29b0 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -80,8 +80,8 @@ "version": "44" }, "network_cmds": { - "hash": "sha256-8aW3dAA/dfZTayGLHqzRqnVLmwJzRpvVmXL4eJGz5OQ=", - "version": "696" + "hash": "sha256-aGBsxdYW21QjTILxcR8tHufQKvkvmai9MKOCxBNZvmI=", + "version": "698.60.4" }, "patch_cmds": { "hash": "sha256-foIoIMe+zgPISFmE10q4cwEUBhiah4nbD7UtjBumZYU=", From 100b5483295cf093358186b43080c4b0dc380591 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 0361/1107] darwin.system_cmds: 1012 -> 1012.60.2 --- .../darwin/apple-source-releases/system_cmds/package.nix | 4 ++++ pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix index f4d1b83f8c29..5e2b5ea0f834 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix @@ -62,7 +62,11 @@ let install -D -t "$out/include/os" \ '${Libc}/os/assumes.h' \ + '${Libc}/os/variant_private.h' \ '${xnu}/libkern/os/base_private.h' + substituteInPlace "$out/include/os/variant_private.h" \ + --replace-fail ', bridgeos(4.0)' "" \ + --replace-fail ', bridgeos' "" touch "$out/include/os/feature_private.h" install -D -t "$out/include/sys" \ diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 4d8b142d29b0..9488fce386ed 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -100,8 +100,8 @@ "version": "319.0.1" }, "system_cmds": { - "hash": "sha256-SZfgMX0znyESzRNNzqyq/FAa9NQeI+5yiBS2xIvsP5g=", - "version": "1012" + "hash": "sha256-9nNJeVJo4XwGSHh+SJydhVt+I8+Rb5hCsPiFYKQ8/28=", + "version": "1012.60.2" }, "text_cmds": { "hash": "sha256-76dagwRcAf5fpoyH5FDR5kdCldv6Mgre6aFBzxaCRkg=", From a736ddeaec75f4a3f26d4d7b79bdb64f878d4074 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 11 Feb 2025 01:11:27 +0000 Subject: [PATCH 0362/1107] darwin.top: 139 -> 139.40.2 --- pkgs/os-specific/darwin/apple-source-releases/top/package.nix | 2 +- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/top/package.nix b/pkgs/os-specific/darwin/apple-source-releases/top/package.nix index 35737d5f748b..ee48e7c444a9 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/top/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/top/package.nix @@ -13,7 +13,7 @@ in mkAppleDerivation { releaseName = "top"; - xcodeHash = "sha256-b7Qv9ks9JmilY9GaEU3/iXoHBNyHRYr4IB0jVf0fYdo="; + xcodeHash = "sha256-YeBhEstvPh8IX8ArVc7U8IRU6vqPoOE6kBTqcqZonGc="; patches = [ # Upstream removed aarch64 support from the 137 source release, but the removal can be reverted. diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 9488fce386ed..2ffec99f7fb6 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -108,7 +108,7 @@ "version": "190.0.1" }, "top": { - "hash": "sha256-jz7udjXO5INtMHTDDdTUYAc4Tpy8v9nW0401LAHiPpA=", - "version": "139" + "hash": "sha256-e+k/jE49BMZZ24ge9JCa2ct5f1og6ewWb6U5ZMWdIEc=", + "version": "139.40.2" } } From 88f912da4852c38a5db25e882f3d89dac23a421c Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Wed, 12 Feb 2025 14:38:20 +0700 Subject: [PATCH 0363/1107] Docs: migrate format of comments to doc-comments --- lib/fileset/internal.nix | 38 ++- lib/licenses.nix | 13 +- lib/modules.nix | 591 +++++++++++++++++++++++++++----------- lib/network/internal.nix | 4 +- lib/options.nix | 178 +++++++++--- lib/path/default.nix | 491 ++++++++++++++++++++----------- lib/sources.nix | 157 ++++++++-- lib/strings-with-deps.nix | 62 ++-- lib/versions.nix | 143 +++++++-- 9 files changed, 1199 insertions(+), 478 deletions(-) diff --git a/lib/fileset/internal.nix b/lib/fileset/internal.nix index 7f002216bc7f..1fd0a7e2350d 100644 --- a/lib/fileset/internal.nix +++ b/lib/fileset/internal.nix @@ -267,7 +267,7 @@ rec { # Set all entries not present to null mapAttrs (name: value: null) (readDir path) // value; - /* + /** A normalisation of a filesetTree suitable filtering with `builtins.path`: - Replace all directories that have no files with `null`. This removes directories that would be empty @@ -276,7 +276,22 @@ rec { Note that this function is strict, it evaluates the entire tree - Type: Path -> filesetTree -> filesetTree + + # Inputs + + `path` + + : 1\. Function argument + + `tree` + + : 2\. Function argument + + # Type + + ``` + Path -> filesetTree -> filesetTree + ``` */ _normaliseTreeFilter = path: tree: @@ -298,7 +313,7 @@ rec { else tree; - /* + /** A minimal normalisation of a filesetTree, intended for pretty-printing: - If all children of a path are recursively included or empty directories, the path itself is also recursively included - If all children of a path are fully excluded or empty directories, the path itself is an empty directory @@ -307,7 +322,22 @@ rec { Note that this function is partially lazy. - Type: Path -> filesetTree -> filesetTree (with "emptyDir"'s) + + # Inputs + + `path` + + : 1\. Function argument + + `tree` + + : 2\. Function argument + + # Type + + ``` + Path -> filesetTree -> filesetTree (with "emptyDir"'s) + ``` */ _normaliseTreeMinimal = path: tree: diff --git a/lib/licenses.nix b/lib/licenses.nix index f72efa5a6145..5d0aff11b7a3 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -24,10 +24,11 @@ let in lib.mapAttrs mkLicense ({ - /* License identifiers from spdx.org where possible. - * If you cannot find your license here, then look for a similar license or - * add it to this list. The URL mentioned above is a good source for inspiration. - */ + /** + License identifiers from spdx.org where possible. + If you cannot find your license here, then look for a similar license or + add it to this list. The URL mentioned above is a good source for inspiration. + */ abstyles = { spdxId = "Abstyles"; @@ -37,7 +38,9 @@ lib.mapAttrs mkLicense ({ acsl14 = { fullName = "Anti-Capitalist Software License v1.4"; url = "https://anticapitalist.software/"; - /* restrictions on corporations apply for both use and redistribution */ + /** + restrictions on corporations apply for both use and redistribution + */ free = false; redistributable = false; }; diff --git a/lib/modules.nix b/lib/modules.nix index 4d2d8e0b08b6..935ef4baabad 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -74,14 +74,16 @@ let decls )); - /* See https://nixos.org/manual/nixpkgs/unstable/#module-system-lib-evalModules - or file://./../doc/module-system/module-system.chapter.md + /** + See https://nixos.org/manual/nixpkgs/unstable/#module-system-lib-evalModules + or file://./../doc/module-system/module-system.chapter.md - !!! Please think twice before adding to this argument list! The more - that is specified here instead of in the modules themselves the harder - it is to transparently move a set of modules to be a submodule of another - config (as the proper arguments need to be replicated at each call to - evalModules) and the less declarative the module set is. */ + !!! Please think twice before adding to this argument list! The more + that is specified here instead of in the modules themselves the harder + it is to transparently move a set of modules to be a submodule of another + config (as the proper arguments need to be replicated at each call to + evalModules) and the less declarative the module set is. + */ evalModules = evalModulesArgs@ { modules , prefix ? [] @@ -378,30 +380,30 @@ let else m: m; - /* - Collects all modules recursively into the form + /** + Collects all modules recursively into the form - { - disabled = [ ]; - # All modules of the main module list - modules = [ - { - key = ; - module = ; - # All modules imported by the module for key1 - modules = [ - { - key = ; - module = ; - # All modules imported by the module for key1-1 - modules = [ ... ]; - } - ... - ]; - } - ... - ]; - } + { + disabled = [ ]; + # All modules of the main module list + modules = [ + { + key = ; + module = ; + # All modules imported by the module for key1 + modules = [ + { + key = ; + module = ; + # All modules imported by the module for key1-1 + modules = [ ... ]; + } + ... + ]; + } + ... + ]; + } */ collectStructuredModules = let @@ -459,12 +461,42 @@ let in modulesPath: initialModules: args: filterModules modulesPath (collectStructuredModules unknownModule "" initialModules args); - /* Wrap a module with a default location for reporting errors. */ + /** + Wrap a module with a default location for reporting errors. + + + # Inputs + + `file` + + : 1\. Function argument + + `m` + + : 2\. Function argument + */ setDefaultModuleLocation = file: m: { _file = file; imports = [ m ]; }; - /* Massage a module into canonical form, that is, a set consisting - of ‘options’, ‘config’ and ‘imports’ attributes. */ + /** + Massage a module into canonical form, that is, a set consisting + of ‘options’, ‘config’ and ‘imports’ attributes. + + + # Inputs + + `file` + + : 1\. Function argument + + `key` + + : 2\. Function argument + + `m` + + : 3\. Function argument + */ unifyModuleSyntax = file: key: m: let addMeta = config: if m ? meta @@ -528,26 +560,38 @@ let # works. in f (args // extraArgs); - /* Merge a list of modules. This will recurse over the option - declarations in all modules, combining them into a single set. - At the same time, for each option declaration, it will merge the - corresponding option definitions in all machines, returning them - in the ‘value’ attribute of each option. + /** + Merge a list of modules. This will recurse over the option + declarations in all modules, combining them into a single set. + At the same time, for each option declaration, it will merge the + corresponding option definitions in all machines, returning them + in the ‘value’ attribute of each option. - This returns a set like - { - # A recursive set of options along with their final values - matchedOptions = { - foo = { _type = "option"; value = "option value of foo"; ... }; - bar.baz = { _type = "option"; value = "option value of bar.baz"; ... }; - ... - }; - # A list of definitions that weren't matched by any option - unmatchedDefns = [ - { file = "file.nix"; prefix = [ "qux" ]; value = "qux"; } - ... - ]; - } + This returns a set like + { + # A recursive set of options along with their final values + matchedOptions = { + foo = { _type = "option"; value = "option value of foo"; ... }; + bar.baz = { _type = "option"; value = "option value of bar.baz"; ... }; + ... + }; + # A list of definitions that weren't matched by any option + unmatchedDefns = [ + { file = "file.nix"; prefix = [ "qux" ]; value = "qux"; } + ... + ]; + } + + + # Inputs + + `prefix` + + : 1\. Function argument + + `modules` + + : 2\. Function argument */ mergeModules = prefix: modules: mergeModules' prefix modules @@ -740,17 +784,30 @@ let in throw (concatStringsSep "\n\n" paragraphs); - /* Merge multiple option declarations into a single declaration. In - general, there should be only one declaration of each option. - The exception is the ‘options’ attribute, which specifies - sub-options. These can be specified multiple times to allow one - module to add sub-options to an option declared somewhere else - (e.g. multiple modules define sub-options for ‘fileSystems’). + /** + Merge multiple option declarations into a single declaration. In + general, there should be only one declaration of each option. + The exception is the ‘options’ attribute, which specifies + sub-options. These can be specified multiple times to allow one + module to add sub-options to an option declared somewhere else + (e.g. multiple modules define sub-options for ‘fileSystems’). - 'loc' is the list of attribute names where the option is located. + 'loc' is the list of attribute names where the option is located. - 'opts' is a list of modules. Each module has an options attribute which - correspond to the definition of 'loc' in 'opt.file'. */ + 'opts' is a list of modules. Each module has an options attribute which + correspond to the definition of 'loc' in 'opt.file'. + + + # Inputs + + `loc` + + : 1\. Function argument + + `opts` + + : 2\. Function argument + */ mergeOptionDecls = loc: opts: foldl' (res: opt: @@ -819,8 +876,25 @@ let } // typeSet ) { inherit loc; declarations = []; declarationPositions = []; options = []; } opts; - /* Merge all the definitions of an option to produce the final - config value. */ + /** + Merge all the definitions of an option to produce the final + config value. + + + # Inputs + + `loc` + + : 1\. Function argument + + `opt` + + : 2\. Function argument + + `defs` + + : 3\. Function argument + */ evalOptionValue = loc: opt: defs: let # Add in the default value for this option, if any. @@ -902,20 +976,28 @@ let else {}; }; - /* Given a config set, expand mkMerge properties, and push down the - other properties into the children. The result is a list of - config sets that do not have properties at top-level. For - example, + /** + Given a config set, expand mkMerge properties, and push down the + other properties into the children. The result is a list of + config sets that do not have properties at top-level. For + example, - mkMerge [ { boot = set1; } (mkIf cond { boot = set2; services = set3; }) ] + mkMerge [ { boot = set1; } (mkIf cond { boot = set2; services = set3; }) ] - is transformed into + is transformed into - [ { boot = set1; } { boot = mkIf cond set2; services = mkIf cond set3; } ]. + [ { boot = set1; } { boot = mkIf cond set2; services = mkIf cond set3; } ]. - This transform is the critical step that allows mkIf conditions - to refer to the full configuration without creating an infinite - recursion. + This transform is the critical step that allows mkIf conditions + to refer to the full configuration without creating an infinite + recursion. + + + # Inputs + + `cfg` + + : 1\. Function argument */ pushDownProperties = cfg: if cfg._type or "" == "merge" then @@ -927,15 +1009,23 @@ let else # FIXME: handle mkOrder? [ cfg ]; - /* Given a config value, expand mkMerge properties, and discharge - any mkIf conditions. That is, this is the place where mkIf - conditions are actually evaluated. The result is a list of - config values. For example, ‘mkIf false x’ yields ‘[]’, - ‘mkIf true x’ yields ‘[x]’, and + /** + Given a config value, expand mkMerge properties, and discharge + any mkIf conditions. That is, this is the place where mkIf + conditions are actually evaluated. The result is a list of + config values. For example, ‘mkIf false x’ yields ‘[]’, + ‘mkIf true x’ yields ‘[x]’, and - mkMerge [ 1 (mkIf true 2) (mkIf true (mkIf false 3)) ] + mkMerge [ 1 (mkIf true 2) (mkIf true (mkIf false 3)) ] - yields ‘[ 1 2 ]’. + yields ‘[ 1 2 ]’. + + + # Inputs + + `def` + + : 1\. Function argument */ dischargeProperties = def: if def._type or "" == "merge" then @@ -951,24 +1041,32 @@ let else [ def ]; - /* Given a list of config values, process the mkOverride properties, - that is, return the values that have the highest (that is, - numerically lowest) priority, and strip the mkOverride - properties. For example, + /** + Given a list of config values, process the mkOverride properties, + that is, return the values that have the highest (that is, + numerically lowest) priority, and strip the mkOverride + properties. For example, - [ { file = "/1"; value = mkOverride 10 "a"; } - { file = "/2"; value = mkOverride 20 "b"; } - { file = "/3"; value = "z"; } - { file = "/4"; value = mkOverride 10 "d"; } - ] + [ { file = "/1"; value = mkOverride 10 "a"; } + { file = "/2"; value = mkOverride 20 "b"; } + { file = "/3"; value = "z"; } + { file = "/4"; value = mkOverride 10 "d"; } + ] - yields + yields - [ { file = "/1"; value = "a"; } - { file = "/4"; value = "d"; } - ] + [ { file = "/1"; value = "a"; } + { file = "/4"; value = "d"; } + ] - Note that "z" has the default priority 100. + Note that "z" has the default priority 100. + + + # Inputs + + `defs` + + : 1\. Function argument */ filterOverrides = defs: (filterOverrides' defs).values; @@ -982,9 +1080,18 @@ let inherit highestPrio; }; - /* Sort a list of properties. The sort priority of a property is - defaultOrderPriority by default, but can be overridden by wrapping the property - using mkOrder. */ + /** + Sort a list of properties. The sort priority of a property is + defaultOrderPriority by default, but can be overridden by wrapping the property + using mkOrder. + + + # Inputs + + `defs` + + : 1\. Function argument + */ sortProperties = defs: let strip = def: @@ -1004,14 +1111,24 @@ let else opt // { type = opt.type.substSubModules opt.options; options = []; }; - /* + /** Merge an option's definitions in a way that preserves the priority of the individual attributes in the option value. This does not account for all option semantics, such as readOnly. - Type: - option -> attrsOf { highestPrio, value } + + # Inputs + + `opt` + + : 1\. Function argument + + # Type + + ``` + option -> attrsOf { highestPrio, value } + ``` */ mergeAttrDefinitionsWithPrio = opt: let @@ -1038,7 +1155,20 @@ let }) defsByAttr; - /* Properties. */ + /** + Properties. + + + # Inputs + + `condition` + + : 1\. Function argument + + `content` + + : 2\. Function argument + */ mkIf = condition: content: { _type = "if"; @@ -1116,21 +1246,46 @@ let mkAliasIfDef = option: mkIf (isOption option && option.isDefined); - /* Compatibility. */ + /** + Compatibility. + + + # Inputs + + `modules` + + : 1\. Function argument + + `args` + + : 2\. Function argument + */ fixMergeModules = modules: args: evalModules { inherit modules args; check = false; }; - /* Return a module that causes a warning to be shown if the - specified option is defined. For example, + /** + Return a module that causes a warning to be shown if the + specified option is defined. For example, - mkRemovedOptionModule [ "boot" "loader" "grub" "bootDevice" ] "" + mkRemovedOptionModule [ "boot" "loader" "grub" "bootDevice" ] "" - causes a assertion if the user defines boot.loader.grub.bootDevice. + causes a assertion if the user defines boot.loader.grub.bootDevice. - replacementInstructions is a string that provides instructions on - how to achieve the same functionality without the removed option, - or alternatively a reasoning why the functionality is not needed. - replacementInstructions SHOULD be provided! + replacementInstructions is a string that provides instructions on + how to achieve the same functionality without the removed option, + or alternatively a reasoning why the functionality is not needed. + replacementInstructions SHOULD be provided! + + + # Inputs + + `optionName` + + : 1\. Function argument + + `replacementInstructions` + + : 2\. Function argument */ mkRemovedOptionModule = optionName: replacementInstructions: { options, ... }: @@ -1148,18 +1303,30 @@ let }]; }; - /* Return a module that causes a warning to be shown if the - specified "from" option is defined; the defined value is however - forwarded to the "to" option. This can be used to rename options - while providing backward compatibility. For example, + /** + Return a module that causes a warning to be shown if the + specified "from" option is defined; the defined value is however + forwarded to the "to" option. This can be used to rename options + while providing backward compatibility. For example, - mkRenamedOptionModule [ "boot" "copyKernels" ] [ "boot" "loader" "grub" "copyKernels" ] + mkRenamedOptionModule [ "boot" "copyKernels" ] [ "boot" "loader" "grub" "copyKernels" ] - forwards any definitions of boot.copyKernels to - boot.loader.grub.copyKernels while printing a warning. + forwards any definitions of boot.copyKernels to + boot.loader.grub.copyKernels while printing a warning. - This also copies over the priority from the aliased option to the - non-aliased option. + This also copies over the priority from the aliased option to the + non-aliased option. + + + # Inputs + + `from` + + : 1\. Function argument + + `to` + + : 2\. Function argument */ mkRenamedOptionModule = from: to: doRename { inherit from to; @@ -1169,12 +1336,16 @@ let }; mkRenamedOptionModuleWith = { - /* Old option path as list of strings. */ + /** + Old option path as list of strings. + */ from, - /* New option path as list of strings. */ + /** + New option path as list of strings. + */ to, - /* + /** Release number of the first release that contains the rename, ignoring backports. Set it to the upcoming release, matching the nixpkgs/.version file. */ @@ -1188,33 +1359,49 @@ let "Obsolete option `${showOption from}' is used. It was renamed to `${showOption to}'."; }; - /* Return a module that causes a warning to be shown if any of the "from" - option is defined; the defined values can be used in the "mergeFn" to set - the "to" value. - This function can be used to merge multiple options into one that has a - different type. + /** + Return a module that causes a warning to be shown if any of the "from" + option is defined; the defined values can be used in the "mergeFn" to set + the "to" value. + This function can be used to merge multiple options into one that has a + different type. - "mergeFn" takes the module "config" as a parameter and must return a value - of "to" option type. + "mergeFn" takes the module "config" as a parameter and must return a value + of "to" option type. - mkMergedOptionModule - [ [ "a" "b" "c" ] - [ "d" "e" "f" ] ] - [ "x" "y" "z" ] - (config: - let value = p: getAttrFromPath p config; - in - if (value [ "a" "b" "c" ]) == true then "foo" - else if (value [ "d" "e" "f" ]) == true then "bar" - else "baz") + mkMergedOptionModule + [ [ "a" "b" "c" ] + [ "d" "e" "f" ] ] + [ "x" "y" "z" ] + (config: + let value = p: getAttrFromPath p config; + in + if (value [ "a" "b" "c" ]) == true then "foo" + else if (value [ "d" "e" "f" ]) == true then "bar" + else "baz") - - options.a.b.c is a removed boolean option - - options.d.e.f is a removed boolean option - - options.x.y.z is a new str option that combines a.b.c and d.e.f - functionality + - options.a.b.c is a removed boolean option + - options.d.e.f is a removed boolean option + - options.x.y.z is a new str option that combines a.b.c and d.e.f + functionality - This show a warning if any a.b.c or d.e.f is set, and set the value of - x.y.z to the result of the merge function + This show a warning if any a.b.c or d.e.f is set, and set the value of + x.y.z to the result of the merge function + + + # Inputs + + `from` + + : 1\. Function argument + + `to` + + : 2\. Function argument + + `mergeFn` + + : 3\. Function argument */ mkMergedOptionModule = from: to: mergeFn: { config, options, ... }: @@ -1240,33 +1427,62 @@ let (mergeFn config))); }; - /* Single "from" version of mkMergedOptionModule. - Return a module that causes a warning to be shown if the "from" option is - defined; the defined value can be used in the "mergeFn" to set the "to" - value. - This function can be used to change an option into another that has a - different type. + /** + Single "from" version of mkMergedOptionModule. + Return a module that causes a warning to be shown if the "from" option is + defined; the defined value can be used in the "mergeFn" to set the "to" + value. + This function can be used to change an option into another that has a + different type. - "mergeFn" takes the module "config" as a parameter and must return a value of - "to" option type. + "mergeFn" takes the module "config" as a parameter and must return a value of + "to" option type. - mkChangedOptionModule [ "a" "b" "c" ] [ "x" "y" "z" ] - (config: - let value = getAttrFromPath [ "a" "b" "c" ] config; - in - if value > 100 then "high" - else "normal") + mkChangedOptionModule [ "a" "b" "c" ] [ "x" "y" "z" ] + (config: + let value = getAttrFromPath [ "a" "b" "c" ] config; + in + if value > 100 then "high" + else "normal") - - options.a.b.c is a removed int option - - options.x.y.z is a new str option that supersedes a.b.c + - options.a.b.c is a removed int option + - options.x.y.z is a new str option that supersedes a.b.c - This show a warning if a.b.c is set, and set the value of x.y.z to the - result of the change function + This show a warning if a.b.c is set, and set the value of x.y.z to the + result of the change function + + + # Inputs + + `from` + + : 1\. Function argument + + `to` + + : 2\. Function argument + + `changeFn` + + : 3\. Function argument */ mkChangedOptionModule = from: to: changeFn: mkMergedOptionModule [ from ] to changeFn; - /* Like ‘mkRenamedOptionModule’, but doesn't show a warning. */ + /** + Like ‘mkRenamedOptionModule’, but doesn't show a warning. + + + # Inputs + + `from` + + : 1\. Function argument + + `to` + + : 2\. Function argument + */ mkAliasOptionModule = from: to: doRename { inherit from to; visible = true; @@ -1274,13 +1490,15 @@ let use = id; }; - /* Transitional version of mkAliasOptionModule that uses MD docs. + /** + Transitional version of mkAliasOptionModule that uses MD docs. - This function is no longer necessary and merely an alias of `mkAliasOptionModule`. + This function is no longer necessary and merely an alias of `mkAliasOptionModule`. */ mkAliasOptionModuleMD = mkAliasOptionModule; - /* mkDerivedConfig : Option a -> (a -> Definition b) -> Definition b + /** + mkDerivedConfig : Option a -> (a -> Definition b) -> Definition b Create config definitions with the same priority as the definition of another option. This should be used for option definitions where one option sets the value of another as a convenience. @@ -1288,6 +1506,17 @@ let value using `mkDerivedConfig options.text (pkgs.writeText "filename.conf")`. It takes care of setting the right priority using `mkOverride`. + + + # Inputs + + `opt` + + : 1\. Function argument + + `f` + + : 2\. Function argument */ # TODO: make the module system error message include information about `opt` in # error messages about conflicts. E.g. introduce a variation of `mkOverride` which @@ -1300,10 +1529,10 @@ let (opt.highestPrio or defaultOverridePriority) (f opt.value); - /* + /** Return a module that help declares an option that has been renamed. When a value is defined for the old option, it is forwarded to the `to` option. - */ + */ doRename = { # List of strings representing the attribute path of the old option. from, @@ -1450,18 +1679,34 @@ let modulePath: staticArg: lib.setDefaultModuleLocation modulePath (import modulePath staticArg); - /* Use this function to import a JSON file as NixOS configuration. + /** + Use this function to import a JSON file as NixOS configuration. - modules.importJSON :: path -> attrs + modules.importJSON :: path -> attrs + + + # Inputs + + `file` + + : 1\. Function argument */ importJSON = file: { _file = file; config = lib.importJSON file; }; - /* Use this function to import a TOML file as NixOS configuration. + /** + Use this function to import a TOML file as NixOS configuration. - modules.importTOML :: path -> attrs + modules.importTOML :: path -> attrs + + + # Inputs + + `file` + + : 1\. Function argument */ importTOML = file: { _file = file; diff --git a/lib/network/internal.nix b/lib/network/internal.nix index 3e05be90c547..20a18e073af5 100644 --- a/lib/network/internal.nix +++ b/lib/network/internal.nix @@ -16,7 +16,7 @@ let inherit (lib.lists) last; - /* + /** IPv6 addresses are 128-bit identifiers. The preferred form is 'x:x:x:x:x:x:x:x', where the 'x's are one to four hexadecimal digits of the eight 16-bit pieces of the address. See RFC 4291. @@ -138,7 +138,7 @@ let parseIpv6FromString = addr: parseExpandedIpv6 (expandIpv6 addr); in { - /* + /** Internally, an IPv6 address is stored as a list of 16-bit integers with 8 elements. Wherever you see `IPv6` in internal functions docs, it means that it is a list of integers produced by one of the internal parsers, such as diff --git a/lib/options.nix b/lib/options.nix index fe665040ad03..08ac385ff46f 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -426,18 +426,29 @@ rec { else if all isInt list && all (x: x == head list) list then head list else throw "Cannot merge definitions of `${showOption loc}'. Definition values:${showDefs defs}"; - /* + /** Require a single definition. WARNING: Does not perform nested checks, as this does not run the merge function! */ mergeOneOption = mergeUniqueOption { message = ""; }; - /* + /** Require a single definition. NOTE: When the type is not checked completely by check, pass a merge function for further checking (of sub-attributes, etc). - */ + + + # Inputs + + `loc` + + : 2\. Function argument + + `defs` + + : 3\. Function argument + */ mergeUniqueOption = args@{ message, # WARNING: the default merge function assumes that the definition is a valid (option) value. You MUST pass a merge function if the return value needs to be @@ -452,7 +463,20 @@ rec { assert length defs > 1; throw "The option `${showOption loc}' is defined multiple times while it's expected to be unique.\n${message}\nDefinition values:${showDefs defs}\n${prioritySuggestion}"; - /* "Merge" option definitions by checking that they all have the same value. */ + /** + "Merge" option definitions by checking that they all have the same value. + + + # Inputs + + `loc` + + : 1\. Function argument + + `defs` + + : 2\. Function argument + */ mergeEqualOption = loc: defs: if defs == [] then abort "This case should never happen." # Return early if we only have one element @@ -465,23 +489,47 @@ rec { else first) (head defs) (tail defs)).value; - /* Extracts values of all "value" keys of the given list. + /** + Extracts values of all "value" keys of the given list. - Type: getValues :: [ { value :: a; } ] -> [a] + # Type - Example: - getValues [ { value = 1; } { value = 2; } ] // => [ 1 2 ] - getValues [ ] // => [ ] + ``` + getValues :: [ { value :: a; } ] -> [a] + ``` + + # Examples + :::{.example} + ## `getValues` usage example + + ```nix + getValues [ { value = 1; } { value = 2; } ] // => [ 1 2 ] + getValues [ ] // => [ ] + ``` + + ::: */ getValues = map (x: x.value); - /* Extracts values of all "file" keys of the given list + /** + Extracts values of all "file" keys of the given list - Type: getFiles :: [ { file :: a; } ] -> [a] + # Type - Example: - getFiles [ { file = "file1"; } { file = "file2"; } ] // => [ "file1" "file2" ] - getFiles [ ] // => [ ] + ``` + getFiles :: [ { file :: a; } ] -> [a] + ``` + + # Examples + :::{.example} + ## `getFiles` usage example + + ```nix + getFiles [ { file = "file1"; } { file = "file2"; } ] // => [ "file1" "file2" ] + getFiles [ ] // => [ ] + ``` + + ::: */ getFiles = map (x: x.file); @@ -530,16 +578,24 @@ rec { [ docOption ] ++ optionals subOptionsVisible subOptions) (collect isOption options); - /* This function recursively removes all derivation attributes from - `x` except for the `name` attribute. + /** + This function recursively removes all derivation attributes from + `x` except for the `name` attribute. - This is to make the generation of `options.xml` much more - efficient: the XML representation of derivations is very large - (on the order of megabytes) and is not actually used by the - manual generator. + This is to make the generation of `options.xml` much more + efficient: the XML representation of derivations is very large + (on the order of megabytes) and is not actually used by the + manual generator. - This function was made obsolete by renderOptionValue and is kept for - compatibility with out-of-tree code. + This function was made obsolete by renderOptionValue and is kept for + compatibility with out-of-tree code. + + + # Inputs + + `x` + + : 1\. Function argument */ scrubOptionValue = x: if isDerivation x then @@ -549,8 +605,16 @@ rec { else x; - /* Ensures that the given option value (default or example) is a `_type`d string - by rendering Nix values to `literalExpression`s. + /** + Ensures that the given option value (default or example) is a `_type`d string + by rendering Nix values to `literalExpression`s. + + + # Inputs + + `v` + + : 1\. Function argument */ renderOptionValue = v: if v ? _type && v ? text then v @@ -560,10 +624,18 @@ rec { } v); - /* For use in the `defaultText` and `example` option attributes. Causes the - given string to be rendered verbatim in the documentation as Nix code. This - is necessary for complex values, e.g. functions, or values that depend on - other values or packages. + /** + For use in the `defaultText` and `example` option attributes. Causes the + given string to be rendered verbatim in the documentation as Nix code. This + is necessary for complex values, e.g. functions, or values that depend on + other values or packages. + + + # Inputs + + `text` + + : 1\. Function argument */ literalExpression = text: if ! isString text then throw "literalExpression expects a string." @@ -571,9 +643,17 @@ rec { literalExample = lib.warn "lib.literalExample is deprecated, use lib.literalExpression instead, or use lib.literalMD for a non-Nix description." literalExpression; - /* For use in the `defaultText` and `example` option attributes. Causes the - given MD text to be inserted verbatim in the documentation, for when - a `literalExpression` would be too hard to read. + /** + For use in the `defaultText` and `example` option attributes. Causes the + given MD text to be inserted verbatim in the documentation, for when + a `literalExpression` would be too hard to read. + + + # Inputs + + `text` + + : 1\. Function argument */ literalMD = text: if ! isString text then throw "literalMD expects a string." @@ -581,18 +661,34 @@ rec { # Helper functions. - /* Convert an option, described as a list of the option parts to a - human-readable version. + /** + Convert an option, described as a list of the option parts to a + human-readable version. - Example: - (showOption ["foo" "bar" "baz"]) == "foo.bar.baz" - (showOption ["foo" "bar.baz" "tux"]) == "foo.\"bar.baz\".tux" - (showOption ["windowManager" "2bwm" "enable"]) == "windowManager.\"2bwm\".enable" - Placeholders will not be quoted as they are not actual values: - (showOption ["foo" "*" "bar"]) == "foo.*.bar" - (showOption ["foo" "" "bar"]) == "foo..bar" - (showOption ["foo" "" "bar"]) == "foo..bar" + # Inputs + + `parts` + + : 1\. Function argument + + + # Examples + :::{.example} + ## `showOption` usage example + + ```nix + (showOption ["foo" "bar" "baz"]) == "foo.bar.baz" + (showOption ["foo" "bar.baz" "tux"]) == "foo.\"bar.baz\".tux" + (showOption ["windowManager" "2bwm" "enable"]) == "windowManager.\"2bwm\".enable" + + Placeholders will not be quoted as they are not actual values: + (showOption ["foo" "*" "bar"]) == "foo.*.bar" + (showOption ["foo" "" "bar"]) == "foo..bar" + (showOption ["foo" "" "bar"]) == "foo..bar" + ``` + + ::: */ showOption = parts: let # If the part is a named placeholder of the form "<...>" don't escape it. diff --git a/lib/path/default.nix b/lib/path/default.nix index e8f0c646c545..62c5b7d3c5da 100644 --- a/lib/path/default.nix +++ b/lib/path/default.nix @@ -165,7 +165,7 @@ in # No rec! Add dependencies on this file at the top. { - /* + /** Append a subpath string to a path. Like `path + ("/" + string)` but safer, because it errors instead of returning potentially surprising results. @@ -178,34 +178,55 @@ in append p s == append p (subpath.normalise s) - Type: - append :: Path -> String -> Path - Example: - append /foo "bar/baz" - => /foo/bar/baz + # Inputs - # subpaths don't need to be normalised - append /foo "./bar//baz/./" - => /foo/bar/baz + `path` - # can append to root directory - append /. "foo/bar" - => /foo/bar + : The absolute path to append to - # first argument needs to be a path value type - append "/foo" "bar" - => + `subpath` - # second argument needs to be a valid subpath string - append /foo /bar - => - append /foo "" - => - append /foo "/bar" - => - append /foo "../bar" - => + : The subpath string to append + + # Type + + ``` + append :: Path -> String -> Path + ``` + + # Examples + :::{.example} + ## `append` usage example + + ```nix + append /foo "bar/baz" + => /foo/bar/baz + + # subpaths don't need to be normalised + append /foo "./bar//baz/./" + => /foo/bar/baz + + # can append to root directory + append /. "foo/bar" + => /foo/bar + + # first argument needs to be a path value type + append "/foo" "bar" + => + + # second argument needs to be a valid subpath string + append /foo /bar + => + append /foo "" + => + append /foo "/bar" + => + append /foo "../bar" + => + ``` + + ::: */ append = # The absolute path to append to @@ -219,7 +240,7 @@ in ${subpathInvalidReason subpath}''; path + ("/" + subpath); - /* + /** Whether the first path is a component-wise prefix of the second path. Laws: @@ -228,18 +249,35 @@ in - `hasPrefix` is a [non-strict partial order](https://en.wikipedia.org/wiki/Partially_ordered_set#Non-strict_partial_order) over the set of all path values. - Type: - hasPrefix :: Path -> Path -> Bool - Example: - hasPrefix /foo /foo/bar - => true - hasPrefix /foo /foo - => true - hasPrefix /foo/bar /foo - => false - hasPrefix /. /foo - => true + # Inputs + + `path1` + + : 1\. Function argument + + # Type + + ``` + hasPrefix :: Path -> Path -> Bool + ``` + + # Examples + :::{.example} + ## `hasPrefix` usage example + + ```nix + hasPrefix /foo /foo/bar + => true + hasPrefix /foo /foo + => true + hasPrefix /foo/bar /foo + => false + hasPrefix /. /foo + => true + ``` + + ::: */ hasPrefix = path1: @@ -261,7 +299,7 @@ in take (length path1Deconstructed.components) path2Deconstructed.components == path1Deconstructed.components; - /* + /** Remove the first path as a component-wise prefix from the second path. The result is a [normalised subpath string](#function-library-lib.path.subpath.normalise). @@ -271,18 +309,35 @@ in removePrefix p (append p s) == subpath.normalise s - Type: - removePrefix :: Path -> Path -> String - Example: - removePrefix /foo /foo/bar/baz - => "./bar/baz" - removePrefix /foo /foo - => "./." - removePrefix /foo/bar /foo - => - removePrefix /. /foo - => "./foo" + # Inputs + + `path1` + + : 1\. Function argument + + # Type + + ``` + removePrefix :: Path -> Path -> String + ``` + + # Examples + :::{.example} + ## `removePrefix` usage example + + ```nix + removePrefix /foo /foo/bar/baz + => "./bar/baz" + removePrefix /foo /foo + => "./." + removePrefix /foo/bar /foo + => + removePrefix /. /foo + => "./foo" + ``` + + ::: */ removePrefix = path1: @@ -310,7 +365,7 @@ in second argument: "${toString path2}" with root "${toString path2Deconstructed.root}"''; joinRelPath components; - /* + /** Split the filesystem root from a [path](https://nixos.org/manual/nix/stable/language/values.html#type-path). The result is an attribute set with these attributes: - `root`: The filesystem root of the path, meaning that this directory has no parent directory. @@ -328,22 +383,39 @@ in dirOf (splitRoot p).root == (splitRoot p).root - Type: - splitRoot :: Path -> { root :: Path, subpath :: String } - Example: - splitRoot /foo/bar - => { root = /.; subpath = "./foo/bar"; } + # Inputs - splitRoot /. - => { root = /.; subpath = "./."; } + `path` - # Nix neutralises `..` path components for all path values automatically - splitRoot /foo/../bar - => { root = /.; subpath = "./bar"; } + : The path to split the root off of - splitRoot "/foo/bar" - => + # Type + + ``` + splitRoot :: Path -> { root :: Path, subpath :: String } + ``` + + # Examples + :::{.example} + ## `splitRoot` usage example + + ```nix + splitRoot /foo/bar + => { root = /.; subpath = "./foo/bar"; } + + splitRoot /. + => { root = /.; subpath = "./."; } + + # Nix neutralises `..` path components for all path values automatically + splitRoot /foo/../bar + => { root = /.; subpath = "./bar"; } + + splitRoot "/foo/bar" + => + ``` + + ::: */ splitRoot = # The path to split the root off of @@ -358,7 +430,7 @@ in subpath = joinRelPath deconstructed.components; }; - /* + /** Whether a [path](https://nixos.org/manual/nix/stable/language/values.html#type-path) has a [store path](https://nixos.org/manual/nix/stable/store/store-path.html#store-path) as a prefix. @@ -371,33 +443,50 @@ in which occur when Nix files in the store use relative path expressions. ::: - Type: - hasStorePathPrefix :: Path -> Bool - Example: - # Subpaths of derivation outputs have a store path as a prefix - hasStorePathPrefix /nix/store/nvl9ic0pj1fpyln3zaqrf4cclbqdfn1j-foo/bar/baz - => true + # Inputs - # The store directory itself is not a store path - hasStorePathPrefix /nix/store - => false + `path` - # Derivation outputs are store paths themselves - hasStorePathPrefix /nix/store/nvl9ic0pj1fpyln3zaqrf4cclbqdfn1j-foo - => true + : 1\. Function argument - # Paths outside the Nix store don't have a store path prefix - hasStorePathPrefix /home/user - => false + # Type - # Not all paths under the Nix store are store paths - hasStorePathPrefix /nix/store/.links/10gg8k3rmbw8p7gszarbk7qyd9jwxhcfq9i6s5i0qikx8alkk4hq - => false + ``` + hasStorePathPrefix :: Path -> Bool + ``` - # Store derivations are also store paths themselves - hasStorePathPrefix /nix/store/nvl9ic0pj1fpyln3zaqrf4cclbqdfn1j-foo.drv - => true + # Examples + :::{.example} + ## `hasStorePathPrefix` usage example + + ```nix + # Subpaths of derivation outputs have a store path as a prefix + hasStorePathPrefix /nix/store/nvl9ic0pj1fpyln3zaqrf4cclbqdfn1j-foo/bar/baz + => true + + # The store directory itself is not a store path + hasStorePathPrefix /nix/store + => false + + # Derivation outputs are store paths themselves + hasStorePathPrefix /nix/store/nvl9ic0pj1fpyln3zaqrf4cclbqdfn1j-foo + => true + + # Paths outside the Nix store don't have a store path prefix + hasStorePathPrefix /home/user + => false + + # Not all paths under the Nix store are store paths + hasStorePathPrefix /nix/store/.links/10gg8k3rmbw8p7gszarbk7qyd9jwxhcfq9i6s5i0qikx8alkk4hq + => false + + # Store derivations are also store paths themselves + hasStorePathPrefix /nix/store/nvl9ic0pj1fpyln3zaqrf4cclbqdfn1j-foo.drv + => true + ``` + + ::: */ hasStorePathPrefix = path: @@ -414,7 +503,7 @@ in "lib.path.hasStorePathPrefix: Argument has a filesystem root (${toString deconstructed.root}) that's not /, which is currently not supported."; componentsHaveStorePathPrefix deconstructed.components; - /* + /** Whether a value is a valid subpath string. A subpath string points to a specific file or directory within an absolute base directory. @@ -428,39 +517,56 @@ in - The string doesn't contain any `..` path components. - Type: - subpath.isValid :: String -> Bool - Example: - # Not a string - subpath.isValid null - => false + # Inputs - # Empty string - subpath.isValid "" - => false + `value` - # Absolute path - subpath.isValid "/foo" - => false + : The value to check - # Contains a `..` path component - subpath.isValid "../foo" - => false + # Type - # Valid subpath - subpath.isValid "foo/bar" - => true + ``` + subpath.isValid :: String -> Bool + ``` - # Doesn't need to be normalised - subpath.isValid "./foo//bar/" - => true + # Examples + :::{.example} + ## `subpath.isValid` usage example + + ```nix + # Not a string + subpath.isValid null + => false + + # Empty string + subpath.isValid "" + => false + + # Absolute path + subpath.isValid "/foo" + => false + + # Contains a `..` path component + subpath.isValid "../foo" + => false + + # Valid subpath + subpath.isValid "foo/bar" + => true + + # Doesn't need to be normalised + subpath.isValid "./foo//bar/" + => true + ``` + + ::: */ subpath.isValid = # The value to check value: subpathInvalidReason value == null; - /* + /** Join subpath strings together using `/`, returning a normalised subpath string. Like `concatStringsSep "/"` but safer, specifically: @@ -492,30 +598,47 @@ in ps != [] -> subpath.join ps == subpath.normalise (concatStringsSep "/" ps) - Type: - subpath.join :: [ String ] -> String - Example: - subpath.join [ "foo" "bar/baz" ] - => "./foo/bar/baz" + # Inputs - # normalise the result - subpath.join [ "./foo" "." "bar//./baz/" ] - => "./foo/bar/baz" + `subpaths` - # passing an empty list results in the current directory - subpath.join [ ] - => "./." + : The list of subpaths to join together - # elements must be valid subpath strings - subpath.join [ /foo ] - => - subpath.join [ "" ] - => - subpath.join [ "/foo" ] - => - subpath.join [ "../foo" ] - => + # Type + + ``` + subpath.join :: [ String ] -> String + ``` + + # Examples + :::{.example} + ## `subpath.join` usage example + + ```nix + subpath.join [ "foo" "bar/baz" ] + => "./foo/bar/baz" + + # normalise the result + subpath.join [ "./foo" "." "bar//./baz/" ] + => "./foo/bar/baz" + + # passing an empty list results in the current directory + subpath.join [ ] + => "./." + + # elements must be valid subpath strings + subpath.join [ /foo ] + => + subpath.join [ "" ] + => + subpath.join [ "/foo" ] + => + subpath.join [ "../foo" ] + => + ``` + + ::: */ subpath.join = # The list of subpaths to join together @@ -537,7 +660,7 @@ in ${subpathInvalidReason path}'' ) 0 subpaths; - /* + /** Split [a subpath](#function-library-lib.path.subpath.isValid) into its path component strings. Throw an error if the subpath isn't valid. Note that the returned path components are also [valid subpath strings](#function-library-lib.path.subpath.isValid), though they are intentionally not [normalised](#function-library-lib.path.subpath.normalise). @@ -548,18 +671,35 @@ in subpath.join (subpath.components s) == subpath.normalise s - Type: - subpath.components :: String -> [ String ] - Example: - subpath.components "." - => [ ] + # Inputs - subpath.components "./foo//bar/./baz/" - => [ "foo" "bar" "baz" ] + `subpath` - subpath.components "/foo" - => + : The subpath string to split into components + + # Type + + ``` + subpath.components :: String -> [ String ] + ``` + + # Examples + :::{.example} + ## `subpath.components` usage example + + ```nix + subpath.components "." + => [ ] + + subpath.components "./foo//bar/./baz/" + => [ "foo" "bar" "baz" ] + + subpath.components "/foo" + => + ``` + + ::: */ subpath.components = # The subpath string to split into components @@ -569,7 +709,7 @@ in ${subpathInvalidReason subpath}''; splitRelPath subpath; - /* + /** Normalise a subpath. Throw an error if the subpath isn't [valid](#function-library-lib.path.subpath.isValid). - Limit repeating `/` to a single one. @@ -602,45 +742,62 @@ in builtins.tryEval (subpath.normalise p)).success == subpath.isValid p - Type: - subpath.normalise :: String -> String - Example: - # limit repeating `/` to a single one - subpath.normalise "foo//bar" - => "./foo/bar" + # Inputs - # remove redundant `.` components - subpath.normalise "foo/./bar" - => "./foo/bar" + `subpath` - # add leading `./` - subpath.normalise "foo/bar" - => "./foo/bar" + : The subpath string to normalise - # remove trailing `/` - subpath.normalise "foo/bar/" - => "./foo/bar" + # Type - # remove trailing `/.` - subpath.normalise "foo/bar/." - => "./foo/bar" + ``` + subpath.normalise :: String -> String + ``` - # Return the current directory as `./.` - subpath.normalise "." - => "./." + # Examples + :::{.example} + ## `subpath.normalise` usage example - # error on `..` path components - subpath.normalise "foo/../bar" - => + ```nix + # limit repeating `/` to a single one + subpath.normalise "foo//bar" + => "./foo/bar" - # error on empty string - subpath.normalise "" - => + # remove redundant `.` components + subpath.normalise "foo/./bar" + => "./foo/bar" - # error on absolute path - subpath.normalise "/foo" - => + # add leading `./` + subpath.normalise "foo/bar" + => "./foo/bar" + + # remove trailing `/` + subpath.normalise "foo/bar/" + => "./foo/bar" + + # remove trailing `/.` + subpath.normalise "foo/bar/." + => "./foo/bar" + + # Return the current directory as `./.` + subpath.normalise "." + => "./." + + # error on `..` path components + subpath.normalise "foo/../bar" + => + + # error on empty string + subpath.normalise "" + => + + # error on absolute path + subpath.normalise "/foo" + => + ``` + + ::: */ subpath.normalise = # The subpath string to normalise diff --git a/lib/sources.nix b/lib/sources.nix index 168e58225889..0fcdb18fdfaf 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -18,10 +18,21 @@ let pathIsRegularFile ; - /* + /** A basic filter for `cleanSourceWith` that removes directories of version control system, backup files (*~) and some generated files. + + + # Inputs + + `name` + + : 1\. Function argument + + `type` + + : 2\. Function argument */ cleanSourceFilter = name: type: @@ -52,11 +63,26 @@ let (type == "unknown") ); - /* + /** Filters a source tree removing version control files and directories using cleanSourceFilter. - Example: - cleanSource ./. + + # Inputs + + `src` + + : 1\. Function argument + + + # Examples + :::{.example} + ## `cleanSource` usage example + + ```nix + cleanSource ./. + ``` + + ::: */ cleanSource = src: @@ -65,23 +91,31 @@ let inherit src; }; - /* + /** Like `builtins.filterSource`, except it will compose with itself, allowing you to chain multiple calls together without any intermediate copies being put in the nix store. - Example: - lib.cleanSourceWith { - filter = f; - src = lib.cleanSourceWith { - filter = g; - src = ./.; - }; - } - # Succeeds! - builtins.filterSource f (builtins.filterSource g ./.) - # Fails! + # Examples + :::{.example} + ## `cleanSourceWith` usage example + + ```nix + lib.cleanSourceWith { + filter = f; + src = lib.cleanSourceWith { + filter = g; + src = ./.; + }; + } + # Succeeds! + + builtins.filterSource f (builtins.filterSource g ./.) + # Fails! + ``` + + ::: */ cleanSourceWith = { @@ -107,10 +141,21 @@ let name = if name != null then name else orig.name; }; - /* + /** Add logging to a source, for troubleshooting the filtering behavior. - Type: - sources.trace :: sourceLike -> Source + + + # Inputs + + `src` + + : Source to debug. The returned source will behave like this source, but also log its filter invocations. + + # Type + + ``` + sources.trace :: sourceLike -> Source + ``` */ trace = # Source to debug. The returned source will behave like this source, but also log its filter invocations. @@ -133,10 +178,30 @@ let satisfiesSubpathInvariant = src ? satisfiesSubpathInvariant && src.satisfiesSubpathInvariant; }; - /* + /** Filter sources by a list of regular expressions. - Example: src = sourceByRegex ./my-subproject [".*\.py$" "^database.sql$"] + + # Inputs + + `src` + + : 1\. Function argument + + `regexes` + + : 2\. Function argument + + + # Examples + :::{.example} + ## `sourceByRegex` usage example + + ```nix + src = sourceByRegex ./my-subproject [".*\.py$" "^database.sql$"] + ``` + + ::: */ sourceByRegex = src: regexes: @@ -155,16 +220,38 @@ let inherit src; }; - /* + /** Get all files ending with the specified suffices from the given source directory or its descendants, omitting files that do not match any suffix. The result of the example below will include files like `./dir/module.c` and `./dir/subdir/doc.xml` if present. - Type: sourceLike -> [String] -> Source - Example: - sourceFilesBySuffices ./. [ ".xml" ".c" ] + # Inputs + + `src` + + : Path or source containing the files to be returned + + `exts` + + : A list of file suffix strings + + # Type + + ``` + sourceLike -> [String] -> Source + ``` + + # Examples + :::{.example} + ## `sourceFilesBySuffices` usage example + + ```nix + sourceFilesBySuffices ./. [ ".xml" ".c" ] + ``` + + ::: */ sourceFilesBySuffices = # Path or source containing the files to be returned @@ -183,10 +270,26 @@ let pathIsGitRepo = path: (_commitIdFromGitRepoOrError path) ? value; - /* + /** Get the commit id of a git repo. - Example: commitIdFromGitRepo + + # Inputs + + `path` + + : 1\. Function argument + + + # Examples + :::{.example} + ## `commitIdFromGitRepo` usage example + + ```nix + commitIdFromGitRepo + ``` + + ::: */ commitIdFromGitRepo = path: diff --git a/lib/strings-with-deps.nix b/lib/strings-with-deps.nix index 900827fe0e4b..e22e19def581 100644 --- a/lib/strings-with-deps.nix +++ b/lib/strings-with-deps.nix @@ -1,44 +1,44 @@ { lib }: -/* -Usage: +/** + Usage: - You define you custom builder script by adding all build steps to a list. - for example: - builder = writeScript "fsg-4.4-builder" - (textClosure [doUnpack addInputs preBuild doMake installPhase doForceShare]); + You define you custom builder script by adding all build steps to a list. + for example: + builder = writeScript "fsg-4.4-builder" + (textClosure [doUnpack addInputs preBuild doMake installPhase doForceShare]); - a step is defined by noDepEntry, fullDepEntry or packEntry. - To ensure that prerequisite are met those are added before the task itself by - textClosureDupList. Duplicated items are removed again. + a step is defined by noDepEntry, fullDepEntry or packEntry. + To ensure that prerequisite are met those are added before the task itself by + textClosureDupList. Duplicated items are removed again. - See trace/nixpkgs/trunk/pkgs/top-level/builder-defs.nix for some predefined build steps + See trace/nixpkgs/trunk/pkgs/top-level/builder-defs.nix for some predefined build steps - Attention: + Attention: - let - pkgs = (import ) {}; - in let - inherit (pkgs.stringsWithDeps) fullDepEntry packEntry noDepEntry textClosureMap; - inherit (pkgs.lib) id; + let + pkgs = (import ) {}; + in let + inherit (pkgs.stringsWithDeps) fullDepEntry packEntry noDepEntry textClosureMap; + inherit (pkgs.lib) id; - nameA = noDepEntry "Text a"; - nameB = fullDepEntry "Text b" ["nameA"]; - nameC = fullDepEntry "Text c" ["nameA"]; + nameA = noDepEntry "Text a"; + nameB = fullDepEntry "Text b" ["nameA"]; + nameC = fullDepEntry "Text c" ["nameA"]; - stages = { - nameHeader = noDepEntry "#! /bin/sh \n"; - inherit nameA nameB nameC; - }; - in - textClosureMap id stages - [ "nameHeader" "nameA" "nameB" "nameC" - nameC # <- added twice. add a dep entry if you know that it will be added once only [1] - "nameB" # <- this will not be added again because the attr name (reference) is used - ] + stages = { + nameHeader = noDepEntry "#! /bin/sh \n"; + inherit nameA nameB nameC; + }; + in + textClosureMap id stages + [ "nameHeader" "nameA" "nameB" "nameC" + nameC # <- added twice. add a dep entry if you know that it will be added once only [1] + "nameB" # <- this will not be added again because the attr name (reference) is used + ] - # result: Str("#! /bin/sh \n\nText a\nText b\nText c\nText c",[]) + # result: Str("#! /bin/sh \n\nText a\nText b\nText c\nText c",[]) - [1] maybe this behaviour should be removed to keep things simple (?) + [1] maybe this behaviour should be removed to keep things simple (?) */ let diff --git a/lib/versions.nix b/lib/versions.nix index 32b4b5fbf945..cde0acaef0a9 100644 --- a/lib/versions.nix +++ b/lib/versions.nix @@ -3,62 +3,149 @@ rec { - /* + /** Break a version string into its component parts. - Example: - splitVersion "1.2.3" - => ["1" "2" "3"] + + # Examples + :::{.example} + ## `splitVersion` usage example + + ```nix + splitVersion "1.2.3" + => ["1" "2" "3"] + ``` + + ::: */ splitVersion = builtins.splitVersion; - /* + /** Get the major version string from a string. - Example: - major "1.2.3" - => "1" + + # Inputs + + `v` + + : 1\. Function argument + + + # Examples + :::{.example} + ## `major` usage example + + ```nix + major "1.2.3" + => "1" + ``` + + ::: */ major = v: builtins.elemAt (splitVersion v) 0; - /* + /** Get the minor version string from a string. - Example: - minor "1.2.3" - => "2" + + # Inputs + + `v` + + : 1\. Function argument + + + # Examples + :::{.example} + ## `minor` usage example + + ```nix + minor "1.2.3" + => "2" + ``` + + ::: */ minor = v: builtins.elemAt (splitVersion v) 1; - /* + /** Get the patch version string from a string. - Example: - patch "1.2.3" - => "3" + + # Inputs + + `v` + + : 1\. Function argument + + + # Examples + :::{.example} + ## `patch` usage example + + ```nix + patch "1.2.3" + => "3" + ``` + + ::: */ patch = v: builtins.elemAt (splitVersion v) 2; - /* + /** Get string of the first two parts (major and minor) of a version string. - Example: - majorMinor "1.2.3" - => "1.2" + + # Inputs + + `v` + + : 1\. Function argument + + + # Examples + :::{.example} + ## `majorMinor` usage example + + ```nix + majorMinor "1.2.3" + => "1.2" + ``` + + ::: */ majorMinor = v: builtins.concatStringsSep "." (lib.take 2 (splitVersion v)); - /* + /** Pad a version string with zeros to match the given number of components. - Example: - pad 3 "1.2" - => "1.2.0" - pad 3 "1.3-rc1" - => "1.3.0-rc1" - pad 3 "1.2.3.4" - => "1.2.3" + + # Inputs + + `n` + + : 1\. Function argument + + `version` + + : 2\. Function argument + + + # Examples + :::{.example} + ## `pad` usage example + + ```nix + pad 3 "1.2" + => "1.2.0" + pad 3 "1.3-rc1" + => "1.3.0-rc1" + pad 3 "1.2.3.4" + => "1.2.3" + ``` + + ::: */ pad = n: version: From 80d5b411f6397d5c3e755a0635d95742f76f3c75 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Wed, 12 Feb 2025 14:51:56 +0700 Subject: [PATCH 0364/1107] Format: lib/sources.nix --- lib/sources.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/lib/sources.nix b/lib/sources.nix index 0fcdb18fdfaf..e165439998a1 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -23,7 +23,6 @@ let directories of version control system, backup files (*~) and some generated files. - # Inputs `name` @@ -66,14 +65,12 @@ let /** Filters a source tree removing version control files and directories using cleanSourceFilter. - # Inputs `src` : 1\. Function argument - # Examples :::{.example} ## `cleanSource` usage example @@ -96,7 +93,6 @@ let allowing you to chain multiple calls together without any intermediate copies being put in the nix store. - # Examples :::{.example} ## `cleanSourceWith` usage example @@ -144,7 +140,6 @@ let /** Add logging to a source, for troubleshooting the filtering behavior. - # Inputs `src` @@ -181,7 +176,6 @@ let /** Filter sources by a list of regular expressions. - # Inputs `src` @@ -192,7 +186,6 @@ let : 2\. Function argument - # Examples :::{.example} ## `sourceByRegex` usage example @@ -226,7 +219,6 @@ let any suffix. The result of the example below will include files like `./dir/module.c` and `./dir/subdir/doc.xml` if present. - # Inputs `src` @@ -273,14 +265,12 @@ let /** Get the commit id of a git repo. - # Inputs `path` : 1\. Function argument - # Examples :::{.example} ## `commitIdFromGitRepo` usage example From e0fe216f4912dd88a021d12a44155fd2cfeb31c8 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Wed, 12 Feb 2025 14:52:12 +0700 Subject: [PATCH 0365/1107] Format: lib/fileset/internal.nix --- lib/fileset/internal.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/fileset/internal.nix b/lib/fileset/internal.nix index 1fd0a7e2350d..4674a321b3ae 100644 --- a/lib/fileset/internal.nix +++ b/lib/fileset/internal.nix @@ -276,7 +276,6 @@ rec { Note that this function is strict, it evaluates the entire tree - # Inputs `path` @@ -322,7 +321,6 @@ rec { Note that this function is partially lazy. - # Inputs `path` From d89ad6c70e0e89aaae75e9f886878ea4e103965a Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Wed, 12 Feb 2025 14:52:23 +0700 Subject: [PATCH 0366/1107] Format: lib/versions.nix --- lib/versions.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/lib/versions.nix b/lib/versions.nix index cde0acaef0a9..2355655f179a 100644 --- a/lib/versions.nix +++ b/lib/versions.nix @@ -6,7 +6,6 @@ rec { /** Break a version string into its component parts. - # Examples :::{.example} ## `splitVersion` usage example @@ -23,14 +22,12 @@ rec { /** Get the major version string from a string. - # Inputs `v` : 1\. Function argument - # Examples :::{.example} ## `major` usage example @@ -47,14 +44,12 @@ rec { /** Get the minor version string from a string. - # Inputs `v` : 1\. Function argument - # Examples :::{.example} ## `minor` usage example @@ -71,14 +66,12 @@ rec { /** Get the patch version string from a string. - # Inputs `v` : 1\. Function argument - # Examples :::{.example} ## `patch` usage example @@ -96,14 +89,12 @@ rec { Get string of the first two parts (major and minor) of a version string. - # Inputs `v` : 1\. Function argument - # Examples :::{.example} ## `majorMinor` usage example @@ -120,7 +111,6 @@ rec { /** Pad a version string with zeros to match the given number of components. - # Inputs `n` @@ -131,7 +121,6 @@ rec { : 2\. Function argument - # Examples :::{.example} ## `pad` usage example From ef85e0daa092c9eae0d32c7ce16b889728a5fbc0 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Wed, 12 Feb 2025 14:52:38 +0700 Subject: [PATCH 0367/1107] Format: lib/path.nix --- lib/path/default.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/lib/path/default.nix b/lib/path/default.nix index 62c5b7d3c5da..4ffee65e1cf5 100644 --- a/lib/path/default.nix +++ b/lib/path/default.nix @@ -178,7 +178,6 @@ in append p s == append p (subpath.normalise s) - # Inputs `path` @@ -249,7 +248,6 @@ in - `hasPrefix` is a [non-strict partial order](https://en.wikipedia.org/wiki/Partially_ordered_set#Non-strict_partial_order) over the set of all path values. - # Inputs `path1` @@ -309,7 +307,6 @@ in removePrefix p (append p s) == subpath.normalise s - # Inputs `path1` @@ -383,7 +380,6 @@ in dirOf (splitRoot p).root == (splitRoot p).root - # Inputs `path` @@ -443,7 +439,6 @@ in which occur when Nix files in the store use relative path expressions. ::: - # Inputs `path` @@ -517,7 +512,6 @@ in - The string doesn't contain any `..` path components. - # Inputs `value` @@ -598,7 +592,6 @@ in ps != [] -> subpath.join ps == subpath.normalise (concatStringsSep "/" ps) - # Inputs `subpaths` @@ -671,7 +664,6 @@ in subpath.join (subpath.components s) == subpath.normalise s - # Inputs `subpath` @@ -742,7 +734,6 @@ in builtins.tryEval (subpath.normalise p)).success == subpath.isValid p - # Inputs `subpath` From c224c447a8902814454a6575b2f6738b4a9d2823 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Wed, 12 Feb 2025 14:56:58 +0700 Subject: [PATCH 0368/1107] .git-blame-ignore-revs: add formatting of doc-comment migrations in lib --- .git-blame-ignore-revs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index b8aeaadf4141..8724f5d5c3a7 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -229,3 +229,9 @@ adb9714bd909df283c66bbd641bd631ff50a4260 # tmuxPlugins sha-to-sri.py script 516b1e74c358a9c4b06e5591f8c1a2897aad0c33 + +# treewide: migrate comments in lib to rfc145 style +ef85e0daa092c9eae0d32c7ce16b889728a5fbc0 +d89ad6c70e0e89aaae75e9f886878ea4e103965a +e0fe216f4912dd88a021d12a44155fd2cfeb31c8 +80d5b411f6397d5c3e755a0635d95742f76f3c75 From 4865ae3eef8833b28667b9d344b08b70f39a8985 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 12 Feb 2025 09:43:51 +0100 Subject: [PATCH 0369/1107] xfsprogs: fix build --- pkgs/by-name/xf/xfsprogs/package.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/by-name/xf/xfsprogs/package.nix b/pkgs/by-name/xf/xfsprogs/package.nix index 86cc97764b9f..6ff404ce7f3a 100644 --- a/pkgs/by-name/xf/xfsprogs/package.nix +++ b/pkgs/by-name/xf/xfsprogs/package.nix @@ -3,6 +3,7 @@ stdenv, buildPackages, fetchurl, + autoreconfHook, gettext, pkg-config, icu, @@ -22,6 +23,14 @@ stdenv.mkDerivation rec { hash = "sha256-CDJAckfbeRzHDe+W5+JUvW7fBD3ISoCmLzzNbj3/0yk="; }; + patches = [ + (fetchurl { + name = "icu76.patch"; + url = "https://lore.kernel.org/linux-xfs/20250212081649.3502717-1-hi@alyssa.is/raw"; + hash = "sha256-Z7BW0B+/5eHWXdHre++wRtdbU/P6XZqudYx6EK5msIU="; + }) + ]; + outputs = [ "bin" "dev" @@ -31,6 +40,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ + autoreconfHook gettext pkg-config libuuid # codegen tool uses libuuid @@ -61,6 +71,12 @@ stdenv.mkDerivation rec { patchShebangs ./install-sh ''; + # The default --force would replace xfsprogs' custom install-sh. + autoreconfFlags = [ + "--install" + "--verbose" + ]; + configureFlags = [ "--disable-lib64" "--with-systemd-unit-dir=${placeholder "out"}/lib/systemd/system" From d68c0aedd61cb06a4bb1143b605fca8936a91a06 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Feb 2025 17:37:06 -0300 Subject: [PATCH 0370/1107] vinegar: 1.8.0 -> 1.8.1 --- pkgs/by-name/vi/vinegar/package.nix | 31 +++++++++++++++++------------ 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/vi/vinegar/package.nix b/pkgs/by-name/vi/vinegar/package.nix index 68cfa1ae0974..8a6bb7daf1fc 100644 --- a/pkgs/by-name/vi/vinegar/package.nix +++ b/pkgs/by-name/vi/vinegar/package.nix @@ -7,20 +7,20 @@ glib, makeBinaryWrapper, pkg-config, + cairo, + gdk-pixbuf, + graphene, gtk4, libadwaita, libGL, libxkbcommon, + pango, vulkan-headers, vulkan-loader, wayland, winetricks, xorg, symlinkJoin, - cairo, - gdk-pixbuf, - graphene, - pango, nix-update-script, }: let @@ -33,7 +33,7 @@ let waylandSupport = true; }).overrideAttrs (oldAttrs: { - # https://github.com/flathub/org.vinegarhq.Vinegar/blob/1a42384ff0c5670504415190301c20e89601bbad/wine.yml#L31 + # https://github.com/flathub/org.vinegarhq.Vinegar/blob/a3c2f1249dec9548bd870027f55edcc58343b685/wine.yml#L31-L38 # --with-wayland is added by waylandSupport = true; configureFlags = oldAttrs.configureFlags or [ ] ++ [ "--disable-tests" @@ -55,16 +55,16 @@ let in buildGoModule rec { pname = "vinegar"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "vinegarhq"; repo = "vinegar"; tag = "v${version}"; - hash = "sha256-eAQ5qlBY1PmpijEu7mPmCBFbAIA30ABcbirdBljAmTQ="; + hash = "sha256-7rc6LKZx0OOZDedtTpHIQT4grx1FejRiVnJnVDUddy4="; }; - vendorHash = "sha256-NLNAUf99psBq8PayorBH1DT6o9wZyKwx9ab+TtpKU50="; + vendorHash = "sha256-TZhdwHom4DTgLs4z/eADeoKakMtyFrvVljDg4JJp7dc="; nativeBuildInputs = [ glib @@ -73,10 +73,15 @@ buildGoModule rec { ]; buildInputs = [ + cairo + gdk-pixbuf + glib.out + graphene gtk4 libadwaita libGL libxkbcommon + pango.out vulkan-headers vulkan-loader wayland @@ -87,6 +92,10 @@ buildGoModule rec { xorg.libXfixes ]; + postPatch = '' + substituteInPlace Makefile --replace-fail 'gtk-update-icon-cache' '${lib.getExe' gtk4 "gtk4-update-icon-cache"}' + ''; + buildPhase = '' runHook preBuild @@ -108,10 +117,6 @@ buildGoModule rec { } ''; - preInstall = '' - substituteInPlace Makefile --replace-fail 'gtk-update-icon-cache' '${lib.getExe' gtk4 "gtk4-update-icon-cache"}' - ''; - installPhase = '' runHook preInstall @@ -136,9 +141,9 @@ buildGoModule rec { name = "vinegar-puregotk-lib-folder"; paths = [ cairo + gdk-pixbuf glib.out graphene - gdk-pixbuf gtk4 libadwaita pango.out From c8f83ec6417c4d5136db7626a474c1ed9a907ed6 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Giraudeau Date: Thu, 5 Dec 2024 21:07:13 +0100 Subject: [PATCH 0371/1107] nixos-container: add support for --private-users imply bind mounts with idmap option when user namespacing is enabled, so that /nix/store and friends are correctly own by root user. --- .../virtualisation/nixos-containers.nix | 50 +++++++++++++++++-- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index 5f43e3322340..823e7e0fe909 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -115,6 +115,16 @@ let extraFlags+=("--private-network") fi + NIX_BIND_OPT="" + if [ -n "$PRIVATE_USERS" ]; then + extraFlags+=("--private-users=$PRIVATE_USERS") + if [ "$PRIVATE_USERS" = "pick" ] || ( [ "$PRIVATE_USERS" != "identity" ] && [ "$PRIVATE_USERS" -gt 0 ] ); then + # when user namespacing is enabled, we use `idmap` mount option + # so that bind mounts under /nix get proper owner (and not nobody/nogroup). + NIX_BIND_OPT=":idmap" + fi + fi + if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ] || [ -n "$HOST_ADDRESS6" ] || [ -n "$LOCAL_ADDRESS6" ]; then extraFlags+=("--network-veth") @@ -171,13 +181,14 @@ let $EXTRA_NSPAWN_FLAGS \ --notify-ready=yes \ --kill-signal=SIGRTMIN+3 \ - --bind-ro=/nix/store \ - --bind-ro=/nix/var/nix/db \ - --bind-ro=/nix/var/nix/daemon-socket \ - --bind="/nix/var/nix/profiles/per-container/$INSTANCE:/nix/var/nix/profiles" \ - --bind="/nix/var/nix/gcroots/per-container/$INSTANCE:/nix/var/nix/gcroots" \ + --bind-ro=/nix/store:/nix/store$NIX_BIND_OPT \ + --bind-ro=/nix/var/nix/db:/nix/var/nix/db$NIX_BIND_OPT \ + --bind-ro=/nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket$NIX_BIND_OPT \ + --bind="/nix/var/nix/profiles/per-container/$INSTANCE:/nix/var/nix/profiles$NIX_BIND_OPT" \ + --bind="/nix/var/nix/gcroots/per-container/$INSTANCE:/nix/var/nix/gcroots$NIX_BIND_OPT" \ ${optionalString (!cfg.ephemeral) "--link-journal=try-guest"} \ --setenv PRIVATE_NETWORK="$PRIVATE_NETWORK" \ + --setenv PRIVATE_USERS="$PRIVATE_USERS" \ --setenv HOST_BRIDGE="$HOST_BRIDGE" \ --setenv HOST_ADDRESS="$HOST_ADDRESS" \ --setenv LOCAL_ADDRESS="$LOCAL_ADDRESS" \ @@ -650,6 +661,27 @@ in ''; }; + privateUsers = mkOption { + type = types.either types.ints.u32 (types.enum [ "no" "identity" "pick" ]); + default = "no"; + description = '' + Whether to give the container its own private UIDs/GIDs space (user namespacing). + Disabled by default (`no`). + + If set to a number (usually above host's UID/GID range: 65536), + user namespacing is enabled and the container UID/GIDs will start at that number. + + If set to `identity`, mostly equivalent to `0`, this will only provide + process capability isolation (no UID/GID isolation, as they are the same as host). + + If set to `pick`, user namespacing is enabled and the UID/GID range is automatically chosen, + so that no overlapping UID/GID ranges are assigned to multiple containers. + This is the recommanded option as it enhances container security massively and operates fully automatically in most cases. + + See https://www.freedesktop.org/software/systemd/man/latest/systemd-nspawn.html#--private-users= for details. + ''; + }; + interfaces = mkOption { type = types.listOf types.str; default = []; @@ -862,6 +894,13 @@ in additionalCapabilities = cfg.additionalCapabilities ++ [ "CAP_NET_ADMIN" ]; } + ) // ( + optionalAttrs (!cfg.enableTun && cfg.privateNetwork + && (cfg.privateUsers == "pick" || (builtins.isInt cfg.privateUsers && cfg.privateUsers > 0 ))) + { + allowedDevices = cfg.allowedDevices + ++ [ { node = "/dev/net/tun"; modifier = "rwm"; } ]; + } ); in recursiveUpdate unit { @@ -923,6 +962,7 @@ in ${optionalString (cfg.networkNamespace != null) '' NETWORK_NAMESPACE_PATH=${cfg.networkNamespace} ''} + PRIVATE_USERS=${toString cfg.privateUsers} INTERFACES="${toString cfg.interfaces}" MACVLANS="${toString cfg.macvlans}" ${optionalString cfg.autoStart '' From a0d86441b54572ad3b27639640b595b2a9cb8fa5 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Giraudeau Date: Fri, 6 Dec 2024 10:18:35 +0100 Subject: [PATCH 0372/1107] nixos-container: runInContainer to enter all namespaces for compatibility with nspawn --private-users= --- pkgs/by-name/ni/nixos-container/nixos-container.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ni/nixos-container/nixos-container.pl b/pkgs/by-name/ni/nixos-container/nixos-container.pl index d6375f5db66f..c499a31da0cf 100755 --- a/pkgs/by-name/ni/nixos-container/nixos-container.pl +++ b/pkgs/by-name/ni/nixos-container/nixos-container.pl @@ -364,7 +364,7 @@ sub restartContainer { sub runInContainer { my @args = @_; my $leader = getLeader; - exec($nsenter, "-t", $leader, "-m", "-u", "-i", "-n", "-p", "--", @args); + exec($nsenter, "--all", "-t", $leader, "--", @args); die "cannot run ‘nsenter’: $!\n"; } From d6fccd0e8cf9a1af188fadd0c13b687d71d892ed Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 12 Feb 2025 17:53:55 +0100 Subject: [PATCH 0373/1107] libcdr: fix build This hack hasn't been necessary since libcdr 0.0.9 or 0.1.0, and now breaks the build with ICU 76. --- pkgs/development/libraries/libcdr/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index f19b3d7b53df..482d544225b9 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - CXXFLAGS="--std=gnu++0x"; # For c++11 constants in lcms2.h - enableParallelBuilding = true; meta = { From 693f05ba64979e8eab65639631d0e3635058be02 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 12 Feb 2025 20:17:53 +0300 Subject: [PATCH 0374/1107] python312Packages.eventlet: skip test broken by openssl upgrade --- pkgs/development/python-modules/eventlet/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 1067637c4d84..e49970321f69 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -65,6 +65,8 @@ buildPythonPackage rec { "test_hosts_no_network" # flaky test, depends on builder performance "test_server_connection_timeout_exception" + # broken with openssl 3.4 + "test_ssl_close" ]; pythonImportsCheck = [ "eventlet" ]; From 68fc36e0b265aa8520dc16b79de316b43b219f44 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Tue, 11 Feb 2025 18:56:14 +0100 Subject: [PATCH 0375/1107] open62541: 1.4.8 -> 1.4.10 https://github.com/open62541/open62541/releases/tag/v1.4.9 https://github.com/open62541/open62541/releases/tag/v1.4.10 --- pkgs/by-name/op/open62541/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/open62541/package.nix b/pkgs/by-name/op/open62541/package.nix index 20402ae725cd..837099a1e98d 100644 --- a/pkgs/by-name/op/open62541/package.nix +++ b/pkgs/by-name/op/open62541/package.nix @@ -30,13 +30,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "open62541"; - version = "1.4.8"; + version = "1.4.10"; src = fetchFromGitHub { owner = "open62541"; repo = "open62541"; rev = "v${finalAttrs.version}"; - hash = "sha256-wPSsEM/vdsCvvbOmJRZMzvvUnWbGSMjWL/loQ2Lvn3s="; + hash = "sha256-UUN8zLkXyXRbUOGFD6TYKUlbkZCIEJGw/S7xpUWVPxQ="; fetchSubmodules = true; }; From be9121fbadcacf1734a8a6d58a5bdbd215f50aae Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Wed, 23 Oct 2024 17:01:52 -0700 Subject: [PATCH 0376/1107] libpsl-with-scripts: init psl-make-dafsa pulls in a runtime python3 dependency which seems to have given various build configurations no end of trouble. This solves the problem in the least subtle manner imaginable, by removing it for all platforms and re-adding it in a new package which currently has no dependants. Switch your dependency from libpsl to libpsl-with-scripts if you are impacted by this. --- .../li/libpsl-with-scripts/package.nix | 53 +++++++++++++++++++ pkgs/by-name/li/libpsl/package.nix | 17 +++--- 2 files changed, 59 insertions(+), 11 deletions(-) create mode 100644 pkgs/by-name/li/libpsl-with-scripts/package.nix diff --git a/pkgs/by-name/li/libpsl-with-scripts/package.nix b/pkgs/by-name/li/libpsl-with-scripts/package.nix new file mode 100644 index 000000000000..cc31b95798f9 --- /dev/null +++ b/pkgs/by-name/li/libpsl-with-scripts/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + libpsl, + python3, + lzip, +}: + +stdenv.mkDerivation { + pname = "libpsl-with-scripts"; + inherit (libpsl) src version patches; + outputs = libpsl.outputs ++ [ "bin" ]; + + nativeBuildInputs = [ + lzip + ]; + + buildInputs = [ + python3 + ]; + + postPatch = '' + patchShebangs src/psl-make-dafsa + ''; + + dontConfigure = true; + dontBuild = true; + + installPhase = + let + linkOutput = oldOutput: newOutput: '' + cd ${oldOutput} + find . -type d -print0 | xargs -0 -I{} mkdir -p ${newOutput}/{} + find . \( -type f -o -type l \) -print0 | xargs -0 -I{} ln -s ${oldOutput}/{} ${newOutput}/{} + cd - + ''; + links = lib.concatMapStrings ( + output: linkOutput libpsl.${output} (builtins.placeholder output) + ) libpsl.outputs; + in + '' + runHook preInstall + + ${links} + + install -D src/psl-make-dafsa $bin/bin/psl-make-dafsa + install -D -m 555 src/psl-make-dafsa.1 $out/share/man/man1/psl-make-dafsa.1 + + runHook postInstall + ''; + + dontFixup = true; +} diff --git a/pkgs/by-name/li/libpsl/package.nix b/pkgs/by-name/li/libpsl/package.nix index 81dd87ded09c..f919f8cb30ff 100644 --- a/pkgs/by-name/li/libpsl/package.nix +++ b/pkgs/by-name/li/libpsl/package.nix @@ -12,7 +12,6 @@ libunistring, libxslt, pkg-config, - python3, buildPackages, publicsuffix-list, }: @@ -40,9 +39,7 @@ stdenv.mkDerivation rec { [ "out" "dev" - ] - # bin/psl-make-dafsa brings a large runtime closure through python3 - ++ lib.optional (!stdenv.hostPlatform.isStatic) "bin"; + ]; nativeBuildInputs = [ autoreconfHook @@ -58,18 +55,16 @@ stdenv.mkDerivation rec { libidn2 libunistring libxslt - ] ++ lib.optional ( - !stdenv.hostPlatform.isStatic - && !stdenv.hostPlatform.isWindows - && (stdenv.hostPlatform.isDarwin -> stdenv.buildPlatform == stdenv.hostPlatform) - ) python3; + ]; propagatedBuildInputs = [ publicsuffix-list ]; - postPatch = lib.optionalString (!stdenv.hostPlatform.isStatic) '' - patchShebangs src/psl-make-dafsa + # bin/psl-make-dafsa brings a large runtime closure through python3 + # use the libpsl-with-scripts package if you need this + postInstall = '' + rm $out/bin/psl-make-dafsa $out/share/man/man1/psl-make-dafsa* ''; preAutoreconf = '' From 5d3564ed4c4bb0fb84f251643e1b011b379be9f4 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Tue, 3 Dec 2024 04:10:10 -0700 Subject: [PATCH 0377/1107] openbsd.sys: pin compiler to clang 18 Otherwise (clang 19), it fails to compile: > --- locore.o --- > /build/locore-e779a9.s:692:9: error: invalid number of bytes > .space (.Liretq_swapgs - XUsyscall_meltdown) - (. - Xsyscall_meltdown), 0xcc > ^ > *** [locore.o] Error code 1 > > make: stopped in /build/sys-openbsd-filtered-src/sys/arch/amd64/compile/GENERIC/obj > 1 error > > make: stopped in /build/sys-openbsd-filtered-src/sys/arch/amd64/compile/GENERIC/obj Eventually, OpenBSD will fix this upstream. For now they are stuck on clang 16. --- pkgs/os-specific/bsd/openbsd/pkgs/sys.nix | 112 ++++++++++++---------- 1 file changed, 59 insertions(+), 53 deletions(-) diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/sys.nix b/pkgs/os-specific/bsd/openbsd/pkgs/sys.nix index 58f1a0be8430..ec91e20fed50 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/sys.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/sys.nix @@ -1,66 +1,72 @@ { + buildPackages, + stdenvNoLibc, + overrideCC, mkDerivation, boot-config, pkgsBuildTarget, baseConfig ? "GENERIC", }: -mkDerivation { - path = "sys/arch/amd64"; - pname = "sys"; - extraPaths = [ "sys" ]; - noLibc = true; +(mkDerivation.override { + stdenvNoLibc = overrideCC stdenvNoLibc buildPackages.llvmPackages_18.clangNoLibc; +}) + { + path = "sys/arch/amd64"; + pname = "sys"; + extraPaths = [ "sys" ]; + noLibc = true; - extraNativeBuildInputs = [ - boot-config - ]; + extraNativeBuildInputs = [ + boot-config + ]; - postPatch = - # The in-kernel debugger (DDB) requires compiler flags not supported by clang, disable it - '' - sed -E -i -e '/DDB/d' $BSDSRCDIR/sys/conf/GENERIC - sed -E -i -e '/pseudo-device\tdt/d' $BSDSRCDIR/sys/arch/amd64/conf/GENERIC - '' - + - # Clang flags compatibility + postPatch = + # The in-kernel debugger (DDB) requires compiler flags not supported by clang, disable it '' - find $BSDSRCDIR -name 'Makefile*' -exec sed -E -i -e 's/-fno-ret-protector/-fno-stack-protector/g' -e 's/-nopie/-no-pie/g' {} + - sed -E -i -e 's_^\tinstall.*$_\tinstall bsd ''${out}/bsd_' -e s/update-link// $BSDSRCDIR/sys/arch/*/conf/Makefile.* + sed -E -i -e '/DDB/d' $BSDSRCDIR/sys/conf/GENERIC + sed -E -i -e '/pseudo-device\tdt/d' $BSDSRCDIR/sys/arch/amd64/conf/GENERIC '' - + - # Remove randomness in build + + + # Clang flags compatibility + '' + find $BSDSRCDIR -name 'Makefile*' -exec sed -E -i -e 's/-fno-ret-protector/-fno-stack-protector/g' -e 's/-nopie/-no-pie/g' {} + + sed -E -i -e 's_^\tinstall.*$_\tinstall bsd ''${out}/bsd_' -e s/update-link// $BSDSRCDIR/sys/arch/*/conf/Makefile.* + '' + + + # Remove randomness in build + '' + sed -E -i -e 's/^PAGE_SIZE=.*$/PAGE_SIZE=4096/g' -e '/^random_uniform/a echo 0; return 0;' $BSDSRCDIR/sys/conf/makegap.sh + sed -E -i -e 's/^v=.*$/v=0 u=nixpkgs h=nixpkgs t=`date -d @1`/g' $BSDSRCDIR/sys/conf/newvers.sh + ''; + + postConfigure = '' + export BSDOBJDIR=$TMP/obj + mkdir $BSDOBJDIR + make obj + + cd conf + config ${baseConfig} + cd - + ''; + + preBuild = + # A lot of files insist on calling unprefixed GNU `ld` and `objdump`. + # It's easier to add them to PATH than patch and substitute. '' - sed -E -i -e 's/^PAGE_SIZE=.*$/PAGE_SIZE=4096/g' -e '/^random_uniform/a echo 0; return 0;' $BSDSRCDIR/sys/conf/makegap.sh - sed -E -i -e 's/^v=.*$/v=0 u=nixpkgs h=nixpkgs t=`date -d @1`/g' $BSDSRCDIR/sys/conf/newvers.sh - ''; - - postConfigure = '' - export BSDOBJDIR=$TMP/obj - mkdir $BSDOBJDIR - make obj - - cd conf - config ${baseConfig} - cd - - ''; - - preBuild = - # A lot of files insist on calling unprefixed GNU `ld` and `objdump`. - # It's easier to add them to PATH than patch and substitute. - '' - mkdir $TMP/bin - export PATH=$TMP/bin:$PATH - ln -s ${pkgsBuildTarget.binutils}/bin/${pkgsBuildTarget.binutils.targetPrefix}objdump $TMP/bin/objdump - ln -s ${pkgsBuildTarget.binutils}/bin/${pkgsBuildTarget.binutils.targetPrefix}ld $TMP/bin/ld - '' - + - # The Makefile claims it needs includes, but it really doesn't. - # Tell it includes aren't real and can't hurt it. + mkdir $TMP/bin + export PATH=$TMP/bin:$PATH + ln -s ${pkgsBuildTarget.binutils}/bin/${pkgsBuildTarget.binutils.targetPrefix}objdump $TMP/bin/objdump + ln -s ${pkgsBuildTarget.binutils}/bin/${pkgsBuildTarget.binutils.targetPrefix}ld $TMP/bin/ld '' - cd compile/${baseConfig}/obj - echo 'includes:' >>Makefile - ''; + + + # The Makefile claims it needs includes, but it really doesn't. + # Tell it includes aren't real and can't hurt it. + '' + cd compile/${baseConfig}/obj + echo 'includes:' >>Makefile + ''; - # stand is in a separate package - env.SKIPDIR = "stand"; - env.NIX_CFLAGS_COMPILE = "-Wno-unused-command-line-argument -Wno-visibility"; -} + # stand is in a separate package + env.SKIPDIR = "stand"; + env.NIX_CFLAGS_COMPILE = "-Wno-unused-command-line-argument -Wno-visibility"; + } From bfef815b6ec066f19b85444a82624f8c7015ac62 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Wed, 12 Feb 2025 08:52:30 -0700 Subject: [PATCH 0378/1107] mautrix-gmessages: init at 0.6.0 https://github.com/mautrix/gmessages/releases/tag/v0.6.0 Signed-off-by: Sumner Evans --- pkgs/by-name/ma/mautrix-gmessages/package.nix | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 pkgs/by-name/ma/mautrix-gmessages/package.nix diff --git a/pkgs/by-name/ma/mautrix-gmessages/package.nix b/pkgs/by-name/ma/mautrix-gmessages/package.nix new file mode 100644 index 000000000000..c6b6982c555c --- /dev/null +++ b/pkgs/by-name/ma/mautrix-gmessages/package.nix @@ -0,0 +1,48 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + olm, + nix-update-script, + testers, + mautrix-gmessages, +}: + +buildGoModule rec { + pname = "mautrix-gmessages"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "mautrix"; + repo = "gmessages"; + tag = "v${version}"; + hash = "sha256-FNjFGO/4j3kLo79oU5fsYA2/yhc9cAsAGIAQ5OJ2VPE="; + }; + + vendorHash = "sha256-QZ16R5i0I7uvQCDpa9/0Fh3jP6TEiheenRnRUXHvYIQ="; + + ldflags = [ + "-s" + "-w" + "-X" + "main.Tag=${version}" + ]; + + buildInputs = [ olm ]; + + doCheck = false; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = mautrix-gmessages; }; + }; + + meta = with lib; { + description = "Matrix-Google Messages puppeting bridge"; + homepage = "https://github.com/mautrix/gmessages"; + changelog = "https://github.com/mautrix/gmessages/blob/${src.rev}/CHANGELOG.md"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ sumnerevans ]; + mainProgram = "mautrix-gmessages"; + }; +} From da2d3e462f7c24585bd7823f7683c9c4b80b1713 Mon Sep 17 00:00:00 2001 From: jervw Date: Wed, 12 Feb 2025 22:49:32 +0200 Subject: [PATCH 0379/1107] maintainers: add jervw --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b5e4bc5296aa..7b5e08fb4877 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10794,6 +10794,13 @@ githubId = 42114389; name = "Jerry Starke"; }; + jervw = { + email = "jervw@pm.me"; + github = "jervw"; + githubId = 53620688; + name = "Jere Vuola"; + keys = [ { fingerprint = "56C2 5B5B 2075 6352 B4B0 E17E F188 3717 47DA 5895"; } ]; + }; jeschli = { email = "jeschli@gmail.com"; github = "0mbi"; From 2018658a6a32cff74b5bd52a5501e1f9343eac94 Mon Sep 17 00:00:00 2001 From: Dominic Date: Wed, 12 Feb 2025 23:22:46 +0100 Subject: [PATCH 0380/1107] librewolf: 134.0.1-1 -> 135.0-1 --- .../networking/browsers/librewolf/src.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index c97fdea4af83..7d0234d7f06c 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "134.0.1-1", + "packageVersion": "135.0-1", "source": { - "rev": "134.0.1-1", - "hash": "sha256-YtZb+VaJu+zofIjJUUx6FjVsEb1sCgFsGlxgP++Yki0=" + "rev": "135.0-1", + "hash": "sha256-UyKfgu6/VAfPkLCjlGgG8SGAG/nOyoP3uyesXqLc5Dk" }, "firefox": { - "version": "134.0.1", - "hash": "sha512-P0DKWnU6ZuCK9OixLXX+q2ewVn7P/TT1zwE/Sa64CczUWMgBHpRW3JAsJOr2JgeBF4dFFOtAzuVXTq/Ok+53LQ==" + "version": "135.0", + "hash": "sha256-gn4SqWLvR1EQia9EmPZev0L6V8ox23kL/X6agg0WuWA=" } } From c9a8d8a4152be9b265b7860a92101d93394e8ee2 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Sat, 11 Jan 2025 21:43:47 -0700 Subject: [PATCH 0381/1107] boehmgc: hack in __data_start symbol OpenBSD's vendored lld includes patches to inject this extra symbol. We don't do that, so use a linker script. --- pkgs/by-name/bo/boehmgc/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/bo/boehmgc/package.nix b/pkgs/by-name/bo/boehmgc/package.nix index e950ad42f9a3..dbd575ea4b6b 100644 --- a/pkgs/by-name/bo/boehmgc/package.nix +++ b/pkgs/by-name/bo/boehmgc/package.nix @@ -54,6 +54,13 @@ stdenv.mkDerivation (finalAttrs: { "CFLAGS_EXTRA=-DNO_SOFT_VDB" ]; + # OpenBSD patches lld (!!!!) to inject this symbol into every linker invocation. + # We are obviously not doing that. + postConfigure = lib.optionalString stdenv.hostPlatform.isOpenBSD '' + echo >$TMP/openbsd.ldscript "__data_start = ADDR(.data);" + export NIX_LDFLAGS="$NIX_LDFLAGS -T $TMP/openbsd.ldscript" + ''; + # `gctest` fails under x86_64 emulation on aarch64-darwin # and also on aarch64-linux (qemu-user) doCheck = From a56794defceeb35c6e748523fe655722f9e4f533 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Sat, 11 Jan 2025 21:44:00 -0700 Subject: [PATCH 0382/1107] nix: adjust boehmgc patch to work with OpenBSD The bundled patch for boehmgc requires various flavors of nonstandard pthread extensions, of which OpenBSD implements none of them. This adds a final fallback case. --- .../nix/patches/boehmgc-coroutine-sp-fallback.patch | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch b/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch index a53b7f1f52f4..2fef8185aea2 100644 --- a/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch +++ b/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch @@ -2,7 +2,7 @@ diff --git a/pthread_stop_world.c b/pthread_stop_world.c index 2b45489..0e6d8ef 100644 --- a/pthread_stop_world.c +++ b/pthread_stop_world.c -@@ -776,6 +776,8 @@ STATIC void GC_restart_handler(int sig) +@@ -776,6 +776,8 @@ /* world is stopped. Should not fail if it isn't. */ GC_INNER void GC_push_all_stacks(void) { @@ -11,22 +11,27 @@ index 2b45489..0e6d8ef 100644 GC_bool found_me = FALSE; size_t nthreads = 0; int i; -@@ -868,6 +870,40 @@ GC_INNER void GC_push_all_stacks(void) +@@ -868,6 +870,45 @@ hi = p->altstack + p->altstack_size; # endif /* FIXME: Need to scan the normal stack too, but how ? */ + } else { -+ #ifdef HAVE_PTHREAD_ATTR_GET_NP ++ #if defined(HAVE_PTHREAD_ATTR_GET_NP) + if (pthread_attr_init(&pattr) != 0) { + ABORT("GC_push_all_stacks: pthread_attr_init failed!"); + } + if (pthread_attr_get_np(p->id, &pattr) != 0) { + ABORT("GC_push_all_stacks: pthread_attr_get_np failed!"); + } -+ #else ++ #elif defined(HAVE_PTHREAD_GETATTR_NP) + if (pthread_getattr_np(p->id, &pattr)) { + ABORT("GC_push_all_stacks: pthread_getattr_np failed!"); + } ++ #else ++ /* assume default */ ++ if (pthread_attr_init(&pattr) != 0) { ++ ABORT("GC_push_all_stacks: pthread_attr_init failed!"); ++ } + #endif + if (pthread_attr_getstacksize(&pattr, &stack_limit)) { + ABORT("GC_push_all_stacks: pthread_attr_getstacksize failed!"); From a779dba38abfde33b798cd2ff7be450e2d0b72c2 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Wed, 12 Feb 2025 15:44:44 -0700 Subject: [PATCH 0383/1107] jq: remove configuration slated for removal in 1.7 --- pkgs/by-name/jq/jq/package.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/by-name/jq/jq/package.nix b/pkgs/by-name/jq/jq/package.nix index 900ba869f352..54f61868ea15 100644 --- a/pkgs/by-name/jq/jq/package.nix +++ b/pkgs/by-name/jq/jq/package.nix @@ -54,15 +54,6 @@ stdenv.mkDerivation rec { bison ]; - # Darwin requires _REENTRANT be defined to use functions like `lgamma_r`. - # Otherwise, configure will detect that they’re in libm, but the build will fail - # with clang 16+ due to calls to undeclared functions. - # This is fixed upstream and can be removed once jq is updated (to 1.7 or an unstable release). - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ - "-D_REENTRANT=1" - "-D_DARWIN_C_SOURCE=1" - ]); - configureFlags = [ "--bindir=\${bin}/bin" From 226cb34a82799a2d6cf541a287bd9a8e44797612 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Wed, 12 Feb 2025 15:53:25 -0700 Subject: [PATCH 0384/1107] jq: fix compilation on OpenBSD/clang19 --- pkgs/by-name/jq/jq/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/jq/jq/package.nix b/pkgs/by-name/jq/jq/package.nix index 54f61868ea15..3d8adb3e7829 100644 --- a/pkgs/by-name/jq/jq/package.nix +++ b/pkgs/by-name/jq/jq/package.nix @@ -63,7 +63,9 @@ stdenv.mkDerivation rec { ] ++ lib.optional (!onigurumaSupport) "--with-oniguruma=no" # jq is linked to libjq: - ++ lib.optional (!stdenv.hostPlatform.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}"; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}" + # https://github.com/jqlang/jq/issues/3252 + ++ lib.optional stdenv.hostPlatform.isOpenBSD "CFLAGS=-D_BSD_SOURCE=1"; # jq binary includes the whole `configureFlags` in: # https://github.com/jqlang/jq/commit/583e4a27188a2db097dd043dd203b9c106bba100 From db8d1d37d56c0a5dff7c5861de48d6feaeefbcbe Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 12 Feb 2025 16:06:28 +0100 Subject: [PATCH 0385/1107] haskell.compiler: drop unnecessary Sphinx patch for GHC >= 9.8 The line the patch touches is actually inside conditional code and isn't executed with Sphinx 7, so we don't need to touch it. --- pkgs/development/compilers/ghc/common-hadrian.nix | 9 ++++----- pkgs/development/compilers/ghc/docs-sphinx-7-ghc98.patch | 8 -------- 2 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 pkgs/development/compilers/ghc/docs-sphinx-7-ghc98.patch diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 7974cba0824c..d9e10c96234a 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -171,11 +171,10 @@ # 9.8 and 9.10 don't run into this problem for some reason || (lib.versionAtLeast version "9.8" && lib.versionOlder version "9.11"); in - [ - # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 - (if lib.versionAtLeast version "9.8" - then ./docs-sphinx-7-ghc98.patch - else ./docs-sphinx-7.patch ) + + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 + lib.optionals (lib.versionOlder version "9.8") [ + ./docs-sphinx-7.patch ] ++ lib.optionals (lib.versionAtLeast version "9.6" && lib.versionOlder version "9.6.6") [ (fetchpatch { diff --git a/pkgs/development/compilers/ghc/docs-sphinx-7-ghc98.patch b/pkgs/development/compilers/ghc/docs-sphinx-7-ghc98.patch deleted file mode 100644 index 3fc1a0f21561..000000000000 --- a/pkgs/development/compilers/ghc/docs-sphinx-7-ghc98.patch +++ /dev/null @@ -1,8 +0,0 @@ -Fix build of docs after sphinx update. -https://github.com/sphinx-doc/sphinx/pull/11381 -https://gitlab.haskell.org/ghc/ghc/-/issues/24129 ---- a/docs/users_guide/rtd-theme/layout.html -+++ b/docs/users_guide/rtd-theme/layout.html -@@ -28 +28 @@ -- -+ From 58cab06b5e37c39857e74a75a7db567a3cfe7e53 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Feb 2025 01:44:10 +0100 Subject: [PATCH 0386/1107] python314: 3.14.0a4 -> 3.14.0a5 https://docs.python.org/3.14/whatsnew/changelog.html#python-3-14-0-alpha-5 --- .../python/cpython/3.12/CVE-2024-12254.patch | 45 ------------------- .../interpreters/python/cpython/default.nix | 4 +- .../interpreters/python/default.nix | 4 +- 3 files changed, 3 insertions(+), 50 deletions(-) delete mode 100644 pkgs/development/interpreters/python/cpython/3.12/CVE-2024-12254.patch diff --git a/pkgs/development/interpreters/python/cpython/3.12/CVE-2024-12254.patch b/pkgs/development/interpreters/python/cpython/3.12/CVE-2024-12254.patch deleted file mode 100644 index 1a19a41d8d4a..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.12/CVE-2024-12254.patch +++ /dev/null @@ -1,45 +0,0 @@ -From e991ac8f2037d78140e417cc9a9486223eb3e786 Mon Sep 17 00:00:00 2001 -From: "J. Nick Koston" -Date: Thu, 5 Dec 2024 22:33:03 -0600 -Subject: [PATCH] gh-127655: Ensure `_SelectorSocketTransport.writelines` - pauses the protocol if needed (#127656) - -Ensure `_SelectorSocketTransport.writelines` pauses the protocol if it reaches the high water mark as needed. - -Co-authored-by: Kumar Aditya - -diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py -index f94bf10b4225e7..f1ab9b12d69a5d 100644 ---- a/Lib/asyncio/selector_events.py -+++ b/Lib/asyncio/selector_events.py -@@ -1175,6 +1175,7 @@ def writelines(self, list_of_data): - # If the entire buffer couldn't be written, register a write handler - if self._buffer: - self._loop._add_writer(self._sock_fd, self._write_ready) -+ self._maybe_pause_protocol() - - def can_write_eof(self): - return True -diff --git a/Lib/test/test_asyncio/test_selector_events.py b/Lib/test/test_asyncio/test_selector_events.py -index aaeda33dd0c677..efca30f37414f9 100644 ---- a/Lib/test/test_asyncio/test_selector_events.py -+++ b/Lib/test/test_asyncio/test_selector_events.py -@@ -805,6 +805,18 @@ def test_writelines_send_partial(self): - self.assertTrue(self.sock.send.called) - self.assertTrue(self.loop.writers) - -+ def test_writelines_pauses_protocol(self): -+ data = memoryview(b'data') -+ self.sock.send.return_value = 2 -+ self.sock.send.fileno.return_value = 7 -+ -+ transport = self.socket_transport() -+ transport._high_water = 1 -+ transport.writelines([data]) -+ self.assertTrue(self.protocol.pause_writing.called) -+ self.assertTrue(self.sock.send.called) -+ self.assertTrue(self.loop.writers) -+ - @unittest.skipUnless(selector_events._HAS_SENDMSG, 'no sendmsg') - def test_write_sendmsg_full(self): - data = memoryview(b'data') diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index bb3bf0b41be3..ba9292e8dd38 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -254,7 +254,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { # (since it will do a futile invocation of gcc (!) to find # libuuid, slowing down program startup a lot). noldconfigPatch - ] ++ optionals (!isPy312 && !isPy313) [ + ] ++ optionals (pythonOlder "3.12") [ # https://www.cve.org/CVERecord?id=CVE-2025-0938 ./CVE-2025-0938.patch ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isFreeBSD) [ @@ -299,8 +299,6 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { ] ++ optionals (pythonOlder "3.12") [ # https://github.com/python/cpython/issues/90656 ./loongarch-support.patch - ] ++ optionals isPy314 [ - ./3.12/CVE-2024-12254.patch ] ++ optionals (pythonAtLeast "3.11" && pythonOlder "3.13") [ # backport fix for https://github.com/python/cpython/issues/95855 ./platform-triplet-detection.patch diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 7473409ef418..eb86f77f00e6 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -100,9 +100,9 @@ in { major = "3"; minor = "14"; patch = "0"; - suffix = "a4"; + suffix = "a5"; }; - hash = "sha256-wk8HiBhzwdRgIoeVymyoyZEw4wx3PJFGPTDX6o/w5ws="; + hash = "sha256-dOg/Jt4eT7nu8bVkks/5JQiDS7cawT9cWAQ4zp8JNoI="; inherit passthruFun; }; # Minimal versions of Python (built without optional dependencies) From 442263f4dceee65cf25b90771224dcc5e376bafe Mon Sep 17 00:00:00 2001 From: Ophestra Date: Thu, 13 Feb 2025 10:08:03 +0900 Subject: [PATCH 0387/1107] libtas: add binutils and ffmpeg to PATH libTAS invokes readelf and ffmpeg, it does not crash when they are not present, however certain features like video encoding stop working without any error message showing up in the GUI. --- pkgs/by-name/li/libtas/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libtas/package.nix b/pkgs/by-name/li/libtas/package.nix index 7a3ab2e7a155..f36e9391a07d 100644 --- a/pkgs/by-name/li/libtas/package.nix +++ b/pkgs/by-name/li/libtas/package.nix @@ -9,6 +9,7 @@ , lua5_3 , qt5 , file +, binutils , makeDesktopItem }: @@ -39,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' wrapProgram $out/bin/libTAS \ - --suffix PATH : ${lib.makeBinPath [ file ]} \ + --suffix PATH : ${lib.makeBinPath [ file binutils ffmpeg ]} \ --set-default LIBTAS_SO_PATH $out/lib/libtas.so ''; From 7c8a24b91fe143751f2e01bc10a433f3105ef70f Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Thu, 21 Nov 2024 05:27:03 -0700 Subject: [PATCH 0388/1107] openbsd.{sys,stand}: patch to support nixbsd init --- .../pkgs/{stand.nix => stand/package.nix} | 2 + .../bsd/openbsd/pkgs/sys/initpath.patch | 166 ++++++++++++++++++ .../openbsd/pkgs/{sys.nix => sys/package.nix} | 2 + 3 files changed, 170 insertions(+) rename pkgs/os-specific/bsd/openbsd/pkgs/{stand.nix => stand/package.nix} (96%) create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/sys/initpath.patch rename pkgs/os-specific/bsd/openbsd/pkgs/{sys.nix => sys/package.nix} (98%) diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/stand.nix b/pkgs/os-specific/bsd/openbsd/pkgs/stand/package.nix similarity index 96% rename from pkgs/os-specific/bsd/openbsd/pkgs/stand.nix rename to pkgs/os-specific/bsd/openbsd/pkgs/stand/package.nix index 4ded2fb4c3fe..0aa3e0efec65 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/stand.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/stand/package.nix @@ -8,6 +8,8 @@ mkDerivation { path = "sys/arch/amd64/stand"; extraPaths = [ "sys" ]; + patches = [ ../sys/initpath.patch ]; + # gcc compat postPatch = '' find $BSDSRCDIR -name Makefile -print0 | xargs -0 sed -E -i -e 's/-nopie/-no-pie/g' diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/sys/initpath.patch b/pkgs/os-specific/bsd/openbsd/pkgs/sys/initpath.patch new file mode 100644 index 000000000000..d09c1a821cb0 --- /dev/null +++ b/pkgs/os-specific/bsd/openbsd/pkgs/sys/initpath.patch @@ -0,0 +1,166 @@ +OpenBSD hardcodes the /sbin/init path which is super unhelpful for booting a +NixOS system. This patch adds a boot parameter that can be passed through the +bootloader and into the kernel specifying which init binary to use. This patch +will assuredly not be accepted upstream but is very relevant to nixpkgs. + +This patch applies for both sys and stand. + +diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c +index f58e6c585c1..874f5a74d6d 100644 +--- a/sys/arch/amd64/amd64/machdep.c ++++ b/sys/arch/amd64/amd64/machdep.c +@@ -181,6 +181,7 @@ int physmem; + u_int64_t dumpmem_low; + u_int64_t dumpmem_high; + extern int boothowto; ++extern char initpath[MAXPATHLEN]; + int cpu_class; + + paddr_t dumpmem_paddr; +@@ -255,6 +256,7 @@ bios_memmap_t *bios_memmap; + u_int32_t bios_cksumlen; + bios_efiinfo_t *bios_efiinfo; + bios_ucode_t *bios_ucode; ++char *passed_init; + + #if NEFI > 0 + EFI_MEMORY_DESCRIPTOR *mmap; +@@ -1992,6 +1994,7 @@ getbootinfo(char *bootinfo, int bootinfo_size) + bios_ddb_t *bios_ddb; + bios_bootduid_t *bios_bootduid; + bios_bootsr_t *bios_bootsr; ++ char *init_param; + #undef BOOTINFO_DEBUG + #ifdef BOOTINFO_DEBUG + printf("bootargv:"); +@@ -2089,6 +2092,11 @@ getbootinfo(char *bootinfo, int bootinfo_size) + bios_ucode = (bios_ucode_t *)q->ba_arg; + break; + ++ case BOOTARG_INIT: ++ init_param = (char*)q->ba_arg; ++ memcpy(initpath, init_param, sizeof(initpath)); ++ break; ++ + default: + #ifdef BOOTINFO_DEBUG + printf(" unsupported arg (%d) %p", q->ba_type, +diff --git a/sys/arch/amd64/include/biosvar.h b/sys/arch/amd64/include/biosvar.h +index b0c71ea0350..93e81b1b051 100644 +--- a/sys/arch/amd64/include/biosvar.h ++++ b/sys/arch/amd64/include/biosvar.h +@@ -225,6 +225,8 @@ typedef struct _bios_ucode { + uint64_t uc_size; + } __packed bios_ucode_t; + ++#define BOOTARG_INIT 13 ++ + #if defined(_KERNEL) || defined (_STANDALONE) + + #ifdef _LOCORE +diff --git a/sys/arch/amd64/stand/efiboot/efiboot.c b/sys/arch/amd64/stand/efiboot/efiboot.c +index 95cf92d298d..ee77f6769fd 100644 +--- a/sys/arch/amd64/stand/efiboot/efiboot.c ++++ b/sys/arch/amd64/stand/efiboot/efiboot.c +@@ -965,6 +965,9 @@ efi_makebootargs(void) + #endif + + addbootarg(BOOTARG_EFIINFO, sizeof(bios_efiinfo), &bios_efiinfo); ++ if (cmd.init[0] != 0) { ++ addbootarg(BOOTARG_INIT, sizeof(cmd.init), &cmd.init); ++ } + } + + /* Vendor device path used to indicate the mmio UART on AMD SoCs. */ +diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c +index b4816b2e9a0..db412097035 100644 +--- a/sys/kern/init_main.c ++++ b/sys/kern/init_main.c +@@ -103,6 +103,8 @@ extern void stoeplitz_init(void); + #include "vscsi.h" + #include "softraid.h" + ++#define DEBUG 1 ++ + const char copyright[] = + "Copyright (c) 1982, 1986, 1989, 1991, 1993\n" + "\tThe Regents of the University of California. All rights reserved.\n" +@@ -127,6 +129,7 @@ int db_active = 0; + int ncpus = 1; + int ncpusfound = 1; /* number of cpus we find */ + volatile int start_init_exec; /* semaphore for start_init() */ ++char initpath[MAXPATHLEN]; + + #if !defined(NO_PROPOLICE) + long __guard_local __attribute__((section(".openbsd.randomdata"))); +@@ -557,6 +560,7 @@ static char *initpaths[] = { + "/sbin/init", + "/sbin/oinit", + "/sbin/init.bak", ++ initpath, + NULL, + }; + +diff --git a/sys/stand/boot/boot.c b/sys/stand/boot/boot.c +index e090a0d0180..1a20b1ece47 100644 +--- a/sys/stand/boot/boot.c ++++ b/sys/stand/boot/boot.c +@@ -74,7 +74,7 @@ boot(dev_t bootdev) + devboot(bootdev, cmd.bootdev); + strlcpy(cmd.image, kernelfile, sizeof(cmd.image)); + cmd.boothowto = 0; +- cmd.conf = "/etc/boot.conf"; ++ cmd.conf = "/boot/nixos/default.conf"; + cmd.timeout = boottimeout; + + if (upgrade()) { +diff --git a/sys/stand/boot/cmd.h b/sys/stand/boot/cmd.h +index 5045f052b8b..327f3de8d84 100644 +--- a/sys/stand/boot/cmd.h ++++ b/sys/stand/boot/cmd.h +@@ -43,6 +43,7 @@ struct cmd_table { + struct cmd_state { + char bootdev[BOOTDEVLEN]; /* device */ + char image[MAXPATHLEN - 16]; /* image */ ++ char init[MAXPATHLEN]; + int boothowto; /* howto */ + char *conf; /* /etc/boot.conf normally */ + int timeout; +diff --git a/sys/stand/boot/vars.c b/sys/stand/boot/vars.c +index d1516776315..b12edcdaeac 100644 +--- a/sys/stand/boot/vars.c ++++ b/sys/stand/boot/vars.c +@@ -42,6 +42,7 @@ static int Xdevice(void); + static int Xdebug(void); + #endif + static int Xdb_console(void); ++static int Xinit(void); + static int Ximage(void); + static int Xhowto(void); + #ifdef BOOT_STTY +@@ -63,6 +64,7 @@ const struct cmd_table cmd_set[] = { + {"image", CMDT_VAR, Ximage}, + {"timeout",CMDT_VAR, Xtimeout}, + {"db_console", CMDT_VAR, Xdb_console}, ++ {"init", CMDT_VAR, Xinit}, + {NULL,0} + }; + +@@ -107,6 +109,17 @@ Xdb_console(void) + return (0); + } + ++int ++Xinit(void) ++{ ++ if (cmd.argc != 2) { ++ printf("%s\n", cmd.init); ++ } else { ++ strlcpy(cmd.init, cmd.argv[1], sizeof(cmd.init)); ++ } ++ return 0; ++} ++ + static int + Xtimeout(void) + { diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/sys.nix b/pkgs/os-specific/bsd/openbsd/pkgs/sys/package.nix similarity index 98% rename from pkgs/os-specific/bsd/openbsd/pkgs/sys.nix rename to pkgs/os-specific/bsd/openbsd/pkgs/sys/package.nix index ec91e20fed50..ba91ab9230b2 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/sys.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/sys/package.nix @@ -16,6 +16,8 @@ extraPaths = [ "sys" ]; noLibc = true; + patches = [ ./initpath.patch ]; + extraNativeBuildInputs = [ boot-config ]; From e74b540127ea2dc04de64b801e14f4197800a9e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20M=C3=BCller?= Date: Thu, 13 Feb 2025 10:51:39 +0100 Subject: [PATCH 0389/1107] djbdns: Fix compile warnings and errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This adds a new patch to the package definition that fixes compiler warnings and errors by including the correct files, or by adding the required forward declarations. At one point the other used implicit pointer conversion, this has been done explicitly now. As such, it should retain its behaviour, for good or worse. Signed-off-by: Marcel Müller --- pkgs/by-name/dj/djbdns/fix-warnings.patch | 127 ++++++++++++++++++++++ pkgs/by-name/dj/djbdns/package.nix | 3 + 2 files changed, 130 insertions(+) create mode 100644 pkgs/by-name/dj/djbdns/fix-warnings.patch diff --git a/pkgs/by-name/dj/djbdns/fix-warnings.patch b/pkgs/by-name/dj/djbdns/fix-warnings.patch new file mode 100644 index 000000000000..4da18c199770 --- /dev/null +++ b/pkgs/by-name/dj/djbdns/fix-warnings.patch @@ -0,0 +1,127 @@ +diff --git a/chkshsgr.c b/chkshsgr.c +index b6eb8a1..caa1b2b 100644 +--- a/chkshsgr.c ++++ b/chkshsgr.c +@@ -1,9 +1,11 @@ ++#include ++#include + #include "exit.h" + + int main() + { + return 0; +- short x[4]; ++ unsigned int x[4]; + + x[0] = x[1] = 0; + if (getgroups(1,x) == 0) if (setgroups(1,x) == -1) _exit(1); +diff --git a/dnsq.c b/dnsq.c +index 533e6af..23b08e7 100644 +--- a/dnsq.c ++++ b/dnsq.c +@@ -1,3 +1,4 @@ ++#include + #include "uint16.h" + #include "strerr.h" + #include "buffer.h" +diff --git a/dnsqr.c b/dnsqr.c +index ff8ea6e..d3879ea 100644 +--- a/dnsqr.c ++++ b/dnsqr.c +@@ -1,3 +1,4 @@ ++#include + #include "uint16.h" + #include "strerr.h" + #include "buffer.h" +diff --git a/hier.c b/hier.c +index a598e61..6eddb21 100644 +--- a/hier.c ++++ b/hier.c +@@ -1,4 +1,5 @@ + #include "auto_home.h" ++#include "instcheck.h" + + void hier() + { +diff --git a/instcheck.h b/instcheck.h +new file mode 100644 +index 0000000..056b74c +--- /dev/null ++++ b/instcheck.h +@@ -0,0 +1,9 @@ ++void h(const char *home, int uid, int gid, int mode); ++ ++void d(const char *home, char *subdir, int uid, int gid, int mode); ++ ++void p(char *home, char *fifo, int uid, int gid, int mode); ++ ++void c(const char *home, char *subdir, char *file, int uid, int gid, int mode); ++ ++void z(char *home, char *file, int len, int uid, int gid, int mode); +diff --git a/prot.c b/prot.c +index 0a8a373..1c56e9c 100644 +--- a/prot.c ++++ b/prot.c +@@ -1,3 +1,5 @@ ++#include ++#include + #include "hasshsgr.h" + #include "prot.h" + +diff --git a/seek_set.c b/seek_set.c +index d08d4f3..47c61e4 100644 +--- a/seek_set.c ++++ b/seek_set.c +@@ -1,4 +1,5 @@ + #include ++#include + #include "seek.h" + + #define SET 0 /* sigh */ +diff --git a/tinydns-data.c b/tinydns-data.c +index ba82f84..c70382e 100644 +--- a/tinydns-data.c ++++ b/tinydns-data.c +@@ -251,19 +251,19 @@ int main() + if (!dns_domain_fromdot(&d1,f[0].s,f[0].len)) nomem(); + + if (!stralloc_0(&f[3])) nomem(); +- if (!scan_ulong(f[3].s,&u)) uint32_unpack_big(defaultsoa,&u); ++ if (!scan_ulong(f[3].s,&u)) uint32_unpack_big(defaultsoa,(unsigned int *)&u); + uint32_pack_big(soa,u); + if (!stralloc_0(&f[4])) nomem(); +- if (!scan_ulong(f[4].s,&u)) uint32_unpack_big(defaultsoa + 4,&u); ++ if (!scan_ulong(f[4].s,&u)) uint32_unpack_big(defaultsoa + 4,(unsigned int *)&u); + uint32_pack_big(soa + 4,u); + if (!stralloc_0(&f[5])) nomem(); +- if (!scan_ulong(f[5].s,&u)) uint32_unpack_big(defaultsoa + 8,&u); ++ if (!scan_ulong(f[5].s,&u)) uint32_unpack_big(defaultsoa + 8,(unsigned int *)&u); + uint32_pack_big(soa + 8,u); + if (!stralloc_0(&f[6])) nomem(); +- if (!scan_ulong(f[6].s,&u)) uint32_unpack_big(defaultsoa + 12,&u); ++ if (!scan_ulong(f[6].s,&u)) uint32_unpack_big(defaultsoa + 12,(unsigned int *)&u); + uint32_pack_big(soa + 12,u); + if (!stralloc_0(&f[7])) nomem(); +- if (!scan_ulong(f[7].s,&u)) uint32_unpack_big(defaultsoa + 16,&u); ++ if (!scan_ulong(f[7].s,&u)) uint32_unpack_big(defaultsoa + 16,(unsigned int *)&u); + uint32_pack_big(soa + 16,u); + + if (!stralloc_0(&f[8])) nomem(); +diff --git a/utime.c b/utime.c +index 4b7984f..6a64060 100644 +--- a/utime.c ++++ b/utime.c +@@ -1,3 +1,4 @@ ++#include + #include + #include + #include "scan.h" +@@ -19,6 +20,7 @@ int main(int argc,char **argv) + scan_ulong(ustr,&u); + + ut[0] = ut[1] = u; +- if (utime(fn,ut) == -1) _exit(111); ++ struct utimbuf new_time = { .actime = u, .modtime = u }; ++ if (utime(fn,&new_time) == -1) _exit(111); + _exit(0); + } diff --git a/pkgs/by-name/dj/djbdns/package.nix b/pkgs/by-name/dj/djbdns/package.nix index 9ce49ccf46fb..196da74cc64d 100644 --- a/pkgs/by-name/dj/djbdns/package.nix +++ b/pkgs/by-name/dj/djbdns/package.nix @@ -33,6 +33,9 @@ stdenv.mkDerivation { # To fix https://github.com/NixOS/nixpkgs/issues/119066. # Note that the NixOS test tests for this. ./softlimit.patch + + # Fix warnings introduced due to implicit type conversions and implicit function declarations + ./fix-warnings.patch ]; postPatch = '' From 38af9d3c373b5ff834f0f83aa3e02f2247e017f5 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 13 Feb 2025 12:26:12 +0100 Subject: [PATCH 0390/1107] libseccomp: fix out-of-bounds read Fixes the tests with musl, but we probably want this fix everywhere. --- pkgs/by-name/li/libseccomp/oob-read.patch | 37 +++++++++++++++++++++++ pkgs/by-name/li/libseccomp/package.nix | 6 +++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/li/libseccomp/oob-read.patch diff --git a/pkgs/by-name/li/libseccomp/oob-read.patch b/pkgs/by-name/li/libseccomp/oob-read.patch new file mode 100644 index 000000000000..c769abdf7e91 --- /dev/null +++ b/pkgs/by-name/li/libseccomp/oob-read.patch @@ -0,0 +1,37 @@ +From 904e9dee373eca499e976dce131f0baee06db2d6 Mon Sep 17 00:00:00 2001 +From: Alyssa Ross +Date: Thu, 13 Feb 2025 12:05:17 +0100 +Subject: [PATCH] api: fix seccomp_export_bpf_mem out-of-bounds read + +*len is the length of the destination buffer, but program->blks is +probably not anywhere near that long. It's already been checked above +that BPF_PGM_SIZE(program) is less than or equal to *len, so that's +the correct value to use here to avoid either reading or writing too +much. + +I noticed this because tests/11-basic-basic_errors started failing on +musl after e797591 ("all: add seccomp_precompute() functionality"). + +Signed-off-by: Alyssa Ross +--- +Link: https://github.com/seccomp/libseccomp/pull/458 + + src/api.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/api.c b/src/api.c +index adccef3..65a277a 100644 +--- a/src/api.c ++++ b/src/api.c +@@ -786,7 +786,7 @@ API int seccomp_export_bpf_mem(const scmp_filter_ctx ctx, void *buf, + if (BPF_PGM_SIZE(program) > *len) + rc = _rc_filter(-ERANGE); + else +- memcpy(buf, program->blks, *len); ++ memcpy(buf, program->blks, BPF_PGM_SIZE(program)); + } + *len = BPF_PGM_SIZE(program); + +-- +2.47.0 + diff --git a/pkgs/by-name/li/libseccomp/package.nix b/pkgs/by-name/li/libseccomp/package.nix index a06233a88a64..edc8f5a17666 100644 --- a/pkgs/by-name/li/libseccomp/package.nix +++ b/pkgs/by-name/li/libseccomp/package.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { hash = "sha256-g7YIUjLRWIw3ncm5yuR7s3QHzyYubnSZPGG6ctKnhNw="; }; + patches = [ + ./oob-read.patch + ]; + outputs = [ "out" "lib" @@ -30,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gperf ]; buildInputs = [ getopt ]; - patchPhase = '' + postPatch = '' patchShebangs . ''; From 74e976c4c6f2494bc62070fe90f64e58fb1971e6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Feb 2025 13:50:11 +0100 Subject: [PATCH 0391/1107] sqlite: backport patch to resolve regression in 3.48.0 Unblocks the test suite of nodejs and probably other packages. --- .../sqlite/3.48.0-fk-conflict-handling.patch | 16 ++++++++++++++++ pkgs/development/libraries/sqlite/default.nix | 5 +++++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/sqlite/3.48.0-fk-conflict-handling.patch diff --git a/pkgs/development/libraries/sqlite/3.48.0-fk-conflict-handling.patch b/pkgs/development/libraries/sqlite/3.48.0-fk-conflict-handling.patch new file mode 100644 index 000000000000..6e3f58a7212d --- /dev/null +++ b/pkgs/development/libraries/sqlite/3.48.0-fk-conflict-handling.patch @@ -0,0 +1,16 @@ +diff --git a/sqlite3.c b/sqlite3.c +index 80433f6..7c234f6 100644 +--- a/sqlite3.c ++++ b/sqlite3.c +@@ -231721,6 +231721,11 @@ static int sessionChangesetApply( + } + } + ++ { ++ int rc2 = sqlite3_exec(db, "PRAGMA defer_foreign_keys = 0", 0, 0, 0); ++ if( rc==SQLITE_OK ) rc = rc2; ++ } ++ + if( (flags & SQLITE_CHANGESETAPPLY_NOSAVEPOINT)==0 ){ + if( rc==SQLITE_OK ){ + rc = sqlite3_exec(db, "RELEASE changeset_apply", 0, 0, 0); diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 670fad6e538d..6a1f0f622be4 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -34,6 +34,11 @@ stdenv.mkDerivation rec { # Can be removed with the next release. # Test: pkgsStatic.gnupg ./Libs.private.patch + + # https://sqlite.org/forum/forumpost/00f3aab3d3be9690 + # https://sqlite.org/src/info/d7c07581 + # TODO: Remove in 3.49.0 + ./3.48.0-fk-conflict-handling.patch ]; outputs = [ "bin" "dev" "man" "doc" "out" ]; From 831628ea20ecd0eefeb880deaaf5164dbcf1862e Mon Sep 17 00:00:00 2001 From: David McFarland Date: Thu, 13 Feb 2025 09:43:12 -0400 Subject: [PATCH 0392/1107] python3Packages.clr-loader: fix build NuGet.targets(174,5): error : '0.2.7.post0' is not a valid version string. (Parameter 'value') Fixes: 91df8eec762aa81eb0aff58e7f94ac3dfe8f37b6 --- pkgs/development/python-modules/clr-loader/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/clr-loader/default.nix b/pkgs/development/python-modules/clr-loader/default.nix index b0921179df4b..d20dcaa51e2a 100644 --- a/pkgs/development/python-modules/clr-loader/default.nix +++ b/pkgs/development/python-modules/clr-loader/default.nix @@ -20,6 +20,11 @@ let hash = "sha256-t6iz+PuxvLu2OC2IfiHRdC1PELXqIJ5K2VVo/pfhx8Y="; }; patches = [ ./dotnet-8-upgrade.patch ]; + # This stops msbuild from picking up $version from the environment + postPatch = '' + echo '' > \ + Directory.Build.props + ''; # This buildDotnetModule is used only to get nuget sources, the actual # build is done in `buildPythonPackage` below. @@ -29,6 +34,7 @@ let version src patches + postPatch ; projectFile = [ "netfx_loader/ClrLoader.csproj" @@ -44,6 +50,7 @@ buildPythonPackage { version src patches + postPatch ; format = "pyproject"; From 513a542b4633a6feb2c4e6c41f7c379155fb5e0e Mon Sep 17 00:00:00 2001 From: Fede Barcelona Date: Thu, 19 Dec 2024 16:22:57 +0100 Subject: [PATCH 0393/1107] tfproviderdocs: init at 0.12.1 --- pkgs/by-name/tf/tfproviderdocs/package.nix | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 pkgs/by-name/tf/tfproviderdocs/package.nix diff --git a/pkgs/by-name/tf/tfproviderdocs/package.nix b/pkgs/by-name/tf/tfproviderdocs/package.nix new file mode 100644 index 000000000000..bf6a8db3482e --- /dev/null +++ b/pkgs/by-name/tf/tfproviderdocs/package.nix @@ -0,0 +1,46 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, +}: +buildGoModule rec { + pname = "tfproviderdocs"; + version = "0.12.1"; + + src = fetchFromGitHub { + owner = "bflad"; + repo = "tfproviderdocs"; + tag = "v${version}"; + hash = "sha256-KCkohIGkh6sg/e0qBi90hMqh/XQQNCBF6Di6V2gxqak="; + }; + + vendorHash = "sha256-fSb1C2W29zF6ygiIg6iq19A4B6ensZLqyPD5MhQ5ec8="; + + ldflags = [ + "-s" + "-w" + "-X github.com/bflad/tfproviderdocs/version.Version=${version}" + "-X github.com/bflad/tfproviderdocs/version.VersionPrerelease=" + ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + doInstallCheck = true; + versionCheckProgramArg = "version"; + + meta = with lib; { + description = "Terraform Provider Documentation Tool"; + license = licenses.mpl20; + longDescription = '' + tfproviderdocs is an open-source tool for validating the documentation of Terraform providers. + It automates the checking of documentation based on the provider's code specifications and configurations. + This helps developers maintain consistent and up-to-date documentation. + ''; + homepage = "https://github.com/bflad/tfproviderdocs"; + maintainers = with maintainers; [ tembleking ]; + mainProgram = "tfproviderdocs"; + }; +} From af221d3cc83ceab8d9ae0e59fa251cd7b79036db Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 13 Feb 2025 15:10:16 +0100 Subject: [PATCH 0394/1107] libiodbc: disable libodbc Disable creation of broken libodbc symlink. Closes: #381423 --- pkgs/development/libraries/libiodbc/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix index fea90d439c24..fcf1cdec33b3 100644 --- a/pkgs/development/libraries/libiodbc/default.nix +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-OJizLQeWE2D28s822zYDa3GaIw5HZGklioDzIkPoRfo="; }; + configureFlags = [ + "--disable-libodbc" + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals useGTK [ gtk2 ] ++ lib.optional stdenv.hostPlatform.isDarwin Carbon; From 7390bc405af2dbc15b6c24fd9057a7fee34b5596 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Feb 2025 17:23:01 +0100 Subject: [PATCH 0395/1107] spidermonkey: pin icu75 --- pkgs/development/interpreters/spidermonkey/common.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix index f4f0024107ba..5b2917393637 100644 --- a/pkgs/development/interpreters/spidermonkey/common.nix +++ b/pkgs/development/interpreters/spidermonkey/common.nix @@ -14,20 +14,16 @@ perl, pkg-config, python3, - python39, python311, rust-cbindgen, rustPlatform, rustc, which, zip, - autoconf213, - yasm, xcbuild, # runtime - icu, - icu67, + icu75, nspr, readline, zlib, @@ -96,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: rec { buildInputs = [ - icu + icu75 nspr readline zlib From d5a328b021cc62ce3baecb3895b3a83e77d16c31 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 13 Feb 2025 13:36:57 -0300 Subject: [PATCH 0396/1107] cosmic-osd: add updateScript --- pkgs/by-name/co/cosmic-osd/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix index 005826ba40b6..08f238b40665 100644 --- a/pkgs/by-name/co/cosmic-osd/package.nix +++ b/pkgs/by-name/co/cosmic-osd/package.nix @@ -7,6 +7,7 @@ pulseaudio, udev, wayland, + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -33,6 +34,15 @@ rustPlatform.buildRustPackage rec { env.POLKIT_AGENT_HELPER_1 = "/run/wrappers/bin/polkit-agent-helper-1"; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; + meta = with lib; { homepage = "https://github.com/pop-os/cosmic-osd"; description = "OSD for the COSMIC Desktop Environment"; From eee668ebffdecc26cf616df39e746aa940de9af0 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 13 Feb 2025 13:40:07 -0300 Subject: [PATCH 0397/1107] cosmic-osd: 1.0.0-alpha.2 -> 1.0.0-alpha.5.1 --- pkgs/by-name/co/cosmic-osd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix index 08f238b40665..9062b3843d60 100644 --- a/pkgs/by-name/co/cosmic-osd/package.nix +++ b/pkgs/by-name/co/cosmic-osd/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "cosmic-osd"; - version = "1.0.0-alpha.2"; + version = "1.0.0-alpha.5.1"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-osd"; rev = "epoch-${version}"; - hash = "sha256-JDdVFNTJI9O88lLKB1esJE4sk7ZZnTMilQRZSAgnTqs="; + hash = "sha256-a5wzCHfp+dhtEkXsJOeEs2ZkmooSWIDGymeAdrXKE+U="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Db1a1FusUdO7rQb0jfznaFNaJjdS9XSDGCMuzV1D79A="; + cargoHash = "sha256-hJC0t8R+cdPWzdpxHA+j7en4IrhZXt5LM3S2V6/bps0="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ From 0184c903f20791e3be5204d0adf07fbded475bdb Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 13 Feb 2025 13:41:25 -0300 Subject: [PATCH 0398/1107] cosmic-osd: use `libcosmicAppHook` --- pkgs/by-name/co/cosmic-osd/package.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix index 9062b3843d60..e61913a07dee 100644 --- a/pkgs/by-name/co/cosmic-osd/package.nix +++ b/pkgs/by-name/co/cosmic-osd/package.nix @@ -2,11 +2,9 @@ lib, fetchFromGitHub, rustPlatform, - pkg-config, - libxkbcommon, + libcosmicAppHook, pulseaudio, udev, - wayland, nix-update-script, }: @@ -24,11 +22,10 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-hJC0t8R+cdPWzdpxHA+j7en4IrhZXt5LM3S2V6/bps0="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ libcosmicAppHook ]; + buildInputs = [ - libxkbcommon pulseaudio - wayland udev ]; From d052af6b3bb9bfe0114e97a3f89457b269166faf Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 13 Feb 2025 13:42:34 -0300 Subject: [PATCH 0399/1107] cosmic-osd: remove `with lib` from meta --- pkgs/by-name/co/cosmic-osd/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix index e61913a07dee..19e8e36e2af6 100644 --- a/pkgs/by-name/co/cosmic-osd/package.nix +++ b/pkgs/by-name/co/cosmic-osd/package.nix @@ -40,12 +40,12 @@ rustPlatform.buildRustPackage rec { ]; }; - meta = with lib; { + meta = { homepage = "https://github.com/pop-os/cosmic-osd"; description = "OSD for the COSMIC Desktop Environment"; mainProgram = "cosmic-osd"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ nyabinary ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ nyabinary ]; + platforms = lib.platforms.linux; }; } From 5f4d0356539ef1758a7e8b6040d52a590b8c9dae Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 13 Feb 2025 13:43:28 -0300 Subject: [PATCH 0400/1107] cosmic-osd: add HeitorAugustoLN to maintainers --- pkgs/by-name/co/cosmic-osd/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix index 19e8e36e2af6..10d5475daba8 100644 --- a/pkgs/by-name/co/cosmic-osd/package.nix +++ b/pkgs/by-name/co/cosmic-osd/package.nix @@ -45,7 +45,10 @@ rustPlatform.buildRustPackage rec { description = "OSD for the COSMIC Desktop Environment"; mainProgram = "cosmic-osd"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ nyabinary ]; + maintainers = with lib.maintainers; [ + nyabinary + HeitorAugustoLN + ]; platforms = lib.platforms.linux; }; } From 2a985d384cd6ebcbcd97c9e16ee1635aeb900817 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 13 Feb 2025 13:44:34 -0300 Subject: [PATCH 0401/1107] cosmic-osd: replace `rev` with `tag` in `fetchFromGitHub` --- pkgs/by-name/co/cosmic-osd/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix index 10d5475daba8..0d6f6ade81c7 100644 --- a/pkgs/by-name/co/cosmic-osd/package.nix +++ b/pkgs/by-name/co/cosmic-osd/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-osd"; - rev = "epoch-${version}"; + tag = "epoch-${version}"; hash = "sha256-a5wzCHfp+dhtEkXsJOeEs2ZkmooSWIDGymeAdrXKE+U="; }; From 36e10e883f13daf62835b3d230aae83434cd62f9 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Thu, 13 Feb 2025 19:53:47 +0100 Subject: [PATCH 0402/1107] nodejs_23: 23.7.0 -> 23.8.0 --- pkgs/development/web/nodejs/v23.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v23.nix b/pkgs/development/web/nodejs/v23.nix index 4929e6835a97..8e27e5e53608 100644 --- a/pkgs/development/web/nodejs/v23.nix +++ b/pkgs/development/web/nodejs/v23.nix @@ -16,8 +16,8 @@ let in buildNodejs { inherit enableNpm; - version = "23.7.0"; - sha256 = "8de192ef2fee2ee8a230dd8d0e9aee182ee9c9856ccdb5fd95188abe84f77242"; + version = "23.8.0"; + sha256 = "6ec5d54d0e8423fc5986f6efa4f661e8370659818b14f458cdc9d1b9f75d3b88"; patches = [ ./configure-emulator.patch From 8088349c28a2a9396a3653d4519734e7bae3c4dc Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 13 Feb 2025 23:26:31 +0100 Subject: [PATCH 0403/1107] python313Packages.trimesh: 4.6.1 -> 4.6.2 Changelog: https://github.com/mikedh/trimesh/releases/tag/4.6.2 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index a1ff069ce3fe..22b53464b9dd 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.6.1"; + version = "4.6.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-/uoiGFhKZnEzinDryUMwpoxZwSggV0ZPd9kqgB1vQPI="; + hash = "sha256-z7mWi1libCZhLqXK2sBV2X0Rkkf0YNdbM/T3gRd4VdY="; }; build-system = [ setuptools ]; From 4880951aea16680accaf7253577243b045542864 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 13 Feb 2025 17:55:13 -0500 Subject: [PATCH 0404/1107] yoda: move to by-name --- .../yoda/default.nix => by-name/yo/yoda/package.nix} | 10 +++++----- pkgs/top-level/all-packages.nix | 3 --- pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) rename pkgs/{development/libraries/physics/yoda/default.nix => by-name/yo/yoda/package.nix} (89%) diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/by-name/yo/yoda/package.nix similarity index 89% rename from pkgs/development/libraries/physics/yoda/default.nix rename to pkgs/by-name/yo/yoda/package.nix index 581c9b4362dd..d6eb417897c7 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/by-name/yo/yoda/package.nix @@ -4,7 +4,7 @@ fetchFromGitLab, autoreconfHook, bash, - python, + python3, root, makeWrapper, zlib, @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { hash = "sha256-sHvwgLH22fvdlh4oLjr4fzZ2WtBJMAlvr4Vxi9Xdf84="; }; - nativeBuildInputs = with python.pkgs; [ + nativeBuildInputs = with python3.pkgs; [ autoreconfHook bash cython @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { buildInputs = [ - python + python3 ] - ++ (with python.pkgs; [ + ++ (with python3.pkgs; [ numpy matplotlib ]) @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { patchShebangs . substituteInPlace pyext/yoda/plotting/script_generator.py \ - --replace '/usr/bin/env python' '${python.interpreter}' + --replace '/usr/bin/env python' '${python3.interpreter}' ''; postInstall = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1fad5c7dcd1..d9e0ac03ab52 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17422,9 +17422,6 @@ with pkgs; imagemagick = graphicsmagick-imagemagick-compat; }; - yoda = callPackage ../development/libraries/physics/yoda { - python = python3; - }; yoda-with-root = lowPrio (yoda.override { withRootSupport = true; }); diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 856f229a15d8..bf8346e038fe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18597,7 +18597,7 @@ self: super: with self; { yfinance = callPackage ../development/python-modules/yfinance { }; - yoda = toPythonModule (pkgs.yoda.override { inherit python; }); + yoda = toPythonModule (pkgs.yoda.override { python3 = python; }); yolink-api = callPackage ../development/python-modules/yolink-api { }; From e763d4a526c6df45f4f25ebd7282f94367e6866b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 13 Feb 2025 18:03:10 -0500 Subject: [PATCH 0405/1107] yoda: 2.0.2 -> 2.0.3 --- pkgs/by-name/yo/yoda/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/yo/yoda/package.nix b/pkgs/by-name/yo/yoda/package.nix index d6eb417897c7..838eb0733065 100644 --- a/pkgs/by-name/yo/yoda/package.nix +++ b/pkgs/by-name/yo/yoda/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "yoda"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitLab { owner = "hepcedar"; repo = pname; rev = "yoda-${version}"; - hash = "sha256-sHvwgLH22fvdlh4oLjr4fzZ2WtBJMAlvr4Vxi9Xdf84="; + hash = "sha256-No2Lr4nmYNfFnJVpg7xYjd35g12CbQtpW9QMjM3owko="; }; nativeBuildInputs = with python3.pkgs; [ @@ -70,12 +70,12 @@ stdenv.mkDerivation rec { installCheckTarget = "check"; - meta = with lib; { + meta = { description = "Provides small set of data analysis (specifically histogramming) classes"; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; homepage = "https://yoda.hepforge.org"; changelog = "https://gitlab.com/hepcedar/yoda/-/blob/yoda-${version}/ChangeLog"; - platforms = platforms.unix; - maintainers = with maintainers; [ veprbl ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ veprbl ]; }; } From f4940c881402caefa9fec0c6ff01e78d1427a8ac Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 13 Feb 2025 18:14:46 -0500 Subject: [PATCH 0406/1107] fastjet: fix compilation --- pkgs/by-name/fa/fastjet/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/fa/fastjet/package.nix b/pkgs/by-name/fa/fastjet/package.nix index f64e8acad983..4ca40d8af55d 100644 --- a/pkgs/by-name/fa/fastjet/package.nix +++ b/pkgs/by-name/fa/fastjet/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, python ? null, withPython ? false, }: @@ -15,6 +16,13 @@ stdenv.mkDerivation rec { hash = "sha256-zBdUcb+rhla4xhg6jl6a0F1fdQbkbzISqagjCQW49qM="; }; + patches = [ + (fetchpatch { + url = "https://gitlab.com/fastjet/fastjet/-/commit/57ff0184c7cf578bbcdee3667aeaa64288cbae1a.diff"; + hash = "sha256-uz8q7s+YAmbB4oXB+wyaSLo4gWSbEEPdATGDBrxT0vg="; + }) + ]; + postPatch = '' patchShebangs --build fastjet-config.in ''; From 01137327f6ca517b1a4cff8b93b0b9397e4c56f7 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sat, 8 Feb 2025 20:49:17 +0100 Subject: [PATCH 0407/1107] mokuro: 0.2.1 -> 0.2.2 --- pkgs/by-name/mo/mokuro/package.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/mo/mokuro/package.nix b/pkgs/by-name/mo/mokuro/package.nix index d1b14f45c289..139f1ad7e06f 100644 --- a/pkgs/by-name/mo/mokuro/package.nix +++ b/pkgs/by-name/mo/mokuro/package.nix @@ -6,19 +6,17 @@ python3Packages.buildPythonApplication rec { pname = "mokuro"; - version = "0.2.1"; + version = "0.2.2"; pyproject = true; src = fetchFromGitHub { owner = "kha-white"; repo = "mokuro"; - rev = "v${version}"; - hash = "sha256-+hcc3spbpktavqJ8q4kuQFpkm0PYIru6UdpkU7L8XI4="; + tag = "v${version}"; + hash = "sha256-cdbkculYPPWCSqBufpgt4EU3ne6KU2Dxk0xsvkdMZHA="; fetchSubmodules = true; }; - pythonRelaxDeps = [ "torchvision" ]; - build-system = with python3Packages; [ setuptools-scm ]; dependencies = with python3Packages; [ @@ -45,6 +43,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = { + changelog = "https://github.com/kha-white/mokuro/releases/tag/v${version}"; description = "Read Japanese manga inside browser with selectable text"; homepage = "https://github.com/kha-white/mokuro"; license = lib.licenses.gpl3Only; From 72dd50b0ee7a993be91dc428ef8e1de7f56ef5a9 Mon Sep 17 00:00:00 2001 From: nayeko Date: Thu, 30 Jan 2025 22:10:39 +0800 Subject: [PATCH 0408/1107] sipp: 3.6.1 -> 3.7.3-unstable-2025-01-22 --- pkgs/by-name/si/sipp/package.nix | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/si/sipp/package.nix b/pkgs/by-name/si/sipp/package.nix index 7ad501f87bdb..3f715baabcee 100644 --- a/pkgs/by-name/si/sipp/package.nix +++ b/pkgs/by-name/si/sipp/package.nix @@ -1,30 +1,27 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, ncurses, libpcap, cmake, openssl, - git, lksctp-tools, }: -stdenv.mkDerivation rec { - version = "3.6.1"; +stdenv.mkDerivation (finalAttrs: { pname = "sipp"; + version = "3.7.3-unstable-2025-01-22"; - src = fetchurl { - url = "https://github.com/SIPp/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-alYOg6/5gvMx3byt+zvVMMWJbNW3V91utoITPMhg7LE="; + src = fetchFromGitHub { + owner = "SIPp"; + repo = "sipp"; + rev = "464cf74c7321069b51c10f0c37f19ba16c2e7138"; + hash = "sha256-mloeBKgDXmsa/WAUhlDsgNdhK8dpisGf3ti5UQQchJ8="; + leaveDotGit = true; }; - postPatch = '' - cp version.h src/version.h - ''; - cmakeFlags = [ - "-DUSE_GSL=1" "-DUSE_PCAP=1" "-DUSE_SSL=1" "-DUSE_SCTP=${if stdenv.hostPlatform.isLinux then "1" else "0"}" @@ -32,23 +29,24 @@ stdenv.mkDerivation rec { # file RPATH_CHANGE could not write new RPATH "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; + enableParallelBuilding = true; nativeBuildInputs = [ cmake - git ]; + buildInputs = [ ncurses libpcap openssl ] ++ lib.optional (stdenv.hostPlatform.isLinux) lksctp-tools; - meta = with lib; { + meta = { homepage = "http://sipp.sf.net"; description = "SIPp testing tool"; mainProgram = "sipp"; - license = licenses.gpl3; - platforms = platforms.unix; + license = lib.licenses.gpl3; + platforms = lib.platforms.unix; }; -} +}) From 34cfba36429056072972a0f12a7470375cc8eeaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Thu, 13 Feb 2025 22:34:52 -0500 Subject: [PATCH 0409/1107] unixcw: cleanup, fix license --- pkgs/applications/radio/unixcw/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/radio/unixcw/default.nix b/pkgs/applications/radio/unixcw/default.nix index 8565b691802d..e1fbfe65ec9a 100644 --- a/pkgs/applications/radio/unixcw/default.nix +++ b/pkgs/applications/radio/unixcw/default.nix @@ -11,23 +11,28 @@ mkDerivation rec { pname = "unixcw"; version = "3.5.1"; + src = fetchurl { url = "mirror://sourceforge/unixcw/unixcw_${version}.orig.tar.gz"; - sha256 = "5f3aacd8a26e16e6eff437c7ae1e9b389956fb137eeb3de24670ce05de479e7a"; + hash = "sha256-Xzqs2KJuFubv9DfHrh6bOJlW+xN+6z3iRnDOBd5Hnno="; }; + patches = [ ./remove-use-of-dlopen.patch ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libpulseaudio alsa-lib qtbase ]; + CFLAGS = "-lasound -lpulse-simple"; - meta = with lib; { - description = "sound characters as Morse code on the soundcard or console speaker"; + meta = { + description = "Sound characters as Morse code on the soundcard or console speaker"; longDescription = '' unixcw is a project providing libcw library and a set of programs using the library: cw, cwgen, cwcp and xcwcp. @@ -44,8 +49,8 @@ mkDerivation rec { cw reports any errors in embedded commands ''; homepage = "https://unixcw.sourceforge.net"; - maintainers = [ maintainers.mafo ]; - license = licenses.gpl2; - platforms = platforms.linux; + maintainers = [ lib.maintainers.mafo ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; } From 296a46fa94ba07a19b1324f3ab90355dc0f3a06a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Thu, 13 Feb 2025 22:38:33 -0500 Subject: [PATCH 0410/1107] unixcw: move to by-name --- .../default.nix => by-name/un/unixcw/package.nix} | 13 ++++++++----- .../un}/unixcw/remove-use-of-dlopen.patch | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 8 insertions(+), 7 deletions(-) rename pkgs/{applications/radio/unixcw/default.nix => by-name/un/unixcw/package.nix} (92%) rename pkgs/{applications/radio => by-name/un}/unixcw/remove-use-of-dlopen.patch (100%) diff --git a/pkgs/applications/radio/unixcw/default.nix b/pkgs/by-name/un/unixcw/package.nix similarity index 92% rename from pkgs/applications/radio/unixcw/default.nix rename to pkgs/by-name/un/unixcw/package.nix index e1fbfe65ec9a..df8e8fe0469f 100644 --- a/pkgs/applications/radio/unixcw/default.nix +++ b/pkgs/by-name/un/unixcw/package.nix @@ -1,14 +1,14 @@ { lib, - mkDerivation, + stdenv, fetchurl, libpulseaudio, alsa-lib, pkg-config, - qtbase, + qt5, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "unixcw"; version = "3.5.1"; @@ -21,12 +21,15 @@ mkDerivation rec { ./remove-use-of-dlopen.patch ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + qt5.wrapQtAppsHook + ]; buildInputs = [ libpulseaudio alsa-lib - qtbase + qt5.qtbase ]; CFLAGS = "-lasound -lpulse-simple"; diff --git a/pkgs/applications/radio/unixcw/remove-use-of-dlopen.patch b/pkgs/by-name/un/unixcw/remove-use-of-dlopen.patch similarity index 100% rename from pkgs/applications/radio/unixcw/remove-use-of-dlopen.patch rename to pkgs/by-name/un/unixcw/remove-use-of-dlopen.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a58cf1edb0c..274a3ad66cdc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17979,8 +17979,6 @@ with pkgs; unityhub = callPackage ../development/tools/unityhub { }; - unixcw = libsForQt5.callPackage ../applications/radio/unixcw { }; - vaultenv = haskell.lib.justStaticExecutables haskellPackages.vaultenv; vaultwarden = callPackage ../tools/security/vaultwarden { From 4d029d1cc02c90be76a370d512e8395e4c95bf27 Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Thu, 13 Feb 2025 22:50:02 -0500 Subject: [PATCH 0411/1107] python3Packages.python-nomad: modernize Move to fetchFromGitHub, add passthru.updateScript, and remove with lib; Signed-off-by: Ethan Carter Edwards --- .../python-modules/python-nomad/default.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/python-nomad/default.nix b/pkgs/development/python-modules/python-nomad/default.nix index e504c4c2896d..ec1fa7f51f21 100644 --- a/pkgs/development/python-modules/python-nomad/default.nix +++ b/pkgs/development/python-modules/python-nomad/default.nix @@ -1,10 +1,11 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, requests, pythonOlder, + nix-update-script, }: buildPythonPackage rec { @@ -14,10 +15,11 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; - src = fetchPypi { - pname = "python_nomad"; - inherit version; - hash = "sha256-U+bZ7G9mtnKunW0DWRokvi2LVFDdf9vhADgxy5t3+Ec="; + src = fetchFromGitHub { + owner = "jrxfive"; + repo = "python-nomad"; + tag = version; + hash = "sha256-tLS463sYVlOr2iZSgSkd4pHUVCtiIPJ3L8+9omlX4NY="; }; build-system = [ setuptools ]; @@ -29,11 +31,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "nomad" ]; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Python client library for Hashicorp Nomad"; homepage = "https://github.com/jrxFive/python-nomad"; changelog = "https://github.com/jrxFive/python-nomad/blob/${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ xbreak ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ xbreak ]; }; } From 6288f880889a22e30696302d55b8e1e0ec4f68f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Thu, 13 Feb 2025 22:41:50 -0500 Subject: [PATCH 0412/1107] unixcw: build cwcp --- pkgs/by-name/un/unixcw/package.nix | 13 ++++++++++++ pkgs/by-name/un/unixcw/unixcw-3.6-tinfo.patch | 20 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/by-name/un/unixcw/unixcw-3.6-tinfo.patch diff --git a/pkgs/by-name/un/unixcw/package.nix b/pkgs/by-name/un/unixcw/package.nix index df8e8fe0469f..fc169b90d32f 100644 --- a/pkgs/by-name/un/unixcw/package.nix +++ b/pkgs/by-name/un/unixcw/package.nix @@ -6,6 +6,8 @@ alsa-lib, pkg-config, qt5, + ncurses, + autoreconfHook, }: stdenv.mkDerivation rec { @@ -19,9 +21,19 @@ stdenv.mkDerivation rec { patches = [ ./remove-use-of-dlopen.patch + + # fix pkg-config searching for ncurses + # yoinked from gentoo (https://gitweb.gentoo.org/repo/gentoo.git/tree/media-radio/unixcw/files/unixcw-3.6-tinfo.patch), with modifications + ./unixcw-3.6-tinfo.patch ]; + postPatch = '' + substituteInPlace src/cwcp/Makefile.am \ + --replace-fail '-lcurses' '-lncurses' + ''; + nativeBuildInputs = [ + autoreconfHook pkg-config qt5.wrapQtAppsHook ]; @@ -30,6 +42,7 @@ stdenv.mkDerivation rec { libpulseaudio alsa-lib qt5.qtbase + ncurses ]; CFLAGS = "-lasound -lpulse-simple"; diff --git a/pkgs/by-name/un/unixcw/unixcw-3.6-tinfo.patch b/pkgs/by-name/un/unixcw/unixcw-3.6-tinfo.patch new file mode 100644 index 000000000000..01038fa1fdd8 --- /dev/null +++ b/pkgs/by-name/un/unixcw/unixcw-3.6-tinfo.patch @@ -0,0 +1,20 @@ +--- a/configure.ac 2017-03-07 13:31:46.074580930 +0100 ++++ b/configure.ac 2017-03-07 13:33:25.640924331 +0100 +@@ -347,7 +347,7 @@ + AC_DEFINE([LIBCW_WITH_PULSEAUDIO], [1], [Define as 1 if your build machine can support PulseAudio.]) + fi + +- ++PKG_PROG_PKG_CONFIG + + if test "$enable_cwcp" = "no" ; then + WITH_CWCP='no' +@@ -355,6 +355,7 @@ + AC_CHECK_LIB(curses, initscr) +- if test $ac_cv_lib_curses_initscr = 'yes' ; then ++ if true ; then + WITH_CWCP='yes' ++ PKG_CHECK_MODULES(ncurses, ncurses, [NCURSES_LIB="$ncurses_LIBS"], ) + else + WITH_CWCP='no' + AC_MSG_WARN([Cannot find libcurses - unable to build cwcp]) From a8d4b83956479f183cfb7b086f57d7a8c41179d0 Mon Sep 17 00:00:00 2001 From: Tim Quelch Date: Fri, 14 Feb 2025 13:38:18 +1100 Subject: [PATCH 0413/1107] bash-my-aws: 2020-01-11 -> 2025-01-22 and refactor Pull to latest commit and refactor the derivation. --- .../0001-update-paths-to-placeholders.patch | 39 +++++++ .../ba/bash-my-aws/0002-fix-tests.patch | 52 +++++++++ pkgs/by-name/ba/bash-my-aws/package.nix | 105 ++++++++++-------- 3 files changed, 151 insertions(+), 45 deletions(-) create mode 100644 pkgs/by-name/ba/bash-my-aws/0001-update-paths-to-placeholders.patch create mode 100644 pkgs/by-name/ba/bash-my-aws/0002-fix-tests.patch diff --git a/pkgs/by-name/ba/bash-my-aws/0001-update-paths-to-placeholders.patch b/pkgs/by-name/ba/bash-my-aws/0001-update-paths-to-placeholders.patch new file mode 100644 index 000000000000..b853da3b1c73 --- /dev/null +++ b/pkgs/by-name/ba/bash-my-aws/0001-update-paths-to-placeholders.patch @@ -0,0 +1,39 @@ +diff --git a/bin/bma b/bin/bma +index 6144842..26965ce 100755 +--- a/bin/bma ++++ b/bin/bma +@@ -13,7 +13,7 @@ + # + # Assumes you have installed bash-my-aws to standard location + +-for f in "${BMA_HOME:-$HOME/.bash-my-aws}"/lib/*-functions; do source $f; done ++for f in @out@/lib/*-functions; do source $f; done + + # Disable awcli client side pager + # +diff --git a/scripts/build b/scripts/build +index 54a786b..37a05df 100755 +--- a/scripts/build ++++ b/scripts/build +@@ -41,7 +41,7 @@ funcs_after_bma=$(compgen -A function) + exclusions=('region') + + for fnc in $(echo "${funcs_before_bma}" "${funcs_after_bma}" "${exclusions}" | tr ' ' '\n' | LC_ALL=C sort | uniq -u); do +- echo "alias $fnc='\${BMA_HOME:-\$HOME/.bash-my-aws}/bin/bma $fnc'" >> "$aliases_destination" ++ echo "alias $fnc='@out@/bin/bma $fnc'" >> "$aliases_destination" + done; + + +diff --git a/scripts/build-completions b/scripts/build-completions +index 2b5d49b..bf86af6 100755 +--- a/scripts/build-completions ++++ b/scripts/build-completions +@@ -6,7 +6,7 @@ cat < $out/bin/bma-init < Date: Fri, 14 Feb 2025 00:06:12 -0600 Subject: [PATCH 0414/1107] goverlay: move to `pkgs/by-name` --- .../goverlay/default.nix => by-name/go/goverlay/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 4 deletions(-) rename pkgs/{tools/graphics/goverlay/default.nix => by-name/go/goverlay/package.nix} (100%) diff --git a/pkgs/tools/graphics/goverlay/default.nix b/pkgs/by-name/go/goverlay/package.nix similarity index 100% rename from pkgs/tools/graphics/goverlay/default.nix rename to pkgs/by-name/go/goverlay/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5745a474153..77a80db8782c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3487,10 +3487,6 @@ with pkgs; gdown = with python3Packages; toPythonApplication gdown; - goverlay = qt6Packages.callPackage ../tools/graphics/goverlay { - inherit (qt6Packages) libqtpas wrapQtAppsHook; - }; - gpt4all-cuda = gpt4all.override { cudaSupport = true; }; From dd8b25abd71a7d0813d8da446ca00fe3c0fd3480 Mon Sep 17 00:00:00 2001 From: RoGreat Date: Fri, 14 Feb 2025 00:06:33 -0600 Subject: [PATCH 0415/1107] maintainers: add RoGreat --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/by-name/go/goverlay/package.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5570d588f74a..b8f67fd8ffd4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19948,6 +19948,12 @@ githubId = 69053978; name = "rogarb"; }; + RoGreat = { + email = "roguegreat@gmail.com"; + github = "RoGreat"; + githubId = 64620440; + name = "RoGreat"; + }; rohanssrao = { email = "rohanssrao@gmail.com"; github = "rohanssrao"; diff --git a/pkgs/by-name/go/goverlay/package.nix b/pkgs/by-name/go/goverlay/package.nix index b59d5de8ac3c..ad6550692c68 100644 --- a/pkgs/by-name/go/goverlay/package.nix +++ b/pkgs/by-name/go/goverlay/package.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { description = "Opensource project that aims to create a Graphical UI to help manage Linux overlays"; homepage = "https://github.com/benjamimgois/goverlay"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ RoGreat ]; platforms = platforms.linux; mainProgram = "goverlay"; }; From bbfc04a05117929f467fd5fd287d015f57ab9ecc Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 14 Feb 2025 06:33:37 +0000 Subject: [PATCH 0416/1107] libei: 1.3.0 -> 1.4.0 Changes: https://gitlab.freedesktop.org/libinput/libei/-/releases/1.4.0 --- pkgs/by-name/li/libei/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libei/package.nix b/pkgs/by-name/li/libei/package.nix index 654f9ba46255..9dc3f0df4f30 100644 --- a/pkgs/by-name/li/libei/package.nix +++ b/pkgs/by-name/li/libei/package.nix @@ -23,14 +23,14 @@ let in stdenv.mkDerivation rec { pname = "libei"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "libinput"; repo = "libei"; rev = version; - hash = "sha256-yKeMHgR3s83xwoXgLW28ewF2tvs6l0Hq0cCAroCgq0U="; + hash = "sha256-lSrIC93Cke90/Xc8dqd3e/TU32tflYHYqc5fE8wglBI="; }; buildInputs = [ From eb845bbbd29ff2f05f8a47f51304dfaa834f959e Mon Sep 17 00:00:00 2001 From: RoGreat Date: Fri, 14 Feb 2025 00:09:40 -0600 Subject: [PATCH 0417/1107] goverlay: qt6Packages --- pkgs/by-name/go/goverlay/package.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/go/goverlay/package.nix b/pkgs/by-name/go/goverlay/package.nix index ad6550692c68..db9051fe10b4 100644 --- a/pkgs/by-name/go/goverlay/package.nix +++ b/pkgs/by-name/go/goverlay/package.nix @@ -12,17 +12,15 @@ libGL, libGLU, libnotify, - libqtpas, libX11, nix-update-script, polkit, procps, - qt6, + qt6Packages, systemd, util-linux, vulkan-tools, which, - wrapQtAppsHook, }: stdenv.mkDerivation rec { @@ -54,15 +52,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ fpc lazarus-qt6 - wrapQtAppsHook + qt6Packages.wrapQtAppsHook ]; buildInputs = [ libGL libGLU - libqtpas + qt6Packages.libqtpas libX11 - qt6.qtbase + qt6Packages.qtbase ]; NIX_LDFLAGS = "-lGLU -rpath ${lib.makeLibraryPath buildInputs}"; @@ -89,10 +87,6 @@ stdenv.mkDerivation rec { which ] }" - - # Force xcb since libqt5pas doesn't support Wayland - # See https://github.com/benjamimgois/goverlay/issues/107 - "--set QT_QPA_PLATFORM xcb" ]; passthru.updateScript = nix-update-script { }; From 8a5a751302ead877db4258fcbe4181f8bd4ff250 Mon Sep 17 00:00:00 2001 From: RoGreat Date: Fri, 14 Feb 2025 00:20:11 -0600 Subject: [PATCH 0418/1107] goverlay: link libGL --- pkgs/by-name/go/goverlay/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/go/goverlay/package.nix b/pkgs/by-name/go/goverlay/package.nix index db9051fe10b4..fe52673ef1ea 100644 --- a/pkgs/by-name/go/goverlay/package.nix +++ b/pkgs/by-name/go/goverlay/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { qt6Packages.qtbase ]; - NIX_LDFLAGS = "-lGLU -rpath ${lib.makeLibraryPath buildInputs}"; + NIX_LDFLAGS = "-lGLU -lGL -rpath ${lib.makeLibraryPath buildInputs}"; buildPhase = '' runHook preBuild From b6fe99db9f128e8f9a92da5d635b9280970549f9 Mon Sep 17 00:00:00 2001 From: RoGreat Date: Fri, 14 Feb 2025 00:55:34 -0600 Subject: [PATCH 0419/1107] goverlay: distro info --- pkgs/by-name/go/goverlay/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/go/goverlay/package.nix b/pkgs/by-name/go/goverlay/package.nix index fe52673ef1ea..4e4e6f90028c 100644 --- a/pkgs/by-name/go/goverlay/package.nix +++ b/pkgs/by-name/go/goverlay/package.nix @@ -13,6 +13,7 @@ libGLU, libnotify, libX11, + lsb-release, nix-update-script, polkit, procps, @@ -46,7 +47,9 @@ stdenv.mkDerivation rec { substituteInPlace overlayunit.pas \ --replace-fail '/usr/share/icons/hicolor/128x128/apps/goverlay.png' "$out/share/icons/hicolor/128x128/apps/goverlay.png" \ --replace-fail '/sbin/ip' "${lib.getExe' iproute2 "ip"}" \ - --replace-fail '/bin/bash' "${lib.getExe' bash "bash"}" + --replace-fail '/bin/bash' "${lib.getExe' bash "bash"}" \ + --replace-fail '/usr/lib/os-release' '/etc/os-release' \ + --replace-fail 'lsb_release' "${lib.getExe' lsb-release "lsb_release"} 2> /dev/null" ''; nativeBuildInputs = [ From 16507bece0d5638cf6d2b5f8d4639a1797c7b9f5 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Fri, 14 Feb 2025 16:01:07 +0800 Subject: [PATCH 0420/1107] emacsPackages.gams-ac: ignore compilation error https://hydra.nix-community.org/build/3081096 --- .../editors/emacs/elisp-packages/melpa-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 62f476dc5440..9c384a5d0812 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -1150,6 +1150,8 @@ let fxrd-mode = ignoreCompilationError super.fxrd-mode; # elisp error + gams-ac = ignoreCompilationError super.gams-ac; # need gams in PATH during compilation + # missing optional dependencies gap-mode = addPackageRequires super.gap-mode [ self.company From 367c46b91724f3eda454b56263276d625b5c7d2a Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Fri, 14 Feb 2025 16:01:33 +0800 Subject: [PATCH 0421/1107] emacsPackages.poly-gams: ignore compilation error https://hydra.nix-community.org/build/3101532 --- .../editors/emacs/elisp-packages/melpa-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 9c384a5d0812..2ed31090e106 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -1494,6 +1494,8 @@ let # https://github.com/polymode/poly-R/issues/41 poly-R = addPackageRequires super.poly-R [ self.ess ]; + poly-gams = ignoreCompilationError super.poly-gams; # need gams in PATH during compilation + # missing optional dependencies: direx e2wm yaol, yaol not on any ELPA pophint = ignoreCompilationError super.pophint; From f28ba247de705663f0d8cb3bfda5aa9274c1ba03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 09:21:03 +0000 Subject: [PATCH 0422/1107] filebeat8: 8.17.1 -> 8.17.2 --- pkgs/by-name/fi/filebeat8/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fi/filebeat8/package.nix b/pkgs/by-name/fi/filebeat8/package.nix index b9ae646a3a87..27fdc4a54142 100644 --- a/pkgs/by-name/fi/filebeat8/package.nix +++ b/pkgs/by-name/fi/filebeat8/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "filebeat"; - version = "8.17.1"; + version = "8.17.2"; src = fetchFromGitHub { owner = "elastic"; repo = "beats"; tag = "v${version}"; - hash = "sha256-I245j8Atnp7r0ZL6Lfew0I4uluSodeNnYWFs3x/JYUc="; + hash = "sha256-Gk+F4OOe/n3SdiycKwJe4nPwfEKAVesKj5Fmvbe9Q5U="; }; - vendorHash = "sha256-eGvpeik7kU/OC1bI4hjavEyF7GvQWXHsNlF+1Smn22c="; + vendorHash = "sha256-p2Bm2MM85BFI/ePw+ZY90UgqeFKbozGvFvsjY6M82ts="; subPackages = [ "filebeat" ]; From b5befb85475250e7849341cc2d10233415c2a528 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 14 Feb 2025 10:00:07 +0100 Subject: [PATCH 0423/1107] llvm_18: fix hash of glibc fix Closes #381739 As mentioned in this ticket, `fetchpatch2` doesn't seem stable without `?full_index=1`. --- pkgs/development/compilers/llvm/common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index a40ffd4044b4..f37539b339dc 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -494,9 +494,9 @@ let (lib.versionAtLeast metadata.release_version "17" && lib.versionOlder metadata.release_version "19") [ # Fixes test-suite on glibc 2.40 (https://github.com/llvm/llvm-project/pull/100804) - (fetchpatch2 { + (fetchpatch { url = "https://github.com/llvm/llvm-project/commit/1e8df9e85a1ff213e5868bd822877695f27504ad.patch"; - hash = "sha256-EX+PYGicK73lsL/J0kSZ4S5y1/NHIclBddhsnV6NPPI="; + hash = "sha256-mvBlG2RxpZPFnPI7jvCMz+Fc8JuM15Ye3th1FVZMizE="; stripLen = 1; }) ] From 27c658d7a9263d387d80a4b568f09a63d3b3c6be Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 14 Feb 2025 11:09:49 +0100 Subject: [PATCH 0424/1107] python313Packagea.trimesh: modernize --- .../python-modules/trimesh/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 22b53464b9dd..7d8db0b0ad66 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, pytestCheckHook, pythonOlder, @@ -16,9 +16,11 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-z7mWi1libCZhLqXK2sBV2X0Rkkf0YNdbM/T3gRd4VdY="; + src = fetchFromGitHub { + owner = "mikedh"; + repo = "trimesh"; + tag = version; + hash = "sha256-ttOawg1mdGkV1Pi0CmFR4VtmZ9MUxPed0KoXLwlbUPE="; }; build-system = [ setuptools ]; @@ -39,13 +41,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "trimesh" ]; - meta = with lib; { + meta = { description = "Python library for loading and using triangular meshes"; homepage = "https://trimesh.org/"; changelog = "https://github.com/mikedh/trimesh/releases/tag/${version}"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "trimesh"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ gebner pbsds ]; From ec3f5a021bc12d32bee8f33828f7daa20a9d24c6 Mon Sep 17 00:00:00 2001 From: qbisi Date: Tue, 4 Feb 2025 16:06:47 +0800 Subject: [PATCH 0425/1107] petsc: simplify configurePhase --- pkgs/by-name/pe/petsc/package.nix | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 3db7a522fff6..5645677df27d 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -47,7 +47,9 @@ stdenv.mkDerivation rec { lapack ] ++ lib.optional hdf5-support hdf5 ++ lib.optional petsc-withp4est p4est ++ lib.optionals withParmetis [ metis parmetis ]; - prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + postPatch = '' + patchShebangs ./lib/petsc/bin + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace config/install.py \ --replace /usr/bin/install_name_tool ${cctools}/bin/install_name_tool ''; @@ -67,6 +69,15 @@ stdenv.mkDerivation rec { "--with-metis-dir=${metis}" "--with-parmetis=1" "--with-parmetis-dir=${parmetis}" + ] ++ lib.optionals petsc-withp4est [ + "--with-p4est=1" + "--with-zlib-include=${zlib.dev}/include" + "--with-zlib-lib=[-L${zlib}/lib,-lz]" + ] ++ lib.optionals hdf5-support [ + "--with-hdf5=1" + "--with-hdf5-fortran-bindings=1" + "--with-hdf5-include=${hdf5.dev}/include" + "--with-hdf5-lib=[-L${hdf5}/lib,-lhdf5]" ] ++ lib.optionals petsc-optimized [ "--with-debugging=0" "COPTFLAGS=-O3" @@ -74,22 +85,6 @@ stdenv.mkDerivation rec { "CXXOPTFLAGS=-O3" "CXXFLAGS=-O3" ]; - preConfigure = '' - patchShebangs ./lib/petsc/bin - '' + lib.optionalString petsc-withp4est '' - configureFlagsArray+=( - "--with-p4est=1" - "--with-zlib-include=${zlib.dev}/include" - "--with-zlib-lib=-L${zlib}/lib -lz" - ) - '' + lib.optionalString hdf5-support '' - configureFlagsArray+=( - "--with-hdf5=1" - "--with-hdf5-fortran-bindings=1" - "--with-hdf5-include=${hdf5.dev}/include" - "--with-hdf5-lib=-L${hdf5}/lib -lhdf5" - ) - ''; hardeningDisable = lib.optionals (!petsc-optimized) [ "fortify" From e6bda1731a4851ef920168fcc8e4e8f8cef8f441 Mon Sep 17 00:00:00 2001 From: qbisi Date: Tue, 4 Feb 2025 16:48:17 +0800 Subject: [PATCH 0426/1107] petsc: reformat with nixfmt-rfc-style --- pkgs/by-name/pe/petsc/package.nix | 97 ++++++++++++++++++------------- 1 file changed, 56 insertions(+), 41 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 5645677df27d..c83df800ca11 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -42,49 +42,64 @@ stdenv.mkDerivation rec { gfortran pkg-config ] ++ lib.optional mpiSupport mpi; - buildInputs = [ - blas - lapack - ] ++ lib.optional hdf5-support hdf5 ++ lib.optional petsc-withp4est p4est ++ lib.optionals withParmetis [ metis parmetis ]; + buildInputs = + [ + blas + lapack + ] + ++ lib.optional hdf5-support hdf5 + ++ lib.optional petsc-withp4est p4est + ++ lib.optionals withParmetis [ + metis + parmetis + ]; - postPatch = '' - patchShebangs ./lib/petsc/bin - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace config/install.py \ - --replace /usr/bin/install_name_tool ${cctools}/bin/install_name_tool - ''; + postPatch = + '' + patchShebangs ./lib/petsc/bin + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace config/install.py \ + --replace /usr/bin/install_name_tool ${cctools}/bin/install_name_tool + ''; - configureFlags = [ - "--with-blas=1" - "--with-lapack=1" - "--with-scalar-type=${petsc-scalar-type}" - "--with-precision=${petsc-precision}" - "--with-mpi=${if mpiSupport then "1" else "0"}" - ] ++ lib.optionals mpiSupport [ - "--CC=mpicc" - "--with-cxx=mpicxx" - "--with-fc=mpif90" - ] ++ lib.optionals (mpiSupport && withParmetis) [ - "--with-metis=1" - "--with-metis-dir=${metis}" - "--with-parmetis=1" - "--with-parmetis-dir=${parmetis}" - ] ++ lib.optionals petsc-withp4est [ - "--with-p4est=1" - "--with-zlib-include=${zlib.dev}/include" - "--with-zlib-lib=[-L${zlib}/lib,-lz]" - ] ++ lib.optionals hdf5-support [ - "--with-hdf5=1" - "--with-hdf5-fortran-bindings=1" - "--with-hdf5-include=${hdf5.dev}/include" - "--with-hdf5-lib=[-L${hdf5}/lib,-lhdf5]" - ] ++ lib.optionals petsc-optimized [ - "--with-debugging=0" - "COPTFLAGS=-O3" - "FOPTFLAGS=-O3" - "CXXOPTFLAGS=-O3" - "CXXFLAGS=-O3" - ]; + configureFlags = + [ + "--with-blas=1" + "--with-lapack=1" + "--with-scalar-type=${petsc-scalar-type}" + "--with-precision=${petsc-precision}" + "--with-mpi=${if mpiSupport then "1" else "0"}" + ] + ++ lib.optionals mpiSupport [ + "--CC=mpicc" + "--with-cxx=mpicxx" + "--with-fc=mpif90" + ] + ++ lib.optionals (mpiSupport && withParmetis) [ + "--with-metis=1" + "--with-metis-dir=${metis}" + "--with-parmetis=1" + "--with-parmetis-dir=${parmetis}" + ] + ++ lib.optionals petsc-withp4est [ + "--with-p4est=1" + "--with-zlib-include=${zlib.dev}/include" + "--with-zlib-lib=[-L${zlib}/lib,-lz]" + ] + ++ lib.optionals hdf5-support [ + "--with-hdf5=1" + "--with-hdf5-fortran-bindings=1" + "--with-hdf5-include=${hdf5.dev}/include" + "--with-hdf5-lib=[-L${hdf5}/lib,-lhdf5]" + ] + ++ lib.optionals petsc-optimized [ + "--with-debugging=0" + "COPTFLAGS=-O3" + "FOPTFLAGS=-O3" + "CXXOPTFLAGS=-O3" + "CXXFLAGS=-O3" + ]; hardeningDisable = lib.optionals (!petsc-optimized) [ "fortify" From 602e8d527b3277770acc30bcc6801f2889a1f07b Mon Sep 17 00:00:00 2001 From: qbisi Date: Tue, 4 Feb 2025 19:53:26 +0800 Subject: [PATCH 0427/1107] petsc: add standalone metis support --- pkgs/by-name/pe/petsc/package.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index c83df800ca11..6ad696a539cf 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -14,6 +14,7 @@ hdf5-support ? false, hdf5, metis, + withMetis ? false, parmetis, withParmetis ? false, pkg-config, @@ -27,6 +28,9 @@ # This version of PETSc does not support a non-MPI p4est build assert petsc-withp4est -> p4est.mpiSupport; +# Package parmetis depend on metis and mpi support +assert withParmetis -> (withMetis && mpiSupport); + stdenv.mkDerivation rec { pname = "petsc"; version = "3.21.4"; @@ -49,10 +53,8 @@ stdenv.mkDerivation rec { ] ++ lib.optional hdf5-support hdf5 ++ lib.optional petsc-withp4est p4est - ++ lib.optionals withParmetis [ - metis - parmetis - ]; + ++ lib.optional withMetis metis + ++ lib.optional withParmetis parmetis; postPatch = '' @@ -76,9 +78,11 @@ stdenv.mkDerivation rec { "--with-cxx=mpicxx" "--with-fc=mpif90" ] - ++ lib.optionals (mpiSupport && withParmetis) [ + ++ lib.optionals withMetis [ "--with-metis=1" "--with-metis-dir=${metis}" + ] + ++ lib.optionals withParmetis [ "--with-parmetis=1" "--with-parmetis-dir=${parmetis}" ] From f4bba88df7414956e652134e198762d619d657cc Mon Sep 17 00:00:00 2001 From: qbisi Date: Tue, 4 Feb 2025 20:10:36 +0800 Subject: [PATCH 0428/1107] petsc: add ptscotch support --- pkgs/by-name/pe/petsc/package.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 6ad696a539cf..2c29bfd2129a 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -17,6 +17,8 @@ withMetis ? false, parmetis, withParmetis ? false, + scotch, + withPtscotch ? false, pkg-config, p4est, zlib, # propagated by p4est but required by petsc @@ -31,6 +33,8 @@ assert petsc-withp4est -> p4est.mpiSupport; # Package parmetis depend on metis and mpi support assert withParmetis -> (withMetis && mpiSupport); +assert withPtscotch -> mpiSupport; + stdenv.mkDerivation rec { pname = "petsc"; version = "3.21.4"; @@ -54,7 +58,8 @@ stdenv.mkDerivation rec { ++ lib.optional hdf5-support hdf5 ++ lib.optional petsc-withp4est p4est ++ lib.optional withMetis metis - ++ lib.optional withParmetis parmetis; + ++ lib.optional withParmetis parmetis + ++ lib.optional withPtscotch scotch; postPatch = '' @@ -86,6 +91,11 @@ stdenv.mkDerivation rec { "--with-parmetis=1" "--with-parmetis-dir=${parmetis}" ] + ++ lib.optionals withPtscotch [ + "--with-ptscotch=1" + "--with-ptscotch-include=${scotch.dev}/include" + "--with-ptscotch-lib=[-L${scotch}/lib,-lptscotch,-lptesmumps,-lptscotchparmetisv3,-lptscotcherr,-lesmumps,-lscotch,-lscotcherr]" + ] ++ lib.optionals petsc-withp4est [ "--with-p4est=1" "--with-zlib-include=${zlib.dev}/include" From 0b2160ea3cbdfa033401a5716ad094b9d76aeacf Mon Sep 17 00:00:00 2001 From: qbisi Date: Tue, 4 Feb 2025 20:14:57 +0800 Subject: [PATCH 0429/1107] petsc: add scalapack and mumps support --- pkgs/by-name/pe/petsc/package.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 2c29bfd2129a..6a13227e4031 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -19,6 +19,10 @@ withParmetis ? false, scotch, withPtscotch ? false, + scalapack, + withScalapack ? false, + mumps_par, + withMumps ? false, pkg-config, p4est, zlib, # propagated by p4est but required by petsc @@ -34,6 +38,8 @@ assert petsc-withp4est -> p4est.mpiSupport; assert withParmetis -> (withMetis && mpiSupport); assert withPtscotch -> mpiSupport; +assert withScalapack -> mpiSupport; +assert withMumps -> withScalapack; stdenv.mkDerivation rec { pname = "petsc"; @@ -59,7 +65,9 @@ stdenv.mkDerivation rec { ++ lib.optional petsc-withp4est p4est ++ lib.optional withMetis metis ++ lib.optional withParmetis parmetis - ++ lib.optional withPtscotch scotch; + ++ lib.optional withPtscotch scotch + ++ lib.optional withScalapack scalapack + ++ lib.optional withMumps mumps_par; postPatch = '' @@ -96,6 +104,14 @@ stdenv.mkDerivation rec { "--with-ptscotch-include=${scotch.dev}/include" "--with-ptscotch-lib=[-L${scotch}/lib,-lptscotch,-lptesmumps,-lptscotchparmetisv3,-lptscotcherr,-lesmumps,-lscotch,-lscotcherr]" ] + ++ lib.optionals withScalapack [ + "--with-scalapack=1" + "--with-scalapack-dir=${scalapack}" + ] + ++ lib.optionals withMumps [ + "--with-mumps=1" + "--with-mumps-dir=${mumps_par}" + ] ++ lib.optionals petsc-withp4est [ "--with-p4est=1" "--with-zlib-include=${zlib.dev}/include" From ad4db6e3abc06917e8dc171f401b2ece716ce757 Mon Sep 17 00:00:00 2001 From: qbisi Date: Tue, 4 Feb 2025 19:42:47 +0800 Subject: [PATCH 0430/1107] python312Packages.petsc4py: init at 3.22.3 --- .../petsc/fix-petsc4py-install-prefix.patch | 22 ++++++++++++++ pkgs/by-name/pe/petsc/package.nix | 30 +++++++++++++++---- pkgs/top-level/python-packages.nix | 6 ++++ 3 files changed, 53 insertions(+), 5 deletions(-) create mode 100644 pkgs/by-name/pe/petsc/fix-petsc4py-install-prefix.patch diff --git a/pkgs/by-name/pe/petsc/fix-petsc4py-install-prefix.patch b/pkgs/by-name/pe/petsc/fix-petsc4py-install-prefix.patch new file mode 100644 index 000000000000..dd3a50114f07 --- /dev/null +++ b/pkgs/by-name/pe/petsc/fix-petsc4py-install-prefix.patch @@ -0,0 +1,22 @@ +diff --git a/config/BuildSystem/config/packages/petsc4py.py b/config/BuildSystem/config/packages/petsc4py.py +index 4a58243..831aa04 100644 +--- a/config/BuildSystem/config/packages/petsc4py.py ++++ b/config/BuildSystem/config/packages/petsc4py.py +@@ -37,7 +37,7 @@ class Configure(config.package.Package): + + def Install(self): + import os +- installLibPath = os.path.join(self.installDir, 'lib') ++ installLibPath = os.path.join(self.installDir, 'lib', '@PYTHON_SITEPACKAGES@') + if self.setCompilers.isDarwin(self.log): + apple = 'You may need to\n (csh/tcsh) setenv MACOSX_DEPLOYMENT_TARGET 10.X\n (sh/bash) MACOSX_DEPLOYMENT_TARGET=10.X; export MACOSX_DEPLOYMENT_TARGET\nbefore running make on PETSc' + else: +@@ -70,7 +70,7 @@ class Configure(config.package.Package): + newdir += 'NUMPY_INCLUDE="'+numpy_include+'" ' + + self.addDefine('HAVE_PETSC4PY',1) +- self.addDefine('PETSC4PY_INSTALL_PATH','"'+os.path.join(self.installdir.dir,'lib')+'"') ++ self.addDefine('PETSC4PY_INSTALL_PATH','"'+installLibPath+'"') + self.addMakeMacro('PETSC4PY','yes') + self.addMakeRule('petsc4pybuild','', \ + ['@echo "*** Building petsc4py ***"',\ diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 6a13227e4031..87009b8a8f91 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -4,7 +4,10 @@ fetchzip, cctools, gfortran, + replaceVars, python3, + python3Packages, + withPetsc4py ? false, blas, lapack, mpiSupport ? true, @@ -51,11 +54,19 @@ stdenv.mkDerivation rec { }; strictDeps = true; - nativeBuildInputs = [ - python3 - gfortran - pkg-config - ] ++ lib.optional mpiSupport mpi; + + nativeBuildInputs = + [ + python3 + gfortran + pkg-config + ] + ++ lib.optional mpiSupport mpi + ++ lib.optionals withPetsc4py [ + python3Packages.setuptools + python3Packages.cython + ]; + buildInputs = [ blas @@ -69,6 +80,14 @@ stdenv.mkDerivation rec { ++ lib.optional withScalapack scalapack ++ lib.optional withMumps mumps_par; + propagatedBuildInputs = lib.optional withPetsc4py python3Packages.numpy; + + patches = [ + (replaceVars ./fix-petsc4py-install-prefix.patch { + PYTHON_SITEPACKAGES = python3.sitePackages; + }) + ]; + postPatch = '' patchShebangs ./lib/petsc/bin @@ -86,6 +105,7 @@ stdenv.mkDerivation rec { "--with-precision=${petsc-precision}" "--with-mpi=${if mpiSupport then "1" else "0"}" ] + ++ lib.optional withPetsc4py "--with-petsc4py=1" ++ lib.optionals mpiSupport [ "--CC=mpicc" "--with-cxx=mpicxx" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b98d245a8297..85ddafd5b6fe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10342,6 +10342,12 @@ self: super: with self; { pesq = callPackage ../development/python-modules/pesq { }; + petsc4py = toPythonModule (pkgs.petsc.override { + python3 = python; + python3Packages = self; + withPetsc4py = true; + }); + pex = callPackage ../development/python-modules/pex { }; pexif = callPackage ../development/python-modules/pexif { }; From 3389354ca5c3f51eca33025f73eaf36aaa23ab31 Mon Sep 17 00:00:00 2001 From: qbisi Date: Wed, 5 Feb 2025 15:32:48 +0800 Subject: [PATCH 0431/1107] petsc: add withFullDeps option --- pkgs/by-name/pe/petsc/package.nix | 15 ++++++++------- pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 87009b8a8f91..9c6e64d6e409 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -13,25 +13,26 @@ mpiSupport ? true, mpi, # generic mpi dependency mpiCheckPhaseHook, - petsc-withp4est ? false, - hdf5-support ? false, + petsc-withp4est ? withFullDeps, + hdf5-support ? withFullDeps, hdf5, metis, - withMetis ? false, + withMetis ? withFullDeps, parmetis, - withParmetis ? false, + withParmetis ? false, # parmetis is unfree and should be enabled manualy scotch, - withPtscotch ? false, + withPtscotch ? withFullDeps, scalapack, - withScalapack ? false, + withScalapack ? withFullDeps, mumps_par, - withMumps ? false, + withMumps ? withFullDeps, pkg-config, p4est, zlib, # propagated by p4est but required by petsc petsc-optimized ? false, petsc-scalar-type ? "real", petsc-precision ? "double", + withFullDeps ? false }: # This version of PETSc does not support a non-MPI p4est build diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 85ddafd5b6fe..dbabff224391 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10346,6 +10346,8 @@ self: super: with self; { python3 = python; python3Packages = self; withPetsc4py = true; + withFullDeps = true; + petsc-optimized = true; }); pex = callPackage ../development/python-modules/pex { }; From 291a201097ee67aafd3157149ab29d4e6a049e8a Mon Sep 17 00:00:00 2001 From: qbisi Date: Wed, 5 Feb 2025 15:48:27 +0800 Subject: [PATCH 0432/1107] petsc: rename some optional dependency flags --- pkgs/by-name/pe/petsc/package.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 9c6e64d6e409..82b0f396a992 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -13,8 +13,8 @@ mpiSupport ? true, mpi, # generic mpi dependency mpiCheckPhaseHook, - petsc-withp4est ? withFullDeps, - hdf5-support ? withFullDeps, + withP4est ? withFullDeps, + withHdf5 ? withFullDeps, hdf5, metis, withMetis ? withFullDeps, @@ -36,7 +36,7 @@ }: # This version of PETSc does not support a non-MPI p4est build -assert petsc-withp4est -> p4est.mpiSupport; +assert withP4est -> (p4est.mpiSupport && mpiSupport); # Package parmetis depend on metis and mpi support assert withParmetis -> (withMetis && mpiSupport); @@ -73,8 +73,8 @@ stdenv.mkDerivation rec { blas lapack ] - ++ lib.optional hdf5-support hdf5 - ++ lib.optional petsc-withp4est p4est + ++ lib.optional withHdf5 hdf5 + ++ lib.optional withP4est p4est ++ lib.optional withMetis metis ++ lib.optional withParmetis parmetis ++ lib.optional withPtscotch scotch @@ -133,12 +133,12 @@ stdenv.mkDerivation rec { "--with-mumps=1" "--with-mumps-dir=${mumps_par}" ] - ++ lib.optionals petsc-withp4est [ + ++ lib.optionals withP4est [ "--with-p4est=1" "--with-zlib-include=${zlib.dev}/include" "--with-zlib-lib=[-L${zlib}/lib,-lz]" ] - ++ lib.optionals hdf5-support [ + ++ lib.optionals withHdf5 [ "--with-hdf5=1" "--with-hdf5-fortran-bindings=1" "--with-hdf5-include=${hdf5.dev}/include" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb3618d837a1..1144d59a2f83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17075,7 +17075,7 @@ with pkgs; ### SCIENCE/GEOLOGY pflotran = callPackage ../by-name/pf/pflotran/package.nix { petsc = petsc.override { - hdf5-support = true; + withHdf5 = true; hdf5 = hdf5-fortran-mpi; petsc-optimized = true; }; From d3b3d83b0fcd2d0e7fd7922a3da66e6a1c9491db Mon Sep 17 00:00:00 2001 From: qbisicwate Date: Thu, 6 Feb 2025 17:46:19 +0800 Subject: [PATCH 0433/1107] petsc: use lib.{getDev,getLib} instead *.{dev,lib} --- pkgs/by-name/pe/petsc/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 82b0f396a992..552416df8ec2 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -122,8 +122,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withPtscotch [ "--with-ptscotch=1" - "--with-ptscotch-include=${scotch.dev}/include" - "--with-ptscotch-lib=[-L${scotch}/lib,-lptscotch,-lptesmumps,-lptscotchparmetisv3,-lptscotcherr,-lesmumps,-lscotch,-lscotcherr]" + "--with-ptscotch-include=${lib.getDev scotch}/include" + "--with-ptscotch-lib=[-L${lib.getLib scotch}/lib,-lptscotch,-lptesmumps,-lptscotchparmetisv3,-lptscotcherr,-lesmumps,-lscotch,-lscotcherr]" ] ++ lib.optionals withScalapack [ "--with-scalapack=1" @@ -135,14 +135,14 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withP4est [ "--with-p4est=1" - "--with-zlib-include=${zlib.dev}/include" - "--with-zlib-lib=[-L${zlib}/lib,-lz]" + "--with-zlib-include=${lib.getDev zlib}/include" + "--with-zlib-lib=[-L${lib.getLib zlib}/lib,-lz]" ] ++ lib.optionals withHdf5 [ "--with-hdf5=1" "--with-hdf5-fortran-bindings=1" - "--with-hdf5-include=${hdf5.dev}/include" - "--with-hdf5-lib=[-L${hdf5}/lib,-lhdf5]" + "--with-hdf5-include=${lib.getDev hdf5}/include" + "--with-hdf5-lib=[-L${lib.getLib hdf5}/lib,-lhdf5]" ] ++ lib.optionals petsc-optimized [ "--with-debugging=0" From 92dc787ceca4c86d4df79e1d53caaa4e32a882f0 Mon Sep 17 00:00:00 2001 From: qbisi Date: Fri, 14 Feb 2025 18:00:55 +0800 Subject: [PATCH 0434/1107] petsc: reorder build options and external dependency --- pkgs/by-name/pe/petsc/package.nix | 44 ++++++++++++++++++------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 552416df8ec2..9d5e412fad7b 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -7,32 +7,38 @@ replaceVars, python3, python3Packages, - withPetsc4py ? false, blas, lapack, - mpiSupport ? true, + zlib, # propagated by p4est but required by petsc mpi, # generic mpi dependency mpiCheckPhaseHook, - withP4est ? withFullDeps, - withHdf5 ? withFullDeps, - hdf5, - metis, - withMetis ? withFullDeps, - parmetis, - withParmetis ? false, # parmetis is unfree and should be enabled manualy - scotch, - withPtscotch ? withFullDeps, - scalapack, - withScalapack ? withFullDeps, - mumps_par, - withMumps ? withFullDeps, - pkg-config, - p4est, - zlib, # propagated by p4est but required by petsc + + # Build options petsc-optimized ? false, petsc-scalar-type ? "real", petsc-precision ? "double", - withFullDeps ? false + mpiSupport ? true, + withPetsc4py ? false, # petsc python binding + withFullDeps ? false, # full External libraries support + + # External libraries options + withHdf5 ? withFullDeps, + withMetis ? withFullDeps, + withParmetis ? false, # parmetis is unfree and should be enabled manualy + withPtscotch ? withFullDeps, + withScalapack ? withFullDeps, + withMumps ? withFullDeps, + withP4est ? withFullDeps, + + # External libraries + hdf5, + metis, + parmetis, + scotch, + scalapack, + mumps_par, + pkg-config, + p4est, }: # This version of PETSc does not support a non-MPI p4est build From 3c01afec0a69da281268e5a921c087e08c6f7222 Mon Sep 17 00:00:00 2001 From: qbisi Date: Fri, 14 Feb 2025 19:05:03 +0800 Subject: [PATCH 0435/1107] petsc: add hdf5 fortran binding --- pkgs/by-name/pe/petsc/package.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 9d5e412fad7b..22735cacece5 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -31,7 +31,7 @@ withP4est ? withFullDeps, # External libraries - hdf5, + hdf5-fortran-mpi, metis, parmetis, scotch, @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { blas lapack ] - ++ lib.optional withHdf5 hdf5 + ++ lib.optional withHdf5 hdf5-fortran-mpi ++ lib.optional withP4est p4est ++ lib.optional withMetis metis ++ lib.optional withParmetis parmetis @@ -147,8 +147,8 @@ stdenv.mkDerivation rec { ++ lib.optionals withHdf5 [ "--with-hdf5=1" "--with-hdf5-fortran-bindings=1" - "--with-hdf5-include=${lib.getDev hdf5}/include" - "--with-hdf5-lib=[-L${lib.getLib hdf5}/lib,-lhdf5]" + "--with-hdf5-include=${lib.getDev hdf5-fortran-mpi}/include" + "--with-hdf5-lib=[-L${lib.getLib hdf5-fortran-mpi}/lib,-lhdf5]" ] ++ lib.optionals petsc-optimized [ "--with-debugging=0" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1144d59a2f83..f18c29a4280e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17076,7 +17076,6 @@ with pkgs; pflotran = callPackage ../by-name/pf/pflotran/package.nix { petsc = petsc.override { withHdf5 = true; - hdf5 = hdf5-fortran-mpi; petsc-optimized = true; }; }; From 120cb83d3bd82c0ade523344e6fe0e7edf2e156d Mon Sep 17 00:00:00 2001 From: qbisi Date: Fri, 14 Feb 2025 19:06:55 +0800 Subject: [PATCH 0436/1107] petsc: set optimized and withHdf5 default to true Petsc is commonly optimized built with hdf5 support to be used as a component of other software and project. See 1. https://sources.debian.org/src/petsc/3.22.2%2Bdfsg1-1/debian/rules/#L154 2. https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=petsc --- pkgs/by-name/pe/petsc/package.nix | 4 ++-- pkgs/top-level/all-packages.nix | 8 -------- pkgs/top-level/python-packages.nix | 1 - 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 22735cacece5..cec3dda54341 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -14,7 +14,7 @@ mpiCheckPhaseHook, # Build options - petsc-optimized ? false, + petsc-optimized ? true, petsc-scalar-type ? "real", petsc-precision ? "double", mpiSupport ? true, @@ -22,7 +22,7 @@ withFullDeps ? false, # full External libraries support # External libraries options - withHdf5 ? withFullDeps, + withHdf5 ? true, withMetis ? withFullDeps, withParmetis ? false, # parmetis is unfree and should be enabled manualy withPtscotch ? withFullDeps, diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f18c29a4280e..77e4a06b3c69 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17072,14 +17072,6 @@ with pkgs; ### SCIENCE/PROGRAMMING - ### SCIENCE/GEOLOGY - pflotran = callPackage ../by-name/pf/pflotran/package.nix { - petsc = petsc.override { - withHdf5 = true; - petsc-optimized = true; - }; - }; - ### SCIENCE/LOGIC abella = callPackage ../applications/science/logic/abella { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dbabff224391..f1e9cc7f6a70 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10347,7 +10347,6 @@ self: super: with self; { python3Packages = self; withPetsc4py = true; withFullDeps = true; - petsc-optimized = true; }); pex = callPackage ../development/python-modules/pex { }; From 4c6997c57956ed47cca3138edffaf778527806b5 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 14 Feb 2025 07:35:17 -0500 Subject: [PATCH 0437/1107] python312Packages.fastjet: fix dependencies --- pkgs/development/python-modules/fastjet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/fastjet/default.nix b/pkgs/development/python-modules/fastjet/default.nix index 6b57b4a8f031..2fdac2219cd5 100644 --- a/pkgs/development/python-modules/fastjet/default.nix +++ b/pkgs/development/python-modules/fastjet/default.nix @@ -63,7 +63,10 @@ buildPythonPackage rec { ]; dependencies = [ + awkward fastjet + numpy + vector ]; buildInputs = [ @@ -73,9 +76,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - awkward - numpy - vector ]; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; From d9ada6e386a584d6ce9686f94231fdae452585b0 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 14 Feb 2025 07:35:35 -0500 Subject: [PATCH 0438/1107] fastjet-contrib: fix soname --- pkgs/by-name/fa/fastjet-contrib/package.nix | 2 ++ pkgs/development/python-modules/fastjet/default.nix | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/fastjet-contrib/package.nix b/pkgs/by-name/fa/fastjet-contrib/package.nix index 02f4c55d215c..caab082a4e3d 100644 --- a/pkgs/by-name/fa/fastjet-contrib/package.nix +++ b/pkgs/by-name/fa/fastjet-contrib/package.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { substituteInPlace "$f" --replace-quiet "ranlib " "${stdenv.cc.targetPrefix}ranlib " done patchShebangs --build ./utils/check.sh ./utils/install-sh + substituteInPlace configure \ + --replace-warn "-Wl,-soname,fastjetcontribfragile.so.0" "-Wl,-soname,libfastjetcontribfragile.so" ''; # Written in shell manually, does not support autoconf-style diff --git a/pkgs/development/python-modules/fastjet/default.nix b/pkgs/development/python-modules/fastjet/default.nix index 2fdac2219cd5..54ebfea342a6 100644 --- a/pkgs/development/python-modules/fastjet/default.nix +++ b/pkgs/development/python-modules/fastjet/default.nix @@ -86,7 +86,5 @@ buildPythonPackage rec { changelog = "https://github.com/scikit-hep/fastjet/releases/tag/v${version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ veprbl ]; - # ImportError: fastjetcontribfragile.so.0: cannot open shared object file: No such file or directory - broken = true; }; } From b78528c39ce44b5ee66833a8d9e7a21943b877df Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Feb 2025 13:44:56 +0100 Subject: [PATCH 0439/1107] python313Packages.scipy: disable failing test Upstream has acknowledged this test failures and is investigating a fix for the 1.15.2 release. --- .../python-modules/scipy/default.nix | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index e142afdba31f..862fdf57be71 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -128,17 +128,21 @@ buildPythonPackage { pytest-xdist ]; - # The following tests are broken on aarch64-darwin with newer compilers and library versions. - # See https://github.com/scipy/scipy/issues/18308 - disabledTests = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ - "test_a_b_neg_int_after_euler_hypergeometric_transformation" - "test_dst4_definition_ortho" - "test_load_mat4_le" - "hyp2f1_test_case47" - "hyp2f1_test_case3" - "test_uint64_max" - "test_large_m4" # https://github.com/scipy/scipy/issues/22466 - ]; + disabledTests = + [ + "test_cumulative_simpson_against_simpson_with_default_dx" + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ + # The following tests are broken on aarch64-darwin with newer compilers and library versions. + # See https://github.com/scipy/scipy/issues/18308 + "test_a_b_neg_int_after_euler_hypergeometric_transformation" + "test_dst4_definition_ortho" + "test_load_mat4_le" + "hyp2f1_test_case47" + "hyp2f1_test_case3" + "test_uint64_max" + "test_large_m4" # https://github.com/scipy/scipy/issues/22466 + ]; doCheck = !(stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin); From 6b401fa83fae7cc67b4c28b98a1ec17c3b5da0a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 13:21:39 +0000 Subject: [PATCH 0440/1107] jmol: 16.3.7 -> 16.3.9 --- pkgs/applications/science/chemistry/jmol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index c7f0403cf90a..d588497b8343 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -25,14 +25,14 @@ let }; in stdenv.mkDerivation rec { - version = "16.3.7"; + version = "16.3.9"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - hash = "sha256-SQuIjwafPipQy9C2yJQ2CIFV/lSAnHkp1jYnPK1BWcQ="; + hash = "sha256-+Eh5484tW/U/YJb7sMf6W/QrsBz5j/aTrW4vnJobwiY="; }; patchPhase = '' From 96df4116de67588f3337a6fabb4f024d56bf23e4 Mon Sep 17 00:00:00 2001 From: Kiara Grouwstra Date: Wed, 12 Feb 2025 14:04:54 +0100 Subject: [PATCH 0441/1107] yed: use archive.org link to reproduce even when pruned Co-authored-by: Sandro --- pkgs/by-name/ye/yed/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ye/yed/package.nix b/pkgs/by-name/ye/yed/package.nix index 0b3a56ef9e38..0665320956b2 100644 --- a/pkgs/by-name/ye/yed/package.nix +++ b/pkgs/by-name/ye/yed/package.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { version = "3.25"; src = fetchzip { - url = "https://www.yworks.com/resources/yed/demo/${pname}-${version}.zip"; + # to update: archive https://www.yworks.com/resources/yed/demo/yEd-${version}.zip + url = "https://web.archive.org/web/20250212125159/https://www.yworks.com/resources/yed/demo/yEd-${version}.zip"; sha256 = "sha256-6Z24XmFPK+aomO7hImN4AdN08kjOsyn9PvHToyQj8sk="; }; From 2c99f4565fcd5db203b21989e76a4217882b9118 Mon Sep 17 00:00:00 2001 From: Vinicius Date: Tue, 11 Feb 2025 12:20:03 +0000 Subject: [PATCH 0442/1107] mockoon: 6.1.0 > 9.1.0 --- pkgs/by-name/mo/mockoon/package.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/mockoon/package.nix b/pkgs/by-name/mo/mockoon/package.nix index f0e276c0cc5f..4c2e7ef755a2 100644 --- a/pkgs/by-name/mo/mockoon/package.nix +++ b/pkgs/by-name/mo/mockoon/package.nix @@ -6,11 +6,11 @@ let pname = "mockoon"; - version = "6.1.0"; + version = "9.1.0"; src = fetchurl { - url = "https://github.com/mockoon/mockoon/releases/download/v${version}/mockoon-${version}.AppImage"; - hash = "sha256-harZU3TTIzfJoY/jAQI0dm7YSOr24Y9xk9L5ZaBLdD8="; + url = "https://github.com/mockoon/mockoon/releases/download/v${version}/mockoon-${version}.x86_64.AppImage"; + hash = "sha256-54E8o8m192yVuuLu3n4I9KRsC5h1UYBZ/1m0n5vGSdY="; }; appimageContents = appimageTools.extractType2 { @@ -31,10 +31,16 @@ appimageTools.wrapType2 { meta = with lib; { description = "Easiest and quickest way to run mock APIs locally"; + longDescription = '' + Mockoon is the easiest and quickest way to run mock APIs locally. + No remote deployment, no account required, free and open-source. + ''; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; homepage = "https://mockoon.com"; + changelog = "https://github.com/mockoon/mockoon/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ dit7ya ]; mainProgram = "mockoon"; + platforms = [ "x86_64-linux" ]; }; } From d02a92e1ba1437c32604ecfb7107235aaf709f55 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Fri, 14 Feb 2025 08:49:25 -0600 Subject: [PATCH 0443/1107] anydesk: 6.4.0 -> 6.4.1 --- pkgs/by-name/an/anydesk/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/an/anydesk/package.nix b/pkgs/by-name/an/anydesk/package.nix index 463cbd40d129..a041ff516211 100644 --- a/pkgs/by-name/an/anydesk/package.nix +++ b/pkgs/by-name/an/anydesk/package.nix @@ -34,14 +34,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "anydesk"; - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { urls = [ "https://download.anydesk.com/linux/anydesk-${finalAttrs.version}-amd64.tar.gz" "https://download.anydesk.com/linux/generic-linux/anydesk-${finalAttrs.version}-amd64.tar.gz" ]; - hash = "sha256-yGzTqbv3SQT6V/DcY8GvRDXilYrZXVsmQOnqy/5+ev8="; + hash = "sha256-rAdoH78e10JYLdXFIlasihztJxXNxb72HuxxSCfEzPE="; }; buildInputs = From bdd0cbbefe1144b1012990b283f6b066fe3afa54 Mon Sep 17 00:00:00 2001 From: Matt Szafir Date: Fri, 14 Feb 2025 11:45:21 -0700 Subject: [PATCH 0444/1107] maintainers: add ZMon3y --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2b6998dc4929..e379bb533b19 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -26072,6 +26072,12 @@ github = "zmitchell"; githubId = 10246891; }; + ZMon3y = { + name = "Matt Szafir"; + email = "mattszafir+nix@gmail.com"; + github = "ZMon3y"; + githubId = 9386488; + }; znaniye = { email = "zn4niye@proton.me"; github = "znaniye"; From dd9559503b3beab22eeaa9ee0cda670b429a7778 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 14 Feb 2025 23:30:49 +0300 Subject: [PATCH 0445/1107] kdePackages: Frameworks 6.10 -> 6.11 --- pkgs/kde/generated/sources/frameworks.json | 432 ++++++++++----------- 1 file changed, 216 insertions(+), 216 deletions(-) diff --git a/pkgs/kde/generated/sources/frameworks.json b/pkgs/kde/generated/sources/frameworks.json index 40280e6404f7..f7d897c97d65 100644 --- a/pkgs/kde/generated/sources/frameworks.json +++ b/pkgs/kde/generated/sources/frameworks.json @@ -1,362 +1,362 @@ { "attica": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/attica-6.10.0.tar.xz", - "hash": "sha256-82wurLytjAgDbp91JRRL7J98XYbxFQ1J+duePcFKv0U=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/attica-6.11.0.tar.xz", + "hash": "sha256-57fAPXZWpZcOAtYcP40nYLLD2kbT9kZL/CVKczsmP7M=" }, "baloo": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/baloo-6.10.0.tar.xz", - "hash": "sha256-VIAZdA2UYtEK2GL8+AG+8WY2UxXa9zIJrYbLduASryo=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/baloo-6.11.0.tar.xz", + "hash": "sha256-u4fUBTSgDMNj0p49fQ83qdzdDYMdsaV7v4uOOVUHVgo=" }, "bluez-qt": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/bluez-qt-6.10.0.tar.xz", - "hash": "sha256-YqR7dwViXW66gtJk9fpCgg//r8je9lyc0AZAtHN8gi0=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/bluez-qt-6.11.0.tar.xz", + "hash": "sha256-k4ELpwp8rAQ7InsjrGqQfFL6L4qpDOtKz+jW1Gt+ros=" }, "breeze-icons": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/breeze-icons-6.10.0.tar.xz", - "hash": "sha256-/kWOuVe+ZV6oAdQfHdPEz6gp57pgQLONadCfa2nDHio=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/breeze-icons-6.11.0.tar.xz", + "hash": "sha256-+c2ewbakERRny6Mafu1Q7l8DhG+x9cMrOr2/aId/ik4=" }, "extra-cmake-modules": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/extra-cmake-modules-6.10.0.tar.xz", - "hash": "sha256-UGmJoNQAkTQD5mnBkSI42wU81rON/3Sxfi5vh5x5zKA=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/extra-cmake-modules-6.11.0.tar.xz", + "hash": "sha256-af2rXw/t+3PRrM/1AS1RC0huHddccR6SWmkSo+cYFLA=" }, "frameworkintegration": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/frameworkintegration-6.10.0.tar.xz", - "hash": "sha256-Yfw1z/sIY1F/ogcrlkdr8QlJnVj7MmQGK0C+Uo3Tr4I=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/frameworkintegration-6.11.0.tar.xz", + "hash": "sha256-p0R6WHBAKERjhGpHngG32CHIm187hoPLs2f1aM6oH7I=" }, "kapidox": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kapidox-6.10.0.tar.xz", - "hash": "sha256-4occRoet+KNo2yMd51JdN1EOonVGO9JxKJhsaZEpdMQ=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kapidox-6.11.0.tar.xz", + "hash": "sha256-o/kGK+5XNMjkUG2AoVkbnRKJpwFx0Q9N6dqIdRbetLw=" }, "karchive": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/karchive-6.10.0.tar.xz", - "hash": "sha256-rFFgwZ3RELva3rqcU1XL/TtcG9AM49vcSghXdmmMikg=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/karchive-6.11.0.tar.xz", + "hash": "sha256-EvxKxTWR+x3YHWxSQ7kAptSAZlWSY/xm6y9Jlc6544A=" }, "kauth": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kauth-6.10.0.tar.xz", - "hash": "sha256-viVgG5GxKaSOSXIxviUToeuMlweoLTg5VWFlbR3xCYg=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kauth-6.11.0.tar.xz", + "hash": "sha256-R5Zg6r6XGYwx8iihgnG8c5sjSUPGjpU4PDYag1ExF5s=" }, "kbookmarks": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kbookmarks-6.10.0.tar.xz", - "hash": "sha256-iR6xLSuaLDzfv9uiUFmcVE1xhs6NHvB/T8TM4dV6lFs=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kbookmarks-6.11.0.tar.xz", + "hash": "sha256-tcZ3RTxwMUue7MABGnMQPwReq8lLxfLyI7WXl4DIAcc=" }, "kcalendarcore": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kcalendarcore-6.10.0.tar.xz", - "hash": "sha256-mI8v1kg0GWc4TZXT0Su5Nqinc3qTHnLCtWFgULwwM2o=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kcalendarcore-6.11.0.tar.xz", + "hash": "sha256-6iYTJNG4DvR4a4bPhr+jLDMqoDV7BbopmxP1S+aac4A=" }, "kcmutils": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kcmutils-6.10.0.tar.xz", - "hash": "sha256-pLy0sE7koDqan9u5bCc2Ah2Usiwi+NXV0Ve5zpgusAE=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kcmutils-6.11.0.tar.xz", + "hash": "sha256-ZNLFzYFlGJwtdBu1Q6q3K1vI21xUDKTojC+ND5PneZA=" }, "kcodecs": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kcodecs-6.10.0.tar.xz", - "hash": "sha256-lhg/+7GFAs1ntvx4rChuIz70buDXE+4d8stME48hQaA=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kcodecs-6.11.0.tar.xz", + "hash": "sha256-+93EN7qZadiWNbdfDvfkHJJcYcZNrB//AIwukTgTn+Q=" }, "kcolorscheme": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kcolorscheme-6.10.0.tar.xz", - "hash": "sha256-8HDtWT8dQBCvWlbiR1Mr6WosfKm+/JIrCEwWIVr3m98=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kcolorscheme-6.11.0.tar.xz", + "hash": "sha256-iye924MPAXP0SumqwFITV5kJuF+mlqKHGy7hHLI5vMg=" }, "kcompletion": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kcompletion-6.10.0.tar.xz", - "hash": "sha256-tW6SW76IHIn86cgEQeFWWtGt/LFvHKxbsIooH7kzS8k=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kcompletion-6.11.0.tar.xz", + "hash": "sha256-yBK2DeRTDeMAORbkX7qxIcX59XbiQwqyzfDj5MkEGFI=" }, "kconfig": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kconfig-6.10.0.tar.xz", - "hash": "sha256-AO8sdb5ous+MMOO/ByNYuPbSvHjUYuexTAhoCMadjX8=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kconfig-6.11.0.tar.xz", + "hash": "sha256-xxByqvJ3EpW1kfxi1PtlfO+zjfKfJA75xxIIVLQtD38=" }, "kconfigwidgets": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kconfigwidgets-6.10.0.tar.xz", - "hash": "sha256-XLF7yvquPu/BRPsQFPFMuZmMnhO3FICNlAqyDZwPtRw=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kconfigwidgets-6.11.0.tar.xz", + "hash": "sha256-KKG7ElFh/pqw2/qJlDNRLpKGab4xzhSfolGRokpQJCo=" }, "kcontacts": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kcontacts-6.10.0.tar.xz", - "hash": "sha256-tiKtARklWE+4LPC/6nE/3dQQHEerbCPvtfuHjxpptG0=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kcontacts-6.11.0.tar.xz", + "hash": "sha256-LwzSazK9utFLbl8+/5niOu3yQl6ssNTW9Eck3ObiZWI=" }, "kcoreaddons": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kcoreaddons-6.10.0.tar.xz", - "hash": "sha256-ib8odHkV6YfKshx3OXsJccr/oSWLb1dVQ9c9QYgYSnI=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kcoreaddons-6.11.0.tar.xz", + "hash": "sha256-/2kcbgkzST6j6MSgukH6Rs7XuTlObzXvne40nM/MOjk=" }, "kcrash": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kcrash-6.10.0.tar.xz", - "hash": "sha256-wDKdpqwoqqyCTbI15XiZnkpIflztuzzsOmo56e6bXbQ=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kcrash-6.11.0.tar.xz", + "hash": "sha256-uhPp9d0rQBJdXWHSm2EttjgzFdwPUQzB8OM7tsmwrok=" }, "kdav": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kdav-6.10.0.tar.xz", - "hash": "sha256-Lo7/Pow1ABaIgHqX5JCm54Uaehof33LfVVmGO4YSkD0=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kdav-6.11.0.tar.xz", + "hash": "sha256-nKVYbmcvVkOYjc1gS2oDD1mz1eePHPNyXy5PJXhSNA4=" }, "kdbusaddons": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kdbusaddons-6.10.0.tar.xz", - "hash": "sha256-6Iv6pqEPgNn3shFigcRIUhOYTK7VVaxoVXu1PuiLuzI=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kdbusaddons-6.11.0.tar.xz", + "hash": "sha256-YuDzsEh+8atyn8hby1SYyUSeC3T+gEl3lDQVi7ixKoc=" }, "kdeclarative": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kdeclarative-6.10.0.tar.xz", - "hash": "sha256-256yteYVtISUnkGsWgXFzqE24jHRWj3iA5As7c39nnM=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kdeclarative-6.11.0.tar.xz", + "hash": "sha256-augRNnvLyBkPil0u85qObHKHHEHsJuKksMODJKPoWWs=" }, "kded": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kded-6.10.0.tar.xz", - "hash": "sha256-VgHZ2/3JUH/q8X9HdLt9EtOMfhlySui5h2OaFv8Oao4=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kded-6.11.0.tar.xz", + "hash": "sha256-VcmSERQpmr2b3F5gHMxqdQ/y0zH8CDbXlnDMvFCOBqQ=" }, "kdesu": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kdesu-6.10.0.tar.xz", - "hash": "sha256-WrmTq8qFy1eYu0N7lqKz2IB534YSjuMNZu4R9g5Rwi4=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kdesu-6.11.0.tar.xz", + "hash": "sha256-qstJ0xPnnxBnlcTat96Zkeb+TnJMK0wZ3u/NFx9qO6c=" }, "kdnssd": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kdnssd-6.10.0.tar.xz", - "hash": "sha256-/Y8IUB/EC5op/DcPf3hxCD8kiZIuG9ULxbD9eAF9qic=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kdnssd-6.11.0.tar.xz", + "hash": "sha256-ads1S7Km+qwW7B63fm9xMI+OvZIFlnx121usk355m9k=" }, "kdoctools": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kdoctools-6.10.0.tar.xz", - "hash": "sha256-A/qY4SEyNe5NSDnRbj7bIu5WhJuasD0UBjnPn6y2sDg=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kdoctools-6.11.0.tar.xz", + "hash": "sha256-383GoCWPXMLlXSSPYWzHxiJOGwYUDetofkAbU3lZ/Ag=" }, "kfilemetadata": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kfilemetadata-6.10.0.tar.xz", - "hash": "sha256-EAtIdwoWuOEt0+xAdb3TuDM+eWLS/HSSzQd9zAPjw1U=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kfilemetadata-6.11.0.tar.xz", + "hash": "sha256-+RkJaer2b50naQzDuFo9GTle42V1gsmubJTEmhEzEsc=" }, "kglobalaccel": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kglobalaccel-6.10.0.tar.xz", - "hash": "sha256-BbDsakTUPOepz9bNcMjQfcpcX2IWlor4Eo/ppe2bGSg=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kglobalaccel-6.11.0.tar.xz", + "hash": "sha256-BVLk5cWKJEczr0nP3QyPwEpjgotsI0azaCAiLV47zvU=" }, "kguiaddons": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kguiaddons-6.10.0.tar.xz", - "hash": "sha256-s74EB3MT5VnFqPZkkdXShs7+lHqvfIk3VEzoWvSFP/o=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kguiaddons-6.11.0.tar.xz", + "hash": "sha256-7wkl9gmuW2LtaJRR3+mTdxnOTsJnFJUrVJbj4SjVzFw=" }, "kholidays": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kholidays-6.10.0.tar.xz", - "hash": "sha256-eI7+ynpVJMWmaGI6uoMK1th1qicR8MrF8jKa3Sq0RY0=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kholidays-6.11.0.tar.xz", + "hash": "sha256-zNv6ter8BDV0kA1m4AIjJvYEjn3NsJvFON7eqZiJxq8=" }, "ki18n": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/ki18n-6.10.0.tar.xz", - "hash": "sha256-L1nwk/jONAq0bFVrNcLq0rlt/rL/ACTFU6yMU+m4oRo=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/ki18n-6.11.0.tar.xz", + "hash": "sha256-ZYoFzsoYS6Mc5YpunFHudvKClFnFbbzTutOqFX6vEf4=" }, "kiconthemes": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kiconthemes-6.10.0.tar.xz", - "hash": "sha256-FYB+eFGDwEiBCvAUGzpWAIXyu/APOiH+li6zemc/kxQ=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kiconthemes-6.11.0.tar.xz", + "hash": "sha256-FnGrP9mx4HU6cGK6uA9UifOsdQ7LMLkduZpmiZiK+4c=" }, "kidletime": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kidletime-6.10.0.tar.xz", - "hash": "sha256-+iX+hmrv1FNgIhQoIs6YVveoX/qVBwmAUn3psx6rCYg=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kidletime-6.11.0.tar.xz", + "hash": "sha256-lu+wtTOjfdsuGIjf99RyLBnEfWYPdNGwpCLrlXGPSII=" }, "kimageformats": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kimageformats-6.10.0.tar.xz", - "hash": "sha256-4W8y7mQ5MZmig5Qvb+e293s3RgNPkOQkRonCj6qx+dM=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kimageformats-6.11.0.tar.xz", + "hash": "sha256-DEV4f5fQD8Alf33jJQ2E6VDeKjMsRedSgTj3z4QxVMw=" }, "kio": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kio-6.10.0.tar.xz", - "hash": "sha256-frRUQ48Unn7VE8O71Sa2fj4+z+Mq58mGFouqWWALaZw=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kio-6.11.0.tar.xz", + "hash": "sha256-/lEeQ6U4b5Y8mv75OiHA30Siwk/MQXd35NBWkQJHf/g=" }, "kirigami": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kirigami-6.10.0.tar.xz", - "hash": "sha256-LiRf/Xnsofz7WR9D/znnwvUWDoaKNuIOu+LWbFUNqNQ=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kirigami-6.11.0.tar.xz", + "hash": "sha256-IjkslbuDXxFiYlDwcoznNZDbY4gU5xgRSPz2ah9ELqY=" }, "kitemmodels": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kitemmodels-6.10.0.tar.xz", - "hash": "sha256-g4WaSu5nv152ipMyVCImTLnoRwE/KBxcsC5jHDs7AAc=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kitemmodels-6.11.0.tar.xz", + "hash": "sha256-OY3E48XERGE1CiCsI0BVuvwrGEKE3eqRVjE072L11qY=" }, "kitemviews": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kitemviews-6.10.0.tar.xz", - "hash": "sha256-ixX/VxnqZenQxyLupkEuMS0F2dpJyHLK+dl9Mp1W120=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kitemviews-6.11.0.tar.xz", + "hash": "sha256-42JTaOP4z2EnIYzD6Ef78BdqWXjIYiixGjIK2W/qLLw=" }, "kjobwidgets": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kjobwidgets-6.10.0.tar.xz", - "hash": "sha256-7j/10hyEhJWdCvGXanwbqwH0NoQU3y67LLhUCzwoaRs=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kjobwidgets-6.11.0.tar.xz", + "hash": "sha256-K7NC5VT47PhNchimVnYo3Mc8G5FNDFqtHIv3dTmG3dc=" }, "knewstuff": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/knewstuff-6.10.0.tar.xz", - "hash": "sha256-gctepU/gPSf4Ckgd3hinZ8oalSZ0A72HSDz92BmB5Oc=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/knewstuff-6.11.0.tar.xz", + "hash": "sha256-izgCtrZDCatnCa81DySNxi4+bVCw207LDJaKz7+yNSA=" }, "knotifications": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/knotifications-6.10.0.tar.xz", - "hash": "sha256-NreIHVBADze0866qTApqlD5Xg9NUQeKwys3G2tBq8qE=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/knotifications-6.11.0.tar.xz", + "hash": "sha256-ouCBXqblwpT902MWypeSpAb1wSPsAaHHOn5Uywvi6jE=" }, "knotifyconfig": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/knotifyconfig-6.10.0.tar.xz", - "hash": "sha256-8LpEeljt79gwKQXtiAMCkZkOJz7e2X0R0rfemGo10Fw=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/knotifyconfig-6.11.0.tar.xz", + "hash": "sha256-YSURFhdYFEqdPZnU8KnrdZMcP4r1lm4EWgiAI8odDG8=" }, "kpackage": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kpackage-6.10.0.tar.xz", - "hash": "sha256-D0nBzbSeAcbc43KrvJgUzL10t/KxMMcxBnQ0XjSYzsE=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kpackage-6.11.0.tar.xz", + "hash": "sha256-v8cE6hcI83FQqdFO3Lue7Y6/jVR1OTDaY0Ms2pVKHqc=" }, "kparts": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kparts-6.10.0.tar.xz", - "hash": "sha256-o8Rg9jXzLiVAk9o9RtU/6aSnzKWYcUkEeYG0d8UKBgw=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kparts-6.11.0.tar.xz", + "hash": "sha256-OZXzVWq6Q03nsT2uCZtRoKhq6t5guh4GWSg21AZpu2o=" }, "kpeople": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kpeople-6.10.0.tar.xz", - "hash": "sha256-qZHFOdeWTf2UeIn9P5suElnYwNPcaTwUwb382NKZcfA=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kpeople-6.11.0.tar.xz", + "hash": "sha256-P2evQ0QjWOe02aCoHYYTNwf/quD14FxIqh85DsR/+Ws=" }, "kplotting": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kplotting-6.10.0.tar.xz", - "hash": "sha256-aUHZMBm/semXfPpZK6EQ+/nDt/JHr0DzNuBABx+SLT8=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kplotting-6.11.0.tar.xz", + "hash": "sha256-zrkVzAJs0g/xDo/bPkkU6mH3Noai2f5qiDml6tFKmJI=" }, "kpty": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kpty-6.10.0.tar.xz", - "hash": "sha256-H8zZLWfqwL/q2sO627QJ3Ncg7SJChO0FYWarV4fy1kc=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kpty-6.11.0.tar.xz", + "hash": "sha256-8dmFvwoUBhp2THwBvLbPKEpZrYLeE+cs/RvSaIGe68I=" }, "kquickcharts": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kquickcharts-6.10.0.tar.xz", - "hash": "sha256-ogNvex7nq7nCeMeCL8GHI9Zh2Fbanb+fAGzuvtcxWY8=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kquickcharts-6.11.0.tar.xz", + "hash": "sha256-/8Naew3eUqza5QiSWlVbdgBsydS3jrAD6aMc1DnymT8=" }, "krunner": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/krunner-6.10.0.tar.xz", - "hash": "sha256-RZyXrVEMNWXUVHtRxNuvGbODTAr993v27k3/NGlX1is=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/krunner-6.11.0.tar.xz", + "hash": "sha256-IXnaZWN12IOep8LFAgh7UnxnFeEBhYKsj2NhLKUnqpA=" }, "kservice": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kservice-6.10.0.tar.xz", - "hash": "sha256-BK1ThQln44gi+K8WUrEYmSzRv6OC4nGCeLtt4DoL27M=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kservice-6.11.0.tar.xz", + "hash": "sha256-FhzSlld/+YArCIsGhm7Fq0wcGm/hn3a7UTTN+KarQAU=" }, "kstatusnotifieritem": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kstatusnotifieritem-6.10.0.tar.xz", - "hash": "sha256-T6GYQ6c3tDZ00Zua0xRmxqpku+J3CQc8PiwzqgO/rCI=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kstatusnotifieritem-6.11.0.tar.xz", + "hash": "sha256-JsksJbH3Apa96ecfuh9xl3jIXLVyJ/YEX2Bq+ZxIqL0=" }, "ksvg": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/ksvg-6.10.0.tar.xz", - "hash": "sha256-Fz4VH274NgFJ+DWx/HSU6Xoz+QVtKUqyE8nvnm2E0Mg=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/ksvg-6.11.0.tar.xz", + "hash": "sha256-BTCS42t23u/+GWKa4So3KxcvlHvuPMIDTGjnuk4dps8=" }, "ktexteditor": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/ktexteditor-6.10.0.tar.xz", - "hash": "sha256-P4DE/rhzfO+Dd14sefhgYMFq+J7otI4tcvlL3BoYC58=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/ktexteditor-6.11.0.tar.xz", + "hash": "sha256-gtM9zK2Y4vUU3k0XxOZlGX/dhYilWXk1j4iu6sb8RBk=" }, "ktexttemplate": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/ktexttemplate-6.10.0.tar.xz", - "hash": "sha256-PjkZCtuQ1PcWcuM9EXs1/oSo81qqkKZ4hGQBBEiUqj0=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/ktexttemplate-6.11.0.tar.xz", + "hash": "sha256-sPMMbkmhMs31hyKOC6Hh2XTMFV0jO1f/YX9dVef3uQU=" }, "ktextwidgets": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/ktextwidgets-6.10.0.tar.xz", - "hash": "sha256-TbZ75w2mjj/SwqnTNZ3PubEeuCo08riNPm7QjjWKsHM=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/ktextwidgets-6.11.0.tar.xz", + "hash": "sha256-DwQ7imBpjM24jj1pV7X1yXz+eT6i7qQh/EZ//98gBpc=" }, "kunitconversion": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kunitconversion-6.10.0.tar.xz", - "hash": "sha256-I8WZBNSASd648d6KpW57DBCp/IKAjzajL09EZDOGnb8=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kunitconversion-6.11.0.tar.xz", + "hash": "sha256-jSaoPRNxvXDEgoFwhoDGnmH6ykSWPeq1LQfJcjwn7kk=" }, "kuserfeedback": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kuserfeedback-6.10.0.tar.xz", - "hash": "sha256-XdF9pxaampDIJ1dTbGZ9dI0ZCZhbl5ux4uUdqEoHNy8=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kuserfeedback-6.11.0.tar.xz", + "hash": "sha256-rFFre4+c0IkWZPi1gNClpcSUz2tdv93Ye29iVlSLeRA=" }, "kwallet": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kwallet-6.10.0.tar.xz", - "hash": "sha256-4Zk5EaFbQxjWSrzgrNwbX8WmEW3HWV7/ht3gOzXmvVA=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kwallet-6.11.0.tar.xz", + "hash": "sha256-zpSwMkRu0eE4PmcxhbWkNy3uq3Hfi3pJCDobbq2CLgk=" }, "kwidgetsaddons": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kwidgetsaddons-6.10.0.tar.xz", - "hash": "sha256-4PpJQ9eHQof9LCwlTx7yHt9+VztrGTVN9f3vjLvv504=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kwidgetsaddons-6.11.0.tar.xz", + "hash": "sha256-HGTnNUgEhF2wzYOuZx37XSywgwhVGgtse4ozmqbctDY=" }, "kwindowsystem": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kwindowsystem-6.10.0.tar.xz", - "hash": "sha256-BGt6oiR4ETI+SLYpiEuCSm/+xHXfIxYlbn/wud9neUQ=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kwindowsystem-6.11.0.tar.xz", + "hash": "sha256-2HLoXQkV3Vzx4rr4n772LphV/zMX7MWTmIK8FyRijVo=" }, "kxmlgui": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/kxmlgui-6.10.0.tar.xz", - "hash": "sha256-Vh+nVWONoWyuIEtnD2L6twFWuRIbkxNhIjjKnJ6OEpI=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/kxmlgui-6.11.0.tar.xz", + "hash": "sha256-acOmpjY72+PMus524jxszsFz6w+cGVTvcxfZmNbttvw=" }, "modemmanager-qt": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/modemmanager-qt-6.10.0.tar.xz", - "hash": "sha256-ZAo/lkh/Podeg++BXxThB3BCrp7oMnaz1/f8OHXi7hU=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/modemmanager-qt-6.11.0.tar.xz", + "hash": "sha256-pjYyOQLFepq/GZFo6cM7NDLFOOJ2JR5rt851P//vX+4=" }, "networkmanager-qt": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/networkmanager-qt-6.10.0.tar.xz", - "hash": "sha256-L0N6trU0+33N5u1A69wsFoBTL3QrjjJupopHrlgXMZE=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/networkmanager-qt-6.11.0.tar.xz", + "hash": "sha256-5uFyMk5Ml4WRKZ4pga1q445dHj1422rIN1FgSvICtgw=" }, "prison": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/prison-6.10.0.tar.xz", - "hash": "sha256-tKDzleylDIGPjgZWsEZkeDRTsamnCaSkWori4nNgLHs=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/prison-6.11.0.tar.xz", + "hash": "sha256-fMjf8+8XKyTRDuUMCHbXnIdzC2+yO9Z4cI93cLnaTyA=" }, "purpose": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/purpose-6.10.0.tar.xz", - "hash": "sha256-Gd55Q993LBtc4ncQmaF1Nul+f/bFpUEcE0bCWyTlGlc=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/purpose-6.11.0.tar.xz", + "hash": "sha256-SOFy8Fhp4aLMGeDrYjCuEs/iPSNLQNbTuy9BHH9phOA=" }, "qqc2-desktop-style": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/qqc2-desktop-style-6.10.0.tar.xz", - "hash": "sha256-nhlUD4+n0Oah/7HDU6JOjH+OKzeoWUOTr3pNXZ4OjlE=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/qqc2-desktop-style-6.11.0.tar.xz", + "hash": "sha256-mWVCcWGWv6yKIoo2tGGMmS4ZN4J3nc9BONY444MGZSw=" }, "solid": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/solid-6.10.0.tar.xz", - "hash": "sha256-JIkugaMEf3U1GdvThLR2NcWiVD2O4L88KZsPz+8xjow=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/solid-6.11.0.tar.xz", + "hash": "sha256-zezHZluAGlCLmtCSmwJayT/ih75QNYnI2MOKUgwlCNc=" }, "sonnet": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/sonnet-6.10.0.tar.xz", - "hash": "sha256-mcC8pWNZT9EV8x8YrTJkdwBGKQxmld7Q0qo8Lt2w1Lc=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/sonnet-6.11.0.tar.xz", + "hash": "sha256-GUQd5i2dl/YeSNJuADVD51YHsrqPbk/rGflWKJryHWA=" }, "syndication": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/syndication-6.10.0.tar.xz", - "hash": "sha256-p0PFJegG5fB7W3snz+NIghALIStNhG5mHGGieuE5YzA=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/syndication-6.11.0.tar.xz", + "hash": "sha256-2InFU6UYkzkhfo0GtihZWro8hCt0aT56gXlgaxNinh0=" }, "syntax-highlighting": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/syntax-highlighting-6.10.0.tar.xz", - "hash": "sha256-tbXjQ/8nvFyVvgBR1WBt/LMpX4NYMOf8bayNKGOJFpk=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/syntax-highlighting-6.11.0.tar.xz", + "hash": "sha256-sj274ZUDCiknyq/F/fTKejcsRMqVAT1hFQN/5i4fy1E=" }, "threadweaver": { - "version": "6.10.0", - "url": "mirror://kde/stable/frameworks/6.10/threadweaver-6.10.0.tar.xz", - "hash": "sha256-E2pjajPM+po3Wi4e5QN2CgqRAAK5cr4O7yA1LrEGu4Q=" + "version": "6.11.0", + "url": "mirror://kde/stable/frameworks/6.11/threadweaver-6.11.0.tar.xz", + "hash": "sha256-xAjZ7zwT6ZBubvGhYt71v3RZ8JkZexeI6z2W30UF3Y8=" } } \ No newline at end of file From c84ff169cceb1fdac7c6cff38f50b90f9eca787a Mon Sep 17 00:00:00 2001 From: Jonas Rembser Date: Mon, 23 Dec 2024 05:15:28 +0100 Subject: [PATCH 0446/1107] root: 6.34.02 -> 6.34.04 Also enables one more feature of ROOT (support of convolutions via fftw). Furthermore removes a patch related to building Clad from source that is not needed anymore thanks to https://github.com/root-project/root/pull/17308. --- pkgs/by-name/ro/root/package.nix | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/ro/root/package.nix b/pkgs/by-name/ro/root/package.nix index a1948927f76a..a7804f7bf050 100644 --- a/pkgs/by-name/ro/root/package.nix +++ b/pkgs/by-name/ro/root/package.nix @@ -11,18 +11,14 @@ coreutils, git, davix, + fftw, ftgl, gl2ps, glew, gnugrep, gnused, gsl, - gtest, lapack, - libX11, - libXpm, - libXft, - libXext, libGLU, libGL, libxcrypt, @@ -30,6 +26,7 @@ llvm_18, lsof, lz4, + xorg, xz, man, openblas, @@ -56,7 +53,7 @@ stdenv.mkDerivation rec { pname = "root"; - version = "6.34.02"; + version = "6.34.04"; passthru = { tests = import ./tests { inherit callPackage; }; @@ -64,7 +61,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - hash = "sha256-FmvsVi5CDhd6rzEz+j+wn4Ls3avoouGQY0W61EJRP5Q="; + hash = "sha256-4yDFNzqOh7sptygJVMqDVa2MQpXPSSNWBvDIsgCss3Q="; }; clad_src = fetchgit { @@ -87,12 +84,12 @@ stdenv.mkDerivation rec { buildInputs = [ davix + fftw ftgl giflib gl2ps glew gsl - gtest lapack libjpeg libpng @@ -117,12 +114,12 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk.privateFrameworksHook ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - libX11 - libXpm - libXft - libXext libGLU libGL + xorg.libX11 + xorg.libXpm + xorg.libXft + xorg.libXext ]; preConfigure = @@ -135,9 +132,6 @@ stdenv.mkDerivation rec { substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \ --replace-fail 'set(lcgpackages ' '#set(lcgpackages ' - # Make sure that clad is not downloaded when building - substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \ - --replace-fail 'UPDATE_COMMAND ""' 'DOWNLOAD_COMMAND "" UPDATE_COMMAND ""' # Make sure that clad is finding the right llvm version substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \ --replace-fail '-DLLVM_DIR=''${LLVM_BINARY_DIR}' '-DLLVM_DIR=''${LLVM_CMAKE_PATH}' @@ -151,6 +145,9 @@ stdenv.mkDerivation rec { # Eliminate impure reference to /System/Library/PrivateFrameworks substituteInPlace core/macosx/CMakeLists.txt \ --replace-fail "-F/System/Library/PrivateFrameworks " "" + # Just like in libpng/12.nix to build the builtin libpng on macOS + substituteInPlace graf2d/asimage/src/libAfterImage/libpng/pngpriv.h \ + --replace-fail '' '' '' + lib.optionalString @@ -167,6 +164,7 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_LIBDIR=lib" "-Dbuiltin_llvm=OFF" "-Dfail-on-missing=ON" + "-Dfftw3=ON" "-Dfitsio=OFF" "-Dgnuinstall=ON" "-Dmathmore=ON" From 68e78b27a0e8639e3ad1066173bac71cd68ebdf2 Mon Sep 17 00:00:00 2001 From: kilianar Date: Sun, 9 Feb 2025 21:24:58 +0100 Subject: [PATCH 0447/1107] calibre: 7.24.0 -> 7.26.0 https://github.com/kovidgoyal/calibre/releases/tag/v7.26.0 --- pkgs/by-name/ca/calibre/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix index 2d1ca03a1177..69a5e3b7d0c9 100644 --- a/pkgs/by-name/ca/calibre/package.nix +++ b/pkgs/by-name/ca/calibre/package.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "calibre"; - version = "7.24.0"; + version = "7.26.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-ftqi6ANY/w4CdcMUAzRn9GOpNbSz36mnNcGHv8ffKbQ="; + hash = "sha256-Cps2x3ZV68jaZ+cIJgQEeh++GG81Y9yX7mC7WKvFcCc="; }; patches = [ @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { (fetchpatch { name = "0007-Hardening-Qt-code.patch"; url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}+ds-1/debian/patches/hardening/0007-Hardening-Qt-code.patch"; - hash = "sha256-9hi4T9LB7aklWASMR8hIuKBgZm2arDvORfmk9S8wgCA="; + hash = "sha256-V/ZUTH0l4QSfM0dHrgLGdJjF/CCQ0S/fnCP/ZKD563U="; }) ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; From 3af42b67639f7ccd02cff924b5028a04d22b757f Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Tue, 11 Feb 2025 03:13:54 -0500 Subject: [PATCH 0448/1107] turbo: 2.3.4 -> 2.4.2 Diff: https://github.com/vercel/turbo/compare/refs/tags/v2.3.4...2.4.2 Changelog: https://github.com/vercel/turbo/releases/tag/v2.4.2 --- pkgs/by-name/tu/turbo-unwrapped/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tu/turbo-unwrapped/package.nix b/pkgs/by-name/tu/turbo-unwrapped/package.nix index 8223b592248c..6c2d6f4c7549 100644 --- a/pkgs/by-name/tu/turbo-unwrapped/package.nix +++ b/pkgs/by-name/tu/turbo-unwrapped/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage rec { pname = "turbo-unwrapped"; - version = "2.3.4"; + version = "2.4.2"; src = fetchFromGitHub { owner = "vercel"; repo = "turbo"; tag = "v${version}"; - hash = "sha256-cvwYBdvBxkntCXA4FJMc54Rca+zoZEjyWZUQoMH9Qdc="; + hash = "sha256-wXQY9W15J7+Plv3IvB8XaZd+Hn0TP2qDOB36bPJwfpY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-e9xq3xc8Rtuq3e/3IEwj9eR9SEj5N4bvsu4PFubm8mM="; + cargoHash = "sha256-L56ubw2tQ3y2KBbbnUdnS9xZzQNMDKdCzKC0n12yl6o="; nativeBuildInputs = [ From 2f5acdf8d6f3f9091b08a1c91a9d7e22c5a2d071 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 00:35:37 +0000 Subject: [PATCH 0449/1107] clinfo: 3.0.23.01.25 -> 3.0.25.02.14 --- pkgs/tools/system/clinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/clinfo/default.nix b/pkgs/tools/system/clinfo/default.nix index 48b5d4672b8a..4db3a1d780ba 100644 --- a/pkgs/tools/system/clinfo/default.nix +++ b/pkgs/tools/system/clinfo/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "clinfo"; - version = "3.0.23.01.25"; + version = "3.0.25.02.14"; src = fetchFromGitHub { owner = "Oblomov"; repo = "clinfo"; rev = version; - sha256 = "sha256-1jZP4SnLIHh3vQJLBp+j/eQ1c8XBGFR2hjYxflhpWAU="; + sha256 = "sha256-UkkrRpmY5vZtTeEqPNYfxAGaJDoTSrNUG9N1Bknozow="; }; buildInputs = From 23fa51cef1e6c82d4f3919356ad034923e14b8f5 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 15 Feb 2025 01:58:50 +0000 Subject: [PATCH 0450/1107] python3Packages.langchain-core: 0.3.31 -> 0.3.35 Diff: https://github.com/langchain-ai/langchain/compare/refs/tags/langchain-core==0.3.31...langchain-core==0.3.35 Changelog: https://github.com/langchain-ai/langchain/releases/tag/v0.3.35 --- .../python-modules/langchain-core/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index d1a5c9f77b64..ef6e79ac0220 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -5,19 +5,17 @@ fetchFromGitHub, # build-system - poetry-core, + pdm-backend, # dependencies jsonpatch, langsmith, packaging, + pydantic, pyyaml, tenacity, typing-extensions, - # optional-dependencies - pydantic, - # tests freezegun, grandalf, @@ -37,19 +35,19 @@ buildPythonPackage rec { pname = "langchain-core"; - version = "0.3.31"; + version = "0.3.35"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-core==${version}"; - hash = "sha256-u+Za7NtXVP0Mg6K65CuRLx8OrVpBXEe1ayP0uMUNJG4="; + hash = "sha256-bwNSeXQJsfbc4c8mSd0GtlVsQ/HRilNiyP6XLcEzL20="; }; sourceRoot = "${src.name}/libs/core"; - build-system = [ poetry-core ]; + build-system = [ pdm-backend ]; pythonRelaxDeps = [ "tenacity" ]; @@ -57,15 +55,12 @@ buildPythonPackage rec { jsonpatch langsmith packaging + pydantic pyyaml tenacity typing-extensions ]; - optional-dependencies = { - pydantic = [ pydantic ]; - }; - pythonImportsCheck = [ "langchain_core" ]; # avoid infinite recursion From 0cc7d8f0cbd5e3352b3565e05ce2c86859363be2 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 15 Feb 2025 01:59:37 +0000 Subject: [PATCH 0451/1107] python3Packages.langchain-text-splitters: 0.3.5 -> 0.3.6 Diff: https://github.com/langchain-ai/langchain/compare/refs/tags/langchain-text-splitters==0.3.5...langchain-text-splitters==0.3.6 Changelog: https://github.com/langchain-ai/langchain/releases/tag/langchain-text-splitters==0.3.6 --- .../python-modules/langchain-text-splitters/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix index e3088d5acccb..746c953d873b 100644 --- a/pkgs/development/python-modules/langchain-text-splitters/default.nix +++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, # build-system - poetry-core, + pdm-backend, # dependencies langchain-core, @@ -17,19 +17,19 @@ buildPythonPackage rec { pname = "langchain-text-splitters"; - version = "0.3.5"; + version = "0.3.6"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-text-splitters==${version}"; - hash = "sha256-2IoNUixZ/+o6ONJpqFa3Z5CLpxj6b6z8dh89kxh2rP4="; + hash = "sha256-mYaIVE/v+t7TJw/l87IJcFh893OTIew6jl6OVj0gXCo="; }; sourceRoot = "${src.name}/libs/text-splitters"; - build-system = [ poetry-core ]; + build-system = [ pdm-backend ]; dependencies = [ langchain-core ]; From f8fbcac1b4bba8bdf2668952795863bab48ded7b Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 15 Feb 2025 02:00:18 +0000 Subject: [PATCH 0452/1107] python3Packages.langchain: 0.3.15 -> 0.3.18 Diff: https://github.com/langchain-ai/langchain/compare/refs/tags/langchain==0.3.15...langchain==0.3.18 Changelog: https://github.com/langchain-ai/langchain/releases/tag/v0.3.18 --- .../python-modules/langchain/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index 1c84fceb2e70..39cb8a41908d 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -2,27 +2,27 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonOlder, # build-system - poetry-core, + pdm-backend, # buildInputs bash, # dependencies aiohttp, + async-timeout, langchain-core, langchain-text-splitters, langsmith, + numpy, pydantic, pyyaml, requests, sqlalchemy, tenacity, - # optional-dependencies - numpy, - # tests freezegun, httpx, @@ -40,19 +40,19 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.3.15"; + version = "0.3.18"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain==${version}"; - hash = "sha256-lANGoMABH1f9Tl/GgMMr7eTCji9q3uqD+Mwjr4nd2Dg="; + hash = "sha256-oJ4lUbQqHNEqd9UdgLH0ZmTkdZpUbJ7UNsQyIrs8JvI="; }; sourceRoot = "${src.name}/libs/langchain"; - build-system = [ poetry-core ]; + build-system = [ pdm-backend ]; buildInputs = [ bash ]; @@ -66,12 +66,13 @@ buildPythonPackage rec { langchain-core langchain-text-splitters langsmith + numpy pydantic pyyaml requests sqlalchemy tenacity - ]; + ] ++ lib.optional (pythonOlder "3.11") async-timeout; optional-dependencies = { numpy = [ numpy ]; From 3f8e227f543b31a20dd35e35bd9396530f7deebe Mon Sep 17 00:00:00 2001 From: Aos Dabbagh <25783780+aos@users.noreply.github.com> Date: Fri, 14 Feb 2025 13:06:11 -0500 Subject: [PATCH 0453/1107] python3Packages.llm-anthropic: init at 0.12 Closes #327800 Closes #372713 (Note: This is just #373495 upgraded to `0.12`. Seems like something happened with git/Github and my PR was automatically closed.) This is a plugin for the already packaged `llm` software. There exists 2 PRs related to this: - #327800: the original - #372713: forks the original and updates as it had no activity for multiple months As helpfully pointed out by @ShaddyDC (https://github.com/NixOS/nixpkgs/pull/372713#issuecomment-2586795561) this is now superseded by `llm-anthropic`, of which this is meant to package. (We also have other PRs that have been commited that add similr plugins at #359379 and #344746.) --- .../python-modules/llm-anthropic/default.nix | 55 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/python-modules/llm-anthropic/default.nix diff --git a/pkgs/development/python-modules/llm-anthropic/default.nix b/pkgs/development/python-modules/llm-anthropic/default.nix new file mode 100644 index 000000000000..d3788ffa7642 --- /dev/null +++ b/pkgs/development/python-modules/llm-anthropic/default.nix @@ -0,0 +1,55 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + llm, + anthropic, + pytestCheckHook, + pytest-asyncio, + pytest-recording, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "llm-anthropic"; + version = "0.12"; + pyproject = true; + + src = fetchFromGitHub { + owner = "simonw"; + repo = "llm-anthropic"; + tag = version; + hash = "sha256-7+5j5jZBFfaaqnfjvLTI+mz1PUuG8sB5nD59UCpJuR4="; + }; + + build-system = [ + setuptools + llm + ]; + dependencies = [ anthropic ]; + + # Otherwise tests will fail to create directory + # Permission denied: '/homeless-shelter' + preCheck = '' + export HOME=$(mktemp -d) + ''; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + pytest-recording + ]; + + pythonImportsCheck = [ "llm_anthropic" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "LLM access to models by Anthropic, including the Claude series"; + homepage = "https://github.com/simonw/llm-anthropic"; + changelog = "https://github.com/simonw/llm-anthropic/releases/tag/${version}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ aos ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 782cf2c469a9..7a2a51d130e0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7697,6 +7697,8 @@ self: super: with self; { llm = callPackage ../development/python-modules/llm { }; + llm-anthropic = callPackage ../development/python-modules/llm-anthropic { }; + llm-cmd = callPackage ../development/python-modules/llm-cmd { }; llm-gguf = callPackage ../development/python-modules/llm-gguf { }; From 1ac75001649e3822e9caffaad85d7f1db76e9482 Mon Sep 17 00:00:00 2001 From: kotatsuyaki Date: Tue, 28 Jan 2025 00:21:44 +0800 Subject: [PATCH 0454/1107] mox: 0.0.10 -> 0.0.14 --- pkgs/by-name/mo/mox/package.nix | 12 ++++++++---- pkgs/by-name/mo/mox/version.patch | 26 ++++++++++++++++++++------ 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/mo/mox/package.nix b/pkgs/by-name/mo/mox/package.nix index 749e4d2e4515..6c4c5addeb13 100644 --- a/pkgs/by-name/mo/mox/package.nix +++ b/pkgs/by-name/mo/mox/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "mox"; - version = "0.0.10"; + version = "0.0.14"; src = fetchFromGitHub { owner = "mjl-"; repo = "mox"; - rev = "v${version}"; - hash = "sha256-BigxFlMkagw82Lkz1xMMSwAJyfSdSbeQr6G6rCaomNg="; + tag = "v${version}"; + hash = "sha256-cBTY4SjQxdM5jXantLws1ckGVn3/b0/iVPFunBy09YQ="; }; # set the version during buildtime @@ -24,6 +24,7 @@ buildGoModule rec { "-s" "-w" "-X github.com/mjl-/mox/moxvar.Version=${version}" + "-X github.com/mjl-/mox/moxvar.VersionBare=${version}" ]; meta = { @@ -31,6 +32,9 @@ buildGoModule rec { mainProgram = "mox"; homepage = "https://github.com/mjl-/mox"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dit7ya ]; + maintainers = with lib.maintainers; [ + dit7ya + kotatsuyaki + ]; }; } diff --git a/pkgs/by-name/mo/mox/version.patch b/pkgs/by-name/mo/mox/version.patch index c842275ac9e4..66dc48c0e864 100644 --- a/pkgs/by-name/mo/mox/version.patch +++ b/pkgs/by-name/mo/mox/version.patch @@ -1,24 +1,37 @@ diff --git a/moxvar/version.go b/moxvar/version.go -index 8c6bac8..69b5f7c 100644 +index 0b69cd9..9a5a5da 100644 --- a/moxvar/version.go +++ b/moxvar/version.go -@@ -1,38 +1,5 @@ +@@ -1,51 +1,6 @@ // Package moxvar provides the version number of a mox build. package moxvar - + -import ( +- "runtime" - "runtime/debug" -) - -// Version is set at runtime based on the Go module used to build. --var Version = "(devel)" ++// Version and VersionBare are set via a build flag. + var Version string +- +-// VersionBare does not add a "+modifications", goversion or other suffix to the version. +-var VersionBare string - -func init() { +- Version = "(devel)" +- VersionBare = "(devel)" +- +- defer func() { +- Version += "-" + runtime.Version() +- }() +- - buildInfo, ok := debug.ReadBuildInfo() - if !ok { - return - } - Version = buildInfo.Main.Version +- VersionBare = buildInfo.Main.Version - if Version == "(devel)" { - var vcsRev, vcsMod string - for _, setting := range buildInfo.Settings { @@ -32,6 +45,7 @@ index 8c6bac8..69b5f7c 100644 - return - } - Version = vcsRev +- VersionBare = vcsRev - switch vcsMod { - case "false": - case "true": @@ -41,5 +55,5 @@ index 8c6bac8..69b5f7c 100644 - } - } -} -+// Version is set via a build flag -+var Version string; ++var VersionBare string +\ No newline at end of file From cbebd8b37d0a17330bbdb5c85db3bdda490995e4 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 15 Feb 2025 07:15:57 +0300 Subject: [PATCH 0455/1107] xmlsec: 1.3.6 -> 1.3.7 --- pkgs/by-name/xm/xmlsec/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xm/xmlsec/package.nix b/pkgs/by-name/xm/xmlsec/package.nix index fe39e7147660..6702290cc24a 100644 --- a/pkgs/by-name/xm/xmlsec/package.nix +++ b/pkgs/by-name/xm/xmlsec/package.nix @@ -4,11 +4,11 @@ lib.fix (self: stdenv.mkDerivation rec { pname = "xmlsec"; - version = "1.3.6"; + version = "1.3.7"; src = fetchurl { url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; - sha256 = "sha256-lStiatPzvhpFmGItq1L9qyqGBNCDfBsAWJ82N1Na+S8="; + sha256 = "sha256-2C6TtpuKogWmFrYpF6JpMiv2Oj6q+zd1AU5hdSsgE+o="; }; patches = [ From b4af5c72afd583278aa4a231e9a83739b1bb528a Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 15 Feb 2025 07:53:24 +0300 Subject: [PATCH 0456/1107] wavpack: 5.8.0 -> 5.8.1 Diff: https://github.com/dbry/WavPack/compare/5.8.0...5.8.1 Changelog: https://github.com/dbry/WavPack/releases/tag/5.8.1 --- pkgs/by-name/wa/wavpack/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/wavpack/package.nix b/pkgs/by-name/wa/wavpack/package.nix index fb7dea59c951..3dbe41e1d949 100644 --- a/pkgs/by-name/wa/wavpack/package.nix +++ b/pkgs/by-name/wa/wavpack/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "wavpack"; - version = "5.8.0"; + version = "5.8.1"; enableParallelBuilding = true; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "dbry"; repo = "WavPack"; rev = version; - hash = "sha256-JT4WOlga3jyHMznEJmgc6EQIAVBZdlazmQphJC1+r4s="; + hash = "sha256-V9jRIuDpZYIBohJRouGr2TI32BZMXSNVfavqPl56YO0="; }; outputs = [ From 3781c5e8db5fd3b0b7455398e613158795816197 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 14:47:11 +0000 Subject: [PATCH 0457/1107] 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 d82f85b92605f7ff85ef88c5c7ee907757a55907 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 Feb 2025 10:00:46 +0100 Subject: [PATCH 0458/1107] python313Packages.browserforge: init at 1.1.0 Intelligent browser header & fingerprint generator https://github.com/daijro/browserforge --- .../python-modules/browserforge/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/browserforge/default.nix diff --git a/pkgs/development/python-modules/browserforge/default.nix b/pkgs/development/python-modules/browserforge/default.nix new file mode 100644 index 000000000000..a9c9b50ac338 --- /dev/null +++ b/pkgs/development/python-modules/browserforge/default.nix @@ -0,0 +1,49 @@ +{ + lib, + aiofiles, + buildPythonPackage, + click, + fetchFromGitHub, + httpx, + orjson, + poetry-core, + pythonOlder, + rich, +}: + +buildPythonPackage rec { + pname = "browserforge"; + version = "1.1.0"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "daijro"; + repo = "browserforge"; + tag = "v${version}"; + hash = "sha256-+uBKVugPScr0gggYaxAdelLKKrmXGY6rWTwhFqBMTcA="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + aiofiles + click + httpx + orjson + rich + ]; + + # Module has no test + doCheck = false; + + pythonImportsCheck = [ "browserforge" ]; + + meta = { + description = "Intelligent browser header & fingerprint generator"; + homepage = "https://github.com/daijro/browserforge"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 34c3ba4022d3..65303f03893b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1938,6 +1938,8 @@ self: super: with self; { browser-cookie3 = callPackage ../development/python-modules/browser-cookie3 { }; + browserforge = callPackage ../development/python-modules/browserforge { }; + brunt = callPackage ../development/python-modules/brunt { }; bsddb3 = callPackage ../development/python-modules/bsddb3 { }; From 6d7f6a92cc5830f28dc56e4de8a4dc18c7ceda69 Mon Sep 17 00:00:00 2001 From: Jeremy Fleischman Date: Sun, 12 Jan 2025 12:21:10 -0800 Subject: [PATCH 0459/1107] lib/types: add `types.pathWith` This gives people some flexibility when they need a path type, and prevents a "combinatorial explosion" of various path stops. I've re-implemented our existing `path` and `pathInStore` types using `pathWith`. Our existing `package` type is potentially a candidate for similar treatment, but it's a little quirkier (there's some stuff with `builtins.hasContext` and `toDerivation` that I don't completely understand), and I didn't want to muddy this PR with that. As a happy side effect of this work, we get a new feature: the ability to create a type for paths *not* in the store. This is useful for when a module needs a path to a file, and wants to protect people from accidentally leaking that file into the nix store. --- lib/tests/modules.sh | 36 ++++++++ lib/tests/modules/pathWith.nix | 88 +++++++++++++++++++ lib/types.nix | 49 ++++++++--- .../development/option-types.section.md | 27 +++++- 4 files changed, 186 insertions(+), 14 deletions(-) create mode 100644 lib/tests/modules/pathWith.nix diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index c86e0aeec6dc..243fbce1ecb5 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -586,6 +586,42 @@ checkConfigOutput '^38|27$' options.submoduleLine38.declarationPositions.1.line # nested options work checkConfigOutput '^34$' options.nested.nestedLine34.declarationPositions.0.line ./declaration-positions.nix +# types.pathWith { inStore = true; } +checkConfigOutput '".*/store/0lz9p8xhf89kb1c1kk6jxrzskaiygnlh-bash-5.2-p15.drv"' config.pathInStore.ok1 ./pathWith.nix +checkConfigOutput '".*/store/0fb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15"' config.pathInStore.ok2 ./pathWith.nix +checkConfigOutput '".*/store/0fb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15/bin/bash"' config.pathInStore.ok3 ./pathWith.nix +checkConfigError 'A definition for option .* is not of type .path in the Nix store.. Definition values:\n\s*- In .*: ""' config.pathInStore.bad1 ./pathWith.nix +checkConfigError 'A definition for option .* is not of type .path in the Nix store.. Definition values:\n\s*- In .*: ".*/store"' config.pathInStore.bad2 ./pathWith.nix +checkConfigError 'A definition for option .* is not of type .path in the Nix store.. Definition values:\n\s*- In .*: ".*/store/"' config.pathInStore.bad3 ./pathWith.nix +checkConfigError 'A definition for option .* is not of type .path in the Nix store.. Definition values:\n\s*- In .*: ".*/store/.links"' config.pathInStore.bad4 ./pathWith.nix +checkConfigError 'A definition for option .* is not of type .path in the Nix store.. Definition values:\n\s*- In .*: "/foo/bar"' config.pathInStore.bad5 ./pathWith.nix + +# types.pathWith { inStore = false; } +checkConfigOutput '"/foo/bar"' config.pathNotInStore.ok1 ./pathWith.nix +checkConfigOutput '".*/store"' config.pathNotInStore.ok2 ./pathWith.nix +checkConfigOutput '".*/store/"' config.pathNotInStore.ok3 ./pathWith.nix +checkConfigOutput '""' config.pathNotInStore.ok4 ./pathWith.nix +checkConfigOutput '".*/store/.links"' config.pathNotInStore.ok5 ./pathWith.nix +checkConfigError 'A definition for option .* is not of type .path not in the Nix store.. Definition values:\n\s*- In .*: ".*/0lz9p8xhf89kb1c1kk6jxrzskaiygnlh-bash-5.2-p15.drv"' config.pathNotInStore.bad1 ./pathWith.nix +checkConfigError 'A definition for option .* is not of type .path not in the Nix store.. Definition values:\n\s*- In .*: ".*/0fb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15"' config.pathNotInStore.bad2 ./pathWith.nix +checkConfigError 'A definition for option .* is not of type .path not in the Nix store.. Definition values:\n\s*- In .*: ".*/0fb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15/bin/bash"' config.pathNotInStore.bad3 ./pathWith.nix +checkConfigError 'A definition for option .* is not of type .path not in the Nix store.. Definition values:\n\s*- In .*: .*/pathWith.nix' config.pathNotInStore.bad4 ./pathWith.nix + +# types.pathWith { } +checkConfigOutput '"/this/is/absolute"' config.anyPath.ok1 ./pathWith.nix +checkConfigOutput '"./this/is/relative"' config.anyPath.ok2 ./pathWith.nix +checkConfigError 'A definition for option .anyPath.bad1. is not of type .path.' config.anyPath.bad1 ./pathWith.nix + +# types.pathWith { absolute = true; } +checkConfigOutput '"/this/is/absolute"' config.absolutePathNotInStore.ok1 ./pathWith.nix +checkConfigError 'A definition for option .absolutePathNotInStore.bad1. is not of type .absolute path not in the Nix store.' config.absolutePathNotInStore.bad1 ./pathWith.nix +checkConfigError 'A definition for option .absolutePathNotInStore.bad2. is not of type .absolute path not in the Nix store.' config.absolutePathNotInStore.bad2 ./pathWith.nix + +# types.pathWith failed type merge +checkConfigError 'The option .conflictingPathOptionType. in .*/pathWith.nix. is already declared in .*/pathWith.nix' config.conflictingPathOptionType ./pathWith.nix + +# types.pathWith { inStore = true; absolute = false; } +checkConfigError 'In pathWith, inStore means the path must be absolute' config.impossiblePathOptionType ./pathWith.nix cat < Date: Sat, 15 Feb 2025 18:40:54 +0800 Subject: [PATCH 0460/1107] argo-workflows: rename from argo to align with upstream --- pkgs/by-name/ar/{argo => argo-workflows}/package.nix | 2 +- pkgs/by-name/ar/{argo => argo-workflows}/staticfiles.go.mod | 0 pkgs/top-level/aliases.nix | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) rename pkgs/by-name/ar/{argo => argo-workflows}/package.nix (98%) rename pkgs/by-name/ar/{argo => argo-workflows}/staticfiles.go.mod (100%) diff --git a/pkgs/by-name/ar/argo/package.nix b/pkgs/by-name/ar/argo-workflows/package.nix similarity index 98% rename from pkgs/by-name/ar/argo/package.nix rename to pkgs/by-name/ar/argo-workflows/package.nix index f4a8825b9554..c74969733c71 100644 --- a/pkgs/by-name/ar/argo/package.nix +++ b/pkgs/by-name/ar/argo-workflows/package.nix @@ -33,7 +33,7 @@ let }; in buildGoModule rec { - pname = "argo"; + pname = "argo-workflows"; version = "3.6.3"; src = fetchFromGitHub { diff --git a/pkgs/by-name/ar/argo/staticfiles.go.mod b/pkgs/by-name/ar/argo-workflows/staticfiles.go.mod similarity index 100% rename from pkgs/by-name/ar/argo/staticfiles.go.mod rename to pkgs/by-name/ar/argo-workflows/staticfiles.go.mod diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c5cb1be5ddf5..9bb4ecc61dbb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -121,6 +121,7 @@ mapAliases { apple-sdk_10_15 = throw "apple-sdk_10_15 was removed as Nixpkgs no longer supports macOS 10.15; see the 25.05 release notes"; # Added 2024-10-27 appthreat-depscan = dep-scan; # Added 2024-04-10 arcanist = throw "arcanist was removed as phabricator is not supported and does not accept fixes"; # Added 2024-06-07 + argo = argo-workflows; # Added 2025-02-01 aria = aria2; # Added 2024-03-26 armcord = throw "ArmCord was renamed to legcord by the upstream developers. Action is required to migrate configurations between the two applications. Please see this PR for more details: https://github.com/NixOS/nixpkgs/pull/347971"; # Added 2024-10-11 aseprite-unfree = aseprite; # Added 2023-08-26 From c87dcd820cf9a5d50344fde10f9aab072c454234 Mon Sep 17 00:00:00 2001 From: Okko Date: Sat, 15 Feb 2025 16:27:59 +0200 Subject: [PATCH 0461/1107] hvm: 2.0.19 -> 2.0.22 --- pkgs/by-name/hv/hvm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hv/hvm/package.nix b/pkgs/by-name/hv/hvm/package.nix index 071fbdf149b9..a6a9d39cb309 100644 --- a/pkgs/by-name/hv/hvm/package.nix +++ b/pkgs/by-name/hv/hvm/package.nix @@ -6,15 +6,15 @@ rustPlatform.buildRustPackage rec { pname = "hvm"; - version = "2.0.19"; + version = "2.0.22"; src = fetchCrate { inherit pname version; - hash = "sha256-+Cx+2v4JrQflDBaNZ9Fu8734Zr4rrgtnojUS4dkx7Ck="; + hash = "sha256-AD8mv47m4E6H8BVkxTExyhrR7VEnuB/KxnRl2puPnX4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-HpQQLFb9vUAGIEKrkGKOfUUNALYGnKCR3/HqA+qvamw="; + cargoHash = "sha256-nLcT+o6xrxPmQqK7FQpCqTlxOOUA1FzqRGQIypcq4fo="; meta = with lib; { description = "Massively parallel, optimal functional runtime in Rust"; From b8b54fc95c8b193b517e3b83aeb9ed0f73c5ebfc Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 15 Feb 2025 02:01:00 +0000 Subject: [PATCH 0462/1107] python3Packages.langchain-community: 0.3.15 -> 0.3.17 Diff: https://github.com/langchain-ai/langchain/compare/refs/tags/langchain-community==0.3.15...langchain-community==0.3.17 Changelog: https://github.com/langchain-ai/langchain/releases/tag/langchain-community==0.3.17 --- .../langchain-community/default.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix index f7e43dae3162..0af7ae2e6267 100644 --- a/pkgs/development/python-modules/langchain-community/default.nix +++ b/pkgs/development/python-modules/langchain-community/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, # build-system - poetry-core, + pdm-backend, # dependencies aiohttp, @@ -13,16 +13,13 @@ langchain, langchain-core, langsmith, + numpy, pydantic-settings, pyyaml, requests, sqlalchemy, tenacity, - # optional-dependencies - typer, - numpy, - # tests httpx, langchain-tests, @@ -39,19 +36,19 @@ buildPythonPackage rec { pname = "langchain-community"; - version = "0.3.15"; + version = "0.3.17"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-community==${version}"; - hash = "sha256-2/Zrl/wED/zm1m+NqgAD4AdrEh/LjFOeQoOSSM05e+s="; + hash = "sha256-+10Q8em74G5RU6VtDqhQJuDsjJ4/EjGM4a3xQzs3Qzo="; }; sourceRoot = "${src.name}/libs/community"; - build-system = [ poetry-core ]; + build-system = [ pdm-backend ]; pythonRelaxDeps = [ "numpy" @@ -66,6 +63,7 @@ buildPythonPackage rec { langchain langchain-core langsmith + numpy pydantic-settings pyyaml requests @@ -73,11 +71,6 @@ buildPythonPackage rec { tenacity ]; - optional-dependencies = { - cli = [ typer ]; - numpy = [ numpy ]; - }; - pythonImportsCheck = [ "langchain_community" ]; nativeCheckInputs = [ From 1aba20200a64db61585ca17df8956d66351f83f3 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 15 Feb 2025 02:02:38 +0000 Subject: [PATCH 0463/1107] python3Packages.langchain-chroma: 0.2.0 -> 0.2.2 Diff: https://github.com/langchain-ai/langchain/compare/refs/tags/langchain-chroma==0.2.0...langchain-chroma==0.2.2 Changelog: https://github.com/langchain-ai/langchain/releases/tag/langchain-chroma==0.2.2 --- .../python-modules/langchain-chroma/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/langchain-chroma/default.nix b/pkgs/development/python-modules/langchain-chroma/default.nix index 53641f07cf33..f074d7f3f53a 100644 --- a/pkgs/development/python-modules/langchain-chroma/default.nix +++ b/pkgs/development/python-modules/langchain-chroma/default.nix @@ -6,28 +6,28 @@ langchain-core, langchain-tests, numpy, - poetry-core, + pdm-backend, pytestCheckHook, pytest-asyncio, }: buildPythonPackage rec { pname = "langchain-chroma"; - version = "0.2.0"; + version = "0.2.2"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-chroma==${version}"; - hash = "sha256-9YxWLc8SaxTl7LwbK0FGzl2WtkWJzTHxm3VRYFGB5To="; + hash = "sha256-GFDaUA0E25YDHYLwrpsAuOiBWFvHByl61XhwK5NmJbg="; }; sourceRoot = "${src.name}/libs/partners/chroma"; patches = [ ./001-async-test.patch ]; - build-system = [ poetry-core ]; + build-system = [ pdm-backend ]; pythonRelaxDeps = [ "numpy" ]; From 2a4103d4ba7517290919699e588752c74d327eb0 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 15 Feb 2025 02:03:44 +0000 Subject: [PATCH 0464/1107] python3Packages.langchain-openai: 0.3.1 -> 0.3.5 Diff: https://github.com/langchain-ai/langchain/compare/refs/tags/langchain-openai==0.3.1...langchain-openai==0.3.5 Changelog: https://github.com/langchain-ai/langchain/releases/tag/langchain-openai==0.3.5 --- .../python-modules/langchain-openai/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/langchain-openai/default.nix b/pkgs/development/python-modules/langchain-openai/default.nix index 14530258f51a..9cbbaabf86eb 100644 --- a/pkgs/development/python-modules/langchain-openai/default.nix +++ b/pkgs/development/python-modules/langchain-openai/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, # build-system - poetry-core, + pdm-backend, # dependencies langchain-core, @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "langchain-openai"; - version = "0.3.1"; + version = "0.3.5"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-openai==${version}"; - hash = "sha256-WvHSeWdBuxbfMNmfoNMzEbhJ5rirQ4JwlWUa0Tgrlrg="; + hash = "sha256-we9LPZeR/eIr+4uDXbBlTm43iapC+MCB0BrbH49Uknw="; }; sourceRoot = "${src.name}/libs/partners/openai"; @@ -45,7 +45,7 @@ buildPythonPackage rec { --replace-fail "--cov=langchain_openai" "" ''; - build-system = [ poetry-core ]; + build-system = [ pdm-backend ]; dependencies = [ langchain-core From 8343124eba3bd452e86370a5f3439d57cb478d09 Mon Sep 17 00:00:00 2001 From: Okko Date: Sat, 15 Feb 2025 16:29:39 +0200 Subject: [PATCH 0465/1107] bend: 0.2.36 -> 0.2.37 --- pkgs/by-name/be/bend/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/be/bend/package.nix b/pkgs/by-name/be/bend/package.nix index 0a2a095bd384..7f0c34b0fcc0 100644 --- a/pkgs/by-name/be/bend/package.nix +++ b/pkgs/by-name/be/bend/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "Bend"; - version = "0.2.36"; + version = "0.2.37"; src = fetchFromGitHub { owner = "HigherOrderCO"; repo = "Bend"; tag = version; - hash = "sha256-j4YMdeSxIbhp7xT42L42/y0ZncFPKBkxTh0LgO/RjkY="; + hash = "sha256-8uBEI9GKUETk8t6Oanb0OECe3MlJ486QnccOuhIxPuY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-mGpH08VMmqoxXm8EUPdsBvSW/CFyRPY4bfyr8JI1es0="; + cargoHash = "sha256-xac5Gb0hcamT3vymq6SKaMiuEn8NU9Bfhu+t/dcjhTE="; nativeBuildInputs = [ hvm From d40f8a170b6c70fff374937242344ddbff72bdcd Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Sat, 15 Feb 2025 14:22:25 +0100 Subject: [PATCH 0466/1107] 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 e168f650dbaef030e73d29a1103e710266431826 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sat, 15 Feb 2025 15:43:30 +0100 Subject: [PATCH 0467/1107] koto: init at 0.15.2 --- pkgs/by-name/ko/koto/package.nix | 44 ++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 pkgs/by-name/ko/koto/package.nix diff --git a/pkgs/by-name/ko/koto/package.nix b/pkgs/by-name/ko/koto/package.nix new file mode 100644 index 000000000000..2708409d2dec --- /dev/null +++ b/pkgs/by-name/ko/koto/package.nix @@ -0,0 +1,44 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + yq, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "koto"; + version = "0.15.2"; + + src = fetchFromGitHub { + owner = "koto-lang"; + repo = "koto"; + tag = "v${version}"; + hash = "sha256-T8SjNeoTANAcT+uAdgzBRMK0LbC038cpKFoCFHgsp8k="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-kIjDY27ot1dN3L8TKaBEQWDzo7+QIFvhdmi1YN9TofI="; + + postPatch = '' + ${lib.getExe' yq "tomlq"} -ti 'del(.bench)' crates/koto/Cargo.toml + ''; + + cargoBuildFlags = [ "--package=koto_cli" ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Simple, expressive, embeddable programming language"; + homepage = "https://github.com/koto-lang/koto"; + changelog = "https://github.com/koto-lang/koto/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ defelo ]; + mainProgram = "koto"; + }; +} From e73bdbd0f053b919386ed32fa53fad2ea6433e4e Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Sat, 15 Feb 2025 16:47:11 +0100 Subject: [PATCH 0468/1107] outline: 0.81.1 -> 0.82.0 Diff: https://github.com/outline/outline/compare/v0.81.1...v0.82.0 Changelog: https://github.com/outline/outline/releases --- pkgs/servers/web-apps/outline/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix index f6cee4bd1c8a..49f0ae356713 100644 --- a/pkgs/servers/web-apps/outline/default.nix +++ b/pkgs/servers/web-apps/outline/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "outline"; - version = "0.81.1"; + version = "0.82.0"; src = fetchFromGitHub { owner = "outline"; repo = "outline"; rev = "v${version}"; - hash = "sha256-P0JDkuEm5eeVwi0+C7uSytA2NPQXUgJEDxqPiJfRNvs="; + hash = "sha256-nCXyR4k/Ny0OLAE18B+GJDyOMTjt6rc375yj+d+c8zQ="; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-j0mA+2GQZNxQoEi8qwmipUXGjPL4/bY5GHAT0o92Ob0="; + hash = "sha256-RDMVlSVYPGAuyOTcI2CBgaaZ5wNT7lznYb4jbirKmqk="; }; configurePhase = '' From e9e80851ca89e5c5f956a767bd88e1e59b8e2e08 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 15 Feb 2025 18:26:37 +0100 Subject: [PATCH 0469/1107] electron_32-bin: 32.3.0 -> 32.3.1 - Changelog: https://github.com/electron/electron/releases/tag/v32.3.1 - Diff: https://github.com/electron/electron/compare/refs/tags/v32.3.0...v32.3.1 --- pkgs/development/tools/electron/binary/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index f817e8020dec..213cb00aa147 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -67,14 +67,14 @@ }, "32": { "hashes": { - "aarch64-darwin": "7b0071f5162fe81cc020e76b3e71aa18e5e888edacca6a0c92f389199097534c", - "aarch64-linux": "292740690b445bf8e3b13c37c74ff2c9820e8d30f6d0ac8e03a62421746f189c", - "armv7l-linux": "efc6bfdbd92e76cde23bfa0967809593ae32e74ed1897765f1105e3761db9478", - "headers": "0pmgcns26pvvp7ihqkl9llpdr8l871p7m6r72scia93siwnyvrvv", - "x86_64-darwin": "a7070ea98e5a4c5d53b2184229428d29109682165be62b17faf0bcdd9547174f", - "x86_64-linux": "8fb72c1d19a51552438eb42fdaae915643c2e310fa3090d8d5293ad6fc94b8c5" + "aarch64-darwin": "9d2de7531f8b4baa513c8622f37415855c889b0e99e59cbdc9570f8056f148fe", + "aarch64-linux": "63aca27373f86044d82bb54a531288d94cb5a248438d222ee3fe4e2282667ea7", + "armv7l-linux": "d6152c0e36ddeea3d23fd945c6c382507fdb95bf8f0a4d2f2b00966ce59aca66", + "headers": "0j87666by9hbqkb3c0wxcjp5g8b7da807al9j4gjrspzp3r96a91", + "x86_64-darwin": "9221ca22b8902508092581c59c9910abd9324e9234699107566e5913bccebc1b", + "x86_64-linux": "4619dd27038abd1165c4f84caa013a0826445428c11cc29d524c5737476edaa3" }, - "version": "32.3.0" + "version": "32.3.1" }, "33": { "hashes": { From 36ff48d035b3b8138f4b03999b4ee9dbbf30d605 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 17:26:44 +0000 Subject: [PATCH 0470/1107] gaugePlugins.dotnet: 0.7.4 -> 0.7.5 --- pkgs/development/tools/gauge/plugins/dotnet/data.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gauge/plugins/dotnet/data.json b/pkgs/development/tools/gauge/plugins/dotnet/data.json index e51edd7004bc..418cf48d555a 100644 --- a/pkgs/development/tools/gauge/plugins/dotnet/data.json +++ b/pkgs/development/tools/gauge/plugins/dotnet/data.json @@ -1,5 +1,5 @@ { - "version": "0.7.4", - "url": "https://github.com/getgauge/gauge-dotnet/releases/download/v0.7.4/gauge-dotnet-0.7.4.zip", - "hash": "sha256-V5zawtvwz1lIe/X4YyFQOBUfg27eMDrVnHV5Mnec+0o=" + "version": "0.7.5", + "url": "https://github.com/getgauge/gauge-dotnet/releases/download/v0.7.5/gauge-dotnet-0.7.5.zip", + "hash": "sha256-h9dBgtSZ6W6O4VdWEl0y2kOEcSOoXMiBDmEl2VYdT3E=" } From 51a2d757f843d1f6222f5c5597c5dd555ecc9149 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 15 Feb 2025 18:26:46 +0100 Subject: [PATCH 0471/1107] electron_33-bin: 33.4.0 -> 33.4.1 - Changelog: https://github.com/electron/electron/releases/tag/v33.4.1 - Diff: https://github.com/electron/electron/compare/refs/tags/v33.4.0...v33.4.1 --- pkgs/development/tools/electron/binary/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index 213cb00aa147..e73a631316a4 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -78,14 +78,14 @@ }, "33": { "hashes": { - "aarch64-darwin": "90044a7aa13f18ca4077a33131190b55fdf3ca5cb0704c537ca630fd0e06369e", - "aarch64-linux": "6542b3152ea9d8dd005a1b8f55b6971dee0f954b3b4e0bab4d625d501a946093", - "armv7l-linux": "95d79d2d2a154783fa6435d937a3e98b4408f2ce75f6706e5781d0d7e2e49d44", - "headers": "00v71c9fy3na040bnp5llp6951fsqls6hnlvbds5gckw3wfdcymc", - "x86_64-darwin": "d66a1400fe3c446f93eabf51b9520a300cdd25805a03d96a4528bda089f4988e", - "x86_64-linux": "f854ceb7362f7eeafdcdfc4a8898493adb72e3433595c59f072427912115d41b" + "aarch64-darwin": "6613ca0dc9f4e0a4488113efcb9a6d81ea32b18842eaac879d2d15f6f6776b8d", + "aarch64-linux": "194c26e79668ba176e1a641a8a0184cc7c0509b3eda9db64137a33f7b29f23a2", + "armv7l-linux": "78ebab80ea5f9b0407179fdbf65a6a533e9e8cc67324eba1916d197a0f163c51", + "headers": "1qlsrljlw08253hpiiccmb0kafnbihyxc7hlvakbhnbwils393xr", + "x86_64-darwin": "723dd6e1b136fc6a4c00432769114fcae80a261a985934311ce730910d0c4df1", + "x86_64-linux": "91950f2c5bd17f03920a20d6e2d57676f341c7ad27fb828570f4e00a1566f407" }, - "version": "33.4.0" + "version": "33.4.1" }, "34": { "hashes": { From 00f656d209ad81944f20c1346b1d3e0a9fa3fc89 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 15 Feb 2025 18:26:48 +0100 Subject: [PATCH 0472/1107] electron_34-bin: 34.1.1 -> 34.2.0 - Changelog: https://github.com/electron/electron/releases/tag/v34.2.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v34.1.1...v34.2.0 --- pkgs/development/tools/electron/binary/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index e73a631316a4..22043a48c759 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -89,13 +89,13 @@ }, "34": { "hashes": { - "aarch64-darwin": "a38a624bee92ee601777c20e6bdbf040d1b2a5506ba1ccac8be1447b1c6b0bfd", - "aarch64-linux": "37d68cef35888c8ca8bbe2002be0a122e8e8ccaf762b60ade1af5e71918e080b", - "armv7l-linux": "741374570bd9e435037f41b42aea7ab640f7ef1e75afb4705cc12344f43ed04c", - "headers": "0b0djna1bprfff0y1pb2wdzsx82v1c1zk20gl2vivgjhslxf0igl", - "x86_64-darwin": "a2ba4f91882819801da2d499de3426dbb191a22f2fe4a6ec92b756f1a0dc2de8", - "x86_64-linux": "9fbca20baea84800f7f50a9b245302dddbfab3425dd762c482d79e867a5a6dbe" + "aarch64-darwin": "ee447c17b2ac545e48083113d7e39a916821c1316f60f42cbcbee4fffe7c022a", + "aarch64-linux": "818c91309da8ff948c43df58a996c05c0d27daa690e1d659355d9db01e351919", + "armv7l-linux": "0c75996c6bf2d37d0441d3e1021386a9348f8d21783d75571cdb10ede606424f", + "headers": "17f06fx4yidshmkdicis6k4azph95mxs1rwpm0ll53szpcs7rdss", + "x86_64-darwin": "8ef741819c8a5370dabc3b9df5e6ac217366477c5d5c656ed23c800bc984d887", + "x86_64-linux": "f12a02d86cc657500978d263ec6d1841b6e2085cd3bd4d30a97cfe14685396f3" }, - "version": "34.1.1" + "version": "34.2.0" } } From 6b1989f61a4fa7417596073bcd37dcafc14bff11 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 15 Feb 2025 18:26:49 +0100 Subject: [PATCH 0473/1107] electron-source.electron_32: 32.3.0 -> 32.3.1 - Changelog: https://github.com/electron/electron/releases/tag/v32.3.1 - Diff: https://github.com/electron/electron/compare/refs/tags/v32.3.0...v32.3.1 --- pkgs/development/tools/electron/info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 07190692cd02..5528a44dc5eb 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -47,10 +47,10 @@ }, "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-pOWNw6MLjy7ucMGtF/sVPNmlmje0ozqRhEwOPkfW1oM=", + "hash": "sha256-3W6F30x90mLX1BdL9zY/YLShFRUGirokadzEg5QX6TU=", "owner": "electron", "repo": "electron", - "rev": "v32.3.0" + "rev": "v32.3.1" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", @@ -938,7 +938,7 @@ "electron_yarn_hash": "122y1vnizwg0rwz8qf37mvpa0i78141y98wn4h11l6b9gyshrs65", "modules": "128", "node": "20.18.1", - "version": "32.3.0" + "version": "32.3.1" }, "33": { "chrome": "130.0.6723.191", From 003f8f4024c02246c7b6941a05d14a89f487dfd5 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 15 Feb 2025 18:26:50 +0100 Subject: [PATCH 0474/1107] electron-source.electron_33: 33.4.0 -> 33.4.1 - Changelog: https://github.com/electron/electron/releases/tag/v33.4.1 - Diff: https://github.com/electron/electron/compare/refs/tags/v33.4.0...v33.4.1 --- pkgs/development/tools/electron/info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 5528a44dc5eb..1a1fcb674405 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -988,10 +988,10 @@ }, "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-1Sl36LYp/tePk5ChWKv9ZCVcoEZECMEDKKiKvpO8ea8=", + "hash": "sha256-cOiflmkAzX0U7wFoGwxYDKMMrmSdjn18oXvguS6RSeY=", "owner": "electron", "repo": "electron", - "rev": "v33.4.0" + "rev": "v33.4.1" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", @@ -1891,6 +1891,6 @@ "electron_yarn_hash": "0bzsswcg62b39xinq5vikk7qz7d15276s2vc15v1gcb5wvh05ff8", "modules": "130", "node": "20.18.1", - "version": "33.4.0" + "version": "33.4.1" } } From 4b382b0464d8ab5dec60b46004c55b48dc7b5af7 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 15 Feb 2025 18:26:53 +0100 Subject: [PATCH 0475/1107] electron-chromedriver_32: 32.3.0 -> 32.3.1 - Changelog: https://github.com/electron/electron/releases/tag/v32.3.1 - Diff: https://github.com/electron/electron/compare/refs/tags/v32.3.0...v32.3.1 --- .../tools/electron/chromedriver/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index 58ff11fa1758..1f9872910833 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -34,14 +34,14 @@ }, "32": { "hashes": { - "aarch64-darwin": "679a286100f2121a3566f7d0988894611628e93920843c873de36d3e37f1b0e9", - "aarch64-linux": "6a297a8db6f64ac3c95ddc17d2a9f95bff3d2fddef2aae565ebf91bcca960f3a", - "armv7l-linux": "c76c9ec01fff88a9cda3aedfd8251880a835d326c349b108f09e02a419dd9a52", - "headers": "0pmgcns26pvvp7ihqkl9llpdr8l871p7m6r72scia93siwnyvrvv", - "x86_64-darwin": "495b3f0e0459badba8f6e3406edd4bcf7e688eb9d11d4b544426fb25d1e22f43", - "x86_64-linux": "af9e3a6aac492827e1ace64fc50744f82523f09842b2414ad00d9a97f06d7a85" + "aarch64-darwin": "606a20ba0c4ca3ff5143d84114c76701866da9d6ca5563c4f230024a9fad107b", + "aarch64-linux": "027d2c4bafbce2903a52bef70a8aadce6bdee8f32cf3e9aa043cef58114bf4f1", + "armv7l-linux": "2084fe0130e0d32a94d7181b9ee0d38b67e38852efe72a44768bfd541074d631", + "headers": "0j87666by9hbqkb3c0wxcjp5g8b7da807al9j4gjrspzp3r96a91", + "x86_64-darwin": "8846b009c7f86dd40630fde6b914dbcd7e1acaf79bfbf6c69b5408a0c91f22f3", + "x86_64-linux": "53f7ca0ee2bc52d7e22d75c3c3815f62f1616e82cfe030b11399549beb85f623" }, - "version": "32.3.0" + "version": "32.3.1" }, "33": { "hashes": { From 85c576ba9b799ed349a68d3305f675a57de5620e Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 15 Feb 2025 18:26:54 +0100 Subject: [PATCH 0476/1107] electron-chromedriver_33: 33.4.0 -> 33.4.1 - Changelog: https://github.com/electron/electron/releases/tag/v33.4.1 - Diff: https://github.com/electron/electron/compare/refs/tags/v33.4.0...v33.4.1 --- .../tools/electron/chromedriver/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index 1f9872910833..6a61dd64ea60 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -45,14 +45,14 @@ }, "33": { "hashes": { - "aarch64-darwin": "0b87f00cf22d2c73a795af554cf9548e0204769d22ffdc7f28183572d4f7fef0", - "aarch64-linux": "5387c7a22c93dfcac348ea5ec604fb8350926e8e2681ca189e0500ff993d58d0", - "armv7l-linux": "53e1fa127812bcfb5a095f781368ee2d9cceb4a91d83dcb32a7ecf072cf39034", - "headers": "00v71c9fy3na040bnp5llp6951fsqls6hnlvbds5gckw3wfdcymc", - "x86_64-darwin": "9a8ec97a21d41b146b010dfe7e4df71907a23bdf0500619036de623b4ddb1ce1", - "x86_64-linux": "ea57c5bafecd8502fa95df73c977efb2a061068eac965d97f99b824479d55de2" + "aarch64-darwin": "df7713ab2e4a7d3b059c507abcd1bb5ec8b71274407035658100529555a6ac65", + "aarch64-linux": "e6f369ceebe049c7c119f943cc36617de3094b45eaf495259599ef65352d2eb5", + "armv7l-linux": "41f9241f412c842027128f1260bb2f07799ddb0e6dfd22171296ccfc5c1d3ce6", + "headers": "1qlsrljlw08253hpiiccmb0kafnbihyxc7hlvakbhnbwils393xr", + "x86_64-darwin": "1fda63a3a64d68cb83c6619dafbf4ba4434b99b1c273c3ecdc3cc8de0ff2f422", + "x86_64-linux": "e3d6fd631f5c1ff63850b7f0af8f3cf325200f66bdf3371c911b8f14f8a44673" }, - "version": "33.4.0" + "version": "33.4.1" }, "34": { "hashes": { From 6dc8694a88e65a8ff721722695aad026709974ab Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 15 Feb 2025 18:26:56 +0100 Subject: [PATCH 0477/1107] electron-chromedriver_34: 34.1.1 -> 34.2.0 - Changelog: https://github.com/electron/electron/releases/tag/v34.2.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v34.1.1...v34.2.0 --- .../tools/electron/chromedriver/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index 6a61dd64ea60..272ff6f99a3c 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -56,13 +56,13 @@ }, "34": { "hashes": { - "aarch64-darwin": "c2aa24978fbe0c3dfb8ae36816633a75f498b4af5052b059631a626925951e41", - "aarch64-linux": "df87d6f0b91a549996c764bb60eaf692c59e087496406562e3bcbb3f90a52d50", - "armv7l-linux": "74b53fff1d210066024476ebbfef7476b05c2c71cd141953b5b7e0a35d129a02", - "headers": "0b0djna1bprfff0y1pb2wdzsx82v1c1zk20gl2vivgjhslxf0igl", - "x86_64-darwin": "95239f35723eeca036ed1e29f7871a4de843c6eda16bccc04436402dddd938aa", - "x86_64-linux": "62734cb681a6da3c73b20504f49c7759c9dbb1c923e250d67c11888426e3cad0" + "aarch64-darwin": "c0a187acca68906c4a6387e8fabd052cb031ace6132d60a71001d9a0e891958e", + "aarch64-linux": "61e03d4fa570976d80f740637f56192b6448a05a73d1fba9717900b29f2b1b4d", + "armv7l-linux": "ec774d9b1a1b828a0db1502a1017fcab1dfed99b1b6b2fd2308dd600a1efa98a", + "headers": "17f06fx4yidshmkdicis6k4azph95mxs1rwpm0ll53szpcs7rdss", + "x86_64-darwin": "fa5a46d752267d8497d375e19079e8b6a8df70c234a79b2d6b48f5862e1a0abc", + "x86_64-linux": "cc15a6e6206485a2d96649ceb60509b9da04fa2811c4824b2e0eb43d1f4b1417" }, - "version": "34.1.1" + "version": "34.2.0" } } From af5916dc6590cccb97bb22ca8f1c5098958779a5 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sat, 8 Feb 2025 14:04:01 +0100 Subject: [PATCH 0478/1107] linuxPackages.rtl8821ce: unstable-2024-03-26 -> unstable-2025-02-08 --- pkgs/os-specific/linux/rtl8821ce/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index d3ceefef0027..1f43c8720b54 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rtl8821ce"; - version = "${kernel.version}-unstable-2024-03-26"; + version = "${kernel.version}-unstable-2025-02-08"; src = fetchFromGitHub { owner = "tomaspinho"; repo = "rtl8821ce"; - rev = "f119398d868b1a3395f40c1df2e08b57b2c882cd"; - hash = "sha256-EfpKa5ZRBVM5T8EVim3cVX1PP1UM9CyG6tN5Br8zYww="; + rev = "46d1a59e37364ed4aedcb09746f0ae412e6b2066"; + hash = "sha256-vQM7e8tuy4Lf2HvGtHUvOxulF4DIhX33vFel9u9i178="; }; hardeningDisable = [ "pic" ]; From 6735c477a022c35681c233dfab8b80a6c3d9821d Mon Sep 17 00:00:00 2001 From: Defelo Date: Sat, 8 Feb 2025 14:18:45 +0100 Subject: [PATCH 0479/1107] linuxPackages.rtl8821ce: refactor --- pkgs/os-specific/linux/rtl8821ce/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index 1f43c8720b54..f71b76d297ca 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -25,9 +25,9 @@ stdenv.mkDerivation (finalAttrs: { prePatch = '' substituteInPlace ./Makefile \ - --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ - --replace /sbin/depmod \# \ - --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + --replace-fail /lib/modules/ "${kernel.dev}/lib/modules/" \ + --replace-fail /sbin/depmod \# \ + --replace-fail '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; preInstall = '' From 686d5b17e4a8ef56317eeb0011ea10ab5d78b387 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sat, 15 Feb 2025 18:27:29 +0100 Subject: [PATCH 0480/1107] linuxPackages.rtl8821ce: remove hhm from maintainers due to several years of inactivity --- pkgs/os-specific/linux/rtl8821ce/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index f71b76d297ca..fd4eb273f613 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -41,10 +41,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/tomaspinho/rtl8821ce"; license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ - hhm - defelo - ]; + maintainers = with lib.maintainers; [ defelo ]; broken = stdenv.hostPlatform.isAarch64 || ((lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened); From 605d136cb9ec701e28906ae310d743528c72a4f1 Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Sat, 15 Feb 2025 18:55:07 +0100 Subject: [PATCH 0481/1107] root5: remove broken symlink --- pkgs/by-name/ro/root5/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/ro/root5/package.nix b/pkgs/by-name/ro/root5/package.nix index 375fff26a01c..760eda7bb7e8 100644 --- a/pkgs/by-name/ro/root5/package.nix +++ b/pkgs/by-name/ro/root5/package.nix @@ -115,7 +115,6 @@ stdenv.mkDerivation rec { done patchShebangs build/unix/ - ln -s ${lib.getDev stdenv.cc.libc}/include/AvailabilityMacros.h cint/cint/include/ # __malloc_hook is deprecated substituteInPlace misc/memstat/src/TMemStatHook.cxx \ From 8e4badef58a7636c8eb912feea04b4fedea101e7 Mon Sep 17 00:00:00 2001 From: nayeko <196556004+nayeko@users.noreply.github.com> Date: Sat, 15 Feb 2025 18:00:31 +0000 Subject: [PATCH 0482/1107] clapper: remove with lib --- pkgs/by-name/cl/clapper/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/cl/clapper/package.nix b/pkgs/by-name/cl/clapper/package.nix index 9d23eda1830c..17f6dc26406b 100644 --- a/pkgs/by-name/cl/clapper/package.nix +++ b/pkgs/by-name/cl/clapper/package.nix @@ -72,15 +72,15 @@ stdenv.mkDerivation (finalAttrs: { ) ''; - meta = with lib; { + meta = { description = "GNOME media player built using GTK4 toolkit and powered by GStreamer with OpenGL rendering"; longDescription = '' Clapper is a GNOME media player built using the GTK4 toolkit. The media player is using GStreamer as a media backend. ''; homepage = "https://github.com/Rafostar/clapper"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ aleksana ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; }; }) From 77136a98791cbe597512836d009d82de3a35b072 Mon Sep 17 00:00:00 2001 From: nayeko <196556004+nayeko@users.noreply.github.com> Date: Sat, 15 Feb 2025 18:00:59 +0000 Subject: [PATCH 0483/1107] clapper: 0.6.1 -> 0.8.0 --- pkgs/by-name/cl/clapper/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/clapper/package.nix b/pkgs/by-name/cl/clapper/package.nix index 17f6dc26406b..b1219422261a 100644 --- a/pkgs/by-name/cl/clapper/package.nix +++ b/pkgs/by-name/cl/clapper/package.nix @@ -20,17 +20,18 @@ libmicrodns, gtuber, glib-networking, + libpeas2, }: stdenv.mkDerivation (finalAttrs: { pname = "clapper"; - version = "0.6.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Rafostar"; repo = "clapper"; - rev = finalAttrs.version; - hash = "sha256-IQJTnLB6FzYYPONOqBkvi89iF0U6fx/aWYvNOOJpBvc="; + tag = finalAttrs.version; + hash = "sha256-Yb2fWsdd8jhxkGWKanLn7CAuF4MjyQ27XTrO8ja3hfs="; }; nativeBuildInputs = [ @@ -59,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: { libadwaita libsoup_3 libmicrodns + libpeas2 ]; postPatch = '' From d2239872cc54353a0ff1669f62c2b6c21e7c6fc4 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 15 Feb 2025 19:16:04 +0100 Subject: [PATCH 0484/1107] gromacs: 2024.5 -> 2025.0 --- .../molecular-dynamics/gromacs/default.nix | 6 ++-- .../{pkgconfig.patch => pkgconfig-2024.patch} | 0 .../gromacs/pkgconfig-2025.patch | 36 +++++++++++++++++++ 3 files changed, 39 insertions(+), 3 deletions(-) rename pkgs/applications/science/molecular-dynamics/gromacs/{pkgconfig.patch => pkgconfig-2024.patch} (100%) create mode 100644 pkgs/applications/science/molecular-dynamics/gromacs/pkgconfig-2025.patch diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 5867656b2cbc..a62e716248e0 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -45,8 +45,8 @@ let } else { - version = "2024.5"; - hash = "sha256-/s8GsYbN25Qs+0LujaXz6yuZk+aswKLxjRSsCwFEJPM="; + version = "2025.0"; + hash = "sha256-onrTWmRilbvsEpq+aE2dA9Hi4L12sNYl6QVXRqrvroI="; }; in stdenv.mkDerivation rec { @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { inherit (source) hash; }; - patches = [ ./pkgconfig.patch ]; + patches = [ (if enablePlumed then ./pkgconfig-2024.patch else ./pkgconfig-2025.patch) ]; postPatch = lib.optionalString enablePlumed '' plumed patch -p -e gromacs-${source.version} diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/pkgconfig.patch b/pkgs/applications/science/molecular-dynamics/gromacs/pkgconfig-2024.patch similarity index 100% rename from pkgs/applications/science/molecular-dynamics/gromacs/pkgconfig.patch rename to pkgs/applications/science/molecular-dynamics/gromacs/pkgconfig-2024.patch diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/pkgconfig-2025.patch b/pkgs/applications/science/molecular-dynamics/gromacs/pkgconfig-2025.patch new file mode 100644 index 000000000000..f5f5e117ed24 --- /dev/null +++ b/pkgs/applications/science/molecular-dynamics/gromacs/pkgconfig-2025.patch @@ -0,0 +1,36 @@ +diff --git a/src/external/muparser/muparser.pc.in b/src/external/muparser/muparser.pc.in +index 646787cb53..d26e84de8f 100644 +--- a/src/external/muparser/muparser.pc.in ++++ b/src/external/muparser/muparser.pc.in +@@ -1,11 +1,9 @@ +-prefix=@CMAKE_INSTALL_PREFIX@ +-exec_prefix=${prefix} +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ +- +-Name: @PACKAGE_NAME@ +-Description: Mathematical expressions parser library +-Version: @MUPARSER_VERSION@ +-Requires: +-Libs: -L${libdir} -lmuparser +-Cflags: -I${includedir} @PKG_CONFIG_FLAGS@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ ++ ++Name: @PACKAGE_NAME@ ++Description: Mathematical expressions parser library ++Version: @MUPARSER_VERSION@ ++Requires: ++Libs: -L${libdir} -lmuparser ++Cflags: -I${includedir} @PKG_CONFIG_FLAGS@ +diff --git a/src/gromacs/libgromacs.pc.cmakein b/src/gromacs/libgromacs.pc.cmakein +index af9b5a6dc0..5f58d549bf 100644 +--- a/src/gromacs/libgromacs.pc.cmakein ++++ b/src/gromacs/libgromacs.pc.cmakein +@@ -1,5 +1,4 @@ +-prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR + + Name: libgromacs@GMX_LIBS_SUFFIX@ + Description: Gromacs library From 8bad41cc0f0f1d452147412fed6110d6abc660ad Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 15 Feb 2025 19:17:29 +0100 Subject: [PATCH 0485/1107] gromacs: apply nixfmt --- .../molecular-dynamics/gromacs/default.nix | 163 ++++++++++-------- 1 file changed, 95 insertions(+), 68 deletions(-) diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index a62e716248e0..f9e70d712b27 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -1,25 +1,25 @@ -{ lib -, stdenv -, fetchurl -, cmake -, hwloc -, fftw -, perl -, blas -, lapack -, llvmPackages -, mpi -, cudaPackages -, plumed -, singlePrec ? true -, config -, enableCuda ? config.cudaSupport -, enableMpi ? false -, enablePlumed ? false -, cpuAcceleration ? null +{ + lib, + stdenv, + fetchurl, + cmake, + hwloc, + fftw, + perl, + blas, + lapack, + llvmPackages, + mpi, + cudaPackages, + plumed, + singlePrec ? true, + config, + enableCuda ? config.cudaSupport, + enableMpi ? false, + enablePlumed ? false, + cpuAcceleration ? null, }: - # CUDA is only implemented for single precission assert enableCuda -> singlePrec; @@ -30,12 +30,20 @@ let # The possible values are defined in CMakeLists.txt: # AUTO None SSE2 SSE4.1 AVX_128_FMA AVX_256 AVX2_256 # AVX2_128 AVX_512 AVX_512_KNL MIC ARM_NEON ARM_NEON_ASIMD - SIMD = x: if (cpuAcceleration != null) then x else - if stdenv.hostPlatform.system == "i686-linux" then "SSE2" else - if stdenv.hostPlatform.system == "x86_64-linux" then "SSE4.1" else - if stdenv.hostPlatform.system == "x86_64-darwin" then "SSE4.1" else - if stdenv.hostPlatform.system == "aarch64-linux" then "ARM_NEON_ASIMD" else - "None"; + SIMD = + x: + if (cpuAcceleration != null) then + x + else if stdenv.hostPlatform.system == "i686-linux" then + "SSE2" + else if stdenv.hostPlatform.system == "x86_64-linux" then + "SSE4.1" + else if stdenv.hostPlatform.system == "x86_64-darwin" then + "SSE4.1" + else if stdenv.hostPlatform.system == "aarch64-linux" then + "ARM_NEON_ASIMD" + else + "None"; source = if enablePlumed then @@ -49,7 +57,8 @@ let hash = "sha256-onrTWmRilbvsEpq+aE2dA9Hi4L12sNYl6QVXRqrvroI="; }; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "gromacs"; version = source.version; @@ -64,58 +73,73 @@ in stdenv.mkDerivation rec { plumed patch -p -e gromacs-${source.version} ''; - outputs = [ "out" "dev" "man" ]; + outputs = [ + "out" + "dev" + "man" + ]; nativeBuildInputs = [ cmake ] ++ lib.optional enablePlumed plumed ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ]; - buildInputs = [ - fftw - perl - hwloc - blas - lapack - ] ++ lib.optional enableMpi mpi - ++ lib.optionals enableCuda [ - cudaPackages.cuda_cccl - cudaPackages.cuda_cudart - cudaPackages.libcufft - cudaPackages.cuda_profiler_api - ] ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp; + buildInputs = + [ + fftw + perl + hwloc + blas + lapack + ] + ++ lib.optional enableMpi mpi + ++ lib.optionals enableCuda [ + cudaPackages.cuda_cccl + cudaPackages.cuda_cudart + cudaPackages.libcufft + cudaPackages.cuda_profiler_api + ] + ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp; propagatedBuildInputs = lib.optional enableMpi mpi; propagatedUserEnvPkgs = lib.optional enableMpi mpi; - cmakeFlags = [ - (lib.cmakeBool "GMX_HWLOC" true) - "-DGMX_SIMD:STRING=${SIMD cpuAcceleration}" - "-DGMX_OPENMP:BOOL=TRUE" - "-DBUILD_SHARED_LIBS=ON" - ] ++ ( - if singlePrec then [ - "-DGMX_DOUBLE=OFF" - ] else [ - "-DGMX_DOUBLE=ON" - "-DGMX_DEFAULT_SUFFIX=OFF" + cmakeFlags = + [ + (lib.cmakeBool "GMX_HWLOC" true) + "-DGMX_SIMD:STRING=${SIMD cpuAcceleration}" + "-DGMX_OPENMP:BOOL=TRUE" + "-DBUILD_SHARED_LIBS=ON" ] - ) ++ ( - if enableMpi - then [ - "-DGMX_MPI:BOOL=TRUE" - "-DGMX_THREAD_MPI:BOOL=FALSE" - ] - else [ - "-DGMX_MPI:BOOL=FALSE" - ] - ) ++ lib.optionals enableCuda [ - "-DGMX_GPU=CUDA" - (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cmakeCudaArchitecturesString) + ++ ( + if singlePrec then + [ + "-DGMX_DOUBLE=OFF" + ] + else + [ + "-DGMX_DOUBLE=ON" + "-DGMX_DEFAULT_SUFFIX=OFF" + ] + ) + ++ ( + if enableMpi then + [ + "-DGMX_MPI:BOOL=TRUE" + "-DGMX_THREAD_MPI:BOOL=FALSE" + ] + else + [ + "-DGMX_MPI:BOOL=FALSE" + ] + ) + ++ lib.optionals enableCuda [ + "-DGMX_GPU=CUDA" + (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cmakeCudaArchitecturesString) - # Gromacs seems to ignore and override the normal variables, so we add this ad hoc: - (lib.cmakeFeature "GMX_CUDA_TARGET_COMPUTE" cmakeCudaArchitecturesString) - ]; + # Gromacs seems to ignore and override the normal variables, so we add this ad hoc: + (lib.cmakeFeature "GMX_CUDA_TARGET_COMPUTE" cmakeCudaArchitecturesString) + ]; postInstall = '' moveToOutput share/cmake $dev @@ -145,6 +169,9 @@ in stdenv.mkDerivation rec { See: https://www.gromacs.org/about.html for details. ''; platforms = platforms.unix; - maintainers = with maintainers; [ sheepforce markuskowa ]; + maintainers = with maintainers; [ + sheepforce + markuskowa + ]; }; } From 0abfcbfa324677288ac52d543d3feb19b9a0adba Mon Sep 17 00:00:00 2001 From: nayeko <196556004+nayeko@users.noreply.github.com> Date: Sat, 15 Feb 2025 18:19:08 +0000 Subject: [PATCH 0486/1107] aliyun-cli: refactor --- pkgs/by-name/al/aliyun-cli/package.nix | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/al/aliyun-cli/package.nix b/pkgs/by-name/al/aliyun-cli/package.nix index 3953e3634efc..d4bcafbe1f10 100644 --- a/pkgs/by-name/al/aliyun-cli/package.nix +++ b/pkgs/by-name/al/aliyun-cli/package.nix @@ -2,6 +2,8 @@ lib, buildGoModule, fetchFromGitHub, + writableTmpDirAsHomeHook, + nix-update-script, }: buildGoModule rec { @@ -9,11 +11,11 @@ buildGoModule rec { version = "3.0.211"; src = fetchFromGitHub { - rev = "v${version}"; owner = "aliyun"; - repo = pname; - fetchSubmodules = true; + repo = "aliyun-cli"; + tag = "v${version}"; hash = "sha256-6msh6bGL++nXVzwwNW6fFZbkN40ieL+SpgRownIs9aE="; + fetchSubmodules = true; }; vendorHash = "sha256-wHdSDBxDArVbD5+EgGcIpQ+NLg5BKXo2v3WM4ni1efc="; @@ -26,16 +28,20 @@ buildGoModule rec { "-X github.com/aliyun/aliyun-cli/cli.Version=${version}" ]; + nativeCheckInputs = [ writableTmpDirAsHomeHook ]; + postInstall = '' - mv $out/bin/main $out/bin/aliyun + install -Dm755 $out/bin/main $out/bin/aliyun ''; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Tool to manage and use Alibaba Cloud resources through a command line interface"; homepage = "https://github.com/aliyun/aliyun-cli"; changelog = "https://github.com/aliyun/aliyun-cli/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ ornxka ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ ornxka ]; mainProgram = "aliyun"; }; } From 3f514d36a7c353152c22e72a36f1edd2f4b7c960 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 15 Feb 2025 20:37:12 +0100 Subject: [PATCH 0487/1107] electron_32: fix log spam when building on x86_64-linux as well Follow-up to ce04dc5edc28423ea4cb3a63b13aa40a912e1b8f. Turns out the very same log spam is happening on x86_64-linux and not just on aarch64-linux but hydra.nixos.org does not enforce the log limit of 64mb for some reason. I should have figured. --- pkgs/development/tools/electron/common.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index 06f50a74c5d0..ea2ec1579b31 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -161,13 +161,14 @@ in env = base.env - // lib.optionalAttrs (lib.versionOlder info.version "33" && stdenv.hostPlatform.isAarch64) { + // lib.optionalAttrs (lib.versionOlder info.version "33") { # Hydra fails to build electron_32.aarch64-linux as of 2025-01-05 due to # clang spamming deprecation warnings mid-build, causing the build log to # grow beyond the limit of 64mb and then getting killed by Hydra. This # renders our clang both too old for the latest chromium without the use # of -Wno-unknown-warning-option and also too new for electron_32 (M128). - # For some reason, this is exclusively happening on aarch64-linux. To + # For some reason, the log size limit appears to only be enforced on + # aarch64-linux. x86_64-linux happily succeeds to build with ~180mb. To # unbreak the build on h.n.o, we simply disable those warnings for now. # https://hydra.nixos.org/build/283952243 NIX_CFLAGS_COMPILE = base.env.NIX_CFLAGS_COMPILE + " -Wno-deprecated"; From 2ea58359e04a2e8338eff05c9d526bdc6910d7c7 Mon Sep 17 00:00:00 2001 From: Bruno Rodrigues Date: Sat, 15 Feb 2025 21:10:29 +0100 Subject: [PATCH 0488/1107] positron-bin: fixed update script --- pkgs/by-name/po/positron-bin/update.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/positron-bin/update.sh b/pkgs/by-name/po/positron-bin/update.sh index 28081f589ec9..a024b382ec96 100755 --- a/pkgs/by-name/po/positron-bin/update.sh +++ b/pkgs/by-name/po/positron-bin/update.sh @@ -29,11 +29,11 @@ sed -i "s|$current_hash|$new_hash|g" $positron_nix # Update Linux hash. current_hash=$(nix store prefetch-file --json --hash-type sha256 \ - "https://github.com/posit-dev/positron/releases/download/${current_version}/Positron-${current_version}.deb" \ + "https://github.com/posit-dev/positron/releases/download/${current_version}/Positron-${current_version}-x64.deb" \ | jq -r .hash) new_hash=$(nix store prefetch-file --json --hash-type sha256 \ - "https://github.com/posit-dev/positron/releases/download/${new_version}/Positron-${new_version}.deb" \ + "https://github.com/posit-dev/positron/releases/download/${new_version}/Positron-${new_version}-x64.deb" \ | jq -r .hash) sed -i "s|$current_hash|$new_hash|g" $positron_nix From 9fbfaf5a1c0569c388e7db25630d51dfae888b8f Mon Sep 17 00:00:00 2001 From: Bruno Rodrigues Date: Sat, 15 Feb 2025 21:10:43 +0100 Subject: [PATCH 0489/1107] positron-bin: 2024.11.0-116 -> 2025.02.0-171 --- pkgs/by-name/po/positron-bin/package.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/po/positron-bin/package.nix b/pkgs/by-name/po/positron-bin/package.nix index c600d2525aeb..e06e1c8e3f96 100644 --- a/pkgs/by-name/po/positron-bin/package.nix +++ b/pkgs/by-name/po/positron-bin/package.nix @@ -3,6 +3,7 @@ _7zz, alsa-lib, systemd, + wrapGAppsHook4, autoPatchelfHook, blas, dpkg, @@ -21,7 +22,7 @@ }: let pname = "positron-bin"; - version = "2024.11.0-116"; + version = "2025.02.0-171"; in stdenv.mkDerivation { inherit version pname; @@ -30,12 +31,12 @@ stdenv.mkDerivation { if stdenv.hostPlatform.isDarwin then fetchurl { url = "https://github.com/posit-dev/positron/releases/download/${version}/Positron-${version}.dmg"; - hash = "sha256-5Ym42InDgFLGdZk0LYV1H0eC5WzmsYToG1KLdiGgTto="; + hash = "sha256-b5o1+UXt5JAuHkm1K1jrMLV+7PHfKJTOff4aTk8xm2I="; } else fetchurl { - url = "https://github.com/posit-dev/positron/releases/download/${version}/Positron-${version}.deb"; - hash = "sha256-pE25XVYFW8WwyQ7zmox2mmXy6ZCSaXk2gSnPimg7xtU="; + url = "https://github.com/posit-dev/positron/releases/download/${version}/Positron-${version}-x64.deb"; + hash = "sha256-TjQc/Y4Sa2MlLslbygYVFbIk3raArMvYstSiSEYzfo0="; }; buildInputs = @@ -64,6 +65,7 @@ stdenv.mkDerivation { lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook dpkg + wrapGAppsHook4 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ _7zz @@ -99,8 +101,8 @@ stdenv.mkDerivation { install -m 444 -D usr/share/applications/positron.desktop "$out/share/applications/positron.desktop" substituteInPlace "$out/share/applications/positron.desktop" \ --replace-fail \ - "Icon=com.visualstudio.code.oss" \ - "Icon=$out/share/pixmaps/com.visualstudio.code.oss.png" \ + "Icon=co.posit.positron" \ + "Icon=$out/share/pixmaps/co.posit.positron.png" \ --replace-fail \ "Exec=/usr/share/positron/positron %F" \ "Exec=$out/share/positron/.positron-wrapped %F" \ From 83781e885212ce909e302f00a0c650d95c6d2a66 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Feb 2025 20:22:47 +0000 Subject: [PATCH 0490/1107] python312Packages.linode-api: 5.26.0 -> 5.27.0 --- pkgs/development/python-modules/linode-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix index a32ed18f7194..20be7c053f3b 100644 --- a/pkgs/development/python-modules/linode-api/default.nix +++ b/pkgs/development/python-modules/linode-api/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "linode-api"; - version = "5.26.0"; + version = "5.27.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "linode"; repo = "python-linode-api"; tag = "v${version}"; - hash = "sha256-+Co8c0JJKzA2IBj/RUrY+iNTCI0nCvqQUW1F7Crd2mc="; + hash = "sha256-hMxCRSba0hjOsq+TFyrb04uMfy13GZEO7elAKmqgnzY="; }; build-system = [ setuptools ]; From 9f828131a68c65160dc310050440a98c0c8aa0ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sat, 15 Feb 2025 18:43:17 -0300 Subject: [PATCH 0491/1107] qogir-icon-theme: 2023-06-05 -> 2025-02-15 Diff: https://github.com/vinceliuice/qogir-icon-theme/compare/2023-06-05...2025-02-15 --- pkgs/by-name/qo/qogir-icon-theme/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/qo/qogir-icon-theme/package.nix b/pkgs/by-name/qo/qogir-icon-theme/package.nix index 179b138e60fa..26b7c6e39bdc 100644 --- a/pkgs/by-name/qo/qogir-icon-theme/package.nix +++ b/pkgs/by-name/qo/qogir-icon-theme/package.nix @@ -23,13 +23,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "dark" "all" ] color stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-06-05"; + version = "2025-02-15"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "sha256-qiHmA/K4hdXVSFzergGhgssKR+kXp3X0cqtX1X5ayM4="; + hash = "sha256-Eh4TWoFfArFmpM/9tkrf2sChQ0zzOZJE9pElchu8DCM="; }; nativeBuildInputs = [ @@ -39,8 +39,6 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "dark" "all" ] color propagatedBuildInputs = [ hicolor-icon-theme ]; - # FIXME: https://hydra.nixos.org/build/286997490/nixlog/5 - dontCheckForBrokenSymlinks = true; dontDropIconThemeCache = true; # These fixup steps are slow and unnecessary. From 17107cf4da04881c48a389ca6ae262379443b536 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 16 Feb 2025 08:34:39 +0800 Subject: [PATCH 0492/1107] simple-scan: Backport fix for RDNN app ID Otherwise GResourced icons are not used. Fixes: f61ee035c46008e0ddbae7bcb08ed9bddc330108 --- pkgs/by-name/si/simple-scan/package.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/si/simple-scan/package.nix b/pkgs/by-name/si/simple-scan/package.nix index 03059cf0ab0f..7136a31ac404 100644 --- a/pkgs/by-name/si/simple-scan/package.nix +++ b/pkgs/by-name/si/simple-scan/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, meson, ninja, pkg-config, @@ -34,6 +35,15 @@ stdenv.mkDerivation rec { hash = "sha256-wW5lkBQv5WO+UUMSKzu7U/awCn2p2VL2HEf6Jve08Kk="; }; + patches = [ + # simple-scan: Use RDNN app ID + # https://gitlab.gnome.org/GNOME/simple-scan/-/issues/390 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/simple-scan/-/commit/c09a6def153e52494072a36233c7e7b3307b67bf.patch"; + hash = "sha256-deyssrsVwPAfT5ru6c0LFwR2pEFnZ0v8wMqoi96tw8s="; + }) + ]; + nativeBuildInputs = [ meson ninja @@ -64,11 +74,6 @@ stdenv.mkDerivation rec { patchShebangs data/meson_compile_gschema.py ''; - postInstall = '' - mkdir -p $out/share/icons/hicolor/scalable/actions/ - install -m 444 ../data/icons/scalable/actions/* $out/share/icons/hicolor/scalable/actions/ - ''; - doCheck = true; passthru = { From 84f62997a927e8397f2979c859cb1bfd7158f353 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 00:44:23 +0000 Subject: [PATCH 0493/1107] cargo-tally: 1.0.57 -> 1.0.58 --- pkgs/by-name/ca/cargo-tally/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-tally/package.nix b/pkgs/by-name/ca/cargo-tally/package.nix index d6588dbedf31..959436f7e668 100644 --- a/pkgs/by-name/ca/cargo-tally/package.nix +++ b/pkgs/by-name/ca/cargo-tally/package.nix @@ -8,15 +8,15 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.57"; + version = "1.0.58"; src = fetchCrate { inherit pname version; - hash = "sha256-0f+23kQZzmUeAjettZ3iRTATiv73sGpI13TzZFTU150="; + hash = "sha256-a9Mgsxe3vNtvuqMJIm7nRL2aiYYzpArz7R5XQcZAUxc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-6wMkRLF3Hn6zu8UM629RoUY83wmSEYaYX5EMb9xBveQ="; + cargoHash = "sha256-3ZlF3FyWzcVL/ZMqId3wY//UzV7LeoJJdftb0IIC7Vk="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk_11_0.frameworks; From 590f015257ca6deed0107fa11165171b346f78ec Mon Sep 17 00:00:00 2001 From: misilelab Date: Sun, 16 Feb 2025 11:50:18 +0900 Subject: [PATCH 0494/1107] simplex-chat-desktop: 6.2.4 -> 6.2.5 --- pkgs/by-name/si/simplex-chat-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix index 876fc9d883a4..998c41fe33d1 100644 --- a/pkgs/by-name/si/simplex-chat-desktop/package.nix +++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix @@ -7,11 +7,11 @@ let pname = "simplex-chat-desktop"; - version = "6.2.4"; + version = "6.2.5"; src = fetchurl { url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage"; - hash = "sha256-Qd9qbsMLCBSs2Ow/OXUDbfl4rFdAIOwUiDmPAvhvDrs="; + hash = "sha256-7A/2FgB35SyBO1GZagChwNytFn2aSzPiAFBeHk316bw="; }; appimageContents = appimageTools.extract { From 957e4132328820b651f92cc38d60eddfb18298f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 04:52:56 +0000 Subject: [PATCH 0495/1107] virtnbdbackup: 2.18 -> 2.20 --- pkgs/by-name/vi/virtnbdbackup/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vi/virtnbdbackup/package.nix b/pkgs/by-name/vi/virtnbdbackup/package.nix index 2cae4225b483..97b90004cddf 100644 --- a/pkgs/by-name/vi/virtnbdbackup/package.nix +++ b/pkgs/by-name/vi/virtnbdbackup/package.nix @@ -7,13 +7,13 @@ python3Packages.buildPythonApplication rec { pname = "virtnbdbackup"; - version = "2.18"; + version = "2.20"; src = fetchFromGitHub { owner = "abbbi"; repo = "virtnbdbackup"; tag = "v${version}"; - hash = "sha256-0ZM3Xu3CbAuN60d0L32odNu9DfnOEDx3X03mFpDFZ6Y="; + hash = "sha256-owYQ6BzIVkfHskZ715R6o0PFzrcQH91FfmjwXQAut4s="; }; build-system = with python3Packages; [ @@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Backup utility for Libvirt/qemu/kvm"; homepage = "https://github.com/abbbi/virtnbdbackup"; - changelog = "https://github.com/abbbi/virtnbdbackup/releases/tag/v${version}"; + changelog = "https://github.com/abbbi/virtnbdbackup/releases/tag/${src.tag}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ genga898 ]; mainProgram = "virtnbdbackup"; From 69bab478d5d612f31860c1690fb6c6f899b35b2a Mon Sep 17 00:00:00 2001 From: emilylange Date: Sun, 16 Feb 2025 06:49:32 +0100 Subject: [PATCH 0496/1107] electron_34-bin: fix read out of range on aarch64 16k pages systems Previously in chromium (source build): 608b73b8be01613fcf4fb817204c7be1caef77b2 This works around a regression in chromium M131-134 that causes electron v33 and v34 on aarch64-linux with 16k pagesize (e.g. Asahi Linux) to crash. This commit applies this workaround only to electron v34, as v33.4.1, for which we have a soon to be merged PR open, already carries the workaround upstream. --- .../tools/electron/binary/generic.nix | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index d63bd6a7b1e5..6864efed6579 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -131,6 +131,13 @@ let ] ); + # Fix read out of range on aarch64 16k pages builds + # https://github.com/NixOS/nixpkgs/pull/365364 + # https://github.com/NixOS/nixpkgs/pull/380991 + # Can likely be removed when v34.2.1 (or v32.3.0?) releases: + # https://github.com/electron/electron/pull/45571 + needsAarch64PageSizeFix = lib.versionAtLeast version "34" && stdenv.hostPlatform.isAarch64; + linux = finalAttrs: { buildInputs = [ glib @@ -153,6 +160,19 @@ let chmod u-x $out/libexec/electron/*.so* ''; + # We use null here to not cause unnecessary rebuilds. + dontWrapGApps = if needsAarch64PageSizeFix then true else null; + preFixup = + if needsAarch64PageSizeFix then + '' + wrapProgram "$out/libexec/electron/chrome_crashpad_handler" "''${gappsWrapperArgs[@]}" + wrapProgram "$out/libexec/electron/chrome-sandbox" "''${gappsWrapperArgs[@]}" + wrapProgram "$out/libexec/electron/electron" "''${gappsWrapperArgs[@]}" \ + --add-flags "--js-flags=--no-decommit-pooled-pages" + '' + else + null; + postFixup = '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ From d950622eb9e78df43b263f0376a3a1b5ef38a195 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 06:25:57 +0000 Subject: [PATCH 0497/1107] stevenblack-blocklist: 3.15.15 -> 3.15.17 --- pkgs/by-name/st/stevenblack-blocklist/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix index 97e0ed4404c9..3572942e5dfc 100644 --- a/pkgs/by-name/st/stevenblack-blocklist/package.nix +++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "stevenblack-blocklist"; - version = "3.15.15"; + version = "3.15.17"; src = fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; tag = finalAttrs.version; - hash = "sha256-wycPhloUQY24wUDFWd/URRlFUiW2hi/wcohrWQ5R8E4="; + hash = "sha256-NjGiPINGJb6EHnRH3ubiorT4069eYWYj1WooOyE2vDM="; }; outputs = [ From cd3f5d28096754cb91c79c94fb67b82d7760f414 Mon Sep 17 00:00:00 2001 From: Adminy <22717869+adminy@users.noreply.github.com> Date: Sun, 16 Feb 2025 08:39:06 +0000 Subject: [PATCH 0498/1107] surrealdb: 2.0.2 -> 2.2.0 Version Bump --- pkgs/by-name/su/surrealdb/package.nix | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix index 83416ddc8aac..8f7022301761 100644 --- a/pkgs/by-name/su/surrealdb/package.nix +++ b/pkgs/by-name/su/surrealdb/package.nix @@ -5,29 +5,23 @@ fetchFromGitHub, pkg-config, openssl, - rocksdb_8_3, + rocksdb, testers, surrealdb, darwin, protobuf, -}: - -let - rocksdb = rocksdb_8_3; -in -rustPlatform.buildRustPackage rec { +}: rustPlatform.buildRustPackage rec { pname = "surrealdb"; - version = "2.0.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "surrealdb"; repo = "surrealdb"; rev = "v${version}"; - hash = "sha256-kTTZx/IXXJrkC0qm4Nx0hYPbricNjwFshCq0aFYCTo0="; + hash = "sha256-gsIeoxSfbHHSdpPn6xAB/t5w3cLtpu6MjTuf5xsI6wI="; }; - useFetchCargoVendor = true; - cargoHash = "sha256-yJfpxklHD/qbEoUS4OMAzlc9/0d/iW3EABU6AK/Maqo="; + cargoHash = "sha256-OXcQsDCiT3seMQhyKEKfC8pcd4MXwbql5+ZDGGkhPMI="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' @@ -54,8 +48,6 @@ rustPlatform.buildRustPackage rec { doCheck = false; checkFlags = [ - # flaky - "--skip=ws_integration::none::merge" # requires docker "--skip=database_upgrade" ]; From c1b4b8cb06889d367a70c160ded4da38c6b8eede Mon Sep 17 00:00:00 2001 From: Brian McGillion Date: Sun, 16 Feb 2025 12:42:16 +0400 Subject: [PATCH 0499/1107] onlyoffice-desktopeditors: 8.2.0 -> 8.3.0 Fixes: #381259 changelog: https://github.com/ONLYOFFICE/DocumentServer/blob/master/CHANGELOG.md#830 Signed-off-by: Brian McGillion --- pkgs/by-name/on/onlyoffice-desktopeditors/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix b/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix index a5aeebf9e1da..742b692a16c5 100644 --- a/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix +++ b/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix @@ -66,11 +66,11 @@ let derivation = stdenv.mkDerivation rec { pname = "onlyoffice-desktopeditors"; - version = "8.2.0"; + version = "8.3.0"; minor = null; src = fetchurl { url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb"; - hash = "sha256-sKjPxrPdnEX/EuZMQJP+PN/Mi1MRV3psK8Jje7V/ecI="; + hash = "sha256-rx9jh2jWA7+EOoNackHEUsLg1lX+VXbqp+cCUQAoQuM="; }; nativeBuildInputs = [ From 28bb35e52c6522d67f9dc3833b9ac0f06bc556bb Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sun, 16 Feb 2025 10:50:18 +0200 Subject: [PATCH 0500/1107] gradle: use pname and version in symlinkJoin An actual `version` attribute is needed for the automatic updates to work. --- pkgs/development/tools/build-managers/gradle/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 1db388194007..3b22a9c2fedb 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -259,7 +259,8 @@ rec { gradle = gradle-unwrapped.override args; in symlinkJoin { - name = "gradle-${gradle.version}"; + pname = "gradle"; + inherit (gradle) version; paths = [ (makeSetupHook { name = "gradle-setup-hook"; } (concatTextFile { From 7fb913f890b46456ef5d403ff40202914c57f021 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sun, 16 Feb 2025 10:50:36 +0200 Subject: [PATCH 0501/1107] gradle: 8.12 -> 8.12.1 --- pkgs/development/tools/build-managers/gradle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 3b22a9c2fedb..ff23eda5f569 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -230,8 +230,8 @@ rec { # https://docs.gradle.org/current/userguide/compatibility.html gradle_8 = gen { - version = "8.12"; - hash = "sha256-egDVH7kxR4Gaq3YCT+7OILa4TkIGlBAfJ2vpUuCL7wM="; + version = "8.12.1"; + hash = "sha256-jZepeYT2y9K4X+TGCnQ0QKNHVEvxiBgEjmEfUojUbJQ="; defaultJava = jdk21; }; From 97bb59b0d61d02dff14041a97d19c3eaa2851633 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Sun, 16 Feb 2025 11:02:14 +0100 Subject: [PATCH 0502/1107] dovecot: fix build after icu update --- pkgs/servers/mail/dovecot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 5b13c1aac03f..7cc1226453b5 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -14,7 +14,7 @@ libcap, coreutils, clucene_core_2, - icu, + icu75, libexttextcat, openldap, libsodium, @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { zlib lz4 clucene_core_2 - icu + icu75 libexttextcat openldap libsodium From 924d1840da7717c6449b611bcc8cf17f79e72277 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 16 Feb 2025 14:07:26 +0300 Subject: [PATCH 0503/1107] nodejs_18: fix build - pin ICU 75 - backport patch to fix tests on OpenSSL 3.4 --- pkgs/development/web/nodejs/openssl-3.4-v18.patch | 15 +++++++++++++++ pkgs/development/web/nodejs/v18.nix | 7 +++++++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/web/nodejs/openssl-3.4-v18.patch diff --git a/pkgs/development/web/nodejs/openssl-3.4-v18.patch b/pkgs/development/web/nodejs/openssl-3.4-v18.patch new file mode 100644 index 000000000000..a674a27e64c4 --- /dev/null +++ b/pkgs/development/web/nodejs/openssl-3.4-v18.patch @@ -0,0 +1,15 @@ +diff --git a/test/parallel/test-tls-psk-circuit.js b/test/parallel/test-tls-psk-circuit.js +index 2b49161df8..8071c6dd18 100644 +--- a/test/parallel/test-tls-psk-circuit.js ++++ b/test/parallel/test-tls-psk-circuit.js +@@ -66,7 +66,8 @@ const expectedHandshakeErr = common.hasOpenSSL32 ? + 'ERR_SSL_SSL/TLS_ALERT_HANDSHAKE_FAILURE' : 'ERR_SSL_SSLV3_ALERT_HANDSHAKE_FAILURE'; + test({ psk: USERS.UserB, identity: 'UserC' }, {}, expectedHandshakeErr); + // Recognized user but incorrect secret should fail handshake +-const expectedIllegalParameterErr = common.hasOpenSSL32 ? +- 'ERR_SSL_SSL/TLS_ALERT_ILLEGAL_PARAMETER' : 'ERR_SSL_SSLV3_ALERT_ILLEGAL_PARAMETER'; ++const expectedIllegalParameterErr = common.hasOpenSSL(3, 4) ? 'ERR_SSL_TLSV1_ALERT_DECRYPT_ERROR' : ++ common.hasOpenSSL(3, 2) ? ++ 'ERR_SSL_SSL/TLS_ALERT_ILLEGAL_PARAMETER' : 'ERR_SSL_SSLV3_ALERT_ILLEGAL_PARAMETER'; + test({ psk: USERS.UserA, identity: 'UserB' }, {}, expectedIllegalParameterErr); + test({ psk: USERS.UserB, identity: 'UserB' }); diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index 8bb6d54d1943..7f1537584a61 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -4,6 +4,7 @@ openssl, python311, fetchpatch2, + icu75, enableNpm ? true, }: @@ -11,6 +12,7 @@ let buildNodejs = callPackage ./nodejs.nix { inherit openssl; python = python311; + icu = icu75; # does not build with newer }; gypPatches = callPackage ./gyp-patches.nix { } ++ [ @@ -75,5 +77,10 @@ buildNodejs { url = "https://github.com/nodejs/node/commit/f270462c09ddfd770291a7c8a2cd204b2c63d730.patch?full_index=1"; hash = "sha256-Err0i5g7WtXcnhykKgrS3ocX7/3oV9UrT0SNeRtMZNU="; }) + + # Fix tests on OpenSSL 3.4 + # Manual backport of https://github.com/nodejs/node/commit/7895b8eae9e4f2919028fe81e38790af07b4cc92 + # FIXME: remove after a minor point release + ./openssl-3.4-v18.patch ] ++ gypPatches; } From 144c05d42f8dffdda488b39cc97973a88ded847d Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Sun, 16 Feb 2025 19:13:06 +0800 Subject: [PATCH 0504/1107] home-assistant-custom-components.xiaomi_miot: Ignore pre-release for nix-update --- .../home-assistant/custom-components/xiaomi_miot/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix index 58a5fae706d7..0f3c2f4b34c0 100644 --- a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix +++ b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix @@ -28,7 +28,7 @@ buildHomeAssistantComponent rec { dontBuild = true; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=^v([0-9.]+)$" ]; }; meta = { changelog = "https://github.com/al-one/hass-xiaomi-miot/releases/tag/v${version}"; From c20ae96f3ab04fdd2a60f4d245eee5a7c4cd8261 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Sun, 16 Feb 2025 12:14:57 +0100 Subject: [PATCH 0505/1107] adr-tools: fix build `bash` doesn't appear in the wrapper anymore, but only `bashInteractive` --- pkgs/by-name/ad/adr-tools/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/ad/adr-tools/package.nix b/pkgs/by-name/ad/adr-tools/package.nix index 7092ce9353ea..ac790896b397 100644 --- a/pkgs/by-name/ad/adr-tools/package.nix +++ b/pkgs/by-name/ad/adr-tools/package.nix @@ -72,9 +72,6 @@ stdenv.mkDerivation rec { gnused ] } - # avoid having two bash dependencies in output - substituteInPlace $out/bin/adr --replace-fail "${lib.getExe bash}" "${lib.getExe bashInteractive}" - installShellCompletion --bash autocomplete/adr ''; From 6283195b167b09da37df6c5e135e73751f54d979 Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Sun, 16 Feb 2025 19:24:45 +0800 Subject: [PATCH 0506/1107] home-assistant-custom-components.xiaomi_miot: 1.0.8 -> 1.0.9 --- .../home-assistant/custom-components/xiaomi_miot/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix index 0f3c2f4b34c0..9a697ad651b0 100644 --- a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix +++ b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix @@ -11,13 +11,13 @@ buildHomeAssistantComponent rec { owner = "al-one"; domain = "xiaomi_miot"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "al-one"; repo = "hass-xiaomi-miot"; rev = "v${version}"; - hash = "sha256-DTIXhs5gPN96C/fWz3s7ZTOybp7Mx+/NbNGXIOGyMmk="; + hash = "sha256-2XCm7XEKQgoe8myAgPnYCOO+XdLTAl8NtAVCBMJGqDc="; }; dependencies = [ From 94e8af4270464dffd655ff3de8b5f48b033e7e4a Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 16 Feb 2025 14:47:21 +0300 Subject: [PATCH 0507/1107] nodejs_20: backport patches to fix tests on OpenSSL 3.4 --- pkgs/development/web/nodejs/v20.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index d0679570f048..66dbd357f028 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -1,3 +1,4 @@ + { callPackage, fetchpatch2, @@ -50,5 +51,20 @@ buildNodejs { stripLen = 1; hash = "sha256-6y3aEqxNC4iTQEv1oewodJrhOHxjp5xZMq1P1QL94Rg="; }) + + # Backport fixes for OpenSSL 3.4 + # FIXME: remove when merged upstream + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/e799722f1a0bf43fe4d47e4824b9524363fe0d62.patch"; + hash = "sha256-nz95vmBx+zFPdOR9kg0HdgiAlqgTeXistOP/NLF3qW0="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/e6a988dbdee47b3412094a90d35d6bd8207c750d.patch"; + hash = "sha256-UJ8alA54PrhHXK9u120HvBgm0scuEDBwCRuuVYVa/Ng="; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/7895b8eae9e4f2919028fe81e38790af07b4cc92.patch"; + hash = "sha256-S2PmFw/e0/DY71UJb2RYXu9Qft/rBFC50K0Ex7v/9QE="; + }) ] ++ gypPatches; } From 53c92507665ed563075b1ff9b74d33028cb69e75 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Sun, 16 Feb 2025 12:37:41 +0100 Subject: [PATCH 0508/1107] oxipng: fix build on aarch64-linux build fails with error: linker `aarch64-linux-gnu-gcc` not found In my testing, it doesn't seem to be necessary to run aarch64 inside a qemu vm. --- pkgs/by-name/ox/oxipng/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ox/oxipng/package.nix b/pkgs/by-name/ox/oxipng/package.nix index b661fd536110..461522b2f3f2 100644 --- a/pkgs/by-name/ox/oxipng/package.nix +++ b/pkgs/by-name/ox/oxipng/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - qemu, }: rustPlatform.buildRustPackage rec { @@ -21,8 +19,11 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-Z0otTCFwtGuSC1XBM3jcgGDFPZuMzQikZaYCnR+S6Us="; - # See https://github.com/shssoichiro/oxipng/blob/14b8b0e93a/.cargo/config.toml#L5 - nativeCheckInputs = [ qemu ]; + # don't require qemu for aarch64-linux tests + # error: linker `aarch64-linux-gnu-gcc` not found + postPatch = '' + rm .cargo/config.toml + ''; meta = { homepage = "https://github.com/shssoichiro/oxipng"; From f7f68bb1ec8041a54d51f526388f8fcbb40a9e45 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 16 Feb 2025 15:02:18 +0300 Subject: [PATCH 0509/1107] git-revise: 0.7.0 -> 0.7.0-unstable-2025-01-28 Fixes tests with Git 2.48 --- pkgs/development/python-modules/git-revise/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/git-revise/default.nix b/pkgs/development/python-modules/git-revise/default.nix index 78fdc254baaa..8e796abdf3c7 100644 --- a/pkgs/development/python-modules/git-revise/default.nix +++ b/pkgs/development/python-modules/git-revise/default.nix @@ -10,15 +10,15 @@ buildPythonPackage rec { pname = "git-revise"; - version = "0.7.0"; + version = "0.7.0-unstable-2025-01-28"; format = "setuptools"; # Missing tests on PyPI src = fetchFromGitHub { owner = "mystor"; repo = pname; - rev = "v${version}"; - hash = "sha256-xV1Z9O5FO4Q/XEpNwnX31tbv8CrXY+wF1Ltpfq+ITRg="; + rev = "189c9fe150e5587def75c51709246c47c93e3b4d"; + hash = "sha256-bqhRV0WtWRUKkBG2tEvctxdoYRkcrpL4JZSHYzox8so="; }; disabled = pythonOlder "3.8"; From 1980df1564cf4eef6d06dc03c290b9477c43f464 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 12:09:06 +0000 Subject: [PATCH 0510/1107] yash: 2.58 -> 2.58.1 --- pkgs/by-name/ya/yash/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ya/yash/package.nix b/pkgs/by-name/ya/yash/package.nix index a40e4b44cb6a..fb96b1ab9654 100644 --- a/pkgs/by-name/ya/yash/package.nix +++ b/pkgs/by-name/ya/yash/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "yash"; - version = "2.58"; + version = "2.58.1"; src = fetchFromGitHub { owner = "magicant"; repo = pname; rev = version; - hash = "sha256-d0Dt/+TxAtfKndXao6Cd9IEujHwi6H5HQjgY774UEFY="; + hash = "sha256-024/Nj4i5fxXMAqVEjlcrSf62a9CZv3W+imAAEdR+xo="; }; strictDeps = true; From 7be5eb69c30f791e1aa08d903adbc2a83ad65bb3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 12:21:59 +0000 Subject: [PATCH 0511/1107] python312Packages.mdtraj: 1.10.2 -> 1.10.3 --- pkgs/development/python-modules/mdtraj/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mdtraj/default.nix b/pkgs/development/python-modules/mdtraj/default.nix index 6bdffc644f2b..6d8afed4ab34 100644 --- a/pkgs/development/python-modules/mdtraj/default.nix +++ b/pkgs/development/python-modules/mdtraj/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "mdtraj"; - version = "1.10.2"; + version = "1.10.3"; pyproject = true; src = fetchFromGitHub { owner = "mdtraj"; repo = "mdtraj"; tag = version; - hash = "sha256-0hSMKrY3p29IUmMuLsNUK4s/AM5zCzAh6Udg/xbeky0="; + hash = "sha256-xmxVPF6GhZpyuTxdmxB7mkfrDb1FIh9Z3obgUOdQmrw="; }; patches = [ From 725dac62b87e7a4bcd8e94dedf2499833dab7cf0 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 16 Feb 2025 15:26:08 +0300 Subject: [PATCH 0512/1107] librsvg: skip tests on i686 --- pkgs/development/libraries/librsvg/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 11b9919ecdb6..5a9d1a9a6121 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -141,8 +141,9 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonBool "tests" finalAttrs.finalPackage.doCheck) ]; - # Probably broken MIME type detection. - doCheck = !stdenv.isDarwin; + # Probably broken MIME type detection on Darwin. + # Tests fail with imprecise rendering on i686. + doCheck = !stdenv.isDarwin && !stdenv.hostPlatform.isi686; env = { PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_QUERY_LOADERS = writeShellScript "gdk-pixbuf-loader-loaders-wrapped" '' From b919b916a1f7bb9e5192f0b83642a558988294b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 13:17:51 +0000 Subject: [PATCH 0513/1107] hawkeye: 6.0.0 -> 6.0.1 --- pkgs/by-name/ha/hawkeye/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ha/hawkeye/package.nix b/pkgs/by-name/ha/hawkeye/package.nix index 6ffc0cc3f428..c65aaf6bd389 100644 --- a/pkgs/by-name/ha/hawkeye/package.nix +++ b/pkgs/by-name/ha/hawkeye/package.nix @@ -7,17 +7,17 @@ rustPackages.rustPlatform.buildRustPackage rec { pname = "hawkeye"; - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "korandoru"; repo = "hawkeye"; tag = "v${version}"; - hash = "sha256-VfJWj9BwNVR7RVUW+CjFuaniyiEath1U0F/7QJcA3r4="; + hash = "sha256-vf4Y/OJ6owLC3AMm4LVUyc/kfUluxN5VxC07hDWuEQY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-SJEl5QsO4KYRv+5xDPHy1Q53qcL89IJ9JTXtzubO5fk="; + cargoHash = "sha256-mGJuAuq2z7JXRgAIVrBaO75Je++lBHHTUowo7+LEuaE="; nativeBuildInputs = [ pkg-config From 14c812068fbbd7c40fce2f2f46c312ffa35cd0cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 13:27:53 +0000 Subject: [PATCH 0514/1107] librime: 1.13.0 -> 1.13.1 --- pkgs/by-name/li/librime/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/librime/package.nix b/pkgs/by-name/li/librime/package.nix index 6024dd411230..401b584ad24a 100644 --- a/pkgs/by-name/li/librime/package.nix +++ b/pkgs/by-name/li/librime/package.nix @@ -30,13 +30,13 @@ let in stdenv.mkDerivation rec { pname = "librime"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "rime"; repo = pname; rev = version; - sha256 = "sha256-vkliraMsBLX05gae834R0LX4uT+XaxrfHmDkFPh1XIQ="; + sha256 = "sha256-pv1I/YFzPLOmBDcT4HcrJWSikPEErEB5UzGrGqfJBvg="; }; nativeBuildInputs = [ From 5fef117961130de3338d1ef22ebb132ea1f86b62 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 16 Feb 2025 16:38:01 +0300 Subject: [PATCH 0515/1107] home-assistant: relax aiozoneinfo dependency --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index f9e8ba70c237..1b68751b13e9 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -405,6 +405,7 @@ python.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "aiohttp" + "aiozoneinfo" "attrs" "bcrypt" "ciso8601" From 379b49f7177bf455b0264f54b097fae910bcb3cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 13:43:20 +0000 Subject: [PATCH 0516/1107] misconfig-mapper: 1.13.0 -> 1.13.5 --- pkgs/by-name/mi/misconfig-mapper/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/misconfig-mapper/package.nix b/pkgs/by-name/mi/misconfig-mapper/package.nix index 53d8446cfbbf..f12464d809ef 100644 --- a/pkgs/by-name/mi/misconfig-mapper/package.nix +++ b/pkgs/by-name/mi/misconfig-mapper/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "misconfig-mapper"; - version = "1.13.0"; + version = "1.13.5"; src = fetchFromGitHub { owner = "intigriti"; repo = "misconfig-mapper"; tag = "v${version}"; - hash = "sha256-WheKF6IG4quJpNBPXbOMKGEUkR6wr3cVi97Gtpaz+LA="; + hash = "sha256-WBZE99CbM0uCmse6FVLK+OxxwBajWEs2pqoOf1EIckc="; }; - vendorHash = "sha256-omnWQfriaPqz51xrUKZM5112ZEHJZgAm68hnqUyzR6A="; + vendorHash = "sha256-fEmf+d9oBXz7KymNVmC+CM7OyPD9QV1uN4ReTNhei7A="; ldflags = [ "-s" From ee6d5667792ff6f20c33b967785cd5110558238a Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Fri, 24 Jan 2025 13:01:52 +0100 Subject: [PATCH 0517/1107] mobilizon: fix media proxy --- .../mobilizon/0002-fix-media-proxy.patch | 19 +++++++++++++++++++ pkgs/servers/mobilizon/default.nix | 17 +++++++++++++---- 2 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 pkgs/servers/mobilizon/0002-fix-media-proxy.patch diff --git a/pkgs/servers/mobilizon/0002-fix-media-proxy.patch b/pkgs/servers/mobilizon/0002-fix-media-proxy.patch new file mode 100644 index 000000000000..9641dd3d60ac --- /dev/null +++ b/pkgs/servers/mobilizon/0002-fix-media-proxy.patch @@ -0,0 +1,19 @@ +diff --git a/lib/web/proxy/reverse_proxy.ex b/lib/web/proxy/reverse_proxy.ex +index 8a78ef27..788ccc30 100644 +--- a/lib/web/proxy/reverse_proxy.ex ++++ b/lib/web/proxy/reverse_proxy.ex +@@ -187,9 +187,13 @@ defmodule Mobilizon.Web.ReverseProxy do + @spec response(Plug.Conn.t(), any(), String.t(), pos_integer(), list(tuple()), Keyword.t()) :: + Plug.Conn.t() + defp response(conn, client, url, status, headers, opts) do ++ headers = build_resp_headers(headers, opts) ++ # Fix HTTP/1.1 protocol violation: content-length can't be combined with chunked encoding ++ headers = Enum.reject(headers, fn {k, _} -> k == "content-length" end) ++ + result = + conn +- |> put_resp_headers(build_resp_headers(headers, opts)) ++ |> put_resp_headers(headers) + |> send_chunked(status) + |> chunk_reply(client, opts) + \ No newline at end of file diff --git a/pkgs/servers/mobilizon/default.nix b/pkgs/servers/mobilizon/default.nix index efd40acbfeef..f8ae27a81ece 100644 --- a/pkgs/servers/mobilizon/default.nix +++ b/pkgs/servers/mobilizon/default.nix @@ -19,10 +19,19 @@ in mixRelease rec { inherit (common) pname version src; - # Version 5.1.1 failed to bump their internal package version, - # which causes issues with static file serving in the NixOS module. - # See https://github.com/NixOS/nixpkgs/pull/370277 - patches = [ ./0001-fix-version.patch ]; + patches = [ + # Version 5.1.1 failed to bump their internal package version, + # which causes issues with static file serving in the NixOS module. + # See https://github.com/NixOS/nixpkgs/pull/370277 + ./0001-fix-version.patch + # Mobilizon uses chunked Transfer-Encoding for the media proxy but also + # sets the Content-Length header. This is a HTTP/1.1 protocol violation + # and results in nginx >=1.24 rejecting the response with this error: + # 'upstream sent "Content-Length" and "Transfer-Encoding" headers at the same + # time while reading response header from upstream' + # Upstream PR: https://framagit.org/framasoft/mobilizon/-/merge_requests/1604 + ./0002-fix-media-proxy.patch + ]; nativeBuildInputs = [ git From 6ff53531124379af406a9ce9218fc87f57c25d2e Mon Sep 17 00:00:00 2001 From: Julian Kuhn Date: Thu, 30 Jan 2025 17:17:42 +0100 Subject: [PATCH 0518/1107] alertmanager-gotify-bridge: init at 2.3.2 --- .../al/alertmanager-gotify-bridge/package.nix | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 pkgs/by-name/al/alertmanager-gotify-bridge/package.nix diff --git a/pkgs/by-name/al/alertmanager-gotify-bridge/package.nix b/pkgs/by-name/al/alertmanager-gotify-bridge/package.nix new file mode 100644 index 000000000000..09e19960b121 --- /dev/null +++ b/pkgs/by-name/al/alertmanager-gotify-bridge/package.nix @@ -0,0 +1,42 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: +buildGoModule rec { + pname = "alertmanager-gotify-bridge"; + version = "2.3.2"; + + src = fetchFromGitHub { + owner = "DRuggeri"; + repo = "alertmanager_gotify_bridge"; + tag = "v${version}"; + hash = "sha256-jG4SC+go6ZxdV1RtLJjZdL4I8jLayY5JKK8mlMDD2pE="; + }; + + vendorHash = "sha256-EjsfY8Ys0Fd99sx7OsZ2jcstdVloqDQQj5xfoIVSX9E="; + + ldflags = [ + "-s" + "-w" + "-X main.Version=${version}" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/alertmanager_gotify_bridge"; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Bridge between Prometheus AlertManager and a Gotify server"; + homepage = "https://github.com/DRuggeri/alertmanager_gotify_bridge"; + changelog = "https://github.com/DRuggeri/alertmanager_gotify_bridge/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ juli0604 ]; + mainProgram = "alertmanager_gotify_bridge"; + }; +} From 16fda46db7f39b608388a222f4072708c80eca28 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Sun, 16 Feb 2025 15:03:22 +0100 Subject: [PATCH 0519/1107] nixos/mobilizon: create launch wrapper through runCommand --- nixos/modules/services/web-apps/mobilizon.nix | 47 +++++++++---------- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/nixos/modules/services/web-apps/mobilizon.nix b/nixos/modules/services/web-apps/mobilizon.nix index b139fc836125..d130ed905428 100644 --- a/nixos/modules/services/web-apps/mobilizon.nix +++ b/nixos/modules/services/web-apps/mobilizon.nix @@ -28,34 +28,29 @@ let # Make a package containing launchers with the correct envirenment, instead of # setting it with systemd services, so that the user can also use them without # troubles - launchers = pkgs.stdenv.mkDerivation { - pname = "${cfg.package.pname}-launchers"; - inherit (cfg.package) version; + launchers = + pkgs.runCommand "${cfg.package.pname}-launchers-${cfg.package.version}" + { + src = cfg.package; + nativeBuildInputs = with pkgs; [ makeWrapper ]; + } + '' + mkdir -p $out/bin - src = cfg.package; + makeWrapper \ + $src/bin/mobilizon \ + $out/bin/mobilizon \ + --run '. ${secretEnvFile}' \ + --set MOBILIZON_CONFIG_PATH "${configFile}" \ + --set-default RELEASE_TMP "/tmp" - nativeBuildInputs = with pkgs; [ makeWrapper ]; - - dontBuild = true; - - installPhase = '' - mkdir -p $out/bin - - makeWrapper \ - $src/bin/mobilizon \ - $out/bin/mobilizon \ - --run '. ${secretEnvFile}' \ - --set MOBILIZON_CONFIG_PATH "${configFile}" \ - --set-default RELEASE_TMP "/tmp" - - makeWrapper \ - $src/bin/mobilizon_ctl \ - $out/bin/mobilizon_ctl \ - --run '. ${secretEnvFile}' \ - --set MOBILIZON_CONFIG_PATH "${configFile}" \ - --set-default RELEASE_TMP "/tmp" - ''; - }; + makeWrapper \ + $src/bin/mobilizon_ctl \ + $out/bin/mobilizon_ctl \ + --run '. ${secretEnvFile}' \ + --set MOBILIZON_CONFIG_PATH "${configFile}" \ + --set-default RELEASE_TMP "/tmp" + ''; repoSettings = cfg.settings.":mobilizon"."Mobilizon.Storage.Repo"; instanceSettings = cfg.settings.":mobilizon".":instance"; From cc287617897f4c63315ef81ec237d5dd4f48aff4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 14:19:25 +0000 Subject: [PATCH 0520/1107] python312Packages.blivet: 3.11.0 -> 3.12.0 --- pkgs/development/python-modules/blivet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index 8740b3f213ee..3ddfbf0b8503 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -35,14 +35,14 @@ let in buildPythonPackage rec { pname = "blivet"; - version = "3.11.0"; + version = "3.12.0"; format = "setuptools"; src = fetchFromGitHub { owner = "storaged-project"; repo = "blivet"; tag = "blivet-${version}"; - hash = "sha256-X5U6XFmcsTfetpxwH0ONSnTasnwh2USukYtx+8HwVGc="; + hash = "sha256-09Fs9lwZksfAIH26bHyewr7ALuVo/cpMhb5xWaifXUg="; }; postPatch = '' From 6a1c02adffc20e6cf160421493ecea2c2a9ccb57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 14:50:45 +0000 Subject: [PATCH 0521/1107] monkeysAudio: 10.92 -> 10.96 --- pkgs/by-name/mo/monkeysAudio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/monkeysAudio/package.nix b/pkgs/by-name/mo/monkeysAudio/package.nix index c89ed2d78265..18911f8b0ea2 100644 --- a/pkgs/by-name/mo/monkeysAudio/package.nix +++ b/pkgs/by-name/mo/monkeysAudio/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "10.92"; + version = "10.96"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-xb+L+X1N6/t7ohodFefIT5zvc/GMjMnkqCNMJukEIFg="; + hash = "sha256-LRkvcx+h3dv7WTd2YvdxsQndgdWY9CBve8GSd1rV+yg="; stripRoot = false; }; From ca4a1e055eaf8051cfc5b299f3a01ec16f2fde58 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 15:13:42 +0000 Subject: [PATCH 0522/1107] kind: 0.26.0 -> 0.27.0 --- pkgs/by-name/ki/kind/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ki/kind/package.nix b/pkgs/by-name/ki/kind/package.nix index 387c2fa69c17..9cbad3d0c47a 100644 --- a/pkgs/by-name/ki/kind/package.nix +++ b/pkgs/by-name/ki/kind/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "kind"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "kubernetes-sigs"; repo = "kind"; - hash = "sha256-1bU4vHC9bVz8TfO7knO1RYRxJUnwsXxZrRVnit5iQz0="; + hash = "sha256-J0M/enjufNmEMm43zo5fi5hL1LfaemNwR6nCClVCJNA="; }; patches = [ @@ -24,7 +24,7 @@ buildGoModule rec { ./kernel-module-path.patch ]; - vendorHash = "sha256-VfqNM48M39R2LaUHirKmSXCdvBXUHu09oMzDPmAQC4o="; + vendorHash = "sha256-dwdDVN/B1bv8cYZYcXxSlGgO46ljBZfXuivPXmvo28c="; nativeBuildInputs = [ installShellFiles ]; From 03393179e017d04fa6684bd54774e954a70bb5af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 15:21:21 +0000 Subject: [PATCH 0523/1107] simple64-netplay-server: 2025.01.3 -> 2025.02.3 --- pkgs/by-name/si/simple64-netplay-server/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simple64-netplay-server/package.nix b/pkgs/by-name/si/simple64-netplay-server/package.nix index 9b03d00e6655..e22c47979e9a 100644 --- a/pkgs/by-name/si/simple64-netplay-server/package.nix +++ b/pkgs/by-name/si/simple64-netplay-server/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "simple64-netplay-server"; - version = "2025.01.3"; + version = "2025.02.3"; src = fetchFromGitHub { owner = "simple64"; repo = "simple64-netplay-server"; tag = "v${version}"; - hash = "sha256-6+apLOy/hlLkvQjVxi4qpIVhfImdevyCFGAo6rBCc6k="; + hash = "sha256-mtyIGS7i4+HRpjE8Z3puoIOGhv21Th27iCXpO2LxtAg="; }; vendorHash = "sha256-lcKOAPCyWKNg+l1YjziaMTn4DjLB0P+dz3FqyAy0sFk="; From e0a1d540b056d59d1453842cfad6536d10ceeb2b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 15:23:19 +0000 Subject: [PATCH 0524/1107] stripe-cli: 1.23.10 -> 1.24.0 --- pkgs/by-name/st/stripe-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stripe-cli/package.nix b/pkgs/by-name/st/stripe-cli/package.nix index d97af867fc62..14370c4846c3 100644 --- a/pkgs/by-name/st/stripe-cli/package.nix +++ b/pkgs/by-name/st/stripe-cli/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.23.10"; + version = "1.24.0"; src = fetchFromGitHub { owner = "stripe"; repo = "stripe-cli"; rev = "v${version}"; - hash = "sha256-QHCQ8cM7XfMdpgIm5zUQIP/5ryc/prvXQfdD91y7zJY="; + hash = "sha256-xWpKSrTH72YZlRGfL12bMF8ieObRIVvDwlUKR10g6hg="; }; vendorHash = "sha256-dWLrJ866R+yPEYs4vc8SRADZXC1xCO7sDosHbU1G63o="; From 4330382f3b1ed6f110d3259a4cace3eca4672c2a Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 16 Feb 2025 16:24:29 +0100 Subject: [PATCH 0525/1107] musl: apply patch for CVE-2025-26519 https://www.openwall.com/lists/musl/2025/02/13/1 --- pkgs/by-name/mu/musl/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/mu/musl/package.nix b/pkgs/by-name/mu/musl/package.nix index d3b080173c8c..d2227dd12a49 100644 --- a/pkgs/by-name/mu/musl/package.nix +++ b/pkgs/by-name/mu/musl/package.nix @@ -78,6 +78,16 @@ stdenv.mkDerivation rec { url = "https://raw.githubusercontent.com/openwrt/openwrt/87606e25afac6776d1bbc67ed284434ec5a832b4/toolchain/musl/patches/300-relative.patch"; sha256 = "0hfadrycb60sm6hb6by4ycgaqc9sgrhh42k39v8xpmcvdzxrsq2n"; }) + (fetchurl { + name = "CVE-2025-26519_0.patch"; + url = "https://www.openwall.com/lists/musl/2025/02/13/1/1"; + hash = "sha256-CJb821El2dByP04WXxPCCYMOcEWnXLpOhYBgg3y3KS4="; + }) + (fetchurl { + name = "CVE-2025-26519_1.patch"; + url = "https://www.openwall.com/lists/musl/2025/02/13/1/2"; + hash = "sha256-BiD87k6KTlLr4ep14rUdIZfr2iQkicBYaSTq+p6WBqE="; + }) ]; CFLAGS = [ "-fstack-protector-strong" From 38dd3d76db02fc52e9e544d9f0dfefe23dc95dbd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 15:26:10 +0000 Subject: [PATCH 0526/1107] python312Packages.weblate-language-data: 2024.16 -> 2025.2 --- .../python-modules/weblate-language-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weblate-language-data/default.nix b/pkgs/development/python-modules/weblate-language-data/default.nix index 12c26e81e323..b1301c6237be 100644 --- a/pkgs/development/python-modules/weblate-language-data/default.nix +++ b/pkgs/development/python-modules/weblate-language-data/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "weblate-language-data"; - version = "2024.16"; + version = "2025.2"; pyproject = true; src = fetchPypi { pname = "weblate_language_data"; inherit version; - hash = "sha256-zPYUsOkYizkaGcN+orrR7mZKAq+4KuSXTZc1arsu/Xw="; + hash = "sha256-T3O107CQ01loE68vlQtcCjeytxCSiu0m5Oj5P06z2NU="; }; build-system = [ setuptools ]; From 2776956ea567b701d37c244f8de951024952ab82 Mon Sep 17 00:00:00 2001 From: Nikolaos Karaolidis Date: Fri, 10 Jan 2025 10:18:51 +0000 Subject: [PATCH 0527/1107] telepresence: fix compilation error Signed-off-by: Nikolaos Karaolidis --- pkgs/tools/networking/telepresence/default.nix | 4 ++++ .../networking/telepresence/fix-versioneer.patch | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/tools/networking/telepresence/fix-versioneer.patch diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix index 244b190fe60b..a02f6e5c9936 100644 --- a/pkgs/tools/networking/telepresence/default.nix +++ b/pkgs/tools/networking/telepresence/default.nix @@ -29,6 +29,10 @@ pythonPackages.buildPythonPackage rec { sha256 = "1ccc8bzcdxp6rh6llk7grcnmyc05fq7dz5w0mifdzjv3a473hsky"; }; + patches = [ + ./fix-versioneer.patch + ]; + nativeBuildInputs = [ makeWrapper ]; postInstall = '' diff --git a/pkgs/tools/networking/telepresence/fix-versioneer.patch b/pkgs/tools/networking/telepresence/fix-versioneer.patch new file mode 100644 index 000000000000..5d3e521f068f --- /dev/null +++ b/pkgs/tools/networking/telepresence/fix-versioneer.patch @@ -0,0 +1,16 @@ +diff --git a/versioneer.py b/versioneer.py +index 7e5bb402e..60d65ef76 100644 +--- a/versioneer.py ++++ b/versioneer.py +@@ -339,9 +339,9 @@ def get_config_from_root(root): + # configparser.NoOptionError (if it lacks "VCS="). See the docstring at + # the top of versioneer.py for instructions on writing your setup.cfg . + setup_cfg = os.path.join(root, "setup.cfg") +- parser = configparser.SafeConfigParser() ++ parser = configparser.ConfigParser() + with open(setup_cfg, "r") as f: +- parser.readfp(f) ++ parser.read_file(f) + VCS = parser.get("versioneer", "VCS") # mandatory + + def get(parser, name): From 57253f7878f7fd685c50d70cdb7b6d526e6e180a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 15:55:12 +0000 Subject: [PATCH 0528/1107] python312Packages.githubkit: 0.12.6 -> 0.12.7 --- pkgs/development/python-modules/githubkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix index ddafe5fe1b5d..3ba2ad3e71b0 100644 --- a/pkgs/development/python-modules/githubkit/default.nix +++ b/pkgs/development/python-modules/githubkit/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "githubkit"; - version = "0.12.6"; + version = "0.12.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "yanyongyu"; repo = "githubkit"; tag = "v${version}"; - hash = "sha256-JqnQ1cO5cbgRRyLSC+0LvYui/GVad3dBSSr/aTNw/yM="; + hash = "sha256-Lu87Vw1nTSxraK9jKr9lvwGXu49s9amO3vICbs89iHA="; }; pythonRelaxDeps = [ "hishel" ]; From 60d1227c5ea343b6396e64631b0cd04cd96036a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 16:02:33 +0000 Subject: [PATCH 0529/1107] python312Packages.msgraph-sdk: 1.20.0 -> 1.21.0 --- pkgs/development/python-modules/msgraph-sdk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index 9473c4aae69a..0e9ed03cd15b 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-sdk"; - version = "1.20.0"; + version = "1.21.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; tag = "v${version}"; - hash = "sha256-kZ+m75oNTh/AJ+hl8Nhulzvk62CWVOx0hJKRFyc0CSI="; + hash = "sha256-e8LeFQroHCHcHDnVnIlz1FTkb4XJ2ANuT4z/82t3P54="; }; build-system = [ flit-core ]; @@ -51,7 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Graph SDK for Python"; homepage = "https://github.com/microsoftgraph/msgraph-sdk-python"; - changelog = "https://github.com/microsoftgraph/msgraph-sdk-python/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/microsoftgraph/msgraph-sdk-python/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 7e80079af151c82cb0a0d5c092439b84edb05f7e Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Sun, 16 Feb 2025 16:53:09 +0100 Subject: [PATCH 0530/1107] mealie: format with nixfmt --- pkgs/by-name/me/mealie/package.nix | 72 ++++++++++++++++-------------- 1 file changed, 39 insertions(+), 33 deletions(-) diff --git a/pkgs/by-name/me/mealie/package.nix b/pkgs/by-name/me/mealie/package.nix index b3c785eb4575..850b9caa0c61 100644 --- a/pkgs/by-name/me/mealie/package.nix +++ b/pkgs/by-name/me/mealie/package.nix @@ -1,11 +1,12 @@ -{ lib -, stdenv -, callPackage -, fetchFromGitHub -, makeWrapper -, nixosTests -, python3Packages -, writeShellScript +{ + lib, + stdenv, + callPackage, + fetchFromGitHub, + makeWrapper, + nixosTests, + python3Packages, + writeShellScript, }: let @@ -107,31 +108,33 @@ pythonpkgs.buildPythonApplication rec { --replace-fail '"script_location", path.join(PROJECT_DIR, "alembic")' '"script_location", "${src}/alembic"' ''; - postInstall = let - start_script = writeShellScript "start-mealie" '' - ${lib.getExe pythonpkgs.gunicorn} "$@" -k uvicorn.workers.UvicornWorker mealie.app:app; + postInstall = + let + start_script = writeShellScript "start-mealie" '' + ${lib.getExe pythonpkgs.gunicorn} "$@" -k uvicorn.workers.UvicornWorker mealie.app:app; + ''; + init_db = writeShellScript "init-mealie-db" '' + ${python.interpreter} $OUT/${python.sitePackages}/mealie/scripts/install_model.py + ${python.interpreter} $OUT/${python.sitePackages}/mealie/db/init_db.py + ''; + in + '' + mkdir -p $out/bin $out/libexec + rm -f $out/bin/* + + substitute ${src}/alembic.ini $out/alembic.ini \ + --replace-fail 'script_location = alembic' 'script_location = ${src}/alembic' + + makeWrapper ${start_script} $out/bin/mealie \ + --set PYTHONPATH "$out/${python.sitePackages}:${pythonpkgs.makePythonPath dependencies}" \ + --set LD_LIBRARY_PATH "${crfpp}/lib" \ + --set STATIC_FILES "${frontend}" \ + --set PATH "${lib.makeBinPath [ crfpp ]}" + + makeWrapper ${init_db} $out/libexec/init_db \ + --set PYTHONPATH "$out/${python.sitePackages}:${pythonpkgs.makePythonPath dependencies}" \ + --set OUT "$out" ''; - init_db = writeShellScript "init-mealie-db" '' - ${python.interpreter} $OUT/${python.sitePackages}/mealie/scripts/install_model.py - ${python.interpreter} $OUT/${python.sitePackages}/mealie/db/init_db.py - ''; - in '' - mkdir -p $out/bin $out/libexec - rm -f $out/bin/* - - substitute ${src}/alembic.ini $out/alembic.ini \ - --replace-fail 'script_location = alembic' 'script_location = ${src}/alembic' - - makeWrapper ${start_script} $out/bin/mealie \ - --set PYTHONPATH "$out/${python.sitePackages}:${pythonpkgs.makePythonPath dependencies}" \ - --set LD_LIBRARY_PATH "${crfpp}/lib" \ - --set STATIC_FILES "${frontend}" \ - --set PATH "${lib.makeBinPath [ crfpp ]}" - - makeWrapper ${init_db} $out/libexec/init_db \ - --set PYTHONPATH "$out/${python.sitePackages}:${pythonpkgs.makePythonPath dependencies}" \ - --set OUT "$out" - ''; nativeCheckInputs = with pythonpkgs; [ pytestCheckHook ]; @@ -160,7 +163,10 @@ pythonpkgs.buildPythonApplication rec { homepage = "https://mealie.io"; changelog = "https://github.com/mealie-recipes/mealie/releases/tag/${src.rev}"; license = licenses.agpl3Only; - maintainers = with maintainers; [ litchipi anoa ]; + maintainers = with maintainers; [ + litchipi + anoa + ]; mainProgram = "mealie"; }; } From 56ff9c7c9dd7dada6b5575d756228bb130fa5c28 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 16 Feb 2025 16:03:43 +0000 Subject: [PATCH 0531/1107] fheroes2: 1.1.5 -> 1.1.6 Changes: https://github.com/ihhub/fheroes2/releases/tag/1.1.6 --- pkgs/by-name/fh/fheroes2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fh/fheroes2/package.nix b/pkgs/by-name/fh/fheroes2/package.nix index 10af267396fb..dbe215a34360 100644 --- a/pkgs/by-name/fh/fheroes2/package.nix +++ b/pkgs/by-name/fh/fheroes2/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - hash = "sha256-Iy7aDC2IRwaNcX+hqtlKNDdOC8WCIlCxfNVeMRK6KP4="; + hash = "sha256-CowCP+gZuGSXWbALYBkmyn+RlDgOGho/Px34GutrBX0="; }; nativeBuildInputs = [ imagemagick ]; From 43c92a3a0ef7119675e209a23948e769439fb2e7 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 16 Feb 2025 16:06:37 +0000 Subject: [PATCH 0532/1107] 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 7ac5805540100164581775b998660d1d210eaba3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 16:10:42 +0000 Subject: [PATCH 0533/1107] storj-uplink: 1.121.3 -> 1.122.2 --- pkgs/by-name/st/storj-uplink/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/storj-uplink/package.nix b/pkgs/by-name/st/storj-uplink/package.nix index 87c5de138da8..3ef80cb20c73 100644 --- a/pkgs/by-name/st/storj-uplink/package.nix +++ b/pkgs/by-name/st/storj-uplink/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "storj-uplink"; - version = "1.121.3"; + version = "1.122.2"; src = fetchFromGitHub { owner = "storj"; repo = "storj"; rev = "v${version}"; - hash = "sha256-Q/iQUgXeYvGDBuVL8hhHU7SK+sNVQtXCDBoRYFO+N9Y="; + hash = "sha256-PO5if8fBbWkLSEFuRues/B4+yWo6I4TNH25SybGU1Rg="; }; subPackages = [ "cmd/uplink" ]; - vendorHash = "sha256-XgHTzE982POxbCzlfSt05y+h8DJb/3fiFV5l/Fu8vGg="; + vendorHash = "sha256-mISSkuBU0E/ss5hLq5S4luStqJ/r9Vy1VVe5hMLehSc="; ldflags = [ "-s" From daadcbdaacc352a2031d53eaf6f8f1eedc263bcb Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 16 Feb 2025 19:41:21 +0300 Subject: [PATCH 0534/1107] nixos/systemd-stage-1: explicitly add pkgs.runtimeShell dependency Because it's no longer pkgs.bash (which is interactive), and can be something else on other platforms anyway. --- nixos/modules/system/boot/systemd/initrd.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index 332cfc2fbb13..472c72fb3889 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -538,7 +538,9 @@ in "${cfg.package.util-linux}/bin/umount" "${cfg.package.util-linux}/bin/sulogin" - # required for script services, and some tools like xfs still want the sh symlink + # required for services generated with writeShellScript and friends + pkgs.runtimeShell + # some tools like xfs still want the sh symlink "${pkgs.bash}/bin" # so NSS can look up usernames From 3abb3bca5eed79a056fcbb7db4a9a7b43a181d49 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 17 Feb 2025 01:42:11 +0900 Subject: [PATCH 0535/1107] lima: 1.0.3 -> 1.0.6 Release: https://github.com/lima-vm/lima/releases/tag/v1.0.6 Diff: https://github.com/lima-vm/lima/compare/v1.0.3...v1.0.6 This commit avoids tagged URLs in comments, That would be incorrectly updated by the update script. --- pkgs/applications/virtualization/lima/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 282fcac2395e..705aef607045 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -14,16 +14,16 @@ buildGoModule rec { pname = "lima"; - version = "1.0.3"; + version = "1.0.6"; src = fetchFromGitHub { owner = "lima-vm"; repo = "lima"; rev = "v${version}"; - hash = "sha256-S0Mk7h4gH5syP/ayK5g1g8HG5f23sKCQCCbM6xOj+n0="; + hash = "sha256-3K2RC4cPoIuDePTOYzY+ejmBFZwgYDvCtoe/ZLX66sc="; }; - vendorHash = "sha256-1SHiz+lfG4nl1qavq/Fd73UV8LkErILk7d8XZJSbHd0="; + vendorHash = "sha256-tjogQUD+F/3ALlJwpdDKdXHRcYB+n0EuJ81TB1VKKDY="; nativeBuildInputs = [ makeWrapper @@ -71,7 +71,7 @@ buildGoModule rec { ''; doInstallCheck = true; - # Workaround for: "panic: $HOME is not defined" at https://github.com/lima-vm/lima/blob/v1.0.3/pkg/limayaml/defaults.go#L52 + # Workaround for: "panic: $HOME is not defined" at https://github.com/lima-vm/lima/blob/cb99e9f8d01ebb82d000c7912fcadcd87ec13ad5/pkg/limayaml/defaults.go#L53 # Don't use versionCheckHook for this package. It cannot inject environment variables. installCheckPhase = '' if [[ "$(HOME="$(mktemp -d)" "$out/bin/limactl" --version | cut -d ' ' -f 3)" == "${version}" ]]; then From c9823d7a6467f29ab711d20b7da423cd7bbf35dc Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sat, 15 Feb 2025 13:40:29 +0100 Subject: [PATCH 0536/1107] 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 215efbea1d5a50961d6e62d1fea3592a7e31b954 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 17:26:27 +0000 Subject: [PATCH 0537/1107] marimo: 0.11.2 -> 0.11.5 --- pkgs/development/python-modules/marimo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 8caf58e83281..cd5cfc383126 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -33,13 +33,13 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.11.2"; + version = "0.11.5"; pyproject = true; # The github archive does not include the static assets src = fetchPypi { inherit pname version; - hash = "sha256-E6mEYTigSPgTC9pNfDpsIbOBagYOL5sc9CpYPMfNtfI="; + hash = "sha256-SELoL9ycfRAeq47dViCcutZ6lg5LUdUtcJbj93N6ig4="; }; build-system = [ hatchling ]; From eed6b13aafce28564c85f6eaa0f6b52eeafcc9bd Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 11 Feb 2025 19:58:25 +0100 Subject: [PATCH 0538/1107] appstream: fix static --- .../libraries/appstream/default.nix | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index d4d0e26adb08..011dd75151bf 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -1,7 +1,9 @@ { lib , stdenv +, buildPackages , replaceVars , fetchFromGitHub +, fetchpatch , meson , mesonEmulatorHook , appstream @@ -32,6 +34,9 @@ , systemd , nixosTests , testers +, withIntrospection ? + lib.meta.availableOn stdenv.hostPlatform gobject-introspection + && stdenv.hostPlatform.emulatorAvailable buildPackages , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd }: @@ -56,6 +61,12 @@ stdenv.mkDerivation (finalAttrs: { # Allow installing installed tests to a separate output. ./installed-tests-path.patch + + (fetchpatch { + name = "static.patch"; + url = "https://github.com/ximion/appstream/commit/90675d8853188f65897d2453346cb0acd531b58f.patch"; + hash = "sha256-d3h5h7B/MP3Sun5YwYCqMHcw4PMMwg1YS/S9vsMzkQ4="; + }) ]; strictDeps = true; @@ -74,13 +85,16 @@ stdenv.mkDerivation (finalAttrs: { xmlto docbook-xsl-nons docbook_xml_dtd_45 - gobject-introspection + glib itstool - vala gperf ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook + ] ++ lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [ appstream + ] ++ lib.optionals withIntrospection [ + gobject-introspection + vala ]; buildInputs = [ @@ -102,10 +116,12 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Dapidocs=false" + "-Dc_args=-Wno-error=missing-include-dirs" "-Ddocs=false" "-Dvapi=true" "-Dinstalled_test_prefix=${placeholder "installedTests"}" "-Dcompose=true" + (lib.mesonBool "gir" withIntrospection) ] ++ lib.optionals (!withSystemd) [ "-Dsystemd=false" ]; From 8cc056c0b08f0e897febcdd61d59f06ccc0dbc58 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 16 Feb 2025 18:13:53 +0100 Subject: [PATCH 0539/1107] ostree: backport static fix for pkg-config file --- pkgs/by-name/os/ostree/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/os/ostree/package.nix b/pkgs/by-name/os/ostree/package.nix index b6d1f6edaa37..f07e757d659d 100644 --- a/pkgs/by-name/os/ostree/package.nix +++ b/pkgs/by-name/os/ostree/package.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , pkg-config , gtk-doc , nixosTests @@ -59,6 +60,13 @@ in stdenv.mkDerivation rec { sha256 = "sha256-VOM4fe4f8WAxoGeayitg2pCrf0omwhGCIzPH8jAAq+4="; }; + patches = [ + (fetchpatch { + name = "static-pkg-config.patch"; + url = "https://github.com/ostreedev/ostree/pull/3382.patch"; + hash = "sha256-VCQLq4OqmojtB7WFHNNV82asgXPGq5tKoJun66eUntY="; + }) + ]; nativeBuildInputs = [ autoconf From 6416fc5865df4fc42534c46a8519955f296aa082 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 16 Feb 2025 18:14:29 +0100 Subject: [PATCH 0540/1107] malcontent: tighten platforms malcontent is tied to polkit, so it'll always only work on a subset of the platforms that polkit does. Being exact about this in the metadata means that we can conditionally enable malcontent in dependent packages based on whether polkit is available. --- pkgs/development/libraries/malcontent/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix index faa48dda2739..3f5270ce75a4 100644 --- a/pkgs/development/libraries/malcontent/default.nix +++ b/pkgs/development/libraries/malcontent/default.nix @@ -101,6 +101,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.freedesktop.org/pwithnall/malcontent"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.unix; + inherit (polkit.meta) platforms badPlatforms; }; } From 750c376688ff0060e8c5daf2d577f7c8eeb4c44b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 16 Feb 2025 18:18:07 +0100 Subject: [PATCH 0541/1107] flatpak: fix static --- pkgs/by-name/fl/flatpak/package.nix | 150 +++++++++++++++++----------- 1 file changed, 91 insertions(+), 59 deletions(-) diff --git a/pkgs/by-name/fl/flatpak/package.nix b/pkgs/by-name/fl/flatpak/package.nix index 61f16695711d..42620c2c4b7d 100644 --- a/pkgs/by-name/fl/flatpak/package.nix +++ b/pkgs/by-name/fl/flatpak/package.nix @@ -5,6 +5,7 @@ appstream, bison, bubblewrap, + buildPackages, bzip2, coreutils, curl, @@ -13,6 +14,7 @@ docbook-xsl-nons, docbook_xml_dtd_45, fetchurl, + fetchpatch, fuse3, gdk-pixbuf, gettext, @@ -58,11 +60,23 @@ xorg, zstd, withAutoSideloading ? false, + withDconf ? lib.meta.availableOn stdenv.hostPlatform dconf, withDocbookDocs ? true, - withGtkDoc ? withDocbookDocs && stdenv.buildPlatform.canExecute stdenv.hostPlatform, + withGlibNetworking ? lib.meta.availableOn stdenv.hostPlatform glib-networking, + withGtkDoc ? + withDocbookDocs + && stdenv.buildPlatform.canExecute stdenv.hostPlatform + # https://github.com/mesonbuild/meson/pull/14257 + && !stdenv.hostPlatform.isStatic, + withIntrospection ? + lib.meta.availableOn stdenv.hostPlatform gobject-introspection + && stdenv.hostPlatform.emulatorAvailable buildPackages, + withMalcontent ? lib.meta.availableOn stdenv.hostPlatform malcontent, withMan ? withDocbookDocs, + withP11Kit ? lib.meta.availableOn stdenv.hostPlatform p11-kit, + withPolkit ? lib.meta.availableOn stdenv.hostPlatform polkit, withSELinuxModule ? false, - withSystemd ? true, + withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, }: stdenv.mkDerivation (finalAttrs: { @@ -89,43 +103,53 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ywrFZa3LYhJ8bRHtUO5wRNaoNvppw1Sy9LZAoiv6Syo="; }; - patches = [ - # Hardcode paths used by tests and change test runtime generation to use files from Nix store. - # https://github.com/flatpak/flatpak/issues/1460 - (replaceVars ./fix-test-paths.patch { - inherit - coreutils - gettext - gtk3 - socat - ; - dfu = desktop-file-utils; - hicolorIconTheme = hicolor-icon-theme; - smi = shared-mime-info; - }) + patches = + [ + # Use flatpak from PATH to avoid references to `/nix/store` in `/desktop` files. + # Applications containing `DBusActivatable` entries should be able to find the flatpak binary. + # https://github.com/NixOS/nixpkgs/issues/138956 + ./binary-path.patch - # Hardcode paths used by Flatpak itself. - (replaceVars ./fix-paths.patch { - p11kit = lib.getExe p11-kit; - }) + # Try mounting fonts and icons from NixOS locations if FHS locations don't exist. + # https://github.com/NixOS/nixpkgs/issues/119433 + ./fix-fonts-icons.patch - # Use flatpak from PATH to avoid references to `/nix/store` in `/desktop` files. - # Applications containing `DBusActivatable` entries should be able to find the flatpak binary. - # https://github.com/NixOS/nixpkgs/issues/138956 - ./binary-path.patch + # Nix environment hacks should not leak into the apps. + # https://github.com/NixOS/nixpkgs/issues/53441 + ./unset-env-vars.patch - # Try mounting fonts and icons from NixOS locations if FHS locations don't exist. - # https://github.com/NixOS/nixpkgs/issues/119433 - ./fix-fonts-icons.patch + # The icon validator needs to access the gdk-pixbuf loaders in the Nix store + # and cannot bind FHS paths since those are not available on NixOS. + finalAttrs.passthru.icon-validator-patch - # Nix environment hacks should not leak into the apps. - # https://github.com/NixOS/nixpkgs/issues/53441 - ./unset-env-vars.patch - - # The icon validator needs to access the gdk-pixbuf loaders in the Nix store - # and cannot bind FHS paths since those are not available on NixOS. - finalAttrs.passthru.icon-validator-patch - ]; + (fetchpatch { + name = "static.patch"; + url = "https://github.com/flatpak/flatpak/commit/114c22e814fc28243585915321b8e943471c377f.patch"; + hash = "sha256-3JLzG74myBTssXQau0Ei5rpthy93Va7xb2MHRnJ3kaI="; + }) + ] + ++ lib.optionals finalAttrs.doCheck [ + # Hardcode paths used by tests and change test runtime generation to use files from Nix store. + # https://github.com/flatpak/flatpak/issues/1460 + (replaceVars ./fix-test-paths.patch { + inherit + coreutils + gettext + gtk3 + socat + ; + dfu = desktop-file-utils; + hicolorIconTheme = hicolor-icon-theme; + smi = shared-mime-info; + }) + ] + ++ lib.optionals withP11Kit [ + # Hardcode p11-kit path used by Flatpak itself. + # If disabled, will have to be on PATH. + (replaceVars ./fix-paths.patch { + p11kit = lib.getExe p11-kit; + }) + ]; # Fixup shebangs in some scripts # @@ -146,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: { [ (python3.pythonOnBuildForHost.withPackages (p: [ p.pyparsing ])) bison - gobject-introspection + glib meson ninja pkg-config @@ -155,6 +179,7 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsNoGuiHook ] ++ lib.optional withGtkDoc gtk-doc + ++ lib.optional withIntrospection gobject-introspection ++ lib.optional withMan libxslt ++ lib.optional withSELinuxModule bzip2 ++ lib.optionals withDocbookDocs [ @@ -163,29 +188,31 @@ stdenv.mkDerivation (finalAttrs: { xmlto ]; - buildInputs = [ - appstream - curl - dconf - fuse3 - gdk-pixbuf - glib-networking - gpgme - gsettings-desktop-schemas - json-glib - libarchive - libcap - librsvg # for flatpak-validate-icon - libseccomp - libxml2 - malcontent - polkit - python3 - wayland - wayland-protocols - xorg.libXau - zstd - ] ++ lib.optional withSystemd systemd; + buildInputs = + [ + appstream + curl + fuse3 + gdk-pixbuf + gpgme + gsettings-desktop-schemas + json-glib + libarchive + libcap + librsvg # for flatpak-validate-icon + libseccomp + libxml2 + python3 + wayland + wayland-protocols + xorg.libXau + zstd + ] + ++ lib.optional withDconf dconf + ++ lib.optional withGlibNetworking glib-networking + ++ lib.optional withMalcontent malcontent + ++ lib.optional withPolkit polkit + ++ lib.optional withSystemd systemd; # Required by flatpak.pc propagatedBuildInputs = [ @@ -197,10 +224,15 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonBool "auto_sideloading" withAutoSideloading) (lib.mesonBool "installed_tests" finalAttrs.finalPackage.doCheck) (lib.mesonBool "tests" finalAttrs.finalPackage.doCheck) + (lib.mesonEnable "dconf" withDconf) (lib.mesonEnable "docbook_docs" withDocbookDocs) + (lib.mesonEnable "gir" withIntrospection) (lib.mesonEnable "gtkdoc" withGtkDoc) + (lib.mesonEnable "malcontent" withMalcontent) (lib.mesonEnable "man" withMan) (lib.mesonEnable "selinux_module" withSELinuxModule) + (lib.mesonEnable "system_helper" withPolkit) + (lib.mesonEnable "systemd" withSystemd) (lib.mesonOption "dbus_config_dir" (placeholder "out" + "/share/dbus-1/system.d")) (lib.mesonOption "profile_dir" (placeholder "out" + "/etc/profile.d")) (lib.mesonOption "system_bubblewrap" (lib.getExe bubblewrap)) From cca28e7ac890a0ee08dced6ec629eaa06ea31ec9 Mon Sep 17 00:00:00 2001 From: Thao Le-Phuong Date: Fri, 14 Feb 2025 22:02:50 -0500 Subject: [PATCH 0542/1107] maintainers: add ThaoTranLePhuong --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 61e79760d9e9..24188ffc74c5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -23125,6 +23125,12 @@ githubId = 1141680; name = "Thane Gill"; }; + ThaoTranLePhuong = { + email = "thaotran.lp@gmail.com"; + github = "Thao-Tran"; + githubId = 7060816; + name = "Thao-Tran Le-Phuong"; + }; thblt = { name = "Thibault Polge"; email = "thibault@thb.lt"; From 821bcdb872ed0d87aea5b12c7f85f1eddc0df327 Mon Sep 17 00:00:00 2001 From: Julian Orth Date: Sun, 16 Feb 2025 19:32:37 +0100 Subject: [PATCH 0543/1107] jay: replace libxkbcommon by xkeyboard_config --- pkgs/by-name/ja/jay/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ja/jay/package.nix b/pkgs/by-name/ja/jay/package.nix index d66d4a0a34f2..1dfa853cab1b 100644 --- a/pkgs/by-name/ja/jay/package.nix +++ b/pkgs/by-name/ja/jay/package.nix @@ -3,7 +3,8 @@ , fetchFromGitHub , libGL , libinput -, libxkbcommon +, pkgconf +, xkeyboard_config , libgbm , pango , udev @@ -31,11 +32,12 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ autoPatchelfHook + pkgconf ]; buildInputs = [ libGL - libxkbcommon + xkeyboard_config libgbm pango udev From 634383be8aa9180f49bef78c05508c85e3855855 Mon Sep 17 00:00:00 2001 From: Thao Le-Phuong Date: Wed, 12 Feb 2025 19:18:39 -0500 Subject: [PATCH 0544/1107] lerna: init at 8.1.9 * Include lerna_6 and lerna_8 variants --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 1041 -- pkgs/development/tools/lerna/default.nix | 37 + pkgs/development/tools/lerna/generic.nix | 34 + .../tools/lerna/package-lock.v6.json | 8945 +++++++++++++++++ .../tools/lerna/package-lock.v8.json | 6766 +++++++++++++ pkgs/top-level/all-packages.nix | 4 + 8 files changed, 15787 insertions(+), 1042 deletions(-) create mode 100644 pkgs/development/tools/lerna/default.nix create mode 100644 pkgs/development/tools/lerna/generic.nix create mode 100644 pkgs/development/tools/lerna/package-lock.v6.json create mode 100644 pkgs/development/tools/lerna/package-lock.v8.json diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 51c3fb93e49e..2df1c8305943 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -135,6 +135,7 @@ mapAliases { inherit (pkgs) kaput-cli; # added 2024-12-03 karma = pkgs.karma-runner; # added 2023-07-29 leetcode-cli = self.vsc-leetcode-cli; # added 2023-08-31 + inherit (pkgs) lerna; # added 2025-02-12 less = pkgs.lessc; # added 2024-06-15 less-plugin-clean-css = pkgs.lessc.plugins.clean-css; # added 2024-06-15 inherit (pkgs) lv_font_conv; # added 2024-06-28 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 755835ccbde7..045c9e7c7470 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -111,7 +111,6 @@ , "katex" , "keyoxide" , "lcov-result-merger" -, "lerna" , "live-server" , "livedown" , "localtunnel" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index bab0e3b260dc..11a1500a774b 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -62984,1047 +62984,6 @@ in bypassCache = true; reconstructLock = true; }; - lerna = nodeEnv.buildNodePackage { - name = "lerna"; - packageName = "lerna"; - version = "8.1.9"; - src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-8.1.9.tgz"; - sha512 = "ZRFlRUBB2obm+GkbTR7EbgTMuAdni6iwtTQTMy7LIrQ4UInG44LyfRepljtgUxh4HA0ltzsvWfPkd5J1DKGCeQ=="; - }; - dependencies = [ - sources."@babel/code-frame-7.26.2" - sources."@babel/helper-validator-identifier-7.25.9" - sources."@babel/runtime-7.26.9" - sources."@emnapi/core-1.3.1" - sources."@emnapi/runtime-1.3.1" - sources."@emnapi/wasi-threads-1.0.1" - sources."@hutson/parse-repository-url-3.0.2" - ( - sources."@isaacs/cliui-8.0.2" - // { - dependencies = [ - sources."ansi-styles-6.2.1" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - sources."wrap-ansi-8.1.0" - ]; - } - ) - sources."@isaacs/string-locale-compare-1.1.0" - sources."@jest/schemas-29.6.3" - sources."@lerna/create-8.1.9" - sources."@napi-rs/wasm-runtime-0.2.4" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@npmcli/agent-2.2.2" - ( - sources."@npmcli/arborist-7.5.4" - // { - dependencies = [ - sources."json-parse-even-better-errors-3.0.2" - sources."minimatch-9.0.5" - ]; - } - ) - sources."@npmcli/fs-3.1.1" - ( - sources."@npmcli/git-5.0.8" - // { - dependencies = [ - sources."ini-4.1.3" - sources."isexe-3.1.1" - sources."which-4.0.0" - ]; - } - ) - sources."@npmcli/installed-package-contents-2.1.0" - ( - sources."@npmcli/map-workspaces-3.0.6" - // { - dependencies = [ - sources."minimatch-9.0.5" - ]; - } - ) - ( - sources."@npmcli/metavuln-calculator-7.1.1" - // { - dependencies = [ - sources."json-parse-even-better-errors-3.0.2" - ]; - } - ) - sources."@npmcli/name-from-folder-2.0.0" - sources."@npmcli/node-gyp-3.0.0" - ( - sources."@npmcli/package-json-5.2.0" - // { - dependencies = [ - sources."json-parse-even-better-errors-3.0.2" - ]; - } - ) - ( - sources."@npmcli/promise-spawn-7.0.2" - // { - dependencies = [ - sources."isexe-3.1.1" - sources."which-4.0.0" - ]; - } - ) - sources."@npmcli/query-3.1.0" - sources."@npmcli/redact-2.0.1" - ( - sources."@npmcli/run-script-8.1.0" - // { - dependencies = [ - sources."isexe-3.1.1" - sources."which-4.0.0" - ]; - } - ) - ( - sources."@nx/devkit-20.4.4" - // { - dependencies = [ - sources."minimatch-9.0.3" - ]; - } - ) - sources."@octokit/auth-token-3.0.4" - sources."@octokit/core-4.2.4" - ( - sources."@octokit/endpoint-7.0.6" - // { - dependencies = [ - sources."is-plain-object-5.0.0" - ]; - } - ) - sources."@octokit/graphql-5.0.6" - sources."@octokit/openapi-types-18.1.1" - sources."@octokit/plugin-enterprise-rest-6.0.1" - sources."@octokit/plugin-paginate-rest-6.1.2" - sources."@octokit/plugin-request-log-1.0.4" - ( - sources."@octokit/plugin-rest-endpoint-methods-7.2.3" - // { - dependencies = [ - sources."@octokit/types-10.0.0" - ]; - } - ) - ( - sources."@octokit/request-6.2.8" - // { - dependencies = [ - sources."is-plain-object-5.0.0" - ]; - } - ) - sources."@octokit/request-error-3.0.3" - sources."@octokit/rest-19.0.11" - sources."@octokit/tsconfig-1.0.2" - sources."@octokit/types-9.3.2" - sources."@sigstore/bundle-2.3.2" - sources."@sigstore/core-1.1.0" - sources."@sigstore/protobuf-specs-0.3.3" - sources."@sigstore/sign-2.3.2" - sources."@sigstore/tuf-2.3.4" - sources."@sigstore/verify-1.2.1" - sources."@sinclair/typebox-0.27.8" - sources."@swc-node/core-1.13.3" - sources."@swc-node/register-1.10.9" - sources."@swc-node/sourcemap-support-0.5.1" - sources."@swc/core-1.10.16" - sources."@swc/counter-0.1.3" - sources."@swc/helpers-0.5.15" - sources."@swc/types-0.1.17" - sources."@tufjs/canonical-json-2.0.0" - ( - sources."@tufjs/models-2.0.1" - // { - dependencies = [ - sources."minimatch-9.0.5" - ]; - } - ) - sources."@tybys/wasm-util-0.9.0" - sources."@types/minimatch-3.0.5" - sources."@types/minimist-1.2.5" - sources."@types/normalize-package-data-2.4.4" - sources."@types/parse-json-4.0.2" - sources."@yarnpkg/lockfile-1.1.0" - ( - sources."@yarnpkg/parsers-3.0.2" - // { - dependencies = [ - sources."js-yaml-3.14.1" - ]; - } - ) - ( - sources."@zkochan/js-yaml-0.0.7" - // { - dependencies = [ - sources."argparse-2.0.1" - ]; - } - ) - sources."JSONStream-1.3.5" - sources."abbrev-2.0.0" - sources."add-stream-1.0.0" - sources."agent-base-7.1.3" - sources."aggregate-error-3.1.0" - sources."ansi-colors-4.1.3" - sources."ansi-escapes-4.3.2" - sources."ansi-regex-6.1.0" - sources."ansi-styles-4.3.0" - sources."aproba-2.0.0" - sources."argparse-1.0.10" - sources."array-differ-3.0.0" - sources."array-ify-1.0.0" - sources."array-union-2.1.0" - sources."arrify-2.0.1" - sources."async-3.2.6" - sources."asynckit-0.4.0" - sources."axios-1.7.9" - ( - sources."babel-plugin-macros-3.1.0" - // { - dependencies = [ - sources."cosmiconfig-7.1.0" - sources."yaml-1.10.2" - ]; - } - ) - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."before-after-hook-2.2.3" - sources."bin-links-4.0.4" - sources."bl-4.1.0" - sources."brace-expansion-2.0.1" - sources."braces-3.0.3" - sources."buffer-5.7.1" - sources."buffer-from-1.1.2" - sources."byte-size-8.1.1" - ( - sources."cacache-18.0.4" - // { - dependencies = [ - sources."fs-minipass-3.0.3" - sources."minipass-7.1.2" - ]; - } - ) - sources."call-bind-apply-helpers-1.0.2" - sources."callsites-3.1.0" - sources."camelcase-5.3.1" - sources."camelcase-keys-6.2.2" - sources."chalk-4.1.0" - sources."chardet-0.7.0" - sources."chownr-2.0.0" - sources."ci-info-3.9.0" - sources."clean-stack-2.2.0" - sources."cli-cursor-3.1.0" - sources."cli-spinners-2.6.1" - sources."cli-width-3.0.0" - sources."cliui-8.0.1" - sources."clone-1.0.4" - sources."clone-deep-4.0.1" - sources."cmd-shim-6.0.3" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."color-support-1.1.3" - sources."colorette-2.0.20" - sources."columnify-1.6.0" - sources."combined-stream-1.0.8" - sources."common-ancestor-path-1.0.1" - sources."compare-func-2.0.0" - sources."concat-map-0.0.1" - sources."concat-stream-2.0.0" - sources."console-control-strings-1.1.0" - sources."conventional-changelog-angular-7.0.0" - ( - sources."conventional-changelog-core-5.0.1" - // { - dependencies = [ - sources."hosted-git-info-4.1.0" - sources."lru-cache-6.0.0" - sources."normalize-package-data-3.0.3" - ]; - } - ) - sources."conventional-changelog-preset-loader-3.0.0" - sources."conventional-changelog-writer-6.0.1" - sources."conventional-commits-filter-3.0.0" - sources."conventional-commits-parser-4.0.0" - sources."conventional-recommended-bump-7.0.1" - sources."core-util-is-1.0.3" - sources."cosmiconfig-9.0.0" - sources."cross-spawn-7.0.6" - sources."cssesc-3.0.0" - sources."dargs-7.0.0" - sources."dateformat-3.0.3" - sources."debug-4.4.0" - sources."decamelize-1.2.0" - ( - sources."decamelize-keys-1.1.1" - // { - dependencies = [ - sources."map-obj-1.0.1" - ]; - } - ) - sources."dedent-1.5.3" - sources."defaults-1.0.4" - sources."define-lazy-prop-2.0.0" - sources."delayed-stream-1.0.0" - sources."deprecation-2.3.1" - sources."detect-indent-5.0.0" - sources."diff-sequences-29.6.3" - sources."dir-glob-3.0.1" - sources."dot-prop-5.3.0" - sources."dotenv-16.4.7" - sources."dotenv-expand-11.0.7" - sources."dunder-proto-1.0.1" - sources."duplexer-0.1.2" - sources."eastasianwidth-0.2.0" - sources."ejs-3.1.10" - sources."emoji-regex-9.2.2" - ( - sources."encoding-0.1.13" - // { - dependencies = [ - sources."iconv-lite-0.6.3" - ]; - } - ) - sources."end-of-stream-1.4.4" - sources."enquirer-2.3.6" - sources."env-paths-2.2.1" - sources."envinfo-7.13.0" - sources."err-code-2.0.3" - sources."error-ex-1.3.2" - sources."es-define-property-1.0.1" - sources."es-errors-1.3.0" - sources."es-object-atoms-1.1.1" - sources."es-set-tostringtag-2.1.0" - sources."escalade-3.2.0" - sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.1" - sources."eventemitter3-4.0.7" - sources."execa-5.0.0" - sources."exponential-backoff-3.1.2" - ( - sources."external-editor-3.1.0" - // { - dependencies = [ - sources."tmp-0.0.33" - ]; - } - ) - ( - sources."fast-glob-3.3.3" - // { - dependencies = [ - sources."glob-parent-5.1.2" - ]; - } - ) - sources."fastq-1.19.0" - sources."figures-3.2.0" - ( - sources."filelist-1.0.4" - // { - dependencies = [ - sources."minimatch-5.1.6" - ]; - } - ) - sources."fill-range-7.1.1" - sources."find-up-4.1.0" - sources."flat-5.0.2" - sources."follow-redirects-1.15.9" - ( - sources."foreground-child-3.3.0" - // { - dependencies = [ - sources."signal-exit-4.1.0" - ]; - } - ) - sources."form-data-4.0.2" - ( - sources."front-matter-4.0.2" - // { - dependencies = [ - sources."js-yaml-3.14.1" - ]; - } - ) - sources."fs-constants-1.0.0" - sources."fs-extra-11.3.0" - ( - sources."fs-minipass-2.1.0" - // { - dependencies = [ - sources."minipass-3.3.6" - ]; - } - ) - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.2" - sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.2.7" - ( - sources."get-pkg-repo-4.2.1" - // { - dependencies = [ - sources."cliui-7.0.4" - sources."hosted-git-info-4.1.0" - sources."lru-cache-6.0.0" - sources."yargs-16.2.0" - sources."yargs-parser-20.2.9" - ]; - } - ) - sources."get-port-5.1.1" - sources."get-proto-1.0.1" - sources."get-stream-6.0.0" - sources."git-raw-commits-3.0.0" - ( - sources."git-remote-origin-url-2.0.0" - // { - dependencies = [ - sources."pify-2.3.0" - ]; - } - ) - sources."git-semver-tags-5.0.1" - sources."git-up-7.0.0" - sources."git-url-parse-14.0.0" - sources."gitconfiglocal-1.0.0" - ( - sources."glob-10.4.5" - // { - dependencies = [ - sources."minimatch-9.0.5" - sources."minipass-7.1.2" - ]; - } - ) - sources."glob-parent-6.0.2" - sources."globby-11.1.0" - sources."gopd-1.2.0" - sources."graceful-fs-4.2.11" - sources."handlebars-4.7.8" - sources."hard-rejection-2.1.0" - sources."has-flag-4.0.0" - sources."has-symbols-1.1.0" - sources."has-tostringtag-1.0.2" - sources."has-unicode-2.0.1" - sources."hasown-2.0.2" - sources."hosted-git-info-7.0.2" - sources."http-cache-semantics-4.1.1" - sources."http-proxy-agent-7.0.2" - sources."https-proxy-agent-7.0.6" - sources."human-signals-2.1.0" - sources."iconv-lite-0.4.24" - sources."ieee754-1.2.1" - sources."ignore-5.3.2" - ( - sources."ignore-walk-6.0.5" - // { - dependencies = [ - sources."minimatch-9.0.5" - ]; - } - ) - ( - sources."import-fresh-3.3.1" - // { - dependencies = [ - sources."resolve-from-4.0.0" - ]; - } - ) - sources."import-local-3.1.0" - sources."imurmurhash-0.1.4" - sources."indent-string-4.0.0" - sources."inherits-2.0.4" - sources."ini-1.3.8" - sources."init-package-json-6.0.3" - ( - sources."inquirer-8.2.6" - // { - dependencies = [ - sources."chalk-4.1.2" - sources."ora-5.4.1" - sources."wrap-ansi-6.2.0" - ]; - } - ) - ( - sources."ip-address-9.0.5" - // { - dependencies = [ - sources."sprintf-js-1.1.3" - ]; - } - ) - sources."is-arrayish-0.2.1" - sources."is-ci-3.0.1" - sources."is-core-module-2.16.1" - sources."is-docker-2.2.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-interactive-1.0.0" - sources."is-lambda-1.0.1" - sources."is-number-7.0.0" - sources."is-obj-2.0.0" - sources."is-plain-obj-1.1.0" - sources."is-plain-object-2.0.4" - sources."is-ssh-1.4.1" - sources."is-stream-2.0.0" - sources."is-text-path-1.0.1" - sources."is-unicode-supported-0.1.0" - sources."is-wsl-2.2.0" - sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."isobject-3.0.1" - sources."jackspeak-3.4.3" - ( - sources."jake-10.9.2" - // { - dependencies = [ - sources."brace-expansion-1.1.11" - sources."minimatch-3.1.2" - ]; - } - ) - sources."jest-diff-29.7.0" - sources."jest-get-type-29.6.3" - sources."js-tokens-4.0.0" - ( - sources."js-yaml-4.1.0" - // { - dependencies = [ - sources."argparse-2.0.1" - ]; - } - ) - sources."jsbn-1.1.0" - sources."json-parse-better-errors-1.0.2" - sources."json-parse-even-better-errors-2.3.1" - sources."json-stringify-nice-1.1.4" - sources."json-stringify-safe-5.0.1" - sources."json5-2.2.3" - sources."jsonc-parser-3.2.0" - sources."jsonfile-6.1.0" - sources."jsonparse-1.3.1" - sources."just-diff-6.0.2" - sources."just-diff-apply-5.5.0" - sources."kind-of-6.0.3" - sources."libnpmaccess-8.0.6" - ( - sources."libnpmpublish-9.0.9" - // { - dependencies = [ - sources."ci-info-4.1.0" - ]; - } - ) - sources."lines-and-columns-2.0.3" - ( - sources."load-json-file-6.2.0" - // { - dependencies = [ - sources."strip-bom-4.0.0" - sources."type-fest-0.6.0" - ]; - } - ) - sources."locate-path-5.0.0" - sources."lodash-4.17.21" - sources."lodash.ismatch-4.4.0" - sources."log-symbols-4.1.0" - sources."lru-cache-10.4.3" - sources."make-dir-4.0.0" - ( - sources."make-fetch-happen-13.0.1" - // { - dependencies = [ - sources."minipass-7.1.2" - ]; - } - ) - sources."map-obj-4.3.0" - sources."math-intrinsics-1.1.0" - ( - sources."meow-8.1.2" - // { - dependencies = [ - sources."hosted-git-info-2.8.9" - sources."lru-cache-6.0.0" - ( - sources."normalize-package-data-3.0.3" - // { - dependencies = [ - sources."hosted-git-info-4.1.0" - sources."semver-7.7.1" - ]; - } - ) - ( - sources."read-pkg-5.2.0" - // { - dependencies = [ - sources."normalize-package-data-2.5.0" - sources."type-fest-0.6.0" - ]; - } - ) - ( - sources."read-pkg-up-7.0.1" - // { - dependencies = [ - sources."type-fest-0.8.1" - ]; - } - ) - sources."semver-5.7.2" - sources."type-fest-0.18.1" - sources."yargs-parser-20.2.9" - ]; - } - ) - sources."merge-stream-2.0.0" - sources."merge2-1.4.1" - sources."micromatch-4.0.8" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-fn-2.1.0" - sources."min-indent-1.0.1" - ( - sources."minimatch-3.0.5" - // { - dependencies = [ - sources."brace-expansion-1.1.11" - ]; - } - ) - sources."minimist-1.2.8" - ( - sources."minimist-options-4.1.0" - // { - dependencies = [ - sources."arrify-1.0.1" - ]; - } - ) - sources."minipass-5.0.0" - ( - sources."minipass-collect-2.0.1" - // { - dependencies = [ - sources."minipass-7.1.2" - ]; - } - ) - ( - sources."minipass-fetch-3.0.5" - // { - dependencies = [ - sources."minipass-7.1.2" - ]; - } - ) - ( - sources."minipass-flush-1.0.5" - // { - dependencies = [ - sources."minipass-3.3.6" - ]; - } - ) - ( - sources."minipass-pipeline-1.2.4" - // { - dependencies = [ - sources."minipass-3.3.6" - ]; - } - ) - ( - sources."minipass-sized-1.0.3" - // { - dependencies = [ - sources."minipass-3.3.6" - ]; - } - ) - ( - sources."minizlib-2.1.2" - // { - dependencies = [ - sources."minipass-3.3.6" - ]; - } - ) - sources."mkdirp-1.0.4" - sources."modify-values-1.0.1" - sources."ms-2.1.3" - sources."multimatch-5.0.0" - sources."mute-stream-0.0.8" - sources."negotiator-0.6.4" - sources."neo-async-2.6.2" - sources."node-fetch-2.6.7" - ( - sources."node-gyp-10.3.1" - // { - dependencies = [ - sources."isexe-3.1.1" - sources."which-4.0.0" - ]; - } - ) - sources."node-machine-id-1.1.12" - sources."nopt-7.2.1" - sources."normalize-package-data-6.0.2" - sources."npm-bundled-3.0.1" - sources."npm-install-checks-6.3.0" - sources."npm-normalize-package-bin-3.0.1" - sources."npm-package-arg-11.0.2" - sources."npm-packlist-8.0.2" - sources."npm-pick-manifest-9.1.0" - ( - sources."npm-registry-fetch-17.1.0" - // { - dependencies = [ - sources."minipass-7.1.2" - ]; - } - ) - sources."npm-run-path-4.0.1" - ( - sources."nx-20.4.4" - // { - dependencies = [ - sources."minimatch-9.0.3" - ]; - } - ) - sources."once-1.4.0" - sources."onetime-5.1.2" - sources."open-8.4.2" - sources."ora-5.3.0" - sources."os-tmpdir-1.0.2" - sources."oxc-resolver-1.12.0" - sources."p-finally-1.0.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-map-4.0.0" - sources."p-map-series-2.1.0" - sources."p-pipe-3.1.0" - sources."p-queue-6.6.2" - sources."p-reduce-2.1.0" - sources."p-timeout-3.2.0" - sources."p-try-2.2.0" - sources."p-waterfall-2.1.1" - sources."package-json-from-dist-1.0.1" - ( - sources."pacote-18.0.6" - // { - dependencies = [ - sources."fs-minipass-3.0.3" - sources."minipass-7.1.2" - ]; - } - ) - sources."parent-module-1.0.1" - ( - sources."parse-conflict-json-3.0.1" - // { - dependencies = [ - sources."json-parse-even-better-errors-3.0.2" - ]; - } - ) - ( - sources."parse-json-5.2.0" - // { - dependencies = [ - sources."lines-and-columns-1.2.4" - ]; - } - ) - sources."parse-path-7.0.1" - sources."parse-url-8.1.0" - sources."path-exists-4.0.0" - sources."path-key-3.1.1" - sources."path-parse-1.0.7" - sources."path-scurry-1.11.1" - sources."path-type-4.0.0" - sources."picocolors-1.1.1" - sources."picomatch-2.3.1" - sources."pify-5.0.0" - sources."pirates-4.0.6" - sources."pkg-dir-4.2.0" - sources."postcss-selector-parser-6.1.2" - ( - sources."pretty-format-29.7.0" - // { - dependencies = [ - sources."ansi-styles-5.2.0" - ]; - } - ) - sources."proc-log-4.2.0" - sources."process-nextick-args-2.0.1" - sources."proggy-2.0.0" - sources."promise-all-reject-late-1.0.1" - sources."promise-call-limit-3.0.2" - sources."promise-inflight-1.0.1" - sources."promise-retry-2.0.1" - sources."promzard-1.0.2" - sources."protocols-2.0.2" - sources."proxy-from-env-1.1.0" - sources."queue-microtask-1.2.3" - sources."quick-lru-4.0.1" - sources."react-is-18.3.1" - ( - sources."read-3.0.1" - // { - dependencies = [ - sources."mute-stream-1.0.0" - ]; - } - ) - sources."read-cmd-shim-4.0.0" - ( - sources."read-package-json-fast-3.0.2" - // { - dependencies = [ - sources."json-parse-even-better-errors-3.0.2" - ]; - } - ) - ( - sources."read-pkg-3.0.0" - // { - dependencies = [ - sources."hosted-git-info-2.8.9" - sources."load-json-file-4.0.0" - sources."normalize-package-data-2.5.0" - sources."parse-json-4.0.0" - sources."path-type-3.0.0" - sources."pify-3.0.0" - sources."semver-5.7.2" - ]; - } - ) - ( - sources."read-pkg-up-3.0.0" - // { - dependencies = [ - sources."find-up-2.1.0" - sources."locate-path-2.0.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" - sources."path-exists-3.0.0" - ]; - } - ) - sources."readable-stream-3.6.2" - sources."redent-3.0.0" - sources."regenerator-runtime-0.14.1" - sources."require-directory-2.1.1" - sources."resolve-1.22.10" - sources."resolve-cwd-3.0.0" - sources."resolve-from-5.0.0" - sources."resolve.exports-2.0.3" - sources."restore-cursor-3.1.0" - sources."retry-0.12.0" - sources."reusify-1.0.4" - ( - sources."rimraf-4.4.1" - // { - dependencies = [ - sources."glob-9.3.5" - sources."minimatch-8.0.4" - sources."minipass-4.2.8" - ]; - } - ) - sources."run-async-2.4.1" - sources."run-parallel-1.2.0" - sources."rxjs-7.8.1" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."semver-7.7.1" - sources."set-blocking-2.0.0" - sources."shallow-clone-3.0.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.7" - sources."sigstore-2.3.1" - sources."slash-3.0.0" - sources."smart-buffer-4.2.0" - sources."socks-2.8.4" - sources."socks-proxy-agent-8.0.5" - sources."sort-keys-2.0.0" - sources."source-map-0.6.1" - sources."source-map-support-0.5.21" - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.5.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.21" - sources."split-1.0.1" - sources."split2-3.2.2" - sources."sprintf-js-1.0.3" - ( - sources."ssri-10.0.6" - // { - dependencies = [ - sources."minipass-7.1.2" - ]; - } - ) - ( - sources."string-width-4.2.3" - // { - dependencies = [ - sources."emoji-regex-8.0.0" - ]; - } - ) - ( - sources."string-width-cjs-4.2.3" - // { - dependencies = [ - sources."emoji-regex-8.0.0" - ]; - } - ) - sources."string_decoder-1.3.0" - ( - sources."strip-ansi-6.0.1" - // { - dependencies = [ - sources."ansi-regex-5.0.1" - ]; - } - ) - ( - sources."strip-ansi-cjs-6.0.1" - // { - dependencies = [ - sources."ansi-regex-5.0.1" - ]; - } - ) - sources."strip-bom-3.0.0" - sources."strip-final-newline-2.0.0" - sources."strip-indent-3.0.0" - sources."strong-log-transformer-2.1.0" - sources."supports-color-7.2.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."tar-6.2.1" - sources."tar-stream-2.2.0" - sources."temp-dir-1.0.0" - sources."text-extensions-1.9.0" - sources."through-2.3.8" - ( - sources."through2-2.0.5" - // { - dependencies = [ - sources."readable-stream-2.3.8" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - } - ) - sources."tmp-0.2.3" - sources."to-regex-range-5.0.1" - sources."tr46-0.0.3" - sources."treeverse-3.0.0" - sources."trim-newlines-3.0.1" - sources."tsconfig-paths-4.2.0" - sources."tslib-2.8.1" - sources."tuf-js-2.2.1" - sources."type-fest-0.21.3" - sources."typedarray-0.0.6" - sources."typescript-5.7.3" - sources."uglify-js-3.19.3" - sources."unique-filename-3.0.0" - sources."unique-slug-4.0.0" - sources."universal-user-agent-6.0.1" - sources."universalify-2.0.1" - sources."upath-2.0.1" - sources."util-deprecate-1.0.2" - sources."uuid-10.0.0" - sources."validate-npm-package-license-3.0.4" - sources."validate-npm-package-name-5.0.1" - sources."walk-up-path-3.0.1" - sources."wcwidth-1.0.1" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - sources."which-2.0.2" - sources."wide-align-1.1.5" - sources."wordwrap-1.0.0" - sources."wrap-ansi-7.0.0" - sources."wrap-ansi-cjs-7.0.0" - sources."wrappy-1.0.2" - ( - sources."write-file-atomic-5.0.1" - // { - dependencies = [ - sources."signal-exit-4.1.0" - ]; - } - ) - ( - sources."write-json-file-3.2.0" - // { - dependencies = [ - sources."make-dir-2.1.0" - sources."pify-4.0.1" - sources."semver-5.7.2" - sources."write-file-atomic-2.4.3" - ]; - } - ) - ( - sources."write-pkg-4.0.0" - // { - dependencies = [ - sources."type-fest-0.4.1" - ]; - } - ) - sources."xtend-4.0.2" - sources."y18n-5.0.8" - sources."yallist-4.0.0" - sources."yaml-2.7.0" - sources."yargs-17.7.2" - sources."yargs-parser-21.1.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Lerna is a fast, modern build system for managing and publishing multiple JavaScript/TypeScript packages from the same repository"; - homepage = "https://lerna.js.org"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; live-server = nodeEnv.buildNodePackage { name = "live-server"; packageName = "live-server"; diff --git a/pkgs/development/tools/lerna/default.nix b/pkgs/development/tools/lerna/default.nix new file mode 100644 index 000000000000..95675ed6d024 --- /dev/null +++ b/pkgs/development/tools/lerna/default.nix @@ -0,0 +1,37 @@ +{ + lib, + callPackage, +}: + +let + inherit (lib) mapAttrs' nameValuePair; + + variants = { + "6" = { + version = "6.6.2"; + hash = "sha256-B+o6SwVTrotHNYJW6CUXU/rJLK2VeGHvZYQZqbhYWjg="; + npmDepsHash = "sha256-yR3MUcmAVj0/+lLQk5+hmyGFnyqhzw1xjVsu7ciYccs="; + packageLockFile = ./package-lock.v6.json; + }; + "8" = { + version = "8.1.9"; + hash = "sha256-Rs6utL5dsL2h+rpOwjbtwEyU5pRdaAWHexfOm18o6BA="; + npmDepsHash = "sha256-o3mLG0mBDIdkjusCKTSoradYlD8r4xdMyHH2HtOG9KQ="; + packageLockFile = ./package-lock.v8.json; + }; + }; + + callLerna = + variant: + callPackage ./generic.nix { + inherit (variant) + version + hash + npmDepsHash + packageLockFile + ; + }; + + mkLerna = versionSuffix: variant: nameValuePair "lerna_${versionSuffix}" (callLerna variant); +in +mapAttrs' mkLerna variants diff --git a/pkgs/development/tools/lerna/generic.nix b/pkgs/development/tools/lerna/generic.nix new file mode 100644 index 000000000000..dc918b08fc00 --- /dev/null +++ b/pkgs/development/tools/lerna/generic.nix @@ -0,0 +1,34 @@ +{ + lib, + buildNpmPackage, + fetchurl, + version, + hash, + npmDepsHash, + packageLockFile, +}: + +buildNpmPackage rec { + pname = "lerna"; + inherit version; + + src = fetchurl { + url = "https://registry.npmjs.org/lerna/-/lerna-${version}.tgz"; + inherit hash; + }; + + postPatch = '' + ln -s ${packageLockFile} package-lock.json + ''; + + inherit npmDepsHash; + dontNpmBuild = true; + + meta = { + description = "Lerna is a fast, modern build system for managing and publishing multiple JavaScript/TypeScript packages from the same repository"; + homepage = "https://lerna.js.org/"; + changelog = "https://github.com/lerna/lerna/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ThaoTranLePhuong ]; + }; +} diff --git a/pkgs/development/tools/lerna/package-lock.v6.json b/pkgs/development/tools/lerna/package-lock.v6.json new file mode 100644 index 000000000000..7c6e567e9e1e --- /dev/null +++ b/pkgs/development/tools/lerna/package-lock.v6.json @@ -0,0 +1,8945 @@ +{ + "name": "lerna", + "version": "6.6.2", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "lerna", + "version": "6.6.2", + "license": "MIT", + "dependencies": { + "@lerna/child-process": "6.6.2", + "@lerna/create": "6.6.2", + "@lerna/legacy-package-management": "6.6.2", + "@npmcli/arborist": "6.2.3", + "@npmcli/run-script": "4.1.7", + "@nrwl/devkit": ">=15.5.2 < 16", + "@octokit/plugin-enterprise-rest": "6.0.1", + "@octokit/rest": "19.0.3", + "byte-size": "7.0.0", + "chalk": "4.1.0", + "clone-deep": "4.0.1", + "cmd-shim": "5.0.0", + "columnify": "1.6.0", + "config-chain": "1.1.12", + "conventional-changelog-angular": "5.0.12", + "conventional-changelog-core": "4.2.4", + "conventional-recommended-bump": "6.1.0", + "cosmiconfig": "7.0.0", + "dedent": "0.7.0", + "dot-prop": "6.0.1", + "envinfo": "^7.7.4", + "execa": "5.0.0", + "fs-extra": "9.1.0", + "get-port": "5.1.1", + "get-stream": "6.0.0", + "git-url-parse": "13.1.0", + "glob-parent": "5.1.2", + "globby": "11.1.0", + "graceful-fs": "4.2.10", + "has-unicode": "2.0.1", + "import-local": "^3.0.2", + "init-package-json": "3.0.2", + "inquirer": "^8.2.4", + "is-ci": "2.0.0", + "is-stream": "2.0.0", + "js-yaml": "^4.1.0", + "libnpmaccess": "^6.0.3", + "libnpmpublish": "7.1.4", + "load-json-file": "6.2.0", + "make-dir": "3.1.0", + "minimatch": "3.0.5", + "multimatch": "5.0.0", + "node-fetch": "2.6.7", + "npm-package-arg": "8.1.1", + "npm-packlist": "5.1.1", + "npm-registry-fetch": "^14.0.3", + "npmlog": "^6.0.2", + "nx": ">=15.5.2 < 16", + "p-map": "4.0.0", + "p-map-series": "2.1.0", + "p-pipe": "3.1.0", + "p-queue": "6.6.2", + "p-reduce": "2.1.0", + "p-waterfall": "2.1.1", + "pacote": "15.1.1", + "pify": "5.0.0", + "read-cmd-shim": "3.0.0", + "read-package-json": "5.0.1", + "resolve-from": "5.0.0", + "rimraf": "^4.4.1", + "semver": "^7.3.8", + "signal-exit": "3.0.7", + "slash": "3.0.0", + "ssri": "9.0.1", + "strong-log-transformer": "2.1.0", + "tar": "6.1.11", + "temp-dir": "1.0.0", + "typescript": "^3 || ^4", + "upath": "^2.0.1", + "uuid": "8.3.2", + "validate-npm-package-license": "3.0.4", + "validate-npm-package-name": "4.0.0", + "write-file-atomic": "4.0.1", + "write-pkg": "4.0.0", + "yargs": "16.2.0", + "yargs-parser": "20.2.4" + }, + "bin": { + "lerna": "dist/cli.js" + }, + "engines": { + "node": "^14.17.0 || >=16.0.0" + } + }, + "node_modules/@babel/code-frame": { + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", + "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.25.9", + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", + "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@gar/promisify": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", + "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==", + "license": "MIT" + }, + "node_modules/@hutson/parse-repository-url": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz", + "integrity": "sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==", + "license": "Apache-2.0", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "license": "ISC", + "dependencies": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-regex": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "license": "MIT" + }, + "node_modules/@isaacs/cliui/node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "license": "MIT", + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@isaacs/cliui/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/@isaacs/string-locale-compare": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz", + "integrity": "sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ==", + "license": "ISC" + }, + "node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", + "license": "MIT", + "dependencies": { + "@sinclair/typebox": "^0.27.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@lerna/child-process": { + "version": "6.6.2", + "resolved": "https://registry.npmjs.org/@lerna/child-process/-/child-process-6.6.2.tgz", + "integrity": "sha512-QyKIWEnKQFnYu2ey+SAAm1A5xjzJLJJj3bhIZd3QKyXKKjaJ0hlxam/OsWSltxTNbcyH1jRJjC6Cxv31usv0Ag==", + "license": "MIT", + "dependencies": { + "chalk": "^4.1.0", + "execa": "^5.0.0", + "strong-log-transformer": "^2.1.0" + }, + "engines": { + "node": "^14.17.0 || >=16.0.0" + } + }, + "node_modules/@lerna/create": { + "version": "6.6.2", + "resolved": "https://registry.npmjs.org/@lerna/create/-/create-6.6.2.tgz", + "integrity": "sha512-xQ+1Y7D+9etvUlE+unhG/TwmM6XBzGIdFBaNoW8D8kyOa9M2Jf3vdEtAxVa7mhRz66CENfhL/+I/QkVaa7pwbQ==", + "license": "MIT", + "dependencies": { + "@lerna/child-process": "6.6.2", + "dedent": "^0.7.0", + "fs-extra": "^9.1.0", + "init-package-json": "^3.0.2", + "npm-package-arg": "8.1.1", + "p-reduce": "^2.1.0", + "pacote": "15.1.1", + "pify": "^5.0.0", + "semver": "^7.3.4", + "slash": "^3.0.0", + "validate-npm-package-license": "^3.0.4", + "validate-npm-package-name": "^4.0.0", + "yargs-parser": "20.2.4" + }, + "engines": { + "node": "^14.17.0 || >=16.0.0" + } + }, + "node_modules/@lerna/legacy-package-management": { + "version": "6.6.2", + "resolved": "https://registry.npmjs.org/@lerna/legacy-package-management/-/legacy-package-management-6.6.2.tgz", + "integrity": "sha512-0hZxUPKnHwehUO2xC4ldtdX9bW0W1UosxebDIQlZL2STnZnA2IFmIk2lJVUyFW+cmTPQzV93jfS0i69T9Z+teg==", + "license": "MIT", + "dependencies": { + "@npmcli/arborist": "6.2.3", + "@npmcli/run-script": "4.1.7", + "@nrwl/devkit": ">=15.5.2 < 16", + "@octokit/rest": "19.0.3", + "byte-size": "7.0.0", + "chalk": "4.1.0", + "clone-deep": "4.0.1", + "cmd-shim": "5.0.0", + "columnify": "1.6.0", + "config-chain": "1.1.12", + "conventional-changelog-core": "4.2.4", + "conventional-recommended-bump": "6.1.0", + "cosmiconfig": "7.0.0", + "dedent": "0.7.0", + "dot-prop": "6.0.1", + "execa": "5.0.0", + "file-url": "3.0.0", + "find-up": "5.0.0", + "fs-extra": "9.1.0", + "get-port": "5.1.1", + "get-stream": "6.0.0", + "git-url-parse": "13.1.0", + "glob-parent": "5.1.2", + "globby": "11.1.0", + "graceful-fs": "4.2.10", + "has-unicode": "2.0.1", + "inquirer": "8.2.4", + "is-ci": "2.0.0", + "is-stream": "2.0.0", + "libnpmpublish": "7.1.4", + "load-json-file": "6.2.0", + "make-dir": "3.1.0", + "minimatch": "3.0.5", + "multimatch": "5.0.0", + "node-fetch": "2.6.7", + "npm-package-arg": "8.1.1", + "npm-packlist": "5.1.1", + "npm-registry-fetch": "14.0.3", + "npmlog": "6.0.2", + "p-map": "4.0.0", + "p-map-series": "2.1.0", + "p-queue": "6.6.2", + "p-waterfall": "2.1.1", + "pacote": "15.1.1", + "pify": "5.0.0", + "pretty-format": "29.4.3", + "read-cmd-shim": "3.0.0", + "read-package-json": "5.0.1", + "resolve-from": "5.0.0", + "semver": "7.3.8", + "signal-exit": "3.0.7", + "slash": "3.0.0", + "ssri": "9.0.1", + "strong-log-transformer": "2.1.0", + "tar": "6.1.11", + "temp-dir": "1.0.0", + "tempy": "1.0.0", + "upath": "2.0.1", + "uuid": "8.3.2", + "write-file-atomic": "4.0.1", + "write-pkg": "4.0.0", + "yargs": "16.2.0" + }, + "engines": { + "node": "^14.17.0 || >=16.0.0" + } + }, + "node_modules/@lerna/legacy-package-management/node_modules/inquirer": { + "version": "8.2.4", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.4.tgz", + "integrity": "sha512-nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg==", + "license": "MIT", + "dependencies": { + "ansi-escapes": "^4.2.1", + "chalk": "^4.1.1", + "cli-cursor": "^3.1.0", + "cli-width": "^3.0.0", + "external-editor": "^3.0.3", + "figures": "^3.0.0", + "lodash": "^4.17.21", + "mute-stream": "0.0.8", + "ora": "^5.4.1", + "run-async": "^2.4.0", + "rxjs": "^7.5.5", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0", + "through": "^2.3.6", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/@lerna/legacy-package-management/node_modules/inquirer/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/@lerna/legacy-package-management/node_modules/make-fetch-happen": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", + "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", + "license": "ISC", + "dependencies": { + "agentkeepalive": "^4.2.1", + "cacache": "^17.0.0", + "http-cache-semantics": "^4.1.1", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", + "is-lambda": "^1.0.1", + "lru-cache": "^7.7.1", + "minipass": "^5.0.0", + "minipass-fetch": "^3.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "promise-retry": "^2.0.1", + "socks-proxy-agent": "^7.0.0", + "ssri": "^10.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@lerna/legacy-package-management/node_modules/make-fetch-happen/node_modules/minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "license": "ISC", + "engines": { + "node": ">=8" + } + }, + "node_modules/@lerna/legacy-package-management/node_modules/make-fetch-happen/node_modules/ssri": { + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", + "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", + "license": "ISC", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@lerna/legacy-package-management/node_modules/make-fetch-happen/node_modules/ssri/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/@lerna/legacy-package-management/node_modules/minipass": { + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz", + "integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==", + "license": "ISC", + "engines": { + "node": ">=8" + } + }, + "node_modules/@lerna/legacy-package-management/node_modules/minipass-fetch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", + "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", + "license": "MIT", + "dependencies": { + "minipass": "^7.0.3", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" + } + }, + "node_modules/@lerna/legacy-package-management/node_modules/minipass-fetch/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/@lerna/legacy-package-management/node_modules/npm-registry-fetch": { + "version": "14.0.3", + "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-14.0.3.tgz", + "integrity": "sha512-YaeRbVNpnWvsGOjX2wk5s85XJ7l1qQBGAp724h8e2CZFFhMSuw9enom7K1mWVUtvXO1uUSFIAPofQK0pPN0ZcA==", + "license": "ISC", + "dependencies": { + "make-fetch-happen": "^11.0.0", + "minipass": "^4.0.0", + "minipass-fetch": "^3.0.0", + "minipass-json-stream": "^1.0.1", + "minizlib": "^2.1.2", + "npm-package-arg": "^10.0.0", + "proc-log": "^3.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@lerna/legacy-package-management/node_modules/npm-registry-fetch/node_modules/npm-package-arg": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz", + "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==", + "license": "ISC", + "dependencies": { + "hosted-git-info": "^6.0.0", + "proc-log": "^3.0.0", + "semver": "^7.3.5", + "validate-npm-package-name": "^5.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@lerna/legacy-package-management/node_modules/semver": { + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "license": "ISC", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@lerna/legacy-package-management/node_modules/semver/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@lerna/legacy-package-management/node_modules/validate-npm-package-name": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz", + "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==", + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@lerna/legacy-package-management/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "license": "MIT", + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@npmcli/arborist": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-6.2.3.tgz", + "integrity": "sha512-lpGOC2ilSJXcc2zfW9QtukcCTcMbl3fVI0z4wvFB2AFIl0C+Q6Wv7ccrpdrQa8rvJ1ZVuc6qkX7HVTyKlzGqKA==", + "license": "ISC", + "dependencies": { + "@isaacs/string-locale-compare": "^1.1.0", + "@npmcli/fs": "^3.1.0", + "@npmcli/installed-package-contents": "^2.0.0", + "@npmcli/map-workspaces": "^3.0.2", + "@npmcli/metavuln-calculator": "^5.0.0", + "@npmcli/name-from-folder": "^2.0.0", + "@npmcli/node-gyp": "^3.0.0", + "@npmcli/package-json": "^3.0.0", + "@npmcli/query": "^3.0.0", + "@npmcli/run-script": "^6.0.0", + "bin-links": "^4.0.1", + "cacache": "^17.0.4", + "common-ancestor-path": "^1.0.1", + "hosted-git-info": "^6.1.1", + "json-parse-even-better-errors": "^3.0.0", + "json-stringify-nice": "^1.1.4", + "minimatch": "^6.1.6", + "nopt": "^7.0.0", + "npm-install-checks": "^6.0.0", + "npm-package-arg": "^10.1.0", + "npm-pick-manifest": "^8.0.1", + "npm-registry-fetch": "^14.0.3", + "npmlog": "^7.0.1", + "pacote": "^15.0.8", + "parse-conflict-json": "^3.0.0", + "proc-log": "^3.0.0", + "promise-all-reject-late": "^1.0.0", + "promise-call-limit": "^1.0.1", + "read-package-json-fast": "^3.0.2", + "semver": "^7.3.7", + "ssri": "^10.0.1", + "treeverse": "^3.0.0", + "walk-up-path": "^1.0.0" + }, + "bin": { + "arborist": "bin/index.js" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/arborist/node_modules/@npmcli/run-script": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-6.0.2.tgz", + "integrity": "sha512-NCcr1uQo1k5U+SYlnIrbAh3cxy+OQT1VtqiAbxdymSlptbzBb62AjH2xXgjNCoP073hoa1CfCAcwoZ8k96C4nA==", + "license": "ISC", + "dependencies": { + "@npmcli/node-gyp": "^3.0.0", + "@npmcli/promise-spawn": "^6.0.0", + "node-gyp": "^9.0.0", + "read-package-json-fast": "^3.0.0", + "which": "^3.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/arborist/node_modules/are-we-there-yet": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-4.0.2.tgz", + "integrity": "sha512-ncSWAawFhKMJDTdoAeOV+jyW1VCMj5QIAwULIBV0SSR7B/RLPPEQiknKcg/RIIZlUQrxELpsxMiTUoAQ4sIUyg==", + "deprecated": "This package is no longer supported.", + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/arborist/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/@npmcli/arborist/node_modules/gauge": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-5.0.2.tgz", + "integrity": "sha512-pMaFftXPtiGIHCJHdcUUx9Rby/rFT/Kkt3fIIGCs+9PMDIljSyRiqraTlxNtBReJRDfUefpa263RQ3vnp5G/LQ==", + "deprecated": "This package is no longer supported.", + "license": "ISC", + "dependencies": { + "aproba": "^1.0.3 || ^2.0.0", + "color-support": "^1.1.3", + "console-control-strings": "^1.1.0", + "has-unicode": "^2.0.1", + "signal-exit": "^4.0.1", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", + "wide-align": "^1.1.5" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/arborist/node_modules/minimatch": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-6.2.0.tgz", + "integrity": "sha512-sauLxniAmvnhhRjFwPNnJKaPFYyddAgbYdeUpHULtCT/GhzdCx/MDNy+Y40lBxTQUrMzDE8e0S43Z5uqfO0REg==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@npmcli/arborist/node_modules/npm-package-arg": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz", + "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==", + "license": "ISC", + "dependencies": { + "hosted-git-info": "^6.0.0", + "proc-log": "^3.0.0", + "semver": "^7.3.5", + "validate-npm-package-name": "^5.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/arborist/node_modules/npmlog": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-7.0.1.tgz", + "integrity": "sha512-uJ0YFk/mCQpLBt+bxN88AKd+gyqZvZDbtiNxk6Waqcj2aPRyfVx8ITawkyQynxUagInjdYT1+qj4NfA5KJJUxg==", + "deprecated": "This package is no longer supported.", + "license": "ISC", + "dependencies": { + "are-we-there-yet": "^4.0.0", + "console-control-strings": "^1.1.0", + "gauge": "^5.0.0", + "set-blocking": "^2.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/arborist/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "license": "ISC", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@npmcli/arborist/node_modules/ssri": { + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", + "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", + "license": "ISC", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/arborist/node_modules/validate-npm-package-name": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz", + "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==", + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/fs": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz", + "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==", + "license": "ISC", + "dependencies": { + "semver": "^7.3.5" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/git": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.1.0.tgz", + "integrity": "sha512-9hwoB3gStVfa0N31ymBmrX+GuDGdVA/QWShZVqE0HK2Af+7QGGrCTbZia/SW0ImUTjTne7SP91qxDmtXvDHRPQ==", + "license": "ISC", + "dependencies": { + "@npmcli/promise-spawn": "^6.0.0", + "lru-cache": "^7.4.4", + "npm-pick-manifest": "^8.0.0", + "proc-log": "^3.0.0", + "promise-inflight": "^1.0.1", + "promise-retry": "^2.0.1", + "semver": "^7.3.5", + "which": "^3.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/installed-package-contents": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.1.0.tgz", + "integrity": "sha512-c8UuGLeZpm69BryRykLuKRyKFZYJsZSCT4aVY5ds4omyZqJ172ApzgfKJ5eV/r3HgLdUYgFVe54KSFVjKoe27w==", + "license": "ISC", + "dependencies": { + "npm-bundled": "^3.0.0", + "npm-normalize-package-bin": "^3.0.0" + }, + "bin": { + "installed-package-contents": "bin/index.js" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/map-workspaces": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-3.0.6.tgz", + "integrity": "sha512-tkYs0OYnzQm6iIRdfy+LcLBjcKuQCeE5YLb8KnrIlutJfheNaPvPpgoFEyEFgbjzl5PLZ3IA/BWAwRU0eHuQDA==", + "license": "ISC", + "dependencies": { + "@npmcli/name-from-folder": "^2.0.0", + "glob": "^10.2.2", + "minimatch": "^9.0.0", + "read-package-json-fast": "^3.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/map-workspaces/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/@npmcli/map-workspaces/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@npmcli/metavuln-calculator": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@npmcli/metavuln-calculator/-/metavuln-calculator-5.0.1.tgz", + "integrity": "sha512-qb8Q9wIIlEPj3WeA1Lba91R4ZboPL0uspzV0F9uwP+9AYMVB2zOoa7Pbk12g6D2NHAinSbHh6QYmGuRyHZ874Q==", + "license": "ISC", + "dependencies": { + "cacache": "^17.0.0", + "json-parse-even-better-errors": "^3.0.0", + "pacote": "^15.0.0", + "semver": "^7.3.5" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/move-file": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz", + "integrity": "sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==", + "deprecated": "This functionality has been moved to @npmcli/fs", + "license": "MIT", + "dependencies": { + "mkdirp": "^1.0.4", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/@npmcli/move-file/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@npmcli/move-file/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/@npmcli/move-file/node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "license": "ISC", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@npmcli/name-from-folder": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/name-from-folder/-/name-from-folder-2.0.0.tgz", + "integrity": "sha512-pwK+BfEBZJbKdNYpHHRTNBwBoqrN/iIMO0AiGvYsp3Hoaq0WbgGSWQR6SCldZovoDpY3yje5lkFUe6gsDgJ2vg==", + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/node-gyp": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz", + "integrity": "sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==", + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/package-json": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-3.1.1.tgz", + "integrity": "sha512-+UW0UWOYFKCkvszLoTwrYGrjNrT8tI5Ckeb/h+Z1y1fsNJEctl7HmerA5j2FgmoqFaLI2gsA1X9KgMFqx/bRmA==", + "license": "ISC", + "dependencies": { + "@npmcli/git": "^4.1.0", + "glob": "^10.2.2", + "json-parse-even-better-errors": "^3.0.0", + "normalize-package-data": "^5.0.0", + "npm-normalize-package-bin": "^3.0.1", + "proc-log": "^3.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/promise-spawn": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-6.0.2.tgz", + "integrity": "sha512-gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg==", + "license": "ISC", + "dependencies": { + "which": "^3.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/query": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@npmcli/query/-/query-3.1.0.tgz", + "integrity": "sha512-C/iR0tk7KSKGldibYIB9x8GtO/0Bd0I2mhOaDb8ucQL/bQVTmGoeREaFj64Z5+iCBRf3dQfed0CjJL7I8iTkiQ==", + "license": "ISC", + "dependencies": { + "postcss-selector-parser": "^6.0.10" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/run-script": { + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-4.1.7.tgz", + "integrity": "sha512-WXr/MyM4tpKA4BotB81NccGAv8B48lNH0gRoILucbcAhTQXLCoi6HflMV3KdXubIqvP9SuLsFn68Z7r4jl+ppw==", + "license": "ISC", + "dependencies": { + "@npmcli/node-gyp": "^2.0.0", + "@npmcli/promise-spawn": "^3.0.0", + "node-gyp": "^9.0.0", + "read-package-json-fast": "^2.0.3", + "which": "^2.0.2" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/@npmcli/run-script/node_modules/@npmcli/node-gyp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-2.0.0.tgz", + "integrity": "sha512-doNI35wIe3bBaEgrlPfdJPaCpUR89pJWep4Hq3aRdh6gKazIVWfs0jHttvSSoq47ZXgC7h73kDsUl8AoIQUB+A==", + "license": "ISC", + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/@npmcli/run-script/node_modules/@npmcli/promise-spawn": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-3.0.0.tgz", + "integrity": "sha512-s9SgS+p3a9Eohe68cSI3fi+hpcZUmXq5P7w0kMlAsWVtR7XbK3ptkZqKT2cK1zLDObJ3sR+8P59sJE0w/KTL1g==", + "license": "ISC", + "dependencies": { + "infer-owner": "^1.0.4" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/@npmcli/run-script/node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "license": "MIT" + }, + "node_modules/@npmcli/run-script/node_modules/npm-normalize-package-bin": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz", + "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==", + "license": "ISC" + }, + "node_modules/@npmcli/run-script/node_modules/read-package-json-fast": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz", + "integrity": "sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==", + "license": "ISC", + "dependencies": { + "json-parse-even-better-errors": "^2.3.0", + "npm-normalize-package-bin": "^1.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@npmcli/run-script/node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nrwl/cli": { + "version": "15.9.7", + "resolved": "https://registry.npmjs.org/@nrwl/cli/-/cli-15.9.7.tgz", + "integrity": "sha512-1jtHBDuJzA57My5nLzYiM372mJW0NY6rFKxlWt5a0RLsAZdPTHsd8lE3Gs9XinGC1jhXbruWmhhnKyYtZvX/zA==", + "license": "MIT", + "dependencies": { + "nx": "15.9.7" + } + }, + "node_modules/@nrwl/devkit": { + "version": "15.9.7", + "resolved": "https://registry.npmjs.org/@nrwl/devkit/-/devkit-15.9.7.tgz", + "integrity": "sha512-Sb7Am2TMT8AVq8e+vxOlk3AtOA2M0qCmhBzoM1OJbdHaPKc0g0UgSnWRml1kPGg5qfPk72tWclLoZJ5/ut0vTg==", + "license": "MIT", + "dependencies": { + "ejs": "^3.1.7", + "ignore": "^5.0.4", + "semver": "7.5.4", + "tmp": "~0.2.1", + "tslib": "^2.3.0" + }, + "peerDependencies": { + "nx": ">= 14.1 <= 16" + } + }, + "node_modules/@nrwl/devkit/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@nrwl/devkit/node_modules/semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "license": "ISC", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@nrwl/nx-darwin-arm64": { + "version": "15.9.7", + "resolved": "https://registry.npmjs.org/@nrwl/nx-darwin-arm64/-/nx-darwin-arm64-15.9.7.tgz", + "integrity": "sha512-aBUgnhlkrgC0vu0fK6eb9Vob7eFnkuknrK+YzTjmLrrZwj7FGNAeyGXSlyo1dVokIzjVKjJg2saZZ0WQbfuCJw==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nrwl/nx-darwin-x64": { + "version": "15.9.7", + "resolved": "https://registry.npmjs.org/@nrwl/nx-darwin-x64/-/nx-darwin-x64-15.9.7.tgz", + "integrity": "sha512-L+elVa34jhGf1cmn38Z0sotQatmLovxoASCIw5r1CBZZeJ5Tg7Y9nOwjRiDixZxNN56hPKXm6xl9EKlVHVeKlg==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nrwl/nx-linux-arm-gnueabihf": { + "version": "15.9.7", + "resolved": "https://registry.npmjs.org/@nrwl/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-15.9.7.tgz", + "integrity": "sha512-pqmfqqEUGFu6PmmHKyXyUw1Al0Ki8PSaR0+ndgCAb1qrekVDGDfznJfaqxN0JSLeolPD6+PFtLyXNr9ZyPFlFg==", + "cpu": [ + "arm" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nrwl/nx-linux-arm64-gnu": { + "version": "15.9.7", + "resolved": "https://registry.npmjs.org/@nrwl/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-15.9.7.tgz", + "integrity": "sha512-NYOa/eRrqmM+In5g3M0rrPVIS9Z+q6fvwXJYf/KrjOHqqan/KL+2TOfroA30UhcBrwghZvib7O++7gZ2hzwOnA==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nrwl/nx-linux-arm64-musl": { + "version": "15.9.7", + "resolved": "https://registry.npmjs.org/@nrwl/nx-linux-arm64-musl/-/nx-linux-arm64-musl-15.9.7.tgz", + "integrity": "sha512-zyStqjEcmbvLbejdTOrLUSEdhnxNtdQXlmOuymznCzYUEGRv+4f7OAepD3yRoR0a/57SSORZmmGQB7XHZoYZJA==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nrwl/nx-linux-x64-gnu": { + "version": "15.9.7", + "resolved": "https://registry.npmjs.org/@nrwl/nx-linux-x64-gnu/-/nx-linux-x64-gnu-15.9.7.tgz", + "integrity": "sha512-saNK5i2A8pKO3Il+Ejk/KStTApUpWgCxjeUz9G+T8A+QHeDloZYH2c7pU/P3jA9QoNeKwjVO9wYQllPL9loeVg==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nrwl/nx-linux-x64-musl": { + "version": "15.9.7", + "resolved": "https://registry.npmjs.org/@nrwl/nx-linux-x64-musl/-/nx-linux-x64-musl-15.9.7.tgz", + "integrity": "sha512-extIUThYN94m4Vj4iZggt6hhMZWQSukBCo8pp91JHnDcryBg7SnYmnikwtY1ZAFyyRiNFBLCKNIDFGkKkSrZ9Q==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nrwl/nx-win32-arm64-msvc": { + "version": "15.9.7", + "resolved": "https://registry.npmjs.org/@nrwl/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-15.9.7.tgz", + "integrity": "sha512-GSQ54hJ5AAnKZb4KP4cmBnJ1oC4ILxnrG1mekxeM65c1RtWg9NpBwZ8E0gU3xNrTv8ZNsBeKi/9UhXBxhsIh8A==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nrwl/nx-win32-x64-msvc": { + "version": "15.9.7", + "resolved": "https://registry.npmjs.org/@nrwl/nx-win32-x64-msvc/-/nx-win32-x64-msvc-15.9.7.tgz", + "integrity": "sha512-x6URof79RPd8AlapVbPefUD3ynJZpmah3tYaYZ9xZRMXojVtEHV8Qh5vysKXQ1rNYJiiB8Ah6evSKWLbAH60tw==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nrwl/tao": { + "version": "15.9.7", + "resolved": "https://registry.npmjs.org/@nrwl/tao/-/tao-15.9.7.tgz", + "integrity": "sha512-OBnHNvQf3vBH0qh9YnvBQQWyyFZ+PWguF6dJ8+1vyQYlrLVk/XZ8nJ4ukWFb+QfPv/O8VBmqaofaOI9aFC4yTw==", + "license": "MIT", + "dependencies": { + "nx": "15.9.7" + }, + "bin": { + "tao": "index.js" + } + }, + "node_modules/@octokit/auth-token": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-3.0.4.tgz", + "integrity": "sha512-TWFX7cZF2LXoCvdmJWY7XVPi74aSY0+FfBZNSXEXFkMpjcqsQwDSYVv5FhRFaI0V1ECnwbz4j59T/G+rXNWaIQ==", + "license": "MIT", + "engines": { + "node": ">= 14" + } + }, + "node_modules/@octokit/core": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/@octokit/core/-/core-4.2.4.tgz", + "integrity": "sha512-rYKilwgzQ7/imScn3M9/pFfUf4I1AZEH3KhyJmtPdE2zfaXAn2mFfUy4FbKewzc2We5y/LlKLj36fWJLKC2SIQ==", + "license": "MIT", + "dependencies": { + "@octokit/auth-token": "^3.0.0", + "@octokit/graphql": "^5.0.0", + "@octokit/request": "^6.0.0", + "@octokit/request-error": "^3.0.0", + "@octokit/types": "^9.0.0", + "before-after-hook": "^2.2.0", + "universal-user-agent": "^6.0.0" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/@octokit/endpoint": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-7.0.6.tgz", + "integrity": "sha512-5L4fseVRUsDFGR00tMWD/Trdeeihn999rTMGRMC1G/Ldi1uWlWJzI98H4Iak5DB/RVvQuyMYKqSK/R6mbSOQyg==", + "license": "MIT", + "dependencies": { + "@octokit/types": "^9.0.0", + "is-plain-object": "^5.0.0", + "universal-user-agent": "^6.0.0" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/@octokit/graphql": { + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-5.0.6.tgz", + "integrity": "sha512-Fxyxdy/JH0MnIB5h+UQ3yCoh1FG4kWXfFKkpWqjZHw/p+Kc8Y44Hu/kCgNBT6nU1shNumEchmW/sUO1JuQnPcw==", + "license": "MIT", + "dependencies": { + "@octokit/request": "^6.0.0", + "@octokit/types": "^9.0.0", + "universal-user-agent": "^6.0.0" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/@octokit/openapi-types": { + "version": "18.1.1", + "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-18.1.1.tgz", + "integrity": "sha512-VRaeH8nCDtF5aXWnjPuEMIYf1itK/s3JYyJcWFJT8X9pSNnBtriDf7wlEWsGuhPLl4QIH4xM8fqTXDwJ3Mu6sw==", + "license": "MIT" + }, + "node_modules/@octokit/plugin-enterprise-rest": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-6.0.1.tgz", + "integrity": "sha512-93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw==", + "license": "MIT" + }, + "node_modules/@octokit/plugin-paginate-rest": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-3.1.0.tgz", + "integrity": "sha512-+cfc40pMzWcLkoDcLb1KXqjX0jTGYXjKuQdFQDc6UAknISJHnZTiBqld6HDwRJvD4DsouDKrWXNbNV0lE/3AXA==", + "license": "MIT", + "dependencies": { + "@octokit/types": "^6.41.0" + }, + "engines": { + "node": ">= 14" + }, + "peerDependencies": { + "@octokit/core": ">=4" + } + }, + "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/openapi-types": { + "version": "12.11.0", + "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-12.11.0.tgz", + "integrity": "sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ==", + "license": "MIT" + }, + "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types": { + "version": "6.41.0", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.41.0.tgz", + "integrity": "sha512-eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg==", + "license": "MIT", + "dependencies": { + "@octokit/openapi-types": "^12.11.0" + } + }, + "node_modules/@octokit/plugin-request-log": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz", + "integrity": "sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==", + "license": "MIT", + "peerDependencies": { + "@octokit/core": ">=3" + } + }, + "node_modules/@octokit/plugin-rest-endpoint-methods": { + "version": "6.8.1", + "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-6.8.1.tgz", + "integrity": "sha512-QrlaTm8Lyc/TbU7BL/8bO49vp+RZ6W3McxxmmQTgYxf2sWkO8ZKuj4dLhPNJD6VCUW1hetCmeIM0m6FTVpDiEg==", + "license": "MIT", + "dependencies": { + "@octokit/types": "^8.1.1", + "deprecation": "^2.3.1" + }, + "engines": { + "node": ">= 14" + }, + "peerDependencies": { + "@octokit/core": ">=3" + } + }, + "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/openapi-types": { + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-14.0.0.tgz", + "integrity": "sha512-HNWisMYlR8VCnNurDU6os2ikx0s0VyEjDYHNS/h4cgb8DeOxQ0n72HyinUtdDVxJhFy3FWLGl0DJhfEWk3P5Iw==", + "license": "MIT" + }, + "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": { + "version": "8.2.1", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-8.2.1.tgz", + "integrity": "sha512-8oWMUji8be66q2B9PmEIUyQm00VPDPun07umUWSaCwxmeaquFBro4Hcc3ruVoDo3zkQyZBlRvhIMEYS3pBhanw==", + "license": "MIT", + "dependencies": { + "@octokit/openapi-types": "^14.0.0" + } + }, + "node_modules/@octokit/request": { + "version": "6.2.8", + "resolved": "https://registry.npmjs.org/@octokit/request/-/request-6.2.8.tgz", + "integrity": "sha512-ow4+pkVQ+6XVVsekSYBzJC0VTVvh/FCTUUgTsboGq+DTeWdyIFV8WSCdo0RIxk6wSkBTHqIK1mYuY7nOBXOchw==", + "license": "MIT", + "dependencies": { + "@octokit/endpoint": "^7.0.0", + "@octokit/request-error": "^3.0.0", + "@octokit/types": "^9.0.0", + "is-plain-object": "^5.0.0", + "node-fetch": "^2.6.7", + "universal-user-agent": "^6.0.0" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/@octokit/request-error": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-3.0.3.tgz", + "integrity": "sha512-crqw3V5Iy2uOU5Np+8M/YexTlT8zxCfI+qu+LxUB7SZpje4Qmx3mub5DfEKSO8Ylyk0aogi6TYdf6kxzh2BguQ==", + "license": "MIT", + "dependencies": { + "@octokit/types": "^9.0.0", + "deprecation": "^2.0.0", + "once": "^1.4.0" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/@octokit/rest": { + "version": "19.0.3", + "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-19.0.3.tgz", + "integrity": "sha512-5arkTsnnRT7/sbI4fqgSJ35KiFaN7zQm0uQiQtivNQLI8RQx8EHwJCajcTUwmaCMNDg7tdCvqAnc7uvHHPxrtQ==", + "license": "MIT", + "dependencies": { + "@octokit/core": "^4.0.0", + "@octokit/plugin-paginate-rest": "^3.0.0", + "@octokit/plugin-request-log": "^1.0.4", + "@octokit/plugin-rest-endpoint-methods": "^6.0.0" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/@octokit/types": { + "version": "9.3.2", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.3.2.tgz", + "integrity": "sha512-D4iHGTdAnEEVsB8fl95m1hiz7D5YiRdQ9b/OEb3BYRVwbLsGHcRVPz+u+BgRLNk0Q0/4iZCBqDN96j2XNxfXrA==", + "license": "MIT", + "dependencies": { + "@octokit/openapi-types": "^18.0.0" + } + }, + "node_modules/@parcel/watcher": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.0.4.tgz", + "integrity": "sha512-cTDi+FUDBIUOBKEtj+nhiJ71AZVlkAsQFuGQTun5tV9mwQBQgZvhCzG+URPQc8myeN32yRVZEfVAPCs1RW+Jvg==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "node-addon-api": "^3.2.1", + "node-gyp-build": "^4.3.0" + }, + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "license": "MIT", + "optional": true, + "engines": { + "node": ">=14" + } + }, + "node_modules/@sigstore/bundle": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-1.1.0.tgz", + "integrity": "sha512-PFutXEy0SmQxYI4texPw3dd2KewuNqv7OuK1ZFtY2fM754yhvG2KdgwIhRnoEE2uHdtdGNQ8s0lb94dW9sELog==", + "license": "Apache-2.0", + "dependencies": { + "@sigstore/protobuf-specs": "^0.2.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@sigstore/protobuf-specs": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.2.1.tgz", + "integrity": "sha512-XTWVxnWJu+c1oCshMLwnKvz8ZQJJDVOlciMfgpJBQbThVjKTCG8dwyhgLngBD2KN0ap9F/gOV8rFDEx8uh7R2A==", + "license": "Apache-2.0", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@sigstore/sign": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-1.0.0.tgz", + "integrity": "sha512-INxFVNQteLtcfGmcoldzV6Je0sbbfh9I16DM4yJPw3j5+TFP8X6uIiA18mvpEa9yyeycAKgPmOA3X9hVdVTPUA==", + "license": "Apache-2.0", + "dependencies": { + "@sigstore/bundle": "^1.1.0", + "@sigstore/protobuf-specs": "^0.2.0", + "make-fetch-happen": "^11.0.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@sigstore/sign/node_modules/make-fetch-happen": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", + "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", + "license": "ISC", + "dependencies": { + "agentkeepalive": "^4.2.1", + "cacache": "^17.0.0", + "http-cache-semantics": "^4.1.1", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", + "is-lambda": "^1.0.1", + "lru-cache": "^7.7.1", + "minipass": "^5.0.0", + "minipass-fetch": "^3.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "promise-retry": "^2.0.1", + "socks-proxy-agent": "^7.0.0", + "ssri": "^10.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@sigstore/sign/node_modules/minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "license": "ISC", + "engines": { + "node": ">=8" + } + }, + "node_modules/@sigstore/sign/node_modules/minipass-fetch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", + "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", + "license": "MIT", + "dependencies": { + "minipass": "^7.0.3", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" + } + }, + "node_modules/@sigstore/sign/node_modules/minipass-fetch/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/@sigstore/sign/node_modules/ssri": { + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", + "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", + "license": "ISC", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@sigstore/sign/node_modules/ssri/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/@sigstore/tuf": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-1.0.3.tgz", + "integrity": "sha512-2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg==", + "license": "Apache-2.0", + "dependencies": { + "@sigstore/protobuf-specs": "^0.2.0", + "tuf-js": "^1.1.7" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "license": "MIT" + }, + "node_modules/@tootallnate/once": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", + "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", + "license": "MIT", + "engines": { + "node": ">= 10" + } + }, + "node_modules/@tufjs/canonical-json": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz", + "integrity": "sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==", + "license": "MIT", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@tufjs/models": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-1.0.4.tgz", + "integrity": "sha512-qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A==", + "license": "MIT", + "dependencies": { + "@tufjs/canonical-json": "1.0.0", + "minimatch": "^9.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@tufjs/models/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/@tufjs/models/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@types/minimatch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", + "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==", + "license": "MIT" + }, + "node_modules/@types/minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==", + "license": "MIT" + }, + "node_modules/@types/normalize-package-data": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz", + "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==", + "license": "MIT" + }, + "node_modules/@types/parse-json": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz", + "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==", + "license": "MIT" + }, + "node_modules/@yarnpkg/lockfile": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", + "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==", + "license": "BSD-2-Clause" + }, + "node_modules/@yarnpkg/parsers": { + "version": "3.0.0-rc.46", + "resolved": "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.46.tgz", + "integrity": "sha512-aiATs7pSutzda/rq8fnuPwTglyVwjM22bNnK2ZgjrpAjQHSSl3lztd2f9evst1W/qnC58DRz7T7QndUDumAR4Q==", + "license": "BSD-2-Clause", + "dependencies": { + "js-yaml": "^3.10.0", + "tslib": "^2.4.0" + }, + "engines": { + "node": ">=14.15.0" + } + }, + "node_modules/@yarnpkg/parsers/node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "license": "MIT", + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/@yarnpkg/parsers/node_modules/js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "license": "MIT", + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/@yarnpkg/parsers/node_modules/sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", + "license": "BSD-3-Clause" + }, + "node_modules/@zkochan/js-yaml": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/@zkochan/js-yaml/-/js-yaml-0.0.6.tgz", + "integrity": "sha512-nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg==", + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/abbrev": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", + "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/add-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz", + "integrity": "sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ==", + "license": "MIT" + }, + "node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "license": "MIT", + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/agentkeepalive": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.6.0.tgz", + "integrity": "sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ==", + "license": "MIT", + "dependencies": { + "humanize-ms": "^1.2.1" + }, + "engines": { + "node": ">= 8.0.0" + } + }, + "node_modules/aggregate-error": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", + "license": "MIT", + "dependencies": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-colors": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", + "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/ansi-escapes": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", + "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", + "license": "MIT", + "dependencies": { + "type-fest": "^0.21.3" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/aproba": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", + "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==", + "license": "ISC" + }, + "node_modules/are-we-there-yet": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz", + "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==", + "deprecated": "This package is no longer supported.", + "license": "ISC", + "dependencies": { + "delegates": "^1.0.0", + "readable-stream": "^3.6.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "license": "Python-2.0" + }, + "node_modules/array-differ": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz", + "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/array-ify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz", + "integrity": "sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng==", + "license": "MIT" + }, + "node_modules/array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/arrify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/async": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", + "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==", + "license": "MIT" + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "license": "MIT" + }, + "node_modules/at-least-node": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", + "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", + "license": "ISC", + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/axios": { + "version": "1.7.9", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz", + "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==", + "license": "MIT", + "dependencies": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "license": "MIT" + }, + "node_modules/base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/before-after-hook": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz", + "integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==", + "license": "Apache-2.0" + }, + "node_modules/bin-links": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/bin-links/-/bin-links-4.0.4.tgz", + "integrity": "sha512-cMtq4W5ZsEwcutJrVId+a/tjt8GSbS+h0oNkdl6+6rBuEv8Ot33Bevj5KPm40t309zuhVic8NjpuL42QCiJWWA==", + "license": "ISC", + "dependencies": { + "cmd-shim": "^6.0.0", + "npm-normalize-package-bin": "^3.0.0", + "read-cmd-shim": "^4.0.0", + "write-file-atomic": "^5.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/bin-links/node_modules/cmd-shim": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-6.0.3.tgz", + "integrity": "sha512-FMabTRlc5t5zjdenF6mS0MBeFZm0XqHqeOkcskKFb/LYCcRQ5fVgLOHVc4Lq9CqABd9zhjwPjMBCJvMCziSVtA==", + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/bin-links/node_modules/read-cmd-shim": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-4.0.0.tgz", + "integrity": "sha512-yILWifhaSEEytfXI76kB9xEEiG1AiozaCJZ83A87ytjRiN+jVibXjedjCRNjoZviinhG+4UkalO3mWTd8u5O0Q==", + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/bin-links/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "license": "ISC", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/bin-links/node_modules/write-file-atomic": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz", + "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==", + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/bl": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "license": "MIT", + "dependencies": { + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "license": "MIT", + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "license": "MIT" + }, + "node_modules/builtins": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.1.0.tgz", + "integrity": "sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==", + "license": "MIT", + "dependencies": { + "semver": "^7.0.0" + } + }, + "node_modules/byte-size": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/byte-size/-/byte-size-7.0.0.tgz", + "integrity": "sha512-NNiBxKgxybMBtWdmvx7ZITJi4ZG+CYUgwOSZTfqB1qogkRHrhbQE/R2r5Fh94X+InN5MCYz6SvB/ejHMj/HbsQ==", + "license": "MIT", + "engines": { + "node": ">=10" + } + }, + "node_modules/cacache": { + "version": "17.1.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz", + "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==", + "license": "ISC", + "dependencies": { + "@npmcli/fs": "^3.1.0", + "fs-minipass": "^3.0.0", + "glob": "^10.2.2", + "lru-cache": "^7.7.1", + "minipass": "^7.0.3", + "minipass-collect": "^1.0.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "p-map": "^4.0.0", + "ssri": "^10.0.0", + "tar": "^6.1.11", + "unique-filename": "^3.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/cacache/node_modules/ssri": { + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", + "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", + "license": "ISC", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/call-bind-apply-helpers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/camelcase-keys": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz", + "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==", + "license": "MIT", + "dependencies": { + "camelcase": "^5.3.1", + "map-obj": "^4.0.0", + "quick-lru": "^4.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/chardet": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", + "license": "MIT" + }, + "node_modules/chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/ci-info": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", + "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", + "license": "MIT" + }, + "node_modules/clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/cli-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "license": "MIT", + "dependencies": { + "restore-cursor": "^3.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cli-spinners": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz", + "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==", + "license": "MIT", + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/cli-width": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", + "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", + "license": "ISC", + "engines": { + "node": ">= 10" + } + }, + "node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "node_modules/cliui/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/clone": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", + "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", + "license": "MIT", + "engines": { + "node": ">=0.8" + } + }, + "node_modules/clone-deep": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", + "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", + "license": "MIT", + "dependencies": { + "is-plain-object": "^2.0.4", + "kind-of": "^6.0.2", + "shallow-clone": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/clone-deep/node_modules/is-plain-object": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "license": "MIT", + "dependencies": { + "isobject": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/cmd-shim": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-5.0.0.tgz", + "integrity": "sha512-qkCtZ59BidfEwHltnJwkyVZn+XQojdAySM1D1gSeh11Z4pW1Kpolkyo53L5noc0nrxmIvyFwTmJRo4xs7FFLPw==", + "license": "ISC", + "dependencies": { + "mkdirp-infer-owner": "^2.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "license": "MIT" + }, + "node_modules/color-support": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", + "license": "ISC", + "bin": { + "color-support": "bin.js" + } + }, + "node_modules/columnify": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/columnify/-/columnify-1.6.0.tgz", + "integrity": "sha512-lomjuFZKfM6MSAnV9aCZC9sc0qGbmZdfygNv+nCpqVkSKdCxCklLtd16O0EILGkImHw9ZpHkAnHaB+8Zxq5W6Q==", + "license": "MIT", + "dependencies": { + "strip-ansi": "^6.0.1", + "wcwidth": "^1.0.0" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "license": "MIT", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/common-ancestor-path": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz", + "integrity": "sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w==", + "license": "ISC" + }, + "node_modules/compare-func": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-2.0.0.tgz", + "integrity": "sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==", + "license": "MIT", + "dependencies": { + "array-ify": "^1.0.0", + "dot-prop": "^5.1.0" + } + }, + "node_modules/compare-func/node_modules/dot-prop": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", + "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", + "license": "MIT", + "dependencies": { + "is-obj": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "license": "MIT" + }, + "node_modules/concat-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz", + "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==", + "engines": [ + "node >= 6.0" + ], + "license": "MIT", + "dependencies": { + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.0.2", + "typedarray": "^0.0.6" + } + }, + "node_modules/config-chain": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz", + "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==", + "dependencies": { + "ini": "^1.3.4", + "proto-list": "~1.2.1" + } + }, + "node_modules/console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==", + "license": "ISC" + }, + "node_modules/conventional-changelog-angular": { + "version": "5.0.12", + "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.12.tgz", + "integrity": "sha512-5GLsbnkR/7A89RyHLvvoExbiGbd9xKdKqDTrArnPbOqBqG/2wIosu0fHwpeIRI8Tl94MhVNBXcLJZl92ZQ5USw==", + "license": "ISC", + "dependencies": { + "compare-func": "^2.0.0", + "q": "^1.5.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/conventional-changelog-core": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-4.2.4.tgz", + "integrity": "sha512-gDVS+zVJHE2v4SLc6B0sLsPiloR0ygU7HaDW14aNJE1v4SlqJPILPl/aJC7YdtRE4CybBf8gDwObBvKha8Xlyg==", + "license": "MIT", + "dependencies": { + "add-stream": "^1.0.0", + "conventional-changelog-writer": "^5.0.0", + "conventional-commits-parser": "^3.2.0", + "dateformat": "^3.0.0", + "get-pkg-repo": "^4.0.0", + "git-raw-commits": "^2.0.8", + "git-remote-origin-url": "^2.0.0", + "git-semver-tags": "^4.1.1", + "lodash": "^4.17.15", + "normalize-package-data": "^3.0.0", + "q": "^1.5.1", + "read-pkg": "^3.0.0", + "read-pkg-up": "^3.0.0", + "through2": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/conventional-changelog-core/node_modules/hosted-git-info": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", + "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", + "license": "ISC", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/conventional-changelog-core/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/conventional-changelog-core/node_modules/normalize-package-data": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz", + "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==", + "license": "BSD-2-Clause", + "dependencies": { + "hosted-git-info": "^4.0.1", + "is-core-module": "^2.5.0", + "semver": "^7.3.4", + "validate-npm-package-license": "^3.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/conventional-changelog-preset-loader": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.3.4.tgz", + "integrity": "sha512-GEKRWkrSAZeTq5+YjUZOYxdHq+ci4dNwHvpaBC3+ENalzFWuCWa9EZXSuZBpkr72sMdKB+1fyDV4takK1Lf58g==", + "license": "MIT", + "engines": { + "node": ">=10" + } + }, + "node_modules/conventional-changelog-writer": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-5.0.1.tgz", + "integrity": "sha512-5WsuKUfxW7suLblAbFnxAcrvf6r+0b7GvNaWUwUIk0bXMnENP/PEieGKVUQrjPqwPT4o3EPAASBXiY6iHooLOQ==", + "license": "MIT", + "dependencies": { + "conventional-commits-filter": "^2.0.7", + "dateformat": "^3.0.0", + "handlebars": "^4.7.7", + "json-stringify-safe": "^5.0.1", + "lodash": "^4.17.15", + "meow": "^8.0.0", + "semver": "^6.0.0", + "split": "^1.0.0", + "through2": "^4.0.0" + }, + "bin": { + "conventional-changelog-writer": "cli.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/conventional-changelog-writer/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/conventional-commits-filter": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.7.tgz", + "integrity": "sha512-ASS9SamOP4TbCClsRHxIHXRfcGCnIoQqkvAzCSbZzTFLfcTqJVugB0agRgsEELsqaeWgsXv513eS116wnlSSPA==", + "license": "MIT", + "dependencies": { + "lodash.ismatch": "^4.4.0", + "modify-values": "^1.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/conventional-commits-parser": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.2.4.tgz", + "integrity": "sha512-nK7sAtfi+QXbxHCYfhpZsfRtaitZLIA6889kFIouLvz6repszQDgxBu7wf2WbU+Dco7sAnNCJYERCwt54WPC2Q==", + "license": "MIT", + "dependencies": { + "is-text-path": "^1.0.1", + "JSONStream": "^1.0.4", + "lodash": "^4.17.15", + "meow": "^8.0.0", + "split2": "^3.0.0", + "through2": "^4.0.0" + }, + "bin": { + "conventional-commits-parser": "cli.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/conventional-recommended-bump": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-6.1.0.tgz", + "integrity": "sha512-uiApbSiNGM/kkdL9GTOLAqC4hbptObFo4wW2QRyHsKciGAfQuLU1ShZ1BIVI/+K2BE/W1AWYQMCXAsv4dyKPaw==", + "license": "MIT", + "dependencies": { + "concat-stream": "^2.0.0", + "conventional-changelog-preset-loader": "^2.3.4", + "conventional-commits-filter": "^2.0.7", + "conventional-commits-parser": "^3.2.0", + "git-raw-commits": "^2.0.8", + "git-semver-tags": "^4.1.1", + "meow": "^8.0.0", + "q": "^1.5.1" + }, + "bin": { + "conventional-recommended-bump": "cli.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/core-util-is": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", + "license": "MIT" + }, + "node_modules/cosmiconfig": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz", + "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==", + "license": "MIT", + "dependencies": { + "@types/parse-json": "^4.0.0", + "import-fresh": "^3.2.1", + "parse-json": "^5.0.0", + "path-type": "^4.0.0", + "yaml": "^1.10.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/cross-spawn": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/cross-spawn/node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/crypto-random-string": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", + "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/cssesc": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", + "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", + "license": "MIT", + "bin": { + "cssesc": "bin/cssesc" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/dargs": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz", + "integrity": "sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/dateformat": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz", + "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==", + "license": "MIT", + "engines": { + "node": "*" + } + }, + "node_modules/debug": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/decamelize-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz", + "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==", + "license": "MIT", + "dependencies": { + "decamelize": "^1.1.0", + "map-obj": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/decamelize-keys/node_modules/map-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", + "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/dedent": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", + "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==", + "license": "MIT" + }, + "node_modules/defaults": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", + "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==", + "license": "MIT", + "dependencies": { + "clone": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/define-lazy-prop": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", + "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/del": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/del/-/del-6.1.1.tgz", + "integrity": "sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==", + "license": "MIT", + "dependencies": { + "globby": "^11.0.1", + "graceful-fs": "^4.2.4", + "is-glob": "^4.0.1", + "is-path-cwd": "^2.2.0", + "is-path-inside": "^3.0.2", + "p-map": "^4.0.0", + "rimraf": "^3.0.2", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/del/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/del/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/del/node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "license": "ISC", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "license": "MIT", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==", + "license": "MIT" + }, + "node_modules/deprecation": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz", + "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==", + "license": "ISC" + }, + "node_modules/detect-indent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz", + "integrity": "sha512-rlpvsxUtM0PQvy9iZe640/IWwWYyBsTApREbA1pHOpmOUIl9MkP/U4z7vTtg4Oaojvqhxt7sdufnT0EzGaR31g==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "license": "MIT", + "dependencies": { + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/dot-prop": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz", + "integrity": "sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==", + "license": "MIT", + "dependencies": { + "is-obj": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/dotenv": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", + "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=10" + } + }, + "node_modules/dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/duplexer": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", + "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==", + "license": "MIT" + }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "license": "MIT" + }, + "node_modules/ejs": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz", + "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==", + "license": "Apache-2.0", + "dependencies": { + "jake": "^10.8.5" + }, + "bin": { + "ejs": "bin/cli.js" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "license": "MIT" + }, + "node_modules/encoding": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", + "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", + "license": "MIT", + "optional": true, + "dependencies": { + "iconv-lite": "^0.6.2" + } + }, + "node_modules/encoding/node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "license": "MIT", + "optional": true, + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "license": "MIT", + "dependencies": { + "once": "^1.4.0" + } + }, + "node_modules/enquirer": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", + "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", + "license": "MIT", + "dependencies": { + "ansi-colors": "^4.1.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/env-paths": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/envinfo": { + "version": "7.14.0", + "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.14.0.tgz", + "integrity": "sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==", + "license": "MIT", + "bin": { + "envinfo": "dist/cli.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/err-code": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", + "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", + "license": "MIT" + }, + "node_modules/error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "license": "MIT", + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, + "node_modules/es-define-property": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-object-atoms": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-set-tostringtag": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", + "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/escalade": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "license": "MIT", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "license": "BSD-2-Clause", + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/eventemitter3": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", + "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", + "license": "MIT" + }, + "node_modules/execa": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz", + "integrity": "sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==", + "license": "MIT", + "dependencies": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/exponential-backoff": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.2.tgz", + "integrity": "sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA==", + "license": "Apache-2.0" + }, + "node_modules/external-editor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", + "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", + "license": "MIT", + "dependencies": { + "chardet": "^0.7.0", + "iconv-lite": "^0.4.24", + "tmp": "^0.0.33" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/external-editor/node_modules/tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "license": "MIT", + "dependencies": { + "os-tmpdir": "~1.0.2" + }, + "engines": { + "node": ">=0.6.0" + } + }, + "node_modules/fast-glob": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", + "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==", + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.8" + }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/fastq": { + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.0.tgz", + "integrity": "sha512-7SFSRCNjBQIZH/xZR3iy5iQYR8aGBE0h3VG6/cwlbrpdciNYBMotQav8c1XI3HjHH+NikUpP53nPdlZSdWmFzA==", + "license": "ISC", + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/figures": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", + "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", + "license": "MIT", + "dependencies": { + "escape-string-regexp": "^1.0.5" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/file-url": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/file-url/-/file-url-3.0.0.tgz", + "integrity": "sha512-g872QGsHexznxkIAdK8UiZRe7SkE6kvylShU4Nsj8NvfvZag7S0QuQ4IgvPDkk75HxgjIVDwycFTDAgIiO4nDA==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/filelist": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", + "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", + "license": "Apache-2.0", + "dependencies": { + "minimatch": "^5.0.1" + } + }, + "node_modules/filelist/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/filelist/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "license": "MIT", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "license": "MIT", + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "license": "BSD-3-Clause", + "bin": { + "flat": "cli.js" + } + }, + "node_modules/follow-redirects": { + "version": "1.15.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", + "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "license": "MIT", + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, + "node_modules/foreground-child": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz", + "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==", + "license": "ISC", + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/foreground-child/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "license": "ISC", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/form-data": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz", + "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==", + "license": "MIT", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "es-set-tostringtag": "^2.1.0", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "license": "MIT" + }, + "node_modules/fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "license": "MIT", + "dependencies": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/fs-minipass": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", + "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", + "license": "ISC", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "license": "ISC" + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/gauge": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz", + "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==", + "deprecated": "This package is no longer supported.", + "license": "ISC", + "dependencies": { + "aproba": "^1.0.3 || ^2.0.0", + "color-support": "^1.1.3", + "console-control-strings": "^1.1.0", + "has-unicode": "^2.0.1", + "signal-exit": "^3.0.7", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", + "wide-align": "^1.1.5" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "license": "ISC", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-intrinsic": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.7.tgz", + "integrity": "sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "function-bind": "^1.1.2", + "get-proto": "^1.0.0", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-pkg-repo": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-4.2.1.tgz", + "integrity": "sha512-2+QbHjFRfGB74v/pYWjd5OhU3TDIC2Gv/YKUTk/tCvAz0pkn/Mz6P3uByuBimLOcPvN2jYdScl3xGFSrx0jEcA==", + "license": "MIT", + "dependencies": { + "@hutson/parse-repository-url": "^3.0.0", + "hosted-git-info": "^4.0.0", + "through2": "^2.0.0", + "yargs": "^16.2.0" + }, + "bin": { + "get-pkg-repo": "src/cli.js" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/get-pkg-repo/node_modules/hosted-git-info": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", + "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", + "license": "ISC", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/get-pkg-repo/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/get-pkg-repo/node_modules/readable-stream": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "license": "MIT", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/get-pkg-repo/node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "license": "MIT" + }, + "node_modules/get-pkg-repo/node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/get-pkg-repo/node_modules/through2": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", + "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", + "license": "MIT", + "dependencies": { + "readable-stream": "~2.3.6", + "xtend": "~4.0.1" + } + }, + "node_modules/get-port": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz", + "integrity": "sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==", + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/get-stream": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz", + "integrity": "sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg==", + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/git-raw-commits": { + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.11.tgz", + "integrity": "sha512-VnctFhw+xfj8Va1xtfEqCUD2XDrbAPSJx+hSrE5K7fGdjZruW7XV+QOrN7LF/RJyvspRiD2I0asWsxFp0ya26A==", + "license": "MIT", + "dependencies": { + "dargs": "^7.0.0", + "lodash": "^4.17.15", + "meow": "^8.0.0", + "split2": "^3.0.0", + "through2": "^4.0.0" + }, + "bin": { + "git-raw-commits": "cli.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/git-remote-origin-url": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz", + "integrity": "sha512-eU+GGrZgccNJcsDH5LkXR3PB9M958hxc7sbA8DFJjrv9j4L2P/eZfKhM+QD6wyzpiv+b1BpK0XrYCxkovtjSLw==", + "license": "MIT", + "dependencies": { + "gitconfiglocal": "^1.0.0", + "pify": "^2.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/git-remote-origin-url/node_modules/pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/git-semver-tags": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-4.1.1.tgz", + "integrity": "sha512-OWyMt5zBe7xFs8vglMmhM9lRQzCWL3WjHtxNNfJTMngGym7pC1kh8sP6jevfydJ6LP3ZvGxfb6ABYgPUM0mtsA==", + "license": "MIT", + "dependencies": { + "meow": "^8.0.0", + "semver": "^6.0.0" + }, + "bin": { + "git-semver-tags": "cli.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/git-semver-tags/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/git-up": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/git-up/-/git-up-7.0.0.tgz", + "integrity": "sha512-ONdIrbBCFusq1Oy0sC71F5azx8bVkvtZtMJAsv+a6lz5YAmbNnLD6HAB4gptHZVLPR8S2/kVN6Gab7lryq5+lQ==", + "license": "MIT", + "dependencies": { + "is-ssh": "^1.4.0", + "parse-url": "^8.1.0" + } + }, + "node_modules/git-url-parse": { + "version": "13.1.0", + "resolved": "https://registry.npmjs.org/git-url-parse/-/git-url-parse-13.1.0.tgz", + "integrity": "sha512-5FvPJP/70WkIprlUZ33bm4UAaFdjcLkJLpWft1BeZKqwR0uhhNGoKwlUaPtVb4LxCSQ++erHapRak9kWGj+FCA==", + "license": "MIT", + "dependencies": { + "git-up": "^7.0.0" + } + }, + "node_modules/gitconfiglocal": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz", + "integrity": "sha512-spLUXeTAVHxDtKsJc8FkFVgFtMdEN9qPGpL23VfSHx4fP4+Ds097IXLvymbnDH8FnmxX5Nr9bPw3A+AQ6mWEaQ==", + "license": "BSD", + "dependencies": { + "ini": "^1.3.2" + } + }, + "node_modules/glob": { + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "license": "ISC", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/glob/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/glob/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/globby": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "license": "MIT", + "dependencies": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/gopd": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", + "license": "ISC" + }, + "node_modules/handlebars": { + "version": "4.7.8", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", + "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==", + "license": "MIT", + "dependencies": { + "minimist": "^1.2.5", + "neo-async": "^2.6.2", + "source-map": "^0.6.1", + "wordwrap": "^1.0.0" + }, + "bin": { + "handlebars": "bin/handlebars" + }, + "engines": { + "node": ">=0.4.7" + }, + "optionalDependencies": { + "uglify-js": "^3.1.4" + } + }, + "node_modules/hard-rejection": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz", + "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/has-symbols": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-tostringtag": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "license": "MIT", + "dependencies": { + "has-symbols": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", + "license": "ISC" + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/hosted-git-info": { + "version": "6.1.3", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.3.tgz", + "integrity": "sha512-HVJyzUrLIL1c0QmviVh5E8VGyUS7xCFPS6yydaVd1UegW+ibV/CohqTH9MkOLDp5o+rb82DMo77PTuc9F/8GKw==", + "license": "ISC", + "dependencies": { + "lru-cache": "^7.5.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/http-cache-semantics": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", + "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==", + "license": "BSD-2-Clause" + }, + "node_modules/http-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", + "license": "MIT", + "dependencies": { + "@tootallnate/once": "2", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "license": "MIT", + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/human-signals": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "license": "Apache-2.0", + "engines": { + "node": ">=10.17.0" + } + }, + "node_modules/humanize-ms": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", + "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==", + "license": "MIT", + "dependencies": { + "ms": "^2.0.0" + } + }, + "node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "BSD-3-Clause" + }, + "node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/ignore-walk": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-5.0.1.tgz", + "integrity": "sha512-yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw==", + "license": "ISC", + "dependencies": { + "minimatch": "^5.0.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/ignore-walk/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/ignore-walk/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/import-fresh": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", + "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", + "license": "MIT", + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/import-fresh/node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/import-local": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz", + "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==", + "license": "MIT", + "dependencies": { + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" + }, + "bin": { + "import-local-fixture": "fixtures/cli.js" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "license": "MIT", + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/infer-owner": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", + "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", + "license": "ISC" + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "license": "ISC", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "license": "ISC" + }, + "node_modules/ini": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", + "license": "ISC" + }, + "node_modules/init-package-json": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-3.0.2.tgz", + "integrity": "sha512-YhlQPEjNFqlGdzrBfDNRLhvoSgX7iQRgSxgsNknRQ9ITXFT7UMfVMWhBTOh2Y+25lRnGrv5Xz8yZwQ3ACR6T3A==", + "license": "ISC", + "dependencies": { + "npm-package-arg": "^9.0.1", + "promzard": "^0.3.0", + "read": "^1.0.7", + "read-package-json": "^5.0.0", + "semver": "^7.3.5", + "validate-npm-package-license": "^3.0.4", + "validate-npm-package-name": "^4.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/init-package-json/node_modules/hosted-git-info": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-5.2.1.tgz", + "integrity": "sha512-xIcQYMnhcx2Nr4JTjsFmwwnr9vldugPy9uVm0o87bjqqWMv9GaqsTeT+i99wTl0mk1uLxJtHxLb8kymqTENQsw==", + "license": "ISC", + "dependencies": { + "lru-cache": "^7.5.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/init-package-json/node_modules/npm-package-arg": { + "version": "9.1.2", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-9.1.2.tgz", + "integrity": "sha512-pzd9rLEx4TfNJkovvlBSLGhq31gGu2QDexFPWT19yCDh0JgnRhlBLNo5759N0AJmBk+kQ9Y/hXoLnlgFD+ukmg==", + "license": "ISC", + "dependencies": { + "hosted-git-info": "^5.0.0", + "proc-log": "^2.0.1", + "semver": "^7.3.5", + "validate-npm-package-name": "^4.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/init-package-json/node_modules/proc-log": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-2.0.1.tgz", + "integrity": "sha512-Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw==", + "license": "ISC", + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/inquirer": { + "version": "8.2.6", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.6.tgz", + "integrity": "sha512-M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg==", + "license": "MIT", + "dependencies": { + "ansi-escapes": "^4.2.1", + "chalk": "^4.1.1", + "cli-cursor": "^3.1.0", + "cli-width": "^3.0.0", + "external-editor": "^3.0.3", + "figures": "^3.0.0", + "lodash": "^4.17.21", + "mute-stream": "0.0.8", + "ora": "^5.4.1", + "run-async": "^2.4.0", + "rxjs": "^7.5.5", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0", + "through": "^2.3.6", + "wrap-ansi": "^6.0.1" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/inquirer/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/ip-address": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz", + "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==", + "license": "MIT", + "dependencies": { + "jsbn": "1.1.0", + "sprintf-js": "^1.1.3" + }, + "engines": { + "node": ">= 12" + } + }, + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "license": "MIT" + }, + "node_modules/is-ci": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", + "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", + "license": "MIT", + "dependencies": { + "ci-info": "^2.0.0" + }, + "bin": { + "is-ci": "bin.js" + } + }, + "node_modules/is-core-module": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", + "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", + "license": "MIT", + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-docker": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", + "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", + "license": "MIT", + "bin": { + "is-docker": "cli.js" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "license": "MIT", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-interactive": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", + "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-lambda": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", + "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==", + "license": "MIT" + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-obj": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", + "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-path-cwd": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz", + "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-plain-obj": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", + "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-plain-object": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", + "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-ssh": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/is-ssh/-/is-ssh-1.4.1.tgz", + "integrity": "sha512-JNeu1wQsHjyHgn9NcWTaXq6zWSR6hqE0++zhfZlkFBbScNkyvxCdeV8sRkSBaeLKxmbpR21brail63ACNxJ0Tg==", + "license": "MIT", + "dependencies": { + "protocols": "^2.0.1" + } + }, + "node_modules/is-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", + "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-text-path": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz", + "integrity": "sha512-xFuJpne9oFz5qDaodwmmG08e3CawH/2ZV8Qqza1Ko7Sk8POWbkRdwIoAWVhqvq0XeUzANEhKo2n0IXUGBm7A/w==", + "license": "MIT", + "dependencies": { + "text-extensions": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-unicode-supported": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-wsl": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", + "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", + "license": "MIT", + "dependencies": { + "is-docker": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "license": "MIT" + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "license": "ISC" + }, + "node_modules/isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/jackspeak": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", + "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", + "license": "BlueOak-1.0.0", + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, + "node_modules/jake": { + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz", + "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==", + "license": "Apache-2.0", + "dependencies": { + "async": "^3.2.3", + "chalk": "^4.0.2", + "filelist": "^1.0.4", + "minimatch": "^3.1.2" + }, + "bin": { + "jake": "bin/cli.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jake/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "license": "MIT" + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/jsbn": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz", + "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==", + "license": "MIT" + }, + "node_modules/json-parse-better-errors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", + "license": "MIT" + }, + "node_modules/json-parse-even-better-errors": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz", + "integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==", + "license": "MIT", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/json-stringify-nice": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz", + "integrity": "sha512-5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw==", + "license": "ISC", + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==", + "license": "ISC" + }, + "node_modules/json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "license": "MIT", + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/jsonc-parser": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", + "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", + "license": "MIT" + }, + "node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "license": "MIT", + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/jsonparse": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", + "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==", + "engines": [ + "node >= 0.2.0" + ], + "license": "MIT" + }, + "node_modules/JSONStream": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", + "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", + "license": "(MIT OR Apache-2.0)", + "dependencies": { + "jsonparse": "^1.2.0", + "through": ">=2.2.7 <3" + }, + "bin": { + "JSONStream": "bin.js" + }, + "engines": { + "node": "*" + } + }, + "node_modules/just-diff": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/just-diff/-/just-diff-6.0.2.tgz", + "integrity": "sha512-S59eriX5u3/QhMNq3v/gm8Kd0w8OS6Tz2FS1NG4blv+z0MuQcBRJyFWjdovM0Rad4/P4aUPFtnkNjMjyMlMSYA==", + "license": "MIT" + }, + "node_modules/just-diff-apply": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/just-diff-apply/-/just-diff-apply-5.5.0.tgz", + "integrity": "sha512-OYTthRfSh55WOItVqwpefPtNt2VdKsq5AnAK6apdtR6yCH8pr0CmSr710J0Mf+WdQy7K/OzMy7K2MgAfdQURDw==", + "license": "MIT" + }, + "node_modules/kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/libnpmaccess": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-6.0.4.tgz", + "integrity": "sha512-qZ3wcfIyUoW0+qSFkMBovcTrSGJ3ZeyvpR7d5N9pEYv/kXs8sHP2wiqEIXBKLFrZlmM0kR0RJD7mtfLngtlLag==", + "license": "ISC", + "dependencies": { + "aproba": "^2.0.0", + "minipass": "^3.1.1", + "npm-package-arg": "^9.0.1", + "npm-registry-fetch": "^13.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/libnpmaccess/node_modules/hosted-git-info": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-5.2.1.tgz", + "integrity": "sha512-xIcQYMnhcx2Nr4JTjsFmwwnr9vldugPy9uVm0o87bjqqWMv9GaqsTeT+i99wTl0mk1uLxJtHxLb8kymqTENQsw==", + "license": "ISC", + "dependencies": { + "lru-cache": "^7.5.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/libnpmaccess/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/libnpmaccess/node_modules/npm-package-arg": { + "version": "9.1.2", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-9.1.2.tgz", + "integrity": "sha512-pzd9rLEx4TfNJkovvlBSLGhq31gGu2QDexFPWT19yCDh0JgnRhlBLNo5759N0AJmBk+kQ9Y/hXoLnlgFD+ukmg==", + "license": "ISC", + "dependencies": { + "hosted-git-info": "^5.0.0", + "proc-log": "^2.0.1", + "semver": "^7.3.5", + "validate-npm-package-name": "^4.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/libnpmaccess/node_modules/npm-registry-fetch": { + "version": "13.3.1", + "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-13.3.1.tgz", + "integrity": "sha512-eukJPi++DKRTjSBRcDZSDDsGqRK3ehbxfFUcgaRd0Yp6kRwOwh2WVn0r+8rMB4nnuzvAk6rQVzl6K5CkYOmnvw==", + "license": "ISC", + "dependencies": { + "make-fetch-happen": "^10.0.6", + "minipass": "^3.1.6", + "minipass-fetch": "^2.0.3", + "minipass-json-stream": "^1.0.1", + "minizlib": "^2.1.2", + "npm-package-arg": "^9.0.1", + "proc-log": "^2.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/libnpmaccess/node_modules/proc-log": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-2.0.1.tgz", + "integrity": "sha512-Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw==", + "license": "ISC", + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/libnpmpublish": { + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-7.1.4.tgz", + "integrity": "sha512-mMntrhVwut5prP4rJ228eEbEyvIzLWhqFuY90j5QeXBCTT2pWSMno7Yo2S2qplPUr02zPurGH4heGLZ+wORczg==", + "license": "ISC", + "dependencies": { + "ci-info": "^3.6.1", + "normalize-package-data": "^5.0.0", + "npm-package-arg": "^10.1.0", + "npm-registry-fetch": "^14.0.3", + "proc-log": "^3.0.0", + "semver": "^7.3.7", + "sigstore": "^1.4.0", + "ssri": "^10.0.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/libnpmpublish/node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/libnpmpublish/node_modules/npm-package-arg": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz", + "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==", + "license": "ISC", + "dependencies": { + "hosted-git-info": "^6.0.0", + "proc-log": "^3.0.0", + "semver": "^7.3.5", + "validate-npm-package-name": "^5.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/libnpmpublish/node_modules/ssri": { + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", + "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", + "license": "ISC", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/libnpmpublish/node_modules/validate-npm-package-name": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz", + "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==", + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/lines-and-columns": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.4.tgz", + "integrity": "sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A==", + "license": "MIT", + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + } + }, + "node_modules/load-json-file": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-6.2.0.tgz", + "integrity": "sha512-gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ==", + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.1.15", + "parse-json": "^5.0.0", + "strip-bom": "^4.0.0", + "type-fest": "^0.6.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/load-json-file/node_modules/type-fest": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", + "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=8" + } + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "license": "MIT", + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "license": "MIT" + }, + "node_modules/lodash.ismatch": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz", + "integrity": "sha512-fPMfXjGQEV9Xsq/8MTSgUf255gawYRbjwMyDbcvDhXgV7enSZA0hynz6vMPnpAb5iONEzBHBPsT+0zes5Z301g==", + "license": "MIT" + }, + "node_modules/log-symbols": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", + "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", + "license": "MIT", + "dependencies": { + "chalk": "^4.1.0", + "is-unicode-supported": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "license": "MIT", + "dependencies": { + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/make-dir/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/make-fetch-happen": { + "version": "10.2.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz", + "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==", + "license": "ISC", + "dependencies": { + "agentkeepalive": "^4.2.1", + "cacache": "^16.1.0", + "http-cache-semantics": "^4.1.0", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", + "is-lambda": "^1.0.1", + "lru-cache": "^7.7.1", + "minipass": "^3.1.6", + "minipass-collect": "^1.0.2", + "minipass-fetch": "^2.0.3", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "promise-retry": "^2.0.1", + "socks-proxy-agent": "^7.0.0", + "ssri": "^9.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/make-fetch-happen/node_modules/@npmcli/fs": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz", + "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==", + "license": "ISC", + "dependencies": { + "@gar/promisify": "^1.1.3", + "semver": "^7.3.5" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/make-fetch-happen/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/make-fetch-happen/node_modules/cacache": { + "version": "16.1.3", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz", + "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==", + "license": "ISC", + "dependencies": { + "@npmcli/fs": "^2.1.0", + "@npmcli/move-file": "^2.0.0", + "chownr": "^2.0.0", + "fs-minipass": "^2.1.0", + "glob": "^8.0.1", + "infer-owner": "^1.0.4", + "lru-cache": "^7.7.1", + "minipass": "^3.1.6", + "minipass-collect": "^1.0.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "mkdirp": "^1.0.4", + "p-map": "^4.0.0", + "promise-inflight": "^1.0.1", + "rimraf": "^3.0.2", + "ssri": "^9.0.0", + "tar": "^6.1.11", + "unique-filename": "^2.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/make-fetch-happen/node_modules/fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "license": "ISC", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/make-fetch-happen/node_modules/glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/make-fetch-happen/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/make-fetch-happen/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/make-fetch-happen/node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "license": "ISC", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/make-fetch-happen/node_modules/rimraf/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/make-fetch-happen/node_modules/rimraf/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/make-fetch-happen/node_modules/rimraf/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/make-fetch-happen/node_modules/unique-filename": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz", + "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==", + "license": "ISC", + "dependencies": { + "unique-slug": "^3.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/make-fetch-happen/node_modules/unique-slug": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz", + "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==", + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/map-obj": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz", + "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==", + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/meow": { + "version": "8.1.2", + "resolved": "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz", + "integrity": "sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q==", + "license": "MIT", + "dependencies": { + "@types/minimist": "^1.2.0", + "camelcase-keys": "^6.2.2", + "decamelize-keys": "^1.1.0", + "hard-rejection": "^2.1.0", + "minimist-options": "4.1.0", + "normalize-package-data": "^3.0.0", + "read-pkg-up": "^7.0.1", + "redent": "^3.0.0", + "trim-newlines": "^3.0.0", + "type-fest": "^0.18.0", + "yargs-parser": "^20.2.3" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/meow/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "license": "MIT", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/meow/node_modules/hosted-git-info": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", + "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", + "license": "ISC", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/meow/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "license": "MIT", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/meow/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/meow/node_modules/normalize-package-data": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz", + "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==", + "license": "BSD-2-Clause", + "dependencies": { + "hosted-git-info": "^4.0.1", + "is-core-module": "^2.5.0", + "semver": "^7.3.4", + "validate-npm-package-license": "^3.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/meow/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/meow/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "license": "MIT", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/meow/node_modules/read-pkg": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", + "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", + "license": "MIT", + "dependencies": { + "@types/normalize-package-data": "^2.4.0", + "normalize-package-data": "^2.5.0", + "parse-json": "^5.0.0", + "type-fest": "^0.6.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/meow/node_modules/read-pkg-up": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", + "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", + "license": "MIT", + "dependencies": { + "find-up": "^4.1.0", + "read-pkg": "^5.2.0", + "type-fest": "^0.8.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/meow/node_modules/read-pkg-up/node_modules/type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=8" + } + }, + "node_modules/meow/node_modules/read-pkg/node_modules/hosted-git-info": { + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", + "license": "ISC" + }, + "node_modules/meow/node_modules/read-pkg/node_modules/normalize-package-data": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "license": "BSD-2-Clause", + "dependencies": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + } + }, + "node_modules/meow/node_modules/read-pkg/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "license": "ISC", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/meow/node_modules/read-pkg/node_modules/type-fest": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", + "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=8" + } + }, + "node_modules/meow/node_modules/type-fest": { + "version": "0.18.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz", + "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==", + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "license": "MIT" + }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/micromatch": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "license": "MIT", + "dependencies": { + "braces": "^3.0.3", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "license": "MIT", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/min-indent": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", + "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/minimatch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz", + "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/minimist-options": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz", + "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==", + "license": "MIT", + "dependencies": { + "arrify": "^1.0.1", + "is-plain-obj": "^1.1.0", + "kind-of": "^6.0.3" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/minipass-collect": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", + "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", + "license": "ISC", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minipass-collect/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-fetch": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz", + "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==", + "license": "MIT", + "dependencies": { + "minipass": "^3.1.6", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" + } + }, + "node_modules/minipass-fetch/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-flush": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", + "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", + "license": "ISC", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minipass-flush/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-json-stream": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.2.tgz", + "integrity": "sha512-myxeeTm57lYs8pH2nxPzmEEg8DGIgW+9mv6D4JZD2pa81I/OBjeU7PtICXV6c9eRGTA5JMDsuIPUZRCyBMYNhg==", + "license": "MIT", + "dependencies": { + "jsonparse": "^1.3.1", + "minipass": "^3.0.0" + } + }, + "node_modules/minipass-json-stream/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-pipeline": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", + "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", + "license": "ISC", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-pipeline/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-sized": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", + "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", + "license": "ISC", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-sized/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "license": "MIT", + "dependencies": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minizlib/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "license": "MIT", + "bin": { + "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/mkdirp-infer-owner": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mkdirp-infer-owner/-/mkdirp-infer-owner-2.0.0.tgz", + "integrity": "sha512-sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw==", + "license": "ISC", + "dependencies": { + "chownr": "^2.0.0", + "infer-owner": "^1.0.4", + "mkdirp": "^1.0.3" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/modify-values": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz", + "integrity": "sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, + "node_modules/multimatch": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz", + "integrity": "sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==", + "license": "MIT", + "dependencies": { + "@types/minimatch": "^3.0.3", + "array-differ": "^3.0.0", + "array-union": "^2.1.0", + "arrify": "^2.0.1", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/multimatch/node_modules/arrify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", + "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/mute-stream": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", + "license": "ISC" + }, + "node_modules/negotiator": { + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz", + "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/neo-async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", + "license": "MIT" + }, + "node_modules/node-addon-api": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", + "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==", + "license": "MIT" + }, + "node_modules/node-fetch": { + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "license": "MIT", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, + "node_modules/node-gyp": { + "version": "9.4.1", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.1.tgz", + "integrity": "sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ==", + "license": "MIT", + "dependencies": { + "env-paths": "^2.2.0", + "exponential-backoff": "^3.1.1", + "glob": "^7.1.4", + "graceful-fs": "^4.2.6", + "make-fetch-happen": "^10.0.3", + "nopt": "^6.0.0", + "npmlog": "^6.0.0", + "rimraf": "^3.0.2", + "semver": "^7.3.5", + "tar": "^6.1.2", + "which": "^2.0.2" + }, + "bin": { + "node-gyp": "bin/node-gyp.js" + }, + "engines": { + "node": "^12.13 || ^14.13 || >=16" + } + }, + "node_modules/node-gyp-build": { + "version": "4.8.4", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.4.tgz", + "integrity": "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==", + "license": "MIT", + "bin": { + "node-gyp-build": "bin.js", + "node-gyp-build-optional": "optional.js", + "node-gyp-build-test": "build-test.js" + } + }, + "node_modules/node-gyp/node_modules/abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", + "license": "ISC" + }, + "node_modules/node-gyp/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/node-gyp/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/node-gyp/node_modules/nopt": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz", + "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==", + "license": "ISC", + "dependencies": { + "abbrev": "^1.0.0" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/node-gyp/node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "license": "ISC", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/node-gyp/node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/nopt": { + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz", + "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==", + "license": "ISC", + "dependencies": { + "abbrev": "^2.0.0" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/normalize-package-data": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-5.0.0.tgz", + "integrity": "sha512-h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==", + "license": "BSD-2-Clause", + "dependencies": { + "hosted-git-info": "^6.0.0", + "is-core-module": "^2.8.1", + "semver": "^7.3.5", + "validate-npm-package-license": "^3.0.4" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-bundled": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.1.tgz", + "integrity": "sha512-+AvaheE/ww1JEwRHOrn4WHNzOxGtVp+adrg2AeZS/7KuxGUYFuBta98wYpfHBbJp6Tg6j1NKSEVHNcfZzJHQwQ==", + "license": "ISC", + "dependencies": { + "npm-normalize-package-bin": "^3.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-install-checks": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.3.0.tgz", + "integrity": "sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==", + "license": "BSD-2-Clause", + "dependencies": { + "semver": "^7.1.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-normalize-package-bin": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz", + "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==", + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-package-arg": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.1.tgz", + "integrity": "sha512-CsP95FhWQDwNqiYS+Q0mZ7FAEDytDZAkNxQqea6IaAFJTAY9Lhhqyl0irU/6PMc7BGfUmnsbHcqxJD7XuVM/rg==", + "license": "ISC", + "dependencies": { + "hosted-git-info": "^3.0.6", + "semver": "^7.0.0", + "validate-npm-package-name": "^3.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/npm-package-arg/node_modules/builtins": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz", + "integrity": "sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==", + "license": "MIT" + }, + "node_modules/npm-package-arg/node_modules/hosted-git-info": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.8.tgz", + "integrity": "sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==", + "license": "ISC", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/npm-package-arg/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/npm-package-arg/node_modules/validate-npm-package-name": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz", + "integrity": "sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==", + "license": "ISC", + "dependencies": { + "builtins": "^1.0.3" + } + }, + "node_modules/npm-packlist": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-5.1.1.tgz", + "integrity": "sha512-UfpSvQ5YKwctmodvPPkK6Fwk603aoVsf8AEbmVKAEECrfvL8SSe1A2YIwrJ6xmTHAITKPwwZsWo7WwEbNk0kxw==", + "license": "ISC", + "dependencies": { + "glob": "^8.0.1", + "ignore-walk": "^5.0.1", + "npm-bundled": "^1.1.2", + "npm-normalize-package-bin": "^1.0.1" + }, + "bin": { + "npm-packlist": "bin/index.js" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/npm-packlist/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/npm-packlist/node_modules/glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/npm-packlist/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/npm-packlist/node_modules/npm-bundled": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz", + "integrity": "sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==", + "license": "ISC", + "dependencies": { + "npm-normalize-package-bin": "^1.0.1" + } + }, + "node_modules/npm-packlist/node_modules/npm-normalize-package-bin": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz", + "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==", + "license": "ISC" + }, + "node_modules/npm-pick-manifest": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-8.0.2.tgz", + "integrity": "sha512-1dKY+86/AIiq1tkKVD3l0WI+Gd3vkknVGAggsFeBkTvbhMQ1OND/LKkYv4JtXPKUJ8bOTCyLiqEg2P6QNdK+Gg==", + "license": "ISC", + "dependencies": { + "npm-install-checks": "^6.0.0", + "npm-normalize-package-bin": "^3.0.0", + "npm-package-arg": "^10.0.0", + "semver": "^7.3.5" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-pick-manifest/node_modules/npm-package-arg": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz", + "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==", + "license": "ISC", + "dependencies": { + "hosted-git-info": "^6.0.0", + "proc-log": "^3.0.0", + "semver": "^7.3.5", + "validate-npm-package-name": "^5.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-pick-manifest/node_modules/validate-npm-package-name": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz", + "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==", + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-registry-fetch": { + "version": "14.0.5", + "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-14.0.5.tgz", + "integrity": "sha512-kIDMIo4aBm6xg7jOttupWZamsZRkAqMqwqqbVXnUqstY5+tapvv6bkH/qMR76jdgV+YljEUCyWx3hRYMrJiAgA==", + "license": "ISC", + "dependencies": { + "make-fetch-happen": "^11.0.0", + "minipass": "^5.0.0", + "minipass-fetch": "^3.0.0", + "minipass-json-stream": "^1.0.1", + "minizlib": "^2.1.2", + "npm-package-arg": "^10.0.0", + "proc-log": "^3.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-registry-fetch/node_modules/make-fetch-happen": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", + "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", + "license": "ISC", + "dependencies": { + "agentkeepalive": "^4.2.1", + "cacache": "^17.0.0", + "http-cache-semantics": "^4.1.1", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", + "is-lambda": "^1.0.1", + "lru-cache": "^7.7.1", + "minipass": "^5.0.0", + "minipass-fetch": "^3.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "promise-retry": "^2.0.1", + "socks-proxy-agent": "^7.0.0", + "ssri": "^10.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-registry-fetch/node_modules/minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "license": "ISC", + "engines": { + "node": ">=8" + } + }, + "node_modules/npm-registry-fetch/node_modules/minipass-fetch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", + "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", + "license": "MIT", + "dependencies": { + "minipass": "^7.0.3", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" + } + }, + "node_modules/npm-registry-fetch/node_modules/minipass-fetch/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/npm-registry-fetch/node_modules/npm-package-arg": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz", + "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==", + "license": "ISC", + "dependencies": { + "hosted-git-info": "^6.0.0", + "proc-log": "^3.0.0", + "semver": "^7.3.5", + "validate-npm-package-name": "^5.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-registry-fetch/node_modules/ssri": { + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", + "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", + "license": "ISC", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-registry-fetch/node_modules/ssri/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/npm-registry-fetch/node_modules/validate-npm-package-name": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz", + "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==", + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "license": "MIT", + "dependencies": { + "path-key": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/npmlog": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz", + "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==", + "deprecated": "This package is no longer supported.", + "license": "ISC", + "dependencies": { + "are-we-there-yet": "^3.0.0", + "console-control-strings": "^1.1.0", + "gauge": "^4.0.3", + "set-blocking": "^2.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/nx": { + "version": "15.9.7", + "resolved": "https://registry.npmjs.org/nx/-/nx-15.9.7.tgz", + "integrity": "sha512-1qlEeDjX9OKZEryC8i4bA+twNg+lB5RKrozlNwWx/lLJHqWPUfvUTvxh+uxlPYL9KzVReQjUuxMLFMsHNqWUrA==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "@nrwl/cli": "15.9.7", + "@nrwl/tao": "15.9.7", + "@parcel/watcher": "2.0.4", + "@yarnpkg/lockfile": "^1.1.0", + "@yarnpkg/parsers": "3.0.0-rc.46", + "@zkochan/js-yaml": "0.0.6", + "axios": "^1.0.0", + "chalk": "^4.1.0", + "cli-cursor": "3.1.0", + "cli-spinners": "2.6.1", + "cliui": "^7.0.2", + "dotenv": "~10.0.0", + "enquirer": "~2.3.6", + "fast-glob": "3.2.7", + "figures": "3.2.0", + "flat": "^5.0.2", + "fs-extra": "^11.1.0", + "glob": "7.1.4", + "ignore": "^5.0.4", + "js-yaml": "4.1.0", + "jsonc-parser": "3.2.0", + "lines-and-columns": "~2.0.3", + "minimatch": "3.0.5", + "npm-run-path": "^4.0.1", + "open": "^8.4.0", + "semver": "7.5.4", + "string-width": "^4.2.3", + "strong-log-transformer": "^2.1.0", + "tar-stream": "~2.2.0", + "tmp": "~0.2.1", + "tsconfig-paths": "^4.1.2", + "tslib": "^2.3.0", + "v8-compile-cache": "2.3.0", + "yargs": "^17.6.2", + "yargs-parser": "21.1.1" + }, + "bin": { + "nx": "bin/nx.js" + }, + "optionalDependencies": { + "@nrwl/nx-darwin-arm64": "15.9.7", + "@nrwl/nx-darwin-x64": "15.9.7", + "@nrwl/nx-linux-arm-gnueabihf": "15.9.7", + "@nrwl/nx-linux-arm64-gnu": "15.9.7", + "@nrwl/nx-linux-arm64-musl": "15.9.7", + "@nrwl/nx-linux-x64-gnu": "15.9.7", + "@nrwl/nx-linux-x64-musl": "15.9.7", + "@nrwl/nx-win32-arm64-msvc": "15.9.7", + "@nrwl/nx-win32-x64-msvc": "15.9.7" + }, + "peerDependencies": { + "@swc-node/register": "^1.4.2", + "@swc/core": "^1.2.173" + }, + "peerDependenciesMeta": { + "@swc-node/register": { + "optional": true + }, + "@swc/core": { + "optional": true + } + } + }, + "node_modules/nx/node_modules/fast-glob": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz", + "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==", + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/nx/node_modules/fs-extra": { + "version": "11.3.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz", + "integrity": "sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==", + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=14.14" + } + }, + "node_modules/nx/node_modules/glob": { + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", + "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + } + }, + "node_modules/nx/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/nx/node_modules/semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "license": "ISC", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/nx/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/nx/node_modules/yargs": { + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "license": "MIT", + "dependencies": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/nx/node_modules/yargs-parser": { + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/nx/node_modules/yargs/node_modules/cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "license": "ISC", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "license": "MIT", + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/open": { + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz", + "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==", + "license": "MIT", + "dependencies": { + "define-lazy-prop": "^2.0.0", + "is-docker": "^2.1.1", + "is-wsl": "^2.2.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ora": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", + "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", + "license": "MIT", + "dependencies": { + "bl": "^4.1.0", + "chalk": "^4.1.0", + "cli-cursor": "^3.1.0", + "cli-spinners": "^2.5.0", + "is-interactive": "^1.0.0", + "is-unicode-supported": "^0.1.0", + "log-symbols": "^4.1.0", + "strip-ansi": "^6.0.0", + "wcwidth": "^1.0.1" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/p-finally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "license": "MIT", + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "license": "MIT", + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-map": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "license": "MIT", + "dependencies": { + "aggregate-error": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-map-series": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/p-map-series/-/p-map-series-2.1.0.tgz", + "integrity": "sha512-RpYIIK1zXSNEOdwxcfe7FdvGcs7+y5n8rifMhMNWvaxRNMPINJHF5GDeuVxWqnfrcHPSCnp7Oo5yNXHId9Av2Q==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/p-pipe": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-pipe/-/p-pipe-3.1.0.tgz", + "integrity": "sha512-08pj8ATpzMR0Y80x50yJHn37NF6vjrqHutASaX5LiH5npS9XPvrUmscd9MF5R4fuYRHOxQR1FfMIlF7AzwoPqw==", + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-queue": { + "version": "6.6.2", + "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz", + "integrity": "sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==", + "license": "MIT", + "dependencies": { + "eventemitter3": "^4.0.4", + "p-timeout": "^3.2.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-reduce": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/p-reduce/-/p-reduce-2.1.0.tgz", + "integrity": "sha512-2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/p-timeout": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz", + "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==", + "license": "MIT", + "dependencies": { + "p-finally": "^1.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/p-waterfall": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/p-waterfall/-/p-waterfall-2.1.1.tgz", + "integrity": "sha512-RRTnDb2TBG/epPRI2yYXsimO0v3BXC8Yd3ogr1545IaqKK17VGhbWVeGGN+XfCm/08OK8635nH31c8bATkHuSw==", + "license": "MIT", + "dependencies": { + "p-reduce": "^2.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/package-json-from-dist": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", + "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", + "license": "BlueOak-1.0.0" + }, + "node_modules/pacote": { + "version": "15.1.1", + "resolved": "https://registry.npmjs.org/pacote/-/pacote-15.1.1.tgz", + "integrity": "sha512-eeqEe77QrA6auZxNHIp+1TzHQ0HBKf5V6c8zcaYZ134EJe1lCi+fjXATkNiEEfbG+e50nu02GLvUtmZcGOYabQ==", + "license": "ISC", + "dependencies": { + "@npmcli/git": "^4.0.0", + "@npmcli/installed-package-contents": "^2.0.1", + "@npmcli/promise-spawn": "^6.0.1", + "@npmcli/run-script": "^6.0.0", + "cacache": "^17.0.0", + "fs-minipass": "^3.0.0", + "minipass": "^4.0.0", + "npm-package-arg": "^10.0.0", + "npm-packlist": "^7.0.0", + "npm-pick-manifest": "^8.0.0", + "npm-registry-fetch": "^14.0.0", + "proc-log": "^3.0.0", + "promise-retry": "^2.0.1", + "read-package-json": "^6.0.0", + "read-package-json-fast": "^3.0.0", + "sigstore": "^1.0.0", + "ssri": "^10.0.0", + "tar": "^6.1.11" + }, + "bin": { + "pacote": "lib/bin.js" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/pacote/node_modules/@npmcli/run-script": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-6.0.2.tgz", + "integrity": "sha512-NCcr1uQo1k5U+SYlnIrbAh3cxy+OQT1VtqiAbxdymSlptbzBb62AjH2xXgjNCoP073hoa1CfCAcwoZ8k96C4nA==", + "license": "ISC", + "dependencies": { + "@npmcli/node-gyp": "^3.0.0", + "@npmcli/promise-spawn": "^6.0.0", + "node-gyp": "^9.0.0", + "read-package-json-fast": "^3.0.0", + "which": "^3.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/pacote/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/pacote/node_modules/ignore-walk": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.5.tgz", + "integrity": "sha512-VuuG0wCnjhnylG1ABXT3dAuIpTNDs/G8jlpmwXY03fXoXy/8ZK8/T+hMzt8L4WnrLCJgdybqgPagnF/f97cg3A==", + "license": "ISC", + "dependencies": { + "minimatch": "^9.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/pacote/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/pacote/node_modules/minipass": { + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz", + "integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==", + "license": "ISC", + "engines": { + "node": ">=8" + } + }, + "node_modules/pacote/node_modules/npm-package-arg": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz", + "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==", + "license": "ISC", + "dependencies": { + "hosted-git-info": "^6.0.0", + "proc-log": "^3.0.0", + "semver": "^7.3.5", + "validate-npm-package-name": "^5.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/pacote/node_modules/npm-packlist": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-7.0.4.tgz", + "integrity": "sha512-d6RGEuRrNS5/N84iglPivjaJPxhDbZmlbTwTDX2IbcRHG5bZCdtysYMhwiPvcF4GisXHGn7xsxv+GQ7T/02M5Q==", + "license": "ISC", + "dependencies": { + "ignore-walk": "^6.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/pacote/node_modules/read-package-json": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.4.tgz", + "integrity": "sha512-AEtWXYfopBj2z5N5PbkAOeNHRPUg5q+Nen7QLxV8M2zJq1ym6/lCz3fYNTCXe19puu2d06jfHhrP7v/S2PtMMw==", + "deprecated": "This package is no longer supported. Please use @npmcli/package-json instead.", + "license": "ISC", + "dependencies": { + "glob": "^10.2.2", + "json-parse-even-better-errors": "^3.0.0", + "normalize-package-data": "^5.0.0", + "npm-normalize-package-bin": "^3.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/pacote/node_modules/ssri": { + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", + "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", + "license": "ISC", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/pacote/node_modules/ssri/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/pacote/node_modules/validate-npm-package-name": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz", + "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==", + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "license": "MIT", + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/parse-conflict-json": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/parse-conflict-json/-/parse-conflict-json-3.0.1.tgz", + "integrity": "sha512-01TvEktc68vwbJOtWZluyWeVGWjP+bZwXtPDMQVbBKzbJ/vZBif0L69KH1+cHv1SZ6e0FKLvjyHe8mqsIqYOmw==", + "license": "ISC", + "dependencies": { + "json-parse-even-better-errors": "^3.0.0", + "just-diff": "^6.0.0", + "just-diff-apply": "^5.2.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/parse-json": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/parse-json/node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "license": "MIT" + }, + "node_modules/parse-json/node_modules/lines-and-columns": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "license": "MIT" + }, + "node_modules/parse-path": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-7.0.1.tgz", + "integrity": "sha512-6ReLMptznuuOEzLoGEa+I1oWRSj2Zna5jLWC+l6zlfAI4dbbSaIES29ThzuPkbhNahT65dWzfoZEO6cfJw2Ksg==", + "license": "MIT", + "dependencies": { + "protocols": "^2.0.0" + } + }, + "node_modules/parse-url": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-8.1.0.tgz", + "integrity": "sha512-xDvOoLU5XRrcOZvnI6b8zA6n9O9ejNk/GExuz1yBuWUGn9KA97GI6HTs6u02wKara1CeVmZhH+0TZFdWScR89w==", + "license": "MIT", + "dependencies": { + "parse-path": "^7.0.0" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "license": "MIT" + }, + "node_modules/path-scurry": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", + "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "license": "BlueOak-1.0.0", + "dependencies": { + "lru-cache": "^10.2.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.18" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/path-scurry/node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "license": "ISC" + }, + "node_modules/path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/picocolors": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "license": "ISC" + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pify": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz", + "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==", + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "license": "MIT", + "dependencies": { + "find-up": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "license": "MIT", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "license": "MIT", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "license": "MIT", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/postcss-selector-parser": { + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz", + "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==", + "license": "MIT", + "dependencies": { + "cssesc": "^3.0.0", + "util-deprecate": "^1.0.2" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/pretty-format": { + "version": "29.4.3", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.4.3.tgz", + "integrity": "sha512-cvpcHTc42lcsvOOAzd3XuNWTcvk1Jmnzqeu+WsOuiPmxUJTnkbAcFNsRKvEpBEUFVUgy/GTZLulZDcDEi+CIlA==", + "license": "MIT", + "dependencies": { + "@jest/schemas": "^29.4.3", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/pretty-format/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/proc-log": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz", + "integrity": "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==", + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", + "license": "MIT" + }, + "node_modules/promise-all-reject-late": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/promise-all-reject-late/-/promise-all-reject-late-1.0.1.tgz", + "integrity": "sha512-vuf0Lf0lOxyQREH7GDIOUMLS7kz+gs8i6B+Yi8dC68a2sychGrHTJYghMBD6k7eUcH0H5P73EckCA48xijWqXw==", + "license": "ISC", + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/promise-call-limit": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/promise-call-limit/-/promise-call-limit-1.0.2.tgz", + "integrity": "sha512-1vTUnfI2hzui8AEIixbdAJlFY4LFDXqQswy/2eOlThAscXCY4It8FdVuI0fMJGAB2aWGbdQf/gv0skKYXmdrHA==", + "license": "ISC", + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/promise-inflight": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", + "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==", + "license": "ISC" + }, + "node_modules/promise-retry": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", + "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", + "license": "MIT", + "dependencies": { + "err-code": "^2.0.2", + "retry": "^0.12.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/promzard": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz", + "integrity": "sha512-JZeYqd7UAcHCwI+sTOeUDYkvEU+1bQ7iE0UT1MgB/tERkAPkesW46MrpIySzODi+owTjZtiF8Ay5j9m60KmMBw==", + "license": "ISC", + "dependencies": { + "read": "1" + } + }, + "node_modules/proto-list": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", + "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==", + "license": "ISC" + }, + "node_modules/protocols": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/protocols/-/protocols-2.0.2.tgz", + "integrity": "sha512-hHVTzba3wboROl0/aWRRG9dMytgH6ow//STBZh43l/wQgmMhYhOFi0EHWAPtoCz9IAUymsyP0TSBHkhgMEGNnQ==", + "license": "MIT" + }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "license": "MIT" + }, + "node_modules/q": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", + "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==", + "deprecated": "You or someone you depend on is using Q, the JavaScript Promise library that gave JavaScript developers strong feelings about promises. They can almost certainly migrate to the native JavaScript promise now. Thank you literally everyone for joining me in this bet against the odds. Be excellent to each other.\n\n(For a CapTP with native promises, see @endo/eventual-send and @endo/captp)", + "license": "MIT", + "engines": { + "node": ">=0.6.0", + "teleport": ">=0.2.0" + } + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/quick-lru": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz", + "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/react-is": { + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", + "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", + "license": "MIT" + }, + "node_modules/read": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz", + "integrity": "sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==", + "license": "ISC", + "dependencies": { + "mute-stream": "~0.0.4" + }, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/read-cmd-shim": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-3.0.0.tgz", + "integrity": "sha512-KQDVjGqhZk92PPNRj9ZEXEuqg8bUobSKRw+q0YQ3TKI5xkce7bUJobL4Z/OtiEbAAv70yEpYIXp4iQ9L8oPVog==", + "license": "ISC", + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/read-package-json": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-5.0.1.tgz", + "integrity": "sha512-MALHuNgYWdGW3gKzuNMuYtcSSZbGQm94fAp16xt8VsYTLBjUSc55bLMKe6gzpWue0Tfi6CBgwCSdDAqutGDhMg==", + "deprecated": "This package is no longer supported. Please use @npmcli/package-json instead.", + "license": "ISC", + "dependencies": { + "glob": "^8.0.1", + "json-parse-even-better-errors": "^2.3.1", + "normalize-package-data": "^4.0.0", + "npm-normalize-package-bin": "^1.0.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/read-package-json-fast": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz", + "integrity": "sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==", + "license": "ISC", + "dependencies": { + "json-parse-even-better-errors": "^3.0.0", + "npm-normalize-package-bin": "^3.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/read-package-json/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/read-package-json/node_modules/glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/read-package-json/node_modules/hosted-git-info": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-5.2.1.tgz", + "integrity": "sha512-xIcQYMnhcx2Nr4JTjsFmwwnr9vldugPy9uVm0o87bjqqWMv9GaqsTeT+i99wTl0mk1uLxJtHxLb8kymqTENQsw==", + "license": "ISC", + "dependencies": { + "lru-cache": "^7.5.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/read-package-json/node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "license": "MIT" + }, + "node_modules/read-package-json/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/read-package-json/node_modules/normalize-package-data": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-4.0.1.tgz", + "integrity": "sha512-EBk5QKKuocMJhB3BILuKhmaPjI8vNRSpIfO9woLC6NyHVkKKdVEdAO1mrT0ZfxNR1lKwCcTkuZfmGIFdizZ8Pg==", + "license": "BSD-2-Clause", + "dependencies": { + "hosted-git-info": "^5.0.0", + "is-core-module": "^2.8.1", + "semver": "^7.3.5", + "validate-npm-package-license": "^3.0.4" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/read-package-json/node_modules/npm-normalize-package-bin": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz", + "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==", + "license": "ISC" + }, + "node_modules/read-pkg": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", + "integrity": "sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==", + "license": "MIT", + "dependencies": { + "load-json-file": "^4.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz", + "integrity": "sha512-YFzFrVvpC6frF1sz8psoHDBGF7fLPc+llq/8NB43oagqWkx8ar5zYtsTORtOjw9W2RHLpWP+zTWwBvf1bCmcSw==", + "license": "MIT", + "dependencies": { + "find-up": "^2.0.0", + "read-pkg": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg-up/node_modules/find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==", + "license": "MIT", + "dependencies": { + "locate-path": "^2.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg-up/node_modules/locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==", + "license": "MIT", + "dependencies": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg-up/node_modules/p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "license": "MIT", + "dependencies": { + "p-try": "^1.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg-up/node_modules/p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==", + "license": "MIT", + "dependencies": { + "p-limit": "^1.1.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg-up/node_modules/p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg-up/node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg/node_modules/hosted-git-info": { + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", + "license": "ISC" + }, + "node_modules/read-pkg/node_modules/load-json-file": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", + "integrity": "sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==", + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.1.2", + "parse-json": "^4.0.0", + "pify": "^3.0.0", + "strip-bom": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg/node_modules/normalize-package-data": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "license": "BSD-2-Clause", + "dependencies": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + } + }, + "node_modules/read-pkg/node_modules/parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==", + "license": "MIT", + "dependencies": { + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg/node_modules/path-type": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", + "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", + "license": "MIT", + "dependencies": { + "pify": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg/node_modules/pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "license": "ISC", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/read-pkg/node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "license": "MIT", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/redent": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", + "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==", + "license": "MIT", + "dependencies": { + "indent-string": "^4.0.0", + "strip-indent": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/resolve": { + "version": "1.22.10", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", + "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", + "license": "MIT", + "dependencies": { + "is-core-module": "^2.16.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-cwd": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", + "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", + "license": "MIT", + "dependencies": { + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/restore-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "license": "MIT", + "dependencies": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/retry": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", + "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "license": "MIT", + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rimraf": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-4.4.1.tgz", + "integrity": "sha512-Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og==", + "license": "ISC", + "dependencies": { + "glob": "^9.2.0" + }, + "bin": { + "rimraf": "dist/cjs/src/bin.js" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/rimraf/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/rimraf/node_modules/glob": { + "version": "9.3.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz", + "integrity": "sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==", + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "minimatch": "^8.0.2", + "minipass": "^4.2.4", + "path-scurry": "^1.6.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/rimraf/node_modules/minimatch": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-8.0.4.tgz", + "integrity": "sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/rimraf/node_modules/minipass": { + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz", + "integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==", + "license": "ISC", + "engines": { + "node": ">=8" + } + }, + "node_modules/run-async": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", + "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/rxjs": { + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "license": "MIT" + }, + "node_modules/semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", + "license": "ISC" + }, + "node_modules/shallow-clone": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", + "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", + "license": "MIT", + "dependencies": { + "kind-of": "^6.0.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "license": "ISC" + }, + "node_modules/sigstore": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-1.9.0.tgz", + "integrity": "sha512-0Zjz0oe37d08VeOtBIuB6cRriqXse2e8w+7yIy2XSXjshRKxbc2KkhXjL229jXSxEm7UbcjS76wcJDGQddVI9A==", + "license": "Apache-2.0", + "dependencies": { + "@sigstore/bundle": "^1.1.0", + "@sigstore/protobuf-specs": "^0.2.0", + "@sigstore/sign": "^1.0.0", + "@sigstore/tuf": "^1.0.3", + "make-fetch-happen": "^11.0.1" + }, + "bin": { + "sigstore": "bin/sigstore.js" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/sigstore/node_modules/make-fetch-happen": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", + "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", + "license": "ISC", + "dependencies": { + "agentkeepalive": "^4.2.1", + "cacache": "^17.0.0", + "http-cache-semantics": "^4.1.1", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", + "is-lambda": "^1.0.1", + "lru-cache": "^7.7.1", + "minipass": "^5.0.0", + "minipass-fetch": "^3.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "promise-retry": "^2.0.1", + "socks-proxy-agent": "^7.0.0", + "ssri": "^10.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/sigstore/node_modules/minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "license": "ISC", + "engines": { + "node": ">=8" + } + }, + "node_modules/sigstore/node_modules/minipass-fetch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", + "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", + "license": "MIT", + "dependencies": { + "minipass": "^7.0.3", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" + } + }, + "node_modules/sigstore/node_modules/minipass-fetch/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/sigstore/node_modules/ssri": { + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", + "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", + "license": "ISC", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/sigstore/node_modules/ssri/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/smart-buffer": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", + "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", + "license": "MIT", + "engines": { + "node": ">= 6.0.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/socks": { + "version": "2.8.4", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.4.tgz", + "integrity": "sha512-D3YaD0aRxR3mEcqnidIs7ReYJFVzWdd6fXJYUM8ixcQcJRGTka/b3saV0KflYhyVJXKhb947GndU35SxYNResQ==", + "license": "MIT", + "dependencies": { + "ip-address": "^9.0.5", + "smart-buffer": "^4.2.0" + }, + "engines": { + "node": ">= 10.0.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/socks-proxy-agent": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz", + "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==", + "license": "MIT", + "dependencies": { + "agent-base": "^6.0.2", + "debug": "^4.3.3", + "socks": "^2.6.2" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/sort-keys": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz", + "integrity": "sha512-/dPCrG1s3ePpWm6yBbxZq5Be1dXGLyLn9Z791chDC3NFrpkVbWGzkBwPN1knaciexFXgRJ7hzdnwZ4stHSDmjg==", + "license": "MIT", + "dependencies": { + "is-plain-obj": "^1.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/spdx-correct": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", + "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", + "license": "Apache-2.0", + "dependencies": { + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" + } + }, + "node_modules/spdx-exceptions": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz", + "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==", + "license": "CC-BY-3.0" + }, + "node_modules/spdx-expression-parse": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", + "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", + "license": "MIT", + "dependencies": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, + "node_modules/spdx-license-ids": { + "version": "3.0.21", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz", + "integrity": "sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==", + "license": "CC0-1.0" + }, + "node_modules/split": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", + "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==", + "license": "MIT", + "dependencies": { + "through": "2" + }, + "engines": { + "node": "*" + } + }, + "node_modules/split2": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz", + "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==", + "license": "ISC", + "dependencies": { + "readable-stream": "^3.0.0" + } + }, + "node_modules/sprintf-js": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", + "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", + "license": "BSD-3-Clause" + }, + "node_modules/ssri": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz", + "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==", + "license": "ISC", + "dependencies": { + "minipass": "^3.1.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/ssri/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-bom": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/strip-indent": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz", + "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==", + "license": "MIT", + "dependencies": { + "min-indent": "^1.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strong-log-transformer": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz", + "integrity": "sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==", + "license": "Apache-2.0", + "dependencies": { + "duplexer": "^0.1.1", + "minimist": "^1.2.0", + "through": "^2.3.4" + }, + "bin": { + "sl-log-transformer": "bin/sl-log-transformer.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/tar": { + "version": "6.1.11", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz", + "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==", + "license": "ISC", + "dependencies": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^3.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/tar-stream": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "license": "MIT", + "dependencies": { + "bl": "^4.0.3", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/tar/node_modules/fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "license": "ISC", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/tar/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/temp-dir": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz", + "integrity": "sha512-xZFXEGbG7SNC3itwBzI3RYjq/cEhBkx2hJuKGIUOcEULmkQExXiHat2z/qkISYsuR+IKumhEfKKbV5qXmhICFQ==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/tempy": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/tempy/-/tempy-1.0.0.tgz", + "integrity": "sha512-eLXG5B1G0mRPHmgH2WydPl5v4jH35qEn3y/rA/aahKhIa91Pn119SsU7n7v/433gtT9ONzC8ISvNHIh2JSTm0w==", + "license": "MIT", + "dependencies": { + "del": "^6.0.0", + "is-stream": "^2.0.0", + "temp-dir": "^2.0.0", + "type-fest": "^0.16.0", + "unique-string": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/tempy/node_modules/temp-dir": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz", + "integrity": "sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/tempy/node_modules/type-fest": { + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.16.0.tgz", + "integrity": "sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==", + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/text-extensions": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz", + "integrity": "sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==", + "license": "MIT", + "engines": { + "node": ">=0.10" + } + }, + "node_modules/through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", + "license": "MIT" + }, + "node_modules/through2": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz", + "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==", + "license": "MIT", + "dependencies": { + "readable-stream": "3" + } + }, + "node_modules/tmp": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz", + "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==", + "license": "MIT", + "engines": { + "node": ">=14.14" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "license": "MIT", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", + "license": "MIT" + }, + "node_modules/treeverse": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/treeverse/-/treeverse-3.0.0.tgz", + "integrity": "sha512-gcANaAnd2QDZFmHFEOF4k7uc1J/6a6z3DJMd/QwEyxLoKGiptJRwid582r7QIsFlFMIZ3SnxfS52S4hm2DHkuQ==", + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/trim-newlines": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", + "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/tsconfig-paths": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz", + "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==", + "license": "MIT", + "dependencies": { + "json5": "^2.2.2", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/tsconfig-paths/node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/tslib": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "license": "0BSD" + }, + "node_modules/tuf-js": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.7.tgz", + "integrity": "sha512-i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg==", + "license": "MIT", + "dependencies": { + "@tufjs/models": "1.0.4", + "debug": "^4.3.4", + "make-fetch-happen": "^11.1.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/tuf-js/node_modules/make-fetch-happen": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", + "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", + "license": "ISC", + "dependencies": { + "agentkeepalive": "^4.2.1", + "cacache": "^17.0.0", + "http-cache-semantics": "^4.1.1", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", + "is-lambda": "^1.0.1", + "lru-cache": "^7.7.1", + "minipass": "^5.0.0", + "minipass-fetch": "^3.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "promise-retry": "^2.0.1", + "socks-proxy-agent": "^7.0.0", + "ssri": "^10.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/tuf-js/node_modules/minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "license": "ISC", + "engines": { + "node": ">=8" + } + }, + "node_modules/tuf-js/node_modules/minipass-fetch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", + "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", + "license": "MIT", + "dependencies": { + "minipass": "^7.0.3", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" + } + }, + "node_modules/tuf-js/node_modules/minipass-fetch/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/tuf-js/node_modules/ssri": { + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", + "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", + "license": "ISC", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/tuf-js/node_modules/ssri/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/type-fest": { + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/typedarray": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", + "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==", + "license": "MIT" + }, + "node_modules/typescript": { + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, + "node_modules/uglify-js": { + "version": "3.19.3", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz", + "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==", + "license": "BSD-2-Clause", + "optional": true, + "bin": { + "uglifyjs": "bin/uglifyjs" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/unique-filename": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", + "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", + "license": "ISC", + "dependencies": { + "unique-slug": "^4.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/unique-slug": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", + "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/unique-string": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", + "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==", + "license": "MIT", + "dependencies": { + "crypto-random-string": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/universal-user-agent": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz", + "integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==", + "license": "ISC" + }, + "node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "license": "MIT", + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/upath": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/upath/-/upath-2.0.1.tgz", + "integrity": "sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==", + "license": "MIT", + "engines": { + "node": ">=4", + "yarn": "*" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "license": "MIT" + }, + "node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "license": "MIT", + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/v8-compile-cache": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", + "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", + "license": "MIT" + }, + "node_modules/validate-npm-package-license": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", + "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", + "license": "Apache-2.0", + "dependencies": { + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" + } + }, + "node_modules/validate-npm-package-name": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-4.0.0.tgz", + "integrity": "sha512-mzR0L8ZDktZjpX4OB46KT+56MAhl4EIazWP/+G/HPGuvfdaqg4YsCdtOm6U9+LOFyYDoh4dpnpxZRB9MQQns5Q==", + "license": "ISC", + "dependencies": { + "builtins": "^5.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/walk-up-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/walk-up-path/-/walk-up-path-1.0.0.tgz", + "integrity": "sha512-hwj/qMDUEjCU5h0xr90KGCf0tg0/LgJbmOWgrWKYlcJZM7XvquvUJZ0G/HMGr7F7OQMOUuPHWP9JpriinkAlkg==", + "license": "ISC" + }, + "node_modules/wcwidth": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", + "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", + "license": "MIT", + "dependencies": { + "defaults": "^1.0.3" + } + }, + "node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", + "license": "BSD-2-Clause" + }, + "node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "license": "MIT", + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, + "node_modules/which": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", + "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/which.js" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/wide-align": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", + "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", + "license": "ISC", + "dependencies": { + "string-width": "^1.0.2 || 2 || 3 || 4" + } + }, + "node_modules/wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==", + "license": "MIT" + }, + "node_modules/wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "license": "ISC" + }, + "node_modules/write-file-atomic": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz", + "integrity": "sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==", + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.7" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16" + } + }, + "node_modules/write-json-file": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/write-json-file/-/write-json-file-3.2.0.tgz", + "integrity": "sha512-3xZqT7Byc2uORAatYiP3DHUUAVEkNOswEWNs9H5KXiicRTvzYzYqKjYc4G7p+8pltvAw641lVByKVtMpf+4sYQ==", + "license": "MIT", + "dependencies": { + "detect-indent": "^5.0.0", + "graceful-fs": "^4.1.15", + "make-dir": "^2.1.0", + "pify": "^4.0.1", + "sort-keys": "^2.0.0", + "write-file-atomic": "^2.4.2" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/write-json-file/node_modules/make-dir": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", + "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", + "license": "MIT", + "dependencies": { + "pify": "^4.0.1", + "semver": "^5.6.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/write-json-file/node_modules/pify": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/write-json-file/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "license": "ISC", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/write-json-file/node_modules/write-file-atomic": { + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz", + "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==", + "license": "ISC", + "dependencies": { + "graceful-fs": "^4.1.11", + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.2" + } + }, + "node_modules/write-pkg": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/write-pkg/-/write-pkg-4.0.0.tgz", + "integrity": "sha512-v2UQ+50TNf2rNHJ8NyWttfm/EJUBWMJcx6ZTYZr6Qp52uuegWw/lBkCtCbnYZEmPRNL61m+u67dAmGxo+HTULA==", + "license": "MIT", + "dependencies": { + "sort-keys": "^2.0.0", + "type-fest": "^0.4.1", + "write-json-file": "^3.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/write-pkg/node_modules/type-fest": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.4.1.tgz", + "integrity": "sha512-IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw==", + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=6" + } + }, + "node_modules/xtend": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", + "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", + "license": "MIT", + "engines": { + "node": ">=0.4" + } + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "license": "ISC" + }, + "node_modules/yaml": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", + "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "license": "ISC", + "engines": { + "node": ">= 6" + } + }, + "node_modules/yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "license": "MIT", + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-parser": { + "version": "20.2.4", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", + "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + } + } +} diff --git a/pkgs/development/tools/lerna/package-lock.v8.json b/pkgs/development/tools/lerna/package-lock.v8.json new file mode 100644 index 000000000000..959d1acc6c59 --- /dev/null +++ b/pkgs/development/tools/lerna/package-lock.v8.json @@ -0,0 +1,6766 @@ +{ + "name": "lerna", + "version": "8.1.9", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "lerna", + "version": "8.1.9", + "license": "MIT", + "dependencies": { + "@lerna/create": "8.1.9", + "@npmcli/arborist": "7.5.4", + "@npmcli/package-json": "5.2.0", + "@npmcli/run-script": "8.1.0", + "@nx/devkit": ">=17.1.2 < 21", + "@octokit/plugin-enterprise-rest": "6.0.1", + "@octokit/rest": "19.0.11", + "aproba": "2.0.0", + "byte-size": "8.1.1", + "chalk": "4.1.0", + "clone-deep": "4.0.1", + "cmd-shim": "6.0.3", + "color-support": "1.1.3", + "columnify": "1.6.0", + "console-control-strings": "^1.1.0", + "conventional-changelog-angular": "7.0.0", + "conventional-changelog-core": "5.0.1", + "conventional-recommended-bump": "7.0.1", + "cosmiconfig": "9.0.0", + "dedent": "1.5.3", + "envinfo": "7.13.0", + "execa": "5.0.0", + "fs-extra": "^11.2.0", + "get-port": "5.1.1", + "get-stream": "6.0.0", + "git-url-parse": "14.0.0", + "glob-parent": "6.0.2", + "globby": "11.1.0", + "graceful-fs": "4.2.11", + "has-unicode": "2.0.1", + "import-local": "3.1.0", + "ini": "^1.3.8", + "init-package-json": "6.0.3", + "inquirer": "^8.2.4", + "is-ci": "3.0.1", + "is-stream": "2.0.0", + "jest-diff": ">=29.4.3 < 30", + "js-yaml": "4.1.0", + "libnpmaccess": "8.0.6", + "libnpmpublish": "9.0.9", + "load-json-file": "6.2.0", + "lodash": "^4.17.21", + "make-dir": "4.0.0", + "minimatch": "3.0.5", + "multimatch": "5.0.0", + "node-fetch": "2.6.7", + "npm-package-arg": "11.0.2", + "npm-packlist": "8.0.2", + "npm-registry-fetch": "^17.1.0", + "nx": ">=17.1.2 < 21", + "p-map": "4.0.0", + "p-map-series": "2.1.0", + "p-pipe": "3.1.0", + "p-queue": "6.6.2", + "p-reduce": "2.1.0", + "p-waterfall": "2.1.1", + "pacote": "^18.0.6", + "pify": "5.0.0", + "read-cmd-shim": "4.0.0", + "resolve-from": "5.0.0", + "rimraf": "^4.4.1", + "semver": "^7.3.8", + "set-blocking": "^2.0.0", + "signal-exit": "3.0.7", + "slash": "3.0.0", + "ssri": "^10.0.6", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", + "strong-log-transformer": "2.1.0", + "tar": "6.2.1", + "temp-dir": "1.0.0", + "typescript": ">=3 < 6", + "upath": "2.0.1", + "uuid": "^10.0.0", + "validate-npm-package-license": "3.0.4", + "validate-npm-package-name": "5.0.1", + "wide-align": "1.1.5", + "write-file-atomic": "5.0.1", + "write-pkg": "4.0.0", + "yargs": "17.7.2", + "yargs-parser": "21.1.1" + }, + "bin": { + "lerna": "dist/cli.js" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@babel/code-frame": { + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", + "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.25.9", + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", + "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@emnapi/core": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.3.1.tgz", + "integrity": "sha512-pVGjBIt1Y6gg3EJN8jTcfpP/+uuRksIo055oE/OBkDNcjZqVbfkWCksG1Jp4yZnj3iKWyWX8fdG/j6UDYPbFog==", + "license": "MIT", + "dependencies": { + "@emnapi/wasi-threads": "1.0.1", + "tslib": "^2.4.0" + } + }, + "node_modules/@emnapi/runtime": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.3.1.tgz", + "integrity": "sha512-kEBmG8KyqtxJZv+ygbEim+KCGtIq1fC22Ms3S4ziXmYKm8uyoLX0MHONVKwp+9opg390VaKRNt4a7A9NwmpNhw==", + "license": "MIT", + "dependencies": { + "tslib": "^2.4.0" + } + }, + "node_modules/@emnapi/wasi-threads": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.1.tgz", + "integrity": "sha512-iIBu7mwkq4UQGeMEM8bLwNK962nXdhodeScX4slfQnRhEMMzvYivHhutCIk8uojvmASXXPC2WNEjwxFWk72Oqw==", + "license": "MIT", + "dependencies": { + "tslib": "^2.4.0" + } + }, + "node_modules/@hutson/parse-repository-url": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz", + "integrity": "sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==", + "license": "Apache-2.0", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "license": "ISC", + "dependencies": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-regex": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "license": "MIT" + }, + "node_modules/@isaacs/cliui/node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "license": "MIT", + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@isaacs/cliui/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/@isaacs/string-locale-compare": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz", + "integrity": "sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ==", + "license": "ISC" + }, + "node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", + "license": "MIT", + "dependencies": { + "@sinclair/typebox": "^0.27.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@lerna/create": { + "version": "8.1.9", + "resolved": "https://registry.npmjs.org/@lerna/create/-/create-8.1.9.tgz", + "integrity": "sha512-DPnl5lPX4v49eVxEbJnAizrpMdMTBz1qykZrAbBul9rfgk531v8oAt+Pm6O/rpAleRombNM7FJb5rYGzBJatOQ==", + "license": "MIT", + "dependencies": { + "@npmcli/arborist": "7.5.4", + "@npmcli/package-json": "5.2.0", + "@npmcli/run-script": "8.1.0", + "@nx/devkit": ">=17.1.2 < 21", + "@octokit/plugin-enterprise-rest": "6.0.1", + "@octokit/rest": "19.0.11", + "aproba": "2.0.0", + "byte-size": "8.1.1", + "chalk": "4.1.0", + "clone-deep": "4.0.1", + "cmd-shim": "6.0.3", + "color-support": "1.1.3", + "columnify": "1.6.0", + "console-control-strings": "^1.1.0", + "conventional-changelog-core": "5.0.1", + "conventional-recommended-bump": "7.0.1", + "cosmiconfig": "9.0.0", + "dedent": "1.5.3", + "execa": "5.0.0", + "fs-extra": "^11.2.0", + "get-stream": "6.0.0", + "git-url-parse": "14.0.0", + "glob-parent": "6.0.2", + "globby": "11.1.0", + "graceful-fs": "4.2.11", + "has-unicode": "2.0.1", + "ini": "^1.3.8", + "init-package-json": "6.0.3", + "inquirer": "^8.2.4", + "is-ci": "3.0.1", + "is-stream": "2.0.0", + "js-yaml": "4.1.0", + "libnpmpublish": "9.0.9", + "load-json-file": "6.2.0", + "lodash": "^4.17.21", + "make-dir": "4.0.0", + "minimatch": "3.0.5", + "multimatch": "5.0.0", + "node-fetch": "2.6.7", + "npm-package-arg": "11.0.2", + "npm-packlist": "8.0.2", + "npm-registry-fetch": "^17.1.0", + "nx": ">=17.1.2 < 21", + "p-map": "4.0.0", + "p-map-series": "2.1.0", + "p-queue": "6.6.2", + "p-reduce": "^2.1.0", + "pacote": "^18.0.6", + "pify": "5.0.0", + "read-cmd-shim": "4.0.0", + "resolve-from": "5.0.0", + "rimraf": "^4.4.1", + "semver": "^7.3.4", + "set-blocking": "^2.0.0", + "signal-exit": "3.0.7", + "slash": "^3.0.0", + "ssri": "^10.0.6", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", + "strong-log-transformer": "2.1.0", + "tar": "6.2.1", + "temp-dir": "1.0.0", + "upath": "2.0.1", + "uuid": "^10.0.0", + "validate-npm-package-license": "^3.0.4", + "validate-npm-package-name": "5.0.1", + "wide-align": "1.1.5", + "write-file-atomic": "5.0.1", + "write-pkg": "4.0.0", + "yargs": "17.7.2", + "yargs-parser": "21.1.1" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@napi-rs/wasm-runtime": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.4.tgz", + "integrity": "sha512-9zESzOO5aDByvhIAsOy9TbpZ0Ur2AJbUI7UT73kcUTS2mxAMHOBaa1st/jAymNoCtvrit99kkzT1FZuXVcgfIQ==", + "license": "MIT", + "dependencies": { + "@emnapi/core": "^1.1.0", + "@emnapi/runtime": "^1.1.0", + "@tybys/wasm-util": "^0.9.0" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "license": "MIT", + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@npmcli/agent": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.2.tgz", + "integrity": "sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og==", + "license": "ISC", + "dependencies": { + "agent-base": "^7.1.0", + "http-proxy-agent": "^7.0.0", + "https-proxy-agent": "^7.0.1", + "lru-cache": "^10.0.1", + "socks-proxy-agent": "^8.0.3" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/arborist": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-7.5.4.tgz", + "integrity": "sha512-nWtIc6QwwoUORCRNzKx4ypHqCk3drI+5aeYdMTQQiRCcn4lOOgfQh7WyZobGYTxXPSq1VwV53lkpN/BRlRk08g==", + "license": "ISC", + "dependencies": { + "@isaacs/string-locale-compare": "^1.1.0", + "@npmcli/fs": "^3.1.1", + "@npmcli/installed-package-contents": "^2.1.0", + "@npmcli/map-workspaces": "^3.0.2", + "@npmcli/metavuln-calculator": "^7.1.1", + "@npmcli/name-from-folder": "^2.0.0", + "@npmcli/node-gyp": "^3.0.0", + "@npmcli/package-json": "^5.1.0", + "@npmcli/query": "^3.1.0", + "@npmcli/redact": "^2.0.0", + "@npmcli/run-script": "^8.1.0", + "bin-links": "^4.0.4", + "cacache": "^18.0.3", + "common-ancestor-path": "^1.0.1", + "hosted-git-info": "^7.0.2", + "json-parse-even-better-errors": "^3.0.2", + "json-stringify-nice": "^1.1.4", + "lru-cache": "^10.2.2", + "minimatch": "^9.0.4", + "nopt": "^7.2.1", + "npm-install-checks": "^6.2.0", + "npm-package-arg": "^11.0.2", + "npm-pick-manifest": "^9.0.1", + "npm-registry-fetch": "^17.0.1", + "pacote": "^18.0.6", + "parse-conflict-json": "^3.0.0", + "proc-log": "^4.2.0", + "proggy": "^2.0.0", + "promise-all-reject-late": "^1.0.0", + "promise-call-limit": "^3.0.1", + "read-package-json-fast": "^3.0.2", + "semver": "^7.3.7", + "ssri": "^10.0.6", + "treeverse": "^3.0.0", + "walk-up-path": "^3.0.1" + }, + "bin": { + "arborist": "bin/index.js" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/arborist/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/@npmcli/arborist/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@npmcli/fs": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz", + "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==", + "license": "ISC", + "dependencies": { + "semver": "^7.3.5" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/git": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-5.0.8.tgz", + "integrity": "sha512-liASfw5cqhjNW9UFd+ruwwdEf/lbOAQjLL2XY2dFW/bkJheXDYZgOyul/4gVvEV4BWkTXjYGmDqMw9uegdbJNQ==", + "license": "ISC", + "dependencies": { + "@npmcli/promise-spawn": "^7.0.0", + "ini": "^4.1.3", + "lru-cache": "^10.0.1", + "npm-pick-manifest": "^9.0.0", + "proc-log": "^4.0.0", + "promise-inflight": "^1.0.1", + "promise-retry": "^2.0.1", + "semver": "^7.3.5", + "which": "^4.0.0" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/git/node_modules/ini": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.3.tgz", + "integrity": "sha512-X7rqawQBvfdjS10YU1y1YVreA3SsLrW9dX2CewP2EbBJM4ypVNLDkO5y04gejPwKIY9lR+7r9gn3rFPt/kmWFg==", + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/installed-package-contents": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.1.0.tgz", + "integrity": "sha512-c8UuGLeZpm69BryRykLuKRyKFZYJsZSCT4aVY5ds4omyZqJ172ApzgfKJ5eV/r3HgLdUYgFVe54KSFVjKoe27w==", + "license": "ISC", + "dependencies": { + "npm-bundled": "^3.0.0", + "npm-normalize-package-bin": "^3.0.0" + }, + "bin": { + "installed-package-contents": "bin/index.js" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/map-workspaces": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-3.0.6.tgz", + "integrity": "sha512-tkYs0OYnzQm6iIRdfy+LcLBjcKuQCeE5YLb8KnrIlutJfheNaPvPpgoFEyEFgbjzl5PLZ3IA/BWAwRU0eHuQDA==", + "license": "ISC", + "dependencies": { + "@npmcli/name-from-folder": "^2.0.0", + "glob": "^10.2.2", + "minimatch": "^9.0.0", + "read-package-json-fast": "^3.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/map-workspaces/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/@npmcli/map-workspaces/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@npmcli/metavuln-calculator": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/@npmcli/metavuln-calculator/-/metavuln-calculator-7.1.1.tgz", + "integrity": "sha512-Nkxf96V0lAx3HCpVda7Vw4P23RILgdi/5K1fmj2tZkWIYLpXAN8k2UVVOsW16TsS5F8Ws2I7Cm+PU1/rsVF47g==", + "license": "ISC", + "dependencies": { + "cacache": "^18.0.0", + "json-parse-even-better-errors": "^3.0.0", + "pacote": "^18.0.0", + "proc-log": "^4.1.0", + "semver": "^7.3.5" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/name-from-folder": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/name-from-folder/-/name-from-folder-2.0.0.tgz", + "integrity": "sha512-pwK+BfEBZJbKdNYpHHRTNBwBoqrN/iIMO0AiGvYsp3Hoaq0WbgGSWQR6SCldZovoDpY3yje5lkFUe6gsDgJ2vg==", + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/node-gyp": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz", + "integrity": "sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==", + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/package-json": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-5.2.0.tgz", + "integrity": "sha512-qe/kiqqkW0AGtvBjL8TJKZk/eBBSpnJkUWvHdQ9jM2lKHXRYYJuyNpJPlJw3c8QjC2ow6NZYiLExhUaeJelbxQ==", + "license": "ISC", + "dependencies": { + "@npmcli/git": "^5.0.0", + "glob": "^10.2.2", + "hosted-git-info": "^7.0.0", + "json-parse-even-better-errors": "^3.0.0", + "normalize-package-data": "^6.0.0", + "proc-log": "^4.0.0", + "semver": "^7.5.3" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/promise-spawn": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-7.0.2.tgz", + "integrity": "sha512-xhfYPXoV5Dy4UkY0D+v2KkwvnDfiA/8Mt3sWCGI/hM03NsYIH8ZaG6QzS9x7pje5vHZBZJ2v6VRFVTWACnqcmQ==", + "license": "ISC", + "dependencies": { + "which": "^4.0.0" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/query": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@npmcli/query/-/query-3.1.0.tgz", + "integrity": "sha512-C/iR0tk7KSKGldibYIB9x8GtO/0Bd0I2mhOaDb8ucQL/bQVTmGoeREaFj64Z5+iCBRf3dQfed0CjJL7I8iTkiQ==", + "license": "ISC", + "dependencies": { + "postcss-selector-parser": "^6.0.10" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/redact": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@npmcli/redact/-/redact-2.0.1.tgz", + "integrity": "sha512-YgsR5jCQZhVmTJvjduTOIHph0L73pK8xwMVaDY0PatySqVM9AZj93jpoXYSJqfHFxFkN9dmqTw6OiqExsS3LPw==", + "license": "ISC", + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/@npmcli/run-script": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-8.1.0.tgz", + "integrity": "sha512-y7efHHwghQfk28G2z3tlZ67pLG0XdfYbcVG26r7YIXALRsrVQcTq4/tdenSmdOrEsNahIYA/eh8aEVROWGFUDg==", + "license": "ISC", + "dependencies": { + "@npmcli/node-gyp": "^3.0.0", + "@npmcli/package-json": "^5.0.0", + "@npmcli/promise-spawn": "^7.0.0", + "node-gyp": "^10.0.0", + "proc-log": "^4.0.0", + "which": "^4.0.0" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/@nx/devkit": { + "version": "20.4.2", + "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-20.4.2.tgz", + "integrity": "sha512-JD/7E/e49P7V9ESQK8b7uEzxgp1TP9Op163QmsJ6In0fpv3RytZSmAUx7lBdwOuOS6yybz8UWSLC/tyADUfDcg==", + "license": "MIT", + "dependencies": { + "ejs": "^3.1.7", + "enquirer": "~2.3.6", + "ignore": "^5.0.4", + "minimatch": "9.0.3", + "semver": "^7.5.3", + "tmp": "~0.2.1", + "tslib": "^2.3.0", + "yargs-parser": "21.1.1" + }, + "peerDependencies": { + "nx": ">= 19 <= 21" + } + }, + "node_modules/@nx/devkit/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/@nx/devkit/node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@nx/nx-darwin-arm64": { + "version": "20.4.2", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-20.4.2.tgz", + "integrity": "sha512-djXV3rZcDdps2TUo7bMNiB6IkxFlLIZfub5cxPhxSbnrKiMGqmISZNn9n0AmchpNNL6auRWZPAPtDfowtR5GqA==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-darwin-x64": { + "version": "20.4.2", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-20.4.2.tgz", + "integrity": "sha512-3PsiO4zEGgco/pSkYnHIB2j/IEnxsaoME+WdRYa8nRfewASAqCqf7e8DyOCftR7CBsXRosiUQWDcICu3cIfBgw==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-freebsd-x64": { + "version": "20.4.2", + "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-20.4.2.tgz", + "integrity": "sha512-FXaQqn67KDGF6b735GCjFVyWVFWYrVxftvmaM/V4pCmJXjhO3K9NV3jhPVj2MNmrpdYwUtfTP1JMpr/iUBYCQA==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-linux-arm-gnueabihf": { + "version": "20.4.2", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-20.4.2.tgz", + "integrity": "sha512-RcVr6VN7lWJybr0bjs2zaK9mQ0OMFmuILx/8IDniLjAQK8JB+1qQhHLgunAAUJtWv+o0sVb6WXlN/F7PTegmEA==", + "cpu": [ + "arm" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-linux-arm64-gnu": { + "version": "20.4.2", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-20.4.2.tgz", + "integrity": "sha512-Gt38hdU615g+pUAUHe5Z9ingLgpDKNumbJfqe6Y65N9XDHMGvi3YpUwFio2t/8DNZDYY7FH46CBYydDCJjDNyw==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-linux-arm64-musl": { + "version": "20.4.2", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-20.4.2.tgz", + "integrity": "sha512-Kp658KNoRfhi4a/1eoXrxxBiw2kkXqR745iuytVn1f/BL3L2tUHCp6+OyFF7sLx8TnlU9yZAxO62k4DPqS+Ffw==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-linux-x64-gnu": { + "version": "20.4.2", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-20.4.2.tgz", + "integrity": "sha512-v+qOF2tmFFPX3fYYCqcdLIgATqlaQcBSHDs8EbwZjdncWk6RQAI/hq6+06+oZQc71RnyhBq5zBE12P0Bj1qTbw==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-linux-x64-musl": { + "version": "20.4.2", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-20.4.2.tgz", + "integrity": "sha512-MxlAqNItkSyiVcB91pOpYWX2Mj6PL9+GzPa63TA0v4PcpZTsFmToYlbKno/1e2T6AKI/0R1ZkAo1XxurUc++nw==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-win32-arm64-msvc": { + "version": "20.4.2", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-20.4.2.tgz", + "integrity": "sha512-0FkvctI4lXFK0BEhQjM5If9RC0ja16oVjSacyLY893gBhbSI56Ud/XSA75uF6aplA4AvBe97NPQg5l5btJSxYw==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-win32-x64-msvc": { + "version": "20.4.2", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-20.4.2.tgz", + "integrity": "sha512-J7Nh/3hfdlbEXvvIYJI+tAnvupYaeDwSU8ZRlDV7VU5Ee9VLT3hDLhmtXcDjEZnFHNPyaIYgFZXXDppU3a04Xg==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@octokit/auth-token": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-3.0.4.tgz", + "integrity": "sha512-TWFX7cZF2LXoCvdmJWY7XVPi74aSY0+FfBZNSXEXFkMpjcqsQwDSYVv5FhRFaI0V1ECnwbz4j59T/G+rXNWaIQ==", + "license": "MIT", + "engines": { + "node": ">= 14" + } + }, + "node_modules/@octokit/core": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/@octokit/core/-/core-4.2.4.tgz", + "integrity": "sha512-rYKilwgzQ7/imScn3M9/pFfUf4I1AZEH3KhyJmtPdE2zfaXAn2mFfUy4FbKewzc2We5y/LlKLj36fWJLKC2SIQ==", + "license": "MIT", + "dependencies": { + "@octokit/auth-token": "^3.0.0", + "@octokit/graphql": "^5.0.0", + "@octokit/request": "^6.0.0", + "@octokit/request-error": "^3.0.0", + "@octokit/types": "^9.0.0", + "before-after-hook": "^2.2.0", + "universal-user-agent": "^6.0.0" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/@octokit/endpoint": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-7.0.6.tgz", + "integrity": "sha512-5L4fseVRUsDFGR00tMWD/Trdeeihn999rTMGRMC1G/Ldi1uWlWJzI98H4Iak5DB/RVvQuyMYKqSK/R6mbSOQyg==", + "license": "MIT", + "dependencies": { + "@octokit/types": "^9.0.0", + "is-plain-object": "^5.0.0", + "universal-user-agent": "^6.0.0" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/@octokit/graphql": { + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-5.0.6.tgz", + "integrity": "sha512-Fxyxdy/JH0MnIB5h+UQ3yCoh1FG4kWXfFKkpWqjZHw/p+Kc8Y44Hu/kCgNBT6nU1shNumEchmW/sUO1JuQnPcw==", + "license": "MIT", + "dependencies": { + "@octokit/request": "^6.0.0", + "@octokit/types": "^9.0.0", + "universal-user-agent": "^6.0.0" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/@octokit/openapi-types": { + "version": "18.1.1", + "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-18.1.1.tgz", + "integrity": "sha512-VRaeH8nCDtF5aXWnjPuEMIYf1itK/s3JYyJcWFJT8X9pSNnBtriDf7wlEWsGuhPLl4QIH4xM8fqTXDwJ3Mu6sw==", + "license": "MIT" + }, + "node_modules/@octokit/plugin-enterprise-rest": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-6.0.1.tgz", + "integrity": "sha512-93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw==", + "license": "MIT" + }, + "node_modules/@octokit/plugin-paginate-rest": { + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-6.1.2.tgz", + "integrity": "sha512-qhrmtQeHU/IivxucOV1bbI/xZyC/iOBhclokv7Sut5vnejAIAEXVcGQeRpQlU39E0WwK9lNvJHphHri/DB6lbQ==", + "license": "MIT", + "dependencies": { + "@octokit/tsconfig": "^1.0.2", + "@octokit/types": "^9.2.3" + }, + "engines": { + "node": ">= 14" + }, + "peerDependencies": { + "@octokit/core": ">=4" + } + }, + "node_modules/@octokit/plugin-request-log": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz", + "integrity": "sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==", + "license": "MIT", + "peerDependencies": { + "@octokit/core": ">=3" + } + }, + "node_modules/@octokit/plugin-rest-endpoint-methods": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-7.2.3.tgz", + "integrity": "sha512-I5Gml6kTAkzVlN7KCtjOM+Ruwe/rQppp0QU372K1GP7kNOYEKe8Xn5BW4sE62JAHdwpq95OQK/qGNyKQMUzVgA==", + "license": "MIT", + "dependencies": { + "@octokit/types": "^10.0.0" + }, + "engines": { + "node": ">= 14" + }, + "peerDependencies": { + "@octokit/core": ">=3" + } + }, + "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-10.0.0.tgz", + "integrity": "sha512-Vm8IddVmhCgU1fxC1eyinpwqzXPEYu0NrYzD3YZjlGjyftdLBTeqNblRC0jmJmgxbJIsQlyogVeGnrNaaMVzIg==", + "license": "MIT", + "dependencies": { + "@octokit/openapi-types": "^18.0.0" + } + }, + "node_modules/@octokit/request": { + "version": "6.2.8", + "resolved": "https://registry.npmjs.org/@octokit/request/-/request-6.2.8.tgz", + "integrity": "sha512-ow4+pkVQ+6XVVsekSYBzJC0VTVvh/FCTUUgTsboGq+DTeWdyIFV8WSCdo0RIxk6wSkBTHqIK1mYuY7nOBXOchw==", + "license": "MIT", + "dependencies": { + "@octokit/endpoint": "^7.0.0", + "@octokit/request-error": "^3.0.0", + "@octokit/types": "^9.0.0", + "is-plain-object": "^5.0.0", + "node-fetch": "^2.6.7", + "universal-user-agent": "^6.0.0" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/@octokit/request-error": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-3.0.3.tgz", + "integrity": "sha512-crqw3V5Iy2uOU5Np+8M/YexTlT8zxCfI+qu+LxUB7SZpje4Qmx3mub5DfEKSO8Ylyk0aogi6TYdf6kxzh2BguQ==", + "license": "MIT", + "dependencies": { + "@octokit/types": "^9.0.0", + "deprecation": "^2.0.0", + "once": "^1.4.0" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/@octokit/rest": { + "version": "19.0.11", + "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-19.0.11.tgz", + "integrity": "sha512-m2a9VhaP5/tUw8FwfnW2ICXlXpLPIqxtg3XcAiGMLj/Xhw3RSBfZ8le/466ktO1Gcjr8oXudGnHhxV1TXJgFxw==", + "license": "MIT", + "dependencies": { + "@octokit/core": "^4.2.1", + "@octokit/plugin-paginate-rest": "^6.1.2", + "@octokit/plugin-request-log": "^1.0.4", + "@octokit/plugin-rest-endpoint-methods": "^7.1.2" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/@octokit/tsconfig": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@octokit/tsconfig/-/tsconfig-1.0.2.tgz", + "integrity": "sha512-I0vDR0rdtP8p2lGMzvsJzbhdOWy405HcGovrspJ8RRibHnyRgggUSNO5AIox5LmqiwmatHKYsvj6VGFHkqS7lA==", + "license": "MIT" + }, + "node_modules/@octokit/types": { + "version": "9.3.2", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-9.3.2.tgz", + "integrity": "sha512-D4iHGTdAnEEVsB8fl95m1hiz7D5YiRdQ9b/OEb3BYRVwbLsGHcRVPz+u+BgRLNk0Q0/4iZCBqDN96j2XNxfXrA==", + "license": "MIT", + "dependencies": { + "@octokit/openapi-types": "^18.0.0" + } + }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "license": "MIT", + "optional": true, + "engines": { + "node": ">=14" + } + }, + "node_modules/@sigstore/bundle": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-2.3.2.tgz", + "integrity": "sha512-wueKWDk70QixNLB363yHc2D2ItTgYiMTdPwK8D9dKQMR3ZQ0c35IxP5xnwQ8cNLoCgCRcHf14kE+CLIvNX1zmA==", + "license": "Apache-2.0", + "dependencies": { + "@sigstore/protobuf-specs": "^0.3.2" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/@sigstore/core": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-1.1.0.tgz", + "integrity": "sha512-JzBqdVIyqm2FRQCulY6nbQzMpJJpSiJ8XXWMhtOX9eKgaXXpfNOF53lzQEjIydlStnd/eFtuC1dW4VYdD93oRg==", + "license": "Apache-2.0", + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/@sigstore/protobuf-specs": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.3.3.tgz", + "integrity": "sha512-RpacQhBlwpBWd7KEJsRKcBQalbV28fvkxwTOJIqhIuDysMMaJW47V4OqW30iJB9uRpqOSxxEAQFdr8tTattReQ==", + "license": "Apache-2.0", + "engines": { + "node": "^18.17.0 || >=20.5.0" + } + }, + "node_modules/@sigstore/sign": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-2.3.2.tgz", + "integrity": "sha512-5Vz5dPVuunIIvC5vBb0APwo7qKA4G9yM48kPWJT+OEERs40md5GoUR1yedwpekWZ4m0Hhw44m6zU+ObsON+iDA==", + "license": "Apache-2.0", + "dependencies": { + "@sigstore/bundle": "^2.3.2", + "@sigstore/core": "^1.0.0", + "@sigstore/protobuf-specs": "^0.3.2", + "make-fetch-happen": "^13.0.1", + "proc-log": "^4.2.0", + "promise-retry": "^2.0.1" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/@sigstore/tuf": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-2.3.4.tgz", + "integrity": "sha512-44vtsveTPUpqhm9NCrbU8CWLe3Vck2HO1PNLw7RIajbB7xhtn5RBPm1VNSCMwqGYHhDsBJG8gDF0q4lgydsJvw==", + "license": "Apache-2.0", + "dependencies": { + "@sigstore/protobuf-specs": "^0.3.2", + "tuf-js": "^2.2.1" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/@sigstore/verify": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-1.2.1.tgz", + "integrity": "sha512-8iKx79/F73DKbGfRf7+t4dqrc0bRr0thdPrxAtCKWRm/F0tG71i6O1rvlnScncJLLBZHn3h8M3c1BSUAb9yu8g==", + "license": "Apache-2.0", + "dependencies": { + "@sigstore/bundle": "^2.3.2", + "@sigstore/core": "^1.1.0", + "@sigstore/protobuf-specs": "^0.3.2" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "license": "MIT" + }, + "node_modules/@tufjs/canonical-json": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-2.0.0.tgz", + "integrity": "sha512-yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA==", + "license": "MIT", + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/@tufjs/models": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-2.0.1.tgz", + "integrity": "sha512-92F7/SFyufn4DXsha9+QfKnN03JGqtMFMXgSHbZOo8JG59WkTni7UzAouNQDf7AuP9OAMxVOPQcqG3sB7w+kkg==", + "license": "MIT", + "dependencies": { + "@tufjs/canonical-json": "2.0.0", + "minimatch": "^9.0.4" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/@tufjs/models/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/@tufjs/models/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@tybys/wasm-util": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.9.0.tgz", + "integrity": "sha512-6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw==", + "license": "MIT", + "dependencies": { + "tslib": "^2.4.0" + } + }, + "node_modules/@types/minimatch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", + "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==", + "license": "MIT" + }, + "node_modules/@types/minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==", + "license": "MIT" + }, + "node_modules/@types/normalize-package-data": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz", + "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==", + "license": "MIT" + }, + "node_modules/@yarnpkg/lockfile": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", + "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==", + "license": "BSD-2-Clause" + }, + "node_modules/@yarnpkg/parsers": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.2.tgz", + "integrity": "sha512-/HcYgtUSiJiot/XWGLOlGxPYUG65+/31V8oqk17vZLW1xlCoR4PampyePljOxY2n8/3jz9+tIFzICsyGujJZoA==", + "license": "BSD-2-Clause", + "dependencies": { + "js-yaml": "^3.10.0", + "tslib": "^2.4.0" + }, + "engines": { + "node": ">=18.12.0" + } + }, + "node_modules/@yarnpkg/parsers/node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "license": "MIT", + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/@yarnpkg/parsers/node_modules/js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "license": "MIT", + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/@yarnpkg/parsers/node_modules/sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", + "license": "BSD-3-Clause" + }, + "node_modules/@zkochan/js-yaml": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/@zkochan/js-yaml/-/js-yaml-0.0.7.tgz", + "integrity": "sha512-nrUSn7hzt7J6JWgWGz78ZYI8wj+gdIJdk0Ynjpp8l+trkn58Uqsf6RYrYkEK+3X18EX+TNdtJI0WxAtc+L84SQ==", + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/abbrev": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", + "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/add-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz", + "integrity": "sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ==", + "license": "MIT" + }, + "node_modules/agent-base": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz", + "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==", + "license": "MIT", + "engines": { + "node": ">= 14" + } + }, + "node_modules/aggregate-error": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", + "license": "MIT", + "dependencies": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-colors": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", + "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/ansi-escapes": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", + "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", + "license": "MIT", + "dependencies": { + "type-fest": "^0.21.3" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/aproba": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", + "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==", + "license": "ISC" + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "license": "Python-2.0" + }, + "node_modules/array-differ": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz", + "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/array-ify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz", + "integrity": "sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng==", + "license": "MIT" + }, + "node_modules/array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/arrify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/async": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", + "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==", + "license": "MIT" + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "license": "MIT" + }, + "node_modules/axios": { + "version": "1.7.9", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz", + "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==", + "license": "MIT", + "dependencies": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "license": "MIT" + }, + "node_modules/base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/before-after-hook": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz", + "integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==", + "license": "Apache-2.0" + }, + "node_modules/bin-links": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/bin-links/-/bin-links-4.0.4.tgz", + "integrity": "sha512-cMtq4W5ZsEwcutJrVId+a/tjt8GSbS+h0oNkdl6+6rBuEv8Ot33Bevj5KPm40t309zuhVic8NjpuL42QCiJWWA==", + "license": "ISC", + "dependencies": { + "cmd-shim": "^6.0.0", + "npm-normalize-package-bin": "^3.0.0", + "read-cmd-shim": "^4.0.0", + "write-file-atomic": "^5.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/bl": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "license": "MIT", + "dependencies": { + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "license": "MIT", + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "license": "MIT" + }, + "node_modules/byte-size": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/byte-size/-/byte-size-8.1.1.tgz", + "integrity": "sha512-tUkzZWK0M/qdoLEqikxBWe4kumyuwjl3HO6zHTr4yEI23EojPtLYXdG1+AQY7MN0cGyNDvEaJ8wiYQm6P2bPxg==", + "license": "MIT", + "engines": { + "node": ">=12.17" + } + }, + "node_modules/cacache": { + "version": "18.0.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz", + "integrity": "sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ==", + "license": "ISC", + "dependencies": { + "@npmcli/fs": "^3.1.0", + "fs-minipass": "^3.0.0", + "glob": "^10.2.2", + "lru-cache": "^10.0.1", + "minipass": "^7.0.3", + "minipass-collect": "^2.0.1", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "p-map": "^4.0.0", + "ssri": "^10.0.0", + "tar": "^6.1.11", + "unique-filename": "^3.0.0" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/camelcase-keys": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz", + "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==", + "license": "MIT", + "dependencies": { + "camelcase": "^5.3.1", + "map-obj": "^4.0.0", + "quick-lru": "^4.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/chardet": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", + "license": "MIT" + }, + "node_modules/chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/cli-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "license": "MIT", + "dependencies": { + "restore-cursor": "^3.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cli-spinners": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz", + "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==", + "license": "MIT", + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/cli-width": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", + "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", + "license": "ISC", + "engines": { + "node": ">= 10" + } + }, + "node_modules/cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/cliui/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/clone": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", + "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", + "license": "MIT", + "engines": { + "node": ">=0.8" + } + }, + "node_modules/clone-deep": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", + "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", + "license": "MIT", + "dependencies": { + "is-plain-object": "^2.0.4", + "kind-of": "^6.0.2", + "shallow-clone": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/clone-deep/node_modules/is-plain-object": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "license": "MIT", + "dependencies": { + "isobject": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/cmd-shim": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-6.0.3.tgz", + "integrity": "sha512-FMabTRlc5t5zjdenF6mS0MBeFZm0XqHqeOkcskKFb/LYCcRQ5fVgLOHVc4Lq9CqABd9zhjwPjMBCJvMCziSVtA==", + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "license": "MIT" + }, + "node_modules/color-support": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", + "license": "ISC", + "bin": { + "color-support": "bin.js" + } + }, + "node_modules/columnify": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/columnify/-/columnify-1.6.0.tgz", + "integrity": "sha512-lomjuFZKfM6MSAnV9aCZC9sc0qGbmZdfygNv+nCpqVkSKdCxCklLtd16O0EILGkImHw9ZpHkAnHaB+8Zxq5W6Q==", + "license": "MIT", + "dependencies": { + "strip-ansi": "^6.0.1", + "wcwidth": "^1.0.0" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "license": "MIT", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/common-ancestor-path": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz", + "integrity": "sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w==", + "license": "ISC" + }, + "node_modules/compare-func": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-2.0.0.tgz", + "integrity": "sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==", + "license": "MIT", + "dependencies": { + "array-ify": "^1.0.0", + "dot-prop": "^5.1.0" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "license": "MIT" + }, + "node_modules/concat-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz", + "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==", + "engines": [ + "node >= 6.0" + ], + "license": "MIT", + "dependencies": { + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.0.2", + "typedarray": "^0.0.6" + } + }, + "node_modules/console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==", + "license": "ISC" + }, + "node_modules/conventional-changelog-angular": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-7.0.0.tgz", + "integrity": "sha512-ROjNchA9LgfNMTTFSIWPzebCwOGFdgkEq45EnvvrmSLvCtAw0HSmrCs7/ty+wAeYUZyNay0YMUNYFTRL72PkBQ==", + "license": "ISC", + "dependencies": { + "compare-func": "^2.0.0" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/conventional-changelog-core": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-5.0.1.tgz", + "integrity": "sha512-Rvi5pH+LvgsqGwZPZ3Cq/tz4ty7mjijhr3qR4m9IBXNbxGGYgTVVO+duXzz9aArmHxFtwZ+LRkrNIMDQzgoY4A==", + "license": "MIT", + "dependencies": { + "add-stream": "^1.0.0", + "conventional-changelog-writer": "^6.0.0", + "conventional-commits-parser": "^4.0.0", + "dateformat": "^3.0.3", + "get-pkg-repo": "^4.2.1", + "git-raw-commits": "^3.0.0", + "git-remote-origin-url": "^2.0.0", + "git-semver-tags": "^5.0.0", + "normalize-package-data": "^3.0.3", + "read-pkg": "^3.0.0", + "read-pkg-up": "^3.0.0" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/conventional-changelog-core/node_modules/hosted-git-info": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", + "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", + "license": "ISC", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/conventional-changelog-core/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/conventional-changelog-core/node_modules/normalize-package-data": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz", + "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==", + "license": "BSD-2-Clause", + "dependencies": { + "hosted-git-info": "^4.0.1", + "is-core-module": "^2.5.0", + "semver": "^7.3.4", + "validate-npm-package-license": "^3.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/conventional-changelog-preset-loader": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-3.0.0.tgz", + "integrity": "sha512-qy9XbdSLmVnwnvzEisjxdDiLA4OmV3o8db+Zdg4WiFw14fP3B6XNz98X0swPPpkTd/pc1K7+adKgEDM1JCUMiA==", + "license": "MIT", + "engines": { + "node": ">=14" + } + }, + "node_modules/conventional-changelog-writer": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-6.0.1.tgz", + "integrity": "sha512-359t9aHorPw+U+nHzUXHS5ZnPBOizRxfQsWT5ZDHBfvfxQOAik+yfuhKXG66CN5LEWPpMNnIMHUTCKeYNprvHQ==", + "license": "MIT", + "dependencies": { + "conventional-commits-filter": "^3.0.0", + "dateformat": "^3.0.3", + "handlebars": "^4.7.7", + "json-stringify-safe": "^5.0.1", + "meow": "^8.1.2", + "semver": "^7.0.0", + "split": "^1.0.1" + }, + "bin": { + "conventional-changelog-writer": "cli.js" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/conventional-commits-filter": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-3.0.0.tgz", + "integrity": "sha512-1ymej8b5LouPx9Ox0Dw/qAO2dVdfpRFq28e5Y0jJEU8ZrLdy0vOSkkIInwmxErFGhg6SALro60ZrwYFVTUDo4Q==", + "license": "MIT", + "dependencies": { + "lodash.ismatch": "^4.4.0", + "modify-values": "^1.0.1" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/conventional-commits-parser": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-4.0.0.tgz", + "integrity": "sha512-WRv5j1FsVM5FISJkoYMR6tPk07fkKT0UodruX4je86V4owk451yjXAKzKAPOs9l7y59E2viHUS9eQ+dfUA9NSg==", + "license": "MIT", + "dependencies": { + "is-text-path": "^1.0.1", + "JSONStream": "^1.3.5", + "meow": "^8.1.2", + "split2": "^3.2.2" + }, + "bin": { + "conventional-commits-parser": "cli.js" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/conventional-recommended-bump": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-7.0.1.tgz", + "integrity": "sha512-Ft79FF4SlOFvX4PkwFDRnaNiIVX7YbmqGU0RwccUaiGvgp3S0a8ipR2/Qxk31vclDNM+GSdJOVs2KrsUCjblVA==", + "license": "MIT", + "dependencies": { + "concat-stream": "^2.0.0", + "conventional-changelog-preset-loader": "^3.0.0", + "conventional-commits-filter": "^3.0.0", + "conventional-commits-parser": "^4.0.0", + "git-raw-commits": "^3.0.0", + "git-semver-tags": "^5.0.0", + "meow": "^8.1.2" + }, + "bin": { + "conventional-recommended-bump": "cli.js" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/core-util-is": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", + "license": "MIT" + }, + "node_modules/cosmiconfig": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz", + "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==", + "license": "MIT", + "dependencies": { + "env-paths": "^2.2.1", + "import-fresh": "^3.3.0", + "js-yaml": "^4.1.0", + "parse-json": "^5.2.0" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/d-fischer" + }, + "peerDependencies": { + "typescript": ">=4.9.5" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/cross-spawn": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/cross-spawn/node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "license": "ISC" + }, + "node_modules/cross-spawn/node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/cssesc": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", + "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", + "license": "MIT", + "bin": { + "cssesc": "bin/cssesc" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/dargs": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz", + "integrity": "sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/dateformat": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz", + "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==", + "license": "MIT", + "engines": { + "node": "*" + } + }, + "node_modules/debug": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/decamelize-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz", + "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==", + "license": "MIT", + "dependencies": { + "decamelize": "^1.1.0", + "map-obj": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/decamelize-keys/node_modules/map-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", + "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/dedent": { + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz", + "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==", + "license": "MIT", + "peerDependencies": { + "babel-plugin-macros": "^3.1.0" + }, + "peerDependenciesMeta": { + "babel-plugin-macros": { + "optional": true + } + } + }, + "node_modules/defaults": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", + "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==", + "license": "MIT", + "dependencies": { + "clone": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/define-lazy-prop": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", + "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "license": "MIT", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/deprecation": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz", + "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==", + "license": "ISC" + }, + "node_modules/detect-indent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz", + "integrity": "sha512-rlpvsxUtM0PQvy9iZe640/IWwWYyBsTApREbA1pHOpmOUIl9MkP/U4z7vTtg4Oaojvqhxt7sdufnT0EzGaR31g==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/diff-sequences": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", + "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", + "license": "MIT", + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "license": "MIT", + "dependencies": { + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/dot-prop": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", + "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", + "license": "MIT", + "dependencies": { + "is-obj": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/dotenv": { + "version": "16.4.7", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz", + "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" + } + }, + "node_modules/dotenv-expand": { + "version": "11.0.7", + "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-11.0.7.tgz", + "integrity": "sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA==", + "license": "BSD-2-Clause", + "dependencies": { + "dotenv": "^16.4.5" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" + } + }, + "node_modules/duplexer": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", + "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==", + "license": "MIT" + }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "license": "MIT" + }, + "node_modules/ejs": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz", + "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==", + "license": "Apache-2.0", + "dependencies": { + "jake": "^10.8.5" + }, + "bin": { + "ejs": "bin/cli.js" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "license": "MIT" + }, + "node_modules/encoding": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", + "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", + "license": "MIT", + "optional": true, + "dependencies": { + "iconv-lite": "^0.6.2" + } + }, + "node_modules/encoding/node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "license": "MIT", + "optional": true, + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "license": "MIT", + "dependencies": { + "once": "^1.4.0" + } + }, + "node_modules/enquirer": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", + "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", + "license": "MIT", + "dependencies": { + "ansi-colors": "^4.1.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/env-paths": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/envinfo": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.13.0.tgz", + "integrity": "sha512-cvcaMr7KqXVh4nyzGTVqTum+gAiL265x5jUWQIDLq//zOGbW+gSW/C+OWLleY/rs9Qole6AZLMXPbtIFQbqu+Q==", + "license": "MIT", + "bin": { + "envinfo": "dist/cli.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/err-code": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", + "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", + "license": "MIT" + }, + "node_modules/error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "license": "MIT", + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, + "node_modules/escalade": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "license": "MIT", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "license": "BSD-2-Clause", + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/eventemitter3": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", + "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", + "license": "MIT" + }, + "node_modules/execa": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz", + "integrity": "sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==", + "license": "MIT", + "dependencies": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/exponential-backoff": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.2.tgz", + "integrity": "sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA==", + "license": "Apache-2.0" + }, + "node_modules/external-editor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", + "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", + "license": "MIT", + "dependencies": { + "chardet": "^0.7.0", + "iconv-lite": "^0.4.24", + "tmp": "^0.0.33" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/external-editor/node_modules/tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "license": "MIT", + "dependencies": { + "os-tmpdir": "~1.0.2" + }, + "engines": { + "node": ">=0.6.0" + } + }, + "node_modules/fast-glob": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", + "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==", + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.8" + }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/fast-glob/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/fastq": { + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.0.tgz", + "integrity": "sha512-7SFSRCNjBQIZH/xZR3iy5iQYR8aGBE0h3VG6/cwlbrpdciNYBMotQav8c1XI3HjHH+NikUpP53nPdlZSdWmFzA==", + "license": "ISC", + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/figures": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", + "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", + "license": "MIT", + "dependencies": { + "escape-string-regexp": "^1.0.5" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/filelist": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", + "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", + "license": "Apache-2.0", + "dependencies": { + "minimatch": "^5.0.1" + } + }, + "node_modules/filelist/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/filelist/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "license": "MIT", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "license": "MIT", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/flat": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "license": "BSD-3-Clause", + "bin": { + "flat": "cli.js" + } + }, + "node_modules/follow-redirects": { + "version": "1.15.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", + "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "license": "MIT", + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, + "node_modules/foreground-child": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz", + "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==", + "license": "ISC", + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/foreground-child/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "license": "ISC", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/form-data": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz", + "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==", + "license": "MIT", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/front-matter": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/front-matter/-/front-matter-4.0.2.tgz", + "integrity": "sha512-I8ZuJ/qG92NWX8i5x1Y8qyj3vizhXS31OxjKDu3LKP+7/qBgfIKValiZIEwoVoJKUHlhWtYrktkxV1XsX+pPlg==", + "license": "MIT", + "dependencies": { + "js-yaml": "^3.13.1" + } + }, + "node_modules/front-matter/node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "license": "MIT", + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/front-matter/node_modules/js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "license": "MIT", + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/front-matter/node_modules/sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", + "license": "BSD-3-Clause" + }, + "node_modules/fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "license": "MIT" + }, + "node_modules/fs-extra": { + "version": "11.3.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz", + "integrity": "sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==", + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=14.14" + } + }, + "node_modules/fs-minipass": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", + "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", + "license": "ISC", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "license": "ISC" + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "license": "ISC", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-pkg-repo": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-4.2.1.tgz", + "integrity": "sha512-2+QbHjFRfGB74v/pYWjd5OhU3TDIC2Gv/YKUTk/tCvAz0pkn/Mz6P3uByuBimLOcPvN2jYdScl3xGFSrx0jEcA==", + "license": "MIT", + "dependencies": { + "@hutson/parse-repository-url": "^3.0.0", + "hosted-git-info": "^4.0.0", + "through2": "^2.0.0", + "yargs": "^16.2.0" + }, + "bin": { + "get-pkg-repo": "src/cli.js" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/get-pkg-repo/node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "node_modules/get-pkg-repo/node_modules/hosted-git-info": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", + "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", + "license": "ISC", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/get-pkg-repo/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/get-pkg-repo/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/get-pkg-repo/node_modules/yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "license": "MIT", + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/get-pkg-repo/node_modules/yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/get-port": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz", + "integrity": "sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==", + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/get-stream": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz", + "integrity": "sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg==", + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/git-raw-commits": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-3.0.0.tgz", + "integrity": "sha512-b5OHmZ3vAgGrDn/X0kS+9qCfNKWe4K/jFnhwzVWWg0/k5eLa3060tZShrRg8Dja5kPc+YjS0Gc6y7cRr44Lpjw==", + "license": "MIT", + "dependencies": { + "dargs": "^7.0.0", + "meow": "^8.1.2", + "split2": "^3.2.2" + }, + "bin": { + "git-raw-commits": "cli.js" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/git-remote-origin-url": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz", + "integrity": "sha512-eU+GGrZgccNJcsDH5LkXR3PB9M958hxc7sbA8DFJjrv9j4L2P/eZfKhM+QD6wyzpiv+b1BpK0XrYCxkovtjSLw==", + "license": "MIT", + "dependencies": { + "gitconfiglocal": "^1.0.0", + "pify": "^2.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/git-remote-origin-url/node_modules/pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/git-semver-tags": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-5.0.1.tgz", + "integrity": "sha512-hIvOeZwRbQ+7YEUmCkHqo8FOLQZCEn18yevLHADlFPZY02KJGsu5FZt9YW/lybfK2uhWFI7Qg/07LekJiTv7iA==", + "license": "MIT", + "dependencies": { + "meow": "^8.1.2", + "semver": "^7.0.0" + }, + "bin": { + "git-semver-tags": "cli.js" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/git-up": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/git-up/-/git-up-7.0.0.tgz", + "integrity": "sha512-ONdIrbBCFusq1Oy0sC71F5azx8bVkvtZtMJAsv+a6lz5YAmbNnLD6HAB4gptHZVLPR8S2/kVN6Gab7lryq5+lQ==", + "license": "MIT", + "dependencies": { + "is-ssh": "^1.4.0", + "parse-url": "^8.1.0" + } + }, + "node_modules/git-url-parse": { + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/git-url-parse/-/git-url-parse-14.0.0.tgz", + "integrity": "sha512-NnLweV+2A4nCvn4U/m2AoYu0pPKlsmhK9cknG7IMwsjFY1S2jxM+mAhsDxyxfCIGfGaD+dozsyX4b6vkYc83yQ==", + "license": "MIT", + "dependencies": { + "git-up": "^7.0.0" + } + }, + "node_modules/gitconfiglocal": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz", + "integrity": "sha512-spLUXeTAVHxDtKsJc8FkFVgFtMdEN9qPGpL23VfSHx4fP4+Ds097IXLvymbnDH8FnmxX5Nr9bPw3A+AQ6mWEaQ==", + "license": "BSD", + "dependencies": { + "ini": "^1.3.2" + } + }, + "node_modules/glob": { + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "license": "ISC", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/glob/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/glob/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/globby": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "license": "MIT", + "dependencies": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "license": "ISC" + }, + "node_modules/handlebars": { + "version": "4.7.8", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", + "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==", + "license": "MIT", + "dependencies": { + "minimist": "^1.2.5", + "neo-async": "^2.6.2", + "source-map": "^0.6.1", + "wordwrap": "^1.0.0" + }, + "bin": { + "handlebars": "bin/handlebars" + }, + "engines": { + "node": ">=0.4.7" + }, + "optionalDependencies": { + "uglify-js": "^3.1.4" + } + }, + "node_modules/hard-rejection": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz", + "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", + "license": "ISC" + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/hosted-git-info": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz", + "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==", + "license": "ISC", + "dependencies": { + "lru-cache": "^10.0.1" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/http-cache-semantics": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", + "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==", + "license": "BSD-2-Clause" + }, + "node_modules/http-proxy-agent": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", + "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", + "license": "MIT", + "dependencies": { + "agent-base": "^7.1.0", + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/https-proxy-agent": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", + "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==", + "license": "MIT", + "dependencies": { + "agent-base": "^7.1.2", + "debug": "4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/human-signals": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "license": "Apache-2.0", + "engines": { + "node": ">=10.17.0" + } + }, + "node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "BSD-3-Clause" + }, + "node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/ignore-walk": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.5.tgz", + "integrity": "sha512-VuuG0wCnjhnylG1ABXT3dAuIpTNDs/G8jlpmwXY03fXoXy/8ZK8/T+hMzt8L4WnrLCJgdybqgPagnF/f97cg3A==", + "license": "ISC", + "dependencies": { + "minimatch": "^9.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/ignore-walk/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/ignore-walk/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/import-fresh": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", + "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", + "license": "MIT", + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/import-fresh/node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/import-local": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", + "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==", + "license": "MIT", + "dependencies": { + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" + }, + "bin": { + "import-local-fixture": "fixtures/cli.js" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "license": "MIT", + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "license": "ISC" + }, + "node_modules/ini": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", + "license": "ISC" + }, + "node_modules/init-package-json": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-6.0.3.tgz", + "integrity": "sha512-Zfeb5ol+H+eqJWHTaGca9BovufyGeIfr4zaaBorPmJBMrJ+KBnN+kQx2ZtXdsotUTgldHmHQV44xvUWOUA7E2w==", + "license": "ISC", + "dependencies": { + "@npmcli/package-json": "^5.0.0", + "npm-package-arg": "^11.0.0", + "promzard": "^1.0.0", + "read": "^3.0.1", + "semver": "^7.3.5", + "validate-npm-package-license": "^3.0.4", + "validate-npm-package-name": "^5.0.0" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/inquirer": { + "version": "8.2.6", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.6.tgz", + "integrity": "sha512-M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg==", + "license": "MIT", + "dependencies": { + "ansi-escapes": "^4.2.1", + "chalk": "^4.1.1", + "cli-cursor": "^3.1.0", + "cli-width": "^3.0.0", + "external-editor": "^3.0.3", + "figures": "^3.0.0", + "lodash": "^4.17.21", + "mute-stream": "0.0.8", + "ora": "^5.4.1", + "run-async": "^2.4.0", + "rxjs": "^7.5.5", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0", + "through": "^2.3.6", + "wrap-ansi": "^6.0.1" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/inquirer/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/ip-address": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz", + "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==", + "license": "MIT", + "dependencies": { + "jsbn": "1.1.0", + "sprintf-js": "^1.1.3" + }, + "engines": { + "node": ">= 12" + } + }, + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "license": "MIT" + }, + "node_modules/is-ci": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz", + "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==", + "license": "MIT", + "dependencies": { + "ci-info": "^3.2.0" + }, + "bin": { + "is-ci": "bin.js" + } + }, + "node_modules/is-core-module": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", + "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", + "license": "MIT", + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-docker": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", + "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", + "license": "MIT", + "bin": { + "is-docker": "cli.js" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "license": "MIT", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-interactive": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", + "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-lambda": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", + "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==", + "license": "MIT" + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-obj": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", + "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-plain-obj": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", + "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-plain-object": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", + "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-ssh": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/is-ssh/-/is-ssh-1.4.0.tgz", + "integrity": "sha512-x7+VxdxOdlV3CYpjvRLBv5Lo9OJerlYanjwFrPR9fuGPjCiNiCzFgAWpiLAohSbsnH4ZAys3SBh+hq5rJosxUQ==", + "license": "MIT", + "dependencies": { + "protocols": "^2.0.1" + } + }, + "node_modules/is-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", + "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-text-path": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz", + "integrity": "sha512-xFuJpne9oFz5qDaodwmmG08e3CawH/2ZV8Qqza1Ko7Sk8POWbkRdwIoAWVhqvq0XeUzANEhKo2n0IXUGBm7A/w==", + "license": "MIT", + "dependencies": { + "text-extensions": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-unicode-supported": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-wsl": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", + "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", + "license": "MIT", + "dependencies": { + "is-docker": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "license": "MIT" + }, + "node_modules/isexe": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz", + "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==", + "license": "ISC", + "engines": { + "node": ">=16" + } + }, + "node_modules/isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/jackspeak": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", + "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", + "license": "BlueOak-1.0.0", + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, + "node_modules/jake": { + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz", + "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==", + "license": "Apache-2.0", + "dependencies": { + "async": "^3.2.3", + "chalk": "^4.0.2", + "filelist": "^1.0.4", + "minimatch": "^3.1.2" + }, + "bin": { + "jake": "bin/cli.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jake/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/jest-diff": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", + "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", + "license": "MIT", + "dependencies": { + "chalk": "^4.0.0", + "diff-sequences": "^29.6.3", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-get-type": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", + "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", + "license": "MIT", + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "license": "MIT" + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/jsbn": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz", + "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==", + "license": "MIT" + }, + "node_modules/json-parse-better-errors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", + "license": "MIT" + }, + "node_modules/json-parse-even-better-errors": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz", + "integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==", + "license": "MIT", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/json-stringify-nice": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz", + "integrity": "sha512-5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw==", + "license": "ISC", + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==", + "license": "ISC" + }, + "node_modules/json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "license": "MIT", + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/jsonc-parser": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", + "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", + "license": "MIT" + }, + "node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "license": "MIT", + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/jsonparse": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", + "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==", + "engines": [ + "node >= 0.2.0" + ], + "license": "MIT" + }, + "node_modules/JSONStream": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", + "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", + "license": "(MIT OR Apache-2.0)", + "dependencies": { + "jsonparse": "^1.2.0", + "through": ">=2.2.7 <3" + }, + "bin": { + "JSONStream": "bin.js" + }, + "engines": { + "node": "*" + } + }, + "node_modules/just-diff": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/just-diff/-/just-diff-6.0.2.tgz", + "integrity": "sha512-S59eriX5u3/QhMNq3v/gm8Kd0w8OS6Tz2FS1NG4blv+z0MuQcBRJyFWjdovM0Rad4/P4aUPFtnkNjMjyMlMSYA==", + "license": "MIT" + }, + "node_modules/just-diff-apply": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/just-diff-apply/-/just-diff-apply-5.5.0.tgz", + "integrity": "sha512-OYTthRfSh55WOItVqwpefPtNt2VdKsq5AnAK6apdtR6yCH8pr0CmSr710J0Mf+WdQy7K/OzMy7K2MgAfdQURDw==", + "license": "MIT" + }, + "node_modules/kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/libnpmaccess": { + "version": "8.0.6", + "resolved": "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-8.0.6.tgz", + "integrity": "sha512-uM8DHDEfYG6G5gVivVl+yQd4pH3uRclHC59lzIbSvy7b5FEwR+mU49Zq1jEyRtRFv7+M99mUW9S0wL/4laT4lw==", + "license": "ISC", + "dependencies": { + "npm-package-arg": "^11.0.2", + "npm-registry-fetch": "^17.0.1" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/libnpmpublish": { + "version": "9.0.9", + "resolved": "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-9.0.9.tgz", + "integrity": "sha512-26zzwoBNAvX9AWOPiqqF6FG4HrSCPsHFkQm7nT+xU1ggAujL/eae81RnCv4CJ2In9q9fh10B88sYSzKCUh/Ghg==", + "license": "ISC", + "dependencies": { + "ci-info": "^4.0.0", + "normalize-package-data": "^6.0.1", + "npm-package-arg": "^11.0.2", + "npm-registry-fetch": "^17.0.1", + "proc-log": "^4.2.0", + "semver": "^7.3.7", + "sigstore": "^2.2.0", + "ssri": "^10.0.6" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/libnpmpublish/node_modules/ci-info": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.1.0.tgz", + "integrity": "sha512-HutrvTNsF48wnxkzERIXOe5/mlcfFcbfCmwcg6CJnizbSue78AbDt+1cgl26zwn61WFxhcPykPfZrbqjGmBb4A==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/lines-and-columns": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.3.tgz", + "integrity": "sha512-cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w==", + "license": "MIT", + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + } + }, + "node_modules/load-json-file": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-6.2.0.tgz", + "integrity": "sha512-gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ==", + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.1.15", + "parse-json": "^5.0.0", + "strip-bom": "^4.0.0", + "type-fest": "^0.6.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/load-json-file/node_modules/type-fest": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", + "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=8" + } + }, + "node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "license": "MIT", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "license": "MIT" + }, + "node_modules/lodash.ismatch": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz", + "integrity": "sha512-fPMfXjGQEV9Xsq/8MTSgUf255gawYRbjwMyDbcvDhXgV7enSZA0hynz6vMPnpAb5iONEzBHBPsT+0zes5Z301g==", + "license": "MIT" + }, + "node_modules/log-symbols": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", + "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", + "license": "MIT", + "dependencies": { + "chalk": "^4.1.0", + "is-unicode-supported": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "license": "ISC" + }, + "node_modules/make-dir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", + "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", + "license": "MIT", + "dependencies": { + "semver": "^7.5.3" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/make-fetch-happen": { + "version": "13.0.1", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz", + "integrity": "sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==", + "license": "ISC", + "dependencies": { + "@npmcli/agent": "^2.0.0", + "cacache": "^18.0.0", + "http-cache-semantics": "^4.1.1", + "is-lambda": "^1.0.1", + "minipass": "^7.0.2", + "minipass-fetch": "^3.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.3", + "proc-log": "^4.2.0", + "promise-retry": "^2.0.1", + "ssri": "^10.0.0" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/map-obj": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz", + "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==", + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/meow": { + "version": "8.1.2", + "resolved": "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz", + "integrity": "sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q==", + "license": "MIT", + "dependencies": { + "@types/minimist": "^1.2.0", + "camelcase-keys": "^6.2.2", + "decamelize-keys": "^1.1.0", + "hard-rejection": "^2.1.0", + "minimist-options": "4.1.0", + "normalize-package-data": "^3.0.0", + "read-pkg-up": "^7.0.1", + "redent": "^3.0.0", + "trim-newlines": "^3.0.0", + "type-fest": "^0.18.0", + "yargs-parser": "^20.2.3" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/meow/node_modules/hosted-git-info": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", + "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", + "license": "ISC", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/meow/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/meow/node_modules/normalize-package-data": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz", + "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==", + "license": "BSD-2-Clause", + "dependencies": { + "hosted-git-info": "^4.0.1", + "is-core-module": "^2.5.0", + "semver": "^7.3.4", + "validate-npm-package-license": "^3.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/meow/node_modules/read-pkg": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", + "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", + "license": "MIT", + "dependencies": { + "@types/normalize-package-data": "^2.4.0", + "normalize-package-data": "^2.5.0", + "parse-json": "^5.0.0", + "type-fest": "^0.6.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/meow/node_modules/read-pkg-up": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", + "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", + "license": "MIT", + "dependencies": { + "find-up": "^4.1.0", + "read-pkg": "^5.2.0", + "type-fest": "^0.8.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/meow/node_modules/read-pkg-up/node_modules/type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=8" + } + }, + "node_modules/meow/node_modules/read-pkg/node_modules/hosted-git-info": { + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", + "license": "ISC" + }, + "node_modules/meow/node_modules/read-pkg/node_modules/normalize-package-data": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "license": "BSD-2-Clause", + "dependencies": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + } + }, + "node_modules/meow/node_modules/read-pkg/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "license": "ISC", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/meow/node_modules/read-pkg/node_modules/type-fest": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", + "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=8" + } + }, + "node_modules/meow/node_modules/type-fest": { + "version": "0.18.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz", + "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==", + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/meow/node_modules/yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "license": "MIT" + }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/micromatch": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "license": "MIT", + "dependencies": { + "braces": "^3.0.3", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "license": "MIT", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/min-indent": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", + "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/minimatch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz", + "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/minimist-options": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz", + "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==", + "license": "MIT", + "dependencies": { + "arrify": "^1.0.1", + "is-plain-obj": "^1.1.0", + "kind-of": "^6.0.3" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/minipass-collect": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz", + "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==", + "license": "ISC", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/minipass-fetch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", + "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", + "license": "MIT", + "dependencies": { + "minipass": "^7.0.3", + "minipass-sized": "^1.0.3", + "minizlib": "^2.1.2" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" + } + }, + "node_modules/minipass-flush": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", + "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", + "license": "ISC", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minipass-flush/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-pipeline": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", + "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", + "license": "ISC", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-pipeline/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-sized": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", + "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", + "license": "ISC", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-sized/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "license": "MIT", + "dependencies": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minizlib/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "license": "MIT", + "bin": { + "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/modify-values": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz", + "integrity": "sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, + "node_modules/multimatch": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz", + "integrity": "sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==", + "license": "MIT", + "dependencies": { + "@types/minimatch": "^3.0.3", + "array-differ": "^3.0.0", + "array-union": "^2.1.0", + "arrify": "^2.0.1", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/multimatch/node_modules/arrify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", + "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/mute-stream": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", + "license": "ISC" + }, + "node_modules/negotiator": { + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz", + "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/neo-async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", + "license": "MIT" + }, + "node_modules/node-fetch": { + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "license": "MIT", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, + "node_modules/node-gyp": { + "version": "10.3.1", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.3.1.tgz", + "integrity": "sha512-Pp3nFHBThHzVtNY7U6JfPjvT/DTE8+o/4xKsLQtBoU+j2HLsGlhcfzflAoUreaJbNmYnX+LlLi0qjV8kpyO6xQ==", + "license": "MIT", + "dependencies": { + "env-paths": "^2.2.0", + "exponential-backoff": "^3.1.1", + "glob": "^10.3.10", + "graceful-fs": "^4.2.6", + "make-fetch-happen": "^13.0.0", + "nopt": "^7.0.0", + "proc-log": "^4.1.0", + "semver": "^7.3.5", + "tar": "^6.2.1", + "which": "^4.0.0" + }, + "bin": { + "node-gyp": "bin/node-gyp.js" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/node-machine-id": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/node-machine-id/-/node-machine-id-1.1.12.tgz", + "integrity": "sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==", + "license": "MIT" + }, + "node_modules/nopt": { + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz", + "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==", + "license": "ISC", + "dependencies": { + "abbrev": "^2.0.0" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/normalize-package-data": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.2.tgz", + "integrity": "sha512-V6gygoYb/5EmNI+MEGrWkC+e6+Rr7mTmfHrxDbLzxQogBkgzo76rkok0Am6thgSF7Mv2nLOajAJj5vDJZEFn7g==", + "license": "BSD-2-Clause", + "dependencies": { + "hosted-git-info": "^7.0.0", + "semver": "^7.3.5", + "validate-npm-package-license": "^3.0.4" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/npm-bundled": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.1.tgz", + "integrity": "sha512-+AvaheE/ww1JEwRHOrn4WHNzOxGtVp+adrg2AeZS/7KuxGUYFuBta98wYpfHBbJp6Tg6j1NKSEVHNcfZzJHQwQ==", + "license": "ISC", + "dependencies": { + "npm-normalize-package-bin": "^3.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-install-checks": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.3.0.tgz", + "integrity": "sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==", + "license": "BSD-2-Clause", + "dependencies": { + "semver": "^7.1.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-normalize-package-bin": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz", + "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==", + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-package-arg": { + "version": "11.0.2", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.2.tgz", + "integrity": "sha512-IGN0IAwmhDJwy13Wc8k+4PEbTPhpJnMtfR53ZbOyjkvmEcLS4nCwp6mvMWjS5sUjeiW3mpx6cHmuhKEu9XmcQw==", + "license": "ISC", + "dependencies": { + "hosted-git-info": "^7.0.0", + "proc-log": "^4.0.0", + "semver": "^7.3.5", + "validate-npm-package-name": "^5.0.0" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/npm-packlist": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-8.0.2.tgz", + "integrity": "sha512-shYrPFIS/JLP4oQmAwDyk5HcyysKW8/JLTEA32S0Z5TzvpaeeX2yMFfoK1fjEBnCBvVyIB/Jj/GBFdm0wsgzbA==", + "license": "ISC", + "dependencies": { + "ignore-walk": "^6.0.4" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/npm-pick-manifest": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-9.1.0.tgz", + "integrity": "sha512-nkc+3pIIhqHVQr085X9d2JzPzLyjzQS96zbruppqC9aZRm/x8xx6xhI98gHtsfELP2bE+loHq8ZaHFHhe+NauA==", + "license": "ISC", + "dependencies": { + "npm-install-checks": "^6.0.0", + "npm-normalize-package-bin": "^3.0.0", + "npm-package-arg": "^11.0.0", + "semver": "^7.3.5" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/npm-registry-fetch": { + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-17.1.0.tgz", + "integrity": "sha512-5+bKQRH0J1xG1uZ1zMNvxW0VEyoNWgJpY9UDuluPFLKDfJ9u2JmmjmTJV1srBGQOROfdBMiVvnH2Zvpbm+xkVA==", + "license": "ISC", + "dependencies": { + "@npmcli/redact": "^2.0.0", + "jsonparse": "^1.3.1", + "make-fetch-happen": "^13.0.0", + "minipass": "^7.0.2", + "minipass-fetch": "^3.0.0", + "minizlib": "^2.1.2", + "npm-package-arg": "^11.0.0", + "proc-log": "^4.0.0" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "license": "MIT", + "dependencies": { + "path-key": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/nx": { + "version": "20.4.2", + "resolved": "https://registry.npmjs.org/nx/-/nx-20.4.2.tgz", + "integrity": "sha512-WXbKqk8looDo9zAISfmWtGyGm5RlOvr0G/THAa1WGSU4qHAZDsUtMAtwnxXje9s+R5rrwMmhbXCVvZELyeJP9Q==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "@napi-rs/wasm-runtime": "0.2.4", + "@yarnpkg/lockfile": "^1.1.0", + "@yarnpkg/parsers": "3.0.2", + "@zkochan/js-yaml": "0.0.7", + "axios": "^1.7.4", + "chalk": "^4.1.0", + "cli-cursor": "3.1.0", + "cli-spinners": "2.6.1", + "cliui": "^8.0.1", + "dotenv": "~16.4.5", + "dotenv-expand": "~11.0.6", + "enquirer": "~2.3.6", + "figures": "3.2.0", + "flat": "^5.0.2", + "front-matter": "^4.0.2", + "ignore": "^5.0.4", + "jest-diff": "^29.4.1", + "jsonc-parser": "3.2.0", + "lines-and-columns": "2.0.3", + "minimatch": "9.0.3", + "node-machine-id": "1.1.12", + "npm-run-path": "^4.0.1", + "open": "^8.4.0", + "ora": "5.3.0", + "resolve.exports": "2.0.3", + "semver": "^7.5.3", + "string-width": "^4.2.3", + "tar-stream": "~2.2.0", + "tmp": "~0.2.1", + "tsconfig-paths": "^4.1.2", + "tslib": "^2.3.0", + "yaml": "^2.6.0", + "yargs": "^17.6.2", + "yargs-parser": "21.1.1" + }, + "bin": { + "nx": "bin/nx.js", + "nx-cloud": "bin/nx-cloud.js" + }, + "optionalDependencies": { + "@nx/nx-darwin-arm64": "20.4.2", + "@nx/nx-darwin-x64": "20.4.2", + "@nx/nx-freebsd-x64": "20.4.2", + "@nx/nx-linux-arm-gnueabihf": "20.4.2", + "@nx/nx-linux-arm64-gnu": "20.4.2", + "@nx/nx-linux-arm64-musl": "20.4.2", + "@nx/nx-linux-x64-gnu": "20.4.2", + "@nx/nx-linux-x64-musl": "20.4.2", + "@nx/nx-win32-arm64-msvc": "20.4.2", + "@nx/nx-win32-x64-msvc": "20.4.2" + }, + "peerDependencies": { + "@swc-node/register": "^1.8.0", + "@swc/core": "^1.3.85" + }, + "peerDependenciesMeta": { + "@swc-node/register": { + "optional": true + }, + "@swc/core": { + "optional": true + } + } + }, + "node_modules/nx/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/nx/node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/nx/node_modules/ora": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/ora/-/ora-5.3.0.tgz", + "integrity": "sha512-zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g==", + "license": "MIT", + "dependencies": { + "bl": "^4.0.3", + "chalk": "^4.1.0", + "cli-cursor": "^3.1.0", + "cli-spinners": "^2.5.0", + "is-interactive": "^1.0.0", + "log-symbols": "^4.0.0", + "strip-ansi": "^6.0.0", + "wcwidth": "^1.0.1" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "license": "ISC", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "license": "MIT", + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/open": { + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz", + "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==", + "license": "MIT", + "dependencies": { + "define-lazy-prop": "^2.0.0", + "is-docker": "^2.1.1", + "is-wsl": "^2.2.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ora": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", + "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", + "license": "MIT", + "dependencies": { + "bl": "^4.1.0", + "chalk": "^4.1.0", + "cli-cursor": "^3.1.0", + "cli-spinners": "^2.5.0", + "is-interactive": "^1.0.0", + "is-unicode-supported": "^0.1.0", + "log-symbols": "^4.1.0", + "strip-ansi": "^6.0.0", + "wcwidth": "^1.0.1" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/p-finally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "license": "MIT", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/p-map": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "license": "MIT", + "dependencies": { + "aggregate-error": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-map-series": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/p-map-series/-/p-map-series-2.1.0.tgz", + "integrity": "sha512-RpYIIK1zXSNEOdwxcfe7FdvGcs7+y5n8rifMhMNWvaxRNMPINJHF5GDeuVxWqnfrcHPSCnp7Oo5yNXHId9Av2Q==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/p-pipe": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-pipe/-/p-pipe-3.1.0.tgz", + "integrity": "sha512-08pj8ATpzMR0Y80x50yJHn37NF6vjrqHutASaX5LiH5npS9XPvrUmscd9MF5R4fuYRHOxQR1FfMIlF7AzwoPqw==", + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-queue": { + "version": "6.6.2", + "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz", + "integrity": "sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==", + "license": "MIT", + "dependencies": { + "eventemitter3": "^4.0.4", + "p-timeout": "^3.2.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-reduce": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/p-reduce/-/p-reduce-2.1.0.tgz", + "integrity": "sha512-2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/p-timeout": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz", + "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==", + "license": "MIT", + "dependencies": { + "p-finally": "^1.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/p-waterfall": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/p-waterfall/-/p-waterfall-2.1.1.tgz", + "integrity": "sha512-RRTnDb2TBG/epPRI2yYXsimO0v3BXC8Yd3ogr1545IaqKK17VGhbWVeGGN+XfCm/08OK8635nH31c8bATkHuSw==", + "license": "MIT", + "dependencies": { + "p-reduce": "^2.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/package-json-from-dist": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", + "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", + "license": "BlueOak-1.0.0" + }, + "node_modules/pacote": { + "version": "18.0.6", + "resolved": "https://registry.npmjs.org/pacote/-/pacote-18.0.6.tgz", + "integrity": "sha512-+eK3G27SMwsB8kLIuj4h1FUhHtwiEUo21Tw8wNjmvdlpOEr613edv+8FUsTj/4F/VN5ywGE19X18N7CC2EJk6A==", + "license": "ISC", + "dependencies": { + "@npmcli/git": "^5.0.0", + "@npmcli/installed-package-contents": "^2.0.1", + "@npmcli/package-json": "^5.1.0", + "@npmcli/promise-spawn": "^7.0.0", + "@npmcli/run-script": "^8.0.0", + "cacache": "^18.0.0", + "fs-minipass": "^3.0.0", + "minipass": "^7.0.2", + "npm-package-arg": "^11.0.0", + "npm-packlist": "^8.0.0", + "npm-pick-manifest": "^9.0.0", + "npm-registry-fetch": "^17.0.0", + "proc-log": "^4.0.0", + "promise-retry": "^2.0.1", + "sigstore": "^2.2.0", + "ssri": "^10.0.0", + "tar": "^6.1.11" + }, + "bin": { + "pacote": "bin/index.js" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "license": "MIT", + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/parse-conflict-json": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/parse-conflict-json/-/parse-conflict-json-3.0.1.tgz", + "integrity": "sha512-01TvEktc68vwbJOtWZluyWeVGWjP+bZwXtPDMQVbBKzbJ/vZBif0L69KH1+cHv1SZ6e0FKLvjyHe8mqsIqYOmw==", + "license": "ISC", + "dependencies": { + "json-parse-even-better-errors": "^3.0.0", + "just-diff": "^6.0.0", + "just-diff-apply": "^5.2.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/parse-json": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/parse-json/node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "license": "MIT" + }, + "node_modules/parse-json/node_modules/lines-and-columns": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "license": "MIT" + }, + "node_modules/parse-path": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-7.0.0.tgz", + "integrity": "sha512-Euf9GG8WT9CdqwuWJGdf3RkUcTBArppHABkO7Lm8IzRQp0e2r/kkFnmhu4TSK30Wcu5rVAZLmfPKSBBi9tWFog==", + "license": "MIT", + "dependencies": { + "protocols": "^2.0.0" + } + }, + "node_modules/parse-url": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-8.1.0.tgz", + "integrity": "sha512-xDvOoLU5XRrcOZvnI6b8zA6n9O9ejNk/GExuz1yBuWUGn9KA97GI6HTs6u02wKara1CeVmZhH+0TZFdWScR89w==", + "license": "MIT", + "dependencies": { + "parse-path": "^7.0.0" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "license": "MIT" + }, + "node_modules/path-scurry": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", + "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "license": "BlueOak-1.0.0", + "dependencies": { + "lru-cache": "^10.2.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.18" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/picocolors": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "license": "ISC" + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pify": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz", + "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==", + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "license": "MIT", + "dependencies": { + "find-up": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/postcss-selector-parser": { + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz", + "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==", + "license": "MIT", + "dependencies": { + "cssesc": "^3.0.0", + "util-deprecate": "^1.0.2" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/pretty-format": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", + "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", + "license": "MIT", + "dependencies": { + "@jest/schemas": "^29.6.3", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/pretty-format/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/proc-log": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz", + "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==", + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", + "license": "MIT" + }, + "node_modules/proggy": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/proggy/-/proggy-2.0.0.tgz", + "integrity": "sha512-69agxLtnI8xBs9gUGqEnK26UfiexpHy+KUpBQWabiytQjnn5wFY8rklAi7GRfABIuPNnQ/ik48+LGLkYYJcy4A==", + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/promise-all-reject-late": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/promise-all-reject-late/-/promise-all-reject-late-1.0.1.tgz", + "integrity": "sha512-vuf0Lf0lOxyQREH7GDIOUMLS7kz+gs8i6B+Yi8dC68a2sychGrHTJYghMBD6k7eUcH0H5P73EckCA48xijWqXw==", + "license": "ISC", + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/promise-call-limit": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/promise-call-limit/-/promise-call-limit-3.0.2.tgz", + "integrity": "sha512-mRPQO2T1QQVw11E7+UdCJu7S61eJVWknzml9sC1heAdj1jxl0fWMBypIt9ZOcLFf8FkG995ZD7RnVk7HH72fZw==", + "license": "ISC", + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/promise-inflight": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", + "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==", + "license": "ISC" + }, + "node_modules/promise-retry": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", + "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", + "license": "MIT", + "dependencies": { + "err-code": "^2.0.2", + "retry": "^0.12.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/promzard": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/promzard/-/promzard-1.0.2.tgz", + "integrity": "sha512-2FPputGL+mP3jJ3UZg/Dl9YOkovB7DX0oOr+ck5QbZ5MtORtds8k/BZdn+02peDLI8/YWbmzx34k5fA+fHvCVQ==", + "license": "ISC", + "dependencies": { + "read": "^3.0.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/protocols": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/protocols/-/protocols-2.0.1.tgz", + "integrity": "sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q==", + "license": "MIT" + }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "license": "MIT" + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/quick-lru": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz", + "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/react-is": { + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", + "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", + "license": "MIT" + }, + "node_modules/read": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/read/-/read-3.0.1.tgz", + "integrity": "sha512-SLBrDU/Srs/9EoWhU5GdbAoxG1GzpQHo/6qiGItaoLJ1thmYpcNIM1qISEUvyHBzfGlWIyd6p2DNi1oV1VmAuw==", + "license": "ISC", + "dependencies": { + "mute-stream": "^1.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/read-cmd-shim": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-4.0.0.tgz", + "integrity": "sha512-yILWifhaSEEytfXI76kB9xEEiG1AiozaCJZ83A87ytjRiN+jVibXjedjCRNjoZviinhG+4UkalO3mWTd8u5O0Q==", + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/read-package-json-fast": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz", + "integrity": "sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==", + "license": "ISC", + "dependencies": { + "json-parse-even-better-errors": "^3.0.0", + "npm-normalize-package-bin": "^3.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/read-pkg": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", + "integrity": "sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==", + "license": "MIT", + "dependencies": { + "load-json-file": "^4.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz", + "integrity": "sha512-YFzFrVvpC6frF1sz8psoHDBGF7fLPc+llq/8NB43oagqWkx8ar5zYtsTORtOjw9W2RHLpWP+zTWwBvf1bCmcSw==", + "license": "MIT", + "dependencies": { + "find-up": "^2.0.0", + "read-pkg": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg-up/node_modules/find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==", + "license": "MIT", + "dependencies": { + "locate-path": "^2.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg-up/node_modules/locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==", + "license": "MIT", + "dependencies": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg-up/node_modules/p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "license": "MIT", + "dependencies": { + "p-try": "^1.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg-up/node_modules/p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==", + "license": "MIT", + "dependencies": { + "p-limit": "^1.1.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg-up/node_modules/p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg-up/node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg/node_modules/hosted-git-info": { + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", + "license": "ISC" + }, + "node_modules/read-pkg/node_modules/load-json-file": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", + "integrity": "sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==", + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.1.2", + "parse-json": "^4.0.0", + "pify": "^3.0.0", + "strip-bom": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg/node_modules/normalize-package-data": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "license": "BSD-2-Clause", + "dependencies": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + } + }, + "node_modules/read-pkg/node_modules/parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==", + "license": "MIT", + "dependencies": { + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg/node_modules/path-type": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", + "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", + "license": "MIT", + "dependencies": { + "pify": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg/node_modules/pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "license": "ISC", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/read-pkg/node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/read/node_modules/mute-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz", + "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==", + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "license": "MIT", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/redent": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", + "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==", + "license": "MIT", + "dependencies": { + "indent-string": "^4.0.0", + "strip-indent": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/resolve": { + "version": "1.22.10", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", + "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", + "license": "MIT", + "dependencies": { + "is-core-module": "^2.16.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-cwd": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", + "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", + "license": "MIT", + "dependencies": { + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/resolve.exports": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz", + "integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==", + "license": "MIT", + "engines": { + "node": ">=10" + } + }, + "node_modules/restore-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "license": "MIT", + "dependencies": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/retry": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", + "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "license": "MIT", + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rimraf": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-4.4.1.tgz", + "integrity": "sha512-Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og==", + "license": "ISC", + "dependencies": { + "glob": "^9.2.0" + }, + "bin": { + "rimraf": "dist/cjs/src/bin.js" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/rimraf/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/rimraf/node_modules/glob": { + "version": "9.3.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz", + "integrity": "sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==", + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "minimatch": "^8.0.2", + "minipass": "^4.2.4", + "path-scurry": "^1.6.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/rimraf/node_modules/minimatch": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-8.0.4.tgz", + "integrity": "sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/rimraf/node_modules/minipass": { + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz", + "integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==", + "license": "ISC", + "engines": { + "node": ">=8" + } + }, + "node_modules/run-async": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", + "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/rxjs": { + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "license": "MIT" + }, + "node_modules/semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", + "license": "ISC" + }, + "node_modules/shallow-clone": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", + "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", + "license": "MIT", + "dependencies": { + "kind-of": "^6.0.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "license": "ISC" + }, + "node_modules/sigstore": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-2.3.1.tgz", + "integrity": "sha512-8G+/XDU8wNsJOQS5ysDVO0Etg9/2uA5gR9l4ZwijjlwxBcrU6RPfwi2+jJmbP+Ap1Hlp/nVAaEO4Fj22/SL2gQ==", + "license": "Apache-2.0", + "dependencies": { + "@sigstore/bundle": "^2.3.2", + "@sigstore/core": "^1.0.0", + "@sigstore/protobuf-specs": "^0.3.2", + "@sigstore/sign": "^2.3.2", + "@sigstore/tuf": "^2.3.4", + "@sigstore/verify": "^1.2.1" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/smart-buffer": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", + "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", + "license": "MIT", + "engines": { + "node": ">= 6.0.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/socks": { + "version": "2.8.4", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.4.tgz", + "integrity": "sha512-D3YaD0aRxR3mEcqnidIs7ReYJFVzWdd6fXJYUM8ixcQcJRGTka/b3saV0KflYhyVJXKhb947GndU35SxYNResQ==", + "license": "MIT", + "dependencies": { + "ip-address": "^9.0.5", + "smart-buffer": "^4.2.0" + }, + "engines": { + "node": ">= 10.0.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/socks-proxy-agent": { + "version": "8.0.5", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz", + "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==", + "license": "MIT", + "dependencies": { + "agent-base": "^7.1.2", + "debug": "^4.3.4", + "socks": "^2.8.3" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/sort-keys": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz", + "integrity": "sha512-/dPCrG1s3ePpWm6yBbxZq5Be1dXGLyLn9Z791chDC3NFrpkVbWGzkBwPN1knaciexFXgRJ7hzdnwZ4stHSDmjg==", + "license": "MIT", + "dependencies": { + "is-plain-obj": "^1.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/spdx-correct": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", + "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", + "license": "Apache-2.0", + "dependencies": { + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" + } + }, + "node_modules/spdx-exceptions": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz", + "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==", + "license": "CC-BY-3.0" + }, + "node_modules/spdx-expression-parse": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", + "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", + "license": "MIT", + "dependencies": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, + "node_modules/spdx-license-ids": { + "version": "3.0.21", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz", + "integrity": "sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==", + "license": "CC0-1.0" + }, + "node_modules/split": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", + "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==", + "license": "MIT", + "dependencies": { + "through": "2" + }, + "engines": { + "node": "*" + } + }, + "node_modules/split2": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz", + "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==", + "license": "ISC", + "dependencies": { + "readable-stream": "^3.0.0" + } + }, + "node_modules/sprintf-js": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", + "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", + "license": "BSD-3-Clause" + }, + "node_modules/ssri": { + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", + "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", + "license": "ISC", + "dependencies": { + "minipass": "^7.0.3" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-bom": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/strip-indent": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz", + "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==", + "license": "MIT", + "dependencies": { + "min-indent": "^1.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strong-log-transformer": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz", + "integrity": "sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==", + "license": "Apache-2.0", + "dependencies": { + "duplexer": "^0.1.1", + "minimist": "^1.2.0", + "through": "^2.3.4" + }, + "bin": { + "sl-log-transformer": "bin/sl-log-transformer.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/tar": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", + "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", + "license": "ISC", + "dependencies": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^5.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/tar-stream": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "license": "MIT", + "dependencies": { + "bl": "^4.0.3", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/tar/node_modules/fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "license": "ISC", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/tar/node_modules/fs-minipass/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/tar/node_modules/minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "license": "ISC", + "engines": { + "node": ">=8" + } + }, + "node_modules/temp-dir": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz", + "integrity": "sha512-xZFXEGbG7SNC3itwBzI3RYjq/cEhBkx2hJuKGIUOcEULmkQExXiHat2z/qkISYsuR+IKumhEfKKbV5qXmhICFQ==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/text-extensions": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz", + "integrity": "sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==", + "license": "MIT", + "engines": { + "node": ">=0.10" + } + }, + "node_modules/through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", + "license": "MIT" + }, + "node_modules/through2": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", + "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", + "license": "MIT", + "dependencies": { + "readable-stream": "~2.3.6", + "xtend": "~4.0.1" + } + }, + "node_modules/through2/node_modules/readable-stream": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "license": "MIT", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/through2/node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "license": "MIT" + }, + "node_modules/through2/node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/tmp": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz", + "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==", + "license": "MIT", + "engines": { + "node": ">=14.14" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "license": "MIT", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", + "license": "MIT" + }, + "node_modules/treeverse": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/treeverse/-/treeverse-3.0.0.tgz", + "integrity": "sha512-gcANaAnd2QDZFmHFEOF4k7uc1J/6a6z3DJMd/QwEyxLoKGiptJRwid582r7QIsFlFMIZ3SnxfS52S4hm2DHkuQ==", + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/trim-newlines": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", + "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/tsconfig-paths": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz", + "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==", + "license": "MIT", + "dependencies": { + "json5": "^2.2.2", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/tsconfig-paths/node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/tslib": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "license": "0BSD" + }, + "node_modules/tuf-js": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-2.2.1.tgz", + "integrity": "sha512-GwIJau9XaA8nLVbUXsN3IlFi7WmQ48gBUrl3FTkkL/XLu/POhBzfmX9hd33FNMX1qAsfl6ozO1iMmW9NC8YniA==", + "license": "MIT", + "dependencies": { + "@tufjs/models": "2.0.1", + "debug": "^4.3.4", + "make-fetch-happen": "^13.0.1" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/type-fest": { + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/typedarray": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", + "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==", + "license": "MIT" + }, + "node_modules/typescript": { + "version": "5.7.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz", + "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==", + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/uglify-js": { + "version": "3.19.3", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz", + "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==", + "license": "BSD-2-Clause", + "optional": true, + "bin": { + "uglifyjs": "bin/uglifyjs" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/unique-filename": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", + "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", + "license": "ISC", + "dependencies": { + "unique-slug": "^4.0.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/unique-slug": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", + "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/universal-user-agent": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz", + "integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==", + "license": "ISC" + }, + "node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "license": "MIT", + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/upath": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/upath/-/upath-2.0.1.tgz", + "integrity": "sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==", + "license": "MIT", + "engines": { + "node": ">=4", + "yarn": "*" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "license": "MIT" + }, + "node_modules/uuid": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz", + "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "license": "MIT", + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/validate-npm-package-license": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", + "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", + "license": "Apache-2.0", + "dependencies": { + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" + } + }, + "node_modules/validate-npm-package-name": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz", + "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==", + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/walk-up-path": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/walk-up-path/-/walk-up-path-3.0.1.tgz", + "integrity": "sha512-9YlCL/ynK3CTlrSRrDxZvUauLzAswPCrsaCgilqFevUYpeEW0/3ScEjaa3kbW/T0ghhkEr7mv+fpjqn1Y1YuTA==", + "license": "ISC" + }, + "node_modules/wcwidth": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", + "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", + "license": "MIT", + "dependencies": { + "defaults": "^1.0.3" + } + }, + "node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", + "license": "BSD-2-Clause" + }, + "node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "license": "MIT", + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, + "node_modules/which": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", + "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", + "license": "ISC", + "dependencies": { + "isexe": "^3.1.1" + }, + "bin": { + "node-which": "bin/which.js" + }, + "engines": { + "node": "^16.13.0 || >=18.0.0" + } + }, + "node_modules/wide-align": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", + "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", + "license": "ISC", + "dependencies": { + "string-width": "^1.0.2 || 2 || 3 || 4" + } + }, + "node_modules/wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==", + "license": "MIT" + }, + "node_modules/wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "license": "ISC" + }, + "node_modules/write-file-atomic": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz", + "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==", + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/write-file-atomic/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "license": "ISC", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/write-json-file": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/write-json-file/-/write-json-file-3.2.0.tgz", + "integrity": "sha512-3xZqT7Byc2uORAatYiP3DHUUAVEkNOswEWNs9H5KXiicRTvzYzYqKjYc4G7p+8pltvAw641lVByKVtMpf+4sYQ==", + "license": "MIT", + "dependencies": { + "detect-indent": "^5.0.0", + "graceful-fs": "^4.1.15", + "make-dir": "^2.1.0", + "pify": "^4.0.1", + "sort-keys": "^2.0.0", + "write-file-atomic": "^2.4.2" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/write-json-file/node_modules/make-dir": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", + "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", + "license": "MIT", + "dependencies": { + "pify": "^4.0.1", + "semver": "^5.6.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/write-json-file/node_modules/pify": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/write-json-file/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "license": "ISC", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/write-json-file/node_modules/write-file-atomic": { + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz", + "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==", + "license": "ISC", + "dependencies": { + "graceful-fs": "^4.1.11", + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.2" + } + }, + "node_modules/write-pkg": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/write-pkg/-/write-pkg-4.0.0.tgz", + "integrity": "sha512-v2UQ+50TNf2rNHJ8NyWttfm/EJUBWMJcx6ZTYZr6Qp52uuegWw/lBkCtCbnYZEmPRNL61m+u67dAmGxo+HTULA==", + "license": "MIT", + "dependencies": { + "sort-keys": "^2.0.0", + "type-fest": "^0.4.1", + "write-json-file": "^3.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/write-pkg/node_modules/type-fest": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.4.1.tgz", + "integrity": "sha512-IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw==", + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=6" + } + }, + "node_modules/xtend": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", + "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", + "license": "MIT", + "engines": { + "node": ">=0.4" + } + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "license": "ISC" + }, + "node_modules/yaml": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.0.tgz", + "integrity": "sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==", + "license": "ISC", + "bin": { + "yaml": "bin.mjs" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/yargs": { + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "license": "MIT", + "dependencies": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/yargs-parser": { + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "license": "ISC", + "engines": { + "node": ">=12" + } + } + } +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5d9e8ce8a00..13b9c7a7b649 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4074,6 +4074,10 @@ with pkgs; leanblueprint = with python3Packages; toPythonApplication leanblueprint; + inherit (callPackage ../development/tools/lerna { }) + lerna_6 lerna_8; + lerna = lerna_8; + lethe = callPackage ../tools/security/lethe { inherit (darwin.apple_sdk.frameworks) Security; }; From ac7c2b0e328cb2fc2c307b1c868d83e3dfab62e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 18:42:05 +0000 Subject: [PATCH 0545/1107] bloomeetunes: 2.10.14 -> 2.10.15 --- pkgs/by-name/bl/bloomeetunes/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bl/bloomeetunes/package.nix b/pkgs/by-name/bl/bloomeetunes/package.nix index ebeeeb30b063..a01aafebc863 100644 --- a/pkgs/by-name/bl/bloomeetunes/package.nix +++ b/pkgs/by-name/bl/bloomeetunes/package.nix @@ -10,13 +10,13 @@ flutter324.buildFlutterApplication rec { pname = "bloomeetunes"; - version = "2.10.14"; + version = "2.10.15"; src = fetchFromGitHub { owner = "HemantKArya"; repo = "BloomeeTunes"; - tag = "v${version}+161"; - hash = "sha256-Cj4NfWEIEYTNAdb6CunA7ExTebK89OlHvZx9n853eHI="; + tag = "v${version}+162"; + hash = "sha256-o26HB2eFXXiovg+X5hNIRRStJBGNEFTF9Um/8AKlKww="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; From 3153339a75d34653c550bbcb095c0c01bb62768b Mon Sep 17 00:00:00 2001 From: nayeko Date: Sun, 16 Feb 2025 08:05:30 +0800 Subject: [PATCH 0546/1107] clashtui: init at 0.2.3 --- pkgs/by-name/cl/clashtui/package.nix | 52 ++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 pkgs/by-name/cl/clashtui/package.nix diff --git a/pkgs/by-name/cl/clashtui/package.nix b/pkgs/by-name/cl/clashtui/package.nix new file mode 100644 index 000000000000..d97f89a9c687 --- /dev/null +++ b/pkgs/by-name/cl/clashtui/package.nix @@ -0,0 +1,52 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "clashtui"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "JohanChane"; + repo = "clashtui"; + tag = "v${version}"; + hash = "sha256-2iQVYZrqo55EO0ZGn6ktP/3Py5v+LiVgrSYTtaxYXyQ="; + }; + + sourceRoot = "${src.name}/clashtui"; + + useFetchCargoVendor = true; + + cargoHash = "sha256-8oDnumyn0Ry1AIWNLO2+1HSPsxkVLRLItgEVEXqSRFI="; + + cargoBuildFlags = [ "--all-features" ]; + + checkFlags = [ + # need fhs + "--skip=utils::config::test::test_save_and_load" + ]; + + doInstallCheck = true; + + versionCheckProgramArg = "--version"; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Mihomo (Clash.Meta) TUI Client"; + homepage = "https://github.com/JohanChane/clashtui"; + changelog = "https://github.com/JohanChane/clashtui/releases/tag/v${version}"; + mainProgram = "clashtui"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ nayeko ]; + }; +} From c932a6e103c3733ba7d1270c60af08140cb8eabf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 20:00:38 +0000 Subject: [PATCH 0547/1107] python312Packages.ansible-compat: 25.1.1 -> 25.1.2 --- pkgs/development/python-modules/ansible-compat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-compat/default.nix b/pkgs/development/python-modules/ansible-compat/default.nix index 9662853c3cbe..4098fa11b845 100644 --- a/pkgs/development/python-modules/ansible-compat/default.nix +++ b/pkgs/development/python-modules/ansible-compat/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "ansible-compat"; - version = "25.1.1"; + version = "25.1.2"; pyproject = true; src = fetchFromGitHub { owner = "ansible"; repo = "ansible-compat"; tag = "v${version}"; - hash = "sha256-uchju9ZxmoqZX3xlAC9lXc+DPpbG71xq1mIHwtaiB9c="; + hash = "sha256-AElonUB2zXB3ZcRTwuaYpEQJYHtPw2lD3tBNMEqwuKo="; }; build-system = [ From ce80578cb2db423c7f4bb7f4157edfaa1cff118f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 20:01:55 +0000 Subject: [PATCH 0548/1107] kubeshark: 52.3.96 -> 52.4.2 --- pkgs/by-name/ku/kubeshark/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ku/kubeshark/package.nix b/pkgs/by-name/ku/kubeshark/package.nix index 105fdfd62593..8381b40cda5b 100644 --- a/pkgs/by-name/ku/kubeshark/package.nix +++ b/pkgs/by-name/ku/kubeshark/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "kubeshark"; - version = "52.3.96"; + version = "52.4.2"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; rev = "v${version}"; - hash = "sha256-o0Rzo7+gT+bj1b5YhfJMKSpeo4tkEof8QHNMzYbtpQw="; + hash = "sha256-FipypVdHAB62pfLk5mMezRLPiPKe0NbWkzlfoWC9D4w="; }; vendorHash = "sha256-kzyQW4bVE7oMOlHVG7LKG1AMTRYa5GLiiEhdarIhMSo="; From bf86849152860c2fb7e64ff64b21e128b92b3091 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 20:24:43 +0000 Subject: [PATCH 0549/1107] mitra: 3.14.0 -> 3.16.0 --- pkgs/by-name/mi/mitra/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/mitra/package.nix b/pkgs/by-name/mi/mitra/package.nix index 9168ed8b5596..e5db5f942940 100644 --- a/pkgs/by-name/mi/mitra/package.nix +++ b/pkgs/by-name/mi/mitra/package.nix @@ -6,18 +6,18 @@ rustPlatform.buildRustPackage rec { pname = "mitra"; - version = "3.14.0"; + version = "3.16.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "silverpill"; repo = "mitra"; rev = "v${version}"; - hash = "sha256-4f0zh7rdS0lTnN4OzUEL8tn6S18cYTj92vA8akyt4K4="; + hash = "sha256-jVm1ftFSOxEseNgze6xsF9k8G02UJc3f/CGxzdNzfhw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-MA/C/8x7Bmh6ekd4iHvjX9Lf/hG43Qb5nhEHINpeBHA="; + cargoHash = "sha256-QQRl9/Rc0cVs1ug5LXN9OFZI4uTO7Jgu1vQQM/RQsLo="; # require running database doCheck = false; From 6b50213aa58f9c575b144cabf42ab18ec06c05c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 16 Feb 2025 13:09:02 -0800 Subject: [PATCH 0550/1107] home-assistant: pin av to version 13.1.0 --- pkgs/servers/home-assistant/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 23f28b18597d..83d22add1d88 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -108,6 +108,16 @@ let }; }); + av = super.av.overridePythonAttrs (rec { + version = "13.1.0"; + src = fetchFromGitHub { + owner = "PyAV-Org"; + repo = "PyAV"; + tag = "v${version}"; + hash = "sha256-x2a9SC4uRplC6p0cD7fZcepFpRidbr6JJEEOaGSWl60="; + }; + }); + eq3btsmart = super.eq3btsmart.overridePythonAttrs (oldAttrs: rec { version = "1.4.1"; src = fetchFromGitHub { From 220ccaf34801a29626352abd7fd370f36700240d Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Sun, 16 Feb 2025 22:13:43 +0100 Subject: [PATCH 0551/1107] python3Packages.owslib: 3.32.0 -> 3.32.1 --- pkgs/development/python-modules/owslib/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix index 0f0ea8c546e1..f0009dc378f7 100644 --- a/pkgs/development/python-modules/owslib/default.nix +++ b/pkgs/development/python-modules/owslib/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "owslib"; - version = "0.32.0"; + version = "0.32.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,12 +23,13 @@ buildPythonPackage rec { owner = "geopython"; repo = "OWSLib"; tag = version; - hash = "sha256-q2O9FNBszNWfL1ekcohSd1RbdLFu8c+zxi+UFeQ7/mk="; + hash = "sha256-yQ/QDTTZLgBoTpa+ssvVPvDotBo6HXMvM2ZgTtbzOcA="; }; postPatch = '' substituteInPlace tox.ini \ - --replace-fail " --doctest-modules --doctest-glob 'tests/**/*.txt'" "" + --replace-fail "--doctest-modules" "" \ + --replace-fail "--doctest-glob='tests/**/*.txt'" "" ''; build-system = [ setuptools ]; @@ -65,7 +66,7 @@ buildPythonPackage rec { meta = with lib; { description = "Client for Open Geospatial Consortium web service interface standards"; homepage = "https://www.osgeo.org/projects/owslib/"; - changelog = "https://github.com/geopython/OWSLib/releases/tag/${version}"; + changelog = "https://github.com/geopython/OWSLib/releases/tag/${src.tag}"; license = licenses.bsd3; maintainers = teams.geospatial.members; }; From 8fb0aa8928ca675954ef78319f807c183b6866a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 21:23:33 +0000 Subject: [PATCH 0552/1107] maa-assistant-arknights: 5.12.3 -> 5.13.1 --- pkgs/by-name/ma/maa-assistant-arknights/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ma/maa-assistant-arknights/pin.json b/pkgs/by-name/ma/maa-assistant-arknights/pin.json index a7a5ae94d47f..1c556e1ea081 100644 --- a/pkgs/by-name/ma/maa-assistant-arknights/pin.json +++ b/pkgs/by-name/ma/maa-assistant-arknights/pin.json @@ -1,10 +1,10 @@ { "stable": { - "version": "5.12.3", - "hash": "sha256-Rl21p+nN5KnabzzH9cRWJnLIKX/3Haex+VSY3PvZs5Q=" + "version": "5.13.1", + "hash": "sha256-mXM1B54Wf1T61jfYz6ug7xPmhLeUqaB6jyBAkxIybfM=" }, "beta": { - "version": "5.13.0-beta.4", - "hash": "sha256-TPNS4VkbUNesT0TN2jAyTilzr5+3H6JxqOLujc7VQDA=" + "version": "5.13.1", + "hash": "sha256-mXM1B54Wf1T61jfYz6ug7xPmhLeUqaB6jyBAkxIybfM=" } } From dd3a29696846795609d422e1709187fc66c91312 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 21:38:04 +0000 Subject: [PATCH 0553/1107] qownnotes: 25.2.1 -> 25.2.7 --- pkgs/by-name/qo/qownnotes/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix index 94f49a28fd18..77480abffdc8 100644 --- a/pkgs/by-name/qo/qownnotes/package.nix +++ b/pkgs/by-name/qo/qownnotes/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "qownnotes"; appname = "QOwnNotes"; - version = "25.2.1"; + version = "25.2.7"; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz"; - hash = "sha256-hP2Q0VZfA6+jmUUqW0L/ufmw2vE9gFj5GSm2G8xRda0="; + hash = "sha256-OGXyyPlHop1xbFNVmq9s+qrC48GFNZkC77FdDdaLcVY="; }; nativeBuildInputs = From a919728213301276c8a0ee97412ed5debeb78f7f Mon Sep 17 00:00:00 2001 From: Julian Kuhn Date: Tue, 11 Feb 2025 22:03:52 +0100 Subject: [PATCH 0554/1107] nixos/alertmanager-gotify-bridge: init module --- nixos/modules/module-list.nix | 1 + .../prometheus/alertmanager-gotify-bridge.nix | 194 ++++++++++++++++++ 2 files changed, 195 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/alertmanager-gotify-bridge.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index dd5b09d91610..f5c9ac28616b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -951,6 +951,7 @@ ./services/monitoring/opentelemetry-collector.nix ./services/monitoring/osquery.nix ./services/monitoring/parsedmarc.nix + ./services/monitoring/prometheus/alertmanager-gotify-bridge.nix ./services/monitoring/prometheus/alertmanager-irc-relay.nix ./services/monitoring/prometheus/alertmanager-webhook-logger.nix ./services/monitoring/prometheus/alertmanager.nix diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager-gotify-bridge.nix b/nixos/modules/services/monitoring/prometheus/alertmanager-gotify-bridge.nix new file mode 100644 index 000000000000..21325a7da756 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/alertmanager-gotify-bridge.nix @@ -0,0 +1,194 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.prometheus.alertmanagerGotify; + pkg = cfg.package; + inherit (lib) + mkEnableOption + mkOption + types + mkIf + mkPackageOption + optionalString + ; +in +{ + meta.maintainers = with lib.maintainers; [ juli0604 ]; + options.services.prometheus.alertmanagerGotify = { + enable = mkEnableOption "alertmagager-gotify"; + package = mkPackageOption pkgs "alertmanager-gotify-bridge" { }; + bindAddress = mkOption { + type = types.str; + default = "0.0.0.0"; + description = "The address the server will listen on (bind address)."; + }; + defaultPriority = mkOption { + type = types.int; + default = 5; + description = "The default priority for messages sent to gotify."; + }; + debug = mkOption { + type = types.bool; + default = false; + description = "Enables extended logs for debugging purposes. Should be disabled in productive mode."; + }; + dispatchErrors = mkOption { + type = types.bool; + default = false; + description = "When enabled, alerts will be tried to dispatch with an error message regarding faulty templating or missing fields to help debugging."; + }; + extendedDetails = mkOption { + type = types.bool; + default = false; + description = "When enabled, alerts are presented in HTML format and include colorized status (FIR|RES), alert start time, and a link to the generator of the alert."; + }; + messageAnnotation = mkOption { + type = types.str; + description = "Annotation holding the alert message."; + }; + openFirewall = mkOption { + type = types.bool; + default = false; + description = "Opens the bridge port in the firewall."; + }; + port = mkOption { + type = types.port; + default = 8080; + description = "The local port the bridge is listening on."; + }; + priorityAnnotation = mkOption { + type = types.str; + default = "priority"; + description = "Annotation holding the priority of the alert."; + }; + timeout = mkOption { + type = types.ints.positive; + default = 5; + description = "The time between sending a message and the timeout."; + }; + titleAnnotation = mkOption { + type = types.str; + default = "summary"; + description = "Annotation holding the title of the alert"; + }; + webhookPath = mkOption { + type = types.str; + default = "/gotify_webhook"; + description = "The URL path to handle requests on."; + }; + environmentFile = mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + description = '' + File containing additional config environment variables for alertmanager-gotify-bridge. + This is especially for secrets like GOTIFY_TOKEN and AUTH_PASSWORD. + ''; + }; + gotifyEndpoint = { + host = mkOption { + type = types.str; + default = "127.0.0.1"; + description = "The hostname or ip your gotify endpoint is running."; + }; + port = mkOption { + type = types.port; + default = 443; + description = "The port your gotify endpoint is running."; + }; + tls = mkOption { + type = types.bool; + default = true; + description = "If your gotify endpoint uses https, leave this option set to default"; + }; + }; + metrics = { + username = mkOption { + type = types.str; + description = "The username used to access your metrics."; + }; + namespace = mkOption { + type = types.str; + default = "alertmanager-gotify-bridge"; + description = "The namescape of the metrics."; + }; + path = mkOption { + type = types.str; + default = "/metrics"; + description = "The path under which the metrics will be exposed."; + }; + }; + }; + + config = mkIf cfg.enable { + users = { + groups.alertmanager-gotify = { }; + users.alertmanager-gotify = { + group = "alertmanager-gotify"; + isSystemUser = true; + }; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.port ]; + }; + + systemd.services.alertmanager-gotify-bridge = { + description = "A bridge between Prometheus AlertManager and a Gotify server"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${lib.getExe pkg} ${optionalString cfg.debug "--debug"}"; + EnvironmentFile = lib.mkIf (cfg.environmentFile != null) [ cfg.environmentFile ]; + User = "alertmanager-gotify"; + Group = "alertmanager-gotify"; + + #hardening + NoNewPrivileges = true; + PrivateTmp = true; + PrivateDevices = true; + PrivateIPC = true; + DevicePolicy = "closed"; + ProtectSystem = "strict"; + ProtectHome = "read-only"; + ProtectControlGroups = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectKernelTunables = true; + ProtectHostname = true; + ProtectProc = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + MemoryDenyWriteExecute = true; + LockPersonality = true; + ProcSubset = "pid"; + SystemCallArchitectures = "native"; + RemoveIPC = true; + + }; + environment = { + BIND_ADDRESS = cfg.bindAddress; + DEFAULT_PRIORITY = toString cfg.defaultPriority; + DISPATCH_ERRORS = toString cfg.dispatchErrors; + EXTENDED_DETAILS = toString cfg.extendedDetails; + MESSAGE_ANNOTATION = cfg.messageAnnotation; + PORT = toString cfg.port; + PRIORITY_ANNOTATION = cfg.priorityAnnotation; + TIMEOUT = "${toString cfg.timeout}s"; + TITLE_ANNOTATION = cfg.titleAnnotation; + WEBHOOK_PATH = cfg.webhookPath; + GOTIFY_ENDPOINT = "${ + if cfg.gotifyEndpoint.tls then "https://" else "http://" + }${toString cfg.gotifyEndpoint.host}:${toString cfg.gotifyEndpoint.port}/message"; + AUTH_USERNAME = cfg.metrics.username; + }; + }; + }; +} From 8424265bce0518a9732bf7fd4b1927330d894b43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 22:51:35 +0000 Subject: [PATCH 0555/1107] 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 c585679a42a8376d6ad3d6869f2c1eba36ff0c90 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Sun, 16 Feb 2025 18:03:44 -0500 Subject: [PATCH 0556/1107] tailwindcss: make v4 default, move tailwindcss_3 to by-name --- pkgs/by-name/ta/tailwindcss/package.nix | 1 + .../default.nix => by-name/ta/tailwindcss_3/package.nix} | 3 +-- .../tools/tailwindcss => by-name/ta/tailwindcss_3}/update.sh | 0 pkgs/by-name/ta/tailwindcss_4/package.nix | 1 - pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 insertions(+), 5 deletions(-) create mode 100644 pkgs/by-name/ta/tailwindcss/package.nix rename pkgs/{development/tools/tailwindcss/default.nix => by-name/ta/tailwindcss_3/package.nix} (97%) rename pkgs/{development/tools/tailwindcss => by-name/ta/tailwindcss_3}/update.sh (100%) diff --git a/pkgs/by-name/ta/tailwindcss/package.nix b/pkgs/by-name/ta/tailwindcss/package.nix new file mode 100644 index 000000000000..e981f68a88e5 --- /dev/null +++ b/pkgs/by-name/ta/tailwindcss/package.nix @@ -0,0 +1 @@ +{ tailwindcss_4 }: tailwindcss_4 diff --git a/pkgs/development/tools/tailwindcss/default.nix b/pkgs/by-name/ta/tailwindcss_3/package.nix similarity index 97% rename from pkgs/development/tools/tailwindcss/default.nix rename to pkgs/by-name/ta/tailwindcss_3/package.nix index f562cabd500f..2f43e836ff9a 100644 --- a/pkgs/development/tools/tailwindcss/default.nix +++ b/pkgs/by-name/ta/tailwindcss_3/package.nix @@ -3,7 +3,6 @@ fetchurl, stdenv, runCommand, - tailwindcss, }: let inherit (stdenv.hostPlatform) system; @@ -30,7 +29,7 @@ let .${system} or throwSystem; in stdenv.mkDerivation (finalAttrs: { - pname = "tailwindcss"; + pname = "tailwindcss_3"; version = "3.4.17"; src = fetchurl { diff --git a/pkgs/development/tools/tailwindcss/update.sh b/pkgs/by-name/ta/tailwindcss_3/update.sh similarity index 100% rename from pkgs/development/tools/tailwindcss/update.sh rename to pkgs/by-name/ta/tailwindcss_3/update.sh diff --git a/pkgs/by-name/ta/tailwindcss_4/package.nix b/pkgs/by-name/ta/tailwindcss_4/package.nix index 9c4128a4df5a..0032ca379844 100644 --- a/pkgs/by-name/ta/tailwindcss_4/package.nix +++ b/pkgs/by-name/ta/tailwindcss_4/package.nix @@ -5,7 +5,6 @@ versionCheckHook, autoPatchelfHook, makeWrapper, - tailwindcss_4, }: let version = "4.0.6"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5d9e8ce8a00..9ee8e802c788 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1081,8 +1081,6 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; - tailwindcss = callPackage ../development/tools/tailwindcss { }; - ufolint = with python3Packages; toPythonApplication ufolint; valeronoi = qt6Packages.callPackage ../tools/misc/valeronoi { }; From 1ea38ae206f7152fffb35f816139098db17512d1 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Sun, 16 Feb 2025 18:09:19 -0500 Subject: [PATCH 0557/1107] tailwindcss_4: add adamcstephens as maintainer --- pkgs/by-name/ta/tailwindcss_4/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ta/tailwindcss_4/package.nix b/pkgs/by-name/ta/tailwindcss_4/package.nix index 0032ca379844..388a39759bb4 100644 --- a/pkgs/by-name/ta/tailwindcss_4/package.nix +++ b/pkgs/by-name/ta/tailwindcss_4/package.nix @@ -70,7 +70,10 @@ stdenv.mkDerivation { homepage = "https://tailwindcss.com/blog/tailwindcss-v4"; license = lib.licenses.mit; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; - maintainers = [ lib.maintainers.adamjhf ]; + maintainers = with lib.maintainers; [ + adamcstephens + adamjhf + ]; mainProgram = "tailwindcss"; platforms = lib.platforms.darwin ++ lib.platforms.linux; }; From 285bd8dd46ff90b5572cdbf51e6658eacc780b17 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Sun, 16 Feb 2025 18:16:53 -0500 Subject: [PATCH 0558/1107] tailwindcss_[34]: split and fix updater scripts --- pkgs/by-name/ta/tailwindcss_3/update.sh | 14 +++++++------- pkgs/by-name/ta/tailwindcss_4/update.sh | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) mode change 100644 => 100755 pkgs/by-name/ta/tailwindcss_4/update.sh diff --git a/pkgs/by-name/ta/tailwindcss_3/update.sh b/pkgs/by-name/ta/tailwindcss_3/update.sh index b3a9ccf37819..1a5f68d74f07 100755 --- a/pkgs/by-name/ta/tailwindcss_3/update.sh +++ b/pkgs/by-name/ta/tailwindcss_3/update.sh @@ -1,27 +1,27 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused jq nix-prefetch +#!nix-shell -i bash -p common-updater-scripts gnused jq nix-prefetch set -eou pipefail ROOT="$(dirname "$(readlink -f "$0")")" -CURRENT_VERSION=$(nix-instantiate --eval --strict --json -A tailwindcss.version . | jq -r .) -LATEST_VERSION=$(curl --fail --silent https://api.github.com/repos/tailwindlabs/tailwindcss/releases/latest | jq --raw-output .tag_name | sed 's/v//') -sed -i "s/version = \".*\"/version = \"${LATEST_VERSION}\"/" "$ROOT/default.nix" +CURRENT_VERSION=$(nix-instantiate --eval --strict --json -A tailwindcss_3.version . | jq -r .) +LATEST_VERSION=$(list-git-tags --url=https://github.com/tailwindlabs/tailwindcss | rg 'v3[0-9\.]*$' | sed -e 's/^v//' | sort -V | tail -n 1) +sed -i "s/version = \".*\"/version = \"${LATEST_VERSION}\"/" "$ROOT/package.nix" if [ "$CURRENT_VERSION" = "$LATEST_VERSION" ]; then - echo "tailwindcss already at latest version $CURRENT_VERSION, exiting" + echo "tailwindcss_3 already at latest version $CURRENT_VERSION, exiting" exit 0 fi function updatePlatform() { NIXPLAT=$1 TAILWINDPLAT=$2 - echo "Updating tailwindcss for $NIXPLAT" + echo "Updating tailwindcss_3 for $NIXPLAT" URL="https://github.com/tailwindlabs/tailwindcss/releases/download/v${LATEST_VERSION}/tailwindcss-${TAILWINDPLAT}" HASH=$(nix hash to-sri --type sha256 "$(nix-prefetch-url --type sha256 "$URL")") - sed -i "s,$NIXPLAT = \"sha256.*\",$NIXPLAT = \"${HASH}\"," "$ROOT/default.nix" + sed -i "s,$NIXPLAT = \"sha256.*\",$NIXPLAT = \"${HASH}\"," "$ROOT/package.nix" } updatePlatform aarch64-darwin macos-arm64 diff --git a/pkgs/by-name/ta/tailwindcss_4/update.sh b/pkgs/by-name/ta/tailwindcss_4/update.sh old mode 100644 new mode 100755 index bcf057e6e9b9..3f50e10768e1 --- a/pkgs/by-name/ta/tailwindcss_4/update.sh +++ b/pkgs/by-name/ta/tailwindcss_4/update.sh @@ -1,27 +1,27 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused jq nix-prefetch +#!nix-shell -i bash -p common-updater-scripts gnused jq nix-prefetch set -eou pipefail ROOT="$(dirname "$(readlink -f "$0")")" CURRENT_VERSION=$(nix-instantiate --eval --strict --json -A tailwindcss.version . | jq -r .) -LATEST_VERSION=$(curl --fail --silent https://api.github.com/repos/tailwindlabs/tailwindcss/releases/latest | jq --raw-output .tag_name | sed 's/v//') -sed -i "s/version = \".*\"/version = \"${LATEST_VERSION}\"/" "$ROOT/default.nix" +LATEST_VERSION=$(list-git-tags --url=https://github.com/tailwindlabs/tailwindcss | rg 'v4[0-9\.]*$' | sed -e 's/^v//' | sort -V | tail -n 1) +sed -i "s/version = \".*\"/version = \"${LATEST_VERSION}\"/" "$ROOT/package.nix" if [ "$CURRENT_VERSION" = "$LATEST_VERSION" ]; then - echo "tailwindcss already at latest version $CURRENT_VERSION, exiting" + echo "tailwindcss_4 already at latest version $CURRENT_VERSION, exiting" exit 0 fi function updatePlatform() { NIXPLAT=$1 TAILWINDPLAT=$2 - echo "Updating tailwindcss for $NIXPLAT" + echo "Updating tailwindcss_4 for $NIXPLAT" URL="https://github.com/tailwindlabs/tailwindcss/releases/download/v${LATEST_VERSION}/tailwindcss-${TAILWINDPLAT}" HASH=$(nix hash to-sri --type sha256 "$(nix-prefetch-url --type sha256 "$URL")") - sed -i "s,$NIXPLAT = \"sha256.*\",$NIXPLAT = \"${HASH}\"," "$ROOT/default.nix" + sed -i "s,$NIXPLAT = \"sha256.*\",$NIXPLAT = \"${HASH}\"," "$ROOT/package.nix" } updatePlatform aarch64-darwin macos-arm64 From 7265adea99020aa3ff809e679806d817a1026026 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Tue, 28 Dec 2021 23:34:24 +0100 Subject: [PATCH 0559/1107] integrity-scrub: init at 0.6.5 --- pkgs/by-name/in/integrity-scrub/package.nix | 39 +++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/by-name/in/integrity-scrub/package.nix diff --git a/pkgs/by-name/in/integrity-scrub/package.nix b/pkgs/by-name/in/integrity-scrub/package.nix new file mode 100644 index 000000000000..3df0878be2c9 --- /dev/null +++ b/pkgs/by-name/in/integrity-scrub/package.nix @@ -0,0 +1,39 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "integrity-scrub"; + version = "0.6.5"; + + src = fetchFromGitHub { + owner = "illdefined"; + repo = "integrity-scrub"; + tag = version; + hash = "sha256-oWS6HxdZ8tGeIRGpfHHkNhNdepBjhhdgTjKmxElNPbk="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-3LC3eZNmHG6OFIvQzmvs4BCSX0CVpwaYhZM2H2YoY4M="; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + doInstallCheck = true; + + # Requires unstable features + env.RUSTC_BOOTSTRAP = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/illdefined/integrity-scrub"; + description = "Scrub dm-integrity devices"; + license = lib.licenses.cc0; + maintainers = with lib.maintainers; [ mvs ]; + platforms = lib.platforms.linux; + }; +} From f61923eca6a440bdf1bc7219e764a09ff6b5152b Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Sun, 16 Feb 2025 18:28:35 -0500 Subject: [PATCH 0560/1107] beam*: add beam team as code owners --- ci/OWNERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ci/OWNERS b/ci/OWNERS index c64ef4208e30..170bc964a3a7 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -443,3 +443,9 @@ pkgs/by-name/lx/lxc* @adamcstephens /pkgs/by-name/ap/apple-sdk @NixOS/darwin-core /pkgs/os-specific/darwin/apple-source-releases @NixOS/darwin-core /pkgs/stdenv/darwin @NixOS/darwin-core + +# BEAM +pkgs/development/beam-modules/ @NixOS/beam +pkgs/development/interpreters/erlang/ @NixOS/beam +pkgs/development/interpreters/elixir/ @NixOS/beam +pkgs/development/interpreters/lfe/ @NixOS/beam From 4895cc33bb06405c506ebcbc7ac0222314dda04d Mon Sep 17 00:00:00 2001 From: phaer Date: Sun, 16 Feb 2025 19:37:24 +0100 Subject: [PATCH 0561/1107] python3Packages.pex: drop phaer from maintainers --- pkgs/development/python-modules/pex/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 2b1d8f0358ee..b7de16f6b259 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -32,7 +32,6 @@ buildPythonPackage rec { license = licenses.asl20; maintainers = with maintainers; [ copumpkin - phaer ]; }; } From 46ba71a13b8a6e0e9420dc27d05c3148ce339d64 Mon Sep 17 00:00:00 2001 From: Damian Sypniewski Date: Tue, 4 Feb 2025 11:32:33 +0900 Subject: [PATCH 0562/1107] dynein: 0.2.1 -> 0.3.0 --- pkgs/development/tools/database/dynein/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/dynein/default.nix b/pkgs/development/tools/database/dynein/default.nix index 7497a7db3803..75fcbb6ffe83 100644 --- a/pkgs/development/tools/database/dynein/default.nix +++ b/pkgs/development/tools/database/dynein/default.nix @@ -1,6 +1,7 @@ { fetchFromGitHub, lib, + cmake, openssl, pkg-config, rustPlatform, @@ -8,28 +9,30 @@ rustPlatform.buildRustPackage rec { pname = "dynein"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "awslabs"; repo = "dynein"; rev = "v${version}"; - hash = "sha256-QhasTFGOFOjzNKdQtA+eBhKy51O4dFt6vpeIAIOM2rQ="; + hash = "sha256-GU/zZ7IJPfpRbrWjrVwPDSFjFfMLoG/c8DDWlN6nZ94="; }; # Use system openssl. OPENSSL_NO_VENDOR = 1; useFetchCargoVendor = true; - cargoHash = "sha256-rOfJz5G6kO1/IM6M6dZJTJmzJhx/450dIPvAVBHUp5o="; + cargoHash = "sha256-PA7Hvn+vYBD80thkIamwOhw4lJWAmU/TQBnwJro4r7c="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl + cmake ]; preBuild = '' + export CMAKE=${lib.getDev cmake}/bin/cmake export OPENSSL_DIR=${lib.getDev openssl} export OPENSSL_LIB_DIR=${lib.getLib openssl}/lib ''; From 4119f477bd06efa314714239dea90fbe76aa9d65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 23:37:41 +0000 Subject: [PATCH 0563/1107] release-plz: 0.3.113 -> 0.3.120 --- pkgs/by-name/re/release-plz/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/release-plz/package.nix b/pkgs/by-name/re/release-plz/package.nix index fa77c246f039..b42729c44cfc 100644 --- a/pkgs/by-name/re/release-plz/package.nix +++ b/pkgs/by-name/re/release-plz/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "release-plz"; - version = "0.3.113"; + version = "0.3.120"; src = fetchFromGitHub { owner = "MarcoIeni"; repo = "release-plz"; rev = "release-plz-v${version}"; - hash = "sha256-m33tBLNOU2+vjIICU0ggnNxLvD/fxJVSxT6bRih9e7U="; + hash = "sha256-5e00l84xKZVqOIDr+Jx0kLFaWEs/oe+EEnDp/obvwWM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-XPe5lQMKTGWlt9E3JSsCT1g7VTFBo/aYrVSf0VNOpVk="; + cargoHash = "sha256-3sTeWE/qMOIR+TxGjL813bPpHou/8Zjt7i0+hEOep1c="; nativeBuildInputs = [ installShellFiles From 929d8601ea6d7aa4c423e9320b95fa7569852e4a Mon Sep 17 00:00:00 2001 From: r-vdp Date: Mon, 17 Feb 2025 00:38:43 +0100 Subject: [PATCH 0564/1107] 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 b293d65bc87e903af189b372aa4d39d24a61582f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 23:40:34 +0000 Subject: [PATCH 0565/1107] cargo-nextest: 0.9.87 -> 0.9.91 --- pkgs/by-name/ca/cargo-nextest/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-nextest/package.nix b/pkgs/by-name/ca/cargo-nextest/package.nix index 3c204c58fed0..72ff8afb084c 100644 --- a/pkgs/by-name/ca/cargo-nextest/package.nix +++ b/pkgs/by-name/ca/cargo-nextest/package.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.87"; + version = "0.9.91"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - hash = "sha256-J+84FZfrbv6jp2T9cYgodLZ+TgIAht+uJSVi5ULDGBU="; + hash = "sha256-jLC90TewhtXiYmbOtgdyzPtS7VlCBMCXWRJlM1DUCI8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-qyqhhAitl0u69JYX+qjN8OnTyF17VdjjkbioFyA/W8s="; + cargoHash = "sha256-Gjf54oc3Z/Ehc4Vg8wi/TfwMOZnPSR4ck4HCS57SNIc="; cargoBuildFlags = [ "-p" "cargo-nextest" ]; cargoTestFlags = [ "-p" "cargo-nextest" ]; From 63f5033fa6459eaebd82e8c1979d6cc01ac7a1af Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Sun, 16 Feb 2025 16:41:47 -0700 Subject: [PATCH 0566/1107] mautrix-whatsapp: 0.11.2 -> 0.11.3 https://github.com/mautrix/whatsapp/releases/tag/v0.11.3 Signed-off-by: Sumner Evans --- pkgs/by-name/ma/mautrix-whatsapp/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mautrix-whatsapp/package.nix b/pkgs/by-name/ma/mautrix-whatsapp/package.nix index f0b4ec1f0654..ff862f38d5f6 100644 --- a/pkgs/by-name/ma/mautrix-whatsapp/package.nix +++ b/pkgs/by-name/ma/mautrix-whatsapp/package.nix @@ -1,5 +1,6 @@ { lib, + nix-update-script, buildGoModule, fetchFromGitHub, olm, @@ -13,22 +14,24 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - hash = "sha256-3S4aNoxK99iExhTJQP/JNq0GajCUjbdq4cUgCBudyXI="; + hash = "sha256-b56WCt71A1+TUN7ug3E/F8A99vqGJLJfHN49klZzx9I="; }; buildInputs = lib.optional (!withGoolm) olm; tags = lib.optional withGoolm "goolm"; - vendorHash = "sha256-9iX+pzken+/7+nqYa71rcc1olCdpmu3UfR09ag3KSKs="; + vendorHash = "sha256-8Iu5rL42TFFqlClQf01kT86Hhb46qsPObjE1snuz1So="; doCheck = false; + passthru.updateScript = nix-update-script { }; + meta = with lib; { homepage = "https://github.com/tulir/mautrix-whatsapp"; description = "Matrix <-> Whatsapp hybrid puppeting/relaybot bridge"; From 1a379815bb9a330585abba05df47468527c1bb4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 16 Feb 2025 15:43:27 -0800 Subject: [PATCH 0567/1107] python313Packages.explorerscript: 0.2.1.post2 -> 0.2.3 Diff: https://github.com/SkyTemple/explorerscript/compare/refs/tags/0.2.1.post2...0.2.3 --- .../python-modules/explorerscript/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/explorerscript/default.nix b/pkgs/development/python-modules/explorerscript/default.nix index 76d92bb173c2..329e6baf2149 100644 --- a/pkgs/development/python-modules/explorerscript/default.nix +++ b/pkgs/development/python-modules/explorerscript/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "explorerscript"; - version = "0.2.1.post2"; + version = "0.2.3"; pyproject = true; src = fetchFromGitHub { owner = "SkyTemple"; repo = "explorerscript"; tag = version; - hash = "sha256-cKEceWr7XmZbuomPOmjQ32ptAjz3LZDQBWAgZEFadDY="; + hash = "sha256-fh40HCU12AVA3cZ5xvRott+93qo8VzHFsbPzTkoV3x4="; # Include a pinned antlr4 fork used as a C++ library fetchSubmodules = true; }; @@ -29,19 +29,17 @@ buildPythonPackage rec { build-system = [ setuptools scikit-build-core - ninja - cmake pybind11 ]; + nativeBuildInputs = [ + cmake + ninja + ]; + # The source include some auto-generated ANTLR code that could be recompiled, but trying that resulted in a crash while decompiling unionall.ssb. # We thus do not rebuild them. - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "scikit-build-core<=0.9.8" scikit-build-core - ''; - dontUseCmakeConfigure = true; pythonRelaxDeps = [ From 79e6c758eb11eb7037d1282c3a38922ca7d1a26b Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 15 Feb 2025 21:40:09 -0500 Subject: [PATCH 0568/1107] python312Packages.sumo: modernize --- .../python-modules/sumo/default.nix | 60 ++++++++++--------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/pkgs/development/python-modules/sumo/default.nix b/pkgs/development/python-modules/sumo/default.nix index 3cf6e4150683..6f94f35451f3 100644 --- a/pkgs/development/python-modules/sumo/default.nix +++ b/pkgs/development/python-modules/sumo/default.nix @@ -3,24 +3,25 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - cython, - h5py, - matplotlib, - numpy, - phonopy, - pymatgen, - scipy, - seekpath, + setuptools, spglib, + numpy, + scipy, + h5py, + pymatgen, + phonopy, + matplotlib, + seekpath, castepxbin, - pytestCheckHook, colormath, + importlib-resources, + pytestCheckHook, }: buildPythonPackage rec { pname = "sumo"; version = "2.3.10"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -31,30 +32,35 @@ buildPythonPackage rec { hash = "sha256-WoOW+JPo5x9V6LN+e8Vf3Q3ohHhQVK81s0Qk7oPn1Tk="; }; - nativeBuildInputs = [ cython ]; - - propagatedBuildInputs = [ - castepxbin - colormath - h5py - matplotlib - numpy - phonopy - pymatgen - scipy - seekpath - spglib + build-system = [ + setuptools ]; - nativeCheckInputs = [ pytestCheckHook ]; + dependencies = [ + spglib + numpy + scipy + h5py + pymatgen + phonopy + matplotlib + seekpath + castepxbin + colormath + importlib-resources + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "sumo" ]; - meta = with lib; { + meta = { description = "Toolkit for plotting and analysis of ab initio solid-state calculation data"; homepage = "https://github.com/SMTG-UCL/sumo"; changelog = "https://github.com/SMTG-Bham/sumo/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ psyanticy ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ psyanticy ]; }; } From 1215ea96c55576e55a40fa32374fe427987faa2a Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 15 Feb 2025 22:28:47 -0500 Subject: [PATCH 0569/1107] python312Packages.numericalunits: fix build --- .../python-modules/numericalunits/default.nix | 35 +++++++++++++------ 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/numericalunits/default.nix b/pkgs/development/python-modules/numericalunits/default.nix index 5fc21a89e878..5f62372502f6 100644 --- a/pkgs/development/python-modules/numericalunits/default.nix +++ b/pkgs/development/python-modules/numericalunits/default.nix @@ -1,26 +1,39 @@ { lib, buildPythonPackage, - fetchPypi, - isPy3k, + fetchFromGitHub, + setuptools, + pytestCheckHook, }: buildPythonPackage rec { - version = "1.26"; - format = "setuptools"; pname = "numericalunits"; + version = "1.26"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-igtplF3WXqz27vjIaLzTKY10OfWIL1B7tgYOwgxyPhI="; + src = fetchFromGitHub { + owner = "sbyrnes321"; + repo = "numericalunits"; + tag = "numericalunits-${version}"; + hash = "sha256-vPB1r+j+p9n+YLnBjHuk2t+QSr+adEOjyC45QSbeb4M="; }; - disabled = !isPy3k; + build-system = [ + setuptools + ]; - meta = with lib; { + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests/tests.py" + ]; + + meta = { homepage = "http://pypi.python.org/pypi/numericalunits"; description = "Package that lets you define quantities with unit"; - license = licenses.mit; - maintainers = [ ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nickcao ]; }; } From e8234072b5a498764b4f0a763c98ccc0a427456c Mon Sep 17 00:00:00 2001 From: Dionysis Grigoropoulos Date: Sat, 15 Feb 2025 23:28:56 +0200 Subject: [PATCH 0570/1107] python3Packages.warcio: fix build Closes #382174 --- pkgs/development/python-modules/warcio/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/warcio/default.nix b/pkgs/development/python-modules/warcio/default.nix index 91ddc5ed3d3b..cb9536e18d41 100644 --- a/pkgs/development/python-modules/warcio/default.nix +++ b/pkgs/development/python-modules/warcio/default.nix @@ -11,6 +11,7 @@ setuptools, six, wsgiprox, + pytest-cov-stub, }: buildPythonPackage rec { @@ -47,13 +48,12 @@ buildPythonPackage rec { pytestCheckHook requests wsgiprox + pytest-cov-stub ]; - pytestFlagsArray = [ "--offline" ]; - - disabledTests = [ - # Tests require network access, see above - "test_get_cache_to_file" + pytestFlagsArray = [ + "--offline" + "--ignore=test/test_capture_http_proxy.py" ]; pythonImportsCheck = [ "warcio" ]; From b4d08c1e7cac47e71399ef9880cd5906fedbd3d8 Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Sun, 16 Feb 2025 19:07:44 -0500 Subject: [PATCH 0571/1107] tmuxPlugins.dracula: 3.0.0 -> 3.1.0 Signed-off-by: Ethan Carter Edwards --- pkgs/misc/tmux-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 2d9450274703..ea59cf1e3f1a 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -197,12 +197,12 @@ in rec { dracula = mkTmuxPlugin rec { pluginName = "dracula"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "dracula"; repo = "tmux"; rev = "v${version}"; - hash = "sha256-VY4PyaQRwTc6LWhPJg4inrQf5K8+bp0+eqRhR7+Iexk="; + hash = "sha256-WNgCa8F618JQiHDM1YxHj7oR7w+7U6SU89K90RYIUh8="; }; meta = with lib; { homepage = "https://draculatheme.com/tmux"; From 1146c444a9ce48358af9351ce925e5a33219a6b6 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Sun, 16 Feb 2025 19:24:58 -0500 Subject: [PATCH 0572/1107] grafana-loki, promtail: move to by-name --- .../gr/grafana-loki/package.nix} | 55 ++++++++++++------- .../pr/promtail/package.nix} | 0 pkgs/top-level/all-packages.nix | 3 - 3 files changed, 34 insertions(+), 24 deletions(-) rename pkgs/{servers/monitoring/loki/default.nix => by-name/gr/grafana-loki/package.nix} (64%) rename pkgs/{servers/monitoring/loki/promtail.nix => by-name/pr/promtail/package.nix} (100%) diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/by-name/gr/grafana-loki/package.nix similarity index 64% rename from pkgs/servers/monitoring/loki/default.nix rename to pkgs/by-name/gr/grafana-loki/package.nix index d5434daeef38..a5f68648c243 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/by-name/gr/grafana-loki/package.nix @@ -1,12 +1,13 @@ -{ stdenv -, lib -, buildGoModule -, fetchFromGitHub -, makeWrapper -, nixosTests -, systemd -, testers -, grafana-loki +{ + stdenv, + lib, + buildGoModule, + fetchFromGitHub, + makeWrapper, + nixosTests, + systemd, + testers, + grafana-loki, }: buildGoModule rec { @@ -31,7 +32,7 @@ buildGoModule rec { "cmd/lokitool" ]; - tags = ["promtail_journal_enabled"]; + tags = [ "promtail_journal_enabled" ]; nativeBuildInputs = [ makeWrapper ]; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ systemd.dev ]; @@ -49,22 +50,34 @@ buildGoModule rec { }; }; - ldflags = let t = "github.com/grafana/loki/v3/pkg/util/build"; in [ - "-s" - "-w" - "-X ${t}.Version=${version}" - "-X ${t}.BuildUser=nix@nixpkgs" - "-X ${t}.BuildDate=unknown" - "-X ${t}.Branch=unknown" - "-X ${t}.Revision=unknown" - ]; + ldflags = + let + t = "github.com/grafana/loki/v3/pkg/util/build"; + in + [ + "-s" + "-w" + "-X ${t}.Version=${version}" + "-X ${t}.BuildUser=nix@nixpkgs" + "-X ${t}.BuildDate=unknown" + "-X ${t}.Branch=unknown" + "-X ${t}.Revision=unknown" + ]; meta = with lib; { description = "Like Prometheus, but for logs"; mainProgram = "promtail"; - license = with licenses; [ agpl3Only asl20 ]; + license = with licenses; [ + agpl3Only + asl20 + ]; homepage = "https://grafana.com/oss/loki/"; changelog = "https://github.com/grafana/loki/releases/tag/v${version}"; - maintainers = with maintainers; [ willibutz globin mmahut emilylange ]; + maintainers = with maintainers; [ + willibutz + globin + mmahut + emilylange + ]; }; } diff --git a/pkgs/servers/monitoring/loki/promtail.nix b/pkgs/by-name/pr/promtail/package.nix similarity index 100% rename from pkgs/servers/monitoring/loki/promtail.nix rename to pkgs/by-name/pr/promtail/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84e92b4eab81..f9d8d3139c04 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11261,9 +11261,6 @@ with pkgs; grafana = callPackage ../servers/monitoring/grafana { }; grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { }; - grafana-loki = callPackage ../servers/monitoring/loki { }; - promtail = callPackage ../servers/monitoring/loki/promtail.nix { }; - hasura-graphql-engine = haskell.lib.compose.justStaticExecutables haskell.packages.ghc810.graphql-engine; hasura-cli = callPackage ../servers/hasura/cli.nix { }; From be4ad2d6436c19f8af7ae8f4da1219644191062a Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Sun, 16 Feb 2025 19:26:14 -0500 Subject: [PATCH 0573/1107] grafana-loki: add updateScript --- pkgs/by-name/gr/grafana-loki/package.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/gr/grafana-loki/package.nix b/pkgs/by-name/gr/grafana-loki/package.nix index a5f68648c243..e2febf9a7713 100644 --- a/pkgs/by-name/gr/grafana-loki/package.nix +++ b/pkgs/by-name/gr/grafana-loki/package.nix @@ -4,6 +4,7 @@ buildGoModule, fetchFromGitHub, makeWrapper, + nix-update-script, nixosTests, systemd, testers, @@ -42,12 +43,16 @@ buildGoModule rec { --prefix LD_LIBRARY_PATH : "${lib.getLib systemd}/lib" ''; - passthru.tests = { - inherit (nixosTests) loki; - version = testers.testVersion { - command = "loki --version"; - package = grafana-loki; + passthru = { + tests = { + inherit (nixosTests) loki; + version = testers.testVersion { + command = "loki --version"; + package = grafana-loki; + }; }; + + updateScript = nix-update-script { }; }; ldflags = From fdd64ce4046dc2986d3699144fc781057f08095b Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 13 Feb 2025 08:30:36 -0500 Subject: [PATCH 0574/1107] crystal_1_2: drop --- pkgs/development/compilers/crystal/default.nix | 9 --------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index a0aa47a88151..9e2a97ebdb8c 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -10,7 +10,6 @@ , git , gmp , hostname -, libatomic_ops , libevent , libiconv , libxml2 @@ -265,14 +264,6 @@ rec { }; }; - crystal_1_2 = generic { - version = "1.2.2"; - sha256 = "sha256-nyOXhsutVBRdtJlJHe2dALl//BUXD1JeeQPgHU4SwiU="; - binary = binaryCrystal_1_2; - llvmPackages = llvmPackages_13; - extraBuildInputs = [ libatomic_ops ]; - }; - crystal_1_7 = generic { version = "1.7.3"; sha256 = "sha256-ULhLGHRIZbsKhaMvNhc+W74BwNgfEjHcMnVNApWY+EE="; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1f24eadb8713..fa47b49da074 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -248,6 +248,7 @@ mapAliases { cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15 crispyDoom = crispy-doom; # Added 2023-05-01 crossLibcStdenv = stdenvNoLibc; # Added 2024-09-06 + crystal_1_2 = throw "'crystal_1_2' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13 clash-geoip = throw "'clash-geoip' has been removed. Consider using 'dbip-country-lite' instead."; # added 2024-10-19 clash-verge = throw "'clash-verge' has been removed, as it was broken and unmaintained. Consider using 'clash-verge-rev' or 'clash-nyanpasu' instead"; # Added 2024-09-17 clasp = clingo; # added 2022-12-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d8c1b340cbf..f01960f08dee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5706,7 +5706,6 @@ with pkgs; }; inherit (darwin.apple_sdk_11_0.callPackage ../development/compilers/crystal { }) - crystal_1_2 crystal_1_7 crystal_1_8 crystal_1_9 From 758e3fad7a6c5eeb444e6e65ec90339100f0f139 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 13 Feb 2025 09:15:30 -0500 Subject: [PATCH 0575/1107] crystal_1_7: drop --- pkgs/development/compilers/crystal/default.nix | 8 -------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 9e2a97ebdb8c..71bc60a727e2 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -15,7 +15,6 @@ , libxml2 , libyaml , libffi -, llvmPackages_13 , llvmPackages_15 , llvmPackages_18 , makeWrapper @@ -264,13 +263,6 @@ rec { }; }; - crystal_1_7 = generic { - version = "1.7.3"; - sha256 = "sha256-ULhLGHRIZbsKhaMvNhc+W74BwNgfEjHcMnVNApWY+EE="; - binary = binaryCrystal_1_2; - llvmPackages = llvmPackages_13; - }; - crystal_1_8 = generic { version = "1.8.2"; sha256 = "sha256-YAORdipzpC9CrFgZUFlFfjzlJQ6ZeA2ekVu8IfPOxR8="; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fa47b49da074..32b99ff92f2f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -249,6 +249,7 @@ mapAliases { crispyDoom = crispy-doom; # Added 2023-05-01 crossLibcStdenv = stdenvNoLibc; # Added 2024-09-06 crystal_1_2 = throw "'crystal_1_2' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13 + crystal_1_7 = throw "'crystal_1_7' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13 clash-geoip = throw "'clash-geoip' has been removed. Consider using 'dbip-country-lite' instead."; # added 2024-10-19 clash-verge = throw "'clash-verge' has been removed, as it was broken and unmaintained. Consider using 'clash-verge-rev' or 'clash-nyanpasu' instead"; # Added 2024-09-17 clasp = clingo; # added 2022-12-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f01960f08dee..642e29474b56 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5706,7 +5706,6 @@ with pkgs; }; inherit (darwin.apple_sdk_11_0.callPackage ../development/compilers/crystal { }) - crystal_1_7 crystal_1_8 crystal_1_9 crystal_1_11 From b19fe47d49d166706d8b5b00a219a7436d85adfa Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 13 Feb 2025 09:17:08 -0500 Subject: [PATCH 0576/1107] crystal: drop pcre dependency from < 1.8 --- pkgs/development/compilers/crystal/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 71bc60a727e2..b8f415920c6a 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -20,7 +20,6 @@ , makeWrapper , openssl , pcre2 -, pcre , pkg-config , installShellFiles , readline @@ -152,7 +151,7 @@ let nativeBuildInputs = [ binary makeWrapper which pkg-config llvmPackages.llvm installShellFiles ]; buildInputs = [ boehmgc - (if lib.versionAtLeast version "1.8" then pcre2 else pcre) + pcre2 libevent libyaml zlib From 3d3c822fce2aeab22965b2d4f9f7aeac73b7b6d9 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 13 Feb 2025 09:18:45 -0500 Subject: [PATCH 0577/1107] crystal_1_8: drop --- pkgs/development/compilers/crystal/default.nix | 7 ------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index b8f415920c6a..5da00de9578e 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -262,13 +262,6 @@ rec { }; }; - crystal_1_8 = generic { - version = "1.8.2"; - sha256 = "sha256-YAORdipzpC9CrFgZUFlFfjzlJQ6ZeA2ekVu8IfPOxR8="; - binary = binaryCrystal_1_2; - llvmPackages = llvmPackages_15; - }; - crystal_1_9 = generic { version = "1.9.2"; sha256 = "sha256-M1oUFs7/8ljszga3StzLOLM1aA4fSfVPQlsbuDHGd84="; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 32b99ff92f2f..f7885d8324ae 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -250,6 +250,7 @@ mapAliases { crossLibcStdenv = stdenvNoLibc; # Added 2024-09-06 crystal_1_2 = throw "'crystal_1_2' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13 crystal_1_7 = throw "'crystal_1_7' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13 + crystal_1_8 = throw "'crystal_1_8' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13 clash-geoip = throw "'clash-geoip' has been removed. Consider using 'dbip-country-lite' instead."; # added 2024-10-19 clash-verge = throw "'clash-verge' has been removed, as it was broken and unmaintained. Consider using 'clash-verge-rev' or 'clash-nyanpasu' instead"; # Added 2024-09-17 clasp = clingo; # added 2022-12-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 642e29474b56..9428c334212c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5706,7 +5706,6 @@ with pkgs; }; inherit (darwin.apple_sdk_11_0.callPackage ../development/compilers/crystal { }) - crystal_1_8 crystal_1_9 crystal_1_11 crystal_1_12 From 5b0bbb8e834d57905a804770bb047c62bf5299be Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 13 Feb 2025 09:21:15 -0500 Subject: [PATCH 0578/1107] crystal_1_9: drop --- pkgs/development/compilers/crystal/default.nix | 7 ------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 5da00de9578e..d4772476a12b 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -262,13 +262,6 @@ rec { }; }; - crystal_1_9 = generic { - version = "1.9.2"; - sha256 = "sha256-M1oUFs7/8ljszga3StzLOLM1aA4fSfVPQlsbuDHGd84="; - binary = binaryCrystal_1_2; - llvmPackages = llvmPackages_15; - }; - crystal_1_11 = generic { version = "1.11.2"; sha256 = "sha256-BBEDWqFtmFUNj0kuGBzv71YHO3KjxV4d2ySTCD4HhLc="; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f7885d8324ae..b60b441f62c4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -251,6 +251,7 @@ mapAliases { crystal_1_2 = throw "'crystal_1_2' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13 crystal_1_7 = throw "'crystal_1_7' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13 crystal_1_8 = throw "'crystal_1_8' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13 + crystal_1_9 = throw "'crystal_1_9' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13 clash-geoip = throw "'clash-geoip' has been removed. Consider using 'dbip-country-lite' instead."; # added 2024-10-19 clash-verge = throw "'clash-verge' has been removed, as it was broken and unmaintained. Consider using 'clash-verge-rev' or 'clash-nyanpasu' instead"; # Added 2024-09-17 clasp = clingo; # added 2022-12-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9428c334212c..b9df72226a2c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5706,7 +5706,6 @@ with pkgs; }; inherit (darwin.apple_sdk_11_0.callPackage ../development/compilers/crystal { }) - crystal_1_9 crystal_1_11 crystal_1_12 crystal_1_14 From 4c2c01b861f9a236b4f318086863e39355306247 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 13 Feb 2025 09:24:06 -0500 Subject: [PATCH 0579/1107] crystal: drop binaryCrystal_1_2 dependency from < 1.10 --- pkgs/development/compilers/crystal/default.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index d4772476a12b..f8195c2e7775 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -242,16 +242,6 @@ let }); in rec { - binaryCrystal_1_2 = genericBinary { - version = "1.2.2"; - sha256s = { - x86_64-linux = "sha256-sW5nhihW/6Dkq95i3vJNWs2D1CtQhujhxVbgQCAas6E="; - aarch64-darwin = "sha256-4VB4yYGl1/YeYSsHOZq7fdeQ8IQMfloAPhEU0iKrvxs="; - x86_64-darwin = "sha256-4VB4yYGl1/YeYSsHOZq7fdeQ8IQMfloAPhEU0iKrvxs="; - aarch64-linux = "sha256-QgPKUDFyodqY1+b85AybSpbbr0RmfISdNpB08Wf34jo="; - }; - }; - binaryCrystal_1_10 = genericBinary { version = "1.10.1"; sha256s = { From 80b1f28070af2c98eb624f031b7f57a0c8bd0dd9 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Mon, 17 Feb 2025 00:29:01 +0000 Subject: [PATCH 0580/1107] grafana-loki: 3.4.0 -> 3.4.2 --- pkgs/by-name/gr/grafana-loki/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gr/grafana-loki/package.nix b/pkgs/by-name/gr/grafana-loki/package.nix index e2febf9a7713..8aeda3eb7495 100644 --- a/pkgs/by-name/gr/grafana-loki/package.nix +++ b/pkgs/by-name/gr/grafana-loki/package.nix @@ -12,14 +12,14 @@ }: buildGoModule rec { - version = "3.4.0"; + version = "3.4.2"; pname = "grafana-loki"; src = fetchFromGitHub { owner = "grafana"; repo = "loki"; rev = "v${version}"; - hash = "sha256-fFdp2QZQgrLPcgzY833TfGvW7QPR/Omq0wwvcejMXac="; + hash = "sha256-GE92NlFCOk6qFtrgeBvLDI0OkmWaJ1j07Q14+jgi9+w="; }; vendorHash = null; From b79966c3e4df8ddafd82f070d5b06cff132229b4 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Mon, 17 Feb 2025 00:32:16 +0000 Subject: [PATCH 0581/1107] tempo: 2.7.0 -> 2.7.1 --- pkgs/by-name/te/tempo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/tempo/package.nix b/pkgs/by-name/te/tempo/package.nix index e9c48eb9505f..36733a0a0a5c 100644 --- a/pkgs/by-name/te/tempo/package.nix +++ b/pkgs/by-name/te/tempo/package.nix @@ -7,14 +7,14 @@ buildGoModule rec { pname = "tempo"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "grafana"; repo = "tempo"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-aCtITq5qT0a1DuoSDK3F46cPvfVsvXOPkZELEuRYi5w="; + hash = "sha256-U+cURfcLoZOB0lgZ/Ky1qcKR8aWbai84ZyHQYQeONVc="; }; vendorHash = null; From 3c55515b3166ae28db52b4e7908249f0391777a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 00:57:10 +0000 Subject: [PATCH 0582/1107] lightspark: 0.8.7 -> 0.9.0 --- pkgs/by-name/li/lightspark/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/lightspark/package.nix b/pkgs/by-name/li/lightspark/package.nix index 4f73bf561ef2..89d6900fba94 100644 --- a/pkgs/by-name/li/lightspark/package.nix +++ b/pkgs/by-name/li/lightspark/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "lightspark"; - version = "0.8.7"; + version = "0.9.0"; src = fetchFromGitHub { owner = "lightspark"; repo = "lightspark"; rev = version; - hash = "sha256-qX/ft9slWTbvuSyi2jB6YC7D7QTtCybL/dTo1dJp3pQ="; + hash = "sha256-2+Kmwj2keCMR7UbKbY6UvrkX4CnW61elres8ltiZuUg="; }; postPatch = '' From cc9e1db81b0484dcd35cf0a2419fbecf1675e20d Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Sun, 16 Feb 2025 19:57:39 -0500 Subject: [PATCH 0583/1107] ex_doc: add updateScript --- pkgs/development/beam-modules/ex_doc/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/beam-modules/ex_doc/default.nix b/pkgs/development/beam-modules/ex_doc/default.nix index fbc1f8a0da92..4d4897780944 100644 --- a/pkgs/development/beam-modules/ex_doc/default.nix +++ b/pkgs/development/beam-modules/ex_doc/default.nix @@ -1,4 +1,4 @@ -{ lib, elixir, fetchFromGitHub, fetchMixDeps, mixRelease }: +{ lib, elixir, fetchFromGitHub, fetchMixDeps, mixRelease, nix-update-script }: # Based on ../elixir-ls/default.nix let @@ -41,6 +41,8 @@ mixRelease { runHook postInstall ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { homepage = "https://github.com/elixir-lang/ex_doc"; description = '' From 849604f776f4c7a8c5b25e43f92dff14963e10b3 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Mon, 17 Feb 2025 00:58:15 +0000 Subject: [PATCH 0584/1107] ex_doc: 0.34.1 -> 0.37.1 --- pkgs/development/beam-modules/ex_doc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/beam-modules/ex_doc/default.nix b/pkgs/development/beam-modules/ex_doc/default.nix index 4d4897780944..736be609e9da 100644 --- a/pkgs/development/beam-modules/ex_doc/default.nix +++ b/pkgs/development/beam-modules/ex_doc/default.nix @@ -3,12 +3,12 @@ let pname = "ex_doc"; - version = "0.34.1"; + version = "0.37.1"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "${pname}"; rev = "v${version}"; - hash = "sha256-OXIRippEDYAKD222XzNJkkZdXbUkDUauv5amr4oAU7c="; + hash = "sha256-PF+4bJ1FGr7t8khorlrB7rSSmNsGpyhC4HmWjw6j0JQ="; }; in mixRelease { @@ -19,7 +19,7 @@ mixRelease { mixFodDeps = fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version elixir; - hash = "sha256-fYINsATbw3M3r+IVoYS14aVEsg9OBuH6mNUqzQJuDQo="; + hash = "sha256-s4b6wuBJPdN0FPn76zbLCHzqJNEZ6E4nOyB1whUM2VY="; }; configurePhase = '' From bc241eb4057336902e7689e55caba3b2b617f553 Mon Sep 17 00:00:00 2001 From: nayeko <196556004+nayeko@users.noreply.github.com> Date: Sat, 15 Feb 2025 18:19:32 +0000 Subject: [PATCH 0585/1107] aliyun-cli: 3.0.211 -> 3.0.252 --- pkgs/by-name/al/aliyun-cli/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/al/aliyun-cli/package.nix b/pkgs/by-name/al/aliyun-cli/package.nix index d4bcafbe1f10..f71e7018e9e4 100644 --- a/pkgs/by-name/al/aliyun-cli/package.nix +++ b/pkgs/by-name/al/aliyun-cli/package.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.211"; + version = "3.0.252"; src = fetchFromGitHub { owner = "aliyun"; repo = "aliyun-cli"; tag = "v${version}"; - hash = "sha256-6msh6bGL++nXVzwwNW6fFZbkN40ieL+SpgRownIs9aE="; + hash = "sha256-BNoNO8HQQGkUTR2MfpolF+PRo7YgT0hUbi5n+zPst6c="; fetchSubmodules = true; }; - vendorHash = "sha256-wHdSDBxDArVbD5+EgGcIpQ+NLg5BKXo2v3WM4ni1efc="; + vendorHash = "sha256-xwhq1UJ73Xxmt3NkpQMCrcl9N0F833N3/V+O+w1SVrQ="; subPackages = [ "main" ]; @@ -31,7 +31,7 @@ buildGoModule rec { nativeCheckInputs = [ writableTmpDirAsHomeHook ]; postInstall = '' - install -Dm755 $out/bin/main $out/bin/aliyun + mv $out/bin/main $out/bin/aliyun ''; passthru.updateScript = nix-update-script { }; From 3e27fe23a98a01742163ce084dd318a82a35fd78 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 01:21:09 +0000 Subject: [PATCH 0586/1107] supergfxctl: 5.2.4 -> 5.2.7 --- pkgs/by-name/su/supergfxctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/supergfxctl/package.nix b/pkgs/by-name/su/supergfxctl/package.nix index 59ccbc77eeae..d0421bd1d902 100644 --- a/pkgs/by-name/su/supergfxctl/package.nix +++ b/pkgs/by-name/su/supergfxctl/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "supergfxctl"; - version = "5.2.4"; + version = "5.2.7"; src = fetchFromGitLab { owner = "asus-linux"; repo = "supergfxctl"; rev = version; - hash = "sha256-ie5JPHBvypUtPStwA/aO4GeQ/qbHTzUJF3T4QuW6JNc="; + hash = "sha256-d3jN4i4oHRFDgr5f6y42gahrCfXBPB61T72x6IeiskM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Ef4lxuN7s5X/9I7VSub5DZVjQG8DhdMr/7CRtd2x9rs="; + cargoHash = "sha256-BM/fcXWyEWjAkqOdj2MItOzKknNUe9HMns30H1n5/xo="; postPatch = '' substituteInPlace data/supergfxd.service --replace /usr/bin/supergfxd $out/bin/supergfxd From f045d50d4e3bcea314b18aa15339425b39c62fdf Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Sun, 16 Feb 2025 15:58:45 +0100 Subject: [PATCH 0587/1107] libretro-shaders-slang: init at 0-unstable-2025-02-14 --- .../li/libretro-shaders-slang/package.nix | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/by-name/li/libretro-shaders-slang/package.nix diff --git a/pkgs/by-name/li/libretro-shaders-slang/package.nix b/pkgs/by-name/li/libretro-shaders-slang/package.nix new file mode 100644 index 000000000000..5aaf4ebf9fa0 --- /dev/null +++ b/pkgs/by-name/li/libretro-shaders-slang/package.nix @@ -0,0 +1,32 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + unstableGitUpdater, +}: + +stdenvNoCC.mkDerivation { + pname = "libretro-shaders-slang"; + version = "0-unstable-2025-02-14"; + + src = fetchFromGitHub { + owner = "libretro"; + repo = "slang-shaders"; + rev = "130f589cd5a2f3e5df1d6607b82b6771bc8b8446"; + hash = "sha256-ig+cE6MZNeY1Rx6ciSvLuxU0UyLPQLP5c5+lKpq4skA="; + }; + + dontConfigure = true; + dontBuild = true; + installFlags = "PREFIX=${placeholder "out"}"; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Slang shaders for use with RetroArch's shader system"; + homepage = "https://github.com/libretro/slang-shaders"; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.nadiaholmquist ]; + platforms = lib.platforms.all; + }; +} From 01cf1a2ae91389ae5eb8b873d5792090dc528bb3 Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Wed, 5 Feb 2025 19:11:45 +0100 Subject: [PATCH 0588/1107] ares: 141 -> 143, switch to CMake build system --- pkgs/by-name/ar/ares/darwin-build-fixes.patch | 25 +++++ pkgs/by-name/ar/ares/package.nix | 96 +++++++++++-------- .../patches/001-dont-rebuild-on-install.patch | 22 ----- 3 files changed, 82 insertions(+), 61 deletions(-) create mode 100644 pkgs/by-name/ar/ares/darwin-build-fixes.patch delete mode 100644 pkgs/by-name/ar/ares/patches/001-dont-rebuild-on-install.patch diff --git a/pkgs/by-name/ar/ares/darwin-build-fixes.patch b/pkgs/by-name/ar/ares/darwin-build-fixes.patch new file mode 100644 index 000000000000..e0fe64bc94da --- /dev/null +++ b/pkgs/by-name/ar/ares/darwin-build-fixes.patch @@ -0,0 +1,25 @@ +diff --git a/cmake/macos/compilerconfig.cmake b/cmake/macos/compilerconfig.cmake +index 99272c662..50f94db37 100644 +--- a/cmake/macos/compilerconfig.cmake ++++ b/cmake/macos/compilerconfig.cmake +@@ -27,7 +27,7 @@ message(DEBUG "macOS SDK Path: ${CMAKE_OSX_SYSROOT}") + string(REGEX MATCH ".+/SDKs/MacOSX([0-9]+\\.[0-9])+\\.sdk$" _ ${CMAKE_OSX_SYSROOT}) + set(_ares_macos_current_sdk ${CMAKE_MATCH_1}) + message(DEBUG "macOS SDK version: ${_ares_macos_current_sdk}") +-if(_ares_macos_current_sdk VERSION_LESS _ares_macos_minimum_sdk) ++if(FALSE) + message( + FATAL_ERROR + "Your macOS SDK version (${_ares_macos_current_sdk}) is too low. " +diff --git a/cmake/macos/helpers.cmake b/cmake/macos/helpers.cmake +index 864a629f0..f455345bf 100644 +--- a/cmake/macos/helpers.cmake ++++ b/cmake/macos/helpers.cmake +@@ -35,7 +35,6 @@ function(ares_configure_executable target) + endif() + endif() + +- _bundle_dependencies(${target}) + + install(TARGETS ${target} BUNDLE DESTINATION "." COMPONENT Application) + endif() diff --git a/pkgs/by-name/ar/ares/package.nix b/pkgs/by-name/ar/ares/package.nix index f712b24feb9d..3da9d7dd7e1d 100644 --- a/pkgs/by-name/ar/ares/package.nix +++ b/pkgs/by-name/ar/ares/package.nix @@ -2,7 +2,8 @@ lib, SDL2, alsa-lib, - autoPatchelfHook, + apple-sdk_14, + cmake, fetchFromGitHub, gtk3, gtksourceview3, @@ -11,42 +12,39 @@ libX11, libXv, libao, - libicns, libpulseaudio, + libretro-shaders-slang, librashader, + ninja, + moltenvk, openal, pkg-config, stdenv, udev, vulkan-loader, - which, wrapGAppsHook3, + zlib, }: stdenv.mkDerivation (finalAttrs: { pname = "ares"; - version = "141"; + version = "143"; src = fetchFromGitHub { owner = "ares-emulator"; repo = "ares"; - rev = "v${finalAttrs.version}"; - hash = "sha256-iNcoNdGw/DfYc9tsOGsPYoZLhVwNzJe8bVotx6Rl0j4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-uuFKbS7WvxkTyyQfuQ6iKPvRt+54zUPdjUlQ/ohBAr8="; }; - patches = [ - ./patches/001-dont-rebuild-on-install.patch - ]; - nativeBuildInputs = [ - autoPatchelfHook + cmake + ninja pkg-config - which - wrapGAppsHook3 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libicns + ++ lib.optionals stdenv.hostPlatform.isLinux [ + wrapGAppsHook3 ]; buildInputs = @@ -54,6 +52,12 @@ stdenv.mkDerivation (finalAttrs: { SDL2 libao librashader + vulkan-loader + zlib + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_14 + moltenvk ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib @@ -68,31 +72,48 @@ stdenv.mkDerivation (finalAttrs: { udev ]; - appendRunpaths = [ - (lib.makeLibraryPath [ - librashader - vulkan-loader - ]) + patches = [ + ./darwin-build-fixes.patch ]; - makeFlags = - lib.optionals stdenv.hostPlatform.isLinux [ - "hiro=gtk3" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "hiro=cocoa" - "lto=false" - "vulkan=false" - ] - ++ [ - "local=false" - "openmp=true" - "prefix=$(out)" - ]; + cmakeFlags = [ + (lib.cmakeBool "ARES_BUILD_LOCAL" false) + (lib.cmakeBool "ARES_SKIP_DEPS" true) + ]; - enableParallelBuilding = true; + postInstall = + if stdenv.hostPlatform.isDarwin then + '' + mkdir $out/Applications + cp -a desktop-ui/ares.app $out/Applications/ares.app + # Shaders directory is already populated with Metal shaders, so can't simply symlink the slang shaders directory itself + for f in ${libretro-shaders-slang}/share/libretro/shaders/shaders_slang/*; do + ln -s "$f" $out/Applications/ares.app/Contents/Resources/Shaders/ + done + '' + else + '' + ln -s ${libretro-shaders-slang}/share/libretro $out/share/libretro + ''; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-mmacosx-version-min=10.14"; + postFixup = + if stdenv.hostPlatform.isDarwin then + '' + install_name_tool \ + -add_rpath ${librashader}/lib \ + -add_rpath ${moltenvk}/lib \ + $out/Applications/ares.app/Contents/MacOS/ares + '' + else + '' + patchelf $out/bin/.ares-wrapped \ + --add-rpath ${ + lib.makeLibraryPath [ + librashader + vulkan-loader + ] + } + ''; meta = { homepage = "https://ares-emu.net"; @@ -104,8 +125,5 @@ stdenv.mkDerivation (finalAttrs: { AndersonTorres ]; platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; }; }) -# TODO: select between Qt and GTK3 -# TODO: call Darwin hackers to deal with specific errors diff --git a/pkgs/by-name/ar/ares/patches/001-dont-rebuild-on-install.patch b/pkgs/by-name/ar/ares/patches/001-dont-rebuild-on-install.patch deleted file mode 100644 index 7b6bbfc21bdc..000000000000 --- a/pkgs/by-name/ar/ares/patches/001-dont-rebuild-on-install.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 65cc7647110edd768e7baa7991143014316e655a Mon Sep 17 00:00:00 2001 -From: Madoura <93990818+Madouura@users.noreply.github.com> -Date: Mon, 9 May 2022 10:17:06 -0500 -Subject: [PATCH] Update GNUmakefile - ---- - desktop-ui/GNUmakefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/desktop-ui/GNUmakefile b/desktop-ui/GNUmakefile -index 8e27b11d3..0bee561fb 100644 ---- a/desktop-ui/GNUmakefile -+++ b/desktop-ui/GNUmakefile -@@ -106,7 +106,7 @@ endif - $(call rdelete,$(object.path)) - $(call rdelete,$(output.path)) - --install: all -+install: - ifeq ($(platform),windows) - $(call mkdir,$(prefix)/$(name)/) - else ifeq ($(shell id -un),root) From c7e14db3ba71deb86b9eece97a717db0f8d837a4 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sun, 16 Feb 2025 17:34:07 -0800 Subject: [PATCH 0589/1107] mattermost: disable Darwin support https://mattermost.com/download/ does not list macOS support. While it compiles, it's not worth supporting. --- pkgs/by-name/ma/mattermost/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix index 03763b6f3f16..eec0732b6f73 100644 --- a/pkgs/by-name/ma/mattermost/package.nix +++ b/pkgs/by-name/ma/mattermost/package.nix @@ -246,20 +246,21 @@ buildMattermost rec { }; }; - meta = with lib; { + meta = { description = "Mattermost is an open source platform for secure collaboration across the entire software development lifecycle"; homepage = "https://www.mattermost.org"; - license = with licenses; [ + license = with lib.licenses; [ agpl3Only asl20 ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ ryantm numinit kranzes mgdelacroix fsagbuya ]; + platforms = lib.platforms.linux; mainProgram = "mattermost"; }; } From c81bea025a337f6dc51f404bba426b3c859ae369 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 02:20:15 +0000 Subject: [PATCH 0590/1107] snpguest: 0.8.0 -> 0.8.3 --- pkgs/by-name/sn/snpguest/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sn/snpguest/package.nix b/pkgs/by-name/sn/snpguest/package.nix index f454bd7c516a..05402129249b 100644 --- a/pkgs/by-name/sn/snpguest/package.nix +++ b/pkgs/by-name/sn/snpguest/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "snpguest"; - version = "0.8.0"; + version = "0.8.3"; src = fetchFromGitHub { owner = "virtee"; repo = "snpguest"; tag = "v${version}"; - hash = "sha256-NqessN2yo7H17zWsnnI1oNIRG5Z1Wxi8oTWETP9DHpk="; + hash = "sha256-Fu8A3n1vzA8y5ccyo785udOTTqumLQWCOy0RL/mQ/us="; }; useFetchCargoVendor = true; - cargoHash = "sha256-r0F/nTT0YTrkknI2wATvBnRxVyXT1mTM8Qt0rOgg8VM="; + cargoHash = "sha256-6AXpdm4Ge8j8w74YGEQYpj6r8gKp+Bim/6xA2WLjSC0="; nativeBuildInputs = [ pkg-config ]; From 7ffa9e92b5c6ba0c5fbc8f06daa4f49cfa2628f4 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Sun, 16 Feb 2025 19:56:18 -0500 Subject: [PATCH 0591/1107] erlang_28: init at 28.0-rc1 --- pkgs/development/beam-modules/default.nix | 14 ++++++++++---- pkgs/development/interpreters/erlang/28.nix | 6 ++++++ .../interpreters/erlang/generic-builder.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 6 +++++- pkgs/top-level/beam-packages.nix | 9 +++++++++ 5 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/interpreters/erlang/28.nix diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 8bbd6418c4c2..a5a3ae2d3837 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -1,4 +1,8 @@ -{ lib, __splicedPackages, erlang }: +{ + lib, + __splicedPackages, + erlang, +}: let pkgs = __splicedPackages; @@ -7,10 +11,13 @@ let lib' = pkgs.callPackage ./lib.nix { }; # FIXME: add support for overrideScope - callPackageWithScope = scope: drv: args: lib.callPackageWith scope drv args; + callPackageWithScope = + scope: drv: args: + lib.callPackageWith scope drv args; mkScope = scope: pkgs // scope; - packages = self: + packages = + self: let defaultScope = mkScope self; callPackage = drv: args: callPackageWithScope defaultScope drv args; @@ -75,7 +82,6 @@ let ex_doc = callPackage ./ex_doc { inherit fetchMixDeps mixRelease; - elixir = elixir_1_17; }; elixir-ls = callPackage ./elixir-ls { inherit elixir fetchMixDeps mixRelease; }; diff --git a/pkgs/development/interpreters/erlang/28.nix b/pkgs/development/interpreters/erlang/28.nix new file mode 100644 index 000000000000..05fb205543cc --- /dev/null +++ b/pkgs/development/interpreters/erlang/28.nix @@ -0,0 +1,6 @@ +{ mkDerivation }: + +mkDerivation { + version = "28.0-rc1"; + sha256 = "sha256-fjje31F5YW5rzetb2r4fkESwKt9N+WOH3yrqETUjJzg="; +} diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 38c8278b02a0..d1cc86697f86 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -140,6 +140,13 @@ stdenv.mkDerivation ( libxml2 ]; + env = lib.optionalAttrs ((lib.versionAtLeast "28.0-rc1" version) && ex_docSupport) { + # erlang-28.0-rc> warning: jinterface.html redirects to ../lib/jinterface/doc/html/index.html, which does not exist + # erlang-28.0-rc> + # erlang-28.0-rc> warning: odbc.html redirects to ../lib/odbc/doc/html/index.html, which does not exist + EX_DOC_WARNINGS_AS_ERRORS = "false"; + }; + buildInputs = [ ncurses diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84e92b4eab81..7b7b530174c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6950,7 +6950,7 @@ with pkgs; }; inherit (beam.interpreters) - erlang erlang_27 erlang_26 erlang_25 + erlang erlang_28 erlang_27 erlang_26 erlang_25 elixir elixir_1_18 elixir_1_17 elixir_1_16 elixir_1_15 elixir_1_14 elixir-ls; @@ -6968,10 +6968,14 @@ with pkgs; beam25Packages = recurseIntoAttrs beam.packages.erlang_25; beam26Packages = recurseIntoAttrs beam.packages.erlang_26; beam27Packages = recurseIntoAttrs beam.packages.erlang_27; + # 28 is pre-release + beam28Packages = dontRecurseIntoAttrs beam.packages.erlang_28; beamMinimal25Packages = recurseIntoAttrs beam_minimal.packages.erlang_25; beamMinimal26Packages = recurseIntoAttrs beam_minimal.packages.erlang_26; beamMinimal27Packages = recurseIntoAttrs beam_minimal.packages.erlang_27; + # 28 is pre-release + beamMinimal28Packages = dontRecurseIntoAttrs beam_minimal.packages.erlang_28; erlang_language_platform = callPackage ../by-name/er/erlang-language-platform/package.nix { }; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 1c039da6b96f..3e2fdd18d0ae 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -31,6 +31,14 @@ in # # Three versions are supported according to https://github.com/erlang/otp/security + erlang_28 = self.beamLib.callErlang ../development/interpreters/erlang/28.nix { + wxGTK = wxGTK32; + parallelBuild = true; + # ex_doc failing to build with erlang 28 + inherit (beam_nodocs.packages.erlang_27) ex_doc; + inherit ex_docSupport wxSupport systemdSupport; + }; + erlang_27 = self.beamLib.callErlang ../development/interpreters/erlang/27.nix { wxGTK = wxGTK32; parallelBuild = true; @@ -76,6 +84,7 @@ in # appropriate Erlang/OTP version. packages = { erlang = self.packages.${self.latestVersion}; + erlang_28 = self.packagesWith self.interpreters.erlang_28; erlang_27 = self.packagesWith self.interpreters.erlang_27; erlang_26 = self.packagesWith self.interpreters.erlang_26; erlang_25 = self.packagesWith self.interpreters.erlang_25; From 5692c291e1ab6304c6b02f7fd27e15e62c7d4795 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 17 Feb 2025 03:54:02 +0100 Subject: [PATCH 0592/1107] vencord: 1.11.4 -> 1.11.5 --- pkgs/by-name/ve/vencord/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix index 2b06481bb7d2..628247ff043b 100644 --- a/pkgs/by-name/ve/vencord/package.nix +++ b/pkgs/by-name/ve/vencord/package.nix @@ -14,19 +14,19 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vencord"; - version = "1.11.4"; + version = "1.11.5"; src = fetchFromGitHub { owner = "Vendicated"; repo = "Vencord"; rev = "v${finalAttrs.version}"; - hash = "sha256-7bFn3+mpiXC4+PGhoJ10QN1oBjj7zS5U2MJf8cJm114="; + hash = "sha256-hdlFL95DFVeUs08/wg6EA5CfV6KeUGaS9kcLGRMyNgY="; }; pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname src; - hash = "sha256-ZUwtNtOmxjhOBpYB7vuytunGBRSuVxdlQsceRmeyhhI="; + hash = "sha256-0afgeJkK0OQWoqF0b8pHPMsiTKox84YmwBhtNWGyVAg="; }; nativeBuildInputs = [ @@ -39,12 +39,12 @@ stdenv.mkDerivation (finalAttrs: { ESBUILD_BINARY_PATH = lib.getExe ( esbuild.overrideAttrs ( final: _: { - version = "0.15.18"; + version = "0.25.0"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${final.version}"; - hash = "sha256-b9R1ML+pgRg9j2yrkQmBulPuLHYLUQvW+WTyR/Cq6zE="; + hash = "sha256-L9jm94Epb22hYsU3hoq1lZXb5aFVD4FC4x2qNt0DljA="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; } From 5f2d23cd48d2aa9827fa194b2fd78b81cf802154 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 03:27:32 +0000 Subject: [PATCH 0593/1107] suitesparse-graphblas: 9.4.2 -> 9.4.4 --- pkgs/by-name/su/suitesparse-graphblas/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/su/suitesparse-graphblas/package.nix b/pkgs/by-name/su/suitesparse-graphblas/package.nix index 5d0d7097260e..df89b8b50bd2 100644 --- a/pkgs/by-name/su/suitesparse-graphblas/package.nix +++ b/pkgs/by-name/su/suitesparse-graphblas/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "suitesparse-graphblas"; - version = "9.4.2"; + version = "9.4.4"; outputs = [ "out" @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - hash = "sha256-qUN5z797IAsP/OW6LmMUDETyJCJ3j8rgeDfj1dCaiyM="; + hash = "sha256-4k5s4cFPZUetvXkyEojB/ellqZrmyXpdQdlBJ93W0Jk="; }; nativeBuildInputs = [ From cac2f0ab8c52aaab1297c58c56357531ea075cc8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 03:28:50 +0000 Subject: [PATCH 0594/1107] tparse: 0.16.0 -> 0.17.0 --- pkgs/by-name/tp/tparse/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tp/tparse/package.nix b/pkgs/by-name/tp/tparse/package.nix index 5441a1413cc8..338ab7df26f8 100644 --- a/pkgs/by-name/tp/tparse/package.nix +++ b/pkgs/by-name/tp/tparse/package.nix @@ -5,7 +5,7 @@ }: let pname = "tparse"; - version = "0.16.0"; + version = "0.17.0"; in buildGoModule { inherit pname version; @@ -14,10 +14,10 @@ buildGoModule { owner = "mfridman"; repo = pname; rev = "v${version}"; - hash = "sha256-fljSjch09kQCpnZerI/h4SRCyxUydfFZGyOXsxmgYOk="; + hash = "sha256-yU4hP+EJ+Ci3Ms0dAoSuqZFT9RRwqmN1V0x5cV+87z0="; }; - vendorHash = "sha256-gGmPQ8YaTk7xG5B8UPK7vOui5YFeEnkuGrAsf0eylXQ="; + vendorHash = "sha256-m0YTGzzjr7/4+vTNhfPb7y2xtsI/y4Q2pbg+3yqSFaw="; ldflags = [ "-s" From 3407bbec54a5dedc9f189d45174ccdf1e4cdf5e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 16 Feb 2025 19:58:08 -0800 Subject: [PATCH 0595/1107] postfix: 3.9.1 -> 3.9.2 Changelog: https://www.postfix.org/announcements/postfix-3.9.2.html --- pkgs/servers/mail/postfix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 796d85a6d907..80c10bc28e45 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -67,11 +67,11 @@ let in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.9.1"; + version = "3.9.2"; src = fetchurl { url = "https://de.postfix.org/ftpmirror/official/postfix-${version}.tar.gz"; - hash = "sha256-xIiUTrA2JXbRj1+MxLmzKjW8s11xuUfarJdkr0dw9kM="; + hash = "sha256-ApB+N9OpZz81eaMmMaimkCWCfqQnnm7gIk2E0fRNhl4="; }; nativeBuildInputs = [ From 787763a6796b08330d18d112ad674abb61894299 Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Mon, 17 Feb 2025 04:19:41 +0000 Subject: [PATCH 0596/1107] ast-grep: 0.34.4 -> 0.35.0 --- pkgs/by-name/as/ast-grep/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index 85fe7124311d..c309a816fc27 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "ast-grep"; - version = "0.34.4"; + version = "0.35.0"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; tag = version; - hash = "sha256-fS2zuL0j/4Z24wvRIu2M47CafC/f0Ta3rMmQomB3P1Q="; + hash = "sha256-uiQYqVcSSQT32Vu8iE5ATIHFGDiyuxaQvg8hkBtB4DU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-b0t5t7qla4/xZiR3YqhLUDRCj+V2jEUjY4sGGA7L+hE="; + cargoHash = "sha256-B/egtLMBrlLobB1m04L1NlNmZ6+DdQIV9Ae0LVPmO2Y="; nativeBuildInputs = [ installShellFiles ]; From d60a4af07fe0b33518232a7d1b984fdcb81fb084 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 04:25:33 +0000 Subject: [PATCH 0597/1107] rio: 0.2.5 -> 0.2.7 --- pkgs/by-name/ri/rio/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ri/rio/package.nix b/pkgs/by-name/ri/rio/package.nix index a268e5b0ee98..da824f1fb201 100644 --- a/pkgs/by-name/ri/rio/package.nix +++ b/pkgs/by-name/ri/rio/package.nix @@ -53,17 +53,17 @@ let in rustPlatform.buildRustPackage rec { pname = "rio"; - version = "0.2.5"; + version = "0.2.7"; src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; rev = "v${version}"; - hash = "sha256-GyHwYvhqRX2ENaytLB/NrJv2wFbpPrZpQd5OW53ZgRw="; + hash = "sha256-OUiEqfh08q/VnX08w7uRDsKMPq5ZBxcZ8jIz/eYVf8k="; }; useFetchCargoVendor = true; - cargoHash = "sha256-TB3Nl3ePIJE7UQ89cJI5MPG4XpsPQgG5tM409GGm+qg="; + cargoHash = "sha256-OQ+nDdq4H291jLgWLLov2XVwOOErpiJPuDBUKR67blw="; nativeBuildInputs = [ From 2563d8e2f72da38781074ffb1275f850d087414b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 04:51:35 +0000 Subject: [PATCH 0598/1107] typos: 1.29.4 -> 1.29.7 --- pkgs/by-name/ty/typos/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/typos/package.nix b/pkgs/by-name/ty/typos/package.nix index d745d3b687ad..2a16ecd754e1 100644 --- a/pkgs/by-name/ty/typos/package.nix +++ b/pkgs/by-name/ty/typos/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.29.4"; + version = "1.29.7"; src = fetchFromGitHub { owner = "crate-ci"; repo = "typos"; tag = "v${version}"; - hash = "sha256-4cCXh6fysunsc6MNb7YNx+1I1tnYJkBgpA30P6IzTcM="; + hash = "sha256-YCOSe0EsPQMvIF6wm1oqisAm7t7GUzL56D/TZcNMTIk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ISz65YPKgQ7W4pC6KM87xPr6Xt1g+Ve0L5nqShS3Ujc="; + cargoHash = "sha256-d5s+reeZjLrRLPJOpWbe0grFsng74o4CmWgI6ln+614="; passthru.updateScript = nix-update-script { }; From 8caa37ec5a054c0a3c8bd69a3fd4469cb0fc7385 Mon Sep 17 00:00:00 2001 From: Brian McGillion Date: Mon, 17 Feb 2025 09:02:10 +0400 Subject: [PATCH 0599/1107] soteria: 0.1.1 -> 0.1.2 Fixes: #382626 changelog: https://github.com/imvaskel/soteria/releases/tag/v0.1.2 Signed-off-by: Brian McGillion --- pkgs/by-name/so/soteria/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/so/soteria/package.nix b/pkgs/by-name/so/soteria/package.nix index f815d91a4ab4..ff6afa1c594e 100644 --- a/pkgs/by-name/so/soteria/package.nix +++ b/pkgs/by-name/so/soteria/package.nix @@ -12,7 +12,7 @@ polkit, }: let - version = "0.1.1"; + version = "0.1.2"; in rustPlatform.buildRustPackage { pname = "soteria"; @@ -22,11 +22,11 @@ rustPlatform.buildRustPackage { owner = "imvaskel"; repo = "soteria"; tag = "v${version}"; - hash = "sha256-T6bJOXSXFWZYAxZ+nTDu+H8Wi75QRKddXkXdSOPwHbI="; + hash = "sha256-i7g2my0hP54Tj86UVEEFQIb5ih26djKgLg++I1n9Sfs="; }; useFetchCargoVendor = true; - cargoHash = "sha256-5f915lrymOwg5bPsTp6sxKikCcTpbeia1fQzKnLYGOs="; + cargoHash = "sha256-Z9ycfFhnff0z2ZG+tqf+qGUL7gDJQ+kC+e+WZ21qN1Y="; nativeBuildInputs = [ pkg-config From 91aaedde77b7a470cafcfb63229d4c91011915a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 05:03:34 +0000 Subject: [PATCH 0600/1107] llama-cpp: 4621 -> 4731 --- pkgs/by-name/ll/llama-cpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 172d0f30c6ab..3330e6a1733b 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -82,13 +82,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "4621"; + version = "4731"; src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; tag = "b${finalAttrs.version}"; - hash = "sha256-6/M1KbGEXYwalHP9PyW7kIJKdEBDViVIO3s6VHp4PbM="; + hash = "sha256-XB7TI1/Ui9BGdsD5TVH5MMZalgEGquW9wYcAhxgAcP0="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT From d7fae2f6002121c5805ffbf779993d189d0eeb7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 05:05:07 +0000 Subject: [PATCH 0601/1107] files-cli: 2.13.239 -> 2.13.247 --- pkgs/by-name/fi/files-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index f1285570ba80..97285168459e 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "files-cli"; - version = "2.13.239"; + version = "2.13.247"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${version}"; - hash = "sha256-rfjfx09Pp+EZiivM1viclNof9u9ojDbyE1NLdKe/rt8="; + hash = "sha256-Czz2qiPagIV19+x6hORIUndCdfME9IV4J2/V+uNzVQ4="; }; - vendorHash = "sha256-B8iuuTtM4d67TmoxAIAruFv2xzjrUGbdRe9XLNaJqe8="; + vendorHash = "sha256-h4HGKtTk+TmzeEpFbgj6wvQmxprJDN2ib+aEDhN82PE="; ldflags = [ "-s" From 6fba1ea29b77b0341623ad8be0216578c18fca4a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 05:20:07 +0000 Subject: [PATCH 0602/1107] pulsarctl: 4.0.1.3 -> 4.1.0-SNAPSHOT --- pkgs/by-name/pu/pulsarctl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pu/pulsarctl/package.nix b/pkgs/by-name/pu/pulsarctl/package.nix index 4b9607ccd2b7..0113ddca9b40 100644 --- a/pkgs/by-name/pu/pulsarctl/package.nix +++ b/pkgs/by-name/pu/pulsarctl/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "pulsarctl"; - version = "4.0.1.3"; + version = "4.1.0-SNAPSHOT"; src = fetchFromGitHub { owner = "streamnative"; repo = "pulsarctl"; rev = "v${version}"; - hash = "sha256-wjLF8yaVRJeh7xMCmNAI/xW7CU5noFPgHkZRtixADv8="; + hash = "sha256-/4JSSYd18hEHUOiay3y74VHBY3ql6aqAK4aWDJaqwCU="; }; vendorHash = "sha256-wNUTJn7Ar+GlePEhdr6xeolAiltJdAoIs5o5uDo8Ibs="; From c1d8ae3bf99aac652ceae289ae6280547d7c0dee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 05:39:05 +0000 Subject: [PATCH 0603/1107] terraform-providers.ovh: 1.5.0 -> 1.6.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7136c6928e93..d559c277328f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -976,11 +976,11 @@ "vendorHash": null }, "ovh": { - "hash": "sha256-aGg3zvGWBVU8dv852nG1u3gRKD6I9ra77D2foDmjUEE=", + "hash": "sha256-haKmmNAHBmB5bpzlqkhvntUlZmyvz5brBgD3bxT40kI=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v1.5.0", + "rev": "v1.6.0", "spdx": "MPL-2.0", "vendorHash": null }, From 7ef4e646ebc0a48a685a75274d2d9c156a0f604a Mon Sep 17 00:00:00 2001 From: gale Date: Sun, 16 Feb 2025 23:39:21 -0600 Subject: [PATCH 0604/1107] 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 b938298ed483ef3b5b3426056491f3fe42d9ba76 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 06:06:37 +0000 Subject: [PATCH 0605/1107] snac2: 2.70 -> 2.72 --- pkgs/servers/snac2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/snac2/default.nix b/pkgs/servers/snac2/default.nix index e7ea238484af..77c272dd1c68 100644 --- a/pkgs/servers/snac2/default.nix +++ b/pkgs/servers/snac2/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "snac2"; - version = "2.70"; + version = "2.72"; src = fetchFromGitea { domain = "codeberg.org"; owner = "grunfink"; repo = pname; rev = version; - hash = "sha256-i0Eh9dT4TOb05hLqsJnC5KoUwnnUVz02CNU2+bc5N2c="; + hash = "sha256-rAdbTzgjd6sZSx8TQrBQbhFjRY/4eSStrEwwCbrHefo="; }; buildInputs = [ From c4653b553a5703b2969ee910915529447efd8128 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 06:23:59 +0000 Subject: [PATCH 0606/1107] fselect: 0.8.5 -> 0.8.9 --- pkgs/by-name/fs/fselect/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fs/fselect/package.nix b/pkgs/by-name/fs/fselect/package.nix index 8ecc5151b288..fdfbea77693e 100644 --- a/pkgs/by-name/fs/fselect/package.nix +++ b/pkgs/by-name/fs/fselect/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "fselect"; - version = "0.8.5"; + version = "0.8.9"; src = fetchFromGitHub { owner = "jhspetersson"; repo = "fselect"; rev = version; - sha256 = "sha256-gEiKv1YbNNWexNfzUULbe0fT0ueJ9TJojhBHp31i6OY="; + sha256 = "sha256-oZnA033/gKg5qppEvP+miNTTTwDpOlhUz8OOnKt5cx0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-/FBEv1jDlYrx06Ia/lF3Vcjnl5nWg0aEQefY67kh9Bw="; + cargoHash = "sha256-4NpyHcTJhLO0xeva/qcKE5WiS15hHvQ9HO8ENgplfvo="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; From 8612d22fc7fb0bb928199e4f5c11e0cd97adfdd8 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Fri, 24 Jan 2025 23:40:14 +0800 Subject: [PATCH 0607/1107] calligraplan: init at 3.3.0 --- pkgs/by-name/ca/calligraplan/package.nix | 59 ++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 pkgs/by-name/ca/calligraplan/package.nix diff --git a/pkgs/by-name/ca/calligraplan/package.nix b/pkgs/by-name/ca/calligraplan/package.nix new file mode 100644 index 000000000000..89394f1c697d --- /dev/null +++ b/pkgs/by-name/ca/calligraplan/package.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenv, + fetchFromGitLab, + qt5, + libsForQt5, + cmake, + extra-cmake-modules, + gitUpdater, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "calligraplan"; + version = "3.3.0"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "office"; + repo = "calligraplan"; + tag = "v${finalAttrs.version}"; + hash = "sha256-szPdRxbzJ2+nmgp+1FwmKZwHEDV8EtbDW/3jsw4J6HI="; + }; + + buildInputs = [ + qt5.qtbase + libsForQt5.kdbusaddons + libsForQt5.kguiaddons + libsForQt5.ki18n + libsForQt5.kiconthemes + libsForQt5.kitemviews + libsForQt5.kjobwidgets + libsForQt5.kio + libsForQt5.knotifications + libsForQt5.kparts + libsForQt5.kinit + libsForQt5.kdiagram + libsForQt5.qt5.qtx11extras + ]; + + nativeBuildInputs = [ + qt5.wrapQtAppsHook + cmake + extra-cmake-modules + ]; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + }; + + meta = { + homepage = "https://www.calligra.org/plan/"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + description = "Project Management Application"; + mainProgram = "calligraplan"; + changelog = "https://invent.kde.org/office/calligraplan/-/tags/v${finalAttrs.version}"; + }; +}) From 52b94287f52b645098d5f663d8ab01688a527edc Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Mon, 17 Feb 2025 06:40:13 +0000 Subject: [PATCH 0608/1107] windsurf: 1.2.6 -> 1.3.4 --- pkgs/by-name/wi/windsurf/info.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json index 83356b1e12a7..494fb18bd478 100644 --- a/pkgs/by-name/wi/windsurf/info.json +++ b/pkgs/by-name/wi/windsurf/info.json @@ -1,20 +1,20 @@ { "aarch64-darwin": { - "version": "1.2.6", + "version": "1.3.4", "vscodeVersion": "1.94.0", - "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/d08b8ea13d580d24be204c76e5dd1651d7234cd2/Windsurf-darwin-arm64-1.2.6.zip", - "sha256": "b9a63785454003f7ccb3b6adebe232e24618247244b556ef61e9e974a4b77f65" + "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/ff5014a12e72ceb812f9e7f61876befac66725e5/Windsurf-darwin-arm64-1.3.4.zip", + "sha256": "3873c50e09500fe43ee78fe6c63b86311d4ea689173bc2660239466b3f2e4fa4" }, "x86_64-darwin": { - "version": "1.2.6", + "version": "1.3.4", "vscodeVersion": "1.94.0", - "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/d08b8ea13d580d24be204c76e5dd1651d7234cd2/Windsurf-darwin-x64-1.2.6.zip", - "sha256": "4a4beae35117162b484521a64fc67cac044ced17a971553ab75ba8823b3cbb75" + "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/ff5014a12e72ceb812f9e7f61876befac66725e5/Windsurf-darwin-x64-1.3.4.zip", + "sha256": "2534839a0e026316cb4fd98b128c44d4c6cf938f47be9a5e7e67457d2f8bf61b" }, "x86_64-linux": { - "version": "1.2.6", + "version": "1.3.4", "vscodeVersion": "1.94.0", - "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/d08b8ea13d580d24be204c76e5dd1651d7234cd2/Windsurf-linux-x64-1.2.6.tar.gz", - "sha256": "ad71eb02b9302d4cf1413c0a83763f45fe455e5be74ee9e1477bea2e85a02caa" + "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/ff5014a12e72ceb812f9e7f61876befac66725e5/Windsurf-linux-x64-1.3.4.tar.gz", + "sha256": "6dcf686038c6587410b25dd041a748a59593164b6c3ffb31935abef1325bfa8c" } } From 903443920454b573aa48a2335d8307ba3837a2d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 06:54:56 +0000 Subject: [PATCH 0609/1107] tgpt: 2.9.0 -> 2.9.1 --- pkgs/by-name/tg/tgpt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tg/tgpt/package.nix b/pkgs/by-name/tg/tgpt/package.nix index c0f0a1d3104d..62bf5d675e83 100644 --- a/pkgs/by-name/tg/tgpt/package.nix +++ b/pkgs/by-name/tg/tgpt/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "tgpt"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "aandrew-me"; repo = "tgpt"; tag = "v${version}"; - hash = "sha256-8R6rb4GvSf4nw78Yxcuh9Vct/qUTkQNatRolT1m7JR4="; + hash = "sha256-6kJwJedFnALP4hpoaQ5DR/zN1KijgwFpYSBb1o+XCHw="; }; - vendorHash = "sha256-HObEC0SqSHJOgiJxlniN4yJ3U8ksv1HeiMhtOiZRq50="; + vendorHash = "sha256-hPbvzhYHOxytQs3NkSVaZhFH0TbOlr4U/QiH+vemTrc="; ldflags = [ "-s" From a72355f07e8cf868a88e100e439e420cdeee74da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 06:57:32 +0000 Subject: [PATCH 0610/1107] llm: 0.21 -> 0.22 --- pkgs/development/python-modules/llm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix index 55f2c36de8d1..673cb8d99eca 100644 --- a/pkgs/development/python-modules/llm/default.nix +++ b/pkgs/development/python-modules/llm/default.nix @@ -22,7 +22,7 @@ let llm = buildPythonPackage rec { pname = "llm"; - version = "0.21"; + version = "0.22"; pyproject = true; build-system = [ setuptools ]; @@ -33,7 +33,7 @@ let owner = "simonw"; repo = "llm"; tag = version; - hash = "sha256-gxmhdczgbcvbWJQTy+gek499C/3jm9WL5vKZmaGVWgU="; + hash = "sha256-l4tFBCIey5cOUvJ8IXLOjslc1zy9MnuiwFFP275S/Bg="; }; patches = [ ./001-disable-install-uninstall-commands.patch ]; @@ -76,7 +76,7 @@ let meta = with lib; { homepage = "https://github.com/simonw/llm"; description = "Access large language models from the command-line"; - changelog = "https://github.com/simonw/llm/releases/tag/${version}"; + changelog = "https://github.com/simonw/llm/releases/tag/${src.tag}"; license = licenses.asl20; mainProgram = "llm"; maintainers = with maintainers; [ From b74609c48af66d6307ffa4701f758fefc78a94e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 06:58:38 +0000 Subject: [PATCH 0611/1107] terraform-providers.auth0: 1.11.0 -> 1.12.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7136c6928e93..ac3918dbc57f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -90,11 +90,11 @@ "vendorHash": "sha256-CHd4r89n+8hpGAZQF6ozqNgMXQgMEb8Uh/gFkrKolyk=" }, "auth0": { - "hash": "sha256-hfmJWtfHwDKtc9nsKZUbibf6VIQb02a/fXWkhqDgiFQ=", + "hash": "sha256-mlGMYuQCiQhQH5gCLLG8YrEQ40E4WuvPW6xFYAOZbwQ=", "homepage": "https://registry.terraform.io/providers/auth0/auth0", "owner": "auth0", "repo": "terraform-provider-auth0", - "rev": "v1.11.0", + "rev": "v1.12.0", "spdx": "MPL-2.0", "vendorHash": "sha256-NynPovzkVRNU0EGxbIcvO4AOxnmG10mWfk8520arU5c=" }, From 7dd3605083e895fe47419400a6d97197697e88ee Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Thu, 13 Feb 2025 19:15:22 +0800 Subject: [PATCH 0612/1107] greed: init at 4.3 --- pkgs/by-name/gr/greed/package.nix | 55 +++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 pkgs/by-name/gr/greed/package.nix diff --git a/pkgs/by-name/gr/greed/package.nix b/pkgs/by-name/gr/greed/package.nix new file mode 100644 index 000000000000..1b55c221fabf --- /dev/null +++ b/pkgs/by-name/gr/greed/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + fetchFromGitLab, + ncurses, + asciidoctor, + gitUpdater, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "greed"; + version = "4.3"; + + src = fetchFromGitLab { + owner = "esr"; + repo = "greed"; + tag = finalAttrs.version; + hash = "sha256-NmX0hYHODe55N0edhdfdm0a/Yqm/UwkU/RREjYl3ePc="; + }; + + postPatch = '' + substituteInPlace Makefile \ + --replace-fail "-lcurses" "-lncurses" \ + --replace-fail "BIN=/usr/games" "BIN=$out/bin" \ + --replace-fail "/usr/share" "$out/share" \ + --replace-fail "/usr/games/lib/greed.hs" "/var/lib/greed/greed.hs" + ''; + + buildInputs = [ + ncurses + ]; + + nativeBuildInputs = [ + asciidoctor + ]; + + preInstall = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man6 + ''; + + passthru = { + updateScript = gitUpdater { }; + }; + + meta = { + homepage = "http://www.catb.org/~esr/"; + platforms = lib.platforms.unix; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + description = "Game of Consumption"; + changelog = "https://gitlab.com/esr/greed/-/blob/${finalAttrs.version}/NEWS.adoc?ref_type=tags"; + mainProgram = "greed"; + }; +}) From aa52640721c94bcac5b903175f13c5d79c188dcd Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Sun, 16 Feb 2025 15:05:33 +0100 Subject: [PATCH 0613/1107] authelia: 4.38.18 -> 4.38.19 --- pkgs/servers/authelia/sources.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/authelia/sources.nix b/pkgs/servers/authelia/sources.nix index e660aa76d925..457836b104b5 100644 --- a/pkgs/servers/authelia/sources.nix +++ b/pkgs/servers/authelia/sources.nix @@ -1,14 +1,14 @@ { fetchFromGitHub }: rec { pname = "authelia"; - version = "4.38.18"; + version = "4.38.19"; src = fetchFromGitHub { owner = "authelia"; repo = "authelia"; rev = "v${version}"; - hash = "sha256-gJEKjplESS6wNN2cM/JYRAHm7200tMlBKs1lZi0ShiE="; + hash = "sha256-VqdSDrvsue8NqUNN5H++psxAyvvSyFNqt2U8yUXhTo8="; }; - vendorHash = "sha256-K5PunLkbcEuWL4IWbXYqgP3H5S/d5IHrWqCin//qJxw="; - pnpmDepsHash = "sha256-jkghQGWLvmL1Vxwl7v4T/H1UUN8DeaCgbc8lnUcS4nA="; + vendorHash = "sha256-NONSCqRalxZq1n0Q3fXKVXpkALkoyIl3+Fsx7Xb3M2w="; + pnpmDepsHash = "sha256-9ZqAoktMS28GTqbOsWDYUsS1H0unWSEPO0Z2b5xXV54="; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 169b83ba27b8..8785a55940d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1627,7 +1627,7 @@ with pkgs; authelia = callPackage ../servers/authelia { buildGoModule = buildGo123Module; - pnpm = pnpm_9; + pnpm = pnpm_10; }; authentik-outposts = recurseIntoAttrs (callPackages ../by-name/au/authentik/outposts.nix { }); From 2fff9666354259af44b29f13f879f121bf6d8f7c Mon Sep 17 00:00:00 2001 From: Svenum Date: Mon, 17 Feb 2025 08:12:36 +0100 Subject: [PATCH 0614/1107] maintainers: add Svenum --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 246df1773ba8..c4b55d79fba8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -22411,6 +22411,12 @@ githubId = 98333944; name = "Sven Over"; }; + Svenum = { + email = "s.ziegler@holypenguin.net"; + github = "Svenum"; + githubId = 43136984; + name = "Sven Ziegler"; + }; svrana = { email = "shaw@vranix.com"; github = "svrana"; From 16415b03d4444c377ea51410837de12f1008c753 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 08:06:35 +0000 Subject: [PATCH 0615/1107] jjui: 0.3 -> 0.4 --- pkgs/by-name/jj/jjui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/jj/jjui/package.nix b/pkgs/by-name/jj/jjui/package.nix index 23f714a34e30..ff554a3e3ae1 100644 --- a/pkgs/by-name/jj/jjui/package.nix +++ b/pkgs/by-name/jj/jjui/package.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "jjui"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "idursun"; repo = "jjui"; tag = "v${version}"; - hash = "sha256-J6Bw7/OtKuQ28gUxc7h+gdKmt98TmNqj5XZ6kLzvg3o="; + hash = "sha256-PAquHh3VVAhc4Tw1XkyKmwFbpLVkDRCMT+FGtqiydCA="; }; - vendorHash = "sha256-czUD0+1ZJJBpp+vYYEBBuWro6InokiPriKFyKvLSGD0="; + vendorHash = "sha256-MxTwe0S2wvkIy8VJl1p8utTX98zfcwpNgCdnpFAMxO0="; postFixup = '' mv $out/bin/cmd $out/bin/jjui From dfd2eb6184e0246066512b120f3e33bc77025235 Mon Sep 17 00:00:00 2001 From: Svenum Date: Mon, 17 Feb 2025 09:11:18 +0100 Subject: [PATCH 0616/1107] tail-tray: init at 0.2.13 --- pkgs/by-name/ta/tail-tray/desktop.patch | 16 +++++++++ pkgs/by-name/ta/tail-tray/package.nix | 45 +++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 pkgs/by-name/ta/tail-tray/desktop.patch create mode 100644 pkgs/by-name/ta/tail-tray/package.nix diff --git a/pkgs/by-name/ta/tail-tray/desktop.patch b/pkgs/by-name/ta/tail-tray/desktop.patch new file mode 100644 index 000000000000..56162f2f4c01 --- /dev/null +++ b/pkgs/by-name/ta/tail-tray/desktop.patch @@ -0,0 +1,16 @@ +diff --git a/tail-tray.desktop.in b/tail-tray.desktop.in +index 2d1c7be..5e859ae 100644 +--- a/tail-tray.desktop.in ++++ b/tail-tray.desktop.in +@@ -2,8 +2,8 @@ + Name=Tail Tray + GenericName=Tail Tray + Comment=Tailscale Tray Application +-Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/tail-tray +-Icon=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATAROOTDIR@/icons/hicolor/128x128/apps/tailscale.png ++Exec=@CMAKE_INSTALL_PREFIX@/bin/tail-tray ++Icon=@CMAKE_INSTALL_PREFIX@/share/icons/hicolor/128x128/apps/tailscale.png + Type=Application + Categories=Qt;KDE;Utility;X-Networking;X-Internet;X-VPN; + StartupNotify=true + diff --git a/pkgs/by-name/ta/tail-tray/package.nix b/pkgs/by-name/ta/tail-tray/package.nix new file mode 100644 index 000000000000..42d010639c23 --- /dev/null +++ b/pkgs/by-name/ta/tail-tray/package.nix @@ -0,0 +1,45 @@ +{ + lib, + fetchFromGitHub, + davfs2, + cmake, + stdenv, + fetchpatch, + pkg-config, + kdePackages, +}: + +stdenv.mkDerivation rec { + pname = "tail-tray"; + version = "0.2.13"; + + src = fetchFromGitHub { + owner = "SneWs"; + repo = "tail-tray"; + tag = "v${version}"; + sha256 = "sha256-BzE32XvDEdlS5D8XjZ4m2OEn+6nS0F7oJYX/a/UKhJ4="; + }; + + nativeBuildInputs = with kdePackages; [ + wrapQtAppsHook + qttools + cmake + pkg-config + ]; + + buildInputs = with kdePackages; [ + qtbase + davfs2 + ]; + + patches = [ ./desktop.patch ]; + + meta = { + description = "Tray icon to manage Tailscale"; + homepage = "https://github.com/SneWs/tail-tray"; + changelog = "https://github.com/SneWs/tail-tray/releases/tag/${version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ Svenum ]; + platforms = lib.platforms.linux; + }; +} From fa99d1c7454292a9ae06583da03023eeb5fe2d59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Mon, 17 Feb 2025 09:14:12 +0100 Subject: [PATCH 0617/1107] prl-tools: add wayland dependency This is required for prlcc to function correctly in wayland sessions. Previously, when using wayland, prlcc did not detect the session. Features such as 'Use all displays in Full Screen' and adjusting the resolution based on host window size were thus not available in Wayland sessions. --- pkgs/os-specific/linux/prl-tools/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 935fcb4001fc..0de175e9025a 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -20,6 +20,7 @@ netcat, timetrap, util-linux, + wayland, }: let @@ -29,6 +30,7 @@ let libPath = lib.concatStringsSep ":" [ "${glib.out}/lib" "${xorg.libXrandr}/lib" + "${wayland.out}/lib" ]; scriptPath = lib.concatStringsSep ":" [ "${bash}/bin" From 24f4b08c0bd240636d6bbd35eb10bd51dba6455e Mon Sep 17 00:00:00 2001 From: misilelab Date: Mon, 17 Feb 2025 02:29:40 +0900 Subject: [PATCH 0618/1107] shards: 0.17.4 -> 0.19.1; migrate to pkgs/by-name Signed-off-by: misilelab --- pkgs/by-name/sh/shards/package.nix | 33 +++++++++++++ .../sh}/shards/shards.nix | 0 .../tools/build-managers/shards/default.nix | 47 ------------------- pkgs/top-level/all-packages.nix | 4 -- 4 files changed, 33 insertions(+), 51 deletions(-) create mode 100644 pkgs/by-name/sh/shards/package.nix rename pkgs/{development/tools/build-managers => by-name/sh}/shards/shards.nix (100%) delete mode 100644 pkgs/development/tools/build-managers/shards/default.nix diff --git a/pkgs/by-name/sh/shards/package.nix b/pkgs/by-name/sh/shards/package.nix new file mode 100644 index 000000000000..697dbd38b4a2 --- /dev/null +++ b/pkgs/by-name/sh/shards/package.nix @@ -0,0 +1,33 @@ +{ + lib, + fetchFromGitHub, + crystal, +}: + +crystal.buildCrystalPackage rec { + pname = "shards"; + version = "0.19.1"; + + src = fetchFromGitHub { + owner = "crystal-lang"; + repo = "shards"; + tag = "v${version}"; + hash = "sha256-LOdI389nVsFXkKPKco1C+O710kBlWImzCvdBBYEsWQQ="; + }; + + # we cannot use `make` or `shards` here as it would introduce a cyclical dependency + format = "crystal"; + shardsFile = ./shards.nix; + crystalBinaries.shards.src = "./src/shards.cr"; + + # tries to execute git which fails spectacularly + doCheck = false; + + meta = with lib; { + description = "Dependency manager for the Crystal language"; + mainProgram = "shards"; + license = licenses.asl20; + maintainers = with maintainers; [ peterhoeg ]; + inherit (crystal.meta) homepage platforms; + }; +} diff --git a/pkgs/development/tools/build-managers/shards/shards.nix b/pkgs/by-name/sh/shards/shards.nix similarity index 100% rename from pkgs/development/tools/build-managers/shards/shards.nix rename to pkgs/by-name/sh/shards/shards.nix diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix deleted file mode 100644 index dd4a75202561..000000000000 --- a/pkgs/development/tools/build-managers/shards/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - fetchFromGitHub, - crystal, -}: - -let - generic = - { version, hash }: - - crystal.buildCrystalPackage { - pname = "shards"; - inherit version; - - src = fetchFromGitHub { - owner = "crystal-lang"; - repo = "shards"; - rev = "v${version}"; - inherit hash; - }; - - # we cannot use `make` or `shards` here as it would introduce a cyclical dependency - format = "crystal"; - shardsFile = ./shards.nix; - crystalBinaries.shards.src = "./src/shards.cr"; - - # tries to execute git which fails spectacularly - doCheck = false; - - meta = with lib; { - description = "Dependency manager for the Crystal language"; - mainProgram = "shards"; - license = licenses.asl20; - maintainers = with maintainers; [ peterhoeg ]; - inherit (crystal.meta) homepage platforms; - }; - }; - -in -rec { - shards_0_17 = generic { - version = "0.17.4"; - hash = "sha256-DAFKmr57fW2CWiexbP4Mvoqfh9ALpYEZv3NFK4Z4Zo4="; - }; - - shards = shards_0_17; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a58cf1edb0c..f565959f1ebc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8256,10 +8256,6 @@ with pkgs; (if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables) haskellPackages.shake; - inherit (callPackage ../development/tools/build-managers/shards { }) - shards_0_17 - shards; - shellcheck = callPackage ../development/tools/shellcheck { inherit (__splicedPackages.haskellPackages) ShellCheck; }; From 0ec80613cab87fd2cb37cad2eb7253be74647f9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Mon, 17 Feb 2025 09:29:29 +0100 Subject: [PATCH 0619/1107] k9s: 0.32.7 -> 0.40.3 --- pkgs/by-name/k9/k9s/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/k9/k9s/package.nix b/pkgs/by-name/k9/k9s/package.nix index 79898bbab638..02632e186ab8 100644 --- a/pkgs/by-name/k9/k9s/package.nix +++ b/pkgs/by-name/k9/k9s/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.32.7"; + version = "0.40.3"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - hash = "sha256-0S6FomP1WVqYl5nP0FcaElgghMcZmE0V8iLhghERF6A="; + hash = "sha256-7juy1j2YULP76YIjwzaXRPfbzZ/cIIzH1v5nddl0bKk="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-ENn2BpGFEpiTNZbnNVt4hv4R6NTT3GivFd3rTy3xEH8="; + vendorHash = "sha256-I0gUTyLLOiTm6LiEFHwylYA1I8+/365GxFs8nSARcy0="; # TODO investigate why some config tests are failing doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); From e78a48a4240e7a4f2a1d873a8eeacd68e83c7901 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 08:30:51 +0000 Subject: [PATCH 0620/1107] mago: 0.0.18 -> 0.10.0 --- pkgs/by-name/ma/mago/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix index 51350e112414..691fa58d9964 100644 --- a/pkgs/by-name/ma/mago/package.nix +++ b/pkgs/by-name/ma/mago/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "mago"; - version = "0.0.18"; + version = "0.10.0"; src = fetchFromGitHub { owner = "carthage-software"; repo = "mago"; tag = version; - hash = "sha256-QSb+5wlv8uFT2wTeJyfsz+vE4Kegqgi7Dqyl1KZU//U="; + hash = "sha256-NYAlLJsKI+twrlryVumjsOnY3xvEeLTO/rAFTZtE+KU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-XpLVe7ln3ZYs8HGE/52xI7op9ZGa4S5u419gE3nVgz0="; + cargoHash = "sha256-0AnJIrA15WC3LPiokwuX9w9riaaL5s2vqwhj4XRa6LM="; env = { # Get openssl-sys to use pkg-config From 4b13f0723830f7af086a123a5e5e2c5ab91732da Mon Sep 17 00:00:00 2001 From: misilelab Date: Mon, 17 Feb 2025 17:34:01 +0900 Subject: [PATCH 0621/1107] pnpm: 10.4.0 -> 10.4.1 Signed-off-by: misilelab --- pkgs/development/tools/pnpm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index 390d71445af4..8b475afebb23 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -16,8 +16,8 @@ let hash = "sha256-hHIWjD4f0L/yh+aUsFP8y78gV5o/+VJrYzO+q432Wo0="; }; "10" = { - version = "10.4.0"; - hash = "sha256-5X6KVE96hCR8+nfdbZI+rlGZo3NHTlPqsfVAx5Yok4Y="; + version = "10.4.1"; + hash = "sha256-S3Aoh5hplZM9QwCDawTW0CpDvHK1Lk9+k6TKYIuVkZc="; }; }; From cc82a80e0d9f81bc5b16858e59d0c7d32ade17a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 08:38:02 +0000 Subject: [PATCH 0622/1107] terraform-providers.gridscale: 2.0.3 -> 2.1.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7136c6928e93..4f7c4ace5e4a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -543,11 +543,11 @@ "vendorHash": "sha256-py17K2zNqAEd22hMYrIpxmBaN6A5eeG/qgmaRBgyCeI=" }, "gridscale": { - "hash": "sha256-uI05BO/c00RNr52rbvY7SZwcn64NRfBpR44/xXWmjqw=", + "hash": "sha256-YE7o8HwHUo6zI2umRv2lXY7voyg1fX5h1UitH89fBXc=", "homepage": "https://registry.terraform.io/providers/gridscale/gridscale", "owner": "gridscale", "repo": "terraform-provider-gridscale", - "rev": "v2.0.3", + "rev": "v2.1.0", "spdx": "MPL-2.0", "vendorHash": null }, From dc49b918c8fd8d335311e1c9565677bee6ff32ce Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Mon, 17 Feb 2025 09:59:16 +0100 Subject: [PATCH 0623/1107] stac-validator: 3.4.0 -> 3.5.0 --- pkgs/by-name/st/stac-validator/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stac-validator/package.nix b/pkgs/by-name/st/stac-validator/package.nix index 90d77f4d2e27..9abb9da75c03 100644 --- a/pkgs/by-name/st/stac-validator/package.nix +++ b/pkgs/by-name/st/stac-validator/package.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonPackage rec { pname = "stac-validator"; - version = "3.4.0"; + version = "3.5.0"; pyproject = true; disabled = python3Packages.pythonOlder "3.8"; @@ -14,11 +14,15 @@ python3Packages.buildPythonPackage rec { owner = "stac-utils"; repo = "stac-validator"; tag = "v${version}"; - hash = "sha256-e3v8WvVbZcxN91w+YNUmSILZ1nZ9Vy1UbEpCQkTMQpQ="; + hash = "sha256-/MConEN+fcY3JKqP/24k0l/m2FHNhIqG7k42ldSPZ1U="; }; build-system = [ python3Packages.setuptools ]; + pythonRelaxDeps = [ + "click" + ]; + dependencies = with python3Packages; [ click jsonschema From b6646381d03c06f5d7883224a4ab34168472a957 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanislav=20Ochotnick=C3=BD?= Date: Mon, 17 Feb 2025 10:21:22 +0100 Subject: [PATCH 0624/1107] boundary: 0.18.0 -> 0.19.0 --- pkgs/by-name/bo/boundary/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/bo/boundary/package.nix b/pkgs/by-name/bo/boundary/package.nix index ebc99ceddaeb..fa832eb72b7c 100644 --- a/pkgs/by-name/bo/boundary/package.nix +++ b/pkgs/by-name/bo/boundary/package.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.18.0"; + version = "0.19.0"; src = let @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; hash = selectSystem { - x86_64-linux = "sha256-Wp1gPFQkOv+ZCEy0D2Tw9l6aCZekdpkXYcTZNheJHEg="; - aarch64-linux = "sha256-jBYu4m3L+j/coJ4D9cPA8mSBYiLiUyVKp98x6mdrrrk="; - x86_64-darwin = "sha256-OuiF1pgutt69ghlkLkEwkWMIFjvAsY7YUZERHNiToMs="; - aarch64-darwin = "sha256-sYKA02euri/K8FM8GoY7Y/WWLE2nBSoiNoxSdUPunWA="; + x86_64-linux = "sha256-tqgY0308n3F/ZYGhn3bAsHa4cBdFz0oGgSHI6y6J1LY="; + aarch64-linux = "sha256-vvc8rOpyOd91crZTQQofj3RixUuWHe7SbMM0BZDkdRw="; + x86_64-darwin = "sha256-wsI8hqULVN+W6zwQsXcWQHbxmocrijsl5eUJgUxLxf8="; + aarch64-darwin = "sha256-S0QXBBiO2qgSazjtwd1bWgL/6gJUimKYPv369L419UU="; }; in fetchzip { From c55f0585ed439a17dc4463209c999ae55fa8fbbd Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 17 Feb 2025 10:22:50 +0100 Subject: [PATCH 0625/1107] python312Packages.hvplot: disable failing tests --- .../python-modules/hvplot/default.nix | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix index 6c5010fc61b0..b258af4f6c59 100644 --- a/pkgs/development/python-modules/hvplot/default.nix +++ b/pkgs/development/python-modules/hvplot/default.nix @@ -1,8 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, - pythonOlder, + fetchFromGitHub, # build-system setuptools-scm, @@ -30,11 +29,11 @@ buildPythonPackage rec { version = "0.11.2"; pyproject = true; - disabled = pythonOlder "3.9"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-t60fLxxwXkfiayLInBFxGoT3d0+qq6t1a0Xo0eAKYBA="; + src = fetchFromGitHub { + owner = "holoviz"; + repo = "hvplot"; + tag = "v${version}"; + hash = "sha256-3zACW2RDRhdGi5RBPOVQJJHT78DwcgHaCHp27gIEnjA="; }; build-system = [ @@ -60,7 +59,20 @@ buildPythonPackage rec { plotly ]; + disabledTests = [ + # Legacy dask-expr implementation is deprecated + # NotImplementedError: The legacy implementation is no longer supported + "test_dask_dataframe_patched" + "test_dask_series_patched" + ]; + disabledTestPaths = [ + # Legacy dask-expr implementation is deprecated + # NotImplementedError: The legacy implementation is no longer supported + "hvplot/tests/plotting/testcore.py" + "hvplot/tests/testcharts.py" + "hvplot/tests/testgeowithoutgv.py" + # All of the following below require xarray.tutorial files that require # downloading files from the internet (not possible in the sandbox). "hvplot/tests/testgeo.py" From 8277b7b1596f2d28b092df0a60b157fc6436a2be Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 17 Feb 2025 10:20:57 +0100 Subject: [PATCH 0626/1107] vscode-extensions.my-python.debugpy: move extension in its own directory --- .../editors/vscode/extensions/default.nix | 16 +------------- .../extensions/ms-python.debugpy/default.nix | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index a0b59e0362a9..bc0ba9f75535 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3513,21 +3513,7 @@ let ms-python.python = callPackage ./ms-python.python { }; - ms-python.debugpy = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "debugpy"; - publisher = "ms-python"; - version = "2024.6.0"; - hash = "sha256-VlPe65ViBur5P6L7iRKdGnmbNlSCwYrdZAezStx8Bz8="; - }; - meta = { - description = "Python debugger (debugpy) extension for VS Code"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.debugpy"; - homepage = "https://github.com/Microsoft/vscode-python-debugger"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.carlthome ]; - }; - }; + ms-python.debugpy = callPackage ./ms-python.debugpy { }; ms-python.vscode-pylance = callPackage ./ms-python.vscode-pylance { }; diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix new file mode 100644 index 000000000000..a6b60a7e8663 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix @@ -0,0 +1,21 @@ +{ + lib, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "debugpy"; + publisher = "ms-python"; + version = "2024.6.0"; + hash = "sha256-VlPe65ViBur5P6L7iRKdGnmbNlSCwYrdZAezStx8Bz8="; + }; + + meta = { + description = "Python debugger (debugpy) extension for VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.debugpy"; + homepage = "https://github.com/Microsoft/vscode-python-debugger"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.carlthome ]; + }; +} From 7f8f65c1fea25a299b9571d2a3e111bc3f1755c4 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 17 Feb 2025 10:30:28 +0100 Subject: [PATCH 0627/1107] vscode-extensions.ms-pyright.pyright: move extension in its own directory --- .../editors/vscode/extensions/default.nix | 17 +------------- .../extensions/ms-pyright.pyright/default.nix | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 16 deletions(-) create mode 100644 pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index bc0ba9f75535..b5b72189d41e 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3422,22 +3422,7 @@ let }; }; - ms-pyright.pyright = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "pyright"; - publisher = "ms-pyright"; - version = "1.1.300"; - hash = "sha256-GzRJeV4qfgM2kBv6U3MH7lMWl3CL6LWPI/9GaVWZL+o="; - }; - meta = { - description = "VS Code static type checking for Python"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-pyright.pyright"; - homepage = "https://github.com/Microsoft/pyright#readme"; - changelog = "https://marketplace.visualstudio.com/items/ms-pyright.pyright/changelog"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.ratsclub ]; - }; - }; + ms-pyright.pyright = callPackage ./ms-pyright.pyright { }; ms-python.black-formatter = buildVscodeMarketplaceExtension { mktplcRef = { diff --git a/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix b/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix new file mode 100644 index 000000000000..5dce86ab3a80 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix @@ -0,0 +1,22 @@ +{ + lib, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "ms-pyright"; + name = "pyright"; + version = "1.1.394"; + hash = "sha256-LQYC4dZ0lJ+NkQjRGW0HQ16TK2NI0ZK2IYytkxoBhR0="; + }; + + meta = { + description = "VS Code static type checking for Python"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-pyright.pyright"; + homepage = "https://github.com/Microsoft/pyright#readme"; + changelog = "https://marketplace.visualstudio.com/items/ms-pyright.pyright/changelog"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ratsclub ]; + }; +} From b98538902bda651cf9340d8d1a4559d8345ef10e Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 17 Feb 2025 10:33:15 +0100 Subject: [PATCH 0628/1107] vscode-extensions.ms-python.mypy-type-checker: 2025.1.10381011 -> 2025.1.10451009 --- .../extensions/ms-python.mypy-type-checker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix index 67f045c70787..6bbd336d3b2f 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix @@ -5,10 +5,10 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { - name = "mypy-type-checker"; publisher = "ms-python"; - version = "2025.1.10381011"; - hash = "sha256-boKUxLOAgQJP13zX/NMhg1MtcrPVQJt5gLbxI7gVSu4="; + name = "mypy-type-checker"; + version = "2025.1.10451009"; + hash = "sha256-Q6wfbm3FMNe0VB29QOf5ulTelGVmZVHUnmK17vbrqWc="; }; meta = { From cf9e1c988ab08795cbbe9de40c601e79449bc979 Mon Sep 17 00:00:00 2001 From: Dionysis Grigoropoulos Date: Mon, 17 Feb 2025 11:35:57 +0200 Subject: [PATCH 0629/1107] files-to-prompt: 0.4 -> 0.5 Diff: https://github.com/simonw/files-to-prompt/compare/0.4...0.5 Changelog: https://github.com/simonw/files-to-prompt/releases/tag/0.5 --- pkgs/by-name/fi/files-to-prompt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fi/files-to-prompt/package.nix b/pkgs/by-name/fi/files-to-prompt/package.nix index efe36136e2d8..94575de68344 100644 --- a/pkgs/by-name/fi/files-to-prompt/package.nix +++ b/pkgs/by-name/fi/files-to-prompt/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "files-to-prompt"; - version = "0.4"; + version = "0.5"; pyproject = true; src = fetchFromGitHub { owner = "simonw"; repo = "files-to-prompt"; tag = version; - hash = "sha256-gl3j0ok/hlFfIF3HhhzYrUZuNlAtU7y+Ej29sQv9tP4="; + hash = "sha256-nO4I9qgG83OnWw6/FWSqx0Du5d3s5dLBjtMQLstWPEY"; }; build-system = with python3Packages; [ From 1f801ba1a00344385539250386effef3f64632ca Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 17 Feb 2025 10:40:43 +0100 Subject: [PATCH 0630/1107] python312Packages.nilearn: cleanup & fix --- .../python-modules/nilearn/default.nix | 63 ++++++++++++------- 1 file changed, 42 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index 63a3fd62c2f3..d3eb405a138a 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -1,19 +1,24 @@ { lib, buildPythonPackage, - fetchPypi, - pythonOlder, - pytestCheckHook, + fetchFromGitHub, + + # build-system hatch-vcs, + hatchling, + + # dependencies + joblib, lxml, - matplotlib, nibabel, numpy, pandas, + requests, scikit-learn, scipy, - joblib, - requests, + packaging, + + pytestCheckHook, }: buildPythonPackage rec { @@ -21,36 +26,52 @@ buildPythonPackage rec { version = "0.11.1"; pyproject = true; - disabled = pythonOlder "3.8"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-oB3wj8bI3tPNb7eiEWNGA61Gpt94BQS20FIiwuepcv4="; + src = fetchFromGitHub { + owner = "nilearn"; + repo = "nilearn"; + tag = version; + hash = "sha256-ZvodSRJkKwPwpYHOLmxAYIIv7f9AlrjmZS9KLPjz5rM="; }; - nativeBuildInputs = [ hatch-vcs ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail " --template=maint_tools/templates/index.html" "" + ''; - nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = [ "test_clean_confounds" ]; # https://github.com/nilearn/nilearn/issues/2608 - # do subset of tests which don't fetch resources - pytestFlagsArray = [ "nilearn/connectome/tests" ]; + build-system = [ + hatch-vcs + hatchling + ]; - propagatedBuildInputs = [ + dependencies = [ joblib lxml - matplotlib nibabel numpy pandas requests scikit-learn scipy + packaging ]; - meta = with lib; { - homepage = "https://nilearn.github.io"; + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTests = [ + # https://github.com/nilearn/nilearn/issues/2608 + "test_clean_confounds" + + # [XPASS(strict)] invalid checks should fail + "test_check_estimator_invalid_group_sparse_covariance" + ]; + + # do subset of tests which don't fetch resources + pytestFlagsArray = [ "nilearn/connectome/tests" ]; + + meta = { description = "Module for statistical learning on neuroimaging data"; + homepage = "https://nilearn.github.io"; changelog = "https://github.com/nilearn/nilearn/releases/tag/${version}"; - license = licenses.bsd3; + license = lib.licenses.bsd3; }; } From 3b4488d5d55d4b7382022fef16ab98dfcbcce182 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 17 Feb 2025 10:41:56 +0100 Subject: [PATCH 0631/1107] python312Packages.nilearn: add GaetanLepage to as maintainer --- pkgs/development/python-modules/nilearn/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index d3eb405a138a..535321edb909 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -73,5 +73,6 @@ buildPythonPackage rec { homepage = "https://nilearn.github.io"; changelog = "https://github.com/nilearn/nilearn/releases/tag/${version}"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } From 040ad6961fd3c4316ed1750bf4d1d1f4f000991b Mon Sep 17 00:00:00 2001 From: Adminy <22717869+adminy@users.noreply.github.com> Date: Mon, 17 Feb 2025 09:58:02 +0000 Subject: [PATCH 0632/1107] Update pkgs/by-name/su/surrealdb/package.nix Co-authored-by: raf --- pkgs/by-name/su/surrealdb/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix index 8f7022301761..2711eb83c15c 100644 --- a/pkgs/by-name/su/surrealdb/package.nix +++ b/pkgs/by-name/su/surrealdb/package.nix @@ -17,7 +17,7 @@ src = fetchFromGitHub { owner = "surrealdb"; repo = "surrealdb"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-gsIeoxSfbHHSdpPn6xAB/t5w3cLtpu6MjTuf5xsI6wI="; }; From 7402a62392d16d84317256cc0cac12de3dd53587 Mon Sep 17 00:00:00 2001 From: Adminy <22717869+adminy@users.noreply.github.com> Date: Mon, 17 Feb 2025 09:58:19 +0000 Subject: [PATCH 0633/1107] Update pkgs/by-name/su/surrealdb/package.nix Co-authored-by: raf --- pkgs/by-name/su/surrealdb/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix index 2711eb83c15c..d072b61769ef 100644 --- a/pkgs/by-name/su/surrealdb/package.nix +++ b/pkgs/by-name/su/surrealdb/package.nix @@ -21,6 +21,7 @@ hash = "sha256-gsIeoxSfbHHSdpPn6xAB/t5w3cLtpu6MjTuf5xsI6wI="; }; + useFetchCargoVendor = true; cargoHash = "sha256-OXcQsDCiT3seMQhyKEKfC8pcd4MXwbql5+ZDGGkhPMI="; # error: linker `aarch64-linux-gnu-gcc` not found From e331616f171da38addbf8230f9f8c6c5fc2972da Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 17 Feb 2025 11:04:26 +0100 Subject: [PATCH 0634/1107] python312Packages.acres: init at 0.2.0 --- .../python-modules/acres/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/acres/default.nix diff --git a/pkgs/development/python-modules/acres/default.nix b/pkgs/development/python-modules/acres/default.nix new file mode 100644 index 000000000000..666299b4dd31 --- /dev/null +++ b/pkgs/development/python-modules/acres/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pdm-backend, + importlib-resources, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "acres"; + version = "0.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nipreps"; + repo = "acres"; + tag = version; + hash = "sha256-DSDTOUNInLMR6C1P4NT+121sU+BYBLw67xRCtKobEaM="; + }; + + build-system = [ + pdm-backend + ]; + + dependencies = [ + importlib-resources + ]; + + pythonImportsCheck = [ + "acres" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "Data-loading utility for Python"; + homepage = "https://github.com/nipreps/acres"; + changelog = "https://github.com/nipreps/acres/blob/${version}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e702b2102235..9dfa577307f2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -51,6 +51,8 @@ self: super: with self; { acquire = callPackage ../development/python-modules/acquire { }; + acres = callPackage ../development/python-modules/acres { }; + actdiag = callPackage ../development/python-modules/actdiag { }; acunetix = callPackage ../development/python-modules/acunetix { }; From 68f695de67334f3bf1bfb81a91c495aaf88c5afd Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 17 Feb 2025 10:53:41 +0100 Subject: [PATCH 0635/1107] python312Packages.niworkflows: 1.12.0 -> 1.12.2 Diff: https://github.com/nipreps/niworkflows/compare/refs/tags/1.12.0...1.12.2 Changelog: https://github.com/nipreps/niworkflows/blob/1.12.2/CHANGES.rst --- .../python-modules/niworkflows/default.nix | 46 +++++++++++++------ 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/niworkflows/default.nix b/pkgs/development/python-modules/niworkflows/default.nix index 05e21f2834ab..5811062df376 100644 --- a/pkgs/development/python-modules/niworkflows/default.nix +++ b/pkgs/development/python-modules/niworkflows/default.nix @@ -2,9 +2,13 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system hatch-vcs, hatchling, - pytestCheckHook, + + # dependencies + acres, attrs, importlib-resources, jinja2, @@ -26,18 +30,24 @@ templateflow, traits, transforms3d, + + # tests + pytest-cov-stub, + pytest-env, + pytestCheckHook, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "niworkflows"; - version = "1.12.0"; + version = "1.12.2"; pyproject = true; src = fetchFromGitHub { owner = "nipreps"; repo = "niworkflows"; tag = version; - hash = "sha256-OWsfz5YDPy1qPpXomr4YiuCDf40Fy1pW8cNHPjHfqp4="; + hash = "sha256-rgnfp12SHlL3LFFMSrHlTd0tWNnA4ekxZ9kKYRvZWlw="; }; pythonRelaxDeps = [ "traits" ]; @@ -48,6 +58,7 @@ buildPythonPackage rec { ]; dependencies = [ + acres attrs importlib-resources jinja2 @@ -73,29 +84,38 @@ buildPythonPackage rec { env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeCheckInputs = [ pytestCheckHook ]; - preCheck = ''export HOME=$(mktemp -d)''; + nativeCheckInputs = [ + pytest-cov-stub + pytest-env + pytestCheckHook + writableTmpDirAsHomeHook + ]; + pytestFlagsArray = [ "niworkflows" ]; - # try to download data: + disabledTests = [ - "test_GenerateCifti" + # try to download data: "ROIsPlot" "ROIsPlot2" + "niworkflows.interfaces.cifti._prepare_cifti" + "niworkflows.utils.misc.get_template_specs" + "test_GenerateCifti" "test_SimpleShowMaskRPT" "test_cifti_surfaces_plot" - "niworkflows.utils.misc.get_template_specs" - "niworkflows.interfaces.cifti._prepare_cifti" ]; - disabledTestPaths = [ "niworkflows/tests/test_registration.py" ]; + + disabledTestPaths = [ + "niworkflows/tests/test_registration.py" + ]; pythonImportsCheck = [ "niworkflows" ]; - meta = with lib; { + meta = { description = "Common workflows for MRI (anatomical, functional, diffusion, etc.)"; mainProgram = "niworkflows-boldref"; homepage = "https://github.com/nipreps/niworkflows"; changelog = "https://github.com/nipreps/niworkflows/blob/${src.tag}/CHANGES.rst"; - license = licenses.asl20; - maintainers = with maintainers; [ bcdarwin ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bcdarwin ]; }; } From 825a12f1803711466c297ecfe5d8c8b29f0f1cc4 Mon Sep 17 00:00:00 2001 From: Adminy <22717869+adminy@users.noreply.github.com> Date: Mon, 17 Feb 2025 10:05:33 +0000 Subject: [PATCH 0636/1107] formatting --- pkgs/by-name/su/surrealdb/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix index d072b61769ef..e9e40d9c0922 100644 --- a/pkgs/by-name/su/surrealdb/package.nix +++ b/pkgs/by-name/su/surrealdb/package.nix @@ -10,7 +10,8 @@ surrealdb, darwin, protobuf, -}: rustPlatform.buildRustPackage rec { +}: +rustPlatform.buildRustPackage rec { pname = "surrealdb"; version = "2.2.0"; @@ -21,7 +22,7 @@ hash = "sha256-gsIeoxSfbHHSdpPn6xAB/t5w3cLtpu6MjTuf5xsI6wI="; }; - useFetchCargoVendor = true; + useFetchCargoVendor = true; cargoHash = "sha256-OXcQsDCiT3seMQhyKEKfC8pcd4MXwbql5+ZDGGkhPMI="; # error: linker `aarch64-linux-gnu-gcc` not found From be7b55de83a8950d71d28642a5a5b58b674ef078 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 17 Feb 2025 19:43:31 +0900 Subject: [PATCH 0637/1107] brush: init at 0.2.15 --- pkgs/by-name/br/brush/package.nix | 68 +++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 pkgs/by-name/br/brush/package.nix diff --git a/pkgs/by-name/br/brush/package.nix b/pkgs/by-name/br/brush/package.nix new file mode 100644 index 000000000000..34dc141a49bd --- /dev/null +++ b/pkgs/by-name/br/brush/package.nix @@ -0,0 +1,68 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, + testers, + runCommand, + writeText, + nix-update-script, + brush, +}: + +rustPlatform.buildRustPackage rec { + pname = "brush"; + version = "0.2.15"; + + src = fetchFromGitHub { + owner = "reubeno"; + repo = "brush"; + tag = "brush-shell-v${version}"; + hash = "sha256-hPF2nXYXAM+5Lz2VJw9vZ6RFZ40y+YkO94Jc/sLUYsg="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-A4v4i6U6BwUMNTI/TO7wTQvNVtQYKGiQfDXOCy8hFTE="; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; + versionCheckProgramArg = [ "--version" ]; + + # Found argument '--test-threads' which wasn't expected, or isn't valid in this context + doCheck = false; + + passthru = { + tests = { + complete = testers.testEqualContents { + assertion = "brushinfo performs to inspect completions"; + expected = writeText "expected" '' + brush + brushctl + brushinfo + ''; + actual = + runCommand "actual" + { + nativeBuildInputs = [ brush ]; + } + '' + brush -c 'brushinfo complete line bru' >$out + ''; + }; + }; + + updateScript = nix-update-script { extraArgs = [ "--version-regex=brush-shell-v([\\d\\.]+)" ]; }; + }; + + meta = { + description = "Bash/POSIX-compatible shell implemented in Rust"; + homepage = "https://github.com/reubeno/brush"; + changelog = "https://github.com/reubeno/brush/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kachick ]; + mainProgram = "brush"; + }; +} From a795c06ab7e9c66d5ec7c7377ce6649968604b2b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 17 Feb 2025 11:52:56 +0100 Subject: [PATCH 0638/1107] python312Packaegs.pydicom: cleanup & mark as broken on darwin --- .../python-modules/pydicom/default.nix | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index 13fbb8e4d0d5..f1c42f7579c9 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - pythonOlder, flit-core, numpy, pytestCheckHook, @@ -11,8 +10,8 @@ # optional/test dependencies gdcm, pillow, - pylibjpeg, pylibjpeg-libjpeg, + writableTmpDirAsHomeHook, }: let # Pydicom needs pydicom-data to run some tests. If these files aren't downloaded @@ -29,8 +28,6 @@ buildPythonPackage rec { version = "3.0.1"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "pydicom"; repo = "pydicom"; @@ -55,13 +52,15 @@ buildPythonPackage rec { ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.pixeldata; + nativeCheckInputs = [ + pytestCheckHook + writableTmpDirAsHomeHook + ] ++ optional-dependencies.pixeldata; # Setting $HOME to prevent pytest to try to create a folder inside # /homeless-shelter which is read-only. # Linking pydicom-data dicom files to $HOME/.pydicom/data preCheck = '' - export HOME=$TMP/test-home mkdir -p $HOME/.pydicom/ ln -s ${test_data}/data_store/data $HOME/.pydicom/data ''; @@ -90,12 +89,20 @@ buildPythonPackage rec { pythonImportsCheck = [ "pydicom" ]; - meta = with lib; { + meta = { description = "Python package for working with DICOM files"; mainProgram = "pydicom"; homepage = "https://pydicom.github.io"; changelog = "https://github.com/pydicom/pydicom/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ bcdarwin ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcdarwin ]; + badPlatforms = [ + # > 200 tests are failing with errors like: + # AttributeError: 'FileDataset' object has no attribute 'BitsStored' + # AttributeError: 'FileDataset' object has no attribute 'Rows' + # AttributeError: The dataset has no 'Pixel Data', 'Float Pixel Data' or 'Double Float Pixel Data' element, no pixel data to decode + # pydicom.errors.InvalidDicomError: File is missing DICOM File Meta Information header or the 'DICM' prefix is missing from the header. + lib.systems.inspect.patterns.isDarwin + ]; }; } From 97c4dfebb396c27233050982bf89abef1893de4e Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 17 Feb 2025 10:36:01 +0100 Subject: [PATCH 0639/1107] vscode-extensions.my-python.python: 2024.15.2024091301 -> 2025.1.2025021102 --- .../editors/vscode/extensions/ms-python.python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix index 19f8a59e37ec..aeddb79a2792 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix @@ -21,8 +21,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2024.15.2024091301"; - hash = "sha256-MB8Vq2rjO37yW3Zh+f8ek/yz0qT+ZYHn/JnF5ZA6CXQ="; + version = "2025.1.2025021102"; + hash = "sha256-qXQrBEKzZthZu1fdnRJXjryyHjpcxJA4c5LrhOI3deM="; }; buildInputs = [ icu ]; From 5cb27768675a15853c131e40314a47a785527f85 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 17 Feb 2025 10:42:31 +0100 Subject: [PATCH 0640/1107] vscode-extensions.ms-python.pylint: move extension into its own directory, bump --- .../editors/vscode/extensions/default.nix | 17 +-------------- .../extensions/ms-python.pylint/default.nix | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 16 deletions(-) create mode 100644 pkgs/applications/editors/vscode/extensions/ms-python.pylint/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index b5b72189d41e..c3346d0a7d83 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3477,22 +3477,7 @@ let }; }; - ms-python.pylint = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "pylint"; - publisher = "ms-python"; - version = "2023.10.1"; - hash = "sha256-1tI5u33c5CHFQxkJZ/OxW3ZA5qPr4RoCIf6dqIMPykQ="; - }; - meta = { - changelog = "https://marketplace.visualstudio.com/items/ms-python.pylint/changelog"; - description = "Python linting support for VS Code using Pylint"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.pylint"; - homepage = "https://github.com/microsoft/vscode-pylint"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.amadejkastelic ]; - }; - }; + ms-python.pylint = callPackage ./ms-python.pylint { }; ms-python.mypy-type-checker = callPackage ./ms-python.mypy-type-checker { }; diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.pylint/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.pylint/default.nix new file mode 100644 index 000000000000..e9c7d050c8ef --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/ms-python.pylint/default.nix @@ -0,0 +1,21 @@ +{ + lib, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "ms-python"; + name = "pylint"; + version = "2024.2.0"; + hash = "sha256-z9bfV2JPFyDk+bgWFYua2462df36MZy3GSVKhrm2Q6Q="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/ms-python.pylint/changelog"; + description = "Python linting support for VS Code using Pylint"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.pylint"; + homepage = "https://github.com/microsoft/vscode-pylint"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.amadejkastelic ]; + }; +} From 60cd7fb8c853415cb2ed78ed7660b41dcc8f3437 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 17 Feb 2025 10:44:10 +0100 Subject: [PATCH 0641/1107] vscode-extensions.ms-python.isort: move extension in its own directory, bump --- .../editors/vscode/extensions/default.nix | 16 +-------------- .../extensions/ms-python.isort/default.nix | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 15 deletions(-) create mode 100644 pkgs/applications/editors/vscode/extensions/ms-python.isort/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c3346d0a7d83..6c9c1a861bb4 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3461,21 +3461,7 @@ let }; }; - ms-python.isort = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "isort"; - publisher = "ms-python"; - version = "2023.10.1"; - hash = "sha256-NRsS+mp0pIhGZiqxAMXNZ7SwLno9Q8pj+RS1WB92HzU="; - }; - meta = with lib; { - description = "Import sorting extension for Visual Studio Code using isort"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.isort"; - homepage = "https://github.com/microsoft/vscode-isort"; - license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; - }; - }; + ms-python.isort = callPackage ./ms-python.isort { }; ms-python.pylint = callPackage ./ms-python.pylint { }; diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.isort/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.isort/default.nix new file mode 100644 index 000000000000..06b7c1dceab7 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/ms-python.isort/default.nix @@ -0,0 +1,20 @@ +{ + lib, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "ms-python"; + name = "isort"; + version = "2023.13.13171013"; + hash = "sha256-UBV9i3LPVv60+toy+kJvESAuJHRmH/uEIwjTidYUXLc="; + }; + meta = with lib; { + description = "Import sorting extension for Visual Studio Code using isort"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.isort"; + homepage = "https://github.com/microsoft/vscode-isort"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + }; +} From f958cc05fb5359c342387e6c7cf1055d9db609ea Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 17 Feb 2025 10:48:11 +0100 Subject: [PATCH 0642/1107] vscode-extensions.ms-python.flake8: move extension in its own directory, bump --- .../editors/vscode/extensions/default.nix | 17 +------------- .../extensions/ms-python.flake8/default.nix | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 16 deletions(-) create mode 100644 pkgs/applications/editors/vscode/extensions/ms-python.flake8/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 6c9c1a861bb4..52bc266f05f2 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3444,22 +3444,7 @@ let }; }; - ms-python.flake8 = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "flake8"; - publisher = "ms-python"; - version = "2023.10.0"; - hash = "sha256-4Vjw8yJPrxLg0hcoTw8AEBEcmQ9sEUNqFaHLxICks0E="; - }; - meta = { - changelog = "https://marketplace.visualstudio.com/items/ms-python.flake8/changelog"; - description = "Python linting support for VS Code using Flake8"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.flake8"; - homepage = "https://github.com/microsoft/vscode-flake8"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.amadejkastelic ]; - }; - }; + ms-python.flake8 = callPackage ./ms-python.flake8 { }; ms-python.isort = callPackage ./ms-python.isort { }; diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.flake8/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.flake8/default.nix new file mode 100644 index 000000000000..c667d8bd8fae --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/ms-python.flake8/default.nix @@ -0,0 +1,22 @@ +{ + lib, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "ms-python"; + name = "flake8"; + version = "2025.1.10441012"; + hash = "sha256-Ed5cojxQzH0+j3oW7EnEk4ptsngYwTLz52Pcb3G6bNs="; + }; + + meta = { + changelog = "https://marketplace.visualstudio.com/items/ms-python.flake8/changelog"; + description = "Python linting support for VS Code using Flake8"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.flake8"; + homepage = "https://github.com/microsoft/vscode-flake8"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.amadejkastelic ]; + }; +} From a1ec3f39024cdc450c817107c0fbbb4080634a6f Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 17 Feb 2025 10:51:31 +0100 Subject: [PATCH 0643/1107] vscode-extensions.ms-python.black-formatter: move extension in its own directory, bump --- .../editors/vscode/extensions/default.nix | 20 +-------------- .../ms-python.black-formatter/default.nix | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 19 deletions(-) create mode 100644 pkgs/applications/editors/vscode/extensions/ms-python.black-formatter/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 52bc266f05f2..e14391b857e1 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3424,25 +3424,7 @@ let ms-pyright.pyright = callPackage ./ms-pyright.pyright { }; - ms-python.black-formatter = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "black-formatter"; - publisher = "ms-python"; - version = "2024.2.0"; - hash = "sha256-qIO+YqTXjwgznzUlnPSts1R2BM6iN8B9vESkelGPgZM="; - }; - meta = { - changelog = "https://marketplace.visualstudio.com/items/ms-python.black-formatter/changelog"; - description = "Formatter extension for Visual Studio Code using black"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.black-formatter"; - homepage = "https://github.com/microsoft/vscode-black-formatter"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ - amadejkastelic - sikmir - ]; - }; - }; + ms-python.black-formatter = callPackage ./ms-python.black-formatter { }; ms-python.flake8 = callPackage ./ms-python.flake8 { }; diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.black-formatter/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.black-formatter/default.nix new file mode 100644 index 000000000000..01fc206f6217 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/ms-python.black-formatter/default.nix @@ -0,0 +1,25 @@ +{ + lib, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "ms-python"; + name = "black-formatter"; + version = "2024.6.0"; + hash = "sha256-Waw+WhazNqVoihC/K/tPFH4tCeYYVOFDBfg+AWvs3q4="; + }; + + meta = { + changelog = "https://marketplace.visualstudio.com/items/ms-python.black-formatter/changelog"; + description = "Formatter extension for Visual Studio Code using black"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.black-formatter"; + homepage = "https://github.com/microsoft/vscode-black-formatter"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + amadejkastelic + sikmir + ]; + }; +} From d171a77b551f4409a3f7a2cbb8443272de05e56d Mon Sep 17 00:00:00 2001 From: liberodark Date: Mon, 17 Feb 2025 11:58:57 +0100 Subject: [PATCH 0644/1107] wings: format --- pkgs/by-name/wi/wings/package.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wi/wings/package.nix b/pkgs/by-name/wi/wings/package.nix index ee8df8dea284..572a72405535 100644 --- a/pkgs/by-name/wi/wings/package.nix +++ b/pkgs/by-name/wi/wings/package.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, fetchurl, fetchpatch, erlang, cl, libGL, libGLU, runtimeShell }: +{ + lib, + stdenv, + fetchurl, + fetchpatch, + erlang, + cl, + libGL, + libGLU, + runtimeShell, +}: stdenv.mkDerivation rec { pname = "wings"; @@ -27,7 +37,12 @@ stdenv.mkDerivation rec { find . -type f -name "*.[eh]rl" -exec sed -i 's,wings/intl_tools/,../intl_tools/,' {} \; ''; - buildInputs = [ erlang cl libGL libGLU ]; + buildInputs = [ + erlang + cl + libGL + libGLU + ]; ERL_LIBS = "${cl}/lib/erlang/lib"; From 7a56ddaf9d42e9aee8ddbf2d95f9ea82502d094c Mon Sep 17 00:00:00 2001 From: r-vdp Date: Mon, 17 Feb 2025 12:06:27 +0100 Subject: [PATCH 0645/1107] switch-to-configuration-ng: don't block when the lockfile is already locked When the lockfile is already locked, stc-ng currently blocks without any message indicating what is going on. This is very confusing to users, especially because most will not know about the lockfile. Since the current call blocks, we actually never end up in the else branch. Switching to a non-blocking call, makes sure that we print out an error and exit in case the lockfile is already locked by another process, which makes it a lot clearer what's going on and gives the user a clue as to what to do to unblock the situation. --- pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs b/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs index a64d8566225b..64fc71e85aed 100644 --- a/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs +++ b/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs @@ -1037,7 +1037,7 @@ fn do_system_switch(action: Action) -> anyhow::Result<()> { die(); }; - let Ok(_lock) = Flock::lock(lock, FlockArg::LockExclusive) else { + let Ok(_lock) = Flock::lock(lock, FlockArg::LockExclusiveNonblock) else { eprintln!("Could not acquire lock"); die(); }; From 8aac9de009621afcb808be72a1aa54557f34a3d5 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 17 Feb 2025 12:06:44 +0100 Subject: [PATCH 0646/1107] vscode-extensions.visualjj.visualjj: 0.13.4 -> 0.13.6 --- .../vscode/extensions/visualjj.visualjj/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix index ceece0447b0f..039847f85ca9 100644 --- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix +++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix @@ -10,26 +10,26 @@ vscode-utils.buildVscodeMarketplaceExtension { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-q9ubYkhrV28sB9CV1dyBEIFEkTrkGHRXdz5+4xjeVzI="; + hash = "sha256-ub19F5vWUWg2eWUg/lst/+GrCsw6o6yeRQ9Lnb83Oow="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-vV5u1QBICz3GIYRgH9UWM38a8YXtvW0u8r7c1SaKwxM="; + hash = "sha256-sNxpfCZbT4rCBn7fYBimFiNsMg72i8GmLfK7EP+8hHg="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-fgT4brIhHI6gNCcsbHpz+v4/diyox2VoFlvCnhPIbPM="; + hash = "sha256-snPaNPNTHFHZmaXckcjQuHTw/LvwaEj9irRLXnyrGHU="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-/uuLRkEY430R5RS7B6972iginpA3pWpApjI6RUTxcHM="; + hash = "sha256-wcNms02vhe3WSWn0HE7owf/0W25EZvkLvRn2oQJewd4="; }; }; in { name = "visualjj"; publisher = "visualjj"; - version = "0.13.4"; + version = "0.13.6"; } // sources.${stdenvNoCC.system} or (throw "Unsupported system ${stdenvNoCC.system}"); From 11c21de1bc52af6f29e7a6e929886bb3108b5f80 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Mon, 17 Feb 2025 09:30:32 +0000 Subject: [PATCH 0647/1107] snapcraft: 8.6.1 -> 8.7.0 --- pkgs/by-name/sn/snapcraft/package.nix | 20 ++++++------------- .../sn/snapcraft/snapcraft-data-dirs.patch | 20 +++++-------------- 2 files changed, 11 insertions(+), 29 deletions(-) diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix index dd7d02d44775..e013ee94d03c 100644 --- a/pkgs/by-name/sn/snapcraft/package.nix +++ b/pkgs/by-name/sn/snapcraft/package.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { pname = "snapcraft"; - version = "8.6.1"; + version = "8.7.0"; pyproject = true; @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { owner = "canonical"; repo = "snapcraft"; tag = version; - hash = "sha256-SbxsgvDptkUl8gHAIrJvnzIPOh0/R81n8cgJWBH7BXQ="; + hash = "sha256-AFqCIqU3XAITrnRp0VzFzvW1LGSJPTFS6VWSR3qF1Pc="; }; patches = [ @@ -43,15 +43,7 @@ python3Packages.buildPythonApplication rec { ]; postPatch = '' - substituteInPlace setup.py \ - --replace-fail 'version=determine_version()' 'version="${version}"' \ - --replace-fail 'gnupg' 'python-gnupg' - - substituteInPlace requirements.txt \ - --replace-fail 'gnupg==2.3.1' 'python-gnupg' - - substituteInPlace snapcraft/__init__.py \ - --replace-fail '__version__ = _get_version()' '__version__ = "${version}"' + substituteInPlace snapcraft/__init__.py --replace-fail "dev" "${version}" substituteInPlace snapcraft_legacy/__init__.py \ --replace-fail '__version__ = _get_version()' '__version__ = "${version}"' @@ -60,8 +52,7 @@ python3Packages.buildPythonApplication rec { --replace-fail 'arch_linker_path = Path(arch_config.dynamic_linker)' \ 'return str(Path("${glibc}/lib/ld-linux-x86-64.so.2"))' - substituteInPlace pyproject.toml \ - --replace-fail '"pytest-cov>=4.0",' "" + substituteInPlace pyproject.toml --replace-fail 'gnupg' 'python-gnupg' ''; nativeBuildInputs = [ makeWrapper ]; @@ -110,10 +101,11 @@ python3Packages.buildPythonApplication rec { validators ]; - build-system = with python3Packages; [ setuptools ]; + build-system = with python3Packages; [ setuptools-scm ]; pythonRelaxDeps = [ "craft-parts" + "cryptography" "docutils" "jsonschema" "pygit2" diff --git a/pkgs/by-name/sn/snapcraft/snapcraft-data-dirs.patch b/pkgs/by-name/sn/snapcraft/snapcraft-data-dirs.patch index 1dc4ef6cdcdf..3f9ac77fa555 100644 --- a/pkgs/by-name/sn/snapcraft/snapcraft-data-dirs.patch +++ b/pkgs/by-name/sn/snapcraft/snapcraft-data-dirs.patch @@ -1,26 +1,16 @@ diff --git a/snapcraft_legacy/internal/common.py b/snapcraft_legacy/internal/common.py -index 6017b405..aacd99a5 100644 +index b3d40c265..c68c24d53 100644 --- a/snapcraft_legacy/internal/common.py +++ b/snapcraft_legacy/internal/common.py -@@ -34,14 +34,17 @@ from snaphelpers import SnapConfigOptions, SnapCtlError +@@ -36,7 +36,10 @@ from snapcraft_legacy.internal import errors - from snapcraft_legacy.internal import errors + SNAPCRAFT_FILES = ["parts", "stage", "prime"] +-_DEFAULT_PLUGINDIR = os.path.join(sys.prefix, "share", "snapcraft", "plugins") +# Get the path to the Nix store entry for Snapcraft at runtime +drv = os.path.realpath(__file__).split("/")[3] + - SNAPCRAFT_FILES = ["parts", "stage", "prime"] --_DEFAULT_PLUGINDIR = os.path.join(sys.prefix, "share", "snapcraft", "plugins") +_DEFAULT_PLUGINDIR = os.path.join(os.sep, "nix", "store", drv, "share", "snapcraft", "plugins") _plugindir = _DEFAULT_PLUGINDIR --_DEFAULT_SCHEMADIR = os.path.join(sys.prefix, "share", "snapcraft", "schema") -+_DEFAULT_SCHEMADIR = os.path.join(os.sep, "nix", "store", drv, "share", "snapcraft", "schema") - _schemadir = _DEFAULT_SCHEMADIR --_DEFAULT_EXTENSIONSDIR = os.path.join(sys.prefix, "share", "snapcraft", "extensions") -+_DEFAULT_EXTENSIONSDIR = os.path.join(os.sep, "nix", "store", drv, "share", "snapcraft", "extensions") - _extensionsdir = _DEFAULT_EXTENSIONSDIR --_DEFAULT_KEYRINGSDIR = os.path.join(sys.prefix, "share", "snapcraft", "keyrings") -+_DEFAULT_KEYRINGSDIR = os.path.join(os.sep, "nix", "store", drv, "share", "snapcraft", "keyrings") - _keyringsdir = _DEFAULT_KEYRINGSDIR - _DOCKERENV_FILE = "/.dockerenv" + _BASE_DIR = Path(__file__).parents[2] From a79257e14087f1bb2811643283683fe305b554c9 Mon Sep 17 00:00:00 2001 From: liberodark Date: Mon, 17 Feb 2025 11:59:47 +0100 Subject: [PATCH 0648/1107] wings: 2.2.4 -> 2.4.1 --- pkgs/by-name/wi/wings/package.nix | 90 +++++++++++++++++++++++-------- 1 file changed, 68 insertions(+), 22 deletions(-) diff --git a/pkgs/by-name/wi/wings/package.nix b/pkgs/by-name/wi/wings/package.nix index 572a72405535..c6c9fb52fa5f 100644 --- a/pkgs/by-name/wi/wings/package.nix +++ b/pkgs/by-name/wi/wings/package.nix @@ -1,31 +1,48 @@ { lib, stdenv, - fetchurl, - fetchpatch, + fetchFromGitHub, erlang, cl, libGL, libGLU, runtimeShell, + git, + eigen, + libigl, + nix-update-script, }: stdenv.mkDerivation rec { pname = "wings"; - version = "2.2.4"; + version = "2.4.1"; - src = fetchurl { - url = "mirror://sourceforge/wings/wings-${version}.tar.bz2"; - sha256 = "1xcmifs4vq2810pqqvsjsm8z3lz24ys4c05xkh82nyppip2s89a3"; + src = fetchFromGitHub { + owner = "dgud"; + repo = "wings"; + tag = "v${version}"; + hash = "sha256-3ulWbAOtYujaymN50u7buvnBdtYMEAe8Ji3arvPUH/s="; }; - patches = [ - (fetchpatch { - url = "https://github.com/dgud/wings/commit/94b3a3c6a0cfdcdbd98edce055d5c83ecb361f37.patch"; - hash = "sha256-DHT1TiYoowloIWrdutBu70mL+557cTFr1dRcNgwbkpE="; - }) + nativeBuildInputs = [ git ]; + buildInputs = [ + erlang + cl + libGL + libGLU + eigen + libigl + cl ]; + preBuildPhases = [ "setupDepsPhase" ]; + setupDepsPhase = '' + mkdir -p _deps/eigen _deps/libigl + ln -s ${eigen}/include/eigen3/* _deps/eigen/ + ln -s ${libigl}/include/* _deps/libigl/ + ln -s ${cl}/lib/erlang/lib/cl* _deps/cl + ''; + postPatch = '' find . -type f -name "Makefile" -exec sed -i 's,-Werror ,,' {} \; sed -i 's,../../wings/,../,' icons/Makefile @@ -35,36 +52,65 @@ stdenv.mkDerivation rec { find . -type f -name "*.[eh]rl" -exec sed -i 's,wings/src/,../src/,' {} \; find . -type f -name "*.[eh]rl" -exec sed -i 's,wings/e3d/,../e3d/,' {} \; find . -type f -name "*.[eh]rl" -exec sed -i 's,wings/intl_tools/,../intl_tools/,' {} \; + echo "${version}" > version ''; - buildInputs = [ - erlang - cl - libGL - libGLU + makeFlags = [ + "TYPE=opt" + "WINGS_VSN=${version}" ]; - ERL_LIBS = "${cl}/lib/erlang/lib"; + preBuild = '' + mkdir -p priv + ''; + + buildPhase = '' + runHook preBuild + + make TYPE=opt WINGS_VSN=${version} + cd c_src + make + cd .. + + runHook postBuild + ''; + + postBuild = '' + test -d ebin || exit 1 + test -d priv || exit 1 + ''; # I did not test the *cl* part. I added the -pa just by imitation. installPhase = '' - mkdir -p $out/bin $out/lib/wings-${version}/ebin - cp ebin/* $out/lib/wings-${version}/ebin - cp -R textures shaders plugins $out/lib/wings-${version} + runHook preInstall + + mkdir -p $out/bin $out/lib/wings-${version}/ebin $out/lib/wings-${version}/priv + cp -R ebin/* $out/lib/wings-${version}/ebin/ + cp -R textures shaders plugins $out/lib/wings-${version}/ + cp -R priv/* $out/lib/wings-${version}/priv/ || true + if [ -d c_src ]; then + find c_src -name "*.so" -exec cp {} $out/lib/wings-${version}/priv/ \; + fi cat << EOF > $out/bin/wings #!${runtimeShell} ${erlang}/bin/erl \ -pa $out/lib/wings-${version}/ebin -run wings_start start_halt "$@" EOF chmod +x $out/bin/wings + + runHook postInstall ''; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { homepage = "https://www.wings3d.com/"; description = "Subdivision modeler inspired by Nendo and Mirai from Izware"; license = lib.licenses.tcltk; - maintainers = [ ]; - platforms = with lib.platforms; linux; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.linux; mainProgram = "wings"; }; } From 6a9d76045c184788cfc72f5e3a8322fe92060d46 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 17 Feb 2025 12:26:05 +0100 Subject: [PATCH 0649/1107] curv: fix build on aarch64 --- pkgs/by-name/cu/curv/package.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/cu/curv/package.nix b/pkgs/by-name/cu/curv/package.nix index a70b9ac3d5d6..ae6d0b8f3ac7 100644 --- a/pkgs/by-name/cu/curv/package.nix +++ b/pkgs/by-name/cu/curv/package.nix @@ -58,16 +58,21 @@ stdenv.mkDerivation rec { llvmPackages.openmp ]; + # force char to be unsigned on aarch64 + # https://codeberg.org/doug-moen/curv/issues/227 + NIX_CFLAGS_COMPILE = [ "-fsigned-char" ]; + # GPU tests do not work in sandbox, instead we do this for sanity - checkPhase = '' - runHook preCheck - test "$($out/bin/curv -x 2 + 2)" -eq "4" - runHook postCheck + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + test "$(set -x; $out/bin/curv -x "2 + 2")" -eq "4" + runHook postInstallCheck ''; meta = with lib; { description = "2D and 3D geometric modelling programming language for creating art with maths"; - homepage = "https://github.com/curv3d/curv"; + homepage = "https://codeberg.org/doug-moen/curv"; license = licenses.asl20; platforms = platforms.all; broken = stdenv.hostPlatform.isDarwin; From 080f3f53d01a201933bf7646c49b6de73431dec8 Mon Sep 17 00:00:00 2001 From: phaer Date: Mon, 17 Feb 2025 12:28:50 +0100 Subject: [PATCH 0650/1107] backblaze-b2: 4.2.0 -> 4.3.0 --- pkgs/by-name/ba/backblaze-b2/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ba/backblaze-b2/package.nix b/pkgs/by-name/ba/backblaze-b2/package.nix index 54c2e9f1ef3d..e2bb597d683f 100644 --- a/pkgs/by-name/ba/backblaze-b2/package.nix +++ b/pkgs/by-name/ba/backblaze-b2/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication rec { pname = "backblaze-b2"; - version = "4.2.0"; + version = "4.3.0"; pyproject = true; src = fetchFromGitHub { owner = "Backblaze"; repo = "B2_Command_Line_Tool"; tag = "v${version}"; - hash = "sha256-a0XJq8M1yw4GmD5ndIAJtmHFKqS0rYdvYIxK7t7oyZw="; + hash = "sha256-ZDjKDLxzz6sHH0VnLlVvmQ0BSbmDBpujDgrtCEmZ2hU="; }; nativeBuildInputs = with python3Packages; [ @@ -44,6 +44,8 @@ python3Packages.buildPythonApplication rec { setuptools ]; + pythonRelaxDeps = [ "phx-class-registry" ]; + nativeCheckInputs = with python3Packages; [ backoff more-itertools From 6bc46b23c66d7f7dcbd47a529526be5b5af433ef Mon Sep 17 00:00:00 2001 From: Vonfry Date: Mon, 17 Feb 2025 19:30:15 +0800 Subject: [PATCH 0651/1107] tdlib: 1.8.44 -> 1.8.45 --- pkgs/by-name/td/tdlib/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/td/tdlib/package.nix b/pkgs/by-name/td/tdlib/package.nix index 1b05ff79b37f..6507b93506b4 100644 --- a/pkgs/by-name/td/tdlib/package.nix +++ b/pkgs/by-name/td/tdlib/package.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation { pname = "tdlib"; - version = "1.8.44"; + version = "1.8.45"; src = fetchFromGitHub { owner = "tdlib"; @@ -45,8 +45,8 @@ stdenv.mkDerivation { # The tdlib authors do not set tags for minor versions, but # external programs depending on tdlib constrain the minor # version, hence we set a specific commit with a known version. - rev = "28c6f2e9c045372d50217919bf5768b7fbbe0294"; - hash = "sha256-IZ/VplO7PSzYVYmUa6nhJdI4kni8x5TZ7XWkf8JcmYI="; + rev = "8e29c4d7d21db3ab2c7a88c384626e95ef789f61"; + hash = "sha256-R/OkKj65PEDrFOTvybv3tQ/cyqBZDzusnd5RJgrgspo="; }; buildInputs = [ From c55a420857802a81b84b62e6f1d8e3f4aa5de751 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Mon, 17 Feb 2025 12:33:45 +0100 Subject: [PATCH 0652/1107] cinny: 4.3.0 -> 4.3.2 --- pkgs/by-name/ci/cinny-unwrapped/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ci/cinny-unwrapped/package.nix b/pkgs/by-name/ci/cinny-unwrapped/package.nix index 9978f08c32ab..a033fb364593 100644 --- a/pkgs/by-name/ci/cinny-unwrapped/package.nix +++ b/pkgs/by-name/ci/cinny-unwrapped/package.nix @@ -13,16 +13,16 @@ buildNpmPackage rec { pname = "cinny-unwrapped"; - version = "4.3.0"; + version = "4.3.2"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny"; rev = "v${version}"; - hash = "sha256-cRsjzIq8uFipyYYmxK4JzmG3Ba/0NaScyiebGqoZJFE="; + hash = "sha256-PXh3ouPPgSm4BFq6lE4vr2L+Eu7rsANvhXzqYY0rpVw="; }; - npmDepsHash = "sha256-ZmeXZN9sW17y4aIeIthvs4YiFF77xabeVXGwr6O49lQ="; + npmDepsHash = "sha256-Ktz82HzbWeMvx5McWS11qpqWNVWJU6yxIFzUkMoT6WE="; nativeBuildInputs = [ python3 From a63e1561d9c0075f45f27647f8db59d20cd25bb3 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Mon, 17 Feb 2025 12:36:46 +0100 Subject: [PATCH 0653/1107] cinny-desktop: 4.3.1 -> 4.3.2 --- pkgs/by-name/ci/cinny-desktop/package.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix index e11bf85c123d..39b03424d322 100644 --- a/pkgs/by-name/ci/cinny-desktop/package.nix +++ b/pkgs/by-name/ci/cinny-desktop/package.nix @@ -19,28 +19,26 @@ rustPlatform.buildRustPackage rec { pname = "cinny-desktop"; # We have to be using the same version as cinny-web or this isn't going to work. - # TODO: this is temporarily not true for Cinny Desktop v4.3.1 - version = "4.3.1"; + version = "4.3.2"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny-desktop"; tag = "v${version}"; - hash = "sha256-lVBKzajxsQ33zC6NhRLMbWK81GxCbIQPtSR61yJHUL4="; + hash = "sha256-GwLfeQG19s35sEfeZmWa+PkJtAcSUHcbe05KnJ+jttY="; }; sourceRoot = "${src.name}/src-tauri"; useFetchCargoVendor = true; - cargoHash = "sha256-a2IyJ5a11cxgHpb2WRDxVF+aoL8kNnjBNwaQpgT3goo="; + cargoHash = "sha256-cX6nVNdSpy1Kbccuiv0XG+MysCjrLem42osTvhn2aMA="; postPatch = let cinny' = - # TODO: temporarily disabled for Cinny Desktop v4.3.1 (cinny-unwrapped is still at 4.3.0) - # assert lib.assertMsg ( - # cinny.version == version - # ) "cinny.version (${cinny.version}) != cinny-desktop.version (${version})"; + assert lib.assertMsg ( + cinny.version == version + ) "cinny.version (${cinny.version}) != cinny-desktop.version (${version})"; cinny.override { conf = { hashRouter.enabled = true; From c775348913f1f5e312aa0b8a6d491edf34f699c0 Mon Sep 17 00:00:00 2001 From: Vonfry Date: Mon, 17 Feb 2025 19:22:47 +0800 Subject: [PATCH 0654/1107] libime: 1.1.9 -> 1.1.10 Diff: https://github.com/fcitx/libime/compare/1.1.9...1.1.10 --- pkgs/by-name/li/libime/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/li/libime/package.nix b/pkgs/by-name/li/libime/package.nix index db80dc81742f..073c3f603628 100644 --- a/pkgs/by-name/li/libime/package.nix +++ b/pkgs/by-name/li/libime/package.nix @@ -17,10 +17,10 @@ let url = "https://download.fcitx-im.org/data/table-${tableVer}.tar.zst"; hash = "sha256-Pp2HsEo5PxMXI0csjqqGDdI8N4o9T2qQBVE7KpWzYUs="; }; - arpaVer = "20241001"; + arpaVer = "20250113"; arpa = fetchurl { url = "https://download.fcitx-im.org/data/lm_sc.arpa-${arpaVer}.tar.zst"; - hash = "sha256-VJNOc5Zus46k/o6unGHf5IavN9octTFqBrGcfSieMGM="; + hash = "sha256-7oPs8g1S6LzNukz2zVcYPVPCV3E6Xrd+46Y9UPw3lt0="; }; dictVer = "20241001"; dict = fetchurl { @@ -30,13 +30,13 @@ let in stdenv.mkDerivation rec { pname = "libime"; - version = "1.1.9"; + version = "1.1.10"; src = fetchFromGitHub { owner = "fcitx"; repo = "libime"; rev = version; - hash = "sha256-Ky4ERYQRUiPn+EYrgfmfHxdVp31a1oD4nevDniPOT20="; + hash = "sha256-liVJEBUYcVYjjJCMW68xXbEHKQpAgTLCPm2yIdWG3IQ="; fetchSubmodules = true; }; From a567a342a9f068f088193b147a69f191dd54ee14 Mon Sep 17 00:00:00 2001 From: Vonfry Date: Mon, 17 Feb 2025 19:22:52 +0800 Subject: [PATCH 0655/1107] fcitx5: 5.1.11 -> 5.1.12 Diff: https://github.com/fcitx/fcitx5/compare/5.1.11...5.1.12 --- pkgs/tools/inputmethods/fcitx5/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix index 6267021e208c..a6c11b3ddbc7 100644 --- a/pkgs/tools/inputmethods/fcitx5/default.nix +++ b/pkgs/tools/inputmethods/fcitx5/default.nix @@ -45,13 +45,13 @@ let in stdenv.mkDerivation rec { pname = "fcitx5"; - version = "5.1.11"; + version = "5.1.12"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-8J2gr2quZvJELd3zzhgwZUowjkOylpM6VZGJ1G3VomI="; + hash = "sha256-Jk7YY6nrY1Yn9KeNlRJbMF/fCMIlUVg/Elt7SymlK84="; }; prePatch = '' From b0eb10c6e8cf4efaacb82be1e2c3619c2063b6b1 Mon Sep 17 00:00:00 2001 From: Vonfry Date: Mon, 17 Feb 2025 19:22:59 +0800 Subject: [PATCH 0656/1107] fcitx5-anthy: 5.1.5 -> 5.1.6 --- pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix index b604a7e838bf..2b73d1f179c8 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "fcitx5-anthy"; - version = "5.1.5"; + version = "5.1.6"; src = fetchurl { url = "https://download.fcitx-im.org/fcitx5/fcitx5-anthy/${pname}-${version}.tar.zst"; - hash = "sha256-heSO2eArdSnOmIg7JG8vOo5y3g5dSPOuXkUfeNqKzSA="; + hash = "sha256-XIgzYHiSE/PHNGUt68IZXKahPwYOZ3O0bq/KO1MrnCI="; }; nativeBuildInputs = [ From 1ccebc0dd7e912598c568da2273e0ecc4a82ee20 Mon Sep 17 00:00:00 2001 From: Vonfry Date: Mon, 17 Feb 2025 19:23:02 +0800 Subject: [PATCH 0657/1107] fcitx5-chewing: 5.1.6 -> 5.1.7 Diff: https://github.com/fcitx/fcitx5-chewing/compare/5.1.6...5.1.7 --- pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix index 33b4571da34d..163c922359da 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-chewing"; - version = "5.1.6"; + version = "5.1.7"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-WSu78k0udlXxiQ1sAqB/LKmVfThxizshH5C9q2CfZLI="; + hash = "sha256-QL1rRMsaDP98as0zlmoDPoVnbqbKQFoUFSCX+j31JcM="; }; nativeBuildInputs = [ From fbd6a6ecff82806f46ee5addf86874a16fb8a059 Mon Sep 17 00:00:00 2001 From: Vonfry Date: Mon, 17 Feb 2025 19:23:06 +0800 Subject: [PATCH 0658/1107] fcitx5-chinese-addons: 5.1.7 -> 5.1.8 Diff: https://github.com/fcitx/fcitx5-chinese-addons/compare/5.1.7...5.1.8 --- pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix index 101db511b155..4203126e72e5 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix @@ -34,13 +34,13 @@ in stdenv.mkDerivation rec { pname = "fcitx5-chinese-addons"; - version = "5.1.7"; + version = "5.1.8"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-vtIzm8ia5hC0JdsGNopIHdAd8RDVgrbtVvj1Jh+gE94="; + hash = "sha256-QO136EbUFxT7yA1Fs4DvV0CKpdCMw/s5s9sW3vRzGD8="; }; nativeBuildInputs = [ From b484a715816744581704bff705d0d2cad0f302d5 Mon Sep 17 00:00:00 2001 From: Vonfry Date: Mon, 17 Feb 2025 19:23:11 +0800 Subject: [PATCH 0659/1107] fcitx5-hangul: 5.1.5 -> 5.1.6 Diff: https://github.com/fcitx/fcitx5-hangul/compare/5.1.5...5.1.6 --- pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix index 86271423a841..61ac278d0239 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-hangul"; - version = "5.1.5"; + version = "5.1.6"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-+IXsMT87Dc+Ad4r6/U+NLYo+04j+I58Cqz99v4Yr0uc="; + hash = "sha256-WTTMW86KsrncfDHttri2eSA0bp/Vm4QVyl9tWkJn00E="; }; nativeBuildInputs = [ From a791c7a1d7d60942fd65311a255a79e0c4f96440 Mon Sep 17 00:00:00 2001 From: Vonfry Date: Mon, 17 Feb 2025 19:23:14 +0800 Subject: [PATCH 0660/1107] fcitx5-lua: 5.0.13 -> 5.0.14 Diff: https://github.com/fcitx/fcitx5-lua/compare/5.0.13...5.0.14 --- pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix index ec040d344998..4a6b3dc7268b 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation rec { pname = "fcitx5-lua"; - version = "5.0.13"; + version = "5.0.14"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-XRfYQquR9SVlYr2sX6ii8JjMyjJZWSMf1u2oKUmOhf8="; + hash = "sha256-7FBUOsaKr9cuEaqd4dqnAGL5sd3RF+qV6GEkOUQ1/k4="; }; nativeBuildInputs = [ From a47221aca31b92c21d54a4f664d92167c84d41fb Mon Sep 17 00:00:00 2001 From: Vonfry Date: Mon, 17 Feb 2025 19:23:17 +0800 Subject: [PATCH 0661/1107] fcitx5-m17n: 5.1.2 -> 5.1.3 Diff: https://github.com/fcitx/fcitx5-m17n/compare/5.1.2...5.1.3 --- pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix index 8d6640b3254a..7eaaa0fc818d 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-m17n"; - version = "5.1.2"; + version = "5.1.3"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-LBFPkkBaKcVtTLKswLlr1EdCoY63nToa8I7ea1/MZeg="; + hash = "sha256-kHMCMsJ8+rI0AtS9zEE5knGvKALhgfmgS8lC/CTmYs0="; }; nativeBuildInputs = [ From 40864cc9126e53e8d7e43fe21ad25abe65872cc6 Mon Sep 17 00:00:00 2001 From: Vonfry Date: Mon, 17 Feb 2025 19:23:22 +0800 Subject: [PATCH 0662/1107] libsForQt5.fcitx5-qt: 5.1.8 -> 5.1.9 Diff: https://github.com/fcitx/fcitx5-qt/compare/5.1.8...5.1.9 --- pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index e7ada4963a1a..f8c7d6742d19 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "fcitx5-qt${majorVersion}"; - version = "5.1.8"; + version = "5.1.9"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-qt"; rev = version; - hash = "sha256-up4EC4GLzDjd9QJzeV2b2uVZNxYa268D/FotCyy1sos="; + hash = "sha256-cOCLPsWRcwukGCKAYHrZSRUYlmfYxdyspX5Y0rqbD2w="; }; postPatch = '' From 074d6cd35fb82511acdf9ceb2f1e0bc82a62bf7c Mon Sep 17 00:00:00 2001 From: Vonfry Date: Mon, 17 Feb 2025 19:23:27 +0800 Subject: [PATCH 0663/1107] fcitx5-rime: 5.1.9 -> 5.1.10 --- pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix index 1ef0ac41f321..d6c7eda599a4 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "fcitx5-rime"; - version = "5.1.9"; + version = "5.1.10"; src = fetchurl { url = "https://download.fcitx-im.org/fcitx5/${pname}/${pname}-${version}.tar.zst"; - hash = "sha256-+aIb7ktmhKb6ixhvzCG6GLeEUfS3QHJmEZ3YGE5YrZg="; + hash = "sha256-ACW79fLgrS+Qv8YJjGr4WldTJsnnGhC0WWf8ia9khYk="; }; cmakeFlags = [ From ffa83545b8adccd1ba7b8d04aaf63151e9b55ee6 Mon Sep 17 00:00:00 2001 From: Vonfry Date: Mon, 17 Feb 2025 19:23:31 +0800 Subject: [PATCH 0664/1107] fcitx5-skk: 5.1.5 -> 5.1.6 Diff: https://github.com/fcitx/fcitx5-skk/compare/5.1.5...5.1.6 --- pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix index 34bfa097dca2..0978efc04c07 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-skk"; - version = "5.1.5"; + version = "5.1.6"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-wv5vX9eFlBUY7x4v9U+OuhKgX6V/b3iTaCvAIwJO10o="; + hash = "sha256-1gfR0wXBXM6Gttwldg2vm8DUUW4OciqKMQkpFQHqLoE="; }; nativeBuildInputs = [ From 267fdbca4203c29240d1d643f365b335a5944c06 Mon Sep 17 00:00:00 2001 From: Vonfry Date: Mon, 17 Feb 2025 19:23:36 +0800 Subject: [PATCH 0665/1107] fcitx5-unikey: 5.1.5 -> 5.1.6 Diff: https://github.com/fcitx/fcitx5-unikey/compare/5.1.5...5.1.6 --- pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix index 07ae7b36fb77..c6b43043956b 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-unikey"; - version = "5.1.5"; + version = "5.1.6"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-unikey"; rev = version; - hash = "sha256-CcyDK+knBXh2P+g3aB0Cv8F5BX7uCRbYwHjMEYo9k8A="; + hash = "sha256-hx3GXoloO3eQP9yhLY8v1ahwvOTCe5XcBey+ZbReRjE="; }; nativeBuildInputs = [ From f66585fd3918eaaf4bc232327faee6ff66f4e6d4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Feb 2025 11:47:47 +0000 Subject: [PATCH 0666/1107] build(deps): bump actions/create-github-app-token from 1.11.3 to 1.11.5 Bumps [actions/create-github-app-token](https://github.com/actions/create-github-app-token) from 1.11.3 to 1.11.5. - [Release notes](https://github.com/actions/create-github-app-token/releases) - [Commits](https://github.com/actions/create-github-app-token/compare/67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7...0d564482f06ca65fa9e77e2510873638c82206f2) --- updated-dependencies: - dependency-name: actions/create-github-app-token dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/backport.yml | 2 +- .github/workflows/codeowners-v2.yml | 4 ++-- .github/workflows/eval.yml | 2 +- .github/workflows/periodic-merge.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 7f4b38f06f2a..428f2e247bcc 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -19,7 +19,7 @@ jobs: steps: # Use a GitHub App to create the PR so that CI gets triggered # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs - - uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3 + - uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5 id: app-token with: app-id: ${{ vars.NIXPKGS_CI_APP_ID }} diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml index 19bfdd4f9f79..f9fd85a58dab 100644 --- a/.github/workflows/codeowners-v2.yml +++ b/.github/workflows/codeowners-v2.yml @@ -63,7 +63,7 @@ jobs: - name: Build codeowners validator run: nix-build base/ci -A codeownersValidator - - uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3 + - uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5 id: app-token with: app-id: ${{ vars.OWNER_RO_APP_ID }} @@ -96,7 +96,7 @@ jobs: # This is intentional, because we need to request the review of owners as declared in the base branch. - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3 + - uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5 id: app-token with: app-id: ${{ vars.OWNER_APP_ID }} diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index a9fecb67b645..beb993655af9 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -241,7 +241,7 @@ jobs: steps: # See ./codeowners-v2.yml, reuse the same App because we need the same permissions # Can't use the token received from permissions above, because it can't get enough permissions - - uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3 + - uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5 id: app-token with: app-id: ${{ vars.OWNER_APP_ID }} diff --git a/.github/workflows/periodic-merge.yml b/.github/workflows/periodic-merge.yml index 12c6907f95e6..84ef484d969f 100644 --- a/.github/workflows/periodic-merge.yml +++ b/.github/workflows/periodic-merge.yml @@ -19,7 +19,7 @@ jobs: steps: # Use a GitHub App to create the PR so that CI gets triggered # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs - - uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3 + - uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5 id: app-token with: app-id: ${{ vars.NIXPKGS_CI_APP_ID }} From 4c5af6cdcdc6a371f811dbd6f5c91a0db5fafcb3 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 17 Feb 2025 12:49:41 +0100 Subject: [PATCH 0667/1107] linux_testing: 6.14-rc2 -> 6.14-rc3 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 630cc673e791..7b5225ffe8e2 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "6.14-rc2", - "hash": "sha256:1i7zxjz0vckl31cb6anb0b9m0k7l3y2gk6r5y6in41p8mjf4rrpk" + "version": "6.14-rc3", + "hash": "sha256:19w0hzb4bbfsckd189p4fvsm6nhsrsbsrwr9ca2k2gxmdjdyd9hi" }, "6.1": { "version": "6.1.128", From e6e7843606653fe4f0ba8b9118b31f3b26865da7 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 17 Feb 2025 12:49:58 +0100 Subject: [PATCH 0668/1107] linux_6_13: 6.13.2 -> 6.13.3 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 7b5225ffe8e2..e998d661fe4d 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -32,7 +32,7 @@ "hash": "sha256:1fpvfj4q2v3przxj5lkb3ra28h3g0mq9dqj4rvx4qnsmkvmdxszk" }, "6.13": { - "version": "6.13.2", - "hash": "sha256:01g73bnif9ynccb772628sca01y8zkww8wzb39qfkfvbj20jkxnd" + "version": "6.13.3", + "hash": "sha256:0b60rbii83lx2h455nm66hhlnygckprbaw3qifmala16xlazncys" } } From 11fce8c32625ce70f3254e081797e5e1b4389304 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 17 Feb 2025 12:50:07 +0100 Subject: [PATCH 0669/1107] linux_6_12: 6.12.13 -> 6.12.14 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index e998d661fe4d..334fccdbe20b 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -28,8 +28,8 @@ "hash": "sha256:1z2913y38clnlmhvwj49h7p4pic24s4d8np7nmd4lk7m2xz8w532" }, "6.12": { - "version": "6.12.13", - "hash": "sha256:1fpvfj4q2v3przxj5lkb3ra28h3g0mq9dqj4rvx4qnsmkvmdxszk" + "version": "6.12.14", + "hash": "sha256:054gi5fp60d2536z06b1lmys9zlraixh22yb75z42xfqnjzz88wl" }, "6.13": { "version": "6.13.3", From d3a03c8ea9690da048a482ec2f3da9e546338591 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 17 Feb 2025 12:50:16 +0100 Subject: [PATCH 0670/1107] linux_6_6: 6.6.77 -> 6.6.78 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 334fccdbe20b..3284b4d54aa0 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -20,8 +20,8 @@ "hash": "sha256:0mm4q8f6kbqddy4zaxjf5xyqpnla5qprvsf7v3vq01gmlzr3rivc" }, "6.6": { - "version": "6.6.77", - "hash": "sha256:0km855dnimg1clilnpcz293bd2gpbycvn3llm9kyynhjrzgqj408" + "version": "6.6.78", + "hash": "sha256:1vckmam50nw8gms1wj18p5mv7rkpl849k3q587bkl4smsndrm8ss" }, "6.11": { "version": "6.11.11", From 7e8817eebdbcc3ab428159ae1962a93f29b6b74c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 17 Feb 2025 12:50:38 +0100 Subject: [PATCH 0671/1107] linux-rt_6_1: 6.1.127-rt48 -> 6.1.128-rt49 --- pkgs/os-specific/linux/kernel/linux-rt-6.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix index 088c7ef0fe50..9b6afa18763d 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix @@ -10,7 +10,7 @@ }@args: let - version = "6.1.127-rt48"; # updated by ./update-rt.sh + version = "6.1.128-rt49"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in @@ -29,7 +29,7 @@ buildLinux ( src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz"; - sha256 = "0xkqpwhvz6qhaxzg1j993lv1iyvb2zydgq6d8mhdbfkz38fx9c0q"; + sha256 = "1wshgkgcxaf4mnm4ngngsj8gq1cg8kq56f5kqsdfcw0m339nfkc7"; }; kernelPatches = @@ -38,7 +38,7 @@ buildLinux ( name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1sq79iibjsph3jmmihabamzmm4sr68sw87jqqa3khzq7f2s6cwmg"; + sha256 = "1gyy9zwfcczy9v8790f06kaz7gg75a4cf4qpyjffqx3s21lwzbjf"; }; }; in From eab7660870b755a087beb08c7e522bdbf9fa2286 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 17 Feb 2025 12:50:58 +0100 Subject: [PATCH 0672/1107] linux-rt_6_6: 6.6.74-rt48 -> 6.6.77-rt50 --- pkgs/os-specific/linux/kernel/linux-rt-6.6.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix index 3210da6a022b..7e217a23ea28 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix @@ -10,7 +10,7 @@ }@args: let - version = "6.6.74-rt48"; # updated by ./update-rt.sh + version = "6.6.77-rt50"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in @@ -29,7 +29,7 @@ buildLinux ( src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz"; - sha256 = "0ka9snxl0y57fajy8vszwa4ggn48pid8m1879d4vl3mbicd2nppi"; + sha256 = "0km855dnimg1clilnpcz293bd2gpbycvn3llm9kyynhjrzgqj408"; }; kernelPatches = @@ -38,7 +38,7 @@ buildLinux ( name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1rpbbm9fln2v6xigxrsajivr4zmh0nika3nmm1y7ws31njkg57gq"; + sha256 = "10kzns1c6yqn7az2i7zwm1lnss56mi6w44rw7xm2kk6n1h80590n"; }; }; in From eaee7b7a4515246c0316e9ef053b64cba6d6929c Mon Sep 17 00:00:00 2001 From: Tim <16214296+Tim-Wsm@users.noreply.github.com> Date: Sun, 9 Feb 2025 22:54:29 +0100 Subject: [PATCH 0673/1107] glibc_multi: add output "static" This change enables static compilation with glibc in a multilib setup. For building a nix shell the output can now be referenced as follows: devShells.default = pkgs.mkShell { packages = [ pkgs.glibc_multi.static ]; }; In the implementation I was forced to make two design decisions: 1. The directory `$static/lib64` has to be a "real" directory and not a symlink. Otherwise, the path to this directory is not added to $NIX_LDFLAGS, which in turn causes the files to not be visible to gcc and ld during the build process (for details see `pkgs/build-support/bintools-wrapper/setup-hook.sh` line 16). 2. The directories `$static/lib` and `$static/lib64` have to contain symlinks to both the files used for static and for dynamic linking (i.e. the outputs of `static` and `out` of the 32 and 64 bit variant of glibc). Without this, dynamic linking still works, however the resulting binaries will segfault. --- pkgs/development/libraries/glibc/multi.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glibc/multi.nix b/pkgs/development/libraries/glibc/multi.nix index 002c5aa35fb3..a57658520458 100644 --- a/pkgs/development/libraries/glibc/multi.nix +++ b/pkgs/development/libraries/glibc/multi.nix @@ -16,7 +16,8 @@ runCommand "${nameVersion.name}-multi-${nameVersion.version}" "out" "bin" "dev" - ]; # TODO: no static version here (yet) + "static" + ]; passthru = { libgcc = lib.lists.filter (x: x != null) [ (glibc64.libgcc or null) @@ -42,4 +43,13 @@ runCommand "${nameVersion.name}-multi-${nameVersion.version}" cp -rs '${glibc32.dev}'/include "$dev/" chmod +w -R "$dev" cp -rsf '${glibc64.dev}'/include "$dev/" + + mkdir -p "$static/lib" "$static/lib64" + # create symlinks for files used for dynamic linking + # -> removing this will cause dynamically linked programs to segfault + cp -rs '${glibc32.out}'/lib/* "$static/lib" + cp -rs '${glibc64.out}'/lib/* "$static/lib64" + # create symlinks for files used for static linking + cp -rs '${glibc32.static}'/lib/* "$static/lib" + cp -rs '${glibc64.static}'/lib/* "$static/lib64" '' From f486df02f71c8138389b4406cd645f3017c07a96 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Mon, 17 Feb 2025 12:58:23 +0100 Subject: [PATCH 0674/1107] 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 40f304af0dd040fbf6df97b774612409e97f6f4e Mon Sep 17 00:00:00 2001 From: Vonfry Date: Mon, 17 Feb 2025 19:58:25 +0800 Subject: [PATCH 0675/1107] fcitx5-mcbopomofo: 2.8.1 -> 2.9.0 --- pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix b/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix index e5b499f20f8a..fe64e911576b 100644 --- a/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix +++ b/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-mcbopomofo"; - version = "2.8.1"; + version = "2.9.0"; src = fetchFromGitHub { owner = "openvanilla"; repo = "fcitx5-mcbopomofo"; rev = version; - hash = "sha256-4z6kSzmtuypbT7oXBJqiOMwU6PVRH+vEBYcBWtv4fGE="; + hash = "sha256-xW3nxAfhdW7S0UJNl/NKhB1vzm0mMd92cA5ksPn7+QI="; }; nativeBuildInputs = [ @@ -39,8 +39,6 @@ stdenv.mkDerivation rec { json_c ]; - strictDeps = true; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; From 7a797c2a28780fdf729766a8e38f0bae4c03ab32 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Mon, 17 Feb 2025 12:58:38 +0100 Subject: [PATCH 0676/1107] 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 125edf84247b22c830776cc0cf21c182c2179712 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Mon, 17 Feb 2025 13:14:25 +0100 Subject: [PATCH 0677/1107] switch-to-configuration: don't block on flock, see 7a56ddaf9d42e9aee8ddbf2d95f9ea82502d094c --- nixos/modules/system/activation/switch-to-configuration.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 672291541d03..8eee52bfa332 100755 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -95,7 +95,7 @@ if (!-f "/etc/NIXOS" && (read_file("/etc/os-release", err_mode => "quiet") // "" make_path("/run/nixos", { mode => oct(755) }); open(my $stc_lock, '>>', '/run/nixos/switch-to-configuration.lock') or die "Could not open lock - $!"; -flock($stc_lock, LOCK_EX) or die "Could not acquire lock - $!"; +flock($stc_lock, LOCK_EX|LOCK_NB) or die "Could not acquire lock - $!"; openlog("nixos", "", LOG_USER); # run pre-switch checks From 6412c1cc6ddfacf62b8ac8e875fd718d64a70943 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 17 Feb 2025 13:21:22 +0100 Subject: [PATCH 0678/1107] python312Packages.pyorthanc: 1.19.0 -> 1.19.1 Diff: https://github.com/gacou54/pyorthanc/compare/refs/tags/v1.19.0...v1.19.1 Changelog: https://github.com/gacou54/pyorthanc/releases/tag/v1.19.1 --- .../python-modules/pyorthanc/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/pyorthanc/default.nix b/pkgs/development/python-modules/pyorthanc/default.nix index 09ef97b0b058..3e84ec6edf34 100644 --- a/pkgs/development/python-modules/pyorthanc/default.nix +++ b/pkgs/development/python-modules/pyorthanc/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, poetry-core, httpx, pydicom, @@ -10,20 +9,23 @@ buildPythonPackage rec { pname = "pyorthanc"; - version = "1.19.0"; - disabled = pythonOlder "3.8"; + version = "1.19.1"; pyproject = true; src = fetchFromGitHub { owner = "gacou54"; - repo = pname; + repo = "pyorthanc"; tag = "v${version}"; - hash = "sha256-6//kmkurtaXRGvnYnk/kU2j9F6V1Aui6IEdl+3DHGH0="; + hash = "sha256-97i341NXb7QsgN0X808mtz1rSKYSP+SMoGJy43Tkwug="; }; build-system = [ poetry-core ]; + pythonRelaxDeps = [ + "pydicom" + ]; + dependencies = [ httpx pydicom @@ -33,11 +35,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyorthanc" ]; - meta = with lib; { + meta = { description = "Python library that wraps the Orthanc REST API"; homepage = "https://github.com/gacou54/pyorthanc"; - changelog = "https://github.com/gacou54/pyorthanc/releases/tag/${src.tag}"; - license = licenses.mit; - maintainers = with maintainers; [ bcdarwin ]; + changelog = "https://github.com/gacou54/pyorthanc/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcdarwin ]; }; } From d82a1958bb7154754dd7cfb2c9a7043ef6052af1 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 17 Feb 2025 13:45:01 +0100 Subject: [PATCH 0679/1107] python312Packages.pydicom-seg: mark as broken --- .../python-modules/pydicom-seg/default.nix | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pydicom-seg/default.nix b/pkgs/development/python-modules/pydicom-seg/default.nix index 420c4505e706..0797548a190f 100644 --- a/pkgs/development/python-modules/pydicom-seg/default.nix +++ b/pkgs/development/python-modules/pydicom-seg/default.nix @@ -3,13 +3,18 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, - pythonOlder, - pytest7CheckHook, + + # build-system poetry-core, + + # dependencies jsonschema, numpy, pydicom, simpleitk, + + # tests + pytestCheckHook, }: buildPythonPackage rec { @@ -17,14 +22,12 @@ buildPythonPackage rec { version = "0.4.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "razorx89"; - repo = pname; + repo = "pydicom-seg"; tag = "v${version}"; - hash = "sha256-2Y3fZHKfZqdp5EU8HfVsmJ5JFfVGZuAR7+Kj7qaTiPM="; fetchSubmodules = true; + hash = "sha256-2Y3fZHKfZqdp5EU8HfVsmJ5JFfVGZuAR7+Kj7qaTiPM="; }; patches = [ @@ -36,7 +39,10 @@ buildPythonPackage rec { }) ]; - pythonRelaxDeps = [ "jsonschema" ]; + pythonRelaxDeps = [ + "jsonschema" + "numpy" + ]; build-system = [ poetry-core ]; @@ -47,15 +53,17 @@ buildPythonPackage rec { simpleitk ]; - nativeCheckInputs = [ pytest7CheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pydicom_seg" ]; - meta = with lib; { + meta = { description = "Medical segmentation file reading and writing"; homepage = "https://github.com/razorx89/pydicom-seg"; changelog = "https://github.com/razorx89/pydicom-seg/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ bcdarwin ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcdarwin ]; + # ModuleNotFoundError: No module named 'pydicom._storage_sopclass_uids' + broken = true; }; } From 6fa339862307bc871abd80983db4c817672a0061 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Tue, 11 Feb 2025 21:14:31 +0800 Subject: [PATCH 0680/1107] python313Packages.aocd-example-parser: 2023.12.20 -> 2024.12.25 --- .../aocd-example-parser/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/aocd-example-parser/default.nix b/pkgs/development/python-modules/aocd-example-parser/default.nix index a78e66980bcd..3914a8c492f1 100644 --- a/pkgs/development/python-modules/aocd-example-parser/default.nix +++ b/pkgs/development/python-modules/aocd-example-parser/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aocd-example-parser"; - version = "2023.12.20"; + version = "2024.12.25"; pyproject = true; disabled = pythonOlder "3.9"; @@ -16,21 +16,18 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "wimglenn"; repo = "aocd-example-parser"; - rev = "07330183f3e43401444fe17b08d72eb6168504e1"; - hash = "sha256-iOxqzZj29aY/xyigir1KOU6GcBBvnlxEOBLHChEQjf4="; + rev = "c86bfc714d2f413965a46a2caf3483e823ea9ade"; + hash = "sha256-1Le1jrLCFRJcUngoq5bt22gM1lpAMBNBRWjOl3yLlsw="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; # Circular dependency with aocd - # pythonImportsCheck = [ - # "aocd_example_parser" - # ]; - meta = with lib; { + meta = { description = "Default implementation of an example parser plugin for advent-of-code-data"; homepage = "https://github.com/wimglenn/aocd-example-parser"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; }; } From 389ad083cdfecc49a313e237681bfa8b9c1ee56d Mon Sep 17 00:00:00 2001 From: SharzyL Date: Mon, 17 Feb 2025 21:01:52 +0800 Subject: [PATCH 0681/1107] Revert "python3Packages.beancount: 2.3.6 -> 3.0.0" This reverts commit c0c242eb9e39f3303ccfc7f88d538bea35d54dbc. --- pkgs/development/python-modules/beancount/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index d621cf7ed7f6..e530a39933c1 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -18,7 +18,7 @@ }: buildPythonPackage rec { - version = "3.0.0"; + version = "2.3.6"; format = "setuptools"; pname = "beancount"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-z2aGhpx+o+78CU7hPthmv196K7DGHk1PXfPjX4Rs/98="; + hash = "sha256-gB+Tvta1fS4iQ2aIxInVob8fduIQ887RhoB1fmDTR1o="; }; # Tests require files not included in the PyPI archive. From efbeabd3cc08989430b5235151f9a961f1cd9693 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 17 Feb 2025 14:01:21 +0100 Subject: [PATCH 0682/1107] python312Packages.deid: 0.3.25 -> 0.4.0 Diff: https://github.com/pydicom/deid/compare/830966d52846c6b721fabb4cc1c75f39eabd55cc...14d1e4eb70f2c9fda43fca411794be9d8a5a8516 Changelog: https://github.com/pydicom/deid/blob/0.4.0/CHANGELOG.md --- .../python-modules/deid/default.nix | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/deid/default.nix b/pkgs/development/python-modules/deid/default.nix index 8d60dd9aa3e9..4158e30b6948 100644 --- a/pkgs/development/python-modules/deid/default.nix +++ b/pkgs/development/python-modules/deid/default.nix @@ -2,22 +2,20 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, - pytestCheckHook, + setuptools, matplotlib, pydicom, python-dateutil, - setuptools, + pytestCheckHook, + versionCheckHook, }: let - deid-data = buildPythonPackage rec { + deid-data = buildPythonPackage { pname = "deid-data"; version = "unstable-2022-12-06"; pyproject = true; - disabled = pythonOlder "3.7"; - build-system = [ setuptools ]; dependencies = [ pydicom ]; @@ -39,18 +37,16 @@ let in buildPythonPackage rec { pname = "deid"; - version = "0.3.25"; + version = "0.4.0"; pyproject = true; - disabled = pythonOlder "3.7"; - # Pypi version has no tests src = fetchFromGitHub { owner = "pydicom"; - repo = pname; + repo = "deid"; # the github repo does not contain Pypi version tags: - rev = "830966d52846c6b721fabb4cc1c75f39eabd55cc"; - hash = "sha256-+slwnQSeRHpoCsvZ24Gq7rOBpQL37a6Iqrj4Mqj6PCo="; + rev = "14d1e4eb70f2c9fda43fca411794be9d8a5a8516"; + hash = "sha256-YsLWHIO6whcBQriMYb0tDD9s/RrxlfeKGORF1UCOilI="; }; build-system = [ setuptools ]; @@ -64,7 +60,9 @@ buildPythonPackage rec { nativeCheckInputs = [ deid-data pytestCheckHook + versionCheckHook ]; + versionCheckProgramArg = [ "--version" ]; pythonImportsCheck = [ "deid" ]; From 8d16040dacc36bd872bd0c4f95a5559d730b5265 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 17 Feb 2025 14:15:09 +0100 Subject: [PATCH 0683/1107] python312Packages.dicom2nifti: cleanup & fix --- .../python-modules/dicom2nifti/default.nix | 64 +++++++++++++------ 1 file changed, 43 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/dicom2nifti/default.nix b/pkgs/development/python-modules/dicom2nifti/default.nix index 6df9a652fb6f..bb426fd4d483 100644 --- a/pkgs/development/python-modules/dicom2nifti/default.nix +++ b/pkgs/development/python-modules/dicom2nifti/default.nix @@ -2,16 +2,22 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, - pytestCheckHook, + + # build-system + setuptools, + + # dependencies gdcm, nibabel, numpy, pydicom, + scipy, + + # tests + pillow, pylibjpeg, pylibjpeg-libjpeg, - scipy, - setuptools, + pytestCheckHook, }: buildPythonPackage rec { @@ -19,8 +25,6 @@ buildPythonPackage rec { version = "2.5.1"; pyproject = true; - disabled = pythonOlder "3.6"; - # no tests in PyPI dist src = fetchFromGitHub { owner = "icometrix"; @@ -29,9 +33,14 @@ buildPythonPackage rec { hash = "sha256-lPaBKqYO8B138fCgeKH6vpwGQhN3JCOnDj5PgaYfRPA="; }; + postPatch = '' + substituteInPlace tests/test_generic.py --replace-fail "from common" "from dicom2nifti.common" + substituteInPlace tests/test_ge.py --replace-fail "import convert_generic" "import dicom2nifti.convert_generic as convert_generic" + ''; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ gdcm nibabel numpy @@ -39,24 +48,37 @@ buildPythonPackage rec { scipy ]; - postPatch = '' - substituteInPlace tests/test_generic.py --replace-fail "from common" "from dicom2nifti.common" - substituteInPlace tests/test_ge.py --replace-fail "import convert_generic" "import dicom2nifti.convert_generic as convert_generic" - ''; - - nativeCheckInputs = [ - pytestCheckHook - pylibjpeg - pylibjpeg-libjpeg - ]; - pythonImportsCheck = [ "dicom2nifti" ]; - meta = with lib; { + nativeCheckInputs = [ + pillow + pylibjpeg + pylibjpeg-libjpeg + pytestCheckHook + ]; + + disabledTests = [ + # OverflowError: Python integer -1024 out of bounds for uint16 + "test_not_a_volume" + "test_resampling" + "test_validate_orthogonal_disabled" + + # RuntimeError: Unable to decompress 'JPEG 2000 Image Compression (Lossless O... + "test_anatomical" + "test_compressed_j2k" + "test_main_function" + "test_rgb" + + # Missing script 'dicom2nifti_scrip' + "test_gantry_option" + "test_gantry_resampling" + ]; + + meta = { homepage = "https://github.com/icometrix/dicom2nifti"; description = "Library for converting dicom files to nifti"; mainProgram = "dicom2nifti"; - license = licenses.mit; - maintainers = with maintainers; [ bcdarwin ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcdarwin ]; }; } From 3e78b6ac4c19501f809b303e6176eba63f774785 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 17 Feb 2025 14:23:19 +0100 Subject: [PATCH 0684/1107] python312Packages.torchio: 0.20.3 -> 0.20.4 Diff: https://github.com/fepegar/torchio/compare/refs/tags/v0.20.3...v0.20.4 --- .../python-modules/torchio/default.nix | 43 +++++++++++++------ 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/torchio/default.nix b/pkgs/development/python-modules/torchio/default.nix index 9a2c22ffc736..3627c923ad6f 100644 --- a/pkgs/development/python-modules/torchio/default.nix +++ b/pkgs/development/python-modules/torchio/default.nix @@ -1,42 +1,54 @@ { - stdenv, lib, + stdenv, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, - pythonOlder, + + # build-system + hatchling, + + # dependencies deprecated, - humanize, matplotlib, nibabel, numpy, - parameterized, + packaging, + rich, scipy, simpleitk, torch, tqdm, typer, + + # tests + humanize, + parameterized, + pytestCheckHook, }: buildPythonPackage rec { pname = "torchio"; - version = "0.20.3"; + version = "0.20.4"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "fepegar"; repo = "torchio"; tag = "v${version}"; - hash = "sha256-I91KcrCwHkjY7oh5RFWfV93pRgd4iQVCBVTtd4TqXGo="; + hash = "sha256-pcUc0pnpb3qQLMOYU9yh7cljyCQ+Ngf8fJDcrRrK8LQ="; }; - propagatedBuildInputs = [ + build-system = [ + hatchling + ]; + + dependencies = [ deprecated humanize nibabel numpy + packaging + rich scipy simpleitk torch @@ -45,10 +57,11 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook matplotlib parameterized + pytestCheckHook ]; + disabledTests = [ # tries to download models: @@ -58,15 +71,17 @@ buildPythonPackage rec { # RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly "test_queue_multiprocessing" ]; + pythonImportsCheck = [ "torchio" "torchio.data" ]; - meta = with lib; { + meta = { description = "Medical imaging toolkit for deep learning"; homepage = "https://torchio.readthedocs.io"; - license = licenses.asl20; - maintainers = [ maintainers.bcdarwin ]; + changelog = "https://github.com/TorchIO-project/torchio/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.bcdarwin ]; }; } From 514e6213ab98d04cffca5b3a2f4856fc8ff67ecf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 17 Feb 2025 14:24:52 +0100 Subject: [PATCH 0685/1107] rspamd: remove nixspam blocklist --- pkgs/by-name/rs/rspamd/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/rs/rspamd/package.nix b/pkgs/by-name/rs/rspamd/package.nix index 1288743c3c1f..ae32c7eb1a18 100644 --- a/pkgs/by-name/rs/rspamd/package.nix +++ b/pkgs/by-name/rs/rspamd/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, cmake, doctest, fmt_11, @@ -39,6 +40,14 @@ stdenv.mkDerivation rec { hash = "sha256-id5nmxdqx+0m0JCCvwaEuUAQkMLTlWadfieJ0wO/wJI="; }; + patches = [ + # remove https://www.nixspam.net/ because it has been shutdown + (fetchpatch { + url = "https://github.com/rspamd/rspamd/commit/dc6e7494c2440cd6c4e474b5ee3c4fabdad1f6bf.patch"; + hash = "sha256-7zY+l5ADLWgPTTBNG/GxX23uX2OwQ33hyzSuokTLgqc="; + }) + ]; + hardeningEnable = [ "pie" ]; nativeBuildInputs = [ From f146e8fc3a0098e6bf8b29c421f4039ccf72c4aa Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 17 Feb 2025 13:29:44 +0000 Subject: [PATCH 0686/1107] xfce.xfce4-notifyd: 0.9.6 -> 0.9.7 https://gitlab.xfce.org/apps/xfce4-notifyd/-/compare/xfce4-notifyd-0.9.6...xfce4-notifyd-0.9.7 --- pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix index f0259878430a..f9ef2d4da3fa 100644 --- a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix @@ -18,10 +18,10 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-notifyd"; - version = "0.9.6"; + version = "0.9.7"; odd-unstable = false; - sha256 = "sha256-TxVz9fUvuS5bl9eq9isalez3/Pro366TGFMBQ2DfIVI="; + sha256 = "sha256-pgdoy3mZOGMOBwK/cYEl8fre4fZo2lfyWzZnrSYlQ64="; buildInputs = [ dbus From 3b9f1f11a55abf6135b407687052ed900590213d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 13:35:48 +0000 Subject: [PATCH 0687/1107] prometheus-node-exporter: 1.8.2 -> 1.9.0 --- pkgs/by-name/pr/prometheus-node-exporter/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/prometheus-node-exporter/package.nix b/pkgs/by-name/pr/prometheus-node-exporter/package.nix index b3be17cd9998..e847682b2821 100644 --- a/pkgs/by-name/pr/prometheus-node-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-node-exporter/package.nix @@ -9,17 +9,17 @@ buildGoModule rec { pname = "node_exporter"; - version = "1.8.2"; + version = "1.9.0"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "node_exporter"; - hash = "sha256-b2uior67RcCCpUE+qx55G1eWiT2wWDVsnosSH9fd3/I="; + hash = "sha256-mm4ZQjpIxaCbKIhZak0ZD4HVx3t+0m6YwjtIWak8RXc="; }; - vendorHash = "sha256-sly8AJk+jNZG8ijTBF1Pd5AOOUJJxIG8jHwBUdlt8fM="; + vendorHash = "sha256-rItbct0UIWs9zulyoQF647RwLJkTsBTDJHLORCgVDo8="; # FIXME: tests fail due to read-only nix store doCheck = false; From 9e699a062f2a2f2c6135db93a1acf8c01b323f18 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 17 Feb 2025 13:34:32 +0000 Subject: [PATCH 0688/1107] xfce.xfdesktop: 4.20.0 -> 4.20.1 https://gitlab.xfce.org/xfce/xfdesktop/-/compare/xfdesktop-4.20.0...xfdesktop-4.20.1 --- pkgs/desktops/xfce/core/xfdesktop/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfdesktop/default.nix b/pkgs/desktops/xfce/core/xfdesktop/default.nix index 0f6e6ef70ee3..09acb879664b 100644 --- a/pkgs/desktops/xfce/core/xfdesktop/default.nix +++ b/pkgs/desktops/xfce/core/xfdesktop/default.nix @@ -1,7 +1,6 @@ { lib, mkXfceDerivation, - fetchpatch, exo, gtk3, libxfce4ui, @@ -18,18 +17,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfdesktop"; - version = "4.20.0"; + version = "4.20.1"; - sha256 = "sha256-80g3lk1TkQI0fbYf2nXs36TrPlaGTHgH6k/TGOzRd3w="; - - patches = [ - # Fix monitor chooser UI resource path - # https://gitlab.xfce.org/xfce/xfdesktop/-/merge_requests/181 - (fetchpatch { - url = "https://gitlab.xfce.org/xfce/xfdesktop/-/commit/699e21b062f56bdc0db192bfe036420b2618612e.patch"; - hash = "sha256-YTtXF+OJMHn6KY2xui1qGZ04np9a60asne+8ZS/dujs="; - }) - ]; + sha256 = "sha256-QBzsHXEdTGj8PlgB+L/TJjxAVksKqf+9KrRN3YaBf44="; buildInputs = [ exo From 2c1c229f035431aaf4b5987a233b9d63c9c39bf9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 13:36:49 +0000 Subject: [PATCH 0689/1107] libasn1c: 0.9.37 -> 0.9.38 --- pkgs/servers/osmocom/libasn1c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/osmocom/libasn1c/default.nix b/pkgs/servers/osmocom/libasn1c/default.nix index 17bbd5200c33..983ef5dbc196 100644 --- a/pkgs/servers/osmocom/libasn1c/default.nix +++ b/pkgs/servers/osmocom/libasn1c/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libasn1c"; - version = "0.9.37"; + version = "0.9.38"; src = fetchFromGitHub { owner = "osmocom"; repo = "libasn1c"; rev = version; - hash = "sha256-st5KbAUhNFSJ0DmPFYOnNvDQ8xtTNi4t8DNYvEjt9Ns="; + hash = "sha256-cnXcUvP6WwHVvpdsIVsMkizlLyg9KMwVj8XYX/nIfic="; }; postPatch = '' From 320ebb3f96579dfa5bf2a8c8400d98016d94faf7 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Tue, 11 Feb 2025 21:16:23 +0800 Subject: [PATCH 0690/1107] python313Packages.aocd: fix build --- .../python-modules/aocd/default.nix | 53 ++++--------------- 1 file changed, 10 insertions(+), 43 deletions(-) diff --git a/pkgs/development/python-modules/aocd/default.nix b/pkgs/development/python-modules/aocd/default.nix index 88aa990fb644..d8a5ffd3cc30 100644 --- a/pkgs/development/python-modules/aocd/default.nix +++ b/pkgs/development/python-modules/aocd/default.nix @@ -9,6 +9,7 @@ pook, pytest-freezegun, pytest-mock, + pytest-cov-stub, pytest-raisin, pytest-socket, pytestCheckHook, @@ -36,9 +37,9 @@ buildPythonPackage rec { hash = "sha256-xR9CfyOUsKSSA/1zYi6kCK3oAaX6Kd625mKMWI+ZFMA="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aocd-example-parser beautifulsoup4 pebble @@ -57,56 +58,22 @@ buildPythonPackage rec { pytest-raisin pytest-socket pytestCheckHook + pytest-cov-stub requests-mock ]; - # Too many failing tests - preCheck = "rm pytest.ini"; - - disabledTests = [ - "test_results" - "test_results_xmas" - "test_run_error" - "test_run_and_autosubmit" - "test_run_and_no_autosubmit" - "test_load_input_from_file" - "test_examples_cache" # IndexError: list index out of range - "test_example_partial" # ValueError: not enough values to unpack (expected 1, got 0) - "test_run_against_examples" # AssertionError: assert '2022/25 - The Puzzle Title' in '' - "test_aocd_no_examples" # SystemExit: 2 - "test_aocd_examples" # SystemExit: 2 - "test_aoce" # SystemExit: 1 - - # TypeError: sequence item 0: expected str instance, bool found - # Likely because they use `pook.get` to get a webpage - "test_submit_prevents_bad_guesses_too_high" - "test_submit_prevents_bad_guesses_too_low" - "test_submit_prevents_bad_guesses_known_incorrect" - "test_submit_correct_answer" - "test_correct_submit_reopens_browser_on_answer_page" - "test_server_error" - "test_submit_when_already_solved" - "test_submitted_too_recently_autoretry" - "test_submitted_too_recently_autoretry_quiet" - "test_submit_when_submitted_too_recently_no_autoretry" - "test_submit_wrong_answer " - "test_correct_submit_records_good_answer" - "test_submits_for_partb_when_already_submitted_parta" - "test_submit_when_parta_solved_but_answer_unsaved" - "test_submit_saves_both_answers_if_possible" - "test_submit_puts_level1_by_default" - "test_cannot_submit_same_bad_answer_twice" - "test_submit_float_warns" + pytestFlagsArray = [ + "tests/" ]; pythonImportsCheck = [ "aocd" ]; - meta = with lib; { + meta = { description = "Get your Advent of Code data with a single import statement"; homepage = "https://github.com/wimglenn/advent-of-code-data"; changelog = "https://github.com/wimglenn/advent-of-code-data/releases/tag/${src.tag}"; - license = licenses.mit; - maintainers = with maintainers; [ aadibajpai ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aadibajpai ]; + platforms = lib.platforms.unix; }; } From 454c64c5104b7adb7ab68689778b9e389ac45622 Mon Sep 17 00:00:00 2001 From: SharzyL Date: Mon, 17 Feb 2025 21:43:08 +0800 Subject: [PATCH 0691/1107] beancount: set passthru.skipBulkUpdate --- pkgs/development/python-modules/beancount/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index e530a39933c1..0422014ac36f 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -49,6 +49,10 @@ buildPythonPackage rec { pytest ]; + # beancount cannot be directly bumped to 3.x + # e.g. https://github.com/NixOS/nixpkgs/issues/380197 + passthru.skipBulkUpdate = true; + meta = with lib; { homepage = "https://github.com/beancount/beancount"; description = "Double-entry bookkeeping computer language"; From 46587e6b695f0972e802d97002736ee8036d6267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=BA=E0=B8=95=E0=B8=B1?= =?UTF-8?q?=E0=B8=A5?= Date: Mon, 17 Feb 2025 20:46:36 +0700 Subject: [PATCH 0692/1107] =?UTF-8?q?movim:=200.29.1=20=E2=86=92=200.29.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/mo/movim/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/movim/package.nix b/pkgs/by-name/mo/movim/package.nix index 8ccbe1f069da..7a00ae7dab49 100644 --- a/pkgs/by-name/mo/movim/package.nix +++ b/pkgs/by-name/mo/movim/package.nix @@ -44,13 +44,13 @@ let in php.buildComposerProject2 (finalAttrs: { pname = "movim"; - version = "0.29.1"; + version = "0.29.2"; src = fetchFromGitHub { owner = "movim"; repo = "movim"; tag = "v${finalAttrs.version}"; - hash = "sha256-8YbRqlppD4tWqCki6v3F1cP8BcG66kAa3njEdPIRPhs="; + hash = "sha256-/u8/9tn0X+IwXKyK3S5uA9X8IRsg5xDdUPpnvxOIaYc="; }; php = php.buildEnv ( @@ -98,7 +98,7 @@ php.buildComposerProject2 (finalAttrs: { # pinned commonmark composerStrictValidation = false; - vendorHash = "sha256-Y1H7jvO/P4R+Rb4V87pha3Icd2Iy7VyzwVDPX72aMqA="; + vendorHash = "sha256-ikIAIPq8Yj27vGmJxeViYJ5SWiZtE68CIE526glZPlo="; postPatch = '' # Our modules are already wrapped, removes missing *.so warnings; From eb29e7c4486e258e61211a12d0df72512eff7c67 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 13:54:43 +0000 Subject: [PATCH 0693/1107] python312Packages.bandit: 1.8.2 -> 1.8.3 --- pkgs/development/python-modules/bandit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bandit/default.nix b/pkgs/development/python-modules/bandit/default.nix index 5d8f878a91fe..bf04f04d575e 100644 --- a/pkgs/development/python-modules/bandit/default.nix +++ b/pkgs/development/python-modules/bandit/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "bandit"; - version = "1.8.2"; + version = "1.8.3"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-4ArVprxnbAlUZp/hOBgCTWa3DkLPWtuXFIDPO2ceg18="; + hash = "sha256-9YR762VNMJQimFw2ZEZJkk4OpEJcdt7C6JEQuHUGGTo="; }; nativeBuildInputs = [ pbr ]; From 0270ce345450e9bbdb6470158f08ab18940d3778 Mon Sep 17 00:00:00 2001 From: Frede Braendstrup Date: Mon, 17 Feb 2025 08:34:02 +0100 Subject: [PATCH 0694/1107] ginko: init at 0.0.8 --- pkgs/by-name/gi/ginko/package.nix | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 pkgs/by-name/gi/ginko/package.nix diff --git a/pkgs/by-name/gi/ginko/package.nix b/pkgs/by-name/gi/ginko/package.nix new file mode 100644 index 000000000000..fc73e339f3c4 --- /dev/null +++ b/pkgs/by-name/gi/ginko/package.nix @@ -0,0 +1,28 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "ginko"; + version = "0.0.8"; + + src = fetchFromGitHub { + owner = "Schottkyc137"; + repo = "ginko"; + tag = "v${version}"; + hash = "sha256-lk+iZclni6jAkvN5/62YobFBAdwTUOfd5v7Fs8M6MQo="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-7VwvFDjwUZechUrkxnXPFN6aMkr9KJkV81rpOZJHr8E="; + + meta = { + description = "Device-tree source parser, analyzer and language server"; + maintainers = [ lib.maintainers.fredeb ]; + license = lib.licenses.mit; + homepage = "https://github.com/Schottkyc137/ginko"; + changelog = "https://github.com/Schottkyc137/ginko/releases/tag/v${version}/CHANGELOG.md"; + }; +} From 6f8dd244bfc734f277a1a7028a780ebb8de004bf Mon Sep 17 00:00:00 2001 From: Armin <159054879+arminius-smh@users.noreply.github.com> Date: Mon, 17 Feb 2025 15:06:06 +0100 Subject: [PATCH 0695/1107] python310Packages.mistune: add missing dependency (#382535) --- pkgs/development/python-modules/mistune/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix index 129cef19d5ad..45f128abb7e8 100644 --- a/pkgs/development/python-modules/mistune/default.nix +++ b/pkgs/development/python-modules/mistune/default.nix @@ -5,6 +5,7 @@ pytestCheckHook, pythonOlder, setuptools, + typing-extensions, }: buildPythonPackage rec { @@ -21,6 +22,10 @@ buildPythonPackage rec { hash = "sha256-gXCFBe58Ij6CiwTddsI4tkPsGBR2z9D8dnxlvTXGSMw="; }; + dependencies = lib.optionals (pythonOlder "3.11") [ + typing-extensions + ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; From 43febf853e7493c161d500c3b633a11393b10f88 Mon Sep 17 00:00:00 2001 From: Tiago Ferreira Date: Fri, 14 Feb 2025 13:28:58 +0000 Subject: [PATCH 0696/1107] maintainers: add tiferrei --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5653007c42b0..9d90ff6dd4f4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -23466,6 +23466,12 @@ github = "tie"; githubId = 14792994; }; + tiferrei = { + name = "Tiago Ferreira"; + email = "me@tiferrei.com"; + github = "tiferrei"; + githubId = 8849915; + }; tilcreator = { name = "TilCreator"; email = "contact.nixos@tc-j.de"; From f4e3a80f9a568b07a9e29d163808e7b34ded25f9 Mon Sep 17 00:00:00 2001 From: Tiago Ferreira Date: Sat, 15 Feb 2025 12:56:43 +0000 Subject: [PATCH 0697/1107] feat: add package ocamlPackages.nice_parser --- .../ocaml-modules/nice_parser/default.nix | 30 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/ocaml-modules/nice_parser/default.nix diff --git a/pkgs/development/ocaml-modules/nice_parser/default.nix b/pkgs/development/ocaml-modules/nice_parser/default.nix new file mode 100644 index 000000000000..bb47fe25eb31 --- /dev/null +++ b/pkgs/development/ocaml-modules/nice_parser/default.nix @@ -0,0 +1,30 @@ +{ + lib, + buildDunePackage, + fetchFromGitHub, + stdio, +}: + +buildDunePackage rec { + pname = "nice_parser"; + version = "1.0.0"; + minimalOCamlVersion = "4.07"; + + src = fetchFromGitHub { + owner = "smolkaj"; + repo = "nice-parser"; + tag = version; + hash = "sha256-h1rqdv19tUH3CsL3OLsTmKir7YCYt4PaW19ymotEvIY="; + }; + + propagatedBuildInputs = [ + stdio + ]; + + meta = { + inherit (src.meta) homepage; + description = "Nice parsers without the boilerplate"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.tiferrei ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 10651337cb3e..9eff14a8fea6 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1269,6 +1269,8 @@ let netchannel = callPackage ../development/ocaml-modules/netchannel { }; + nice_parser = callPackage ../development/ocaml-modules/nice_parser { }; + ninja_utils = callPackage ../development/ocaml-modules/ninja_utils { }; nonstd = callPackage ../development/ocaml-modules/nonstd { }; From 126018cca024a605304fd02d1da884629aeb32a0 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Mon, 17 Feb 2025 07:14:02 -0700 Subject: [PATCH 0698/1107] mautrix-meta: 0.4.3 -> 0.4.4 (#382695) --- pkgs/by-name/ma/mautrix-meta/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mautrix-meta/package.nix b/pkgs/by-name/ma/mautrix-meta/package.nix index dcabe80c261b..a8ae69195fc9 100644 --- a/pkgs/by-name/ma/mautrix-meta/package.nix +++ b/pkgs/by-name/ma/mautrix-meta/package.nix @@ -15,7 +15,7 @@ buildGoModule rec { pname = "mautrix-meta"; - version = "0.4.3"; + version = "0.4.4"; subPackages = [ "cmd/mautrix-meta" ]; @@ -23,13 +23,13 @@ buildGoModule rec { owner = "mautrix"; repo = "meta"; rev = "v${version}"; - hash = "sha256-aq1tmw19evTxmSNpDQyFdjyc0ow1Rsm2jlodglcj084="; + hash = "sha256-S8x3TGQEs+oh/3Q1Gz00M8dOcjjuHSgzVhqlbikZ8QE="; }; buildInputs = lib.optional (!withGoolm) olm; tags = lib.optional withGoolm "goolm"; - vendorHash = "sha256-1ulBTkhb/MDmu26R8v8HUt1HkRNpsufpp+EzTQrlaCQ="; + vendorHash = "sha256-sUnvwPJQOoVzxbo2lS3CRcTrWsPjgYPsKClVw1wZJdM="; passthru = { tests = { From 2f9691732e44cd9f6f6097924288c48c0918040e Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Mon, 17 Feb 2025 00:43:55 +0100 Subject: [PATCH 0699/1107] python3Packages.pex: 2.29.0 -> 2.33.1 --- .../python-modules/pex/default.nix | 48 ++++++++++++++++--- 1 file changed, 41 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index b7de16f6b259..45e18e7b56fc 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -2,23 +2,57 @@ lib, buildPythonPackage, fetchPypi, - hatchling, - pythonOlder, + fetchurl, + setuptools, }: +let + # 4 binaries which require vendoring, as otherwise + # the build system behind pex will attempt to fetch + # them during at build time + uv-trampoline = { + # Taken from https://github.com/pex-tool/pex/blob/2c66932d6645e8e542e5386eae08b9cc2dbb2a21/pex/windows/__init__.py#L45 + version = "0.5.29"; + aarch64-gui = fetchurl { + url = "https://raw.githubusercontent.com/astral-sh/uv/refs/tags/${uv-trampoline.version}/crates/uv-trampoline/trampolines/uv-trampoline-aarch64-gui.exe"; + hash = "sha256-mb8x1FpyH+wy11X5YgWfqh/VUwBb62M4Zf9aFr5V4EE="; + }; + + aarch64-console = fetchurl { + url = "https://raw.githubusercontent.com/astral-sh/uv/refs/tags/${uv-trampoline.version}/crates/uv-trampoline/trampolines/uv-trampoline-aarch64-console.exe"; + hash = "sha256-1S2aM+6CV7rKz+3ncM5X7kk7uDQeuha1+8lUEMYC75k="; + }; + + x86_64-gui = fetchurl { + url = "https://raw.githubusercontent.com/astral-sh/uv/refs/tags/${uv-trampoline.version}/crates/uv-trampoline/trampolines/uv-trampoline-x86_64-gui.exe"; + hash = "sha256-icnp1oXrOZpc+dHTGvDbTHjr+D8M0eamvRrC9bPI/KI="; + }; + + x86_64-console = fetchurl { + url = "https://raw.githubusercontent.com/astral-sh/uv/refs/tags/${uv-trampoline.version}/crates/uv-trampoline/trampolines/uv-trampoline-x86_64-console.exe"; + hash = "sha256-nLopBrlCMMFjkKVRlY7Ke2zFGpQOyF5mSlLs0d7+HRQ="; + }; + }; +in buildPythonPackage rec { pname = "pex"; - version = "2.29.0"; + version = "2.33.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { inherit pname version; - hash = "sha256-2JeQ1zGKZorVqx+2OzjdF7nln00t42yxP2O0e6AVGx4="; + hash = "sha256-kHTvgXe51TencKDkFQAAdyPXuJLBNpJ0NIy1KB8p5JQ="; }; - build-system = [ hatchling ]; + preBuild = '' + mkdir -p pex/windows/stubs + cp ${uv-trampoline.aarch64-gui} pex/windows/stubs/uv-trampoline-aarch64-gui.exe + cp ${uv-trampoline.aarch64-console} pex/windows/stubs/uv-trampoline-aarch64-console.exe + cp ${uv-trampoline.x86_64-gui} pex/windows/stubs/uv-trampoline-x86_64-gui.exe + cp ${uv-trampoline.x86_64-console} pex/windows/stubs/uv-trampoline-x86_64-console.exe + ''; + + build-system = [ setuptools ]; # A few more dependencies I don't want to handle right now... doCheck = false; From 69dd0734e0b2e699d6c1a24de9aeeae350c42a99 Mon Sep 17 00:00:00 2001 From: Javi Merino Date: Mon, 10 Feb 2025 14:00:21 +0000 Subject: [PATCH 0700/1107] python3Packages.jira: fix build 7e7963d8736b (python3Packages.jira: 3.8.0 -> 3.9.4, 2025-01-19) update python3Packages.jira to 3.9.4. After that commit, python-jira fails to build: $ nix build -L --impure --expr '(import ./. {}).python3.withPackages(ps: [ ps.jira ])' [...] error: builder for '/nix/store/bfr24lmgw4izl9ixh2sdm794a9kky7w6-python3.12-jira-3.9.4.drv' failed with exit code 1; last 19 log lines: > Sourcing python-remove-tests-dir-hook > Sourcing python-catch-conflicts-hook.sh > Sourcing python-remove-bin-bytecode-hook.sh > Sourcing pypa-build-hook > Using pypaBuildPhase > Sourcing python-runtime-deps-check-hook > Using pythonRuntimeDepsCheckHook > Sourcing pypa-install-hook > Using pypaInstallPhase > Sourcing python-imports-check-hook.sh > Using pythonImportsCheckPhase > Sourcing python-namespaces-hook > Sourcing python-catch-conflicts-hook.sh > Running phase: unpackPhase > unpacking source archive /nix/store/ck51dycsghmkf7449p615crsqdn2xsni-source > source root is source > setting SOURCE_DATE_EPOCH to timestamp 315619200 of file "source/tox.ini" > Running phase: patchPhase > substitute(): ERROR: file 'setup.cfg' does not exist For full logs, run 'nix log /nix/store/bfr24lmgw4izl9ixh2sdm794a9kky7w6-python3.12-jira-3.9.4.drv'. error: 1 dependencies of derivation '/nix/store/i5xib9msa42grs3cwa1ibw0cfdi799f9-python3-3.12.8-env.drv' failed to build The functionality in setup.cfg was moved to pyproject.toml in pycontribs/jira@668562a3f8c7 (migrate `setup.cfg` to `pyproject.toml` (pycontribs/jira#1776), 2024-03-25). Use pytest-cov-stub instead of the `postPatch` hack. --- pkgs/development/python-modules/jira/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index 370b70457660..27c7de4f7b47 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -10,6 +10,7 @@ pillow, pyjwt, pytestCheckHook, + pytest-cov-stub, pythonOlder, requests, requests-futures, @@ -67,14 +68,10 @@ buildPythonPackage rec { nativeCheckInputs = [ flaky pytestCheckHook + pytest-cov-stub requests-mock ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov-report=xml --cov jira" "" - ''; - pythonImportsCheck = [ "jira" ]; # impure tests because of connectivity attempts to jira servers From 50eeaac136f85c9a60d40623991f0c26542a880b Mon Sep 17 00:00:00 2001 From: Javi Merino Date: Mon, 17 Feb 2025 14:45:24 +0000 Subject: [PATCH 0701/1107] python3Packages.jira: don't use repo = pname In issue #277994 it was discussed that it's better to hardcode the package name. --- pkgs/development/python-modules/jira/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index 27c7de4f7b47..950c08989aac 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pycontribs"; - repo = pname; + repo = "jira"; tag = version; hash = "sha256-P3dbrBKpHvLNIA+JBeSXEQl4QVZ0FdKkNIU8oPHWw6k="; }; From 40386f1a37acc215f358334b199254f7121b089c Mon Sep 17 00:00:00 2001 From: Picnoir Date: Wed, 30 Oct 2024 10:26:17 +0100 Subject: [PATCH 0702/1107] swaylock-plugin: init at unstable-2025-01-28 This project is based on swaylock. Its release cycle is mirroring the swaylock one. I decided to initially target the current master instead of the 1.8 tag (mirroring the swaylock 1.8 one) because the author pushed quite some important fixes since the 1.8 tag: ac02c52 * main origin/main Check if keymap is NULL before dereferencing 7df380e * Implement the wl_data_device_manager interface cda81da * Document that grace period is off by default fdade0d * Set _POSIX_C_SOURCE for seat.c 97bb7b2 * Add missing include and use a standard clock 969b502 * Add grace period feature c112872 * Fix potential NULL deference after getpwuid bfed22d * Fix leak of dmabuf plane file descriptors 13f641d * Implement zwp_linux_buffer_params_v1.create 3a9e5f6 * Allow role-less commits 2406d92 * Fix dmabuf-feedback event order 45326ee * Add missing implementation for zwlr_layer_shell_v1.destroy e792b19 * Exit when password handling subprocess crashes 541f9f1 * Fix completion install paths 337a6a3 * Fix uninitialized variable warning e1ae7cd * picnoir/main Stop processing auth requests after success 7be1a21 * Improve frame callback and commit handling 58103bd * Fix a divide by zero crash 9b18ea3 * Fix a crash on client timeout 5669df9 * Silence an unnecessary warning 04dbb56 * Require that surface size matches acknowledged configure 3a6ea3b * Implement viewporter and fractional scale 0fb1438 * Update to version 5 of zwlr_layer_shell_v1 c4802c2 * Fix crash when client exits without making a registry 5b0293e * Make removing timers safer for event loop --- pkgs/by-name/sw/swaylock-plugin/package.nix | 88 +++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 pkgs/by-name/sw/swaylock-plugin/package.nix diff --git a/pkgs/by-name/sw/swaylock-plugin/package.nix b/pkgs/by-name/sw/swaylock-plugin/package.nix new file mode 100644 index 000000000000..4e4e7fa258e7 --- /dev/null +++ b/pkgs/by-name/sw/swaylock-plugin/package.nix @@ -0,0 +1,88 @@ +{ + cairo, + fetchFromGitHub, + gdk-pixbuf, + lib, + libxcrypt, + libxkbcommon, + makeWrapper, + meson, + ninja, + nix-update-script, + pam, + pkg-config, + scdoc, + stdenv, + swaybg, + systemd, + versionCheckHook, + wayland, + wayland-protocols, + wayland-scanner, +}: + +stdenv.mkDerivation { + pname = "swaylock-plugin"; + version = "unstable-2025-01-28"; + src = fetchFromGitHub { + owner = "mstoeckl"; + repo = "swaylock-plugin"; + rev = "ac02c528bce8f529f33c85065d77eac1aceccbe5"; + hash = "sha256-e4iQ7yCPkkJBpgD0aE94lsID8v3kXhr7YmAszfFi7zA="; + }; + + strictDeps = true; + depsBuildBuild = [ pkg-config ]; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + nativeBuildInputs = [ + makeWrapper + meson + ninja + pkg-config + scdoc + wayland-scanner + ]; + buildInputs = [ + cairo + libxcrypt + gdk-pixbuf + libxkbcommon + pam + systemd + wayland + wayland-protocols + ]; + + postInstall = '' + wrapProgram $out/bin/swaylock-plugin \ + --prefix PATH : "${lib.makeBinPath [ swaybg ]}" + ''; + + mesonFlags = [ + "-Dpam=enabled" + "-Dgdk-pixbuf=enabled" + "-Dman-pages=enabled" + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Screen locker for Wayland, forked from swaylock"; + longDescription = '' + swaylock-pulgins is a fork of swaylock, a screen locking utility for Wayland compositors. + On top of the usual swaylock features, it allow you to use a + subcommand to generate the lockscreen background. + + Important note: You need to set "security.pam.services.swaylock-plugin = {};" manually. + ''; + homepage = "https://github.com/mstoeckl/swaylock-plugin"; + mainProgram = "swaylock-plugin"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ picnoir ]; + }; +} From 1aa7e7a131e88cec8bdce48d1a291947e6379593 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Mon, 17 Feb 2025 13:15:01 +0100 Subject: [PATCH 0703/1107] switch-to-configuration: add a test to make sure that we don't block on the lockfile We should exit with a clear error message instead. --- nixos/tests/switch-test.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index 4ad08b726bf5..ba1a6f329cd3 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -732,6 +732,23 @@ in { out = switch_to_specialisation("${machine}", "modifiedSystemConf") assert_contains(out, "starting the following units: ${dbusService}\n") + with subtest("aborts on already locked lock file"): + (exitcode, _) = machine.execute( + 'flock -x --nb /run/nixos/switch-to-configuration.lock -c "${otherSystem}/bin/switch-to-configuration test"', + timeout=5 + ) + # See man timeout, exit codes above 124 come from the timeout command + # We want to make sure that stc actually exited with an error code, + # if instead we hit the timeout, then it means that stc hangs, which is + # what we don't want + # TODO: We cannot match on the exact exit code since it's not consistent between + # stc and stc-ng, since errno/last_os_error is not a very stable interface, + # we should probably get rid of that in stc-ng once we got rid of the + # perl implementation + assert exitcode < 124, \ + "switch-to-configuration did not abort as expected, " + \ + f"probably it timed out instead (exit code: {exitcode}), 124 means timeout" + with subtest("fstab mounts"): switch_to_specialisation("${machine}", "") # add a mountpoint From 8b4b5dbefc546e6bab9fe64728b8ce2af33473d5 Mon Sep 17 00:00:00 2001 From: Javi Merino Date: Mon, 17 Feb 2025 14:50:58 +0000 Subject: [PATCH 0704/1107] python3Packages.jira: use build-system and dependencies --- pkgs/development/python-modules/jira/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index 950c08989aac..d7c1d60f66c1 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -36,12 +36,12 @@ buildPythonPackage rec { hash = "sha256-P3dbrBKpHvLNIA+JBeSXEQl4QVZ0FdKkNIU8oPHWw6k="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ defusedxml packaging requests From 2c462b531d7a013af46cfb2e7372ea3396cbbbd2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 17 Feb 2025 15:09:05 +0100 Subject: [PATCH 0705/1107] python312Packages.devito: 4.8.11 -> 4.8.12 Diff: https://github.com/devitocodes/devito/compare/refs/tags/v4.8.11...v4.8.12 Changelog: https://github.com/devitocodes/devito/releases/tag/v4.8.12 --- .../python-modules/devito/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/devito/default.nix b/pkgs/development/python-modules/devito/default.nix index a69ae736a22a..70dc31735c67 100644 --- a/pkgs/development/python-modules/devito/default.nix +++ b/pkgs/development/python-modules/devito/default.nix @@ -31,25 +31,16 @@ buildPythonPackage rec { pname = "devito"; - version = "4.8.11"; + version = "4.8.12"; pyproject = true; src = fetchFromGitHub { owner = "devitocodes"; repo = "devito"; tag = "v${version}"; - hash = "sha256-c8/b2dRwfH4naSVRaRon6/mBDva7RSDmi/TJUJp26g0="; + hash = "sha256-Eqyq96mVB5ZhPaLASesWhzjjHcXz/tAIOPP//8yGoBM="; }; - # packaging.metadata.InvalidMetadata: 'python_version_3.8_' is invalid for 'provides-extra' - postPatch = '' - substituteInPlace requirements-testing.txt \ - --replace-fail 'pooch; python_version >= "3.8"' "pooch" - - substituteInPlace tests/test_builtins.py \ - --replace-fail "from scipy.misc import ascent" "from scipy.datasets import ascent" - ''; - pythonRemoveDeps = [ "pip" ]; pythonRelaxDeps = true; @@ -125,6 +116,10 @@ buildPythonPackage rec { # Numerical tests "test_lm_fb" "test_lm_ds" + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + # Numerical error + "test_pow_precision" ]; disabledTestPaths = From 29e9d008f2d8988d0cbf782c4ffb5b1b2a7e0bb0 Mon Sep 17 00:00:00 2001 From: Levizor Date: Mon, 17 Feb 2025 16:08:06 +0100 Subject: [PATCH 0706/1107] hyprland-workspaces-tui: 1.1.0 -> 1.2.0 --- pkgs/by-name/hy/hyprland-workspaces-tui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hy/hyprland-workspaces-tui/package.nix b/pkgs/by-name/hy/hyprland-workspaces-tui/package.nix index b4ad6f1ad75c..6ea9c21eff3a 100644 --- a/pkgs/by-name/hy/hyprland-workspaces-tui/package.nix +++ b/pkgs/by-name/hy/hyprland-workspaces-tui/package.nix @@ -9,18 +9,18 @@ }: rustPlatform.buildRustPackage rec { pname = "hyprland-workspaces-tui"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "Levizor"; repo = "hyprland-workspaces-tui"; tag = version; - hash = "sha256-QMwiBQGAybdL8FaUil6tFzSFg4nN/9mGVoqiDFwGZec="; + hash = "sha256-DLu7njrD5i9FeNWVZGBTKki70FurIGxtwgS6HbA7YLE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-aT8LfBVOEVUvzgPlBIOXTgT+WXEt3vHMDyCcl9jT5/E="; + cargoHash = "sha256-1NZrpqbFiYSJtFNnlDwXX4J4rLwa9XlwUT+boMtr4tk="; nativeBuildInputs = [ makeWrapper From f5dde77b8030b83eb46771a73323aa2a25ddafa1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 17 Feb 2025 16:16:44 +0100 Subject: [PATCH 0707/1107] python313Packages.tencentcloud-sdk-python: 3.0.1318 -> 3.0.1319 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1318...3.0.1319 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1319/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index e8f812e21de9..a25c6387e559 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1318"; + version = "3.0.1319"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-pH0gm+/bZqMKWt3800rfMdKba0ZxuPNmkXDR2lPc3fs="; + hash = "sha256-AwWUvIx+BWfUelhGjYvzxLc08nNx/NXYDip5Et/hMdo="; }; build-system = [ setuptools ]; From bdddb0c51702e8cb10ab1f4df739dfbffc55a9d6 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 17 Feb 2025 16:17:39 +0100 Subject: [PATCH 0708/1107] Revert "lib.types.attrsWith: remove failing test" This reverts commit ce8f304bb68f88be5e32975c3299f2e16abe05c0. The problem was simply a typo (nestedTypes.elemType -> type.nestedTypes.elemType) ! And CI didn't run for lib in the orginal PR which is why it didn't get caught. --- lib/tests/modules.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 243fbce1ecb5..d6614822ea00 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -398,6 +398,10 @@ checkConfigError 'infinite recursion encountered' config.nonLazyResult ./lazy-at checkConfigOutput '^"mergedName..nested"$' config.result ./name-merge-attrsWith-1.nix checkConfigError 'The option .mergedName. in .*\.nix. is already declared in .*\.nix' config.mergedName ./name-merge-attrsWith-2.nix +# Test the attrsOf functor.wrapped warning +# shellcheck disable=2016 +NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `type.functor.wrapped` attribute of the option `mergedLazyLazy` is accessed, use `type.nestedTypes.elemType` instead.' options.mergedLazyLazy.type.functor.wrapped ./lazy-attrsWith.nix + # Even with multiple assignments, a type error should be thrown if any of them aren't valid checkConfigError 'A definition for option .* is not of type .*' \ config.value ./declare-int-unsigned-value.nix ./define-value-list.nix ./define-value-int-positive.nix From 25b5a22bead30d87dbb80ac91e2fc63b2c0c17e2 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 17 Feb 2025 09:21:10 -0600 Subject: [PATCH 0709/1107] luaPackages: use writableTmpDirAsHomeHook Replace manual workaounds with hook. --- pkgs/development/lua-modules/overrides.nix | 34 ++++++++++------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 213e018d75b2..aba68e183815 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -501,10 +501,10 @@ in final.nlua final.busted gitMinimal + writableTmpDirAsHomeHook ]; checkPhase = '' runHook preCheck - export HOME=$(mktemp -d) busted --lua=nlua --lpath='lua/?.lua' --lpath='lua/?/init.lua' tests/ runHook postCheck ''; @@ -696,10 +696,10 @@ in nativeCheckInputs = [ final.nlua final.busted + writableTmpDirAsHomeHook ]; checkPhase = '' runHook preCheck - export HOME=$(mktemp -d) busted --lua=nlua runHook postCheck ''; @@ -710,10 +710,10 @@ in nativeCheckInputs = [ final.nlua final.busted + writableTmpDirAsHomeHook ]; checkPhase = '' runHook preCheck - export HOME=$(mktemp -d) busted --lua=nlua runHook postCheck ''; @@ -741,11 +741,11 @@ in final.nlua final.busted neovim-unwrapped + writableTmpDirAsHomeHook ]; checkPhase = '' runHook preCheck - export HOME=$(mktemp -d) export LUA_PATH="./lua/?.lua;./lua/?/init.lua;$LUA_PATH" nvim --headless -i NONE \ --cmd "set rtp+=${vimPlugins.plenary-nvim}" \ @@ -760,10 +760,10 @@ in nativeCheckInputs = [ final.nlua final.busted + writableTmpDirAsHomeHook ]; checkPhase = '' runHook preCheck - export HOME=$(mktemp -d) busted --lua=nlua runHook postCheck ''; @@ -782,12 +782,12 @@ in nativeCheckInputs = [ final.nlua final.busted + writableTmpDirAsHomeHook ]; # upstream uses PlenaryBusted which is a pain to setup checkPhase = '' runHook preCheck - export HOME=$(mktemp -d) busted --lua=nlua --lpath='lua/?.lua' --lpath='lua/?/init.lua' tests/ runHook postCheck ''; @@ -807,13 +807,13 @@ in neovim-unwrapped coreutils findutils + writableTmpDirAsHomeHook ]; checkPhase = '' runHook preCheck # remove failing tests, need internet access for instance rm tests/plenary/job_spec.lua tests/plenary/scandir_spec.lua tests/plenary/curl_spec.lua - export HOME="$TMPDIR" make test runHook postCheck ''; @@ -982,10 +982,10 @@ in nativeCheckInputs = [ final.nlua final.busted + writableTmpDirAsHomeHook ]; checkPhase = '' runHook preCheck - export HOME=$(mktemp -d) busted --lua=nlua runHook postCheck ''; @@ -996,10 +996,10 @@ in nativeCheckInputs = [ final.nlua final.busted + writableTmpDirAsHomeHook ]; checkPhase = '' runHook preCheck - export HOME=$(mktemp -d) busted --lua=nlua runHook postCheck ''; @@ -1010,6 +1010,7 @@ in nativeCheckInputs = [ final.plenary-nvim neovim-unwrapped + writableTmpDirAsHomeHook ]; # the plugin loads the library from either the LIBSQLITE env @@ -1021,8 +1022,6 @@ in # we override 'luarocks test' because otherwise neovim doesn't find/load the plenary plugin checkPhase = '' - export HOME="$TMPDIR"; - nvim --headless -i NONE \ -u test/minimal_init.vim --cmd "set rtp+=${vimPlugins.plenary-nvim}" \ -c "PlenaryBustedDirectory test/auto/ { sequential = true, minimal_init = './test/minimal_init.vim' }" @@ -1093,9 +1092,9 @@ in tree-sitter ]; - preInstall = '' - export HOME="$TMPDIR"; - ''; + nativeBuildInputs = oa.nativeBuildInputs or [ ] ++ [ + writableTmpDirAsHomeHook + ]; }); tree-sitter-norg = prev.tree-sitter-norg.overrideAttrs (oa: { @@ -1123,10 +1122,9 @@ in lua.pkgs.luarocks-build-treesitter-parser tree-sitter ]; - - preInstall = '' - export HOME="$TMPDIR"; - ''; + nativeBuildInputs = oa.nativeBuildInputs or [ ] ++ [ + writableTmpDirAsHomeHook + ]; }); vstruct = prev.vstruct.overrideAttrs (_: { From eff11c8bc5dd2dddc35a08242c71e1677d442f20 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Feb 2025 16:21:32 +0100 Subject: [PATCH 0710/1107] home-assistant-component-tests.stream: disable failing test This test crashes the python interpreter in libx265_encode_stream: ``` #0 0x00007feefe2a7a7e in free () from /nix/store/81mi7m3k3wsiz9rrrg636sx21psj20hc-glibc-2.40-66/lib/libc.so.6 No symbol table info available. #1 0x00007fee98059295 in av_free (ptr=) at libavutil/mem.c:243 No locals. #2 0x00007fee98059352 in av_freep (arg=) at libavutil/mem.c:253 val = #3 0x00007fee997a4713 in libx265_encode_frame (avctx=, pkt=, pic=, got_packet=0x7ffe35c7e3f4) at libavcodec/libx265.c:821 [...] #4 0x00007fee99526ff6 in ff_encode_encode_cb (avctx=avctx@entry=0x16d1f00, avpkt=avpkt@entry=0x16ad440, frame=0x16f5e80, got_packet=got_packet@entry=0x7ffe35c7e3f4) at libavcodec/encode.c:254 codec = 0x7fee9a25e5c0 [...] ``` --- pkgs/servers/home-assistant/tests.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index a45707b4cdb6..9660ad0f6424 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -67,6 +67,10 @@ let # tries to retrieve file from github "test_non_text_stdout_capture" ]; + stream = [ + # crashes with x265>=4.0 + "test_h265_video_is_hvc1" + ]; websocket_api = [ # AssertionError: assert 'unknown_error' == 'template_error' "test_render_template_with_timeout" From 99678b61c6390d4290efe996d86cfe0ad1f8c166 Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Mon, 17 Feb 2025 16:28:20 +0100 Subject: [PATCH 0711/1107] Revert "amazon-ec2-metadata-mock: init at 1.13.0" --- .../am/amazon-ec2-metadata-mock/package.nix | 43 ------------------- 1 file changed, 43 deletions(-) delete mode 100644 pkgs/by-name/am/amazon-ec2-metadata-mock/package.nix diff --git a/pkgs/by-name/am/amazon-ec2-metadata-mock/package.nix b/pkgs/by-name/am/amazon-ec2-metadata-mock/package.nix deleted file mode 100644 index e69614c4ee15..000000000000 --- a/pkgs/by-name/am/amazon-ec2-metadata-mock/package.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, - nix-update-script, - versionCheckHook, -}: - -buildGoModule rec { - pname = "amazon-ec2-metadata-mock"; - version = "1.13.0"; - - src = fetchFromGitHub { - owner = "aws"; - repo = "amazon-ec2-metadata-mock"; - tag = "v${version}"; - hash = "sha256-gqzROHfwhd3i1GWSp58dBKjS1EU7Xu0Fqbzv2PoLaF8="; - }; - - vendorHash = "sha256-Px4vhFW1mhXbBuPbxEpukmeLZewF7zooOXKxL8sEFLU="; - - subPackages = [ "cmd/ec2-metadata-mock" ]; - - doInstallCheck = true; - - nativeInstallCheckInputs = [ versionCheckHook ]; - - versionCheckProgram = "${builtins.placeholder "out"}/bin/ec2-metadata-mock"; - - versionCheckProgramArg = "--version"; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = { - description = "Tool to simulate Amazon EC2 instance metadata"; - homepage = "https://github.com/aws/amazon-ec2-metadata-mock"; - license = lib.licenses.asl20; - mainProgram = "ec2-metadata-mock"; - maintainers = with lib.maintainers; [ arianvp ]; - }; -} From d09e693880fecb5ecb223a82ac56c3958a690767 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 15:31:45 +0000 Subject: [PATCH 0712/1107] renode-unstable: 1.15.3+20250202git50d499e4e -> 1.15.3+20250214git71a264d7b --- pkgs/by-name/re/renode-unstable/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix index 1d1a1d10a476..a9e6eebd7d3a 100644 --- a/pkgs/by-name/re/renode-unstable/package.nix +++ b/pkgs/by-name/re/renode-unstable/package.nix @@ -7,11 +7,11 @@ renode.overrideAttrs ( finalAttrs: _: { pname = "renode-unstable"; - version = "1.15.3+20250202git50d499e4e"; + version = "1.15.3+20250214git71a264d7b"; src = fetchurl { url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-dotnet.tar.gz"; - hash = "sha256-aLeBd506FRuTTIS0ZAlJQ1OBNWrK8YY4vfmLj6YpUI0="; + hash = "sha256-QDicOg49zK0RHmmGxN5NGi/hqTTnVv49EZ6ZymfhLVA="; }; passthru.updateScript = From 23e2902b9d00a4a5ba5575690e8178363a6faaee Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 17 Feb 2025 16:40:32 +0100 Subject: [PATCH 0713/1107] python312Packages.transformers: 4.48.3 -> 4.49.0 Diff: https://github.com/huggingface/transformers/compare/refs/tags/v4.48.3...v4.49.0 Changelog: https://github.com/huggingface/transformers/releases/tag/v4.49.0 --- .../python-modules/transformers/default.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 92027cd34943..3fcb2b6a4923 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, # build-system setuptools, @@ -59,25 +58,16 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.48.3"; + version = "4.49.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "transformers"; tag = "v${version}"; - hash = "sha256-gDPJx/kgFa8KCoX8XCMtFrSY/z2as22yDSNEW3UDm/0="; + hash = "sha256-drq7RWoRaRejiQjCUHIYuzaKa9rA4eQZI2do74scp1c="; }; - patches = [ - # Remove on the next major version bump - (fetchpatch { - url = "https://github.com/huggingface/transformers/commit/db864b5526d56fd99143619abff969bfcb5596d5.patch?full_index=1"; - name = "dont-import-torch-distributed-if-not-available.patch"; - hash = "sha256-XOraJmSt9Rp/oNiil6vDUBqZhd8MDbA0nz1Tx16Mk14="; - }) - ]; - build-system = [ setuptools ]; dependencies = [ @@ -200,7 +190,7 @@ buildPythonPackage rec { homepage = "https://github.com/huggingface/transformers"; description = "Natural Language Processing for TensorFlow 2.0 and PyTorch"; mainProgram = "transformers-cli"; - changelog = "https://github.com/huggingface/transformers/releases/tag/${src.tag}"; + changelog = "https://github.com/huggingface/transformers/releases/tag/v${version}"; license = lib.licenses.asl20; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ From e40c33427ef8c3a40876b61c524164b922a18604 Mon Sep 17 00:00:00 2001 From: Matt Szafir Date: Fri, 14 Feb 2025 11:45:47 -0700 Subject: [PATCH 0714/1107] gopro-tool: init at 0-unstable-2024-04-18 --- nixos/tests/all-tests.nix | 1 + nixos/tests/gopro-tool.nix | 41 +++++++++++++++++++++++ pkgs/by-name/go/gopro-tool/package.nix | 45 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++ 4 files changed, 92 insertions(+) create mode 100644 nixos/tests/gopro-tool.nix create mode 100644 pkgs/by-name/go/gopro-tool/package.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 3e29907f3c5a..7728234f11bc 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -404,6 +404,7 @@ in { gollum = handleTest ./gollum.nix {}; gonic = handleTest ./gonic.nix {}; google-oslogin = handleTest ./google-oslogin {}; + gopro-tool = handleTest ./gopro-tool.nix {}; goss = handleTest ./goss.nix {}; gotenberg = handleTest ./gotenberg.nix {}; gotify-server = handleTest ./gotify-server.nix {}; diff --git a/nixos/tests/gopro-tool.nix b/nixos/tests/gopro-tool.nix new file mode 100644 index 000000000000..1f183e4c30d5 --- /dev/null +++ b/nixos/tests/gopro-tool.nix @@ -0,0 +1,41 @@ +import ./make-test-python.nix ( + { lib, pkgs, ... }: + + let + testScript = '' + start_all() + + machine.wait_for_unit("multi-user.target") + + # Check that gopro-tool is installed + machine.succeed("which gopro-tool") + + # Check that the v4l2loopback module is available + machine.succeed("lsmod | grep v4l2loopback || echo 'Module not found'") + + # Check that VLC is installed + machine.succeed("which vlc") + ''; + in + { + name = "gopro-tool"; + meta.maintainers = with lib.maintainers; [ ZMon3y ]; + nodes.machine = + { config, pkgs, ... }: + { + # Ensure dependencies are installed + environment.systemPackages = with pkgs; [ + gopro-tool + vlc + ]; + + # Load kernel module for testing + boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; + + # Enable module loading + boot.kernelModules = [ "v4l2loopback" ]; + }; + + testScript = testScript; + } +) diff --git a/pkgs/by-name/go/gopro-tool/package.nix b/pkgs/by-name/go/gopro-tool/package.nix new file mode 100644 index 000000000000..e282bb0f9e07 --- /dev/null +++ b/pkgs/by-name/go/gopro-tool/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitHub, + makeWrapper, + ffmpeg, + vlc, + jq, +}: + +stdenv.mkDerivation { + pname = "gopro-tool"; + version = "0-unstable-2024-04-18"; + + src = fetchFromGitHub { + owner = "juchem"; + repo = "gopro-tool"; + rev = "a678f0ea65e24dca9b8d848b245bd2d487d3c8ca"; + sha256 = "0sh3s38m17pci24x4kdlmlhn0gwgm28aaa6p7qs16wysk0q0h6wz"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + cp $src/gopro-tool $out/bin/gopro-tool + chmod +x $out/bin/gopro-tool + + wrapProgram $out/bin/gopro-tool \ + --prefix PATH : ${ + lib.makeBinPath [ + ffmpeg + vlc + jq + ] + } + ''; + + meta = { + description = "A tool to control GoPro webcam mode in Linux (requires v4l2loopback kernel module and a firewall rule)"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ ZMon3y ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb3618d837a1..866d351cc9f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6222,6 +6222,11 @@ with pkgs; dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {}); + gopro-tool = callPackage ../by-name/go/gopro-tool/package.nix { + vlc = + vlc.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ x264 ]; }); + }; + gwe = callPackage ../tools/misc/gwe { nvidia_x11 = linuxPackages.nvidia_x11; }; From 5a520c643e49276ff6fc0b3a34daacb9ba5813b3 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 17 Feb 2025 10:30:57 +0100 Subject: [PATCH 0715/1107] coreutils: disable VMULL on aarch64 musl Yikes. --- pkgs/tools/misc/coreutils/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 9e841d6338c9..f87f92363eee 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -154,6 +154,11 @@ stdenv.mkDerivation rec { # the shipped configure script doesn't enable nls, but using autoreconfHook # does so which breaks the build ++ optional stdenv.hostPlatform.isDarwin "--disable-nls" + # The VMULL-based CRC implementation produces incorrect results on musl. + # https://lists.gnu.org/archive/html/bug-coreutils/2025-02/msg00046.html + ++ optional ( + stdenv.hostPlatform.config == "aarch64-unknown-linux-musl" + ) "utils_cv_vmull_intrinsic_exists=no" ++ optionals (isCross && stdenv.hostPlatform.libc == "glibc") [ # TODO(19b98110126fde7cbb1127af7e3fe1568eacad3d): Needed for fstatfs() I # don't know why it is not properly detected cross building with glibc. From eaca584353c3be2c81a20c64da3126523d1ac818 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 17 Feb 2025 10:44:12 +0100 Subject: [PATCH 0716/1107] python312Packages.qcodes: 0.50.1 -> 0.51.0 Diff: https://github.com/microsoft/Qcodes/compare/refs/tags/v0.50.1...v0.51.0 Changelog: https://github.com/QCoDeS/Qcodes/releases/tag/v0.51.0 --- .../python-modules/qcodes/default.nix | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/qcodes/default.nix b/pkgs/development/python-modules/qcodes/default.nix index f2528a213b08..757e82e773ff 100644 --- a/pkgs/development/python-modules/qcodes/default.nix +++ b/pkgs/development/python-modules/qcodes/default.nix @@ -45,7 +45,7 @@ sphinx-issues, towncrier, - # checks + # tests deepdiff, hypothesis, lxml, @@ -55,20 +55,26 @@ pytest-rerunfailures, pytest-xdist, pytestCheckHook, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "qcodes"; - version = "0.50.1"; + version = "0.51.0"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "Qcodes"; tag = "v${version}"; - hash = "sha256-oNJVOz2FMMhUkYIajeWwRmHzLcXu5qTSQzjk0gciOnE="; + hash = "sha256-QgCMoZrC3ZCo8yayRXw9fvBj5xi+XH2x/E1MuQFULPo="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'default-version = "0.0"' 'default-version = "${version}"' + ''; + build-system = [ setuptools versioningit @@ -142,6 +148,7 @@ buildPythonPackage rec { pytestCheckHook pyvisa-sim sphinx + writableTmpDirAsHomeHook ]; __darwinAllowLocalNetworking = true; @@ -182,19 +189,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "qcodes" ]; - # Remove the `asyncio_default_fixture_loop_scope` option as it has been introduced in newer `pytest-asyncio` v0.24 - # which is not in nixpkgs yet: - # pytest.PytestConfigWarning: Unknown config option: asyncio_default_fixture_loop_scope - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail 'default-version = "0.0"' 'default-version = "${version}"' \ - --replace-fail 'asyncio_default_fixture_loop_scope = "function"' "" - ''; - - postInstall = '' - export HOME="$TMPDIR" - ''; - meta = { description = "Python-based data acquisition framework"; changelog = "https://github.com/QCoDeS/Qcodes/releases/tag/v${version}"; From f8b78d4329d8b3527e9656f2845dc81d5e0a2651 Mon Sep 17 00:00:00 2001 From: Sandro Date: Mon, 17 Feb 2025 17:00:39 +0100 Subject: [PATCH 0717/1107] trilinos: remove dangling symlink to fix build (#382649) --- .../libraries/science/math/trilinos/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/trilinos/default.nix b/pkgs/development/libraries/science/math/trilinos/default.nix index e4c7f587eaef..25de281cffb4 100644 --- a/pkgs/development/libraries/science/math/trilinos/default.nix +++ b/pkgs/development/libraries/science/math/trilinos/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "trilinos"; repo = "Trilinos"; - rev = "${pname}-release-${lib.replaceStrings [ "." ] [ "-" ] version}"; + tag = "trilinos-release-${lib.replaceStrings [ "." ] [ "-" ] version}"; sha256 = "sha256-Nqjr7RAlUHm6vs87a1P84Y7BIZEL0Vs/A1Z6dykfv+o="; }; @@ -94,6 +94,11 @@ stdenv.mkDerivation rec { cmakeFlagsArray+=(${flagsBase}) ''; + postInstall = '' + # remove dangling symlink + rm $out/lib/cmake/tribits/doc/developers_guide/TribitsBuildReference.html + ''; + passthru = { inherit withMPI; }; From be8ad8564e904564c7578209549227d48f88a8d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 16:10:00 +0000 Subject: [PATCH 0718/1107] home-assistant-custom-lovelace-modules.universal-remote-card: 4.3.8 -> 4.3.9 --- .../universal-remote-card/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix index 829f8f96ca82..bbfe36d70956 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix @@ -6,18 +6,18 @@ buildNpmPackage rec { pname = "universal-remote-card"; - version = "4.3.8"; + version = "4.3.9"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "android-tv-card"; rev = version; - hash = "sha256-fu+0O5WXzsy/HN2j7M2zBg8YgPUcSuzeOhOf1akATes="; + hash = "sha256-7Eoa1CVruVDuNHvvcdxMERWtq1S+HIFPXMFc+GZu4ns="; }; patches = [ ./dont-call-git.patch ]; - npmDepsHash = "sha256-AwJmFsVFOV6rapnLm9Y660TFiX9HIOIU4049EIyWWuM="; + npmDepsHash = "sha256-jjN8VFVw4wFAArUzdxjmH6w9M9WUtpKUgjPqfE3jTOw="; installPhase = '' runHook preInstall From a0d8769244ab912cafdee16399b93bbb325ec8a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Kucharczyk?= Date: Mon, 17 Feb 2025 17:23:38 +0100 Subject: [PATCH 0719/1107] syncthingtray: set mainProgram --- pkgs/applications/misc/syncthingtray/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 6cded45faf1c..9acd79fbf379 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -120,5 +120,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl2Plus; maintainers = with maintainers; [ doronbehar ]; platforms = platforms.linux ++ platforms.darwin; + mainProgram = "syncthingtray"; }; }) From d149dabb544274b742df8c535ccb1ff8ca0e06e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 17 Feb 2025 17:28:11 +0100 Subject: [PATCH 0720/1107] nixos/oauth2-proxy-nginx: match files in location block exactly --- nixos/modules/services/security/oauth2-proxy-nginx.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/security/oauth2-proxy-nginx.nix b/nixos/modules/services/security/oauth2-proxy-nginx.nix index af1878cd09dc..307d73adea3d 100644 --- a/nixos/modules/services/security/oauth2-proxy-nginx.nix +++ b/nixos/modules/services/security/oauth2-proxy-nginx.nix @@ -105,7 +105,7 @@ in add_header Set-Cookie $auth_cookie; ''; - "/oauth2/auth" = + "= /oauth2/auth" = let maybeQueryArg = name: value: From 201505e6b7e1c996c63df3aa42403d191f3b42f7 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 17 Feb 2025 18:41:24 +0200 Subject: [PATCH 0721/1107] strip-nondeterminism: Add `updateScript` Still won't be updated by r-ryantm because https://www.github.com/nix-community/nixpkgs-update/blob/ca25a2a7aaa94faeb209bf488c201b34dddcda27/src/Skiplist.hs#L161 --- .../perl-modules/strip-nondeterminism/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/perl-modules/strip-nondeterminism/default.nix b/pkgs/development/perl-modules/strip-nondeterminism/default.nix index 29fa3f1dc900..65884a494404 100644 --- a/pkgs/development/perl-modules/strip-nondeterminism/default.nix +++ b/pkgs/development/perl-modules/strip-nondeterminism/default.nix @@ -8,6 +8,7 @@ ArchiveCpio, SubOverride, shortenPerlShebang, + gitUpdater, }: buildPerlPackage rec { @@ -64,6 +65,10 @@ buildPerlPackage rec { doCheck = !stdenv.hostPlatform.isDarwin; doInstallCheck = true; + passthru = { + updateScript = gitUpdater { }; + }; + meta = with lib; { description = "Perl module for stripping bits of non-deterministic information"; mainProgram = "strip-nondeterminism"; From 72823e90a87e7b1056bbe176e1ccce6f9fbd0cf7 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 17 Feb 2025 16:45:00 +0000 Subject: [PATCH 0722/1107] strip-nondeterminism: 1.13.1 -> 1.14.1 --- .../development/perl-modules/strip-nondeterminism/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/perl-modules/strip-nondeterminism/default.nix b/pkgs/development/perl-modules/strip-nondeterminism/default.nix index 65884a494404..a5767f934cbc 100644 --- a/pkgs/development/perl-modules/strip-nondeterminism/default.nix +++ b/pkgs/development/perl-modules/strip-nondeterminism/default.nix @@ -13,7 +13,7 @@ buildPerlPackage rec { pname = "strip-nondeterminism"; - version = "1.13.1"; + version = "1.14.1"; outputs = [ "out" @@ -25,7 +25,7 @@ buildPerlPackage rec { repo = "strip-nondeterminism"; domain = "salsa.debian.org"; rev = version; - sha256 = "czx9UhdgTsQSfDNo1mMOXCM/3/nuNe+cPZeyy2xdnKs="; + sha256 = "C/812td9BX1YRqFpD9QYgBfzE+biZeAKgxoNcxpb6UU="; }; strictDeps = true; From 1cc293deea81e214d75d733c421ca296ebfa0b07 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 17 Feb 2025 17:55:12 +0100 Subject: [PATCH 0723/1107] python312Packages.annoy: cleanup & mark as broken on darwin --- .../python-modules/annoy/default.nix | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/annoy/default.nix b/pkgs/development/python-modules/annoy/default.nix index 2a3175eaf890..9e9b16baf70e 100644 --- a/pkgs/development/python-modules/annoy/default.nix +++ b/pkgs/development/python-modules/annoy/default.nix @@ -2,11 +2,16 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system + setuptools, + + # nativeBuildInputs h5py, + + # tests numpy, pytestCheckHook, - pythonOlder, - setuptools, }: buildPythonPackage rec { @@ -14,8 +19,6 @@ buildPythonPackage rec { version = "1.17.3"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "spotify"; repo = "annoy"; @@ -48,11 +51,15 @@ buildPythonPackage rec { pythonImportsCheck = [ "annoy" ]; - meta = with lib; { + meta = { description = "Approximate Nearest Neighbors in C++/Python optimized for memory usage and loading/saving to disk"; homepage = "https://github.com/spotify/annoy"; changelog = "https://github.com/spotify/annoy/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ timokau ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ timokau ]; + badPlatforms = [ + # Several tests fail with AssertionError + lib.systems.inspect.patterns.isDarwin + ]; }; } From 84e5b304b5ccf69e614c28a1b1b78efa38f22aa0 Mon Sep 17 00:00:00 2001 From: Aaron VerDow Date: Mon, 17 Feb 2025 11:10:35 -0600 Subject: [PATCH 0724/1107] maintainers: add averdow --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index dda73802e1e0..54038996dadb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2352,6 +2352,12 @@ githubId = 97070581; name = "averagebit"; }; + averdow = { + email = "aaron@verdow.com"; + github = "AaronVerDow"; + githubId = 2530548; + name = "Aaron VerDow"; + }; averelld = { email = "averell+nixos@rxd4.com"; github = "averelld"; From 6e4e0015a95551a5bd53341cb4c4e6c419d1afbf Mon Sep 17 00:00:00 2001 From: Lorenzo Bevilacqua <43483037+ardubev16@users.noreply.github.com> Date: Mon, 17 Feb 2025 01:21:46 +0100 Subject: [PATCH 0725/1107] mainteiners: add ardubev16 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9d90ff6dd4f4..14d7e28ef64a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1860,6 +1860,12 @@ githubId = 13347712; name = "Leo Shchurov"; }; + ardubev16 = { + email = "lorenzobevilacqua02@gmail.com"; + github = "ardubev16"; + githubId = 43483037; + name = "Lorenzo Bevilacqua"; + }; ardumont = { email = "eniotna.t@gmail.com"; github = "ardumont"; From ebd23f3d766fa867efef5f5e448cc89ee4f75142 Mon Sep 17 00:00:00 2001 From: Lorenzo Bevilacqua <43483037+ardubev16@users.noreply.github.com> Date: Mon, 17 Feb 2025 02:22:37 +0100 Subject: [PATCH 0726/1107] kube-review: init at 0.4.0 --- pkgs/by-name/ku/kube-review/package.nix | 33 +++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/ku/kube-review/package.nix diff --git a/pkgs/by-name/ku/kube-review/package.nix b/pkgs/by-name/ku/kube-review/package.nix new file mode 100644 index 000000000000..d79fe86c261f --- /dev/null +++ b/pkgs/by-name/ku/kube-review/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule rec { + pname = "kube-review"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "anderseknert"; + repo = "kube-review"; + tag = "v${version}"; + hash = "sha256-0wDapaV1e6QNZWeHG86t12iu1yW1LW6mnpdWIrwvBFk="; + }; + + vendorHash = "sha256-lzhjIX+67S+68erlJNHVXMKgRFUUyG+ymZEKVKRRpRc="; + ldflags = [ + "-X github.com/anderseknert/kube-review/cmd.version=v${version}" + ]; + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Create Kubernetes AdmissionReview requests from Kubernetes resource manifests"; + mainProgram = "kube-review"; + homepage = "https://github.com/anderseknert/kube-review"; + changelog = "https://github.com/anderseknert/kube-review/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.ardubev16 ]; + }; +} From 3cd3f5eb5669fe1b18a55c5d7bd745b958c78776 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 17 Feb 2025 18:23:20 +0100 Subject: [PATCH 0727/1107] python312Packages.docling-core: 2.18.1 -> 2.19.1 Diff: https://github.com/DS4SD/docling-core/compare/refs/tags/v2.18.1...v2.19.1 Changelog: https://github.com/DS4SD/docling-core/blob/v2.19.1/CHANGELOG.md --- .../python-modules/docling-core/default.nix | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/docling-core/default.nix b/pkgs/development/python-modules/docling-core/default.nix index b5d80274de60..4733371c982f 100644 --- a/pkgs/development/python-modules/docling-core/default.nix +++ b/pkgs/development/python-modules/docling-core/default.nix @@ -2,35 +2,40 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system poetry-core, + # dependencies jsonref, jsonschema, + latex2mathml, pandas, pillow, pydantic, - tabulate, pyyaml, semchunk, - typing-extensions, + tabulate, transformers, typer, - latex2mathml, + typing-extensions, + + # tests jsondiff, - requests, pytestCheckHook, + requests, }: buildPythonPackage rec { pname = "docling-core"; - version = "2.18.1"; + version = "2.19.1"; pyproject = true; src = fetchFromGitHub { owner = "DS4SD"; repo = "docling-core"; tag = "v${version}"; - hash = "sha256-ymFBR+nz/zq6EFgCbSQPfZDQ/Gk8QeJrkeVQ7KZ9bmo="; + hash = "sha256-SBPk9DF9M1rY6YOqO1FOfnAcaGLQrJnMaBUG1JLWYFU="; }; build-system = [ @@ -38,18 +43,18 @@ buildPythonPackage rec { ]; dependencies = [ - jsonschema - pydantic jsonref - tabulate + jsonschema + latex2mathml pandas pillow + pydantic pyyaml - typing-extensions - transformers semchunk + tabulate + transformers typer - latex2mathml + typing-extensions ]; pythonRelaxDeps = [ @@ -73,7 +78,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/DS4SD/docling-core/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/DS4SD/docling-core/blob/v${version}/CHANGELOG.md"; description = "Python library to define and validate data types in Docling"; homepage = "https://github.com/DS4SD/docling-core"; license = lib.licenses.mit; From 9f848d0d43a8ee51c3feff16f11e54ca3ef5903c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 17 Feb 2025 18:22:29 +0100 Subject: [PATCH 0728/1107] python312Packages.docling: 2.20.0 -> 2.23.0 Diff: https://github.com/DS4SD/docling/compare/refs/tags/v2.20.0...v2.23.0 Changelog: https://github.com/DS4SD/docling/blob/refs/tags/v2.23.0/CHANGELOG.md --- .../python-modules/docling/default.nix | 125 +++++++++--------- 1 file changed, 66 insertions(+), 59 deletions(-) diff --git a/pkgs/development/python-modules/docling/default.nix b/pkgs/development/python-modules/docling/default.nix index a0996e6f1636..bd0de9cf152a 100644 --- a/pkgs/development/python-modules/docling/default.nix +++ b/pkgs/development/python-modules/docling/default.nix @@ -2,56 +2,61 @@ lib, buildPythonPackage, fetchFromGitHub, - # dependencies - pydantic, - docling-core, - docling-ibm-models, - deepsearch-glm, - docling-parse, - filetype, - pypdfium2, - pydantic-settings, - huggingface-hub, - requests, - easyocr, - tesserocr, - certifi, - rtree, - scipy, - typer, - python-docx, - python-pptx, - beautifulsoup4, - pandas, - marko, - openpyxl, - lxml, - # ocrmac # not yet packaged - rapidocr-onnxruntime, - onnxruntime, - pillow, - pyarrow, + # build system poetry-core, + + # dependencies + beautifulsoup4, + certifi, + deepsearch-glm, + docling-core, + docling-ibm-models, + docling-parse, + easyocr, + filetype, + huggingface-hub, + lxml, + marko, + # ocrmac # not yet packaged + onnxruntime, + openpyxl, + pandas, + pillow, + pyarrow, + pydantic, + pydantic-settings, + pypdfium2, + python-docx, + python-pptx, + rapidocr-onnxruntime, + requests, + rtree, + scipy, + tesserocr, + typer, + # optional dependencies - mkdocs-material, - mkdocs-jupyter, # mkdocs-click # not yet packaged + mkdocs-jupyter, + mkdocs-material, mkdocstrings, - # native check inputs + + # tests pytestCheckHook, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "docling"; - version = "2.20.0"; + version = "2.23.0"; pyproject = true; src = fetchFromGitHub { owner = "DS4SD"; repo = "docling"; tag = "v${version}"; - hash = "sha256-6p6/UwbI4ZB6ro1O5ELg8fENEnpH4ycpCyOk7QPX7cY="; + hash = "sha256-ySywKaLxjtgQM7RtzJrxZDS3z8uMwAwPDYO51uKHT28="; }; build-system = [ @@ -59,34 +64,34 @@ buildPythonPackage rec { ]; dependencies = [ - pydantic + beautifulsoup4 + certifi + deepsearch-glm docling-core docling-ibm-models - deepsearch-glm docling-parse - filetype - pypdfium2 - pydantic-settings - huggingface-hub - requests easyocr - tesserocr - certifi - rtree - scipy - typer - python-docx - python-pptx - beautifulsoup4 - pandas - marko - openpyxl + filetype + huggingface-hub lxml + marko # ocrmac # not yet packaged - rapidocr-onnxruntime onnxruntime + openpyxl + pandas pillow pyarrow + pydantic + pydantic-settings + pypdfium2 + python-docx + python-pptx + rapidocr-onnxruntime + requests + rtree + scipy + tesserocr + typer ]; pythonRelaxDeps = [ @@ -107,20 +112,17 @@ buildPythonPackage rec { ]; docs = [ - mkdocs-material - mkdocs-jupyter # mkdocs-click # not yet packaged + mkdocs-jupyter + mkdocs-material mkdocstrings # griffle-pydantic ]; }; - preCheck = '' - export HOME="$TEMPDIR" - ''; - nativeCheckInputs = [ pytestCheckHook + writableTmpDirAsHomeHook ]; pythonImportsCheck = [ @@ -130,6 +132,7 @@ buildPythonPackage rec { disabledTests = [ "test_e2e_pdfs_conversions" # AssertionError: ## TableFormer: Table Structure Understanding with Transf "test_e2e_conversions" # RuntimeError: Tesseract is not available + # huggingface_hub.errors.LocalEntryNotFoundError: An error happened "test_cli_convert" "test_code_and_formula_conversion" @@ -138,8 +141,12 @@ buildPythonPackage rec { "test_convert_stream" "test_compare_legacy_output" "test_ocr_coverage_threshold" + # requires network access "test_page_range" + + # AssertionError: pred_itxt==true_itxt + "test_e2e_valid_csv_conversions" ]; meta = { From d59886879681c44a52836dacbb714bc95fc61c1d Mon Sep 17 00:00:00 2001 From: Quentin Frey <51170829+Limosine@users.noreply.github.com> Date: Mon, 17 Feb 2025 18:31:57 +0100 Subject: [PATCH 0729/1107] ncmpc: 0.51 -> 0.52 --- pkgs/by-name/nc/ncmpc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nc/ncmpc/package.nix b/pkgs/by-name/nc/ncmpc/package.nix index caddc5019736..ea251ac8cd1b 100644 --- a/pkgs/by-name/nc/ncmpc/package.nix +++ b/pkgs/by-name/nc/ncmpc/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "ncmpc"; - version = "0.51"; + version = "0.52"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; - rev = "v${version}"; - sha256 = "sha256-mFZ8szJT7eTPHQHxjpP5pThCcY0YERGkGR8528Xu9MA="; + tag = "v${version}"; + sha256 = "sha256-j/hZdKl1LQ/yEGDUv9k5PQJ6pngAl52mVCpfacWrRw0="; }; buildInputs = [ From 6ae981186ae71ed1c31b8dd1469f96107d8b8eaf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 17:54:28 +0000 Subject: [PATCH 0730/1107] terraform-providers.dme: 1.0.6 -> 1.0.7 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7136c6928e93..739d3b56d46b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -363,11 +363,11 @@ "vendorHash": null }, "dme": { - "hash": "sha256-QNkr+6lKlKY+os0Pf6dqlmIn9u2LtMOo6ONahDeA9mE=", + "hash": "sha256-u7mCQtz6Z7X34nbYKaRNPrbD7IuDe1tH67noAeTWH6Q=", "homepage": "https://registry.terraform.io/providers/DNSMadeEasy/dme", "owner": "DNSMadeEasy", "repo": "terraform-provider-dme", - "rev": "v1.0.6", + "rev": "v1.0.7", "spdx": "MPL-2.0", "vendorHash": null }, From c75366679660bb11879aec70f0b95d98c42a53ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 18:07:39 +0000 Subject: [PATCH 0731/1107] terraform-providers.minio: 3.2.3 -> 3.3.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7136c6928e93..b757e002dc4d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -822,13 +822,13 @@ "vendorHash": "sha256-5d5vTEu08abEAxr9lFvmGsRKlcPq+B+TPGVkalr75tU=" }, "minio": { - "hash": "sha256-Y34cCOQqJslDU4LcCou1QxIFfyUP2PRt3ExoCUNl8so=", + "hash": "sha256-OIdXZIy+W8yO3y7z/1JzG7QegJmMLTFSoC7FmioscmA=", "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", "repo": "terraform-provider-minio", - "rev": "v3.2.3", + "rev": "v3.3.0", "spdx": "AGPL-3.0", - "vendorHash": "sha256-a9v1nVG3NiuyHwJGhIKKKXFDp4/Cb533EJxrfqK9h/A=" + "vendorHash": "sha256-1nm2Y4T9/mCWMXMjXEzBz3w08AYHjQJeb9mYPQeWPs0=" }, "mongodbatlas": { "hash": "sha256-bngDZUqemOjmRTQC0UnQG2IvjuqjORrZ3Agr1K0T+TE=", From 16af17553a39a5cf85aedc20a0416703e66414a9 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 17 Feb 2025 15:12:53 -0300 Subject: [PATCH 0732/1107] 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 0733/1107] 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 66164cd33e66dfd66d62ddd019b8fa20be32685e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 14:39:30 +0000 Subject: [PATCH 0734/1107] pmtiles: 1.25.0 -> 1.25.1 --- pkgs/by-name/pm/pmtiles/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/pm/pmtiles/package.nix b/pkgs/by-name/pm/pmtiles/package.nix index 736907fa3bfc..9642c4deacf8 100644 --- a/pkgs/by-name/pm/pmtiles/package.nix +++ b/pkgs/by-name/pm/pmtiles/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "pmtiles"; - version = "1.25.0"; + version = "1.25.1"; src = fetchFromGitHub { owner = "protomaps"; repo = "go-pmtiles"; - rev = "v${version}"; - hash = "sha256-eOcjJPQ5a9d1iDaTa+oZgMmyaOszd2ORaKKr3Td4WP0="; + tag = "v${version}"; + hash = "sha256-sX+rEXCmDqHP6GZ5QdvJLBaJsuAhvRQSm+htlQiyYDk="; }; vendorHash = "sha256-NQ74rLYhzacOrw6Tl6WoERfqbx2aF9X18rh0oOjCotE="; @@ -27,11 +27,11 @@ buildGoModule rec { mv $out/bin/go-pmtiles $out/bin/pmtiles ''; - meta = with lib; { + meta = { description = "Single-file utility for creating and working with PMTiles archives"; homepage = "https://github.com/protomaps/go-pmtiles"; - license = licenses.bsd3; - maintainers = teams.geospatial.members ++ (with maintainers; [ theaninova ]); + license = lib.licenses.bsd3; + maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ theaninova ]); mainProgram = "pmtiles"; }; } From 789938fc73ac56e7a1f504aa377defc8be1e790f Mon Sep 17 00:00:00 2001 From: Fournux Date: Mon, 17 Feb 2025 19:24:05 +0100 Subject: [PATCH 0735/1107] =?UTF-8?q?amarok:=203.1.1=20=E2=86=92=203.2.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://invent.kde.org/multimedia/amarok/-/compare/v3.1.1...v3.2.2 --- pkgs/applications/audio/amarok/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index 1160c05b6101..b398bf1f4480 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -44,11 +44,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "amarok"; - version = "3.1.1"; + version = "3.2.2"; src = fetchurl { url = "mirror://kde/stable/amarok/${finalAttrs.version}/amarok-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-CrilxE8v6OcEdnWlfmQM54fxyAE0rB5VX8vvzZRyLmY="; + sha256 = "sha256-/N48N9H4FezIiTD+bR6k1LCx7Tsz/NMt9VQq+HTdKrA="; }; outputs = [ From a2012b3e438dc2a37e379b0525a9e487c164c9ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 18:27:02 +0000 Subject: [PATCH 0736/1107] terraform-providers.pagerduty: 3.19.4 -> 3.21.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7136c6928e93..98b944746a50 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -985,11 +985,11 @@ "vendorHash": null }, "pagerduty": { - "hash": "sha256-6n+FPTuoK5eoaNxa+E8NAWglMBMH/1eJAu6BmiaKhAs=", + "hash": "sha256-A+i85IEblZNHz/Z3MpD+c8c0aAO1MAsuwlbKHKm238M=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v3.19.4", + "rev": "v3.21.0", "spdx": "MPL-2.0", "vendorHash": null }, From 5a25bc6270269c545f0c5dac1f5a189cf67d3e15 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 17 Feb 2025 19:33:33 +0100 Subject: [PATCH 0737/1107] 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 11377d720972e54450cd916305522b00af807ec7 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 17 Feb 2025 11:22:50 -0600 Subject: [PATCH 0738/1107] luaPackages.orgmode: fix tree-sitter-org error --- pkgs/development/lua-modules/overrides.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index aba68e183815..60fe3e744c45 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -1110,6 +1110,16 @@ in ]; }); + orgmode = prev.orgmode.overrideAttrs (oa: { + # Patch in tree-sitter-orgmode dependency + postPatch = '' + substituteInPlace lua/orgmode/config/init.lua \ + --replace-fail \ + "pcall(vim.treesitter.language.add, 'org')" \ + "pcall(function() vim.treesitter.language.add('org', { path = '${final.tree-sitter-orgmode}/lib/lua/${final.tree-sitter-orgmode.lua.luaversion}/parser/org.so'}) end)" + ''; + }); + tree-sitter-orgmode = prev.tree-sitter-orgmode.overrideAttrs (oa: { propagatedBuildInputs = let From 2dc66dedcb314022e4eae29b3f309ba6094bf775 Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Sat, 15 Feb 2025 15:03:08 +0100 Subject: [PATCH 0739/1107] 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 4197d835f3edadb3c8d9c7336baf9298bbdfdb5e Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 17 Feb 2025 18:40:12 +0000 Subject: [PATCH 0740/1107] wezterm: 0-unstable-2025-02-10 -> 0-unstable-2025-02-13 --- pkgs/by-name/we/wezterm/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/we/wezterm/package.nix b/pkgs/by-name/we/wezterm/package.nix index 84e0843ee523..cf686b8721b9 100644 --- a/pkgs/by-name/we/wezterm/package.nix +++ b/pkgs/by-name/we/wezterm/package.nix @@ -29,14 +29,14 @@ rustPlatform.buildRustPackage rec { pname = "wezterm"; - version = "0-unstable-2025-02-10"; + version = "0-unstable-2025-02-13"; src = fetchFromGitHub { owner = "wez"; repo = "wezterm"; - rev = "52c1ca749552af4d8a2f18ec10fe8f14b6622519"; + rev = "ee0c04e735fb94cb5119681f704fb7fa6731e713"; fetchSubmodules = true; - hash = "sha256-4dIu0WczmjfCfYe2/fZybMWfgYd4XezIHUUPVb3ou28="; + hash = "sha256-0jqnSzzfg8ecBaayJI8oP9X0FyijFFT3LA6GKfpAFwI="; }; postPatch = '' @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage rec { --replace-fail 'hash hostnamectl 2>/dev/null' 'command type -P hostnamectl &>/dev/null' ''; - cargoHash = "sha256-2PJBd3nouxK0iIDOKIS9rrXbbts6zTYdrzxxokSiNwo="; + cargoHash = "sha256-WyQYmRNlabJaCTJm7Cn9nkXfOGAcOHwhoD9vmEggrDw="; useFetchCargoVendor = true; nativeBuildInputs = [ @@ -66,13 +66,13 @@ rustPlatform.buildRustPackage rec { buildInputs = [ fontconfig + openssl zlib ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libxcb libxkbcommon - openssl wayland xcbutil xcbutilimage From 53035684850779c37996434738694ad28ffb8adc Mon Sep 17 00:00:00 2001 From: Korrat Date: Mon, 17 Feb 2025 19:54:22 +0100 Subject: [PATCH 0741/1107] prettypst: unstable-2024-10-20 -> 2.0.0 --- pkgs/by-name/pr/prettypst/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pr/prettypst/package.nix b/pkgs/by-name/pr/prettypst/package.nix index c71a5eac7f4b..cc821c9f4834 100644 --- a/pkgs/by-name/pr/prettypst/package.nix +++ b/pkgs/by-name/pr/prettypst/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "prettypst"; - version = "unstable-2024-10-20"; + version = "2.0.0"; src = fetchFromGitHub { owner = "antonWetzel"; repo = "prettypst"; - rev = "a724b56de0527faf0f1f1eecb17d0b847872411c"; - hash = "sha256-CVvcrytEG2q6kPiGBMfy/oQCD63Gm2AenvLUhCUx6fw="; + rev = "2.0.0"; + hash = "sha256-fGm3HDMJ12HlVOjLtaS2hcAzVl/jl4nqMYly0aBVRxw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-NxCc5DGbeHJ3M2V4h/u0lvzEkSbFU+rMcSnu+kJ0rXM="; + cargoHash = "sha256-zfx6SDtvn5waKWZB1gVxcvCzP+Rp7+J+txaRHoRfaBM="; meta = { changelog = "https://github.com/antonWetzel/prettypst/blob/${src.rev}/changelog.md"; From 69171c1b722374039a26d400d0e0984caf53c325 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 17 Feb 2025 11:01:59 -0800 Subject: [PATCH 0742/1107] signalbackup-tools: 20250213-1 -> 20250217 Diff: https://github.com/bepaald/signalbackup-tools/compare/20250213-1...20250217 --- pkgs/by-name/si/signalbackup-tools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index 40f52e701c42..26e4e5240ab0 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20250213-1"; + version = "20250217"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; rev = version; - hash = "sha256-616NpIZ2TWyZEoYWZx6XDDxmZbsnrpxcWmTc7QgiT70="; + hash = "sha256-cjEbnuELa2c03Gdn1l3I8lM9szPJ8luhUYTj6qW/VWU="; }; nativeBuildInputs = [ From a5b2caac92f37f372585738634bb5e10c72107a3 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 16 Feb 2025 20:50:08 +0100 Subject: [PATCH 0743/1107] humblebundle-downloader: init at 0.4.3 --- .../hu/humblebundle-downloader/package.nix | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/hu/humblebundle-downloader/package.nix diff --git a/pkgs/by-name/hu/humblebundle-downloader/package.nix b/pkgs/by-name/hu/humblebundle-downloader/package.nix new file mode 100644 index 000000000000..3d5e4c15861d --- /dev/null +++ b/pkgs/by-name/hu/humblebundle-downloader/package.nix @@ -0,0 +1,36 @@ +{ + fetchFromGitHub, + lib, + python3Packages, +}: + +python3Packages.buildPythonApplication rec { + pname = "humblebundle-downloader"; + version = "0.4.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "xtream1101"; + repo = "humblebundle-downloader"; + tag = version; + hash = "sha256-fLfAGDKn6AWHJKsgQ0fBYdN6mGfZNrVs9n6Zo9VRgIY="; + }; + + build-system = with python3Packages; [ + poetry-core + ]; + + dependencies = with python3Packages; [ + parsel + requests + ]; + + meta = { + description = "Download your Humble Bundle Library"; + mainProgram = "hbd"; + homepage = "https://github.com/xtream1101/humblebundle-downloader"; + changelog = "https://github.com/xtream1101/humblebundle-downloader/blob/${src.tag}/CHANGELOG.md"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +} From cf234c1d6e4405a11e18c55062f20ee5f04c878f Mon Sep 17 00:00:00 2001 From: oddlama Date: Mon, 17 Feb 2025 20:08:23 +0100 Subject: [PATCH 0744/1107] vimPlugins.blink-cmp: 0.12.2 -> 0.12.4 --- .../editors/vim/plugins/non-generated/blink-cmp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix index f4a24aa9aaf7..5ee275409991 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix @@ -9,12 +9,12 @@ replaceVars, }: let - version = "0.12.2"; + version = "0.12.4"; src = fetchFromGitHub { owner = "Saghen"; repo = "blink.cmp"; tag = "v${version}"; - hash = "sha256-oPh0mIqSxbpzmUzk3lP7OwcqKfP8syP0NAPKysTet98="; + hash = "sha256-ybzEQHvZIiF+B2SIdFX8HJGai50PUw5QRgrL7qJ0sUk="; }; blink-fuzzy-lib = rustPlatform.buildRustPackage { inherit version src; From eb4009247f671b346012a87302b8e3c29f496f41 Mon Sep 17 00:00:00 2001 From: Mitchell Pleune Date: Mon, 17 Feb 2025 19:17:52 +0000 Subject: [PATCH 0745/1107] python3Packages.onnxruntime: buildInputs dep on onnxruntime The onnxruntime libs are patched to look for additional runtime libraries in `${onnxruntime}/lib`, so we must depend on it. Alternatively, onnxruntime could be built twice, once for each lib path patch, but onnxruntime takes a vert long time to build with cuda support. --- pkgs/development/python-modules/onnxruntime/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/onnxruntime/default.nix b/pkgs/development/python-modules/onnxruntime/default.nix index 48c342c1626f..90df4cb2aff0 100644 --- a/pkgs/development/python-modules/onnxruntime/default.nix +++ b/pkgs/development/python-modules/onnxruntime/default.nix @@ -50,6 +50,13 @@ buildPythonPackage { oneDNN re2 onnxruntime.protobuf + + # https://github.com/NixOS/nixpkgs/pull/357656 patches the onnx lib to ${pkgs.onnxruntime}/lib + # but these files are copied into this package too. If the origional non-python onnxruntime + # package is GC-ed, cuda support in this python package will break. + # Two options, rebuild onnxruntime twice with the different paths hard-coded, or just hold a runtime + # dependency between the two. Option 2, because onnxruntime takes forever to build with cuda support. + onnxruntime ] ++ lib.optionals onnxruntime.passthru.cudaSupport ( with onnxruntime.passthru.cudaPackages; From 646a6293b39cbc147212d732f46fe4580287d83a Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 16 Feb 2025 22:54:05 +0100 Subject: [PATCH 0746/1107] itch-dl: init at 0.5.2 --- pkgs/by-name/it/itch-dl/package.nix | 49 +++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/by-name/it/itch-dl/package.nix diff --git a/pkgs/by-name/it/itch-dl/package.nix b/pkgs/by-name/it/itch-dl/package.nix new file mode 100644 index 000000000000..9eaf7acdeb91 --- /dev/null +++ b/pkgs/by-name/it/itch-dl/package.nix @@ -0,0 +1,49 @@ +{ + fetchFromGitHub, + lib, + python3Packages, +}: + +python3Packages.buildPythonApplication rec { + pname = "itch-dl"; + version = "0.5.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "DragoonAethis"; + repo = "itch-dl"; + tag = version; + hash = "sha256-MkhXM9CQXbVcnztMPnBscryXWSaSQUeoG6KtVuS8YEo="; + }; + + nativeBuildInputs = with python3Packages; [ + pythonRelaxDepsHook + ]; + + build-system = with python3Packages; [ + poetry-core + ]; + + dependencies = with python3Packages; [ + beautifulsoup4 + lxml + pydantic + requests + tqdm + urllib3 + ]; + + pythonRelaxDeps = [ + "pydantic" + "urllib3" + ]; + + meta = { + description = "Itch.io game downloader with website, game jam, collection and library support"; + mainProgram = "itch-dl"; + homepage = "https://github.com/DragoonAethis/itch-dl"; + changelog = "https://github.com/DragoonAethis/itch-dl/releases/tag/${src.tag}"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +} From 788902c8a185168799758dee71b5902edde86e78 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 19:30:10 +0000 Subject: [PATCH 0747/1107] terraform-providers.spacelift: 1.19.1 -> 1.20.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7136c6928e93..44482dea2c84 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1192,13 +1192,13 @@ "vendorHash": "sha256-YFV+qXD78eajSeagJPgPu+qIktx1Vh/ZT0fUPOBuZyo=" }, "spacelift": { - "hash": "sha256-qa+mBk57B2lauJI8k6t4BLksyKVM9tXKQOzo0ky/gAQ=", + "hash": "sha256-prw8STuA6n04JTZT8iDG7giFwkZ0FzGXzuuxyBJ5xjM=", "homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift", "owner": "spacelift-io", "repo": "terraform-provider-spacelift", - "rev": "v1.19.1", + "rev": "v1.20.0", "spdx": "MIT", - "vendorHash": "sha256-c3R/7k7y7XS2Qli00nSj7gh/3Mj88PY4WybBTq/+pPs=" + "vendorHash": "sha256-8K5ye/QD7Iy8GNb+BCfJ2oo/5dATHpEXM+qD7c0NEu8=" }, "spotinst": { "hash": "sha256-ThGr8oY7SevU05S7g4r8Il4mr02zzg53YzaYztkY7M4=", From 12deb29171381969ff0ce2cad889c5af313fade5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 19:35:05 +0000 Subject: [PATCH 0748/1107] terraform-providers.vsphere: 2.11.0 -> 2.11.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7136c6928e93..b5741c23ce6f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1427,13 +1427,13 @@ "vendorHash": null }, "vsphere": { - "hash": "sha256-8xJOuafposGNtFw6ZMfrmoGOp67rubOdrLDR9DFRxdg=", + "hash": "sha256-ce3nKSBvF7Enk3wsW4ackEBIDPKPP0qkjZ7Dm9SGKV4=", "homepage": "https://registry.terraform.io/providers/hashicorp/vsphere", "owner": "hashicorp", "repo": "terraform-provider-vsphere", - "rev": "v2.11.0", + "rev": "v2.11.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-nQM1RcdgndUwHJWAspu/INFSXBoXJgAFBZR1x2txCkE=" + "vendorHash": "sha256-3RylkFRnCG5Z9G/4iV8YJgBnNKYS4T3AhA2JdI+1FEY=" }, "vultr": { "hash": "sha256-vgeTK5fGHYzHCBdxq1JN9agK6+jYGkCkFnAWrkIz/gM=", From 65f928452e0d16a9d7893a41f3f372acc8c138df Mon Sep 17 00:00:00 2001 From: winston Date: Sun, 2 Feb 2025 18:05:12 +0100 Subject: [PATCH 0749/1107] maintainers: add nekowinston --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 52cf46a7bab5..48e79dc8b767 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16380,6 +16380,12 @@ githubId = 43587167; name = "Nikita Tikhonov"; }; + nekowinston = { + email = "hey@winston.sh"; + github = "nekowinston"; + githubId = 79978224; + name = "winston"; + }; nelsonjeppesen = { email = "nix@jeppesen.io"; github = "NelsonJeppesen"; From 3df1bef9a3d770717e24acecdc7681e747023ef9 Mon Sep 17 00:00:00 2001 From: winston Date: Sun, 2 Feb 2025 18:05:46 +0100 Subject: [PATCH 0750/1107] delineate: init at 0.1.0 --- pkgs/by-name/de/delineate/graphview-dir.patch | 13 +++ pkgs/by-name/de/delineate/package.nix | 99 +++++++++++++++++++ 2 files changed, 112 insertions(+) create mode 100644 pkgs/by-name/de/delineate/graphview-dir.patch create mode 100644 pkgs/by-name/de/delineate/package.nix diff --git a/pkgs/by-name/de/delineate/graphview-dir.patch b/pkgs/by-name/de/delineate/graphview-dir.patch new file mode 100644 index 000000000000..3a6eaa774290 --- /dev/null +++ b/pkgs/by-name/de/delineate/graphview-dir.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index 616ccff..d32b4c5 100644 +--- a/meson.build ++++ b/meson.build +@@ -29,7 +29,7 @@ version = meson.project_version() + prefix = get_option('prefix') + bindir = prefix / get_option('bindir') + localedir = prefix / get_option('localedir') +-graphviewsrcdir = prefix / 'src/delineate/graph_view' ++graphviewsrcdir = prefix / 'opt/delineate/graph_view' + + datadir = prefix / get_option('datadir') + pkgdatadir = datadir / meson.project_name() diff --git a/pkgs/by-name/de/delineate/package.nix b/pkgs/by-name/de/delineate/package.nix new file mode 100644 index 000000000000..9d1d86d63b7f --- /dev/null +++ b/pkgs/by-name/de/delineate/package.nix @@ -0,0 +1,99 @@ +{ + appstream, + buildNpmPackage, + cargo, + cmake, + desktop-file-utils, + fetchFromGitHub, + gtk4, + gtksourceview5, + lib, + libadwaita, + meson, + ninja, + nix-update-script, + pkg-config, + rustPlatform, + rustc, + stdenv, + webkitgtk_6_0, + wrapGAppsHook4, +}: +let + d3-graphviz = buildNpmPackage rec { + pname = "d3-graphviz"; + version = "5.6.0"; + + src = fetchFromGitHub { + owner = "magjac"; + repo = "d3-graphviz"; + tag = "v${version}"; + hash = "sha256-MZhAzR6+GIBTsLPJq5NqaEPHjiBMgYBJ0hFbDPNPgFk="; + }; + + npmDepsHash = "sha256-J1kptumP/8UoiYDM+AJOYUne0OSkMXCTAXW3ZmavU4E="; + + # keep the devDependencies, as Delineate imports d3 via node_modules + # https://github.com/SeaDve/Delineate/blob/v0.1.0/data/graph_view/index.html#L10-L11 + npmPruneFlags = "--include=dev"; + }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "delineate"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "SeaDve"; + repo = "Delineate"; + tag = "v${finalAttrs.version}"; + hash = "sha256-dFGh7clxc6UxQRTsNKrggWDvL3CPmzJmrvO1jqMVoTg="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) src; + hash = "sha256-RtQnpbjULtnvlc71L4KIKPES0WRSY2GoaIwt8UvlYOA="; + }; + + patches = [ + ./graphview-dir.patch + ]; + + nativeBuildInputs = [ + cargo + cmake + desktop-file-utils + gtk4 + meson + ninja + pkg-config + rustPlatform.bindgenHook + rustPlatform.cargoSetupHook + rustc + wrapGAppsHook4 + ]; + + buildInputs = [ + appstream + gtksourceview5 + libadwaita + webkitgtk_6_0 + ]; + + dontUseCmakeConfigure = true; + + postInstall = '' + ln -s ${d3-graphviz}/lib/node_modules/d3-graphviz $out/opt/delineate/graph_view/d3-graphviz + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "View and edit graphs"; + homepage = "https://github.com/SeaDve/Delineate"; + changelog = "https://github.com/SeaDve/Delineate/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.nekowinston ]; + platforms = lib.platforms.linux; + mainProgram = "delineate"; + }; +}) From 337756615375efc27d8c745629781011924c1632 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 19:42:28 +0000 Subject: [PATCH 0751/1107] php84: 8.4.3 -> 8.4.4 --- pkgs/development/interpreters/php/8.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.4.nix b/pkgs/development/interpreters/php/8.4.nix index 84dadc68968e..48c7aa01d9d2 100644 --- a/pkgs/development/interpreters/php/8.4.nix +++ b/pkgs/development/interpreters/php/8.4.nix @@ -4,8 +4,8 @@ let base = callPackage ./generic.nix ( _args // { - version = "8.4.3"; - hash = "sha256-1rEjedHx3yFtGTKECjGxT+0eD8fo2x6dF5X3Wh516tk="; + version = "8.4.4"; + hash = "sha256-GSoyX9PKCbbFKN1gFO4H2APDFiUU1LsNPgmB0ArHAOw="; } ); in From 9d9b490e9a6115dab9fe7724c2edf218c91a7fd6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 19:43:47 +0000 Subject: [PATCH 0752/1107] terraform-providers.signalfx: 9.7.1 -> 9.7.2 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7136c6928e93..2c1579eb24f8 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1147,11 +1147,11 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { - "hash": "sha256-m+dclQs0oGwXci/SDfaNSwuzTCV3hDskyiD0VbTmryQ=", + "hash": "sha256-16FdvnLNFgX2shkBTxefPZ/gpIZiSxbxKRlVvDoUT8o=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v9.7.1", + "rev": "v9.7.2", "spdx": "MPL-2.0", "vendorHash": "sha256-Eh/8EDdnxKBbq0E3KXFtO4liJ6ruytfyCyM5DVwk9jo=" }, From 7236b15ac72d2a36477b700b83501ab9ef3ed5a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 17 Feb 2025 20:54:13 +0100 Subject: [PATCH 0753/1107] gitea: 1.23.2 -> 1.23.3 Diff: https://github.com/go-gitea/gitea/compare/refs/tags/v1.23.2...v1.23.3 --- pkgs/by-name/gi/gitea/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix index b04a6140aff9..9ec714fabbab 100644 --- a/pkgs/by-name/gi/gitea/package.nix +++ b/pkgs/by-name/gi/gitea/package.nix @@ -35,13 +35,13 @@ let in buildGoModule rec { pname = "gitea"; - version = "1.23.2"; + version = "1.23.3"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; tag = "v${gitea.version}"; - hash = "sha256-g7nrqSeMoAcfN8uexEKySZwY8SCosIpACtURRbUgb5c="; + hash = "sha256-XVaNqnvTbB3d6ksyEzHOqrKhtzU4YLSpBs8RrqG1/hw="; }; proxyVendor = true; From a3a07ac733f5aa4a1b1800d4a4042b65c6a9865f Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Mon, 17 Feb 2025 21:00:28 +0100 Subject: [PATCH 0754/1107] coqPackages.jasmin: init at 2024.07.2 (#382064) --- .../coq-modules/jasmin/default.nix | 37 +++++++++++++++++++ pkgs/top-level/coq-packages.nix | 1 + 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/coq-modules/jasmin/default.nix diff --git a/pkgs/development/coq-modules/jasmin/default.nix b/pkgs/development/coq-modules/jasmin/default.nix new file mode 100644 index 000000000000..16a1a15eb9e1 --- /dev/null +++ b/pkgs/development/coq-modules/jasmin/default.nix @@ -0,0 +1,37 @@ +{ + lib, + mkCoqDerivation, + coq, + mathcomp, + mathcomp-word, + version ? null, +}: + +mkCoqDerivation { + pname = "jasmin"; + owner = "jasmin-lang"; + + inherit version; + defaultVersion = + with lib.versions; + lib.switch [ coq.version mathcomp.version ] [ + { cases = [ (range "8.18" "8.20") (range "2.2" "2.3") ]; + out = "2024.07.2"; } + ] null; + releaseRev = v: "v${v}"; + + release."2024.07.2".sha256 = "sha256-aF8SYY5jRxQ6iEr7t6mRN3BEmIDhJ53PGhuZiJGB+i8="; + + propagatedBuildInputs = [ + mathcomp-word + ]; + + makeFlags = [ "-C" "proofs" ]; + + meta = with lib; { + description = "Jasmin language & verified compiler"; + homepage = "https://github.com/jasmin-lang/jasmin/"; + license = licenses.mit; + maintainers = with maintainers; [ proux01 vbgl ]; + }; +} diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 372c95eb3df4..185ecbe78436 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -87,6 +87,7 @@ let itauto = callPackage ../development/coq-modules/itauto { }; ITree = callPackage ../development/coq-modules/ITree { }; itree-io = callPackage ../development/coq-modules/itree-io { }; + jasmin = callPackage ../development/coq-modules/jasmin {}; json = callPackage ../development/coq-modules/json {}; lemma-overloading = callPackage ../development/coq-modules/lemma-overloading {}; LibHyps = callPackage ../development/coq-modules/LibHyps {}; From c8f8c0917ffa609e779051d618a2d7ef461f778d Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Sun, 16 Feb 2025 00:07:15 -0500 Subject: [PATCH 0755/1107] drum-machine: init at 1.0.0 --- pkgs/by-name/dr/drum-machine/package.nix | 75 ++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 pkgs/by-name/dr/drum-machine/package.nix diff --git a/pkgs/by-name/dr/drum-machine/package.nix b/pkgs/by-name/dr/drum-machine/package.nix new file mode 100644 index 000000000000..fab0966a6a10 --- /dev/null +++ b/pkgs/by-name/dr/drum-machine/package.nix @@ -0,0 +1,75 @@ +{ + lib, + appstream, + desktop-file-utils, + fetchFromGitHub, + glib, + gobject-introspection, + gtk4, + libadwaita, + meson, + ninja, + nix-update-script, + pkg-config, + python3Packages, + wrapGAppsHook4, +}: + +python3Packages.buildPythonApplication rec { + pname = "drum-machine"; + version = "1.0.0"; + pyproject = false; + + src = fetchFromGitHub { + owner = "Revisto"; + repo = "drum-machine"; + tag = "v${version}"; + hash = "sha256-7D9Cda0HILRC/RLySC7jEJ7QhoO2KOQBFNZtn9wD+54="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + appstream + desktop-file-utils + glib + gobject-introspection + gtk4 # For `gtk-update-icon-theme` + meson + ninja + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ libadwaita ]; + + dependencies = with python3Packages; [ + mido + pygame + pygobject3 + ]; + + dontWrapGApps = true; + + makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ]; + + # NOTE: `postCheck` is intentionally not used here, as the entire checkPhase + # is skipped by `buildPythonApplication` + # https://github.com/NixOS/nixpkgs/blob/9d4343b7b27a3e6f08fc22ead568233ff24bbbde/pkgs/development/interpreters/python/mk-python-derivation.nix#L296 + postInstallCheck = '' + mesonCheckPhase + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Modern and intuitive application for creating, playing, and managing drum patterns"; + homepage = "https://apps.gnome.org/DrumMachine"; + changelog = "https://github.com/Revisto/drum-machine/releases/tag/${src.tag}"; + license = lib.licenses.gpl3Plus; + maintainers = lib.teams.gnome-circle.members; + platforms = lib.platforms.linux; + }; +} From b80c7c0bd1809a18328d5ed842e646966ad0f093 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 20:12:30 +0000 Subject: [PATCH 0756/1107] terraform-providers.launchdarkly: 2.21.5 -> 2.23.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7136c6928e93..22bc0f7cea9e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -732,13 +732,13 @@ "vendorHash": "sha256-PfvIzUugDsnMKW7mSM2GyJZpXi3wJsEhYLKzlKq1U6A=" }, "launchdarkly": { - "hash": "sha256-nneVn/q6p1FbFSZDjL5aEmp1U1xtjGox/mf48e140Qs=", + "hash": "sha256-ftpPH5EP67yLmE32Z99nnBuGeBNKck4Ca039GV6iReQ=", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.21.5", + "rev": "v2.23.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-mdVTcbfJ06o8LTfFMnpmoYSbLVSjZxxhpFFsL54tbUA=" + "vendorHash": "sha256-6lcLNoD/CNYpmwHuRsUCPoSii5ZXAlAjWSXVk9i0izU=" }, "libvirt": { "hash": "sha256-B99pSnnI+GoMX4uleDqBoAKPe15l/+C5mIUGp6KsE54=", From 2f45486c6c4362cf107bed4bbd96daa066999386 Mon Sep 17 00:00:00 2001 From: oddlama Date: Mon, 17 Feb 2025 21:11:50 +0100 Subject: [PATCH 0757/1107] nixos/kanidm: add home_mount_prefix to BindPaths if set --- nixos/modules/services/security/kanidm.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix index a54471c0b956..4ed74d9e7480 100644 --- a/nixos/modules/services/security/kanidm.nix +++ b/nixos/modules/services/security/kanidm.nix @@ -855,12 +855,16 @@ in User = "kanidm"; Group = "kanidm"; - BindPaths = [ - # To create the socket - "/run/kanidmd:/run/kanidmd" - # To store backups - cfg.serverSettings.online_backup.path - ]; + BindPaths = + [ + # To create the socket + "/run/kanidmd:/run/kanidmd" + # To store backups + cfg.serverSettings.online_backup.path + ] + ++ optional ( + cfg.enablePam && cfg.unixSettings ? home_mount_prefix + ) cfg.unixSettings.home_mount_prefix; AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; From 0ff5e5ebc255f819cc91faedd5efb9f0abf6bd7a Mon Sep 17 00:00:00 2001 From: merrkry Date: Mon, 17 Feb 2025 21:45:59 +0100 Subject: [PATCH 0758/1107] memogram: 0.2.2 -> 0.2.4 --- pkgs/by-name/me/memogram/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/memogram/package.nix b/pkgs/by-name/me/memogram/package.nix index 1fef943879bb..9205ea5d3f5b 100644 --- a/pkgs/by-name/me/memogram/package.nix +++ b/pkgs/by-name/me/memogram/package.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "memogram"; - version = "0.2.2"; + version = "0.2.4"; src = fetchFromGitHub { owner = "usememos"; repo = "telegram-integration"; tag = "v${version}"; - hash = "sha256-CUo5fPWNE4FP1Dtwb1rPNSPP/CAJvYGYYIMAx/oeSOc="; + hash = "sha256-nhNVo8Bp/g/IWyj548BQlyxPy1t3DDCyLmInDwQCH4c="; }; - vendorHash = "sha256-BDGA7GpXS3/esBvb3+rC8ZgtER2OgBJ1bHZ6AHP/i4s="; + vendorHash = "sha256-g8mAG5l2juOVaem2xk+pPVzKYNJHbWbkS/D0LwF+XdM="; subPackages = [ "bin/memogram" ]; From 38f778cec223f996d618bb8e34919e594df3adb7 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Mon, 17 Feb 2025 21:46:29 +0100 Subject: [PATCH 0759/1107] python3Packages.drf-standardized-errors: fix patch url --- .../python-modules/drf-standardized-errors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/drf-standardized-errors/default.nix b/pkgs/development/python-modules/drf-standardized-errors/default.nix index c20114c2542f..484e5c12325c 100644 --- a/pkgs/development/python-modules/drf-standardized-errors/default.nix +++ b/pkgs/development/python-modules/drf-standardized-errors/default.nix @@ -28,8 +28,8 @@ buildPythonPackage rec { patches = [ # fix test_openapi_utils test (fetchpatch { - url = "https://github.com/ghazi-git/drf-standardized-errors/pull/96/commits/4a2b1be3c97cd6db50543e6ff0303c0df0731d8a.patch"; - hash = "sha256-8+zVzBX7yDGfpsyvj61auqV+zdG6mIyj2LtR3D8l4jc="; + url = "https://github.com/ghazi-git/drf-standardized-errors/commit/dbc37d4228bdefa858ab299517097d6e52a0b698.patch"; + hash = "sha256-CZTBmhAFKODGLiN2aQNKMaR8VyKs0H55Tzu4Rh6X9R8="; }) ]; From 7bb85613ab4006bb95465a939780dfa42c9cff59 Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 17 Feb 2025 21:55:07 +0100 Subject: [PATCH 0760/1107] rimgo: pin tailwindcss --- pkgs/by-name/ri/rimgo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ri/rimgo/package.nix b/pkgs/by-name/ri/rimgo/package.nix index 9a97990bee56..f28667bbe7db 100644 --- a/pkgs/by-name/ri/rimgo/package.nix +++ b/pkgs/by-name/ri/rimgo/package.nix @@ -2,7 +2,7 @@ lib, fetchFromGitea, buildGoModule, - tailwindcss, + tailwindcss_3, }: buildGoModule rec { pname = "rimgo"; @@ -18,7 +18,7 @@ buildGoModule rec { vendorHash = "sha256-nk1Pl9K62RjmBUgTlbp3u6cCoiEwpUHavfT3Oy0iyGU="; - nativeBuildInputs = [ tailwindcss ]; + nativeBuildInputs = [ tailwindcss_3 ]; preBuild = '' tailwindcss -i static/tailwind.css -o static/app.css -m From 6dfdfc9c3a7a5e5f98ec6c4379ed89c02517c916 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 17 Feb 2025 21:37:49 +0100 Subject: [PATCH 0761/1107] php84Extensions.pcov: 1.0.11 -> 1.0.12 --- pkgs/development/php-packages/pcov/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/php-packages/pcov/default.nix b/pkgs/development/php-packages/pcov/default.nix index 02af71c12e6e..1b990d02fd9e 100644 --- a/pkgs/development/php-packages/pcov/default.nix +++ b/pkgs/development/php-packages/pcov/default.nix @@ -1,14 +1,13 @@ { buildPecl, lib, - php, pcre2, fetchFromGitHub, fetchpatch, }: let - version = "1.0.11"; + version = "1.0.12"; in buildPecl { inherit version; @@ -17,8 +16,8 @@ buildPecl { src = fetchFromGitHub { owner = "krakjoe"; repo = "pcov"; - rev = "v${version}"; - sha256 = "sha256-lyY17Y9chpTO8oeWmDGSh0YSnipYqCuy1qmn9su5Eu8="; + tag = "v${version}"; + hash = "sha256-lyY17Y9chpTO8oeWmDGSh0YSnipYqCuy1qmn9su5Eu8="; }; buildInputs = [ pcre2 ]; @@ -27,15 +26,15 @@ buildPecl { # Allow building for PHP 8.4 (fetchpatch { url = "https://github.com/krakjoe/pcov/commit/7d764c7c2555e8287351961d72be3ebec4d8743f.patch"; - sha256 = "sha256-5wIHrrCwUXQpPdUg+3Kwyop5yvOzQQ3qc4pQXU8q2OM="; + hash = "sha256-5wIHrrCwUXQpPdUg+3Kwyop5yvOzQQ3qc4pQXU8q2OM="; }) ]; - meta = with lib; { + meta = { changelog = "https://github.com/krakjoe/pcov/releases/tag/v${version}"; description = "Self contained php-code-coverage compatible driver for PHP"; - license = licenses.php301; + license = lib.licenses.php301; homepage = "https://github.com/krakjoe/pcov"; - maintainers = teams.php.members; + maintainers = lib.teams.php.members; }; } From cac79ca847f28319998791048c1c479fd6d6180e Mon Sep 17 00:00:00 2001 From: merrkry Date: Mon, 17 Feb 2025 21:58:53 +0100 Subject: [PATCH 0762/1107] 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 8f0516b7d4a74b9c95a5f576ff148fc3333b1edf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 17 Feb 2025 21:58:56 +0100 Subject: [PATCH 0763/1107] youtube-music: 3.7.2 -> 3.7.4 Changelog: https://github.com/th-ch/youtube-music/releases/tag/v3.7.3 Changelog: https://github.com/th-ch/youtube-music/releases/tag/v3.7.4 --- pkgs/applications/audio/youtube-music/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix index c989bdf5cf1f..ef035a500226 100644 --- a/pkgs/applications/audio/youtube-music/default.nix +++ b/pkgs/applications/audio/youtube-music/default.nix @@ -13,18 +13,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "youtube-music"; - version = "3.7.2"; + version = "3.7.4"; src = fetchFromGitHub { owner = "th-ch"; repo = "youtube-music"; rev = "v${finalAttrs.version}"; - hash = "sha256-gZ3EvIjPa/THRwMigglGp+Wtv+wEN7V11KOu1QsyJpE="; + hash = "sha256-qzvfYxM5mxxujWE0SDUapmN+Px9NkP58e1UeLEtZ7bc="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-4yeLfolBquKFjKB4iYj8rMPvclfpjwHhV6/Xb/YNQWo="; + hash = "sha256-guD1yWFd+uO9H/egHS0PJ9HIIlF+wFS/98YtvjIzZW8="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5d9e8ce8a00..e2a508637f60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15785,7 +15785,7 @@ with pkgs; youtube-dl-light = with python3Packages; toPythonApplication youtube-dl-light; youtube-music = callPackage ../applications/audio/youtube-music { - pnpm = pnpm_9; + pnpm = pnpm_10; }; youtube-tui = callPackage ../applications/video/youtube-tui { From fc95c95737bc9773c4bc8e6fac4640bf038aab3d Mon Sep 17 00:00:00 2001 From: Julien CLAISSE Date: Mon, 17 Feb 2025 22:01:43 +0100 Subject: [PATCH 0764/1107] terraform-providers.proxmox: 2.9.14 -> 3.0.1-rc6 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7136c6928e93..7b8cda07fc7a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1039,13 +1039,13 @@ "vendorHash": "sha256-mnKXYT0GfIS+ODzBCS9l4rLF1ugadesmpgdOgj74nLg=" }, "proxmox": { - "hash": "sha256-ikXLLNoAjrnGGGI3fHTKFXm8YwqNazE/U39JTjOBsW4=", + "hash": "sha256-dQvJVAxSR0eMeJseDR80MqXX4v7ry794bIr+ilpKBoQ=", "homepage": "https://registry.terraform.io/providers/Telmate/proxmox", "owner": "Telmate", "repo": "terraform-provider-proxmox", - "rev": "v2.9.14", + "rev": "v3.0.1-rc6", "spdx": "MIT", - "vendorHash": "sha256-um4iOwYO6ASv9wpu5Jua9anUZBKly4yVgI224Fk2dOM=" + "vendorHash": "sha256-rD4+m0txQhzw2VmQ56/ZXjtQ9QOufseZGg8TrisgAJo=" }, "rabbitmq": { "hash": "sha256-ArteHTNNUxgiBJamnR1bJFDrvNnqjbJ6D3mj1XlpVUA=", From 108b5eec8fe7683684e5bb981f986e249ad29e1c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 17 Feb 2025 21:54:33 +0100 Subject: [PATCH 0765/1107] php84Extensions.pdo_oci: fix build with PHP >= 8.4 --- .../php-packages/pdo_oci/default.nix | 29 +++++++++++++++++++ pkgs/top-level/php-packages.nix | 28 ++++++++++-------- 2 files changed, 45 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/php-packages/pdo_oci/default.nix diff --git a/pkgs/development/php-packages/pdo_oci/default.nix b/pkgs/development/php-packages/pdo_oci/default.nix new file mode 100644 index 000000000000..f4e4bb2856d8 --- /dev/null +++ b/pkgs/development/php-packages/pdo_oci/default.nix @@ -0,0 +1,29 @@ +{ + buildPecl, + lib, + oracle-instantclient, + php, +}: + +buildPecl { + version = "1.1.0"; + pname = "pdo_oci"; + + hash = "sha256-XKtpWH6Rn8s19Wlu15eb/6dcCpJ7Bc/pr9Pxi8L4S8c="; + + buildInputs = [ oracle-instantclient ]; + configureFlags = [ "--with-pdo-oci=instantclient,${oracle-instantclient.lib}/lib" ]; + + internalDeps = [ php.extensions.pdo ]; + postPatch = '' + sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${oracle-instantclient.dev}/include"|' config.m4 + ''; + + meta = { + changelog = "https://pecl.php.net/package-changelog.php?package=PDO_OCI"; + description = "The PHP PDO_OCI extension lets you access Oracle Database"; + license = lib.licenses.php301; + homepage = "https://pecl.php.net/package/pdo_oci"; + maintainers = lib.teams.php.members; + }; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 978c42a0d305..b7d13f2a9637 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -342,22 +342,26 @@ lib.makeScope pkgs.newScope ( pcov = callPackage ../development/php-packages/pcov { }; - pdo_oci = buildPecl rec { - inherit (php.unwrapped) src version; + pdo_oci = + if (lib.versionAtLeast php.version "8.4") then + callPackage ../development/php-packages/pdo_oci { } + else + buildPecl rec { + inherit (php.unwrapped) src version; - pname = "pdo_oci"; - sourceRoot = "php-${version}/ext/pdo_oci"; + pname = "pdo_oci"; + sourceRoot = "php-${version}/ext/pdo_oci"; - buildInputs = [ pkgs.oracle-instantclient ]; - configureFlags = [ "--with-pdo-oci=instantclient,${pkgs.oracle-instantclient.lib}/lib" ]; + buildInputs = [ pkgs.oracle-instantclient ]; + configureFlags = [ "--with-pdo-oci=instantclient,${pkgs.oracle-instantclient.lib}/lib" ]; - internalDeps = [ php.extensions.pdo ]; - postPatch = '' - sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 - ''; + internalDeps = [ php.extensions.pdo ]; + postPatch = '' + sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 + ''; - meta.maintainers = lib.teams.php.members; - }; + meta.maintainers = lib.teams.php.members; + }; pdo_sqlsrv = callPackage ../development/php-packages/pdo_sqlsrv { }; From 34a56602304b90ec7f242ebec133f5fb6051fd55 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 17 Feb 2025 22:09:45 +0100 Subject: [PATCH 0766/1107] php83: 8.3.16 -> 8.3.17 diff: https://github.com/php/php-src/compare/php-8.3.16..php-8.3.17 changelog: https://www.php.net/ChangeLog-8.php#8.3.17 --- pkgs/development/interpreters/php/8.3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix index 7b4b5c6d438b..4475da8d8940 100644 --- a/pkgs/development/interpreters/php/8.3.nix +++ b/pkgs/development/interpreters/php/8.3.nix @@ -4,8 +4,8 @@ let base = callPackage ./generic.nix ( _args // { - version = "8.3.16"; - hash = "sha256-6SCCGMvcuBaDS2xe2N3FdI+xL/d3z54OA7tIlidmCLY="; + version = "8.3.17"; + hash = "sha256-TgNNynqxb8YGLIxTBnUo9OyqJGvyIxDmhB9wCAlCZKw="; } ); in From e22c687f399091727b8f70341a76e593b4a8b39a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 17 Feb 2025 12:51:10 -0800 Subject: [PATCH 0767/1107] deltachat-desktop: 1.52.1 -> 1.54.1 Diff: https://github.com/deltachat/deltachat-desktop/compare/refs/tags/v1.52.1...v1.54.1 Changelog: https://github.com/deltachat/deltachat-desktop/blob/v1.54.1/CHANGELOG.md --- pkgs/by-name/de/deltachat-desktop/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix index 3cdbafdc33f0..966aaba0c1a3 100644 --- a/pkgs/by-name/de/deltachat-desktop/package.nix +++ b/pkgs/by-name/de/deltachat-desktop/package.nix @@ -1,6 +1,6 @@ { lib , copyDesktopItems -, electron_32 +, electron_34 , fetchFromGitHub , deltachat-rpc-server , makeDesktopItem @@ -19,36 +19,36 @@ let deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec { - version = "1.155.1"; + version = "1.155.5"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; tag = "v${version}"; - hash = "sha256-XZLKvOvdyvR5poRY/oo9MHi1f2XzBmSDR8VqjW3wq74="; + hash = "sha256-U0phIPkR4lt/WsCDt2TQv8NfjG04JdmCVDbMA1/ySdo="; }; cargoDeps = rustPlatform.fetchCargoVendor { pname = "deltachat-core-rust"; inherit version src; - hash = "sha256-ZxKR1M9wqmzKVbSdBKzTsKF9tDVRGHnd+Ra9Jy5CQQY="; + hash = "sha256-lkqBC/b128GSMpvAWpWmkrrf/E0twCDtDM1EBPOnp7Y="; }; }; - electron = electron_32; + electron = electron_34; pnpm = pnpm_9; in stdenv.mkDerivation (finalAttrs: { pname = "deltachat-desktop"; - version = "1.52.1"; + version = "1.54.1"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-L/dgdg7Yrosy054Jdo2ST3x37kQ+CHOEN92/YNjnTYc="; + hash = "sha256-mt0y7W16ThRYQNALFPBNcnR34MDqs6m3Vt+mYALqGs8="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-ovwdFpVFqXaGqsYc1ldhimqgdi0CXjQYMMMcmUXtMFc="; + hash = "sha256-/1utoiKw/BycWPuwWykcJniUw9kUGk/WtPCqqZu8E+U="; }; nativeBuildInputs = [ From 0358fbb538ff8ea0c8cad3edb3c93a9611122dfd Mon Sep 17 00:00:00 2001 From: merrkry Date: Mon, 17 Feb 2025 22:08:15 +0100 Subject: [PATCH 0768/1107] 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 12f61a1118d61b4c16a296c51767b2fb5642a60a Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Mon, 17 Feb 2025 21:10:16 +0000 Subject: [PATCH 0769/1107] protonplus: 0.4.23 -> 0.4.24 Diff: https://github.com/Vysp3r/ProtonPlus/compare/v0.4.23...v0.4.24 Changelog: https://github.com/Vysp3r/ProtonPlus/releases/tag/v0.4.24 --- pkgs/by-name/pr/protonplus/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/protonplus/package.nix b/pkgs/by-name/pr/protonplus/package.nix index 9e38380dbb2a..352fb91dfb21 100644 --- a/pkgs/by-name/pr/protonplus/package.nix +++ b/pkgs/by-name/pr/protonplus/package.nix @@ -20,13 +20,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "protonplus"; - version = "0.4.23"; + version = "0.4.24"; src = fetchFromGitHub { owner = "Vysp3r"; repo = "protonplus"; rev = "v${finalAttrs.version}"; - hash = "sha256-axVtURzMLPv+CgDJZj/TM4sfysW+GJWZ+MEe9Z6DhHE="; + hash = "sha256-nmwdXcd5V8gbq96Cen5494429JvKXgYBuQgCgMrhuWk="; }; nativeBuildInputs = [ From 43bb03239a2a277c28b9246ad6a04d13a5f690b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 17 Feb 2025 13:20:39 -0800 Subject: [PATCH 0770/1107] libdeltachat: 1.155.4 -> 1.155.6 Diff: https://github.com/deltachat/deltachat-core-rust/compare/refs/tags/v1.155.4...v1.155.6 Changelog: https://github.com/deltachat/deltachat-core-rust/blob/v1.155.6/CHANGELOG.md --- pkgs/by-name/li/libdeltachat/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index ba90468edaf9..cdf2886963fd 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.155.4"; + version = "1.155.6"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; tag = "v${version}"; - hash = "sha256-cSk3GK6jlFkZ7XckB9PKIYHyK1Yj1qoJvWDrlbRmrhw="; + hash = "sha256-d7EmmyLSJjFIZM1j6LP8f4WnXiptNTAqOdJD/oPL02Y="; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoVendor { pname = "deltachat-core-rust"; inherit version src; - hash = "sha256-+j6ENk6wvA3t2I2C8J2tOYJUVSS6s1Wa/8sDwGqF9Ho="; + hash = "sha256-E01aEzNi06LQntrlA+342a8Nl5API6v7HbdmuKpfajs="; }; nativeBuildInputs = [ From b8de31feded8d1c5dca4f2648c20fe0975961ba9 Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 17 Feb 2025 22:22:09 +0100 Subject: [PATCH 0771/1107] plausible: pin tailwindcss --- pkgs/servers/web-apps/plausible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/servers/web-apps/plausible/default.nix index bdf9b93b9a61..5ccaa0fa9566 100644 --- a/pkgs/servers/web-apps/plausible/default.nix +++ b/pkgs/servers/web-apps/plausible/default.nix @@ -9,7 +9,7 @@ nixosTests, npm-lockfile-fix, brotli, - tailwindcss, + tailwindcss_3, esbuild, ... }: @@ -141,7 +141,7 @@ beamPackages.mixRelease rec { cp -r ${tracker} tracker cat >> config/config.exs < Date: Mon, 17 Feb 2025 21:10:54 +0000 Subject: [PATCH 0772/1107] sydbox: 3.30.1 -> 3.32.2 Diff: https://gitlab.exherbo.org/sydbox/sydbox/-/compare/v3.32.2...v3.30.1 Changelog: https://gitlab.exherbo.org/sydbox/sydbox/-/blob/v3.32.2/ChangeLog.md --- pkgs/by-name/sy/sydbox/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/sydbox/package.nix b/pkgs/by-name/sy/sydbox/package.nix index 0f247a1c50b8..dd45b7f52c5d 100644 --- a/pkgs/by-name/sy/sydbox/package.nix +++ b/pkgs/by-name/sy/sydbox/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { pname = "sydbox"; - version = "3.30.1"; + version = "3.32.2"; outputs = [ "out" @@ -25,11 +25,11 @@ rustPlatform.buildRustPackage rec { owner = "Sydbox"; repo = "sydbox"; tag = "v${version}"; - hash = "sha256-Vby+2uSosp5yHc99lB2nMozMfsLowPunXuS30evKiZk="; + hash = "sha256-afuOpRRjUDYCIERSQzrVykrxc9bxRvUqU62aA/Z83VY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-1Em6ibjYXWnCIF1r7qS2uKvBAhb1klGjwrv9E6PTQCU="; + cargoHash = "sha256-NasGY1FTdO3EtnIkNcvntnR3aiCe0mUrVCBnwiNy7Bs="; nativeBuildInputs = [ mandoc From 27d6497ba9367e16173ce0a84b6809d108f0d0b9 Mon Sep 17 00:00:00 2001 From: Dionysis Grigoropoulos Date: Mon, 17 Feb 2025 23:34:03 +0200 Subject: [PATCH 0773/1107] python3Packages.rns: 0.9.1 -> 0.9.2 Diff: https://github.com/markqvist/Reticulum/compare/0.9.1...0.9.2 Changelog: https://github.com/markqvist/Reticulum/releases/tag/0.9.2 --- pkgs/development/python-modules/rns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index 89dccd77fdb8..5f7cdf8f5273 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "rns"; - version = "0.9.1"; + version = "0.9.2"; pyproject = true; src = fetchFromGitHub { owner = "markqvist"; repo = "Reticulum"; tag = version; - hash = "sha256-AR7JMvx5qWPFtMhotO2MlqKH5d/CcGOrvpaB031vTX8="; + hash = "sha256-BnR+gVcV4ul/z6Yoj4KFisBqGK0HOHfsisTNqLPrgF8="; }; patches = [ From c38c1d4897144cfaceb757f2fec03c368a66085c Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 17 Feb 2025 22:38:30 +0100 Subject: [PATCH 0774/1107] stalwart: pin tailwindcss --- pkgs/by-name/st/stalwart-mail/webadmin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stalwart-mail/webadmin.nix b/pkgs/by-name/st/stalwart-mail/webadmin.nix index cf7c06a17ead..53c44fa5d017 100644 --- a/pkgs/by-name/st/stalwart-mail/webadmin.nix +++ b/pkgs/by-name/st/stalwart-mail/webadmin.nix @@ -3,7 +3,7 @@ rustPlatform, fetchFromGitHub, trunk, - tailwindcss, + tailwindcss_3, fetchNpmDeps, nix-update-script, nodejs, @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { llvmPackages.bintools-unwrapped nodejs npmHooks.npmConfigHook - tailwindcss + tailwindcss_3 trunk # needs to match with wasm-bindgen version in upstreams Cargo.lock wasm-bindgen-cli_0_2_93 From 48afbbe751cadc291f9c3f17a57488e63b2cb203 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 21:39:55 +0000 Subject: [PATCH 0775/1107] python312Packages.docling-ibm-models: 3.3.0 -> 3.3.2 --- .../development/python-modules/docling-ibm-models/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docling-ibm-models/default.nix b/pkgs/development/python-modules/docling-ibm-models/default.nix index 660f009e55ec..86c1c595d7b1 100644 --- a/pkgs/development/python-modules/docling-ibm-models/default.nix +++ b/pkgs/development/python-modules/docling-ibm-models/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "docling-ibm-models"; - version = "3.3.0"; + version = "3.3.2"; pyproject = true; src = fetchFromGitHub { owner = "DS4SD"; repo = "docling-ibm-models"; tag = "v${version}"; - hash = "sha256-wxkHd+TCBibOTWO09JOsjX6oBtUxZ/9IOmyLdeptzeQ="; + hash = "sha256-8mqDgbTj5g6jXEumj16Me9NjHLCOdR+pXmAwn2dghfg="; }; build-system = [ From 561ac4c3e79508fea794979e9a1e830fd2de9ccd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 21:40:29 +0000 Subject: [PATCH 0776/1107] python312Packages.jpype1: 1.5.1 -> 1.5.2 --- pkgs/development/python-modules/jpype1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jpype1/default.nix b/pkgs/development/python-modules/jpype1/default.nix index 7449573ba014..9aed829e8900 100644 --- a/pkgs/development/python-modules/jpype1/default.nix +++ b/pkgs/development/python-modules/jpype1/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "jpype1"; - version = "1.5.1"; + version = "1.5.2"; pyproject = true; src = fetchFromGitHub { owner = "originell"; repo = "jpype"; tag = "v${version}"; - hash = "sha256-IMmMYlcTkOQ5P4FYTp1QmUY9AsnYhzJ3mcpgl52qImg="; + hash = "sha256-Q5/umU7JHiro+7YuC6nVG9ocpQ/Yc4LGa5+7SGGARTo="; }; build-system = [ setuptools ]; From cf4c8e97ad99b24d3169c8d7e012abbe8ea83a3f Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Mon, 17 Feb 2025 18:51:20 -0300 Subject: [PATCH 0777/1107] nixos/networkd: add new options introduced in systemd 257 The Wireguard public key can now be read from a file. Signed-off-by: Fernando Rodrigues --- nixos/modules/system/boot/networkd.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 6a63808cf2e4..1b0e220bd31f 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -437,6 +437,7 @@ let (assertKeyIsSystemdCredential "PresharedKey") (assertOnlyFields [ "PublicKey" + "PublicKeyFile" "PresharedKey" "PresharedKeyFile" "AllowedIPs" From 0d510780509fa3b9cae9b19f9a90030a8dd9dee6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 22:10:44 +0000 Subject: [PATCH 0778/1107] pkcs11-provider: 0.6 -> 1.0 --- pkgs/by-name/pk/pkcs11-provider/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pk/pkcs11-provider/package.nix b/pkgs/by-name/pk/pkcs11-provider/package.nix index 70f3f586cc3f..5fdac02fb126 100644 --- a/pkgs/by-name/pk/pkcs11-provider/package.nix +++ b/pkgs/by-name/pk/pkcs11-provider/package.nix @@ -22,14 +22,14 @@ let in stdenv.mkDerivation rec { pname = "pkcs11-provider"; - version = "0.6"; + version = "1.0"; src = fetchFromGitHub { owner = "latchset"; repo = "pkcs11-provider"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-wYqmxxAzraaVR2+mbsRfgyvD/tapn8UOO0UzBX2ZJH4="; + hash = "sha256-Q9dmzYDBco+LLVWdORFTjRyk0RX8qhmZ1m+Kgfeyr04="; }; buildInputs = [ From dc33239dc4804e210dff8ed0568abd4c91b8c4e4 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 17 Feb 2025 23:20:19 +0100 Subject: [PATCH 0779/1107] python312Packages.islpy: 2025.1.1 -> 2025.1.2 Diff: https://github.com/inducer/islpy/compare/refs/tags/v2025.1.1...v2025.1.2 Changelog: https://github.com/inducer/islpy/releases/tag/v2025.1.2 --- pkgs/development/python-modules/islpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix index 8a4a5b2ef4d4..f93936879ef9 100644 --- a/pkgs/development/python-modules/islpy/default.nix +++ b/pkgs/development/python-modules/islpy/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "islpy"; - version = "2025.1.1"; + version = "2025.1.2"; pyproject = true; src = fetchFromGitHub { owner = "inducer"; repo = "islpy"; tag = "v${version}"; - hash = "sha256-SCrEHz5gMPSfrgyPQcTf4k2YlzVs7WWdhgnw7U0Tv30="; + hash = "sha256-F+qF/pX/1rFZiDVK71FYNatWuVkcvl62+EriTHzAfHw="; }; build-system = [ From 7cdab27d09af5f92852afdaa74ba201c86a99782 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Tue, 18 Feb 2025 09:23:59 +1100 Subject: [PATCH 0780/1107] 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 6bb00cb366b81bb6677f2c30c4cde7800ecaa40b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 17 Feb 2025 23:24:45 +0100 Subject: [PATCH 0781/1107] python312Packages.treescope: 0.1.8 -> 0.1.9 Diff: https://github.com/google-deepmind/treescope/compare/refs/tags/v0.1.8...v0.1.9 Changelog: https://github.com/google-deepmind/treescope/releases/tag/v0.1.9 --- pkgs/development/python-modules/treescope/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/treescope/default.nix b/pkgs/development/python-modules/treescope/default.nix index 9694de2c4a86..aa889cc114aa 100644 --- a/pkgs/development/python-modules/treescope/default.nix +++ b/pkgs/development/python-modules/treescope/default.nix @@ -17,20 +17,22 @@ # tests absl-py, jaxlib, + omegaconf, + pydantic, pytestCheckHook, torch, }: buildPythonPackage rec { pname = "treescope"; - version = "0.1.8"; + version = "0.1.9"; pyproject = true; src = fetchFromGitHub { owner = "google-deepmind"; repo = "treescope"; tag = "v${version}"; - hash = "sha256-/rSQUmmfMPP7sZ6avd9bc4lSW/sHLXLEKKCJdXjBTB4="; + hash = "sha256-rLrsG7psY3xkuvNtdRULiMWKzIiWZpJ7TVJhwTNGXRQ="; }; build-system = [ flit-core ]; @@ -51,6 +53,8 @@ buildPythonPackage rec { absl-py jax jaxlib + omegaconf + pydantic pytestCheckHook torch ]; From 6a6222b5c59c9d0bb306565a92f005cae4b80b69 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 17 Feb 2025 22:36:21 +0000 Subject: [PATCH 0782/1107] mdbook: 0.4.44 -> 0.4.45 Changes: https://github.com/rust-lang/mdBook/blob/master/CHANGELOG.md#mdbook-0445 --- pkgs/by-name/md/mdbook/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/md/mdbook/package.nix b/pkgs/by-name/md/mdbook/package.nix index 899228ad4918..1a54785575a3 100644 --- a/pkgs/by-name/md/mdbook/package.nix +++ b/pkgs/by-name/md/mdbook/package.nix @@ -9,7 +9,7 @@ installShellFiles, }: let - version = "0.4.44"; + version = "0.4.45"; in rustPlatform.buildRustPackage rec { inherit version; @@ -19,13 +19,13 @@ rustPlatform.buildRustPackage rec { owner = "rust-lang"; repo = "mdBook"; tag = "v${version}"; - hash = "sha256-p3DzsK1LSAp9eBES8gNqLsjKrs426nPgQxSjOKCLpzY="; + hash = "sha256-LgjJUz1apE1MejVjl4/5O6ISpnGkBXY33g6xfoukZxA="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; allowGitDependencies = false; - hash = "sha256-ah/6sugq3fkgB2N6ZjXWCHVHhCY8z4zgq3jcobURdpk="; + hash = "sha256-+7fC6cq6NQIUPtmNc5S5y4lRIS47v0tg1ru/AAYA6TM="; }; nativeBuildInputs = [ installShellFiles ]; From f71056ce9a6faafa733335526bf31679d8c8e7e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 22:54:31 +0000 Subject: [PATCH 0783/1107] vscode-extensions.ms-dotnettools.csharp: 2.61.28 -> 2.63.32 --- .../extensions/ms-dotnettools.csharp/lockfile.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/lockfile.json b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/lockfile.json index 0807d5d30d5d..70521c0013e6 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/lockfile.json +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/lockfile.json @@ -1,7 +1,7 @@ { - "version": "2.61.28", + "version": "2.63.32", "linux-x64": { - "hash": "sha256-lyP/NCvpaVW8dbZp/8OS9qrBa7yuO4rTo8Wwo/7wD7g=", + "hash": "sha256-laI6zoydOKAkRHZvHXQ6eFEJoFrb2I2Fe6gvti3eoJg=", "binaries": [ ".debugger/createdump", ".debugger/vsdbg", @@ -11,7 +11,7 @@ ] }, "linux-arm64": { - "hash": "sha256-bZ5ABDh3MnO33MQEXhLlF4UVGTCrcj5pCYgQDS6AP58=", + "hash": "sha256-3XWSzNhPSoAUlVVe3RNQ/Ttxm4WIuWahH0hGd4FXFhw=", "binaries": [ ".debugger/createdump", ".debugger/vsdbg", @@ -21,7 +21,7 @@ ] }, "darwin-x64": { - "hash": "sha256-5yDTJp3GDb7HYAG9q8wvr4QKwjGJ214ifUjwxZMwIts=", + "hash": "sha256-TfI6XR2jCxKCNt3mNu+ndH3KqHctWK+JF52eNd+QaLQ=", "binaries": [ ".debugger/x86_64/createdump", ".debugger/x86_64/vsdbg", @@ -31,7 +31,7 @@ ] }, "darwin-arm64": { - "hash": "sha256-58fz7IFzYgvC9Eruz1JgF4/ftHQV4FGdcfOODlCmGBA=", + "hash": "sha256-SoTaPgFYuxilmXZ/QXrc8xrMa58u6HnmuhiNK9knfME=", "binaries": [ ".debugger/arm64/createdump", ".debugger/arm64/vsdbg", From c9377b15aadc81ed9ae071a5dcbaeb44cf311fad Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Tue, 18 Feb 2025 08:02:03 +0900 Subject: [PATCH 0784/1107] opcua-commander: fix build on darwin (#382748) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * opcua-commander: fix build on darwin * opcua-commander: prefer optionalString to construct CLI arguments https://github.com/NixOS/nixpkgs/pull/382748#discussion_r1958311936 Co-authored-by: Sandro Jäckel Co-authored-by: Kenichi Kamiya --------- Co-authored-by: Sandro Jäckel --- pkgs/by-name/op/opcua-commander/package.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/op/opcua-commander/package.nix b/pkgs/by-name/op/opcua-commander/package.nix index 31f00279f875..ac137b7fe184 100644 --- a/pkgs/by-name/op/opcua-commander/package.nix +++ b/pkgs/by-name/op/opcua-commander/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildNpmPackage, fetchFromGitHub, typescript, @@ -25,10 +26,18 @@ buildNpmPackage rec { makeWrapper ]; - postPatch = '' - substituteInPlace package.json \ - --replace-warn "npx -y esbuild" "esbuild" - ''; + postPatch = + let + esbuildPrefix = + "esbuild" + # Workaround for 'No loader is configured for ".node" files: node_modules/fsevents/fsevents.node' + # esbuild issue is https://github.com/evanw/esbuild/issues/1051 + + lib.optionalString stdenv.hostPlatform.isDarwin " --external:fsevents"; + in + '' + substituteInPlace package.json \ + --replace-fail 'npx -y esbuild' '${esbuildPrefix}' + ''; # We need to add `nodejs` to PATH for `opcua-commander` to properly work # when connected to an OPC-UA server. From 03801f460997bf3b1c9b11690d145ddb6bc5da15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 23:21:56 +0000 Subject: [PATCH 0785/1107] cargo-modules: 0.21.2 -> 0.22.0 --- pkgs/by-name/ca/cargo-modules/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-modules/package.nix b/pkgs/by-name/ca/cargo-modules/package.nix index 2a81fa8a2b9b..925e6dd75d94 100644 --- a/pkgs/by-name/ca/cargo-modules/package.nix +++ b/pkgs/by-name/ca/cargo-modules/package.nix @@ -6,17 +6,17 @@ }: rustPlatform.buildRustPackage rec { pname = "cargo-modules"; - version = "0.21.2"; + version = "0.22.0"; src = fetchFromGitHub { owner = "regexident"; repo = "cargo-modules"; tag = "v${version}"; - hash = "sha256-mrl1I1dmf2WqtUbBsUq3kgqPwc4S/EaYRc/B9hpEo90="; + hash = "sha256-dtL4vcNPtZc1FQ6LnlovXX0bQkyzkfhPDaJvf/SVmaU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-fg9w7jDoXJjdho8dHBItDp6O/6eU89eQMASYqTrUB2I="; + cargoHash = "sha256-Mc+fAb46JiS2wH1Ybksj75qHf6JU26NFrHUv/drca5k="; checkFlags = [ "--skip=cfg_test::with_tests::smoke" From 48c9e493f087eecec9b78a0318f0adb5df4cca88 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Tue, 18 Feb 2025 10:12:33 +1100 Subject: [PATCH 0786/1107] 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 7251e3875f7b7f4e5e8eafc0ffe401316b45a678 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Wed, 27 Nov 2024 11:43:03 +0000 Subject: [PATCH 0787/1107] =?UTF-8?q?apacheKafka:=203.8.0=20=E2=86=92=203.?= =?UTF-8?q?8.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/servers/apache-kafka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index 1e9435b8598f..bdb24ac39f0a 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -3,9 +3,9 @@ let versionMap = { "3_8" = { - kafkaVersion = "3.8.0"; + kafkaVersion = "3.8.1"; scalaVersion = "2.13"; - sha256 = "sha256-4Cl8xv2wnvnZkFdRsl0rYpwXUo+GKbYFYe7/h84pCZw="; + sha256 = "sha256-IhdChtYMqmKyVQbEhpRLxuBNjLLS8VCD0v60gjl3i2I="; jre = jdk17_headless; nixosTest = nixosTests.kafka.kafka_3_8; }; From 89e275f74740e0d462d5d275a0bea84847bdbb89 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Wed, 27 Nov 2024 11:51:11 +0000 Subject: [PATCH 0788/1107] apacheKafka: init at 3.9.0 --- nixos/tests/kafka.nix | 1 + pkgs/servers/apache-kafka/default.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix index 5390e9d7f79f..8d0eeee2e38e 100644 --- a/nixos/tests/kafka.nix +++ b/nixos/tests/kafka.nix @@ -106,6 +106,7 @@ in with pkgs; { kafka_3_6 = makeKafkaTest "kafka_3_6" { kafkaPackage = apacheKafka_3_6; }; kafka_3_7 = makeKafkaTest "kafka_3_7" { kafkaPackage = apacheKafka_3_7; }; kafka_3_8 = makeKafkaTest "kafka_3_8" { kafkaPackage = apacheKafka_3_8; }; + kafka_3_9 = makeKafkaTest "kafka_3_9" { kafkaPackage = apacheKafka_3_9; }; kafka = makeKafkaTest "kafka" { kafkaPackage = apacheKafka; }; kafka_kraft = makeKafkaTest "kafka_kraft" { kafkaPackage = apacheKafka; mode = "kraft"; }; } diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index bdb24ac39f0a..1968591c3c8b 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -2,6 +2,13 @@ let versionMap = { + "3_9" = { + kafkaVersion = "3.9.0"; + scalaVersion = "2.13"; + sha256 = "sha256-q8REAt3xA+OPGbDktE5l2pqDG6nlj9dyUEGxqhaO6NE="; + jre = jdk17_headless; + nixosTest = nixosTests.kafka.kafka_3_9; + }; "3_8" = { kafkaVersion = "3.8.1"; scalaVersion = "2.13"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c7573ce65fd..5f1dcd39d3d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7479,7 +7479,8 @@ with pkgs; inherit (callPackages ../servers/apache-kafka { }) apacheKafka_3_6 apacheKafka_3_7 - apacheKafka_3_8; + apacheKafka_3_8 + apacheKafka_3_9; apacheKafka = apacheKafka_3_8; From e28cde906f79288f7fc4558e91fb3c79f9bde2d2 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Wed, 27 Nov 2024 11:53:06 +0000 Subject: [PATCH 0789/1107] apacheKafka: drop 3.6 --- nixos/tests/kafka.nix | 1 - pkgs/servers/apache-kafka/default.nix | 7 ------- pkgs/top-level/aliases.nix | 3 ++- pkgs/top-level/all-packages.nix | 1 - 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix index 8d0eeee2e38e..416c0dcb8081 100644 --- a/nixos/tests/kafka.nix +++ b/nixos/tests/kafka.nix @@ -103,7 +103,6 @@ let }) { inherit system; }); in with pkgs; { - kafka_3_6 = makeKafkaTest "kafka_3_6" { kafkaPackage = apacheKafka_3_6; }; kafka_3_7 = makeKafkaTest "kafka_3_7" { kafkaPackage = apacheKafka_3_7; }; kafka_3_8 = makeKafkaTest "kafka_3_8" { kafkaPackage = apacheKafka_3_8; }; kafka_3_9 = makeKafkaTest "kafka_3_9" { kafkaPackage = apacheKafka_3_9; }; diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index 1968591c3c8b..6e31ee06ca0e 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -23,13 +23,6 @@ let jre = jdk17_headless; nixosTest = nixosTests.kafka.kafka_3_7; }; - "3_6" = { - kafkaVersion = "3.6.2"; - scalaVersion = "2.13"; - sha256 = "sha256-wxfkf3cUHTFG6VY9nLodZIbIHmcLIR7OasRqn3Lkqqw="; - jre = jdk17_headless; - nixosTest = nixosTests.kafka.kafka_3_6; - }; }; build = versionInfo: stdenv.mkDerivation rec { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1f24eadb8713..4b1296eab261 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -110,9 +110,10 @@ mapAliases { androidndkPkgs_23b = lib.warnOnInstantiate "The package set `androidndkPkgs_23b` has been renamed to `androidndkPkgs_23`." androidndkPkgs_23; # Added 2024-07-21 ankisyncd = throw "ankisyncd is dead, use anki-sync-server instead"; # Added 2024-08-10 ao = libfive; # Added 2024-10-11 - apacheKafka_3_5 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-06-13 anbox = throw "'anbox' has been removed as the upstream project is unmaintained, see https://github.com/anbox/.github/blob/main/profile/README.md"; # Added 2025-01-04 anevicon = throw "'anevicon' has been removed because the upstream repository no longer exists"; # Added 2025-01-26 + apacheKafka_3_5 = throw "apacheKafka_2_8 through _3_6 have been removed from nixpkgs as outdated"; # Added 2024-06-13 + apacheKafka_3_6 = throw "apacheKafka_2_8 through _3_6 have been removed from nixpkgs as outdated"; # Added 2024-11-27 antimicroX = throw "'antimicroX' has been renamed to/replaced by 'antimicrox'"; # Converted to throw 2024-10-17 apacheAnt = ant; # Added 2024-11-28 apple-sdk_10_12 = throw "apple-sdk_10_12 was removed as Nixpkgs no longer supports macOS 10.12; see the 25.05 release notes"; # Added 2024-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f1dcd39d3d5..067b644047bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7477,7 +7477,6 @@ with pkgs; antlr = antlr4; inherit (callPackages ../servers/apache-kafka { }) - apacheKafka_3_6 apacheKafka_3_7 apacheKafka_3_8 apacheKafka_3_9; From ef86ddbafdbf2b7ba3178b6acf2e34100464c377 Mon Sep 17 00:00:00 2001 From: Dillon Beliveau Date: Mon, 17 Feb 2025 15:50:14 -0800 Subject: [PATCH 0790/1107] 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 db8416a302be009f88602c1223bcc581367b2ca8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 19 Oct 2024 16:30:26 +0200 Subject: [PATCH 0791/1107] Revert "python312Packages.tempest: add missing pynacl checkInput to fix build" This reverts commit 284e618ce5b9f917ed435daa9bbc4e9407870484. --- pkgs/development/python-modules/tempest/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix index 1e9762bbaf0c..980165a6c29f 100644 --- a/pkgs/development/python-modules/tempest/default.nix +++ b/pkgs/development/python-modules/tempest/default.nix @@ -19,7 +19,6 @@ paramiko, pbr, prettytable, - pynacl, python, pythonOlder, pyyaml, @@ -75,7 +74,6 @@ buildPythonPackage rec { nativeCheckInputs = [ hacking oslotest - pynacl stestr ]; From 8a254de229d2d1ecfed4c36d33788774a820d4bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 19 Oct 2024 16:31:14 +0200 Subject: [PATCH 0792/1107] Revert "python312Packages.smart-open: add pynacl to checkInputs" This reverts commit a26a95a9a75c630a77796d4178c960ab8bd90dd8. --- pkgs/development/python-modules/smart-open/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/smart-open/default.nix b/pkgs/development/python-modules/smart-open/default.nix index 5bce34054cc9..14ab3f7d467b 100644 --- a/pkgs/development/python-modules/smart-open/default.nix +++ b/pkgs/development/python-modules/smart-open/default.nix @@ -11,7 +11,6 @@ requests, moto, paramiko, - pynacl, pytestCheckHook, responses, setuptools, @@ -57,7 +56,6 @@ buildPythonPackage rec { moto pytestCheckHook responses - pynacl ] ++ lib.flatten (lib.attrValues optional-dependencies); pytestFlagsArray = [ "smart_open" ]; From be2336e18b42773635e8cf556e0143a13dedf165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 19 Oct 2024 16:33:46 +0200 Subject: [PATCH 0793/1107] treewide: cleanup paramiko.optional-dependency.ed25519 --- pkgs/development/python-modules/docker/default.nix | 2 +- pkgs/development/python-modules/ncclient/default.nix | 2 +- pkgs/development/python-modules/sshtunnel/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 64b6c50be537..4698aa19f811 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { ]; optional-dependencies = { - ssh = [ paramiko paramiko.optional-dependencies.ed25519 ]; + ssh = [ paramiko ]; tls = []; websockets = [ websocket-client ]; }; diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix index 3f1d8462e7fd..cff31090db63 100644 --- a/pkgs/development/python-modules/ncclient/default.nix +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { paramiko lxml six - ] ++ paramiko.optional-dependencies.ed25519; + ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sshtunnel/default.nix b/pkgs/development/python-modules/sshtunnel/default.nix index ecb8e24d01a4..08d6bf114082 100644 --- a/pkgs/development/python-modules/sshtunnel/default.nix +++ b/pkgs/development/python-modules/sshtunnel/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = [ paramiko ] ++ paramiko.optional-dependencies.ed25519; + dependencies = [ paramiko ]; nativeCheckInputs = [ pytestCheckHook From 61a64eb13733a13520b6436719175349e69a9397 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 01:07:13 +0000 Subject: [PATCH 0794/1107] svu: 2.2.0 -> 3.0.0 --- pkgs/by-name/sv/svu/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sv/svu/package.nix b/pkgs/by-name/sv/svu/package.nix index 012adee06657..b85fa8ab748c 100644 --- a/pkgs/by-name/sv/svu/package.nix +++ b/pkgs/by-name/sv/svu/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "svu"; - version = "2.2.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "caarlos0"; repo = pname; rev = "v${version}"; - sha256 = "sha256-C5ATwRsi9hJBO9xFlyMDoxu97rJHwcKNToWhcmx6M6g="; + sha256 = "sha256-z+2H49fhi0X7rH1NvgOlkJFCrEftAMk5PA/qUUJIfmY="; }; - vendorHash = "sha256-/FSvNoVDWAkQs09gMrqyoA0su52nlk/nSCYRAhQhbwQ="; + vendorHash = "sha256-lqE5S13VQ7WLow6tXcFOWcK/dw7LvvEDpgRTQ8aJGeg="; ldflags = [ "-s" From ab44f18e2143c5af93c2b818388368ca5bb50a07 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 01:10:58 +0000 Subject: [PATCH 0795/1107] b3sum: 1.5.5 -> 1.6.0 --- pkgs/by-name/b3/b3sum/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/b3/b3sum/package.nix b/pkgs/by-name/b3/b3sum/package.nix index 93de50e805ed..12f7dc3c20ca 100644 --- a/pkgs/by-name/b3/b3sum/package.nix +++ b/pkgs/by-name/b3/b3sum/package.nix @@ -6,15 +6,15 @@ rustPlatform.buildRustPackage rec { pname = "b3sum"; - version = "1.5.5"; + version = "1.6.0"; src = fetchCrate { inherit version pname; - hash = "sha256-PgtQc8rwIbiHAue323POh15png7DerZbCuAKLi+jEYE="; + hash = "sha256-nsixj/zskHNIkv/qiD1DvrjeqkzVuN76tH+vCLGvPW8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-4RD6GcBGUHMXS8BYs1NqpR3fVul2J3qh5E4MFnMbwoE="; + cargoHash = "sha256-HAbL/3StlK+VlonoviB2hFxCj7oyG93ReUytE3pFOMQ="; meta = { description = "BLAKE3 cryptographic hash function"; From 02ad387f0d6b6d6c79ec907077fe82c5543648b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 01:12:01 +0000 Subject: [PATCH 0796/1107] 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 0797/1107] 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 0798/1107] 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 0799/1107] 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 2a349d9d3854bffe62fe0208feadc0d0af7221ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 01:42:06 +0000 Subject: [PATCH 0800/1107] civo: 1.1.95 -> 1.1.97 --- pkgs/by-name/ci/civo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ci/civo/package.nix b/pkgs/by-name/ci/civo/package.nix index 8b2729ca6998..66b9dc84160d 100644 --- a/pkgs/by-name/ci/civo/package.nix +++ b/pkgs/by-name/ci/civo/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "civo"; - version = "1.1.95"; + version = "1.1.97"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - hash = "sha256-/byI9QFxkCiyVvxF0K1RjK5xW4EE8l/+LqqKy9GW1Pw="; + hash = "sha256-0BIvKzG+ePN4VyXPj4VfCoZiq/pDZb9/7k/kTIa4Fqs="; }; - vendorHash = "sha256-ZylfnOeS6tXYaBbXg5znus6CKE+IZXmPSOc9UwYtscc="; + vendorHash = "sha256-V1R5MQ3y8mcm8ffc2INKk6BTYUROEvr8lHBs6MvbpkQ="; nativeBuildInputs = [ installShellFiles ]; From 99fb5230c6d1ef31ee47109c6b1fc178e5a9a4c8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 Feb 2025 02:46:53 +0100 Subject: [PATCH 0801/1107] python313Packages.esphome-glyphsets: init at 0.1.0 --- .../esphome-glyphsets/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/esphome-glyphsets/default.nix diff --git a/pkgs/development/python-modules/esphome-glyphsets/default.nix b/pkgs/development/python-modules/esphome-glyphsets/default.nix new file mode 100644 index 000000000000..faa4c5663464 --- /dev/null +++ b/pkgs/development/python-modules/esphome-glyphsets/default.nix @@ -0,0 +1,34 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, +}: + +buildPythonPackage rec { + pname = "esphome-glyphsets"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "esphome"; + repo = "esphome-glyphsets"; + tag = "v${version}"; + hash = "sha256-kST2AsZRWZrVmInUNN153+FOXa/t9vbHN3hAReKQJaU="; + fetchSubmodules = true; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ + "esphome_glyphsets" + ]; + + meta = { + description = "A lightweight version of glyphsets for ESPHome"; + homepage = "https://github.com/esphome/esphome-glyphsets"; + changelog = "https://github.com/esphome/esphome-glyphsets/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index af53309e3a83..333f70755e08 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4275,6 +4275,8 @@ self: super: with self; { esphome-dashboard-api = callPackage ../development/python-modules/esphome-dashboard-api { }; + esphome-glyphsets = callPackage ../development/python-modules/esphome-glyphsets { }; + esprima = callPackage ../development/python-modules/esprima { }; escapism = callPackage ../development/python-modules/escapism { }; From abacc56123bb7ca3a0a33472e61bad12c0a089db Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 Feb 2025 03:04:36 +0100 Subject: [PATCH 0802/1107] python313Packages.aioesphomeapi: 29.0.0 -> 29.1.0 https://github.com/esphome/aioesphomeapi/releases/tag/v29.1.0 --- .../python-modules/aioesphomeapi/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 374123cb8239..c6f618b22e88 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "29.0.0"; + version = "29.1.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "esphome"; repo = "aioesphomeapi"; tag = "v${version}"; - hash = "sha256-1H6+/V87mjkBvHwPTs3sgrqY24Gc/MCKb97r2ly6oTA="; + hash = "sha256-/4/FNb6lGlitsAzO0OadWqP02Wx+mnlrA6yzXFm72sg="; }; build-system = [ @@ -62,17 +62,13 @@ buildPythonPackage rec { ]; disabledTests = [ - # https://github.com/esphome/aioesphomeapi/issues/837 - "test_reconnect_logic_stop_callback" - # python3.12.4 regression - # https://github.com/esphome/aioesphomeapi/issues/889 - "test_start_connection_cannot_increase_recv_buffer" - "test_start_connection_can_only_increase_buffer_size_to_262144" + # https://github.com/esphome/aioesphomeapi/pull/1081 + "test_request_while_handshaking" ]; disabledTestPaths = [ # benchmarking requires pytest-codespeed - "tests/test_bluetooth_benchmarks.py" + "tests/benchmarks" ]; pythonImportsCheck = [ "aioesphomeapi" ]; From bd5db2abed4198a58f489b6dccdb274f63bfa304 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 17 Feb 2025 21:01:53 -0600 Subject: [PATCH 0803/1107] 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 9e6de4ab6d1b85e1faf5bf9ebdd29a071ccc0b47 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Mon, 17 Feb 2025 22:11:40 -0500 Subject: [PATCH 0804/1107] tailwindcss: revert back to v3 as default v4 is too much of a breaking change at this point, including other packages in tree --- pkgs/by-name/ta/tailwindcss/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ta/tailwindcss/package.nix b/pkgs/by-name/ta/tailwindcss/package.nix index e981f68a88e5..2c945ebfeadb 100644 --- a/pkgs/by-name/ta/tailwindcss/package.nix +++ b/pkgs/by-name/ta/tailwindcss/package.nix @@ -1 +1 @@ -{ tailwindcss_4 }: tailwindcss_4 +{ tailwindcss_3 }: tailwindcss_3 From 23a1c8add3b5a89087ac0182f5124f4d7d8f2496 Mon Sep 17 00:00:00 2001 From: Katherine Jamison Date: Mon, 17 Feb 2025 20:15:36 -0700 Subject: [PATCH 0805/1107] linuxKernel.kernels.linux_{lqx,zen}: add axertheaxe as maintainer --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index b3c123022de9..fc5c2ab5b2f4 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -140,6 +140,7 @@ let maintainers = with lib.maintainers; [ thiagokokada jerrysm64 + axertheaxe ]; description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads." From f1a30b68d22edbe7fbaacbb4cef312d041781600 Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Tue, 18 Feb 2025 03:17:23 +0000 Subject: [PATCH 0806/1107] 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 0807/1107] 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 a2b85d4ef550b8dd77b04ee58769114f674b5c4d Mon Sep 17 00:00:00 2001 From: Mutsuha Asada Date: Tue, 14 Jan 2025 15:25:54 +0900 Subject: [PATCH 0808/1107] ocamlPackages.bitv: 1.3 -> 2.0 Changelog: https://github.com/backtracking/bitv/releases/tag/2.0 Diff: https://github.com/backtracking/bitv/compare/1.3...2.0 --- .../ocaml-modules/bitv/default.nix | 54 +++++++------------ 1 file changed, 19 insertions(+), 35 deletions(-) diff --git a/pkgs/development/ocaml-modules/bitv/default.nix b/pkgs/development/ocaml-modules/bitv/default.nix index 6b9325dc0c52..fa8444261740 100644 --- a/pkgs/development/ocaml-modules/bitv/default.nix +++ b/pkgs/development/ocaml-modules/bitv/default.nix @@ -1,42 +1,26 @@ { - stdenv, lib, fetchFromGitHub, - autoreconfHook, - which, - ocaml, - findlib, + buildDunePackage, }: -if lib.versionOlder ocaml.version "4.02" then - throw "bitv is not available for OCaml ${ocaml.version}" -else +buildDunePackage rec { + pname = "bitv"; + version = "2.0"; + minimalOCamlVersion = "4.08"; - stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-bitv"; - version = "1.3"; + src = fetchFromGitHub { + owner = "backtracking"; + repo = "bitv"; + tag = version; + hash = "sha256-llfbdrvxrz6323G2LBAtKaXOrHQriFzaz3ulvFVhH6s="; + }; - src = fetchFromGitHub { - owner = "backtracking"; - repo = "bitv"; - rev = version; - sha256 = "sha256-sZwq6c10hBBS9tGvKlWD9GE3JBrZPByfDrXE6xIPcG4="; - }; - - nativeBuildInputs = [ - autoreconfHook - which - ocaml - findlib - ]; - - createFindlibDestdir = true; - - meta = { - description = "Bit vector library for OCaml"; - license = lib.licenses.lgpl21; - homepage = "https://github.com/backtracking/bitv"; - maintainers = [ lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; - }; - } + meta = { + description = "Bit vector library for OCaml"; + license = lib.licenses.lgpl21; + homepage = "https://github.com/backtracking/bitv"; + changelog = "https://github.com/backtracking/bitv/releases/tag/${version}"; + maintainers = [ lib.maintainers.vbgl ]; + }; +} From eb230c2cc2c8eff41c8273e1272f2c4ff4993a1b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 03:56:17 +0000 Subject: [PATCH 0809/1107] troubadix: 25.1.4 -> 25.2.0 --- pkgs/by-name/tr/troubadix/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tr/troubadix/package.nix b/pkgs/by-name/tr/troubadix/package.nix index 196591366b29..72451431393e 100644 --- a/pkgs/by-name/tr/troubadix/package.nix +++ b/pkgs/by-name/tr/troubadix/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "troubadix"; - version = "25.1.4"; + version = "25.2.0"; pyproject = true; src = fetchFromGitHub { owner = "greenbone"; repo = "troubadix"; tag = "v${version}"; - hash = "sha256-AMvYjspaLxqxq/6Nb5KMMfwWMhXfeB8NHWeveGNsWQY="; + hash = "sha256-pNxQOoh4vRme8ORlyN+ZqtpPTeTG5Yh5nm14jOo8MFc="; }; pythonRelaxDeps = [ @@ -55,7 +55,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Linting tool for NASL files"; homepage = "https://github.com/greenbone/troubadix"; - changelog = "https://github.com/greenbone/troubadix/releases/tag/v${version}"; + changelog = "https://github.com/greenbone/troubadix/releases/tag/${src.tag}"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; mainProgram = "troubadix"; From 13d9b32d2bc54b0244c411e6ec8b392e559853fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 04:11:11 +0000 Subject: [PATCH 0810/1107] terraform-providers.harbor: 3.10.18 -> 3.10.19 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b0f2b6a05f6a..67e4ec75751b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -552,13 +552,13 @@ "vendorHash": null }, "harbor": { - "hash": "sha256-FSuJ8upRnDny9Rjf+hS+Kd6e3YcuqYRMfwMwseHNlfo=", + "hash": "sha256-s3tmPNzaiSnUqOpg1luj2M5pZMfbfw98XDJfwXatoM4=", "homepage": "https://registry.terraform.io/providers/goharbor/harbor", "owner": "goharbor", "repo": "terraform-provider-harbor", - "rev": "v3.10.18", + "rev": "v3.10.19", "spdx": "MIT", - "vendorHash": "sha256-YkTXwx3RjIbzJnagfcYgb5IRnF0sHEDBDzdHf+GS8xI=" + "vendorHash": "sha256-qDyMoIfWE1m1+edu6Y7L9gfGVH+GdmVVjQQDet3nu1g=" }, "hcloud": { "hash": "sha256-nkp4XTFRBSxqRAURL0O4H/l7oDF/OEXmew0MkmyQryc=", 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 0811/1107] 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 0812/1107] 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 3452fcb15f63a5b6f0b2cee3a8366af59563f8d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 18 Feb 2025 04:38:16 +0000 Subject: [PATCH 0813/1107] devenv: 1.4 -> 1.4.1 --- pkgs/by-name/de/devenv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix index 6e64ccf592e2..d3ebaef3882a 100644 --- a/pkgs/by-name/de/devenv/package.nix +++ b/pkgs/by-name/de/devenv/package.nix @@ -27,7 +27,7 @@ let doInstallCheck = false; }); - version = "1.4"; + version = "1.4.1"; in rustPlatform.buildRustPackage { pname = "devenv"; @@ -37,11 +37,11 @@ rustPlatform.buildRustPackage { owner = "cachix"; repo = "devenv"; rev = "v${version}"; - hash = "sha256-ax0264nOyPcTJvIJAnPKGfkfXQ8Oe8ZVFziKf3UV26o="; + hash = "sha256-OjdnHKQ+eWA8YvPUpl3xxyaNK91c9sMebqXgVdN8Lm4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-K06D4tD3IOCA7/iqQ7fhybsgcSmMxPUcoUi+VNPtgAY="; + cargoHash = "sha256-Z7xf1fuXi2Lx005rQwWa7ZNw8nJGz1z33KPnX/pxO3E="; buildAndTestSubdir = "devenv"; From 814ecdf1a43cf3b88a0a934c9af31c2b8d24bbc4 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 11 Feb 2025 07:21:29 +0100 Subject: [PATCH 0814/1107] =?UTF-8?q?ocamlPackages.js=5Fof=5Focaml:=205.9.?= =?UTF-8?q?1=20=E2=86=92=206.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/ctypes_stubs_js/default.nix | 8 ++++++-- .../ocaml-modules/gen_js_api/ojs.nix | 1 - .../ocaml-modules/janestreet/0.15.nix | 10 ++++++++++ .../ocaml-modules/janestreet/0.16.nix | 10 ++++++++++ .../ocaml-modules/janestreet/0.17.nix | 10 ++++++++++ .../tools/ocaml/js_of_ocaml/compiler.nix | 3 ++- .../development/tools/ocaml/js_of_ocaml/lwt.nix | 5 +---- .../development/tools/ocaml/js_of_ocaml/ppx.nix | 7 ++----- .../ocaml/js_of_ocaml/ppx_deriving_json.nix | 5 +---- .../tools/ocaml/js_of_ocaml/tyxml.nix | 5 +---- pkgs/top-level/ocaml-packages.nix | 17 +++++++++++++++-- 11 files changed, 58 insertions(+), 23 deletions(-) diff --git a/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix b/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix index 2b4ce1472e94..d80c1c5f3d10 100644 --- a/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix +++ b/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix @@ -14,7 +14,6 @@ buildDunePackage rec { pname = "ctypes_stubs_js"; version = "0.1"; - duneVersion = "3"; minimalOCamlVersion = "4.08"; src = fetchFromGitLab { @@ -27,7 +26,12 @@ buildDunePackage rec { propagatedBuildInputs = [ integers_stubs_js ]; nativeCheckInputs = [ nodejs - js_of_ocaml-compiler + ( + if lib.versionAtLeast js_of_ocaml-compiler.version "6.0" then + js_of_ocaml-compiler.override { version = "5.9.1"; } + else + js_of_ocaml-compiler + ) ]; checkInputs = [ ctypes diff --git a/pkgs/development/ocaml-modules/gen_js_api/ojs.nix b/pkgs/development/ocaml-modules/gen_js_api/ojs.nix index 7a77574be7e7..0d64ef2d2250 100644 --- a/pkgs/development/ocaml-modules/gen_js_api/ojs.nix +++ b/pkgs/development/ocaml-modules/gen_js_api/ojs.nix @@ -8,7 +8,6 @@ buildDunePackage rec { pname = "ojs"; inherit (gen_js_api) version src; - duneVersion = "3"; propagatedBuildInputs = [ js_of_ocaml-compiler ]; diff --git a/pkgs/development/ocaml-modules/janestreet/0.15.nix b/pkgs/development/ocaml-modules/janestreet/0.15.nix index 49c28ae5381b..a56a58865cfa 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.15.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.15.nix @@ -9,6 +9,16 @@ zstd, }: +let + js_of_ocaml-compiler = self.js_of_ocaml-compiler.override { version = "5.9.1"; }; + js_of_ocaml = self.js_of_ocaml.override { inherit js_of_ocaml-compiler; }; + gen_js_api = self.gen_js_api.override { + inherit js_of_ocaml-compiler; + ojs = self.ojs.override { inherit js_of_ocaml-compiler; }; + }; + js_of_ocaml-ppx = self.js_of_ocaml-ppx.override { inherit js_of_ocaml; }; +in + with self; { diff --git a/pkgs/development/ocaml-modules/janestreet/0.16.nix b/pkgs/development/ocaml-modules/janestreet/0.16.nix index 74e8b2c9a62a..60358dc4f574 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.16.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.16.nix @@ -9,6 +9,16 @@ krb5, }: +let + js_of_ocaml-compiler = self.js_of_ocaml-compiler.override { version = "5.9.1"; }; + js_of_ocaml = self.js_of_ocaml.override { inherit js_of_ocaml-compiler; }; + gen_js_api = self.gen_js_api.override { + inherit js_of_ocaml-compiler; + ojs = self.ojs.override { inherit js_of_ocaml-compiler; }; + }; + js_of_ocaml-ppx = self.js_of_ocaml-ppx.override { inherit js_of_ocaml; }; +in + with self; { diff --git a/pkgs/development/ocaml-modules/janestreet/0.17.nix b/pkgs/development/ocaml-modules/janestreet/0.17.nix index 8e43fde337bf..f4a515c58f54 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.17.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.17.nix @@ -8,6 +8,16 @@ zstd, }: +let + js_of_ocaml-compiler = self.js_of_ocaml-compiler.override { version = "5.9.1"; }; + js_of_ocaml = self.js_of_ocaml.override { inherit js_of_ocaml-compiler; }; + gen_js_api = self.gen_js_api.override { + inherit js_of_ocaml-compiler; + ojs = self.ojs.override { inherit js_of_ocaml-compiler; }; + }; + js_of_ocaml-ppx = self.js_of_ocaml-ppx.override { inherit js_of_ocaml; }; +in + with self; { diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index b1855a49d133..61792e7e2cd4 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -10,7 +10,7 @@ menhir, menhirLib, sedlex, - version ? if lib.versionAtLeast ocaml.version "4.11" then "5.9.1" else "5.8.2", + version ? if lib.versionAtLeast ocaml.version "4.11" then "6.0.1" else "5.8.2", }: buildDunePackage { @@ -22,6 +22,7 @@ buildDunePackage { url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz"; hash = { + "6.0.1" = "sha256-gT2+4rYuFUEEnqI6IOQFzyROJ+v6mFl4XPpT4obSxhQ="; "5.9.1" = "sha256-aMlcYIcdjpyaVMgvNeLtUEE7y0QPIg0LNRayoe4ccwc="; "5.8.2" = "sha256-ciAZS9L5sU2VgVOlogZ1A1nXtJ3hL+iNdFDThc7L8Eo="; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix index ebbd742549e1..c05039ce967e 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix @@ -1,6 +1,5 @@ { buildDunePackage, - js_of_ocaml-compiler, js_of_ocaml-ppx, js_of_ocaml, lwt, @@ -10,7 +9,7 @@ buildDunePackage { pname = "js_of_ocaml-lwt"; - inherit (js_of_ocaml-compiler) version src; + inherit (js_of_ocaml) version src meta; buildInputs = [ js_of_ocaml-ppx ]; @@ -19,6 +18,4 @@ buildDunePackage { lwt lwt_log ]; - - meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ]; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix index 959567ad612a..bf9310a7c620 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix @@ -1,17 +1,14 @@ { buildDunePackage, - js_of_ocaml-compiler, - ppxlib, js_of_ocaml, + ppxlib, }: buildDunePackage { pname = "js_of_ocaml-ppx"; - inherit (js_of_ocaml-compiler) version src; + inherit (js_of_ocaml) version src meta; buildInputs = [ js_of_ocaml ]; propagatedBuildInputs = [ ppxlib ]; - - meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ]; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix index 7239ae3cd75c..17efff930fb2 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix @@ -1,6 +1,5 @@ { buildDunePackage, - js_of_ocaml-compiler, js_of_ocaml, ppxlib, }: @@ -8,12 +7,10 @@ buildDunePackage { pname = "js_of_ocaml-ppx_deriving_json"; - inherit (js_of_ocaml-compiler) version src; + inherit (js_of_ocaml) version src meta; propagatedBuildInputs = [ js_of_ocaml ppxlib ]; - - meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ]; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix index 1124e700e685..57a7e132e877 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix @@ -1,6 +1,5 @@ { buildDunePackage, - js_of_ocaml-compiler, js_of_ocaml-ppx, js_of_ocaml, reactivedata, @@ -10,7 +9,7 @@ buildDunePackage { pname = "js_of_ocaml-tyxml"; - inherit (js_of_ocaml-compiler) version src; + inherit (js_of_ocaml) version src meta; buildInputs = [ js_of_ocaml-ppx ]; @@ -19,6 +18,4 @@ buildDunePackage { reactivedata tyxml ]; - - meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ]; } diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 9eff14a8fea6..73a1ce489819 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -460,7 +460,15 @@ let stdenv = pkgs.gcc13Stdenv; }; - eliom = callPackage ../development/ocaml-modules/eliom { }; + eliom = let + js_of_ocaml-compiler = self.js_of_ocaml-compiler.override { version = "5.9.1"; }; + js_of_ocaml = self.js_of_ocaml.override { inherit js_of_ocaml-compiler; }; + in callPackage ../development/ocaml-modules/eliom rec { + js_of_ocaml-ppx = self.js_of_ocaml-ppx.override { inherit js_of_ocaml; }; + js_of_ocaml-ppx_deriving_json = self.js_of_ocaml-ppx_deriving_json.override { inherit js_of_ocaml; }; + js_of_ocaml-lwt = self.js_of_ocaml-lwt.override { inherit js_of_ocaml js_of_ocaml-ppx; }; + js_of_ocaml-tyxml = self.js_of_ocaml-tyxml.override { inherit js_of_ocaml js_of_ocaml-ppx; }; + }; elpi = callPackage ../development/ocaml-modules/elpi ( let ppxlib_0_15 = if lib.versionAtLeast ppxlib.version "0.15" @@ -1425,7 +1433,12 @@ let ocsigen-start = callPackage ../development/ocaml-modules/ocsigen-start { }; - ocsigen-toolkit = callPackage ../development/ocaml-modules/ocsigen-toolkit { }; + ocsigen-toolkit = let + js_of_ocaml-compiler = self.js_of_ocaml-compiler.override { version = "5.9.1"; }; + js_of_ocaml = self.js_of_ocaml.override { inherit js_of_ocaml-compiler; }; + in callPackage ../development/ocaml-modules/ocsigen-toolkit { + js_of_ocaml-ppx_deriving_json = self.js_of_ocaml-ppx_deriving_json.override { inherit js_of_ocaml; }; + }; ocsipersist = callPackage ../development/ocaml-modules/ocsipersist {}; From f499509e8ade914c9377bfb775492130d9e27491 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 05:05:28 +0000 Subject: [PATCH 0815/1107] vscode-extensions.ms-dotnettools.csdevkit: 1.15.34 -> 1.16.6 --- .../extensions/ms-dotnettools.csdevkit/lockfile.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/lockfile.json b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/lockfile.json index 9e8262714b99..0907b601296f 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/lockfile.json +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/lockfile.json @@ -1,7 +1,7 @@ { - "version": "1.15.34", + "version": "1.16.6", "linux-x64": { - "hash": "sha256-QoITLhgIYcoYpYzDqvss+aSh0/ZQc9V6+QSSBRGg1wc=", + "hash": "sha256-/ONaevRlpGc4xaYr9vV8maZUP3HbjmgUk/AbXAJM4tg=", "binaries": [ "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/servicehub-controller-net60.linux-x64/Microsoft.ServiceHub.Controller", "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/visualstudio-code-servicehost.linux-x64/Microsoft.VisualStudio.Code.ServiceHost", @@ -10,7 +10,7 @@ ] }, "linux-arm64": { - "hash": "sha256-aluG7CfqG5CNKG7FZqdp5vNa9bZ+OYQa5y7JoVvCSh0=", + "hash": "sha256-yhzozbnTsAddbx0Hior/DnN+vjRFWtIW8Z4zu1xfrhY=", "binaries": [ "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/servicehub-controller-net60.linux-arm64/Microsoft.ServiceHub.Controller", "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/visualstudio-code-servicehost.linux-arm64/Microsoft.VisualStudio.Code.ServiceHost", @@ -19,7 +19,7 @@ ] }, "darwin-x64": { - "hash": "sha256-nm3qEpVfzpVhZCrCtrjYSYNDCSGmmIE/uufh/n6yZ+M=", + "hash": "sha256-PZwhzd9yVAJiVz5g7ogICUIgwJvS2MyGQMZbNN+7QRM=", "binaries": [ "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/servicehub-controller-net60.darwin-x64/Microsoft.ServiceHub.Controller", "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/visualstudio-code-servicehost.darwin-x64/Microsoft.VisualStudio.Code.ServiceHost", @@ -28,7 +28,7 @@ ] }, "darwin-arm64": { - "hash": "sha256-1AHY13x77au2MjUEKbzuIyukKXLwmEYZwh4sFyApcbI=", + "hash": "sha256-iR0jJnkcA12+CJUI0ECrRSR2+j2emtfmLt2Uz4ke7YY=", "binaries": [ "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/servicehub-controller-net60.darwin-arm64/Microsoft.ServiceHub.Controller", "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/visualstudio-code-servicehost.darwin-arm64/Microsoft.VisualStudio.Code.ServiceHost", From bc7ba2fc707371c9094d63653dee2ebb13aef5c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 05:21:42 +0000 Subject: [PATCH 0816/1107] codeql: 2.20.3 -> 2.20.4 --- pkgs/by-name/co/codeql/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/codeql/package.nix b/pkgs/by-name/co/codeql/package.nix index b90ec95819a5..b6f2e05c4337 100644 --- a/pkgs/by-name/co/codeql/package.nix +++ b/pkgs/by-name/co/codeql/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.20.3"; + version = "2.20.4"; dontConfigure = true; dontBuild = true; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - hash = "sha256-J5zPIfQz1RRCLfer1gL/5ZbLT/Wb+SUTUWF2pMyvdxk="; + hash = "sha256-oxqprZwPW6qwp3ilPhtQ+cxXeyzC4xZm9L9bkiFgxys="; }; nativeBuildInputs = [ From ba021c0fdce659d4fee8ad6e85fdeb9f878d6f0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 05:25:46 +0000 Subject: [PATCH 0817/1107] 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 0818/1107] 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 7df22f33ab420638c01a359fa91464de13d0a619 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 05:40:55 +0000 Subject: [PATCH 0819/1107] louvre: 2.14.0-1 -> 2.14.1-1 --- pkgs/by-name/lo/louvre/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lo/louvre/package.nix b/pkgs/by-name/lo/louvre/package.nix index 248e5c634ea9..3fa3286b7182 100644 --- a/pkgs/by-name/lo/louvre/package.nix +++ b/pkgs/by-name/lo/louvre/package.nix @@ -24,13 +24,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "louvre"; - version = "2.14.0-1"; + version = "2.14.1-1"; src = fetchFromGitHub { owner = "CuarzoSoftware"; repo = "Louvre"; rev = "v${finalAttrs.version}"; - hash = "sha256-2qFtgKOqTBPTKiZ5/RuQEUK8GPwm9Nv8bc7+y+3+0Ow="; + hash = "sha256-fZ9lH7kfp++YONI3Kr4fJX1SsemhoJGdgz6eEeHKA6Q="; }; sourceRoot = "${finalAttrs.src.name}/src"; From d56454fe0b9a25fee5fd092a152bc0fed889bfa7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 06:13:39 +0000 Subject: [PATCH 0820/1107] 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 fd786ff3805efea7611eca20d4fff2a13cd79117 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 18 Feb 2025 01:16:19 -0500 Subject: [PATCH 0821/1107] rivet: move to pkgs/by-name --- .../default.nix => by-name/ri/rivet/package.nix} | 14 +++++++------- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 7 insertions(+), 11 deletions(-) rename pkgs/{development/libraries/physics/rivet/default.nix => by-name/ri/rivet/package.nix} (90%) diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/by-name/ri/rivet/package.nix similarity index 90% rename from pkgs/development/libraries/physics/rivet/default.nix rename to pkgs/by-name/ri/rivet/package.nix index adf5ae595efe..cb7ceda22827 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/by-name/ri/rivet/package.nix @@ -5,10 +5,10 @@ fastjet, fastjet-contrib, ghostscript, + graphicsmagick-imagemagick-compat, hdf5, hepmc3, highfive, - imagemagick, less, pkg-config, python3, @@ -52,9 +52,9 @@ stdenv.mkDerivation rec { pkg-config ]; buildInputs = [ + graphicsmagick-imagemagick-compat hepmc3 highfive - imagemagick python3 latex python3.pkgs.yoda @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { --replace-fail '"ps2pdf"' '"${ghostscript}/bin/ps2pdf"' \ --replace-fail '"ps2eps"' '"${ghostscript}/bin/ps2eps"' \ --replace-fail '"kpsewhich"' '"'$latex'/bin/kpsewhich"' \ - --replace-fail '"convert"' '"${imagemagick.out}/bin/convert"' + --replace-fail '"convert"' '"${graphicsmagick-imagemagick-compat.out}/bin/convert"' substituteInPlace bin/rivet \ --replace-fail '"less"' '"${less}/bin/less"' substituteInPlace bin/rivet-mkhtml-tex \ @@ -109,11 +109,11 @@ stdenv.mkDerivation rec { done ''; - meta = with lib; { + meta = { description = "Framework for comparison of experimental measurements from high-energy particle colliders to theory predictions"; - license = licenses.gpl3; + license = lib.licenses.gpl3; homepage = "https://rivet.hepforge.org"; - platforms = platforms.unix; - maintainers = with maintainers; [ veprbl ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ veprbl ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb69df388926..e289c52ded44 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17364,10 +17364,6 @@ with pkgs; hepmc = hepmc2; }; - rivet = callPackage ../development/libraries/physics/rivet { - imagemagick = graphicsmagick-imagemagick-compat; - }; - yoda-with-root = lowPrio (yoda.override { withRootSupport = true; }); From 57d25df9911d56a0d0b358c9f957ab5108c2df25 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 06:27:10 +0000 Subject: [PATCH 0822/1107] allure: 2.32.1 -> 2.32.2 --- pkgs/by-name/al/allure/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/allure/package.nix b/pkgs/by-name/al/allure/package.nix index e440d5f9173c..a3f1d9478a91 100644 --- a/pkgs/by-name/al/allure/package.nix +++ b/pkgs/by-name/al/allure/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "allure"; - version = "2.32.1"; + version = "2.32.2"; src = fetchurl { url = "https://github.com/allure-framework/allure2/releases/download/${finalAttrs.version}/allure-${finalAttrs.version}.tgz"; - hash = "sha256-EpTcdF1v6Os7FL/stqRR6OtZoPGuWp8qoC6U7NtBtaY="; + hash = "sha256-/hcsXcLT6V2mSJMHBcjFRMFA0uuILQQDIKmrLNRsh9s="; }; dontConfigure = true; From 58952797bd3897cba7d45c3cb4eb0632d9ebfe8c Mon Sep 17 00:00:00 2001 From: GovanifY Date: Tue, 18 Feb 2025 04:09:11 +0100 Subject: [PATCH 0823/1107] imhex: 1.36.2 -> 1.37.0 --- pkgs/by-name/im/imhex/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix index b9ab55fc993b..6039efea9c53 100644 --- a/pkgs/by-name/im/imhex/package.nix +++ b/pkgs/by-name/im/imhex/package.nix @@ -27,15 +27,15 @@ }: let - version = "1.36.2"; - patterns_version = "1.36.2"; + version = "1.37.0"; + patterns_version = "1.37.0"; patterns_src = fetchFromGitHub { name = "ImHex-Patterns-source-${patterns_version}"; owner = "WerWolv"; repo = "ImHex-Patterns"; - rev = "ImHex-v${patterns_version}"; - hash = "sha256-MKw9BsOhbaojmQGdl+Wkit/ot5Xsym+AvCTHY2vZHmY="; + tag = "ImHex-v${patterns_version}"; + hash = "sha256-2NgMYaG6+XKp0fIHAn3vAcoXXa3EF4HV01nI+t1IL1U="; }; in @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "WerWolv"; repo = "ImHex"; tag = "v${finalAttrs.version}"; - hash = "sha256-e7ppx2MdtTPki/Q+1kWswHkFLNRcO0Y8+q9VzpgUoVE="; + hash = "sha256-6Pm34NSmSHKwvOUJNDbHs7i7WE7HHZbQ0LpWaHxRAYo="; }; strictDeps = true; From d218b1fa46c830c8af7c80bb8244053896c0bfc4 Mon Sep 17 00:00:00 2001 From: GovanifY Date: Tue, 18 Feb 2025 04:10:02 +0100 Subject: [PATCH 0824/1107] imhex: add myself as maintainer --- pkgs/by-name/im/imhex/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix index 6039efea9c53..b345d6a776bc 100644 --- a/pkgs/by-name/im/imhex/package.nix +++ b/pkgs/by-name/im/imhex/package.nix @@ -137,6 +137,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ kashw2 cafkafk + govanify ]; platforms = with lib.platforms; linux ++ darwin; }; From a748ed16f7176518ef685c2802f3b41bc5dde003 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 06:56:24 +0000 Subject: [PATCH 0825/1107] cryptomator: 1.15.0 -> 1.15.1 --- pkgs/by-name/cr/cryptomator/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cr/cryptomator/package.nix b/pkgs/by-name/cr/cryptomator/package.nix index 1badd7aee2ff..bee6f77e3291 100644 --- a/pkgs/by-name/cr/cryptomator/package.nix +++ b/pkgs/by-name/cr/cryptomator/package.nix @@ -17,13 +17,13 @@ let in maven.buildMavenPackage rec { pname = "cryptomator"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "cryptomator"; repo = "cryptomator"; tag = version; - hash = "sha256-fGn8jsPHwGHSiXgIfkMtSYut6pVg8p9+N/uDUlj2Wwc="; + hash = "sha256-yNCVSaA2GtTFUYoN7IZxEYMxkkQwMiNnfnmSXaruFjM="; }; mvnJdk = jdk; From 3c80347b98c38ce894c0d57e4664dfaf008d38d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 06:56:38 +0000 Subject: [PATCH 0826/1107] flix: 0.57.0 -> 0.57.1 --- pkgs/by-name/fl/flix/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flix/package.nix b/pkgs/by-name/fl/flix/package.nix index 066f77dd8644..082564f802cc 100644 --- a/pkgs/by-name/fl/flix/package.nix +++ b/pkgs/by-name/fl/flix/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "flix"; - version = "0.57.0"; + version = "0.57.1"; src = fetchurl { url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar"; - sha256 = "sha256-8qiNh8a6fwKkCeTGda/rBVWFSbYJsLRg27CxQsuL9Mo="; + sha256 = "sha256-baUKhAC0M4nLbukxdWaxsToGGS1Zb+Oj9CTCqtwHE4o="; }; dontUnpack = true; From 19fc3e56ed8b8d77cfc78c34575fe44c65fbaaa3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 06:57:40 +0000 Subject: [PATCH 0827/1107] 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 0828/1107] 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 0829/1107] 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 0830/1107] 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 0831/1107] 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 0832/1107] 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 c125cc969f53ffb08464be24cc6785eaafc80bc4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 07:33:15 +0000 Subject: [PATCH 0833/1107] v2ray-domain-list-community: 20250124154827 -> 20250216152937 --- pkgs/by-name/v2/v2ray-domain-list-community/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix index aac22888bc86..38977273149f 100644 --- a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix +++ b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix @@ -9,12 +9,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20250124154827"; + version = "20250216152937"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-E69X6ktgZvW3xrZl+jmQMoPwRQlqU+0RW2epJHyFgeQ="; + hash = "sha256-VmICKm6G5evY1X9jnFD4Ip9BFuFMGqOB5aoIDYcGqJQ="; }; vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg="; meta = with lib; { From f062cf97bef63604f88489613368f4f0ad860062 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 07:40:36 +0000 Subject: [PATCH 0834/1107] 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 ca7dd8701684d8b236c758d88d3e64a8060c941c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 07:58:15 +0000 Subject: [PATCH 0835/1107] cedar: 4.3.1 -> 4.3.2 --- pkgs/by-name/ce/cedar/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ce/cedar/package.nix b/pkgs/by-name/ce/cedar/package.nix index 4eefcc70335d..21304e642ff4 100644 --- a/pkgs/by-name/ce/cedar/package.nix +++ b/pkgs/by-name/ce/cedar/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "cedar"; - version = "4.3.1"; + version = "4.3.2"; src = fetchFromGitHub { owner = "cedar-policy"; repo = "cedar"; tag = "v${version}"; - hash = "sha256-1EJvLQDQQTiNwPe0Ynt6VI3RD/3jGbt/0H7pzGcl1wA="; + hash = "sha256-by2Y+zh2fMvobFLl2eiUWtw2iU/znKt8YoZGKvdJK+g="; }; useFetchCargoVendor = true; - cargoHash = "sha256-vkJjUmzuYwR/GI/7h0S2AOXJ8Im074a7QzXDs23rIak="; + cargoHash = "sha256-5g4YYs96Dxp7HaZpHO3drEekZoDz/yiO0ngWeTnwnbo="; passthru = { tests.version = testers.testVersion { package = cedar; }; From 47b0560069b5c6b5f1d3db4d92a8eb50ec10a228 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 08:00:21 +0000 Subject: [PATCH 0836/1107] 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 faac398dad7753b4a2331378ccf64558c4f3e2f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 08:02:53 +0000 Subject: [PATCH 0837/1107] pkgsite: 0-unstable-2025-01-31 -> 0-unstable-2025-02-14 --- pkgs/by-name/pk/pkgsite/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix index df8c1bb0dcc2..4edc9b90ac10 100644 --- a/pkgs/by-name/pk/pkgsite/package.nix +++ b/pkgs/by-name/pk/pkgsite/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "pkgsite"; - version = "0-unstable-2025-01-31"; + version = "0-unstable-2025-02-14"; src = fetchFromGitHub { owner = "golang"; repo = "pkgsite"; - rev = "50d4697cc82f2eedc49fc659871d1e81ca4c6164"; - hash = "sha256-zDUsMkhQH/KJDjUE6mw/zRF23Ad3VIfqjEIY374Y9GE="; + rev = "dd488e5da97a2d18430760c4558bf0b6be1a4bfd"; + hash = "sha256-1tzoHN9kXFkTwwH6loMnagbYX6s9YPhSPXgw/groklE="; }; - vendorHash = "sha256-Z+Ji3RO2zn5vn9DXOAxyeI4OZXGOfyVdfdIsNyJHZpE="; + vendorHash = "sha256-Zb0rhIgdP5Ct8ypuEwRBrN2k+UZ6bZceI3B1XAMC0dk="; subPackages = [ "cmd/pkgsite" ]; From 61b1a1af71cb6a7002c8a69f1ca551925789f1f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 08:09:39 +0000 Subject: [PATCH 0838/1107] 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 b39eabfc8a7ad27ac5b16ba717eba4089ba20194 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 08:23:01 +0000 Subject: [PATCH 0839/1107] python312Packages.simsimd: 6.3.0 -> 6.3.3 --- pkgs/development/python-modules/simsimd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/simsimd/default.nix b/pkgs/development/python-modules/simsimd/default.nix index 2dbd8773d86d..1bc5590ca90c 100644 --- a/pkgs/development/python-modules/simsimd/default.nix +++ b/pkgs/development/python-modules/simsimd/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "simsimd"; - version = "6.3.0"; + version = "6.3.3"; pyproject = true; src = fetchFromGitHub { owner = "ashvardanian"; repo = "simsimd"; tag = "v${version}"; - hash = "sha256-RQgPjU2uOxOnDacIARMAkKvnUIHLzRsaxLERmTrLj1Q="; + hash = "sha256-8D3mMhGrHATqxc79OvfcG92UnDGjU6YDfFjReXdR6cs="; }; build-system = [ @@ -41,7 +41,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/ashvardanian/SimSIMD/releases/tag/v${version}"; + changelog = "https://github.com/ashvardanian/SimSIMD/releases/tag/${src.tag}"; description = "Portable mixed-precision BLAS-like vector math library for x86 and ARM"; homepage = "https://github.com/ashvardanian/simsimd"; license = lib.licenses.asl20; 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 0840/1107] 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 0841/1107] 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 0842/1107] 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 0843/1107] 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 74d6325048818ccbdc4d20a649c573d2e0ffe42c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 08:34:44 +0000 Subject: [PATCH 0844/1107] structorizer: 3.32-25 -> 3.32-26 --- pkgs/by-name/st/structorizer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/structorizer/package.nix b/pkgs/by-name/st/structorizer/package.nix index a112a0bb0112..9b8db6ac84a7 100644 --- a/pkgs/by-name/st/structorizer/package.nix +++ b/pkgs/by-name/st/structorizer/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "structorizer"; - version = "3.32-25"; + version = "3.32-26"; desktopItems = [ (makeDesktopItem { @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { owner = "fesch"; repo = "Structorizer.Desktop"; rev = version; - hash = "sha256-JZHS3QtPNVajrNkEoAT606Yn2OZ8KuFeMZCxNyZxAy8="; + hash = "sha256-hRcs0fey+6YCXcWXNTWuAnaRfmRNL2Cpn+dry8wYRSg="; }; patches = [ From fbf4124ab58c42effcbdd928d8c1aa14fd0c167d Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Mon, 17 Feb 2025 22:08:22 -0800 Subject: [PATCH 0845/1107] 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 0846/1107] 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:41:55 +0100 Subject: [PATCH 0847/1107] nixos-container: avoid subshell when testing $PRIVATE_USERS So that the script is not rejected by https://www.shellcheck.net/wiki/SC2235 under `systemd.enableStrictShellChecks = true;` --- nixos/modules/virtualisation/nixos-containers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index 823e7e0fe909..04fc77bbf5da 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -118,7 +118,7 @@ let NIX_BIND_OPT="" if [ -n "$PRIVATE_USERS" ]; then extraFlags+=("--private-users=$PRIVATE_USERS") - if [ "$PRIVATE_USERS" = "pick" ] || ( [ "$PRIVATE_USERS" != "identity" ] && [ "$PRIVATE_USERS" -gt 0 ] ); then + if [ "$PRIVATE_USERS" = "pick" ] || { [ "$PRIVATE_USERS" != "identity" ] && [ "$PRIVATE_USERS" -gt 0 ]; }; then # when user namespacing is enabled, we use `idmap` mount option # so that bind mounts under /nix get proper owner (and not nobody/nogroup). NIX_BIND_OPT=":idmap" From 6a3f025e54d8fd007b97ea60ece540e27e8cebc2 Mon Sep 17 00:00:00 2001 From: GovanifY Date: Wed, 22 Jan 2025 14:13:48 +0100 Subject: [PATCH 0848/1107] nixos/ghidra: init --- .../manual/release-notes/rl-2505.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/programs/ghidra.nix | 47 +++++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 nixos/modules/programs/ghidra.nix diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 994a4e95b4ab..b0c800a11edc 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -67,6 +67,8 @@ - [Homer](https://homer-demo.netlify.app/), a very simple static homepage for your server. Available as [services.homer](options.html#opt-services.homer). +- [Ghidra](https://ghidra-sre.org/), a software reverse engineering (SRE) suite of tools. Available as [programs.ghidra](options.html#opt-programs.ghidra). + - [Omnom](https://github.com/asciimoo/omnom), a webpage bookmarking and snapshotting service. Available as [services.omnom](options.html#opt-services.omnom.enable). - [Yggdrasil-Jumper](https://github.com/one-d-wide/yggdrasil-jumper) is an independent project that aims to transparently reduce latency of a connection over Yggdrasil network, utilizing NAT traversal to automatically bypass intermediary nodes. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a07a08dbdd7c..47de3efbdd4e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -209,6 +209,7 @@ ./programs/gamescope.nix ./programs/gdk-pixbuf.nix ./programs/geary.nix + ./programs/ghidra.nix ./programs/git.nix ./programs/git-worktree-switcher.nix ./programs/gnome-disks.nix diff --git a/nixos/modules/programs/ghidra.nix b/nixos/modules/programs/ghidra.nix new file mode 100644 index 000000000000..a832a2161e76 --- /dev/null +++ b/nixos/modules/programs/ghidra.nix @@ -0,0 +1,47 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.programs.ghidra; +in +{ + options.programs.ghidra = { + enable = lib.mkEnableOption "Ghidra, a software reverse engineering (SRE) suite of tools"; + + gdb = lib.mkOption { + default = true; + type = lib.types.bool; + description = '' + Whether to add to gdbinit the python modules required to make Ghidra's debugger work. + ''; + }; + + package = lib.mkPackageOption pkgs "ghidra" { example = "ghidra-bin"; }; + }; + + config = lib.mkIf cfg.enable { + environment = { + systemPackages = [ cfg.package ]; + + etc = lib.mkIf cfg.gdb { + "gdb/gdbinit.d/ghidra-modules.gdb".text = with pkgs.python3.pkgs; '' + python + import sys + [sys.path.append(p) for p in "${ + (makePythonPath [ + psutil + protobuf + ]) + }".split(":")] + end + ''; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ govanify ]; +} From fb806425f3910c5e345c525366274ceb18020da9 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 18 Feb 2025 09:58:57 +0100 Subject: [PATCH 0849/1107] 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 0850/1107] 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 07679a005a55bb33bf62556c60e9ed18fab4030d Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 18 Feb 2025 03:46:46 -0500 Subject: [PATCH 0851/1107] yoda: workaround darwin detection --- pkgs/by-name/yo/yoda/package.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/yo/yoda/package.nix b/pkgs/by-name/yo/yoda/package.nix index 838eb0733065..1f98ae4f135a 100644 --- a/pkgs/by-name/yo/yoda/package.nix +++ b/pkgs/by-name/yo/yoda/package.nix @@ -30,20 +30,16 @@ stdenv.mkDerivation rec { ]; buildInputs = - [ - python3 - ] + [ python3 ] ++ (with python3.pkgs; [ numpy matplotlib ]) - ++ lib.optionals withRootSupport [ - root - ]; + ++ lib.optionals withRootSupport [ root ]; - propagatedBuildInputs = [ - zlib - ]; + propagatedBuildInputs = [ zlib ]; + + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DWITH_OSX"; strictDeps = true; From facea472a0b0b88a07ff33f6f667c1e24d0a52a5 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 18 Feb 2025 03:47:00 -0500 Subject: [PATCH 0852/1107] rivet: 4.0.2 -> 4.0.3 --- pkgs/by-name/ri/rivet/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ri/rivet/package.nix b/pkgs/by-name/ri/rivet/package.nix index cb7ceda22827..f69fc644e841 100644 --- a/pkgs/by-name/ri/rivet/package.nix +++ b/pkgs/by-name/ri/rivet/package.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "rivet"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; - hash = "sha256-ZaOzb0K/94LtJ2eTDmaeCbFAiZYF15cvyPd3hbSogsA="; + hash = "sha256-27l7dp0Yd/NMPFAZASe/2nhHvOx5uh3llWH99DzdSGk="; }; latex = texliveBasic.withPackages ( From 5f8fb9bc1435438b11729e088355b39c2f63bcd2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 09:22:06 +0000 Subject: [PATCH 0853/1107] zoekt: 3.7.2-2-unstable-2025-02-02 -> 3.7.2-2-unstable-2025-02-17 --- pkgs/by-name/zo/zoekt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zo/zoekt/package.nix b/pkgs/by-name/zo/zoekt/package.nix index ac1808f7b8b8..631565f67cc9 100644 --- a/pkgs/by-name/zo/zoekt/package.nix +++ b/pkgs/by-name/zo/zoekt/package.nix @@ -8,13 +8,13 @@ buildGoModule { pname = "zoekt"; - version = "3.7.2-2-unstable-2025-02-02"; + version = "3.7.2-2-unstable-2025-02-17"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "zoekt"; - rev = "261aae37dce6a46cdf1eb669d95d314adc0758e7"; - hash = "sha256-ReyUai63hs+cfBo8v3CuKtCBmtLEUWOUR3zBI82eXOQ="; + rev = "914a27d7d2e2b489a70e0fc1c6ce64aae8e7964b"; + hash = "sha256-kUCFAWIyHPzHdhMshrSYSGBIyGD0Nh9HNJRqia5qh/Q="; }; vendorHash = "sha256-7bpoUxhoVc74bN9/B6TWyufSvDRD90KpIXUMKK+3BcU="; From a74d7b0f66003fb1b177c9481d7c575bcf054efc Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 17 Feb 2025 21:05:30 +0100 Subject: [PATCH 0854/1107] haskellPackages.text-icu: disable test(s) broken by icu >= 76 Output changed from GMT+1 to MEZ in one case, I think we can safely ignore that. --- .../development/haskell-modules/configuration-common.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 25016b493040..3f705c5c520e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1951,6 +1951,15 @@ self: super: { }; hspec-core_2_7_10 = doJailbreak (dontCheck super.hspec-core_2_7_10); + # Disable test cases that were broken by insignificant changes in icu 76 + # https://github.com/haskell/text-icu/issues/108 + text-icu = overrideCabal (drv: { + testFlags = drv.testFlags or [ ] ++ [ + "-t" + "!Test cases" + ]; + }) super.text-icu; + # waiting for aeson bump servant-swagger-ui-core = doJailbreak super.servant-swagger-ui-core; From c05f2ec2eabceddd1ddc6a6ed1f2aebb284f0706 Mon Sep 17 00:00:00 2001 From: "\"Gaetan Lepage\"" <"gaetan@glepage.com"> Date: Tue, 18 Feb 2025 10:57:32 +0100 Subject: [PATCH 0855/1107] vimPlugins.github-nvim-theme: init at 2024-12-31 --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index aacd40cc52ed..eabc61c6b06e 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -5057,6 +5057,19 @@ final: prev: meta.hydraPlatforms = [ ]; }; + github-nvim-theme = buildVimPlugin { + pname = "github-nvim-theme"; + version = "2024-12-31"; + src = fetchFromGitHub { + owner = "projekt0n"; + repo = "github-nvim-theme"; + rev = "c106c9472154d6b2c74b74565616b877ae8ed31d"; + sha256 = "1w7lz4bgfm8hq1mir4hcr8ik585d4l4w7bjl8yl3g3zklj8223pw"; + }; + meta.homepage = "https://github.com/projekt0n/github-nvim-theme/"; + meta.hydraPlatforms = [ ]; + }; + gitignore-nvim = buildVimPlugin { pname = "gitignore.nvim"; version = "2024-03-25"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index ca4e3f7122cc..89b4a73a2905 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -387,6 +387,7 @@ https://github.com/akinsho/git-conflict.nvim/,HEAD, https://github.com/rhysd/git-messenger.vim/,, https://github.com/mikesmithgh/git-prompt-string-lualine.nvim/,HEAD, https://github.com/ThePrimeagen/git-worktree.nvim/,, +https://github.com/projekt0n/github-nvim-theme/,HEAD, https://github.com/wintermute-cell/gitignore.nvim/,HEAD, https://github.com/vim-scripts/gitignore.vim/,, https://github.com/ruifm/gitlinker.nvim/,, From e21466f5e21f9f99b699157b4afd11992e9e0529 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 18 Feb 2025 10:02:09 +0100 Subject: [PATCH 0856/1107] 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 0857/1107] 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 0858/1107] 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 ]; }; From be8612e15a2849936faf954d46da0d29e3f2c24e Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 18 Feb 2025 10:20:13 +0100 Subject: [PATCH 0859/1107] postgresql: fetch from GitHub instead of tarball This allows us to fetch newer releases a few days before they are officially released and the tarballs have been pushed. The regular release cycle is like this: - Sunday, the release notes are committed. - Monday, the version is "stamped", i.e. the version bump committed. - Thursday, the release is made. There are not going to be any changes from Monday on, so we can kick off our builds at that time already - they still need time to hit unstable anyway. --- pkgs/servers/sql/postgresql/13.nix | 3 ++- pkgs/servers/sql/postgresql/14.nix | 3 ++- pkgs/servers/sql/postgresql/15.nix | 3 ++- pkgs/servers/sql/postgresql/16.nix | 3 ++- pkgs/servers/sql/postgresql/17.nix | 3 ++- pkgs/servers/sql/postgresql/generic.nix | 25 ++++++++++++++----------- pkgs/servers/sql/postgresql/libpq.nix | 11 +++++++---- 7 files changed, 31 insertions(+), 20 deletions(-) diff --git a/pkgs/servers/sql/postgresql/13.nix b/pkgs/servers/sql/postgresql/13.nix index 72a8dd8bb392..b2a189592310 100644 --- a/pkgs/servers/sql/postgresql/13.nix +++ b/pkgs/servers/sql/postgresql/13.nix @@ -1,6 +1,7 @@ import ./generic.nix { version = "13.18"; - hash = "sha256-zuqSq+4qjBlAjSeLaN5qeLa9PbtPotZT+nynRdZmqrE="; + rev = "ref/tags/REL_13_18"; + hash = "sha256-Lw8rd6MAvKZ7/Y1a0ccauL7K6lHxsp5huK4QFun9wcc="; muslPatches = { disable-test-collate-icu-utf8 = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b"; diff --git a/pkgs/servers/sql/postgresql/14.nix b/pkgs/servers/sql/postgresql/14.nix index e5011f5314ca..cf4141008ffc 100644 --- a/pkgs/servers/sql/postgresql/14.nix +++ b/pkgs/servers/sql/postgresql/14.nix @@ -1,6 +1,7 @@ import ./generic.nix { version = "14.15"; - hash = "sha256-AuiR4xS06e4ky9eAKNq3xz+cG6PjCDW8vvcf4iBAH8U="; + rev = "ref/tags/REL_14_15"; + hash = "sha256-slb6UiJyIzDaNS782/ZDVztBw4B4qTY6OuEWI+HZ+Ds="; muslPatches = { disable-test-collate-icu-utf8 = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; diff --git a/pkgs/servers/sql/postgresql/15.nix b/pkgs/servers/sql/postgresql/15.nix index bf17a088f2bd..3b654c8fee95 100644 --- a/pkgs/servers/sql/postgresql/15.nix +++ b/pkgs/servers/sql/postgresql/15.nix @@ -1,6 +1,7 @@ import ./generic.nix { version = "15.10"; - hash = "sha256-VavnONRB8OWGWLPsb4gJenE7XjtzE59iMNe1xMOJ5XM="; + rev = "ref/tags/REL_15_10"; + hash = "sha256-5RNcoqcmcYCCBK8bmz2Wruky1mzDh5SrDF3OOV31GMw="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql15/dont-use-locale-a-on-musl.patch?id=f424e934e6d076c4ae065ce45e734aa283eecb9c"; diff --git a/pkgs/servers/sql/postgresql/16.nix b/pkgs/servers/sql/postgresql/16.nix index fd1957b89386..4ce791d49b19 100644 --- a/pkgs/servers/sql/postgresql/16.nix +++ b/pkgs/servers/sql/postgresql/16.nix @@ -1,6 +1,7 @@ import ./generic.nix { version = "16.6"; - hash = "sha256-Izac2szUUnCsXcww+p2iBdW+M/pQXh8XoEGNLK7KR3s="; + rev = "ref/tags/REL_16_6"; + hash = "sha256-cw/bSR9ZI6HFtbSTQxvuB7ng7V6g5SZZ7B0oMCz4E7Q="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql16/dont-use-locale-a-on-musl.patch?id=08a24be262339fd093e641860680944c3590238e"; diff --git a/pkgs/servers/sql/postgresql/17.nix b/pkgs/servers/sql/postgresql/17.nix index 34d2ddeccb27..e76114ee1aa6 100644 --- a/pkgs/servers/sql/postgresql/17.nix +++ b/pkgs/servers/sql/postgresql/17.nix @@ -1,6 +1,7 @@ import ./generic.nix { version = "17.2"; - hash = "sha256-gu8nwK83UWldf2Ti2WNYMAX7tqDD32PQ5LQiEdcCEWQ="; + rev = "ref/tags/REL_17_2"; + hash = "sha256-P7IwvMcOI6vW14PiB2R0NEzAEPeaKg0zaUKTw2GJ5DA="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql17/dont-use-locale-a-on-musl.patch?id=d69ead2c87230118ae7f72cef7d761e761e1f37e"; diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 00b9f0e15ce1..569eb87f8e97 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -4,6 +4,7 @@ let # utils { stdenv, + fetchFromGitHub, fetchpatch, fetchurl, lib, @@ -13,6 +14,7 @@ let # source specification hash, muslPatches ? { }, + rev, version, # runtime dependencies @@ -130,9 +132,12 @@ let inherit version; pname = pname + lib.optionalString jitSupport "-jit"; - src = fetchurl { - url = "mirror://postgresql/source/v${version}/${pname}-${version}.tar.bz2"; - inherit hash; + src = fetchFromGitHub { + owner = "postgres"; + repo = "postgres"; + # rev, not tag, on purpose: allows updating when new versions + # are "stamped" a few days before release (tag). + inherit hash rev; }; __structuredAttrs = true; @@ -215,22 +220,20 @@ let nativeBuildInputs = [ + bison + docbook-xsl-nons + docbook_xml_dtd_45 + flex libxml2 + libxslt makeWrapper + perl pkg-config removeReferencesTo ] ++ lib.optionals jitSupport [ llvmPackages.llvm.dev nukeReferences - ] - ++ lib.optionals (atLeast "17") [ - bison - flex - perl - docbook_xml_dtd_45 - docbook-xsl-nons - libxslt ]; enableParallelBuilding = true; diff --git a/pkgs/servers/sql/postgresql/libpq.nix b/pkgs/servers/sql/postgresql/libpq.nix index 0c064e45cf99..62e7fc9df6c7 100644 --- a/pkgs/servers/sql/postgresql/libpq.nix +++ b/pkgs/servers/sql/postgresql/libpq.nix @@ -1,7 +1,7 @@ { # utils stdenv, - fetchurl, + fetchFromGitHub, lib, # runtime dependencies @@ -31,9 +31,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "libpq"; version = "17.2"; - src = fetchurl { - url = "mirror://postgresql/source/v${finalAttrs.version}/postgresql-${finalAttrs.version}.tar.bz2"; - hash = "sha256-gu8nwK83UWldf2Ti2WNYMAX7tqDD32PQ5LQiEdcCEWQ="; + src = fetchFromGitHub { + owner = "postgres"; + repo = "postgres"; + # rev, not tag, on purpose: see generic.nix. + rev = "ref/tags/REL_17_2"; + hash = "sha256-P7IwvMcOI6vW14PiB2R0NEzAEPeaKg0zaUKTw2GJ5DA="; }; __structuredAttrs = true; From 2c1a09f1fef5f6b1690b2fdb19a8b98cae14a751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=BA=E0=B8=95=E0=B8=B1?= =?UTF-8?q?=E0=B8=A5?= Date: Wed, 12 Feb 2025 12:42:02 +0700 Subject: [PATCH 0860/1107] nixos/h2o: init module Co-Authored-By: adisbladis --- nixos/modules/module-list.nix | 1 + .../services/web-servers/h2o/default.nix | 263 ++++++++++++++++++ .../web-servers/h2o/vhost-options.nix | 151 ++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/web-servers/h2o/basic.nix | 138 +++++++++ nixos/tests/web-servers/h2o/default.nix | 16 ++ nixos/tests/web-servers/h2o/file_handler.rb | 3 + nixos/tests/web-servers/h2o/mruby.nix | 64 +++++ 8 files changed, 637 insertions(+) create mode 100644 nixos/modules/services/web-servers/h2o/default.nix create mode 100644 nixos/modules/services/web-servers/h2o/vhost-options.nix create mode 100644 nixos/tests/web-servers/h2o/basic.nix create mode 100644 nixos/tests/web-servers/h2o/default.nix create mode 100644 nixos/tests/web-servers/h2o/file_handler.rb create mode 100644 nixos/tests/web-servers/h2o/mruby.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e1000541c104..41b2c21ba690 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1608,6 +1608,7 @@ ./services/web-servers/darkhttpd.nix ./services/web-servers/fcgiwrap.nix ./services/web-servers/garage.nix + ./services/web-servers/h2o/default.nix ./services/web-servers/hitch/default.nix ./services/web-servers/jboss/default.nix ./services/web-servers/keter diff --git a/nixos/modules/services/web-servers/h2o/default.nix b/nixos/modules/services/web-servers/h2o/default.nix new file mode 100644 index 000000000000..7e021281f91a --- /dev/null +++ b/nixos/modules/services/web-servers/h2o/default.nix @@ -0,0 +1,263 @@ +{ + config, + lib, + pkgs, + ... +}: + +# TODO: ACME +# TODO: Gems includes for Mruby +# TODO: Recommended options +let + cfg = config.services.h2o; + + inherit (lib) + literalExpression + mkDefault + mkEnableOption + mkIf + mkOption + types + ; + + settingsFormat = pkgs.formats.yaml { }; + + hostsConfig = lib.concatMapAttrs ( + name: value: + let + port = { + HTTP = lib.attrByPath [ "http" "port" ] cfg.defaultHTTPListenPort value; + TLS = lib.attrByPath [ "tls" "port" ] cfg.defaultTLSListenPort value; + }; + serverName = if value.serverName != null then value.serverName else name; + in + # HTTP settings + lib.optionalAttrs (value.tls == null || value.tls.policy == "add") { + "${serverName}:${builtins.toString port.HTTP}" = value.settings // { + listen.port = port.HTTP; + }; + } + # Redirect settings + // lib.optionalAttrs (value.tls != null && value.tls.policy == "force") { + "${serverName}:${builtins.toString port.HTTP}" = { + listen.port = port.HTTP; + paths."/" = { + redirect = { + status = value.tls.redirectCode; + url = "https://${serverName}:${builtins.toString port.TLS}"; + }; + }; + }; + } + # TLS settings + // + lib.optionalAttrs + ( + value.tls != null + && builtins.elem value.tls.policy [ + "add" + "only" + "force" + ] + ) + { + "${serverName}:${builtins.toString port.TLS}" = value.settings // { + listen = + let + identity = value.tls.identity; + in + { + port = port.TLS; + ssl = value.tls.extraSettings or { } // { + inherit identity; + }; + }; + }; + } + ) cfg.hosts; + + h2oConfig = settingsFormat.generate "h2o.yaml" ( + lib.recursiveUpdate { hosts = hostsConfig; } cfg.settings + ); +in +{ + options = { + services.h2o = { + enable = mkEnableOption "H2O web server"; + + user = mkOption { + type = types.nonEmptyStr; + default = "h2o"; + description = "User running H2O service"; + }; + + group = mkOption { + type = types.nonEmptyStr; + default = "h2o"; + description = "Group running H2O services"; + }; + + package = lib.mkPackageOption pkgs "h2o" { + example = '' + pkgs.h2o.override { + withMruby = true; + }; + ''; + }; + + defaultHTTPListenPort = mkOption { + type = types.port; + default = 80; + description = '' + If hosts do not specify listen.port, use these ports for HTTP by default. + ''; + example = 8080; + }; + + defaultTLSListenPort = mkOption { + type = types.port; + default = 443; + description = '' + If hosts do not specify listen.port, use these ports for SSL by default. + ''; + example = 8443; + }; + + mode = mkOption { + type = + with types; + nullOr (enum [ + "daemon" + "master" + "worker" + "test" + ]); + default = "master"; + description = "Operating mode of H2O"; + }; + + settings = mkOption { + type = settingsFormat.type; + description = "Configuration for H2O (see )"; + }; + + hosts = mkOption { + type = types.attrsOf ( + types.submodule ( + import ./vhost-options.nix { + inherit config lib; + } + ) + ); + default = { }; + description = '' + The `hosts` config to be merged with the settings. + + Note that unlike YAML used for H2O, Nix will not support duplicate + keys to, for instance, have multiple listens in a host block; use the + virtual host options in like `http` & `tls` or use `$HOST:$PORT` + keys if manually specifying config. + ''; + example = + literalExpression + # nix + '' + { + "hydra.example.com" = { + tls = { + policy = "force"; + indentity = [ + { + key-file = "/path/to/key"; + certificate-file = "/path/to/cert"; + }; + ]; + extraSettings = { + minimum-version = "TLSv1.3"; + }; + }; + settings = { + paths."/" = { + "file:dir" = "/var/www/default"; + }; + }; + }; + } + ''; + }; + }; + }; + + config = mkIf cfg.enable { + users = { + users.${cfg.user} = + { + group = cfg.group; + } + // lib.optionalAttrs (cfg.user == "h2o") { + isSystemUser = true; + }; + groups.${cfg.group} = { }; + }; + + systemd.services.h2o = { + description = "H2O web server service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + ExecStop = "${pkgs.coreutils}/bin/kill -s QUIT $MAINPID"; + User = cfg.user; + Restart = "always"; + RestartSec = "10s"; + RuntimeDirectory = "h2o"; + RuntimeDirectoryMode = "0750"; + CacheDirectory = "h2o"; + CacheDirectoryMode = "0750"; + LogsDirectory = "h2o"; + LogsDirectoryMode = "0750"; + ProtectSystem = "strict"; + ProtectHome = mkDefault true; + PrivateTmp = true; + PrivateDevices = true; + ProtectHostname = true; + ProtectClock = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + RestrictAddressFamilies = [ + "AF_UNIX" + "AF_INET" + "AF_INET6" + ]; + RestrictNamespaces = true; + LockPersonality = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + RemoveIPC = true; + PrivateMounts = true; + AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; + CapabilitiesBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; + }; + + script = + let + args = + [ + "--conf" + "${h2oConfig}" + ] + ++ lib.optionals (cfg.mode != null) [ + "--mode" + cfg.mode + ]; + in + '' + ${lib.getExe cfg.package} ${lib.strings.escapeShellArgs args} + ''; + }; + }; + +} diff --git a/nixos/modules/services/web-servers/h2o/vhost-options.nix b/nixos/modules/services/web-servers/h2o/vhost-options.nix new file mode 100644 index 000000000000..26abf8eb4f6a --- /dev/null +++ b/nixos/modules/services/web-servers/h2o/vhost-options.nix @@ -0,0 +1,151 @@ +{ config, lib, ... }: + +let + inherit (lib) + literalExpression + mkOption + types + ; +in +{ + options = { + serverName = mkOption { + type = types.nullOr types.nonEmptyStr; + default = null; + description = '' + Server name to be used for this virtual host. Defaults to attribute + name in hosts. + ''; + example = "example.org"; + }; + + http = mkOption { + type = types.nullOr ( + types.submodule { + options = { + port = mkOption { + type = types.port; + default = config.services.h2o.defaultHTTPListenPort; + defaultText = literalExpression '' + config.services.h2o.defaultHTTPListenPort + ''; + description = '' + Override the default HTTP port for this virtual host. + ''; + example = literalExpression "8080"; + }; + }; + } + ); + default = null; + description = "HTTP options for virtual host"; + }; + + tls = mkOption { + type = types.nullOr ( + types.submodule { + options = { + port = mkOption { + type = types.port; + default = config.services.h2o.defaultTLSListenPort; + defaultText = literalExpression '' + config.services.h2o.defaultTLSListenPort + ''; + description = '' + Override the default TLS port for this virtual host."; + ''; + example = 8443; + }; + policy = mkOption { + type = types.enum [ + "add" + "only" + "force" + ]; + description = '' + `add` will additionally listen for TLS connections. `only` will + disable TLS connections. `force` will redirect non-TLS traffic + to the TLS connection. + ''; + example = "force"; + }; + redirectCode = mkOption { + type = types.ints.between 300 399; + default = 301; + example = 308; + description = '' + HTTP status used by `globalRedirect` & `forceSSL`. Possible + usecases include temporary (302, 307) redirects, keeping the + request method & body (307, 308), or explicitly resetting the + method to GET (303). See + . + ''; + }; + identity = mkOption { + type = types.nonEmptyListOf ( + types.submodule { + options = { + key-file = mkOption { + type = types.path; + description = "Path to key file"; + }; + certificate-file = mkOption { + type = types.path; + description = "Path to certificate file"; + }; + }; + } + ); + default = null; + description = '' + Key / certificate pairs for the virtual host. + ''; + example = + literalExpression + # nix + '' + { + indentities = [ + { + key-file = "/path/to/rsa.key"; + certificate-file = "/path/to/rsa.crt"; + } + { + key-file = "/path/to/ecdsa.key"; + certificate-file = "/path/to/ecdsa.crt"; + } + ]; + } + ''; + }; + extraSettings = mkOption { + type = types.nullOr types.attrs; + default = null; + description = '' + Additional TLS/SSL-related configuration options. + ''; + example = + literalExpression + # nix + '' + { + minimum-version = "TLSv1.3"; + } + ''; + }; + }; + } + ); + default = null; + description = "TLS options for virtual host"; + }; + + settings = mkOption { + type = types.attrs; + description = '' + Attrset to be transformed into YAML for host config. Note that the HTTP + / TLS configurations will override these config values. + ''; + }; + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index dcb0f1fe0a27..dec9ac9ce5d9 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -420,6 +420,7 @@ in { guacamole-server = handleTest ./guacamole-server.nix {}; guix = handleTest ./guix {}; gvisor = handleTest ./gvisor.nix {}; + h2o = discoverTests (import ./web-servers/h2o { inherit handleTestOn; }); hadoop = import ./hadoop { inherit handleTestOn; package=pkgs.hadoop; }; hadoop_3_3 = import ./hadoop { inherit handleTestOn; package=pkgs.hadoop_3_3; }; hadoop2 = import ./hadoop { inherit handleTestOn; package=pkgs.hadoop2; }; diff --git a/nixos/tests/web-servers/h2o/basic.nix b/nixos/tests/web-servers/h2o/basic.nix new file mode 100644 index 000000000000..673e082322bb --- /dev/null +++ b/nixos/tests/web-servers/h2o/basic.nix @@ -0,0 +1,138 @@ +import ../../make-test-python.nix ( + { lib, pkgs, ... }: + + # Tests basics such as TLS, creating a mime-type & serving Unicode characters. + + let + domain = { + HTTP = "h2o.local"; + TLS = "acme.test"; + }; + + port = { + HTTP = 8080; + TLS = 8443; + }; + + sawatdi_chao_lok = "สวัสดีชาวโลก"; + + hello_world_txt = pkgs.writeTextFile { + name = "/hello_world.txt"; + text = sawatdi_chao_lok; + }; + + hello_world_rst = pkgs.writeTextFile { + name = "/hello_world.rst"; + text = # rst + '' + ==================== + Thaiger Sprint 2025‼ + ==================== + + ${sawatdi_chao_lok} + ''; + }; + in + { + name = "h2o-basic"; + + meta = { + maintainers = with lib.maintainers; [ toastal ]; + }; + + nodes = { + server = + { pkgs, ... }: + { + services.h2o = { + enable = true; + defaultHTTPListenPort = port.HTTP; + defaultTLSListenPort = port.TLS; + hosts = { + "${domain.HTTP}" = { + settings = { + paths = { + "/hello_world.txt" = { + "file.file" = "${hello_world_txt}"; + }; + }; + }; + }; + "${domain.TLS}" = { + tls = { + policy = "force"; + identity = [ + { + key-file = ../../common/acme/server/acme.test.key.pem; + certificate-file = ../../common/acme/server/acme.test.cert.pem; + } + ]; + extraSettings = { + minimum-version = "TLSv1.3"; + }; + }; + settings = { + paths = { + "/hello_world.rst" = { + "file.file" = "${hello_world_rst}"; + }; + }; + }; + }; + }; + settings = { + compress = "ON"; + compress-minimum-size = 32; + "file.mime.addtypes" = { + "text/x-rst" = { + extensions = [ ".rst" ]; + is_compressible = "YES"; + }; + }; + ssl-offload = "kernel"; + }; + }; + + security.pki.certificates = [ + (builtins.readFile ../../common/acme/server/ca.cert.pem) + ]; + + networking = { + firewall.allowedTCPPorts = with port; [ + HTTP + TLS + ]; + extraHosts = '' + 127.0.0.1 ${domain.HTTP} + 127.0.0.1 ${domain.TLS} + ''; + }; + }; + }; + + testScript = # python + '' + server.wait_for_unit("h2o.service") + + http_hello_world_body = server.succeed("curl --fail-with-body 'http://${domain.HTTP}:${builtins.toString port.HTTP}/hello_world.txt'") + assert "${sawatdi_chao_lok}" in http_hello_world_body + + tls_hello_world_head = server.succeed("curl -v --head --compressed --http2 --tlsv1.3 --fail-with-body 'https://${domain.TLS}:${builtins.toString port.TLS}/hello_world.rst'").lower() + print(tls_hello_world_head) + assert "http/2 200" in tls_hello_world_head + assert "server: h2o" in tls_hello_world_head + assert "content-type: text/x-rst" in tls_hello_world_head + + tls_hello_world_body = server.succeed("curl -v --http2 --tlsv1.3 --compressed --fail-with-body 'https://${domain.TLS}:${builtins.toString port.TLS}/hello_world.rst'") + assert "${sawatdi_chao_lok}" in tls_hello_world_body + + tls_hello_world_head_redirected = server.succeed("curl -v --head --fail-with-body 'http://${domain.TLS}:${builtins.toString port.HTTP}/hello_world.rst'").lower() + assert "redirected" in tls_hello_world_head_redirected + + server.fail("curl --location --max-redirs 0 'http://${domain.TLS}:${builtins.toString port.HTTP}/hello_world.rst'") + + tls_hello_world_body_redirected = server.succeed("curl -v --location --fail-with-body 'http://${domain.TLS}:${builtins.toString port.HTTP}/hello_world.rst'") + assert "${sawatdi_chao_lok}" in tls_hello_world_body_redirected + ''; + } +) diff --git a/nixos/tests/web-servers/h2o/default.nix b/nixos/tests/web-servers/h2o/default.nix new file mode 100644 index 000000000000..23d419842834 --- /dev/null +++ b/nixos/tests/web-servers/h2o/default.nix @@ -0,0 +1,16 @@ +{ + system ? builtins.currentSystem, + handleTestOn, +}: + +let + supportedSystems = [ + "x86_64-linux" + "i686-linux" + "aarch64-linux" + ]; +in +{ + basic = handleTestOn supportedSystems ./basic.nix { inherit system; }; + mruby = handleTestOn supportedSystems ./mruby.nix { inherit system; }; +} diff --git a/nixos/tests/web-servers/h2o/file_handler.rb b/nixos/tests/web-servers/h2o/file_handler.rb new file mode 100644 index 000000000000..6e14da191dee --- /dev/null +++ b/nixos/tests/web-servers/h2o/file_handler.rb @@ -0,0 +1,3 @@ +Proc.new do |env| + [200, {'content-type' => 'text/plain'}, ["FILE_HANDLER"]] +end diff --git a/nixos/tests/web-servers/h2o/mruby.nix b/nixos/tests/web-servers/h2o/mruby.nix new file mode 100644 index 000000000000..e8cedf300446 --- /dev/null +++ b/nixos/tests/web-servers/h2o/mruby.nix @@ -0,0 +1,64 @@ +import ../../make-test-python.nix ( + { lib, pkgs, ... }: + + let + domain = "h2o.local"; + + port = 8080; + + sawatdi_chao_lok = "สวัสดีชาวโลก"; + in + { + name = "h2o-mruby"; + + meta = { + maintainers = with lib.maintainers; [ toastal ]; + }; + + nodes = { + server = + { pkgs, ... }: + { + services.h2o = { + enable = true; + package = pkgs.h2o.override { withMruby = true; }; + settings = { + listen = port; + hosts = { + "${domain}" = { + paths = { + "/hello_world" = { + "mruby.handler" = # ruby + '' + Proc.new do |env| + [200, {'content-type' => 'text/plain'}, ["${sawatdi_chao_lok}"]] + end + ''; + }; + "/file_handler" = { + "mruby.handler-file" = ./file_handler.rb; + }; + }; + }; + }; + }; + }; + + networking.extraHosts = '' + 127.0.0.1 ${domain} + ''; + }; + }; + + testScript = # python + '' + server.wait_for_unit("h2o.service") + + hello_world = server.succeed("curl --fail-with-body http://${domain}:${builtins.toString port}/hello_world") + assert "${sawatdi_chao_lok}" in hello_world + + file_handler = server.succeed("curl --fail-with-body http://${domain}:${builtins.toString port}/file_handler") + assert "FILE_HANDLER" in file_handler + ''; + } +) From 2bcb69609a8845891d3b7913cd26840c8f5e5064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=BA=E0=B8=95=E0=B8=B1?= =?UTF-8?q?=E0=B8=A5?= Date: Sun, 16 Feb 2025 18:18:48 +0700 Subject: [PATCH 0861/1107] h2o: add OpenSSL to $PATH --- pkgs/by-name/h2/h2o/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index 6a6df40b8dd5..d908919589d4 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -66,7 +66,8 @@ stdenv.mkDerivation (finalAttrs: { EXES="$(find "$out/share/h2o" -type f -executable)" for exe in $EXES; do wrapProgram "$exe" \ - --set "H2O_PERL" "${lib.getExe perl}" + --set "H2O_PERL" "${lib.getExe perl}" \ + --prefix "PATH" : "${lib.getBin openssl}/bin" done ''; From cafb803cba1e13a6d4f626e2270322d5d2fea556 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 10:11:58 +0000 Subject: [PATCH 0862/1107] mov-cli: 4.4.16 -> 4.4.18 --- pkgs/by-name/mo/mov-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/mov-cli/package.nix b/pkgs/by-name/mo/mov-cli/package.nix index 0e0c0004ebe3..c1980c975fa5 100644 --- a/pkgs/by-name/mo/mov-cli/package.nix +++ b/pkgs/by-name/mo/mov-cli/package.nix @@ -9,7 +9,7 @@ let pname = "mov-cli"; - version = "4.4.16"; + version = "4.4.18"; in python3.pkgs.buildPythonPackage { inherit pname version; @@ -19,7 +19,7 @@ python3.pkgs.buildPythonPackage { owner = "mov-cli"; repo = "mov-cli"; tag = version; - hash = "sha256-hOnbBXzg9S0pqEcdXVrdG+P9tLqE8NC++ppOwqd+y+M="; + hash = "sha256-4NgDhxBL2llla0248hAflVbqFaRUmITCafLHQWagLOM="; }; propagatedBuildInputs = with python3.pkgs; [ From a88f645c5eea89c2dcf0f4089fe58329d3ef8624 Mon Sep 17 00:00:00 2001 From: Michael Glass Date: Mon, 27 Jan 2025 16:27:05 +0100 Subject: [PATCH 0863/1107] mydumper: ignore pre-release versions when auto updating see: https://github.com/mydumper/mydumper/tree/afe0eb9317f1e9cdde45f7b0e463029912c6c981?tab=readme-ov-file#versioning --- pkgs/by-name/my/mydumper/package.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/my/mydumper/package.nix b/pkgs/by-name/my/mydumper/package.nix index ed5c58ef4d58..280455d6df2a 100644 --- a/pkgs/by-name/my/mydumper/package.nix +++ b/pkgs/by-name/my/mydumper/package.nix @@ -102,7 +102,14 @@ stdenv.mkDerivation rec { cp -r $src/docs/images ./docs ''; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + # even patch numbers are pre-releases + # see https://github.com/mydumper/mydumper/tree/afe0eb9317f1e9cdde45f7b0e463029912c6c981?tab=readme-ov-file#versioning + extraArgs = [ + "--version-regex" + "v(\\d+\\.\\d+\\.\\d*[13579]-\\d+)" + ]; + }; # mydumper --version is checked in `versionCheckHook` passthru.tests = testers.testVersion { From 8e25714eeec98b1cdacb32a4b0df438400ef6b21 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 15 Feb 2025 11:26:30 +0100 Subject: [PATCH 0864/1107] postgresql_13: 13.18 -> 13.20 ChangeLog: https://www.postgresql.org/about/news/postgresql-173-167-1511-1416-and-1319-released-3015/ https://www.postgresql.org/about/news/out-of-cycle-release-scheduled-for-february-20-2025-3016/ Co-authored-by: Wolfgang Walther --- pkgs/servers/sql/postgresql/13.nix | 7 ++++--- pkgs/servers/sql/postgresql/generic.nix | 5 ----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/13.nix b/pkgs/servers/sql/postgresql/13.nix index b2a189592310..8f1493c6c366 100644 --- a/pkgs/servers/sql/postgresql/13.nix +++ b/pkgs/servers/sql/postgresql/13.nix @@ -1,7 +1,8 @@ import ./generic.nix { - version = "13.18"; - rev = "ref/tags/REL_13_18"; - hash = "sha256-Lw8rd6MAvKZ7/Y1a0ccauL7K6lHxsp5huK4QFun9wcc="; + version = "13.20"; + # "Stamp 13.20" + rev = "c8f198c3acb59ed858b5b9b88b4fbc55cece544e"; + hash = "sha256-GkDtzqwjMJipvr0wykM9Z5Tb0R7WgJA/PGPTVUXxf7Q="; muslPatches = { disable-test-collate-icu-utf8 = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b"; diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 569eb87f8e97..ca157411536e 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -302,11 +302,6 @@ let ./patches/paths-for-split-outputs.patch ./patches/paths-with-postgresql-suffix.patch - (fetchpatch { - url = "https://github.com/postgres/postgres/commit/8108674f0e5639baebcf03b54b7ccf9e9a8662a2.patch"; - hash = "sha256-EQJkDR0eb7QWCjyMzXMn+Vbcwx3MMdC83oN7XSVJP0U="; - }) - (replaceVars ./patches/locale-binary-path.patch { locale = "${ if stdenv.hostPlatform.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc From 903de708a8d4221119e6f2faa2bcab8ed7ff7615 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 15 Feb 2025 11:27:29 +0100 Subject: [PATCH 0865/1107] postgresql_14: 14.15 -> 14.17 ChangeLog: https://www.postgresql.org/about/news/postgresql-173-167-1511-1416-and-1319-released-3015/ https://www.postgresql.org/about/news/out-of-cycle-release-scheduled-for-february-20-2025-3016/ Co-authored-by: Wolfgang Walther --- pkgs/servers/sql/postgresql/14.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/14.nix b/pkgs/servers/sql/postgresql/14.nix index cf4141008ffc..bee593a35fd2 100644 --- a/pkgs/servers/sql/postgresql/14.nix +++ b/pkgs/servers/sql/postgresql/14.nix @@ -1,7 +1,8 @@ import ./generic.nix { - version = "14.15"; - rev = "ref/tags/REL_14_15"; - hash = "sha256-slb6UiJyIzDaNS782/ZDVztBw4B4qTY6OuEWI+HZ+Ds="; + version = "14.17"; + # "Stamp 14.17" + rev = "e5cabe28006995d90cc9ebc613dad072c44c7f4a"; + hash = "sha256-BvmfxHHTcxRkWZoawvHanQeAuqHnQIh77RQjxPo5fuI="; muslPatches = { disable-test-collate-icu-utf8 = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; From e9a5ab86073f5ba26d5828b4cbd3e0841b30c2f5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 15 Feb 2025 11:28:15 +0100 Subject: [PATCH 0866/1107] postgresql_15: 15.10 -> 15.12 ChangeLog: https://www.postgresql.org/about/news/postgresql-173-167-1511-1416-and-1319-released-3015/ https://www.postgresql.org/about/news/out-of-cycle-release-scheduled-for-february-20-2025-3016/ Co-authored-by: Wolfgang Walther --- pkgs/servers/sql/postgresql/15.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/15.nix b/pkgs/servers/sql/postgresql/15.nix index 3b654c8fee95..c9d7f2f22a2a 100644 --- a/pkgs/servers/sql/postgresql/15.nix +++ b/pkgs/servers/sql/postgresql/15.nix @@ -1,7 +1,8 @@ import ./generic.nix { - version = "15.10"; - rev = "ref/tags/REL_15_10"; - hash = "sha256-5RNcoqcmcYCCBK8bmz2Wruky1mzDh5SrDF3OOV31GMw="; + version = "15.12"; + # "Stamp 15.12" + rev = "50d3d22baba63613d1f1406b2ed460dc9b03c3fc"; + hash = "sha256-6my9UzW05iYwTWR9y/VTZ1RQVNudavMFfUT9dpUQ15o="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql15/dont-use-locale-a-on-musl.patch?id=f424e934e6d076c4ae065ce45e734aa283eecb9c"; From 172fa69cbdf07b2e4a9d2c84929c7d65cebe6156 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 15 Feb 2025 11:28:40 +0100 Subject: [PATCH 0867/1107] postgresql_16: 16.6 -> 16.8 ChangeLog: https://www.postgresql.org/about/news/postgresql-173-167-1511-1416-and-1319-released-3015/ https://www.postgresql.org/about/news/out-of-cycle-release-scheduled-for-february-20-2025-3016/ Co-authored-by: Wolfgang Walther --- pkgs/servers/sql/postgresql/16.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/16.nix b/pkgs/servers/sql/postgresql/16.nix index 4ce791d49b19..6213c4d1b25c 100644 --- a/pkgs/servers/sql/postgresql/16.nix +++ b/pkgs/servers/sql/postgresql/16.nix @@ -1,7 +1,8 @@ import ./generic.nix { - version = "16.6"; - rev = "ref/tags/REL_16_6"; - hash = "sha256-cw/bSR9ZI6HFtbSTQxvuB7ng7V6g5SZZ7B0oMCz4E7Q="; + version = "16.8"; + # "Stamp 16.8" + rev = "71eb35c0b18de96537bd3876ec9bf8075bfd484f"; + hash = "sha256-nVUGBuvCDFXozTyEDAAQa+IR3expCdztH90J68FhAXQ="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql16/dont-use-locale-a-on-musl.patch?id=08a24be262339fd093e641860680944c3590238e"; From 70d670e42c6519b1c35cd27f1a2d7697e4b124aa Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 15 Feb 2025 11:29:09 +0100 Subject: [PATCH 0868/1107] postgresql_17: 17.2 -> 17.4 ChangeLog: https://www.postgresql.org/about/news/postgresql-173-167-1511-1416-and-1319-released-3015/ https://www.postgresql.org/about/news/out-of-cycle-release-scheduled-for-february-20-2025-3016/ Co-authored-by: Wolfgang Walther --- pkgs/servers/sql/postgresql/17.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/17.nix b/pkgs/servers/sql/postgresql/17.nix index e76114ee1aa6..130ef4216ef8 100644 --- a/pkgs/servers/sql/postgresql/17.nix +++ b/pkgs/servers/sql/postgresql/17.nix @@ -1,7 +1,8 @@ import ./generic.nix { - version = "17.2"; - rev = "ref/tags/REL_17_2"; - hash = "sha256-P7IwvMcOI6vW14PiB2R0NEzAEPeaKg0zaUKTw2GJ5DA="; + version = "17.4"; + # "Stamp 17.4" + rev = "f8554dee417ffc4540c94cf357f7bf7d4b6e5d80"; + hash = "sha256-TEpvX28chR3CXiOQsNY12t8WfM9ywoZVX1e/6mj9DqE="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql17/dont-use-locale-a-on-musl.patch?id=d69ead2c87230118ae7f72cef7d761e761e1f37e"; From 7a8b7390d88ff3af49ac1749e93314b8d0ff4572 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 12:44:21 +0000 Subject: [PATCH 0869/1107] libpq: 17.2 -> 17.4 ChangeLog: https://www.postgresql.org/about/news/postgresql-173-167-1511-1416-and-1319-released-3015/ https://www.postgresql.org/about/news/out-of-cycle-release-scheduled-for-february-20-2025-3016/ Co-authored-by: Maximilian Bosch Co-authored-by: Wolfgang Walther --- pkgs/servers/sql/postgresql/libpq.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/libpq.nix b/pkgs/servers/sql/postgresql/libpq.nix index 62e7fc9df6c7..16f361b1f2a2 100644 --- a/pkgs/servers/sql/postgresql/libpq.nix +++ b/pkgs/servers/sql/postgresql/libpq.nix @@ -29,14 +29,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "libpq"; - version = "17.2"; + version = "17.4"; src = fetchFromGitHub { owner = "postgres"; repo = "postgres"; # rev, not tag, on purpose: see generic.nix. - rev = "ref/tags/REL_17_2"; - hash = "sha256-P7IwvMcOI6vW14PiB2R0NEzAEPeaKg0zaUKTw2GJ5DA="; + rev = "f8554dee417ffc4540c94cf357f7bf7d4b6e5d80"; + hash = "sha256-TEpvX28chR3CXiOQsNY12t8WfM9ywoZVX1e/6mj9DqE="; }; __structuredAttrs = true; From 7cd5f9d16607ba39cf097f40bed552b280f41f61 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Tue, 18 Feb 2025 11:35:07 +0100 Subject: [PATCH 0870/1107] percona-server_8_0: fix broken symlink --- pkgs/servers/sql/percona-server/8_0.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/percona-server/8_0.nix b/pkgs/servers/sql/percona-server/8_0.nix index 1e7946b0b4de..45f5a5b99a69 100644 --- a/pkgs/servers/sql/percona-server/8_0.nix +++ b/pkgs/servers/sql/percona-server/8_0.nix @@ -142,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' moveToOutput "lib/*.a" $static so=${stdenv.hostPlatform.extensions.sharedLibrary} - ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so + ln -s libperconaserverclient$so $out/lib/libmysqlclient_r$so wrapProgram $out/bin/mysqld_safe --prefix PATH : ${ lib.makeBinPath [ From 762c7902514183d42b99fd353ec3e08f384705ca Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Tue, 18 Feb 2025 11:35:07 +0100 Subject: [PATCH 0871/1107] percona_server_8_4: fix broken symlink --- pkgs/servers/sql/percona-server/8_4.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/percona-server/8_4.nix b/pkgs/servers/sql/percona-server/8_4.nix index 068c5b946700..5a5a6d57726c 100644 --- a/pkgs/servers/sql/percona-server/8_4.nix +++ b/pkgs/servers/sql/percona-server/8_4.nix @@ -162,7 +162,7 @@ stdenv.mkDerivation (finalAttrs: { '' moveToOutput "lib/*.a" $static so=${stdenv.hostPlatform.extensions.sharedLibrary} - ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so + ln -s libperconaserverclient$so $out/lib/libmysqlclient_r$so wrapProgram $out/bin/mysqld_safe --prefix PATH : ${ lib.makeBinPath [ From 92dfde3dd8ab7c11de7ad841602e8400d4dfcf64 Mon Sep 17 00:00:00 2001 From: Sandro Date: Tue, 18 Feb 2025 11:40:50 +0100 Subject: [PATCH 0872/1107] nixos/mobilizon: minor format --- nixos/modules/services/web-apps/mobilizon.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/web-apps/mobilizon.nix b/nixos/modules/services/web-apps/mobilizon.nix index d130ed905428..c78f7104715d 100644 --- a/nixos/modules/services/web-apps/mobilizon.nix +++ b/nixos/modules/services/web-apps/mobilizon.nix @@ -455,7 +455,6 @@ in add_header Cache-Control "public, max-age=31536000, s-maxage=31536000, immutable"; ''; }; - }; }; From e0647dcfaf85014baa21e728031bcbc2e47562cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 11:07:35 +0000 Subject: [PATCH 0873/1107] circup: 2.1.1 -> 2.1.2 --- pkgs/by-name/ci/circup/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ci/circup/package.nix b/pkgs/by-name/ci/circup/package.nix index c7464f2ee953..2f4ac456ecbb 100644 --- a/pkgs/by-name/ci/circup/package.nix +++ b/pkgs/by-name/ci/circup/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "circup"; - version = "2.1.1"; + version = "2.1.2"; pyproject = true; src = fetchFromGitHub { owner = "adafruit"; repo = "circup"; tag = version; - hash = "sha256-G2c2Psd5cyjKkpqYQOLVWSeLIWdoxYm45KLT0q7cTzQ="; + hash = "sha256-lmuxqkZVByJwnfHj4yljWQwTvdLnguq3hZm6a7LN6Xo="; }; pythonRelaxDeps = [ "semver" ]; @@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "CircuitPython library updater"; homepage = "https://github.com/adafruit/circup"; - changelog = "https://github.com/adafruit/circup/releases/tag/${version}"; + changelog = "https://github.com/adafruit/circup/releases/tag/${src.tag}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; mainProgram = "circup"; From e6bfdde6bdf3c7bffd9cd549e6189d8349201af9 Mon Sep 17 00:00:00 2001 From: L-Trump Date: Tue, 18 Feb 2025 19:08:22 +0800 Subject: [PATCH 0874/1107] easytier: 2.1.2 -> 2.2.2 --- pkgs/by-name/ea/easytier/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ea/easytier/package.nix b/pkgs/by-name/ea/easytier/package.nix index 4a3410ecde67..ba56c33b08f8 100644 --- a/pkgs/by-name/ea/easytier/package.nix +++ b/pkgs/by-name/ea/easytier/package.nix @@ -11,18 +11,18 @@ rustPlatform.buildRustPackage rec { pname = "easytier"; - version = "2.1.2"; + version = "2.2.2"; src = fetchFromGitHub { owner = "EasyTier"; repo = "EasyTier"; tag = "v${version}"; - hash = "sha256-iY4HluL5TlYuKDBrz0fvLwJg/aX9lKiCyFs4V5WhQZs="; + hash = "sha256-Heb2ax2yUuGmqzIjrqjHUL3QZoofp7ATrIEN27ZA/Zs="; }; useFetchCargoVendor = true; - cargoHash = "sha256-KV7CdSEbmR7HIfKsS1sKsPqMz9Ku/rfbV8WmFkMC9oI="; + cargoHash = "sha256-U2ZK9GlfTjXsA7Fjd288YDlqSZNl3vHryLG1FE/GH5c="; nativeBuildInputs = [ protobuf ]; From 2d640b648a4295e46063e5fcb956de46603db037 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 18 Feb 2025 12:13:43 +0100 Subject: [PATCH 0875/1107] python312Packages.tensordict: 0.7.0 -> 0.7.1 Diff: https://github.com/pytorch/tensordict/compare/refs/tags/v0.7.0...v0.7.1 Changelog: https://github.com/pytorch/tensordict/releases/tag/v0.7.1 --- pkgs/development/python-modules/tensordict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensordict/default.nix b/pkgs/development/python-modules/tensordict/default.nix index 391142bc00f5..e9754a0a7817 100644 --- a/pkgs/development/python-modules/tensordict/default.nix +++ b/pkgs/development/python-modules/tensordict/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "tensordict"; - version = "0.7.0"; + version = "0.7.1"; pyproject = true; src = fetchFromGitHub { owner = "pytorch"; repo = "tensordict"; tag = "v${version}"; - hash = "sha256-KbCNBFewMx4kaWMoV+zREj6XTZiwmR4/I3zpf55wuOQ="; + hash = "sha256-tUm1uV9k/IDlR3y/e1aIlU1bjDeh2+zdJdxu8Z9x3es="; }; build-system = [ From fe74ef7dd5193faa8c07d9d32bed9696fc8913ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 11:21:18 +0000 Subject: [PATCH 0876/1107] azure-cli-extensions.vm-repair: 2.0.2 -> 2.0.3 --- pkgs/by-name/az/azure-cli/extensions-manual.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index e6cf38104e74..80794a25dff8 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -140,9 +140,9 @@ vm-repair = mkAzExtension rec { pname = "vm-repair"; - version = "2.0.2"; + version = "2.0.3"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/vm_repair-${version}-py2.py3-none-any.whl"; - hash = "sha256-ts7ByTWI1Chtx9kFQ3sfw4TWP8X5b1hYscudnYJDdOs="; + hash = "sha256-ynbq8XyoC6LR7N/x6Ztl74Gu4otTN+QiWLmvy7OfGA0="; description = "Support for repairing Azure Virtual Machines"; propagatedBuildInputs = with python3Packages; [ opencensus ]; meta.maintainers = with lib.maintainers; [ ]; From 24a5f5cc212ba92034e51ac32ce96a55e71de035 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 18 Feb 2025 13:09:48 +0100 Subject: [PATCH 0877/1107] python312Packages.torchrl: 0.7.0 -> 0.7.1 Diff: https://github.com/pytorch/rl/compare/refs/tags/v0.7.0...v0.7.1 Changelog: https://github.com/pytorch/rl/releases/tag/v0.7.1 --- pkgs/development/python-modules/torchrl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/torchrl/default.nix b/pkgs/development/python-modules/torchrl/default.nix index 1e249d4d255d..d2131e808c51 100644 --- a/pkgs/development/python-modules/torchrl/default.nix +++ b/pkgs/development/python-modules/torchrl/default.nix @@ -48,14 +48,14 @@ buildPythonPackage rec { pname = "torchrl"; - version = "0.7.0"; + version = "0.7.1"; pyproject = true; src = fetchFromGitHub { owner = "pytorch"; repo = "rl"; tag = "v${version}"; - hash = "sha256-SMVm1XfHHqSkWTDVSqqO3kIxMBgV9A+XrEpJ56AyaBE="; + hash = "sha256-+GE84GusipNZ18euV8ag0AbOtUrYfOxUAeXeCgF2OiI="; }; build-system = [ From 654ab78aa6b15217f847ead6fee8f6522dc83e4e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 12:32:22 +0000 Subject: [PATCH 0878/1107] umurmur: 0.2.20 -> 0.3.0 --- pkgs/by-name/um/umurmur/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/um/umurmur/package.nix b/pkgs/by-name/um/umurmur/package.nix index d2e5aa049896..60f42bf77bdc 100644 --- a/pkgs/by-name/um/umurmur/package.nix +++ b/pkgs/by-name/um/umurmur/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "umurmur"; - version = "0.2.20"; + version = "0.3.0"; src = fetchFromGitHub { owner = "umurmur"; repo = "umurmur"; rev = version; - sha256 = "sha256-jp5+NbGmT90ksffvpLYIX2q5cPeVidDCYMPvLHCiP68="; + sha256 = "sha256-q5k1Lv+/Kz602QFcdb/FoWWaH9peAQIf7u1NTCWKTBM="; }; nativeBuildInputs = [ autoreconfHook ]; From 5c4f0b02f991e5ef60cbd19b8d301f64f64240e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 12:33:08 +0000 Subject: [PATCH 0879/1107] ddcutil: 2.1.4 -> 2.2.0 --- pkgs/by-name/dd/ddcutil/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dd/ddcutil/package.nix b/pkgs/by-name/dd/ddcutil/package.nix index cd0ad0b31990..12754468dea7 100644 --- a/pkgs/by-name/dd/ddcutil/package.nix +++ b/pkgs/by-name/dd/ddcutil/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "ddcutil"; - version = "2.1.4"; + version = "2.2.0"; src = fetchurl { url = "https://www.ddcutil.com/tarballs/ddcutil-${version}.tar.gz"; - hash = "sha256-4U/igqtgw2rwyuhEkV1pWYPIyNZEt2N6hlXJ9bDUyRw="; + hash = "sha256-7Qx58cWCafSRuNyhcdSSuf7xM0JzcOG6UFiWa5K5VS4="; }; nativeBuildInputs = [ From 1feaad04030d5dcd4ccad5376a95faf7ac4f87b9 Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Sun, 16 Feb 2025 17:00:12 +0100 Subject: [PATCH 0880/1107] mealie: 2.3.0 -> 2.6.0 Changelog: https://github.com/mealie-recipes/mealie/releases/tag/v2.6.0 make mealie build --- .../me/mealie/0000_openai_1.63.0.patch | 13 +++++++++++ pkgs/by-name/me/mealie/package.nix | 23 +++++++------------ 2 files changed, 21 insertions(+), 15 deletions(-) create mode 100644 pkgs/by-name/me/mealie/0000_openai_1.63.0.patch diff --git a/pkgs/by-name/me/mealie/0000_openai_1.63.0.patch b/pkgs/by-name/me/mealie/0000_openai_1.63.0.patch new file mode 100644 index 000000000000..3d6489dcf2d0 --- /dev/null +++ b/pkgs/by-name/me/mealie/0000_openai_1.63.0.patch @@ -0,0 +1,13 @@ +diff --git a/mealie/services/openai/openai.py b/mealie/services/openai/openai.py +index 09c391d5..5d74d930 100644 +--- a/mealie/services/openai/openai.py ++++ b/mealie/services/openai/openai.py +@@ -7,7 +7,7 @@ from pathlib import Path + from textwrap import dedent + + from openai import NOT_GIVEN, AsyncOpenAI +-from openai.resources.chat.completions import ChatCompletion ++from openai.types.chat import ChatCompletion + from pydantic import BaseModel, field_validator + + from mealie.core.config import get_app_settings diff --git a/pkgs/by-name/me/mealie/package.nix b/pkgs/by-name/me/mealie/package.nix index 850b9caa0c61..20ebeef2a94b 100644 --- a/pkgs/by-name/me/mealie/package.nix +++ b/pkgs/by-name/me/mealie/package.nix @@ -10,12 +10,12 @@ }: let - version = "2.3.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "mealie-recipes"; repo = "mealie"; - rev = "v${version}"; - hash = "sha256-GN+uXyZCvDuFmQnXhn0mFans3bvvEw7Uq6V0OeCPEbE="; + tag = "v${version}"; + hash = "sha256-txkHCQ/xTakPXXFki161jNOKwAH9p9z1hCNEEkbqQtM="; }; frontend = callPackage (import ./mealie-frontend.nix src version) { }; @@ -55,6 +55,11 @@ pythonpkgs.buildPythonApplication rec { pythonRelaxDeps = true; + patches = [ + # compatiblity with openai 1.63.0 + ./0000_openai_1.63.0.patch + ]; + dependencies = with pythonpkgs; [ aiofiles alembic @@ -97,15 +102,6 @@ pythonpkgs.buildPythonApplication rec { substituteInPlace mealie/__init__.py \ --replace-fail '__version__ = ' '__version__ = "v${version}" #' - - substituteInPlace mealie/services/backups_v2/alchemy_exporter.py \ - --replace-fail 'PROJECT_DIR = ' "PROJECT_DIR = Path('$out') #" - - substituteInPlace mealie/db/init_db.py \ - --replace-fail 'PROJECT_DIR = ' "PROJECT_DIR = Path('$out') #" - - substituteInPlace mealie/services/backups_v2/alchemy_exporter.py \ - --replace-fail '"script_location", path.join(PROJECT_DIR, "alembic")' '"script_location", "${src}/alembic"' ''; postInstall = @@ -122,9 +118,6 @@ pythonpkgs.buildPythonApplication rec { mkdir -p $out/bin $out/libexec rm -f $out/bin/* - substitute ${src}/alembic.ini $out/alembic.ini \ - --replace-fail 'script_location = alembic' 'script_location = ${src}/alembic' - makeWrapper ${start_script} $out/bin/mealie \ --set PYTHONPATH "$out/${python.sitePackages}:${pythonpkgs.makePythonPath dependencies}" \ --set LD_LIBRARY_PATH "${crfpp}/lib" \ From 1d4b238173703ce62592f1cd9f418563d3711b44 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 18 Feb 2025 13:46:49 +0100 Subject: [PATCH 0881/1107] openssh, openssh_hpn, openssh_gssapi: 9.9p1 -> 9.9p2 Fixes CVE-2025-26465 and CVE-2025-26466. https://www.qualys.com/2025/02/18/openssh-mitm-dos.txt https://www.openssh.com/releasenotes.html#9.9p2 --- pkgs/tools/networking/openssh/common.nix | 4 ---- pkgs/tools/networking/openssh/default.nix | 16 ++++++++-------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index 631c6175012c..03ccad62723e 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -50,10 +50,6 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./locale_archive.patch - (fetchurl { - url = "https://git.alpinelinux.org/aports/plain/main/openssh/gss-serv.c.patch?id=a7509603971ce2f3282486a43bb773b1b522af83"; - sha256 = "sha256-eFFOd4B2nccRZAQWwdBPBoKWjfEdKEVGJvKZAzLu3HU="; - }) # See discussion in https://github.com/NixOS/nixpkgs/pull/16966 ./dont_create_privsep_path.patch ] ++ extraPatches; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 80a48c178e60..d8237cae7a3c 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -11,11 +11,11 @@ in { openssh = common rec { pname = "openssh"; - version = "9.9p1"; + version = "9.9p2"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - hash = "sha256-s0P7zb/4fxWxmG5uFdbU/Jp9NgZr5rf7UHCHuo+WbAI="; + hash = "sha256-karbYD4IzChe3fll4RmdAlhfqU2ZTWyuW0Hhch4hVnM="; }; extraPatches = [ ./ssh-keysign-8.5.patch ]; @@ -24,12 +24,12 @@ in openssh_hpn = common rec { pname = "openssh-with-hpn"; - version = "9.9p1"; + version = "9.9p2"; extraDesc = " with high performance networking patches"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - hash = "sha256-s0P7zb/4fxWxmG5uFdbU/Jp9NgZr5rf7UHCHuo+WbAI="; + hash = "sha256-karbYD4IzChe3fll4RmdAlhfqU2ZTWyuW0Hhch4hVnM="; }; extraPatches = @@ -67,12 +67,12 @@ in openssh_gssapi = common rec { pname = "openssh-with-gssapi"; - version = "9.9p1"; + version = "9.9p2"; extraDesc = " with GSSAPI support"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - hash = "sha256-s0P7zb/4fxWxmG5uFdbU/Jp9NgZr5rf7UHCHuo+WbAI="; + hash = "sha256-karbYD4IzChe3fll4RmdAlhfqU2ZTWyuW0Hhch4hVnM="; }; extraPatches = [ @@ -80,8 +80,8 @@ in (fetchpatch { name = "openssh-gssapi.patch"; - url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%25${version}-2/debian/patches/gssapi.patch"; - hash = "sha256-cQF5psMZpLWwVqK9CNi+Q8wHn6w6ffQUJRNI5jKGgD0="; + url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%25${version}-1/debian/patches/gssapi.patch"; + hash = "sha256-JyOXA8Al8IFLdndJQ1LO+r4hJqtXjz1NHwOPiSAQkE8="; }) ]; From 9ea04b91183c9f1854ee19e649f321b83a0ed371 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Tue, 18 Feb 2025 11:40:14 +0100 Subject: [PATCH 0882/1107] rocqPackages.rocq-elpi: init at 2.5.0 --- .../coq-modules/coq-elpi/default.nix | 25 ++++++- .../coq-modules/hierarchy-builder/default.nix | 5 +- .../rocq-modules/rocq-elpi/default.nix | 68 +++++++++++++++++++ pkgs/top-level/rocq-packages.nix | 1 + 4 files changed, 96 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/rocq-modules/rocq-elpi/default.nix diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index 5c0f9d2a6e9e..9fe57b01822c 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -3,6 +3,7 @@ mkCoqDerivation, which, coq, + rocqPackages, stdlib, version ? null, elpi-version ? null, @@ -34,7 +35,7 @@ derivation = mkCoqDerivation { owner = "LPCIC"; inherit version; defaultVersion = lib.switch coq.coq-version [ - { case = "9.0"; out = "2.4.0"; } + { case = "9.0"; out = "2.5.0"; } { case = "8.20"; out = "2.2.0"; } { case = "8.19"; out = "2.0.1"; } { case = "8.18"; out = "2.0.0"; } @@ -46,6 +47,7 @@ derivation = mkCoqDerivation { { case = "8.12"; out = "1.8.3_8.12"; } { case = "8.11"; out = "1.6.3_8.11"; } ] null; + release."2.5.0".sha256 = "sha256-Z5xjO83X/ZoTQlWnVupGXPH3HuJefr57Kv128I0dltg="; release."2.4.0".sha256 = "sha256-W2+vVGExLLux8e0nSZESSoMVvrLxhL6dmXkb+JuKiqc="; release."2.2.0".sha256 = "sha256-rADEoqTXM7/TyYkUKsmCFfj6fjpWdnZEOK++5oLfC/I="; release."2.0.1".sha256 = "sha256-cuoPsEJ+JRLVc9Golt2rJj4P7lKltTrrmQijjoViooc="; @@ -127,4 +129,23 @@ patched-derivation3 = patched-derivation2.overrideAttrs propagatedBuildInputs = o.propagatedBuildInputs ++ [ stdlib ]; } ); -in patched-derivation3 +patched-derivation4 = patched-derivation3.overrideAttrs + ( + o: + # this is just a wrapper for rocPackages.bignums for Rocq >= 9.0 + lib.optionalAttrs (coq.version != null && (coq.version == "dev" + || lib.versions.isGe "9.0" coq.version)) { + configurePhase = '' + echo no configuration + ''; + buildPhase = '' + echo building nothing + ''; + installPhase = '' + echo installing nothing + ''; + propagatedBuildInputs = o.propagatedBuildInputs + ++ [ rocqPackages.rocq-elpi ]; + } + ); +in patched-derivation4 diff --git a/pkgs/development/coq-modules/hierarchy-builder/default.nix b/pkgs/development/coq-modules/hierarchy-builder/default.nix index 270c9a26d337..33105a0f89b3 100644 --- a/pkgs/development/coq-modules/hierarchy-builder/default.nix +++ b/pkgs/development/coq-modules/hierarchy-builder/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, coq, coq-elpi, version ? null }: +{ lib, mkCoqDerivation, coq, stdlib, coq-elpi, version ? null }: let hb = mkCoqDerivation { pname = "hierarchy-builder"; @@ -48,4 +48,7 @@ hb.overrideAttrs (o: { installFlags = [ "DESTDIR=$(out)" ] ++ o.installFlags; } else { installFlags = [ "VFILES=structures.v" ] ++ o.installFlags; }) + // + lib.optionalAttrs (lib.versions.isLe "1.8.1" o.version) + { propagatedBuildInputs = o.propagatedBuildInputs ++ [ stdlib ]; } ) diff --git a/pkgs/development/rocq-modules/rocq-elpi/default.nix b/pkgs/development/rocq-modules/rocq-elpi/default.nix new file mode 100644 index 000000000000..738d6a42c9d4 --- /dev/null +++ b/pkgs/development/rocq-modules/rocq-elpi/default.nix @@ -0,0 +1,68 @@ +{ + lib, + mkRocqDerivation, + which, + rocq-core, + version ? null, + elpi-version ? null, +}: + +let +default-elpi-version = if elpi-version != null then elpi-version else ( + lib.switch rocq-core.rocq-version [ + { case = "9.0"; out = "2.0.7"; } + ] { } +); +elpi = rocq-core.ocamlPackages.elpi.override { version = default-elpi-version; }; +propagatedBuildInputs_wo_elpi = [ + rocq-core.ocamlPackages.findlib + rocq-core.ocamlPackages.ppx_optcomp +]; +derivation = mkRocqDerivation { + pname = "elpi"; + repo = "coq-elpi"; + owner = "LPCIC"; + inherit version; + defaultVersion = lib.switch rocq-core.rocq-version [ + { case = "9.0"; out = "2.5.0"; } + ] null; + release."2.5.0".sha256 = "sha256-Z5xjO83X/ZoTQlWnVupGXPH3HuJefr57Kv128I0dltg="; + releaseRev = v: "v${v}"; + + mlPlugin = true; + useDune = true; + + propagatedBuildInputs = propagatedBuildInputs_wo_elpi ++ [ elpi ]; + + configurePhase = '' + patchShebangs etc/with-rocq-wrap.sh + make dune-files || true + ''; + + buildPhase = '' + etc/with-rocq-wrap.sh dune build -p rocq-elpi @install ''${enableParallelBuilding:+-j $NIX_BUILD_CORES} + ''; + + installPhase = '' + etc/with-rocq-wrap.sh dune install --root . rocq-elpi --prefix=$out --libdir $OCAMLFIND_DESTDIR + mkdir $out/lib/coq/ + mv $OCAMLFIND_DESTDIR/coq $out/lib/coq/${rocq-core.rocq-version} + ''; + + meta = { + description = "Rocq plugin embedding ELPI"; + maintainers = [ lib.maintainers.cohencyril ]; + license = lib.licenses.lgpl21Plus; + }; +}; +patched-derivation1 = derivation.overrideAttrs + ( + o: + lib.optionalAttrs (o ? elpi-version) + { + propagatedBuildInputs = propagatedBuildInputs_wo_elpi ++ [ + (rocq-core.ocamlPackages.elpi.override { version = o.elpi-version; }) + ]; + } + ); +in patched-derivation1 diff --git a/pkgs/top-level/rocq-packages.nix b/pkgs/top-level/rocq-packages.nix index ef00e278f132..44a59c87c407 100644 --- a/pkgs/top-level/rocq-packages.nix +++ b/pkgs/top-level/rocq-packages.nix @@ -14,6 +14,7 @@ let mkRocqDerivation = lib.makeOverridable (callPackage ../build-support/rocq {}); bignums = callPackage ../development/rocq-modules/bignums {}; + rocq-elpi = callPackage ../development/rocq-modules/rocq-elpi {}; stdlib = callPackage ../development/rocq-modules/stdlib {}; filterPackages = doesFilter: if doesFilter then filterRocqPackages self else self; From 688232dcd4e8f97f4670729681dd69b051fd0457 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 18 Feb 2025 13:50:25 +0100 Subject: [PATCH 0883/1107] opencv: add missing hash for ipp support --- pkgs/development/libraries/opencv/4.x.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index f7b5fc367523..aa1142c9070f 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -141,7 +141,7 @@ let owner = "opencv"; repo = "opencv_3rdparty"; rev = "7f55c0c26be418d494615afca15218566775c725"; - hash = ""; + hash = "sha256-XbmS+FXUL8MAG7kawbDkb2XHG9R0DpPhiYhq/18eTnY="; } + "/ippicv"; files = let name = platform: "ippicv_2021.10.0_${platform}_20230919_general.tgz"; in if effectiveStdenv.hostPlatform.system == "x86_64-linux" then @@ -555,6 +555,7 @@ effectiveStdenv.mkDerivation { tests = { inherit (gst_all_1) gst-plugins-bad; + withIpp = opencv4.override { enableIpp = true; }; } // optionalAttrs (!effectiveStdenv.hostPlatform.isDarwin) { inherit qimgv; } // optionalAttrs (!enablePython) { pythonEnabled = pythonPackages.opencv4; } From 41d0ceb0f81a97ea9353c5ab616ddec6ea971009 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 18 Feb 2025 16:02:26 +0300 Subject: [PATCH 0884/1107] home-assistant-custom-components.tuya_local: 2025.1.2 -> 2025.2.0 Diff: https://github.com/make-all/tuya-local/compare/refs/tags/2025.1.2...2025.2.0 Changelog: https://github.com/make-all/tuya-local/releases/tag/2025.2.0 --- .../home-assistant/custom-components/tuya_local/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix b/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix index 6ce4f09a4bf6..65c5776c734b 100644 --- a/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix +++ b/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix @@ -11,13 +11,13 @@ buildHomeAssistantComponent rec { owner = "make-all"; domain = "tuya_local"; - version = "2025.1.2"; + version = "2025.2.0"; src = fetchFromGitHub { inherit owner; repo = "tuya-local"; tag = version; - hash = "sha256-qgNXY31YPzD1R+mdkw1nb35JU1rZ6kNj5Npjn+qfon4="; + hash = "sha256-G/+mAq++bJ2Z41B6gi/izBLvuZwew3Tx/0mGZm4g6TE="; }; dependencies = [ From d461b13ba860251e0c60877b6f44c67f16804929 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 13:26:02 +0000 Subject: [PATCH 0885/1107] witness: 0.7.0 -> 0.8.0 --- pkgs/by-name/wi/witness/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wi/witness/package.nix b/pkgs/by-name/wi/witness/package.nix index d52ea85af158..fbeb249cd0c2 100644 --- a/pkgs/by-name/wi/witness/package.nix +++ b/pkgs/by-name/wi/witness/package.nix @@ -11,15 +11,15 @@ buildGoModule rec { pname = "witness"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "in-toto"; repo = "witness"; rev = "v${version}"; - sha256 = "sha256-eHAEaecL4bJUZfFiXK3NqgTZU9l6b46WI/vDBuAqCUw="; + sha256 = "sha256-KqsBeKtMLLCtGoFfYOgIy0b+fYRpV7zCHVjPzgXj6Zo="; }; - vendorHash = "sha256-AZRY8N88dUKAybdstSTRB8sirx4L4ZmiffQ7Qwlpb/8="; + vendorHash = "sha256-0zl+sdF6ZNAW2R9MskLvwfd1ppMtvFgkUvp5ibh23oI="; nativeBuildInputs = [ installShellFiles ]; From d523378fc83be19a2742d0dfd48f414671a60a4e Mon Sep 17 00:00:00 2001 From: LordMZTE Date: Sun, 16 Feb 2025 12:42:19 +0100 Subject: [PATCH 0886/1107] xfce.thunar-vcs-plugin: init at 0.3.0 --- pkgs/desktops/xfce/default.nix | 2 ++ .../xfce/thunar-plugins/vcs/default.nix | 36 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/desktops/xfce/thunar-plugins/vcs/default.nix diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index dabfe761a7ba..56e1924069b1 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -43,6 +43,8 @@ makeScopeWithSplicing' { thunar-media-tags-plugin = callPackage ./thunar-plugins/media-tags { }; + thunar-vcs-plugin = callPackage ./thunar-plugins/vcs { }; + tumbler = callPackage ./core/tumbler { }; xfce4-panel = callPackage ./core/xfce4-panel { }; diff --git a/pkgs/desktops/xfce/thunar-plugins/vcs/default.nix b/pkgs/desktops/xfce/thunar-plugins/vcs/default.nix new file mode 100644 index 000000000000..d74a0c2720b8 --- /dev/null +++ b/pkgs/desktops/xfce/thunar-plugins/vcs/default.nix @@ -0,0 +1,36 @@ +{ + lib, + mkXfceDerivation, + thunar, + exo, + libxfce4util, + subversion, + apr, + aprutil, + withSubversion ? false, +}: +mkXfceDerivation { + category = "thunar-plugins"; + pname = "thunar-vcs-plugin"; + version = "0.3.0"; + odd-unstable = false; + + sha256 = "sha256-e9t6lIsvaV/2AAL/7I4Pbcokvy7Lp2+D9sJefTZqB1g="; + + buildInputs = + [ + thunar + exo + libxfce4util + ] + ++ lib.optionals withSubversion [ + apr + aprutil + subversion + ]; + + meta = { + description = "Thunar plugin providing support for Subversion and Git"; + maintainers = with lib.maintainers; [ lordmzte ] ++ lib.teams.xfce.members; + }; +} From 9837de0da7885ff76628494ba5c97384c3655623 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sun, 16 Feb 2025 00:43:26 +0700 Subject: [PATCH 0887/1107] elm-land: Rewrite and migrate from elmPackages to pkgs/by-name Signed-off-by: Ilan Joselevich --- .editorconfig | 2 +- pkgs/by-name/el/elm-land/elm-srcs.nix | 67 + pkgs/by-name/el/elm-land/package.nix | 71 + pkgs/by-name/el/elm-land/registry.dat | Bin 0 -> 349 bytes .../compilers/elm/packages/node/default.nix | 41 +- .../elm/packages/node/node-composition.nix | 2 +- .../elm/packages/node/node-packages.json | 1 - .../elm/packages/node/node-packages.nix | 4442 ++++++++--------- 8 files changed, 2164 insertions(+), 2462 deletions(-) create mode 100644 pkgs/by-name/el/elm-land/elm-srcs.nix create mode 100644 pkgs/by-name/el/elm-land/package.nix create mode 100644 pkgs/by-name/el/elm-land/registry.dat diff --git a/.editorconfig b/.editorconfig index 29e0a4aa8566..ce32c88d7c90 100644 --- a/.editorconfig +++ b/.editorconfig @@ -90,7 +90,7 @@ indent_style = unset insert_final_newline = unset trim_trailing_whitespace = unset -[pkgs/development/compilers/elm/registry.dat] +[registry.dat] end_of_line = unset insert_final_newline = unset diff --git a/pkgs/by-name/el/elm-land/elm-srcs.nix b/pkgs/by-name/el/elm-land/elm-srcs.nix new file mode 100644 index 000000000000..154eeb6de42e --- /dev/null +++ b/pkgs/by-name/el/elm-land/elm-srcs.nix @@ -0,0 +1,67 @@ +{ + + "elm/browser" = { + sha256 = "0nagb9ajacxbbg985r4k9h0jadqpp0gp84nm94kcgbr5sf8i9x13"; + version = "1.0.2"; + }; + + "elm/core" = { + sha256 = "19w0iisdd66ywjayyga4kv2p1v9rxzqjaxhckp8ni6n8i0fb2dvf"; + version = "1.0.5"; + }; + + "elm/html" = { + sha256 = "1n3gpzmpqqdsldys4ipgyl1zacn0kbpc3g4v3hdpiyfjlgh8bf3k"; + version = "1.0.0"; + }; + + "elm/json" = { + sha256 = "0kjwrz195z84kwywaxhhlnpl3p251qlbm5iz6byd6jky2crmyqyh"; + version = "1.1.3"; + }; + + "stil4m/elm-syntax" = { + sha256 = "1dlk7gslh9la6y7y3d56a37lsymmz32rlspbywcfmq40mq9hiify"; + version = "7.2.9"; + }; + + "elm-community/list-extra" = { + sha256 = "043iwpdwyrfb1jndxh7kf7xlkgq1v6pjczv1r1b19p2wky6nmy8z"; + version = "8.5.2"; + }; + + "elm/parser" = { + sha256 = "0a3cxrvbm7mwg9ykynhp7vjid58zsw03r63qxipxp3z09qks7512"; + version = "1.1.0"; + }; + + "elm/time" = { + sha256 = "0vch7i86vn0x8b850w1p69vplll1bnbkp8s383z7pinyg94cm2z1"; + version = "1.0.0"; + }; + + "elm/url" = { + sha256 = "0av8x5syid40sgpl5vd7pry2rq0q4pga28b4yykn9gd9v12rs3l4"; + version = "1.0.0"; + }; + + "elm/virtual-dom" = { + sha256 = "1yvb8px2z62xd578ag2q0r5hd1vkz9y7dfkx05355iiy1d7jwq4v"; + version = "1.0.3"; + }; + + "miniBill/elm-unicode" = { + sha256 = "18w246bvra93amvqq3r2kqdv5ad8iavnhvcsbfdxw6747pi6pg2f"; + version = "1.0.2"; + }; + + "rtfeldman/elm-hex" = { + sha256 = "1y0aa16asvwdqmgbskh5iba6psp43lkcjjw9mgzj3gsrg33lp00d"; + version = "1.0.0"; + }; + + "stil4m/structured-writer" = { + sha256 = "02k32yaw275bivab90wy8qkbys3gg4fw53f798dzf1j9wharhg12"; + version = "1.0.3"; + }; +} diff --git a/pkgs/by-name/el/elm-land/package.nix b/pkgs/by-name/el/elm-land/package.nix new file mode 100644 index 000000000000..b086dac6f058 --- /dev/null +++ b/pkgs/by-name/el/elm-land/package.nix @@ -0,0 +1,71 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + elmPackages, + versionCheckHook, + writeShellScript, + nix-update, + elm2nix, + nixfmt-rfc-style, +}: + +buildNpmPackage rec { + pname = "elm-land"; + version = "0.20.1"; + + src = fetchFromGitHub { + owner = "elm-land"; + repo = "elm-land"; + rev = "v${version}"; + hash = "sha256-PFyiVTH2Cek377YZwaCmvDToQCaxWQvJrQkRhyNI2Wg="; + }; + + sourceRoot = "${src.name}/projects/cli"; + + npmDepsHash = "sha256-Bg16s0tqEaUT+BbFMKuEtx32rmbZLIILp8Ra/dQGmUg="; + + npmRebuildFlags = [ "--ignore-scripts" ]; + + postConfigure = + (elmPackages.fetchElmDeps { + elmPackages = import ./elm-srcs.nix; + elmVersion = elmPackages.elm.version; + registryDat = ./registry.dat; + }) + + '' + ln -sf ${lib.getExe elmPackages.elm} node_modules/.bin/elm + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + passthru.updateScript = writeShellScript "update-elm-land" '' + set -eu -o pipefail + + # Update version, src and npm deps + ${lib.getExe nix-update} "$UPDATE_NIX_ATTR_PATH" + + # Update elm deps + cp "$(nix-build -A "$UPDATE_NIX_ATTR_PATH".src)/projects/cli/src/codegen/elm.json" elm.json + trap 'rm -rf elm.json registry.dat &> /dev/null' EXIT + ${lib.getExe elm2nix} convert > pkgs/by-name/el/elm-land/elm-srcs.nix + ${lib.getExe nixfmt-rfc-style} pkgs/by-name/el/elm-land/elm-srcs.nix + ${lib.getExe elm2nix} snapshot + cp registry.dat pkgs/by-name/el/elm-land/registry.dat + ''; + + meta = { + description = "A production-ready framework for building Elm applications"; + homepage = "https://github.com/elm-land/elm-land"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + domenkozar + zupo + ]; + mainProgram = "elm-land"; + }; +} diff --git a/pkgs/by-name/el/elm-land/registry.dat b/pkgs/by-name/el/elm-land/registry.dat new file mode 100644 index 0000000000000000000000000000000000000000..503848580f45a8e96c050fee139952537dd205c0 GIT binary patch literal 349 zcmZR80A2{iz{{MPlgpk|lwV$)TExh}1Qlig39}^U7o{>Xu%d`%l;q|x!bBJ#>avRS z^B5VKVWJ?tYz2u$AQKTvL82@rnYpP5A+T=d(js&Nxyv$(N=g%RbW`$k85!W_@}}nG z>L%ys=9cDVmQ-@(WEPj`rdE^`C33LB-OZ7knV0F5nUli}Qe2vsnVg@JisUcOqLQ@K zoRr+eJa&+RjMNGw=dcx*WagOUa)D%uEAvVcE7+MhVZMS&3Ko|Xl_r;z7Nw@>mKSA~ JfI Date: Tue, 18 Feb 2025 14:12:11 +0000 Subject: [PATCH 0888/1107] mdbook-admonish: 1.18.0 -> 1.19.0 --- pkgs/by-name/md/mdbook-admonish/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/md/mdbook-admonish/package.nix b/pkgs/by-name/md/mdbook-admonish/package.nix index 1e41e3056248..7533d25f6c7c 100644 --- a/pkgs/by-name/md/mdbook-admonish/package.nix +++ b/pkgs/by-name/md/mdbook-admonish/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-admonish"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "tommilligan"; repo = pname; tag = "v${version}"; - hash = "sha256-GNQIOjgHCt3XPCzF0RjV9YStI8psLdHhTPuTkdgx8vA="; + hash = "sha256-rlJowyyB83bNqzOavggbwVJg9/GYZLYjGr8Pv/O6UBE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-GbXLlWHbLL7HbyuX223S/o1/+LwbK8FjL7lnEgVVn00="; + cargoHash = "sha256-ilX/Tky3eQB0Aumz+gRRyaVz/MAM/qiNrGulZSPGUg0="; meta = { description = "Preprocessor for mdbook to add Material Design admonishments"; From 96c93afd6127276ab84a634641a49fefdfdd5e5f Mon Sep 17 00:00:00 2001 From: jervw Date: Wed, 12 Feb 2025 22:51:29 +0200 Subject: [PATCH 0889/1107] mpls: init at 0.12.0 --- pkgs/by-name/mp/mpls/package.nix | 42 ++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 pkgs/by-name/mp/mpls/package.nix diff --git a/pkgs/by-name/mp/mpls/package.nix b/pkgs/by-name/mp/mpls/package.nix new file mode 100644 index 000000000000..b848022a8116 --- /dev/null +++ b/pkgs/by-name/mp/mpls/package.nix @@ -0,0 +1,42 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + versionCheckHook, +}: +buildGoModule rec { + pname = "mpls"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "mhersson"; + repo = "mpls"; + tag = "v${version}"; + hash = "sha256-2NOP5k3N2T2T8zg/6SlKDRJsWt+LcjAOmYe/tMrjCnc="; + }; + + vendorHash = "sha256-6iXZWLCF0LfchcGSFrCtILLeR1Yx7oxD/7JIYyrrkHM="; + + ldflags = [ + "-s" + "-w" + "-X github.com/mhersson/mpls/cmd.Version=${version}" + "-X github.com/mhersson/mpls/internal/mpls.Version=${version}" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Live preview of markdown using Language Server Protocol"; + homepage = "https://github.com/mhersson/mpls"; + changelog = "https://github.com/mhersson/mpls/releases/tag/${src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jervw ]; + mainProgram = "mpls"; + }; +} From 7d50d466710fe8e1cedca8b88c641833fe19d0fb Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 18 Feb 2025 15:12:31 +0100 Subject: [PATCH 0890/1107] opencv: do not add withIpp to passthru.tests on darwin --- pkgs/development/libraries/opencv/4.x.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index aa1142c9070f..b876a8f1780d 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -555,9 +555,11 @@ effectiveStdenv.mkDerivation { tests = { inherit (gst_all_1) gst-plugins-bad; + } + // optionalAttrs (!effectiveStdenv.hostPlatform.isDarwin) { + inherit qimgv; withIpp = opencv4.override { enableIpp = true; }; } - // optionalAttrs (!effectiveStdenv.hostPlatform.isDarwin) { inherit qimgv; } // optionalAttrs (!enablePython) { pythonEnabled = pythonPackages.opencv4; } // optionalAttrs (effectiveStdenv.buildPlatform != "x86_64-darwin") { opencv4-tests = callPackage ./tests.nix { From 8b0a00d67a08a9e0dc6be6fcb3262bd126cea047 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 14:29:34 +0000 Subject: [PATCH 0891/1107] lighthouse-steamvr: 1.2.0 -> 1.3.0 --- pkgs/tools/misc/lighthouse-steamvr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/lighthouse-steamvr/default.nix b/pkgs/tools/misc/lighthouse-steamvr/default.nix index 77afc0114258..fbb8e2647c67 100644 --- a/pkgs/tools/misc/lighthouse-steamvr/default.nix +++ b/pkgs/tools/misc/lighthouse-steamvr/default.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "Lighthouse"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "ShayBox"; repo = pname; rev = version; - hash = "sha256-uJ8U4knNKAliHjxP0JnV1lSCEsB6OHyYSbb5aWboYV4="; + hash = "sha256-3zcMxPOJ4Vvl3HTK13pG3/4duK+2O6i4acv9Uz5zWjA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-YJgtkrDs7cBpjux0SE6TTXcduZRC+8+4SMMiCXYeCYI="; + cargoHash = "sha256-iVcNwWADF84yQyzIb8WJpJqWGVAaHOVnbdDHFeHXHyI="; nativeBuildInputs = [ pkg-config ]; From f1ad64212af3dac636ef3c3e37735fb31d0056fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 14:32:16 +0000 Subject: [PATCH 0892/1107] fn-cli: 0.6.36 -> 0.6.38 --- pkgs/by-name/fn/fn-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fn/fn-cli/package.nix b/pkgs/by-name/fn/fn-cli/package.nix index 01be247931a6..60a6d684efca 100644 --- a/pkgs/by-name/fn/fn-cli/package.nix +++ b/pkgs/by-name/fn/fn-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "fn"; - version = "0.6.36"; + version = "0.6.38"; src = fetchFromGitHub { owner = "fnproject"; repo = "cli"; rev = version; - hash = "sha256-JL1Xobmt6T7sSbEEj8L5+XB8/LbxMjhcmRxO//xVSQQ="; + hash = "sha256-JzOt0wjlChK07NhZ0y5kFtsmN5cLL4dJStogmGucAgc="; }; vendorHash = null; From 36016cf26b686e44c0f332d57669082e8a3b3748 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 18 Feb 2025 11:00:16 +0100 Subject: [PATCH 0893/1107] vimPlugins.faust-nvim: init at 2022-06-01 --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 11 +++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 25 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index aacd40cc52ed..837b66b77dd8 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -4496,6 +4496,19 @@ final: prev: meta.hydraPlatforms = [ ]; }; + faust-nvim = buildVimPlugin { + pname = "faust-nvim"; + version = "2022-06-01"; + src = fetchFromGitHub { + owner = "madskjeldgaard"; + repo = "faust-nvim"; + rev = "d6e8b1658233df74ac8dc1dc84a3f7568dc00586"; + sha256 = "0zf8zfc6baxd93w5iyhldcda5izb5ldrxb0wkcxqkp95azsc871w"; + }; + meta.homepage = "https://github.com/madskjeldgaard/faust-nvim/"; + meta.hydraPlatforms = [ ]; + }; + fcitx-vim = buildVimPlugin { pname = "fcitx.vim"; version = "2024-04-21"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index dca05fc8405e..2bd78cecc1f1 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1099,6 +1099,17 @@ in dependencies = [ self.nui-nvim ]; }; + faust-nvim = super.faust-nvim.overrideAttrs { + dependencies = with self; [ + luasnip + nvim-fzf + ]; + nvimSkipModule = [ + # E5108: Error executing lua vim/_init_packages.lua:0: ...in-faust-nvim-2022-06-01/lua/faust-nvim/autosnippets.lua:3: '=' expected near 'wd' + "faust-nvim.autosnippets" + ]; + }; + fcitx-vim = super.fcitx-vim.overrideAttrs { passthru.python3Dependencies = ps: with ps; [ dbus-python ]; meta = { diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index ca4e3f7122cc..7a9502155352 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -344,6 +344,7 @@ https://github.com/brooth/far.vim/,, https://github.com/Chaitanyabsprip/fastaction.nvim/,HEAD, https://github.com/pteroctopus/faster.nvim/,HEAD, https://github.com/konfekt/fastfold/,, +https://github.com/madskjeldgaard/faust-nvim/,HEAD, https://github.com/lilydjwg/fcitx.vim/,fcitx5, https://github.com/bakpakin/fennel.vim/,, https://github.com/wincent/ferret/,, From 27178320875ea48abe31aab6ad902fa0127178a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Feb 2025 00:06:10 +0000 Subject: [PATCH 0894/1107] i3wsr: 2.1.1 -> 3.1.1 --- pkgs/applications/window-managers/i3/wsr.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/i3/wsr.nix b/pkgs/applications/window-managers/i3/wsr.nix index cc3e9bbce47b..dd2efb0a022c 100644 --- a/pkgs/applications/window-managers/i3/wsr.nix +++ b/pkgs/applications/window-managers/i3/wsr.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "i3wsr"; - version = "2.1.1"; + version = "3.1.1"; src = fetchFromGitHub { owner = "roosta"; - repo = pname; + repo = "i3wsr"; rev = "v${version}"; - sha256 = "sha256-Mq4TpQDiIYePUS3EwBfOe2+QmvF6+WEDK12WahbuhSU="; + hash = "sha256-RTJ+up3mt6KuMkTBCXDUmztxwEQCeyAjuhhOUrdIfTo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ecFlektG6CcGvD2l39MuplknpXuJ5B08ydJunxI7Pvg="; + cargoHash = "sha256-7WS+8EGGl8sJ3TeT7IM+u1AiD0teJ2AITb++zK/keXs="; nativeBuildInputs = [ python3 ]; buildInputs = [ libxcb ]; From 4be578e7dd9e81b258f67925bf2275e8bd1a7e72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Tue, 18 Feb 2025 09:57:45 -0500 Subject: [PATCH 0895/1107] yazi-unwrapped: add man pages --- pkgs/by-name/ya/yazi-unwrapped/package.nix | 28 ++++++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ya/yazi-unwrapped/package.nix b/pkgs/by-name/ya/yazi-unwrapped/package.nix index 574b9207f9a0..5b21ada86a24 100644 --- a/pkgs/by-name/ya/yazi-unwrapped/package.nix +++ b/pkgs/by-name/ya/yazi-unwrapped/package.nix @@ -8,18 +8,34 @@ Foundation, rust-jemalloc-sys, }: - -rustPlatform.buildRustPackage rec { - pname = "yazi"; +let version = "25.2.11"; - src = fetchFromGitHub { + code_src = fetchFromGitHub { owner = "sxyazi"; repo = "yazi"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-yVpSoEmEA+/XF/jlJqKdkj86m8IZLAbrxDxz5ZnmP78="; }; + man_src = fetchFromGitHub { + name = "manpages"; # needed to ensure name is unique + owner = "yazi-rs"; + repo = "manpages"; + rev = "8950e968f4a1ad0b83d5836ec54a070855068dbf"; + hash = "sha256-kEVXejDg4ChFoMNBvKlwdFEyUuTcY2VuK9j0PdafKus="; + }; +in +rustPlatform.buildRustPackage rec { + pname = "yazi"; + inherit version; + + srcs = [ + code_src + man_src + ]; + sourceRoot = code_src.name; + useFetchCargoVendor = true; cargoHash = "sha256-AfXi68PNrYj6V6CYIPZT0t2l5KYTYrIzJgrcEPLW8FM="; @@ -36,6 +52,8 @@ rustPlatform.buildRustPackage rec { --fish ./yazi-boot/completions/yazi.fish \ --zsh ./yazi-boot/completions/_yazi + installManPage ../${man_src.name}/yazi{.1,-config.5} + install -Dm444 assets/yazi.desktop -t $out/share/applications install -Dm444 assets/logo.png $out/share/pixmaps/yazi.png ''; From 31b5f3ba6361adde901c0c83b02f13212ccdc01f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C3=B6lfchen?= <115360611+W-lfchen@users.noreply.github.com> Date: Tue, 18 Feb 2025 16:06:48 +0100 Subject: [PATCH 0896/1107] obsidian: 1.8.4 -> 1.8.7 --- pkgs/by-name/ob/obsidian/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ob/obsidian/package.nix b/pkgs/by-name/ob/obsidian/package.nix index 3d691d5a02cf..acf085e3d947 100644 --- a/pkgs/by-name/ob/obsidian/package.nix +++ b/pkgs/by-name/ob/obsidian/package.nix @@ -13,7 +13,7 @@ }: let pname = "obsidian"; - version = "1.8.4"; + version = "1.8.7"; appname = "Obsidian"; meta = with lib; { description = "Powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -37,9 +37,9 @@ let url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; hash = if stdenv.hostPlatform.isDarwin then - "sha256-kg0gH4LW78uKUxnvE1CG8B1BvJzyO8vlP6taLvmGw/s=" + "sha256-odpuje7yiEztYG8Yt7oUhR7N7wkdXo8OlglTTMeCz4k=" else - "sha256-bvmvzVyHrjh1Yj3JxEfry521CMX3E2GENmXddEeLwiE="; + "sha256-tOP3kXWVmL8aH5QP8E6VtJAf4sLEgVRuXidRU1iJkM8="; }; icon = fetchurl { From b0eeee28ac2630dd166e019e686cdc2daf04aabd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C3=B6lfchen?= <115360611+W-lfchen@users.noreply.github.com> Date: Tue, 18 Feb 2025 16:07:20 +0100 Subject: [PATCH 0897/1107] obsidian: drop electron version pin --- pkgs/top-level/all-packages.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb69df388926..4f6e433ef03d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14592,10 +14592,6 @@ with pkgs; obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {}); wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix { }; - obsidian = callPackage ../by-name/ob/obsidian/package.nix { - electron = electron_33; - }; - okms-cli = callPackage ../by-name/ok/okms-cli/package.nix { buildGoModule = buildGo123Module; }; From faf21a9627612082ae91124e5ea316bd82168472 Mon Sep 17 00:00:00 2001 From: liberodark Date: Tue, 18 Feb 2025 16:18:10 +0100 Subject: [PATCH 0898/1107] openfortivpn: format --- pkgs/by-name/op/openfortivpn/package.nix | 52 +++++++++++++----------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/op/openfortivpn/package.nix b/pkgs/by-name/op/openfortivpn/package.nix index 1b1885965b21..147139d3d01d 100644 --- a/pkgs/by-name/op/openfortivpn/package.nix +++ b/pkgs/by-name/op/openfortivpn/package.nix @@ -1,13 +1,14 @@ -{ stdenv -, lib -, fetchFromGitHub -, autoreconfHook -, pkg-config -, openssl -, ppp -, systemd -, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd -, withPpp ? stdenv.hostPlatform.isLinux +{ + stdenv, + lib, + fetchFromGitHub, + autoreconfHook, + pkg-config, + openssl, + ppp, + systemd, + withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, + withPpp ? stdenv.hostPlatform.isLinux, }: stdenv.mkDerivation rec { @@ -27,21 +28,26 @@ stdenv.mkDerivation rec { --replace '$(DESTDIR)$(confdir)' /tmp ''; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; - buildInputs = [ - openssl - ] - ++ lib.optional withSystemd systemd - ++ lib.optional withPpp ppp; + buildInputs = + [ + openssl + ] + ++ lib.optional withSystemd systemd + ++ lib.optional withPpp ppp; - configureFlags = [ - "--sysconfdir=/etc" - ] - ++ lib.optional withSystemd "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" - ++ lib.optional withPpp "--with-pppd=${ppp}/bin/pppd" - # configure: error: cannot check for file existence when cross compiling - ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-proc"; + configureFlags = + [ + "--sysconfdir=/etc" + ] + ++ lib.optional withSystemd "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + ++ lib.optional withPpp "--with-pppd=${ppp}/bin/pppd" + # configure: error: cannot check for file existence when cross compiling + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-proc"; enableParallelBuilding = true; From cfca2520cd19ece9da40f5180d4d334bf06bec89 Mon Sep 17 00:00:00 2001 From: liberodark Date: Tue, 18 Feb 2025 16:21:46 +0100 Subject: [PATCH 0899/1107] openfortivpn: 1.22.1 -> 1.23.1 --- pkgs/by-name/op/openfortivpn/package.nix | 26 +++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/op/openfortivpn/package.nix b/pkgs/by-name/op/openfortivpn/package.nix index 147139d3d01d..6651f17ed167 100644 --- a/pkgs/by-name/op/openfortivpn/package.nix +++ b/pkgs/by-name/op/openfortivpn/package.nix @@ -9,17 +9,19 @@ systemd, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, withPpp ? stdenv.hostPlatform.isLinux, + versionCheckHook, + nix-update-script, }: stdenv.mkDerivation rec { pname = "openfortivpn"; - version = "1.22.1"; + version = "1.23.1"; src = fetchFromGitHub { owner = "adrienverge"; repo = pname; - rev = "v${version}"; - hash = "sha256-FhS4q8p1Q2Lu7xj2ZkUbJcMWvRSn+lqFdYqBNYB3V1E="; + tag = "v${version}"; + hash = "sha256-Pv9v7e5xPTIrgqldBDtTFxW+aIjbxSeu0sQ9n6HjO9w="; }; # we cannot write the config file to /etc and as we don't need the file, so drop it @@ -51,12 +53,22 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { description = "Client for PPP+SSL VPN tunnel services"; homepage = "https://github.com/adrienverge/openfortivpn"; - license = licenses.gpl3; - maintainers = with maintainers; [ madjar ]; - platforms = with platforms; linux ++ darwin; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ madjar ]; + platforms = with lib.platforms; linux ++ darwin; mainProgram = "openfortivpn"; }; } From 42b78d21fcf121e9ed2542e1067d7d678af7ee2a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 15:37:54 +0000 Subject: [PATCH 0900/1107] gosmee: 0.22.3 -> 0.22.4 --- pkgs/by-name/go/gosmee/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/gosmee/package.nix b/pkgs/by-name/go/gosmee/package.nix index f1cc58016c5c..47cd46c5f620 100644 --- a/pkgs/by-name/go/gosmee/package.nix +++ b/pkgs/by-name/go/gosmee/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gosmee"; - version = "0.22.3"; + version = "0.22.4"; src = fetchFromGitHub { owner = "chmouel"; repo = "gosmee"; rev = "v${version}"; - hash = "sha256-zfPD01ARc5nye3Iq01sziC72nnuY3LhZshNugBtdnXs="; + hash = "sha256-e+Mkhkk+PTeTipWFnjiJ8jLMYB7D+/FCWaOuaKe1jr4="; }; vendorHash = null; From 35578bcb0f643bd9fb6ae298e830318683f2f464 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 15:48:07 +0000 Subject: [PATCH 0901/1107] xh: 0.23.1 -> 0.24.0 --- pkgs/by-name/xh/xh/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/xh/xh/package.nix b/pkgs/by-name/xh/xh/package.nix index 2afe5d5ef48e..a91cba99b26e 100644 --- a/pkgs/by-name/xh/xh/package.nix +++ b/pkgs/by-name/xh/xh/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "xh"; - version = "0.23.1"; + version = "0.24.0"; src = fetchFromGitHub { owner = "ducaale"; repo = "xh"; rev = "v${version}"; - hash = "sha256-fNsiM9B3E34x8m+RuVlZXIhsoB0JaxloAUfa0RmXobQ="; + hash = "sha256-5Eq/rJ917zjlTnuxdIWhBNr8LA/ag+fyECYYX5k2S7I="; }; useFetchCargoVendor = true; - cargoHash = "sha256-uF2FoDgQQjLAiI2bjtLKmGxRINdF6RHSXR8j0TWDXkU="; + cargoHash = "sha256-jeEhlpOl4ZiR1kQxCI3e6jacszVogzROpFC2w43BjZ0="; buildFeatures = lib.optional withNativeTls "native-tls"; From 9fdd4f3a28da9c5664d8666aa8f2ad185ab23bf6 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Fri, 10 Jan 2025 19:33:46 -0500 Subject: [PATCH 0902/1107] freshBootstrapTools.bootstrapTools: switch to llvm-readtapi After the LLVM update, it is no longer necessary to use tapi. The library can also be dropped because a vendored version is now used with ld64 instead of the full dylib. --- pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix b/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix index c678d2d20f2c..1f50bcf5188a 100644 --- a/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix @@ -22,7 +22,6 @@ ld64, libffi, libiconv, - libtapi, libxml2, llvmPackages, ncurses, @@ -181,11 +180,10 @@ stdenv.mkDerivation (finalAttrs: { # Copy tools needed to build the SDK cp -d ${getBin jq}/bin/* $out/bin - cp -d ${getBin libtapi}/bin/* $out/bin + cp -d ${getBin llvmPackages.llvm}/bin/llvm-readtapi $out/bin cp -d ${getLib jq}/lib/lib*.dylib $out/lib cp -d ${getLib oniguruma}/lib/lib*.dylib $out/lib - cp -d ${getLib libtapi}/lib/libtapi*.dylib $out/lib # copy sigtool cp -d ${getBin darwin.sigtool}/bin/{codesign,sigtool} $out/bin From a2fe0ce8953ea87f2c47b6aaf384a1c54186b364 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Tue, 18 Feb 2025 10:56:15 -0500 Subject: [PATCH 0903/1107] zed-editor: 0.173.10 -> 0.173.11 --- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 8b64da7f2ac4..818afbe97867 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -96,7 +96,7 @@ let in rustPlatform.buildRustPackage rec { pname = "zed-editor"; - version = "0.173.10"; + version = "0.173.11"; outputs = [ "out" ] ++ lib.optional buildRemoteServer "remote_server"; @@ -104,7 +104,7 @@ rustPlatform.buildRustPackage rec { owner = "zed-industries"; repo = "zed"; tag = "v${version}"; - hash = "sha256-6GVRJUBCXD9ohRcOATK/tzh7e7icyZzA/SuCAL9DauQ="; + hash = "sha256-iHojGnVW8cNRVwHghDAymPrznFYWaC4n/WfjRYGsHtw="; }; patches = [ @@ -124,7 +124,7 @@ rustPlatform.buildRustPackage rec { ''; useFetchCargoVendor = true; - cargoHash = "sha256-xtziusGBsSni/ZtG+OzIkWxp3azg54G4r/5Wi9n9cyc="; + cargoHash = "sha256-Gen/WJUoYgGYDYS1hW563dQc8zDMMQnvF0Mk49TNWJo="; nativeBuildInputs = [ From 25c1e22861da6b861a1ee8735783c8971399cb70 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 19 Feb 2025 00:08:44 +0800 Subject: [PATCH 0904/1107] xfce.thunar-vcs-plugin: Explicitly add gtk3, glib These are direct dependencies so explicitly add them instead of relying on propagation. --- pkgs/desktops/xfce/thunar-plugins/vcs/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/desktops/xfce/thunar-plugins/vcs/default.nix b/pkgs/desktops/xfce/thunar-plugins/vcs/default.nix index d74a0c2720b8..f250fc8502d7 100644 --- a/pkgs/desktops/xfce/thunar-plugins/vcs/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/vcs/default.nix @@ -4,6 +4,8 @@ thunar, exo, libxfce4util, + gtk3, + glib, subversion, apr, aprutil, @@ -22,6 +24,8 @@ mkXfceDerivation { thunar exo libxfce4util + gtk3 + glib ] ++ lib.optionals withSubversion [ apr From e5cafe9052a706ca4a4c9b8e138ff7c0b3ce0550 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 18 Feb 2025 17:32:59 +0100 Subject: [PATCH 0905/1107] pylyzer: 0.0.79 -> 0.0.80 Diff: https://github.com/mtshiba/pylyzer/compare/refs/tags/v0.0.79...v0.0.80 Changelog: https://github.com/mtshiba/pylyzer/releases/tag/v0.0.80 --- pkgs/by-name/py/pylyzer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/py/pylyzer/package.nix b/pkgs/by-name/py/pylyzer/package.nix index 024a33dcb3e1..700abd346a9b 100644 --- a/pkgs/by-name/py/pylyzer/package.nix +++ b/pkgs/by-name/py/pylyzer/package.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage rec { pname = "pylyzer"; - version = "0.0.79"; + version = "0.0.80"; src = fetchFromGitHub { owner = "mtshiba"; repo = "pylyzer"; tag = "v${version}"; - hash = "sha256-CCQluzwB2NAOKE11kQ60FMgIqfGsjgxeHwgJO9WF4Kw="; + hash = "sha256-UXzaLGTZSdhh1xs19mFdY0HfmQoHxYEJXU6IaTz+Rrs="; }; useFetchCargoVendor = true; - cargoHash = "sha256-6QqQpABNuy+Dd5EL/E6BXG7+TWXnZ9Tjzu57iSfXvSA="; + cargoHash = "sha256-HO5SZtSA/0yPcSP5ZqDua1SScJdU8aXd9xshCmxvsuE="; nativeBuildInputs = [ gitMinimal From 23ffd421c23fbc5397185ee6532cd8d83577d237 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 Feb 2025 13:43:45 +0100 Subject: [PATCH 0906/1107] firefox-unwrapped: 135.0 -> 135.0.1 https://www.mozilla.org/en-US/firefox/135.0.1/releasenotes/ https://www.mozilla.org/en-US/security/advisories/mfsa2025-12/ Fixes: CVE-2025-1414 --- .../networking/browsers/firefox/packages/firefox.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix index 4a3963e1b913..7349c2bd1587 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix @@ -9,10 +9,10 @@ buildMozillaMach rec { pname = "firefox"; - version = "135.0"; + version = "135.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "7d283bcefe1e328901f15a88f5ff3da566bb0495ce5b9e3895e7a156020126a5743b6bffd69d94d9eb812e1868195ae92db162d29a5d98ee118fdb238469c089"; + sha512 = "9ff7c2ab6bc1660e339cdcd7745f8bdac5be25d3a79b9f0393385935270d7ef488599856bc38c22ae0b067389fa71a6999703b74804a6e0ea8265eb99788cea9"; }; meta = { From 3d6790562dafc1f83451b284fb65fd4a71065ef2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 Feb 2025 13:44:14 +0100 Subject: [PATCH 0907/1107] firefox-bin-unwrapped: 135.0 -> 135.0.1 https://www.mozilla.org/en-US/firefox/135.0.1/releasenotes/ https://www.mozilla.org/en-US/security/advisories/mfsa2025-12/ Fixes: CVE-2025-1414 --- .../browsers/firefox-bin/release_sources.nix | 826 +++++++++--------- 1 file changed, 413 insertions(+), 413 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index a18711555e8e..2d36767588fa 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,1241 +1,1241 @@ { - version = "135.0"; + version = "135.0.1"; sources = [ { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/ach/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ach/firefox-135.0.1.tar.xz"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "1c72ae4ca4b2787a5a0303ae26b55b0567d98c4e9069f2c33f28e88f1ad9f07e"; + sha256 = "85f54d601a54340e8f2ea32d10fd90b74540eb235e5947c83b786e49e4a3dbe9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/af/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/af/firefox-135.0.1.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "f40b4bac1e3685ed9b79086cb6500e30f94747c7706e0e65fe4bd3c83812cf8e"; + sha256 = "e10153197ee408118aa303bda76d0e97b0c4a62b85b39076739adef247848de9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/an/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/an/firefox-135.0.1.tar.xz"; locale = "an"; arch = "linux-x86_64"; - sha256 = "48c186bfdbc870c281b1970167b39d3b0d3af665198b546d1dd0cf774daabff2"; + sha256 = "d7f063a5dd361c0000b387482919604767d615cbd3532cdff31fdc15b698f0f4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/ar/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ar/firefox-135.0.1.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "06991c44e4d590e1809d75a3921f00d0c31798e78454ef4f939714893740aefd"; + sha256 = "7b93dcb47d37d19d46203627aee494ace37b1e1629a79314a1c1aa0a008c2521"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/ast/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ast/firefox-135.0.1.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "077fdc0c748b7ada6bf6d9cb2026cea94757542aa8a795020e937ee2b566605c"; + sha256 = "8d114c39a8d24ac91da7354476ba1e8c99c9573567fe300aa556b26d9dd020d5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/az/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/az/firefox-135.0.1.tar.xz"; locale = "az"; arch = "linux-x86_64"; - sha256 = "a188bf9f89d8579666ce1e58c7c7dd0ab1f971d87f3ec43387d34898c498b2f4"; + sha256 = "9f9791f7f85d1a87a2c3dab83bbd9d95640cc077737127b948a5aea77293edf6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/be/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/be/firefox-135.0.1.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "974676acec444f68020a3b871ceb270ced980722b373249b141c96c024d7fdbb"; + sha256 = "4f9298489d5fcd9ff3426d1ea7be509747262e49a1967c7ae12891266065a5b0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/bg/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/bg/firefox-135.0.1.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "6d30628b228a7494fec868d80a552f8724de3c3594c90967b10e89fb3e5bebd3"; + sha256 = "b8499ea04a2db8bdd75b5936e371c2015884fd5dbf6989bffcf9db2cb0100370"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/bn/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/bn/firefox-135.0.1.tar.xz"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "178d83edc34474ad82602c396b7d322aa70741cd41d84026ffd2bbac0df53181"; + sha256 = "2b3e1c660fa829676b0e9969589e0dbf1d5cf633f1df18dd60bb8eb0f550b1bd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/br/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/br/firefox-135.0.1.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "d683933efc74359ffffb027255f4b24297a2b02ac1811982fb40e810f5de6058"; + sha256 = "14cb1e8a9941c94768bb87152719e89bfd9beab394317c8790139bd440d84234"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/bs/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/bs/firefox-135.0.1.tar.xz"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "855cbe9d5559764966a5275f0f2fafbf9a86ef0c4341a6d86e82374597f7eeb4"; + sha256 = "31bcbf6c483156208faa629fcbc8f9bc158795aca261531f670c7a6da8510d4d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/ca-valencia/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ca-valencia/firefox-135.0.1.tar.xz"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "d62151af817255873ba3ce45c4aeae598e6c739eb4434833d56e7041d2b83abd"; + sha256 = "45bb5481a4d145c89d863a55130ec12ec066ba4449478822f4d8af60b2db678b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/ca/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ca/firefox-135.0.1.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "1d0fca6f1bcf443ea9a2d076d1550e023565cf2078a197a46d40ee19fb1bfa22"; + sha256 = "d760dc6e37eb091b4e03a18843e6ed2c49e055d2be4eae15b8b0f56508e03294"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/cak/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/cak/firefox-135.0.1.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "cb2af8ae23d3b10b26e60459e8975e90b676e45cc185a0fd790b1f9de957d5fd"; + sha256 = "6026da8bac996273b82c8e06d8797f3537c0a5c84fcaa92c9e13ff0f40563180"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/cs/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/cs/firefox-135.0.1.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "4af79ccf21d59c10f3d30fd9b01a45cd619d03656ebda3428d7a7d866ea048c9"; + sha256 = "f686b0f9902b61fea029d3839c0285639e1ba71eb5ef6d6133b6b468d7273381"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/cy/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/cy/firefox-135.0.1.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "8ea7b7b910480826efe50fc340cf1f9a7acead428c225ad8059769e2d3070e70"; + sha256 = "e799431f1a5df2ed9b1c570c2cf605ddab3593c9c0443b0229b006aaac548217"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/da/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/da/firefox-135.0.1.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "44bc65af79c371cba4fb24e0b9e6a7447b1b732ca6442f88b36e450094fb9cad"; + sha256 = "2d98f25400b2bb6336ab3d142dda68e1487e34f5c213e25b5fcf27857d7354ba"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/de/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/de/firefox-135.0.1.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "944404dcce66113db2ce3d265fe02e45316c1fb403112d1e8866a4f470b7d215"; + sha256 = "66d8c8e64ff9d207798e778306dec390d99ccf701357d079f98a231266bd8224"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/dsb/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/dsb/firefox-135.0.1.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "08662a46ab22520e6e565435c19c8dd1b5e81244c81ebe2705c9736e44a7fb2a"; + sha256 = "821e3ff15d1f164f26b59ff48153fd980dde556ab37746e9357259020cd74d91"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/el/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/el/firefox-135.0.1.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "10906363000b5fbdc9e6d086d66ab681a473f213bb560f491d91580ff8250f5a"; + sha256 = "f3c29ea42946d8183cd835ac3810c785acadb8c88a64988837d91a7dfd8b55d1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/en-CA/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/en-CA/firefox-135.0.1.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "ead65cb99388a19eeb8c80fbdbfc09150f945a77caa930139b1108dcc2a86bca"; + sha256 = "8ded99749c418c8cac6ff852c6fdd7e1d674c3ebf4152bbf187528b6e648608a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/en-GB/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/en-GB/firefox-135.0.1.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "1ccc70900ec49724515c23f3a77d18f82fb524ea40d6633d053f106579262564"; + sha256 = "4a66152c914635f4fecbec370a3775ecc87f2f50c7eb17d52b9ea95e472652ce"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/en-US/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/en-US/firefox-135.0.1.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "6fcc1a2f95a6b232af82b4b7644566638c5df349e3095c65b7c18d1a63412d3d"; + sha256 = "4f76c45196cd4d7cacbdc9038d80757cc9bbe387dd43e2b81bd8a7748d630ee8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/eo/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/eo/firefox-135.0.1.tar.xz"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "983ebe6649a8becd22063844bcb58864a54cea0941744cd6d03a019d1bb59583"; + sha256 = "d0dfb267fe91da8ae11e31c3df62e5789f2652d88cb5b5d7b0320814ad00b9c3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/es-AR/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/es-AR/firefox-135.0.1.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "c65760be0132e46a30c81555c911afe723c2c98e8286b99a61444e5c0ec867cf"; + sha256 = "587c6a1837db53eaf365e675c5b1790ccb00c0ffbe5a48dd0e6ea71a2a501dd6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/es-CL/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/es-CL/firefox-135.0.1.tar.xz"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "ac005f7f470f6c8ef276b4f5e36b53af3cfa1f1e2655b8a6ab4d764d8e0cebe9"; + sha256 = "99abb3aecd6d1064e5073635a691b7eacc72d5304a1793f0c23120eea2593fba"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/es-ES/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/es-ES/firefox-135.0.1.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "4afb8480604fa02c3c0dfd7f34e857f27073b567256d526cbd851d8f45acfab3"; + sha256 = "0ba144c3d86c93dbe3131ce8cc400ecbef1fe2ddbf652bea91fa9234039a65bf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/es-MX/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/es-MX/firefox-135.0.1.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "a36e447a8856e66b1ab0003f99f306e88d4b9238c9d82f12f3911fb93efc9b98"; + sha256 = "e1fa322eea3e8c8680424544e23938b5a2f53188687ce42da57b8f51d7f48de3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/et/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/et/firefox-135.0.1.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "8a8ed6af26b4b5660f3d3f7b2e6683de0f3c8ace5b37ece8042d5169b1b65b54"; + sha256 = "1c40069708c67ad9f6b69e30c4c90eacc2c55c4803f9bdd6e2ab87c88d4c0490"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/eu/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/eu/firefox-135.0.1.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "fec762fb119d0b69c9280f09a679d4f069c42d60f2f281139b86221b18f6446e"; + sha256 = "641ceee7d60d3afeb49781bb82c2b0f599dee7342d837eaa47d39a1830dbfa22"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/fa/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/fa/firefox-135.0.1.tar.xz"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "67d7b3e6f0394f9447ff68caabd75194b2691423d0c1ec0fd6574531f75beca2"; + sha256 = "3fde1e08a577f2fe2c5d4f9accab679cb2c00a68410c904628a88ffb3eb6deae"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/ff/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ff/firefox-135.0.1.tar.xz"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "7950552b59c008b04d676fea68681862f20ff6e3d477ff45d15093e2518e1827"; + sha256 = "e304b6019ca397f76adf8798b648142e46452cc99ce133571b35455b80d8ddda"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/fi/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/fi/firefox-135.0.1.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "252918efd1388ee3dd64973116da0a48e9aaa5779ac1e3e178339eedb00bc70e"; + sha256 = "3f67277f06a45ac65459f43b0cb9a4366a6963b62985cdbd68dba3ef9ba1756b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/fr/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/fr/firefox-135.0.1.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "95018737ff0279af7fbed959e089aa454789d450a2aae9186f9cb32496463c73"; + sha256 = "132cff32e22ace6b88411ff5af29281c07908363bf2fc951aeee1fb7224af9d0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/fur/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/fur/firefox-135.0.1.tar.xz"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "67bcb18bf5bb24164d13ba4c2a57b961da734d73447823c8ebf3d0eb5f352c86"; + sha256 = "d00fed3e2125981c1aee361192128f6fbb513f38fd8df43725b9f9d0167e5633"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/fy-NL/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/fy-NL/firefox-135.0.1.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "3bb8946e8b6da67195b88f8f8e09ef91a8606211a3389c917a2f674b5e42fb7e"; + sha256 = "91e032552cecca42eabe114f61eef772ed4ff1b5a6f3aab8a2878b4e19349939"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/ga-IE/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ga-IE/firefox-135.0.1.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "5c50d53c0f4c29e9dce68e854d1fb08efedf52e898fdd1020d30d3ce7a320cff"; + sha256 = "f2f74d2cc1058f872863523d5f92af386373b1f0cecbe7f63cca223f26ddc241"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/gd/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/gd/firefox-135.0.1.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "c1dc86916f59feb1ed772b7e9970c74e348e4d2bf732483afc694b269d53f6d0"; + sha256 = "6f5e31d2f351feb3e1e7a5959ed7a4152627b15d0e7ac5145618290c02a01a7b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/gl/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/gl/firefox-135.0.1.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "3ca9452038dc4d51828f0537b5f47722b0192ec02275bfded474a7c9301ae09a"; + sha256 = "3cfa4db7dd654d02caeb4f94d9a384c28b3966326d5874fdc5e7cba82d5ec95c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/gn/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/gn/firefox-135.0.1.tar.xz"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "cdc827463e68e2d495ce3fdc763c0f58584d1ccc37230e9dcb882fa329435cc4"; + sha256 = "dff5fd3ec38a386a12f0c22ad48b9839eb374576caa458449e6238f609517dc5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/gu-IN/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/gu-IN/firefox-135.0.1.tar.xz"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "b417ba7fac4f48e66a4e09469efdf89e7c6256e16b7816231904e46156a0b6d8"; + sha256 = "a40f2abd3af7f02e538397a263f87eb5e4fcd9e111a715b60ae2bc49c97f406c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/he/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/he/firefox-135.0.1.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "ca14f7d1f2e6babfb22a8bf29ad669c922bdfd946bdd84ac1a856cd90f5a193b"; + sha256 = "32bd9eb3e13731084245257224c5224a7faa01cfccecbf34f293e3ea8e487435"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/hi-IN/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/hi-IN/firefox-135.0.1.tar.xz"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "bb65b8a58a75ed7f204bf4ce303a3524212c77523e2a6c0aa7128267330a22a0"; + sha256 = "98851d1ec53e8181afc99809a346530ba85982109d81f05379fccac40d792abe"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/hr/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/hr/firefox-135.0.1.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "2d4eb481e719e863f993668fa24c2ac7d4d59b4a3d3e1b858bae1a9f589c0938"; + sha256 = "be37998e147f5a49bbd9fea5c8d978a9720bca3f48941e0b9611c24aa97d859d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/hsb/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/hsb/firefox-135.0.1.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "4b9bd7bf2567696217fbb3d1a1591392ebe121889e37f19fb6c101c825e50017"; + sha256 = "acc2fc5c8b535732df36b29b66ac9e6e57aaef836fa81584ddca50282166de14"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/hu/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/hu/firefox-135.0.1.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "b4ad2d51fe2b163bbd614ffd7d134379fc0d3c6c9e8a2dc981568b4a7e889d89"; + sha256 = "b8db7bd380a88798f3940f9aba34be6415d8a55964ec93d25edc66aa857985a6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/hy-AM/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/hy-AM/firefox-135.0.1.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "556d15ef76f99c314c0ceee26d83a8205e0084990dd006f259cbc4635d872ed6"; + sha256 = "1f05f5a57f4456685ecd91407a934af22b2d4c747b6c6e3bb7ea5fd12bdd185f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/ia/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ia/firefox-135.0.1.tar.xz"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "d30f9d9d14a472401a68e6f520e379970d32a6c93f524fda7bf29789ac0d5cc6"; + sha256 = "7e6ee73ffe85a5c0a271918ecc9adfb50022b5e09a653443fd617ab47e860637"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/id/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/id/firefox-135.0.1.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "7ffe754c6b1be3c7a3a499f0b688c13a3fc3a770b542b6cd38b4f793a7ce75b1"; + sha256 = "065f5bf64bba19939f8b841e5f49eac1cdf9b9f7cfbf26bc005b77ad30bc746d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/is/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/is/firefox-135.0.1.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "5437377b0e3a93390167bd82bb9d15efa3024ba2970af3fbbdf500099b304fdf"; + sha256 = "412e812053077448faaf7592361692e8bcaaeb4328d51289892fbf7bd517aae3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/it/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/it/firefox-135.0.1.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "75ff55730b650391dfe6d25c21fda1f725184cb7311b3950612e53f8e6d1c763"; + sha256 = "acfbc59a9da22ffc60c39adc6c0410cdc514a810fbfa9d7d246a6d689fcd25d6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/ja/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ja/firefox-135.0.1.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "d963a2ff202be5849a26def218f24d645d00c62ab61811276d59dea0af5bdc54"; + sha256 = "3e321738351d2642898a5b99c6e54eb4ebf0e3f2a12d8d440ffe34d3dc1b030d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/ka/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ka/firefox-135.0.1.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "f5d8493435f8edc3aad31465a493888e0710a6ac2d3d9a4284df93f6b49d6cfb"; + sha256 = "987fec6c9d62316473a1e86a33c1550e8c3ef43d1984f8bb678aba0b03b6b72b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/kab/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/kab/firefox-135.0.1.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "4b1fb5d1e349dfcd119a3f1e69d35f756d88e12b6930fd4f87b7f9c60b93dede"; + sha256 = "f8b39495eaf6b5d9236e633cbd70df081a4f2cd330d6a41d92c18902f27aee5a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/kk/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/kk/firefox-135.0.1.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "0564b49bd1ce01355412f222b094392fb587075f27c123f3dc7dd8d633d1c599"; + sha256 = "04758df2c976f3545b9528c91c8f83ea8998354c3dc663250014970f1c6b69a7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/km/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/km/firefox-135.0.1.tar.xz"; locale = "km"; arch = "linux-x86_64"; - sha256 = "0fac242e26d84dba180369f3823d0c5e042e7ff6d0a55d2996f7c9edb8c7e52b"; + sha256 = "d7fe56786823bdbb27f9777891a82564d4279155c17ff10ea74dab2ce5c427e0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/kn/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/kn/firefox-135.0.1.tar.xz"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "d0147ff4d8631f97466b24580399af1c0a28abfbbef46ac11fac992f0ba0209e"; + sha256 = "bade2e71b45a2f1e2fa1c8870ec2f5e52bd28f7a3a13998938200ab4b0900a3b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/ko/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ko/firefox-135.0.1.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "74f5e705c872363433f49e89f5cafae717714e6bb207216a0374e49a6b4c2944"; + sha256 = "40743fd1c0c064a44ed81d5acd57f78994a6cb01ebcddf8e5e2876d4654a46ad"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/lij/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/lij/firefox-135.0.1.tar.xz"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "00ba8877816c06f514e7828c1f876b3df98596f60d450d1c5c7f56b1bd5690ad"; + sha256 = "be26468c3ae7d798abbdea470e1b3295ae93efd563c34358c0984366125091ab"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/lt/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/lt/firefox-135.0.1.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "0a57c98cf283fe21e544742a1c9b87ffad91de07c1b3722b96bb8fe2984cea26"; + sha256 = "67ec58587fdede39ae054baffecfa9e7dcce5c5ea9811f97d1ba1de74c8f2a53"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/lv/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/lv/firefox-135.0.1.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "85535cdf0325145a3cefd827dc0112dcf5ea1718038b8701f078f476ed48fa28"; + sha256 = "ce14f1ae6041fa1d790fc60196756169316d714d38b17563e50ff390887cdfec"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/mk/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/mk/firefox-135.0.1.tar.xz"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "9f0c4cf48906b312b520f0411601c820e82e1b6c3311f8417548bb3c8775f02a"; + sha256 = "a06f5d0a075b8cb79e69c5e21dd4fa43bcd0b82680b56a39ebf215af15efe398"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/mr/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/mr/firefox-135.0.1.tar.xz"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "6e5c12b7077d87e8b0186af7519c1cd1ed6aebf63221fd93e65d4e88c1813fe7"; + sha256 = "5c5ee80edd4d7854d9474474971a48d724a1c93c0cac60d62fd93687aa159eb1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/ms/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ms/firefox-135.0.1.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "ebb2255bacad7590a420be6bd367c4d1d35ae7006c0646bfa7d08e38741aba2d"; + sha256 = "bd3fb4ebd6ed6833cefeb147736a1eadee824a457053854a2ba5a16eac8273bc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/my/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/my/firefox-135.0.1.tar.xz"; locale = "my"; arch = "linux-x86_64"; - sha256 = "cf58d7def2b0442db80e45fd59ccdbe14eae993d42ea764aff6445ce034f45b4"; + sha256 = "25cb3e2e364899be8c708411f591f8ae51e95af9f9ef726e7d1b58835ab33880"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/nb-NO/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/nb-NO/firefox-135.0.1.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "471b87f899a4c28e4a11dd748c8f76078f58e7a701e520ff6f748e8f21ac33f6"; + sha256 = "0265a2be242623af393a43effa41ce35d4f7a7970a963c0d7fab406d1634d944"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/ne-NP/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ne-NP/firefox-135.0.1.tar.xz"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "440b832a00b3e3e7a7d41948fc152c9a4af625751af23f876703b4bc77b946a8"; + sha256 = "d0cb102fe9d54bee0a4b1db719afbdecb63dc4ef4447bfba6100ee5a96232fbd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/nl/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/nl/firefox-135.0.1.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "e8a59134c4455310976871172079f3debcc5222c6e8c6357304dd3e7b9eb04ca"; + sha256 = "aafedbe22664d2bc7c0638670c505bc4f8953d187fd3f879218c1131d3278b86"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/nn-NO/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/nn-NO/firefox-135.0.1.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "66a1bfc01030a377ed78ac2134bce1562b619d0b7ca8d5cfc4ff7e84b06498d2"; + sha256 = "129627b922147601fe04d6f2419fcc0174f81943b0da660bd95fa6fb236fdc1c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/oc/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/oc/firefox-135.0.1.tar.xz"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "723444216c411b054ef1efa2cce1556b14aba4d4a4351b4dc26237e525783def"; + sha256 = "8d392514cd05614334b931d04e6b6b8bbd58f0f43fab5dae9efdbba8ce30a001"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/pa-IN/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/pa-IN/firefox-135.0.1.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "113dab1bb1f697ac26d1d4622962a53b7d46d7c558fc3675ba6278b337ca5ee9"; + sha256 = "ec27efc20302616ffb4ecdf936a9eb7a1d4ce886b67f3a8fb66f4820a8246b76"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/pl/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/pl/firefox-135.0.1.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "48992e4be7074cb9ea1882193e6eb06ffe706667694c12ec64799a6b3f6671e0"; + sha256 = "7ac5b2a539050a06ec9a1940a923976222bd635dc07acc8a9a4e379c50d918ec"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/pt-BR/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/pt-BR/firefox-135.0.1.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "d52b91648052cdc829f50512b37cfac8a1ced6bbe3db33bcb333a795b66a1f22"; + sha256 = "6c81b880332d86f273a142986310de26a18a77597ace7c35e4d63923d39db070"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/pt-PT/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/pt-PT/firefox-135.0.1.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "a72013522ad747f22b92391786aad176e50585e1e0dc0afec559a8e87084edee"; + sha256 = "25cae3090f199ad7c4233463a4fe33aea7dcd2dedbaf699264eb7529eedbc4cb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/rm/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/rm/firefox-135.0.1.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "651e39063b367d7e22912f14bcc794454048059814aa80ba04486ab6e505f036"; + sha256 = "7c6c2602081870a8a6a37bf994da60d875decb48a5a8bc1d2dfe153224d9fd5e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/ro/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ro/firefox-135.0.1.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "73733799737ddb45e3485e9e26916e1a4ae4c7c688f09f9480032aa9cf168754"; + sha256 = "20bdf9c4c37ddf25f515064b0746a4a31f71b59e0b4a510f2dadbe71699a4234"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/ru/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ru/firefox-135.0.1.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "b1a095895901dd65cfaf9740047eaebd3db9df604238ff42ef466d16c0c92205"; + sha256 = "34a498efc44115d13aed6a494725e8c201da5b3e2c920a34bee7fc9da627a02c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/sat/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/sat/firefox-135.0.1.tar.xz"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "fe6fc98ab8d9221ef02eef166d788c70c3844e90810b53fa57495f0329c1f533"; + sha256 = "512c0ff90882875da0d8025942788dad94008a55a0e7e54fe6aa0a0ef4ce34cd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/sc/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/sc/firefox-135.0.1.tar.xz"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "6115bad40882792a160586da0787aa6afb1426d98499c8f59f6358601ebb40ef"; + sha256 = "d31bf478b2fd3cc24b0bdefac89d1a78b1216f9ca7878bc7edc71a858d643e45"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/sco/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/sco/firefox-135.0.1.tar.xz"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "6d448c48d3f532a498eaf396ad6be2c0ebe19c323bc1620e4a5ce312c75d97c2"; + sha256 = "a7fb73f110385a112b74077b08b0ecf28a294fcaedec516339d5bdf3784f6200"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/si/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/si/firefox-135.0.1.tar.xz"; locale = "si"; arch = "linux-x86_64"; - sha256 = "d93451b71ea2ae0231a008819d095f45637fa3af5cdfc0066b40a90f405b190a"; + sha256 = "cd4f6385ce73b65f4492310a9be81ef356c915047ecb6030c048de49c32f017c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/sk/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/sk/firefox-135.0.1.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "fedb44754d0b838d62c908208799a771ca75322191993d10d2a608203ae48a38"; + sha256 = "4ef13cc54f9065949238fa8bbc556c04d33fb2a72407d853e303a8b7652ea1f6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/skr/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/skr/firefox-135.0.1.tar.xz"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "f3ae834cca2720bfa043aae64de686e70cf596913a9b1853df05ad917e8919ec"; + sha256 = "d51cd2574035a26ee977e050ebded2407fd82a4b8b1d8ef523aff6db06c3a4eb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/sl/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/sl/firefox-135.0.1.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "7d29a2193ac247a91832315acee4d9fbfb53737ae24474eefd62396cf23743aa"; + sha256 = "4da326890042c183d7a929d5b85661e8c7e4913ff69d16615c01ca603324a55e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/son/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/son/firefox-135.0.1.tar.xz"; locale = "son"; arch = "linux-x86_64"; - sha256 = "f1f56ee2b49a7999e689b819e8a87cbf3242fc156737f96f81ad37207a3450d4"; + sha256 = "4864312286399cb2b4d03785fb686133078d60c191eb2d13a8378b7ecc6e78de"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/sq/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/sq/firefox-135.0.1.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "59480fe7650d0d113bd7e8dc6cced23ce58a3a3c3c41e06eee05cee1ced8c539"; + sha256 = "218f269f88a1d6289ecdab29a11395647fe693e4144d767eb46305f5736359af"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/sr/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/sr/firefox-135.0.1.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "bcabf19c9cd05ca3134684a54ad0b40d93fa51fa42a743716cc8f61c42af871b"; + sha256 = "a84d53bebe11310254c65455358daa0d0c40280575c9fbf6e0a4c0b578a6cda3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/sv-SE/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/sv-SE/firefox-135.0.1.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "f970c9b0c6631e71b558741673d4059968987ae3298491ba0eda73e846812961"; + sha256 = "46ff0638dff2df105f760852d3cb258f67ce7b70b3ec6092a7112f15ffc9553c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/szl/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/szl/firefox-135.0.1.tar.xz"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "b11b31a0400d8919555cf31546c7019be647aefbc6627b02b56cd0af746284d7"; + sha256 = "da2bc83da355292b4914cf1766426ca6aa623f4a329fd6f16b0252708a8f1986"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/ta/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ta/firefox-135.0.1.tar.xz"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "f8c76cc97872e841187563b6dfbcb37683e56a9c1138b28c385dc4537c04f4fd"; + sha256 = "731dd9e89351143c923e99b71d8b18cd09cdcba01ef8781037826bcaff52c35d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/te/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/te/firefox-135.0.1.tar.xz"; locale = "te"; arch = "linux-x86_64"; - sha256 = "a2888833539370cc5403975e5f2e2117bab9d7cb85d2bf04b9baaca08002bb3a"; + sha256 = "71d10251232991cfe2f2a7f37016ed93bb6ed1cb009732c05e72371e8d716495"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/tg/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/tg/firefox-135.0.1.tar.xz"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "93724f54fe48cb5d8b8f7cdf1e6c7f2b29feb4e3d99c82087ef61096dd2e4a22"; + sha256 = "bcf402aaa8bdeeb48ab7d21a6ea5eef55ed97fa04c96e3931c0df063ce36719f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/th/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/th/firefox-135.0.1.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "73a8b94072ba89c6c65b6a1b5bced4ffb8b0272971f3b3f193f344bbafdfd6ed"; + sha256 = "c726adabe33ce9c9ef83ad2c3511cb5b3b14cfac740704b477f79d20db47faba"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/tl/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/tl/firefox-135.0.1.tar.xz"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "d1476f5ecf3e92305ecaae292a52ff2c055680045bb87461d2dc265fea649fb8"; + sha256 = "2603148fd61af0bc103564de6df46ac5813fc98f6408e2916ccdc1234fb3bade"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/tr/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/tr/firefox-135.0.1.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "2fdad5abd956c3a48b458bf5651c7752b8197c1d1cf9ebd658d863374106fc5c"; + sha256 = "25678b5287864fc27a9eeb53b0fcc7cbd1ca5ac319e7a666659a549cf73d8d07"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/trs/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/trs/firefox-135.0.1.tar.xz"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "6778234dd35065cb9b18481703d8ffdcffefdd625b3f2b388c974f2bd430cec5"; + sha256 = "7a7e0a7d6288add3a287bca63c4c8eeabbe909105774f26b5df19bf593f8abcc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/uk/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/uk/firefox-135.0.1.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "b8bd129dd0a9d0dae1d236ba7e22a5a9e37fa6c5558855ebbd324db0015f41af"; + sha256 = "9ce9461aa559bb9572f71aab42d96a0dc42181b80cc5baa09c4ead7907e77c74"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/ur/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/ur/firefox-135.0.1.tar.xz"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "359806d22bf487eb60630a1cf4af9b586f3c2e0ba8a6e5226cfa17274d3ad56c"; + sha256 = "225cb95d842660b83f45ad2c6bf78500bc72ee47d774e22db51e43d5bbc09e8f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/uz/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/uz/firefox-135.0.1.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "793659a2f2720d72d94758945267c0ddd056076160966d349bc21b4ad1813ab4"; + sha256 = "ffffa772a552421e82c79472ea641a4255725947e1be14221fff4e8bbebf9c54"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/vi/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/vi/firefox-135.0.1.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "fe8d38493ffffdc4edce2796b9166577e66388c769d4309247ca9202c17688f9"; + sha256 = "1fb27749f090584cf06f731d871c8317b0bcc5a85391a85b1bd2c9caddde5848"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/xh/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/xh/firefox-135.0.1.tar.xz"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "2b14be62835ffecfc9be149df654c4e969071a74f247e81f8896d1d03f10580f"; + sha256 = "47c7365321aa796f5a1bfb960a59e329fdcbcc8cd98c05736cbb3fcc3aa9cdf0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/zh-CN/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/zh-CN/firefox-135.0.1.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "89e60faadee55c112b47e4bd3b6f9fbb759a0cfa2fb4486c862bb8e4b0da141c"; + sha256 = "3f192e56a3636945878d1c61b208cf37b3ba2761a9a0def06c2bf57f8e5e6868"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-x86_64/zh-TW/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-x86_64/zh-TW/firefox-135.0.1.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "c90b2484a8cb8d5aa495c448ae79c2bb43d62f3a3201adb698dbea94a05e4f90"; + sha256 = "1a1bce8af641af3dfa42e3cd97fc092d4f122bc4cf8cf48bf600235b388a6c46"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/ach/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ach/firefox-135.0.1.tar.xz"; locale = "ach"; arch = "linux-i686"; - sha256 = "a07a2a731018ae7537ad89d02cb4ca4826960ac2c5c7f54334d9c429259ce7a0"; + sha256 = "c82cd11cbeab8500505a974944bbe72f5c1a7812a385ed83f50d6c06c37b72c2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/af/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/af/firefox-135.0.1.tar.xz"; locale = "af"; arch = "linux-i686"; - sha256 = "630eda9698abd2b781fa7777507f5557e7a9a278ba3287056b25384d28ef3b07"; + sha256 = "63a0ad22cf777230cb88b33998afa52851e510454e03bda5f9af3f08179eb303"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/an/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/an/firefox-135.0.1.tar.xz"; locale = "an"; arch = "linux-i686"; - sha256 = "58e1a5de6de631e36b4e654194a87f1de339c83ba3c749bbe00021b54bdb732a"; + sha256 = "6e4561401df01b7a4b8a997270603171a781151cd31a4003677e076933de99c9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/ar/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ar/firefox-135.0.1.tar.xz"; locale = "ar"; arch = "linux-i686"; - sha256 = "19344923c0e4b1291e21a1f6671633ce3b7ddf7695de192fc863fb21474df14e"; + sha256 = "c7b7e1cff64f22436e13ee69344bc7c4d762c02f26afd69935b9c66c536b0b89"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/ast/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ast/firefox-135.0.1.tar.xz"; locale = "ast"; arch = "linux-i686"; - sha256 = "eb8f82fb906d0e95d936431ea6bf716514fc04187e383640a1ad44663c0d343e"; + sha256 = "8fb6ee84c5bfa8c1a3843780f71672a47b5ba4f0f5de31e09946baf32f04e94e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/az/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/az/firefox-135.0.1.tar.xz"; locale = "az"; arch = "linux-i686"; - sha256 = "5f01c5b62ac22e98a5d246abb1c3c95dad6a942daa09b48182ea2a7a16543160"; + sha256 = "5b04b6afb8e278df645dfeafcdccf35b0d822b2af3f8b85d0834b4bbcd1d22dc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/be/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/be/firefox-135.0.1.tar.xz"; locale = "be"; arch = "linux-i686"; - sha256 = "ba31da6bcb5decd92c5b0a4633de52ead1add60b8001aba9f9283cc7eb419603"; + sha256 = "bfbf9a3ba109af1659c4569515bda7ae8becae2d52c89b20515c13552f02d679"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/bg/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/bg/firefox-135.0.1.tar.xz"; locale = "bg"; arch = "linux-i686"; - sha256 = "a875391947cebbd6c4b9b4bd92563211fede6c0508a3525dc36de4784f0141a6"; + sha256 = "3268b534952c38b6d62badaca6a5feafc3be9fd895381233887e984dc70242a2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/bn/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/bn/firefox-135.0.1.tar.xz"; locale = "bn"; arch = "linux-i686"; - sha256 = "649a71bc265d4a0e1db63f4591b28faaa8c99642b0ac8212f21ea701f2c971bc"; + sha256 = "d70488e1e19a4b4a5d78ed76d810471597279596f87fa2a791f99b5d4980ba58"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/br/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/br/firefox-135.0.1.tar.xz"; locale = "br"; arch = "linux-i686"; - sha256 = "1f80b825902b13cc6cd5f6ec99b0e6b85413ba4e4aca7159643aec4fe67f2957"; + sha256 = "ce36b6e4eeb9fe08f1ac8fa9ae3e39de455a84351a07f94190c1107138d2b42f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/bs/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/bs/firefox-135.0.1.tar.xz"; locale = "bs"; arch = "linux-i686"; - sha256 = "07a42950a980aa8377cfd8928eebc0f65c7f8fbc62d0896b27e67abd20019b89"; + sha256 = "3a4b8f3a5cb0b12223e1b9effcccfa9080db3df224cc9fe4bacfdca7929286ef"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/ca-valencia/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ca-valencia/firefox-135.0.1.tar.xz"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "2cc5a7999e020c825d051bdc741f9b246f997c88e7a6b8c2b7a11f8edd1511c7"; + sha256 = "cfcaa98614b10f801eefbb577b649485e35609c5e5873ba7252431c322cf8ca2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/ca/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ca/firefox-135.0.1.tar.xz"; locale = "ca"; arch = "linux-i686"; - sha256 = "47ec24db0b43cb366458c490468e39462fbc40817dcb487cc6a47e2a4b6742bb"; + sha256 = "0fc1404dc7fc6fe900065c3139efa8a5b564b2e31c43b14f3f12abbd9782b934"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/cak/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/cak/firefox-135.0.1.tar.xz"; locale = "cak"; arch = "linux-i686"; - sha256 = "9119d696b019c4c751442e0aad94d611c2f18d079c6695f893b57c048deff019"; + sha256 = "20516b513a9ed010c149b224f6571b1f58bc10659174a2b35f0895ac25066cbd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/cs/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/cs/firefox-135.0.1.tar.xz"; locale = "cs"; arch = "linux-i686"; - sha256 = "12553328d1dec07058d0924ec0b7bee4b10948226eb557a4403c70c3ce54f793"; + sha256 = "50f2c076ad1fed32095b2df46fff544055876129f97dd0148b68105a400efcf8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/cy/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/cy/firefox-135.0.1.tar.xz"; locale = "cy"; arch = "linux-i686"; - sha256 = "ab846aaf4ba274f1bcf08f47a66fdb7fc924e63160bd0ed7fccb8181d6cb9f21"; + sha256 = "e5ec5267bc359ea1b6d0558ca11e4759475694291e85b5e2284b26c0cb95b207"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/da/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/da/firefox-135.0.1.tar.xz"; locale = "da"; arch = "linux-i686"; - sha256 = "36df3630869da89b0113d1e153472ef27610f557bccf6728488789f99be44efa"; + sha256 = "b94cd629ed241c78631af1999de1c428a628baa88d4efed600472f55c4f91d68"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/de/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/de/firefox-135.0.1.tar.xz"; locale = "de"; arch = "linux-i686"; - sha256 = "605907fe9e0243084065bc23a2ae26cb54d185ab3e3e376d1bce61cae7ee485f"; + sha256 = "2e534968130b9ae7ea8c47f66b29ba9f97c0f4017404760fe7e2a8a0ff8af4e7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/dsb/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/dsb/firefox-135.0.1.tar.xz"; locale = "dsb"; arch = "linux-i686"; - sha256 = "31719fbad799cfbec1fdfa144ad7cb4a4353715da13bcfb2cbed9ca4a7e97d22"; + sha256 = "2afe07c907d965a26d6a165dd5ffd6b799d40208618233c4394a503c0e5693d2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/el/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/el/firefox-135.0.1.tar.xz"; locale = "el"; arch = "linux-i686"; - sha256 = "04bece5ae8b0e5f343d296133d3c8cf08cd13b176b1194058d8077e3c0346e31"; + sha256 = "a08417db97449e9f51c21b23f81a6627e860d5c2610f3f43064f40021864a91b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/en-CA/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/en-CA/firefox-135.0.1.tar.xz"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "8caeaeffcb9de03b0ee52d2348cffa1cc7ad2f1a4a5a168495eec4581abd5910"; + sha256 = "bc263b9f5a082f49e59c8f8432a89f29e2b241ce32236b95dc3efca653789acc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/en-GB/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/en-GB/firefox-135.0.1.tar.xz"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "17b068b5b75916a144fbeaada4700413eccf7ad8158cc30d91d0b565ee635d3b"; + sha256 = "eb8b857d57327915f5e7ba3b10170dcfbc90c76e317893fc435d4001c71615c2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/en-US/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/en-US/firefox-135.0.1.tar.xz"; locale = "en-US"; arch = "linux-i686"; - sha256 = "32d5797fb6b73956057126f364641806580a5abf41aef66aea981ba3b52505c1"; + sha256 = "067f19bd0eee8892418a1f56160322187c3f4ac081a7ae796dc32774921a56ba"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/eo/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/eo/firefox-135.0.1.tar.xz"; locale = "eo"; arch = "linux-i686"; - sha256 = "ebe7d8caa5a32e18dc7065d8690c62af2f0f30b1bdc5830fbaef818fd7e877b2"; + sha256 = "211c205fd397da7979438e432240c53f2bbc0e9832a2dcbd7301c594b7924e46"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/es-AR/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/es-AR/firefox-135.0.1.tar.xz"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "143afb8ae089c2b624ed11de82f23de9459e2be74b3df419d95419bfd7047b6c"; + sha256 = "dc5aa614418fd37b61c4a469156d85f9f37c27eccb8e570caa0448d1a2bf18b1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/es-CL/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/es-CL/firefox-135.0.1.tar.xz"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "d8ab54eb2a0d1fc311b52d310ab5ac5717c77ebe3b8cc260ddb9405cd4c8dbbe"; + sha256 = "912a7cc7d8d94cc4494542d48870456f7920a4f3bc3153a6e9f96d7ae33b998b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/es-ES/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/es-ES/firefox-135.0.1.tar.xz"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "c068fcd27a64ce394d1039b8ff60da2945b64f4db56ee74a57058b71dbe7b3da"; + sha256 = "129be627e784c79f5cab7864fc9bce8f36fdbdad6eabb5d319438334149045a3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/es-MX/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/es-MX/firefox-135.0.1.tar.xz"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "5c01075d6533b39bcce503ceef855aa78d92b13a9b0784385493539ceb58f2ac"; + sha256 = "95fcf3ddb9e19e402760a2065a50907e6d6bc7114ff0f40b62c6f240fd7ffc1b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/et/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/et/firefox-135.0.1.tar.xz"; locale = "et"; arch = "linux-i686"; - sha256 = "b58bbea73e0189d3125ab4665978c752a5ef25c4c3aa5c2d1f0dbf89fc6a3612"; + sha256 = "13685d04f661d5de4b47fff13c278b0d753941beff73f738bed6742e3bab740f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/eu/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/eu/firefox-135.0.1.tar.xz"; locale = "eu"; arch = "linux-i686"; - sha256 = "da1461208643165545bd501df3d24fefb84cdd9f74158dc72dc3707b1a3c1860"; + sha256 = "3b576d42d83bb25daf60b6ebaeb51ed90c0c6ba02bb303704eed99c5d9311277"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/fa/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/fa/firefox-135.0.1.tar.xz"; locale = "fa"; arch = "linux-i686"; - sha256 = "b2dedcf59b982a0a226481da071e18ccbf913383d0aa5ba967f15f4629f4c56a"; + sha256 = "af54fc246326c125b22f26f825a5354afc31a027a326cfddef2614f3016d6958"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/ff/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ff/firefox-135.0.1.tar.xz"; locale = "ff"; arch = "linux-i686"; - sha256 = "a85ec356ff144a9bb93d0831b2c012257cf5ee58b6aa83ddb18a4ba215a9ecb2"; + sha256 = "b2baef68a972000a2efcd11cda6af5b3279ab1b80116f9bb44beb61532e132f8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/fi/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/fi/firefox-135.0.1.tar.xz"; locale = "fi"; arch = "linux-i686"; - sha256 = "4535482d184ab9d39730560e7ff9e2874f6f6364db24caaf63389c19d316b64e"; + sha256 = "c1004e13cfcd6894503a6e13fad8dd97c8ebedfa69f52f9d003abde50f88c073"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/fr/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/fr/firefox-135.0.1.tar.xz"; locale = "fr"; arch = "linux-i686"; - sha256 = "4c9f90a96ec29d4d54f28f7249959ebf95f6549e3d0357fba938e530316a341e"; + sha256 = "ffa6a20adf5f77f5fd7ab38da6b886d7de4d940357c44e4fee161538b385d594"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/fur/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/fur/firefox-135.0.1.tar.xz"; locale = "fur"; arch = "linux-i686"; - sha256 = "80d4a91909511dfdf59ae74d5a410dc9dc0b0768514aa42869143e488a92053a"; + sha256 = "e5409602ca444c8b8ec3de997ee56f981bf398f27fb383429d5fb5d51a12d5c1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/fy-NL/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/fy-NL/firefox-135.0.1.tar.xz"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "c7cd74f4bc0d8285f3c1ae9d3dfa0185aab96e1166968ff78be7d72f57a2c745"; + sha256 = "6965b6d0a81784a1b434edc47433216bc723fbf998f694543a16f80967c777e1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/ga-IE/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ga-IE/firefox-135.0.1.tar.xz"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "1a3dbdf047686dbe14763be7b08c5dfa9a9d0b4aebe81cdd8d5ce15a44811251"; + sha256 = "b76b639a3f4b84cbd27b10946f744f9ebe77b51259043c322709a4221d81554a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/gd/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/gd/firefox-135.0.1.tar.xz"; locale = "gd"; arch = "linux-i686"; - sha256 = "7c43ebb96030c764e6e3ed546956091121cf72bc8e0afd7ea6dbe15413b913e4"; + sha256 = "e28e684bf152f76c7878f05fa796299349640239479e7edaaa1e136f4023dc18"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/gl/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/gl/firefox-135.0.1.tar.xz"; locale = "gl"; arch = "linux-i686"; - sha256 = "1f8dee786eec9cbe3ba024180e25068d640e1d7b548e21982eeee38aea111f3e"; + sha256 = "8d28ed21f02efd61288323226275d91445b7fa524f3079b73e9cc67573993386"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/gn/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/gn/firefox-135.0.1.tar.xz"; locale = "gn"; arch = "linux-i686"; - sha256 = "9a1c5c0e001e93751749e8cecaf70d141f987024e6d94169b787a90c006f0a52"; + sha256 = "84ac348eee05dd7688c80c24c14facf01227cc315f0a704076dfc75a8b860eed"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/gu-IN/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/gu-IN/firefox-135.0.1.tar.xz"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "e3e730c52b102361ebcecb300cde0d08c3ac9cf11851a341b89e7c8cf25d3200"; + sha256 = "c8a8ca67e03f1576a45cbd683fda752382acd72471db2ef9cc37c435cb918feb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/he/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/he/firefox-135.0.1.tar.xz"; locale = "he"; arch = "linux-i686"; - sha256 = "3946a8667cafd2e28bce8a05504718c36349150820a971b731e33ec2fcebec63"; + sha256 = "fb6e174f3a0262546ad9e4b5f083504fb2b0dc8e97f6bbdf8fd028e77519d961"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/hi-IN/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/hi-IN/firefox-135.0.1.tar.xz"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "5d8be7e6cec5cc331f4c08bdc594b4c2123b6436d33a33ff00f53cbfe5c15f58"; + sha256 = "d615c947f4d005ff5f5c735dc51851a6cc581c673db92b6298188f0c2982e05a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/hr/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/hr/firefox-135.0.1.tar.xz"; locale = "hr"; arch = "linux-i686"; - sha256 = "819d02265ef917799607265bd7c574bcf5cce50a57bbe7840f9f926c33dbeb6b"; + sha256 = "63ddf1729af345a5f695b8e253e347e8a232a77b6e2a949f87770bf769b7162b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/hsb/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/hsb/firefox-135.0.1.tar.xz"; locale = "hsb"; arch = "linux-i686"; - sha256 = "4fa4706f8a8d8a059ac96153fc8030a633bf68ed0300b62a4e1fa97abcf73ada"; + sha256 = "60be97a59f23fe68f22e62e1fe9c95b723ae144f6c92dcf505f29985eb770af8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/hu/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/hu/firefox-135.0.1.tar.xz"; locale = "hu"; arch = "linux-i686"; - sha256 = "d5ed9ecf6a837c9e49be86845055502541dddc6b1683bb295f73aa9bbfb30bd3"; + sha256 = "cf878262e5ac4668b03e53ba9ea8d06caddf5ae6062ed482c3ff53a4b42d5ab0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/hy-AM/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/hy-AM/firefox-135.0.1.tar.xz"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "6f30295f24ff5da7b698d4230477b8d781aa5f853bcc737ce7c5e168c204503c"; + sha256 = "81916fa78ef8924cfbeeafd1544bd7f004394b0be9319a38cc9bf9daf2be0537"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/ia/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ia/firefox-135.0.1.tar.xz"; locale = "ia"; arch = "linux-i686"; - sha256 = "0f4ebd48ecfd5569278b810d376f2ff7fb9c40579fd16aecdb4c5290bd52bb54"; + sha256 = "3c1fe474d0a6cea2bf7cf21800ab47e0079326e3eda3a1951d4d266b0c38a5cd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/id/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/id/firefox-135.0.1.tar.xz"; locale = "id"; arch = "linux-i686"; - sha256 = "0b58b33c5793a7c49b24b2eaf92412618bbd8b40aa56bf6b56e88c7e755f57c1"; + sha256 = "f06ee4c1d2f087278152810a47c0d22d2d95f56782a12e149281c281e490444d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/is/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/is/firefox-135.0.1.tar.xz"; locale = "is"; arch = "linux-i686"; - sha256 = "0253cc841852ec7f18afc8ff4073c36c4fe0779dc69575748c118ff5f3ddf0dc"; + sha256 = "2c191208103635c58040f0a5fb29a8a4f71c28fc86ddf39ca0510885abda08af"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/it/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/it/firefox-135.0.1.tar.xz"; locale = "it"; arch = "linux-i686"; - sha256 = "f4dde397485ba89c87f8204767cf89b62bbc15298a8a644cd6acbd72dd89ae75"; + sha256 = "0af746d1574f0ed4bd0ff0f6fe8297d8f30bf60ccaddc9bbd76989428f83cba0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/ja/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ja/firefox-135.0.1.tar.xz"; locale = "ja"; arch = "linux-i686"; - sha256 = "f69146017ba38d2d1f4639364ab53ac7c5d7c60c5b91ef96859af3485dae6c16"; + sha256 = "97650d3343a76441c61c89de9a4b1166472a1e8d9daf4cf80b09e7892448aec3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/ka/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ka/firefox-135.0.1.tar.xz"; locale = "ka"; arch = "linux-i686"; - sha256 = "20a3a901d7ee16f65849392c2718ccb22f6ecc46ac5d5e66437cb170692cff28"; + sha256 = "8340484f793a2a957c742139663206621322739288d62ee32ebd8f531afcda89"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/kab/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/kab/firefox-135.0.1.tar.xz"; locale = "kab"; arch = "linux-i686"; - sha256 = "2408dec859396be2d506e81ee1d4e2560afda638256b65d6e11fef9aaaa30546"; + sha256 = "3bdca715f792492e1f154f6282e875680507858da33dec14ef6fd81556eeb71b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/kk/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/kk/firefox-135.0.1.tar.xz"; locale = "kk"; arch = "linux-i686"; - sha256 = "e700c63a5000a61313817b8f4a7941f25e61bce5b6a5bfdcdff79bd5991b94df"; + sha256 = "e12f286e5da6cce0d6a12aa17d08f34371164acc6ca8a3aae9ed28df3ae4e2b8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/km/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/km/firefox-135.0.1.tar.xz"; locale = "km"; arch = "linux-i686"; - sha256 = "b35589060c905e8377bd1f01a370d496cb0b9ace900906d9c06b0544ebdbf573"; + sha256 = "13911d8099e669e5ceb77c089f8606e2556dd86beb32ae86a8d48d8d7f196b6a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/kn/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/kn/firefox-135.0.1.tar.xz"; locale = "kn"; arch = "linux-i686"; - sha256 = "af2de8fa55fa1ae3e8135f3cede963e55420b0b284b442d9600bc8ca95164f03"; + sha256 = "dbc0696f90bace3fef21cfc7c816554ef500bbe123637467751b2572e28efce3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/ko/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ko/firefox-135.0.1.tar.xz"; locale = "ko"; arch = "linux-i686"; - sha256 = "3b0db0b6da4f3b535c4f0db404e96da0316efcf69d357df19319438a7e7a5f77"; + sha256 = "41a044fd8c2108137d07955e0fb8558d48d4c1e8eb28056b1f113d3c8866e124"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/lij/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/lij/firefox-135.0.1.tar.xz"; locale = "lij"; arch = "linux-i686"; - sha256 = "3311e2c8274b4bdfd6e4605cbf7a8982b6e2fa8b722a1cb5dc22bf86220fbce0"; + sha256 = "041982f1e4523807dce5c7f6b92b01c362255725b204974f7a42561a169e722d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/lt/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/lt/firefox-135.0.1.tar.xz"; locale = "lt"; arch = "linux-i686"; - sha256 = "0b41db6f021a8ed23854deea44cf0c05747ab5683847d7e23ced10092af52018"; + sha256 = "5b9298fd6a0278d88876e2577233f37f0c109fa1523c296ebf495cbf65e14f61"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/lv/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/lv/firefox-135.0.1.tar.xz"; locale = "lv"; arch = "linux-i686"; - sha256 = "42359e372283afa8a3a1be679eec96bace420a824b4934267647364190da191a"; + sha256 = "8b22d827132e87a32541d40c0fbaa9eb44b0033f558644ef9406216731b4426f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/mk/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/mk/firefox-135.0.1.tar.xz"; locale = "mk"; arch = "linux-i686"; - sha256 = "f8007f41254785ccd82a487583e8ad78c4bc82344c08a7b5a1e2e63dea83dca0"; + sha256 = "aed9daec2f23cf8d8a166e190e0c80e0701040fb57fa304de3c3c29ca3bf6933"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/mr/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/mr/firefox-135.0.1.tar.xz"; locale = "mr"; arch = "linux-i686"; - sha256 = "10afc8d897c9bcaa6dcef951489f0249b23ae797d7e8dd8b7db951549512d1d7"; + sha256 = "f06cc784521054bb1ae02b3d99b6820055f6f3a7af9f7ef72fce63dd9d55e488"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/ms/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ms/firefox-135.0.1.tar.xz"; locale = "ms"; arch = "linux-i686"; - sha256 = "85be1b00eed99ce715c4087446cf8698bd3e2b291bc668f21a7af95822677695"; + sha256 = "16ed16efc1f850be47360ccfede38a43becc051e4417fea5c9ba4e42c69a9994"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/my/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/my/firefox-135.0.1.tar.xz"; locale = "my"; arch = "linux-i686"; - sha256 = "b283773b57401221a6c11631a01d76f9ba1654d4bb4c967b252ceb9b0de92f07"; + sha256 = "1d27debaec3228fae7e56dc021df9f3985b45c1ddbd53a9f24ffcd84c833bf85"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/nb-NO/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/nb-NO/firefox-135.0.1.tar.xz"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "ae11655f5e4274c43e9631bef110b02955e216e1fcbaff4025152c95af1e330d"; + sha256 = "62f259043d06b3468c94eb8088bdb1ad85c491bb37e7b6d4df9b2a3a5e941e8a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/ne-NP/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ne-NP/firefox-135.0.1.tar.xz"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "829e206e2cc1dd5a2253a78506cf34f1fc3f6232272993766ac1672e7b9791a0"; + sha256 = "6a2b77fdfc2560d089a3181353782b68c99441819e964ddbd4a0724e36bf35fd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/nl/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/nl/firefox-135.0.1.tar.xz"; locale = "nl"; arch = "linux-i686"; - sha256 = "5509e5499a2685c0aed78b6b94ed855277a1a6e264275f710ada8ef0ee559317"; + sha256 = "a41cee355f500aca74fc45d01d82f671a7be30bc535dd66dd4aa656944d5c2f7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/nn-NO/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/nn-NO/firefox-135.0.1.tar.xz"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "6720456fc8a1329eb4ae5c132466724e47d90962b11669a78e54a86b8275b845"; + sha256 = "e23dcd1a632ae9523a0c404beedfad11027d921d033a8eb877d7a23562c8b0b2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/oc/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/oc/firefox-135.0.1.tar.xz"; locale = "oc"; arch = "linux-i686"; - sha256 = "d4a09d842cce68721631620e2bd5bb660af7a60f087f2895cc0f8557019673a8"; + sha256 = "d3f4e32079423d0ff4a17b3f65dd071a9343ead3ba70ecf2220779d58894212a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/pa-IN/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/pa-IN/firefox-135.0.1.tar.xz"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "57ccaf9a4297e665f8a5e6d96cf6b1cddee7dfb20e19a1222f28ef2d7745fe04"; + sha256 = "ee0195d6c81d2444927a712b54e17ca610b327e93dc351721dbe92211e52830c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/pl/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/pl/firefox-135.0.1.tar.xz"; locale = "pl"; arch = "linux-i686"; - sha256 = "f5466f86466996e629ff696d741ce088a52cad277e3ae9e4b993d115f78f8166"; + sha256 = "f760ae4af63044878bd30ca81e990368fb940240bddfb3970e3e365d6eeb7a0e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/pt-BR/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/pt-BR/firefox-135.0.1.tar.xz"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "78f23b4fe39e5c63cc5b7920f5d23d5b56c1d4dbf0ced2555f2ace83ad273a02"; + sha256 = "7d5640b25e19264d7eb65b0a1d0d42f94cd3f23d2522dfbaa1dd6ef1cd11272f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/pt-PT/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/pt-PT/firefox-135.0.1.tar.xz"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "627acc82631d1ec768f5b6db839c4fe35da62d122d5f44c99026cafad5fcb79e"; + sha256 = "5438be4a31c069bb24165a291997353eec760e1f6d293a738bddb04269309101"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/rm/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/rm/firefox-135.0.1.tar.xz"; locale = "rm"; arch = "linux-i686"; - sha256 = "f760882647686c29f4a06eaff4dc5b36a526fa7c79f3376cdca882c674540770"; + sha256 = "1f6bcaa34fc64e2df6e02327bb6908e6fc175709645a20354df3f5e10dd94689"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/ro/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ro/firefox-135.0.1.tar.xz"; locale = "ro"; arch = "linux-i686"; - sha256 = "992e47bfefa6119ff2242f76c31b384442b1839e186eb1ffe77bd9823df6bd44"; + sha256 = "0d5f3918bdb99590fbfc9ba120161af625e2111f1c646dcc6e45562d45edf76d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/ru/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ru/firefox-135.0.1.tar.xz"; locale = "ru"; arch = "linux-i686"; - sha256 = "9013b0dd4ede8346aaa03eebd86c962862d3a934b0e434867de75179df5bf7e3"; + sha256 = "bc5712bdab6eae0ec4ad0f2ff2a2534baf0014f51b3c07279350a630d2b1aecc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/sat/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/sat/firefox-135.0.1.tar.xz"; locale = "sat"; arch = "linux-i686"; - sha256 = "dc28e7b81777a21a16fb370c300db8b13a6ce04b5fceb6d6519868c5756438e6"; + sha256 = "618408e39eb1f7b0ea6ab20f74666d35e4a7dcab839b61588671191421e1a2ee"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/sc/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/sc/firefox-135.0.1.tar.xz"; locale = "sc"; arch = "linux-i686"; - sha256 = "cd0ad4cc058276d812e9320d4bbaa3fb85776eca94efa7b50e26bf493e2b27f6"; + sha256 = "dbc95d8d5529e59642efd27637eb18ce89a56b40bdb7d6c9df4433e5718460c7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/sco/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/sco/firefox-135.0.1.tar.xz"; locale = "sco"; arch = "linux-i686"; - sha256 = "6e7344d4fe680074c9693bed8bd53a23056bb380133ee69ac48183f459f2bfeb"; + sha256 = "026d409e7e86646e558204a9d6cd410d854925116a06e289a2a42dd908fb10a6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/si/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/si/firefox-135.0.1.tar.xz"; locale = "si"; arch = "linux-i686"; - sha256 = "1a97c7d611850c4d51e4877a8095692ea4a43c419714ac2c15fcb996bf537903"; + sha256 = "202838316171552b6da2ef6b333c1d73941ccddb617cb103a40baa74552b067c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/sk/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/sk/firefox-135.0.1.tar.xz"; locale = "sk"; arch = "linux-i686"; - sha256 = "b156f3881bca16eba9da6e57180e1738aef51e1509df124b366c2b3b47c0d5cf"; + sha256 = "f8966944f387e89bde5dc93b2d86b41922f778beb6fd17879831cfa738c812f6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/skr/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/skr/firefox-135.0.1.tar.xz"; locale = "skr"; arch = "linux-i686"; - sha256 = "7f805ea3ae7088d7a27bc6268c88509c36296c24d6eddc8090088b86b01147f7"; + sha256 = "827176c3fcb0355d77364117e2b19c2d495e9aebdd86a4647fdff5a303d4a9ae"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/sl/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/sl/firefox-135.0.1.tar.xz"; locale = "sl"; arch = "linux-i686"; - sha256 = "20f8a5096542e674a71c940abc305b75b85d62d4dc4df082e013f351126b02ee"; + sha256 = "f727a0d7a7b78aa48ff95fe5139c39769b6595fd4d5d371e185dfb40130099b5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/son/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/son/firefox-135.0.1.tar.xz"; locale = "son"; arch = "linux-i686"; - sha256 = "a0b073d9d27f788283f45bab15599e2af985ac005b4c5ef668ee1fd3bee3658e"; + sha256 = "c783330aadb74922bf02d9c0b45ea42066d9b4668979e91ef6006d32ce139fc6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/sq/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/sq/firefox-135.0.1.tar.xz"; locale = "sq"; arch = "linux-i686"; - sha256 = "92f0a7677fe01cdee34f1cf190dc7251e57d227f55c31d48c5ce83f8d7321c11"; + sha256 = "1ebb5a0f44aa0a850930a7936aad40b43af0d702a68e9c91b63c40bfd6be24b7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/sr/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/sr/firefox-135.0.1.tar.xz"; locale = "sr"; arch = "linux-i686"; - sha256 = "39a50e200d5ce945e7a2acd13be34bd7d52e02c91079b4803d48325dfa81ff3f"; + sha256 = "b0a53e48e940177ff013cb1d737e8ab9a3b36b7971aaad3d2977a49e2b3391f8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/sv-SE/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/sv-SE/firefox-135.0.1.tar.xz"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "41fa5e130806e53be730129abe4b3fb997627974a37a83cd470242f5ec089932"; + sha256 = "a878c834a3434ece1071e35ac7b641fec839caeb7944be935701d0f1a8827fab"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/szl/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/szl/firefox-135.0.1.tar.xz"; locale = "szl"; arch = "linux-i686"; - sha256 = "23d714703092342d4d08deef15c8bc4a67f169772a064bca9d251956235254b6"; + sha256 = "225bb44e577cebfb5c00cca92d0bb727f1927e001800ed58436f05056b3f306e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/ta/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ta/firefox-135.0.1.tar.xz"; locale = "ta"; arch = "linux-i686"; - sha256 = "e4f447f676071d00f8da91bf0da4d167e12899e2697c54e6292550a34d7300e6"; + sha256 = "d42227878cf9a9145ca25a2c8843f681c6fa8a04624ce9833d1e0f5bea9957d2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/te/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/te/firefox-135.0.1.tar.xz"; locale = "te"; arch = "linux-i686"; - sha256 = "f9382d58456cb70498dfa81ad5867e9f270eb1f363121b7ada6bcecff14fa046"; + sha256 = "6c0e77f5bb0f63f87c7cb614119948823e3e18f4185691e9868e5fe9f0d23af6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/tg/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/tg/firefox-135.0.1.tar.xz"; locale = "tg"; arch = "linux-i686"; - sha256 = "a4bd85c33939c3d4cf092beb77f02a18f9a705001c8809445cf5a596db880b57"; + sha256 = "f52a5f70015e490fa1ed675f00cbfd07144baea736b72fab945f5419d02ce2b6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/th/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/th/firefox-135.0.1.tar.xz"; locale = "th"; arch = "linux-i686"; - sha256 = "909af32f3357e7cc0a8b487e34e7bafff3a31713f42a140ae1e79f488f881825"; + sha256 = "8ff6b30726c51c7226256f4373266c54865d597617511c17ac544a302bff2768"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/tl/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/tl/firefox-135.0.1.tar.xz"; locale = "tl"; arch = "linux-i686"; - sha256 = "cbf1fe33dea4e5ff46399e03ebc0c9449a1669cfa0dd56aa22bbd246a0663b35"; + sha256 = "7f2cb41dee4c348e319f1532249bef98b115219e86abdfb144f0e102d7eadb65"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/tr/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/tr/firefox-135.0.1.tar.xz"; locale = "tr"; arch = "linux-i686"; - sha256 = "2c9b55bca186fff6ff66ccd3e18f550126b4249d1fde3c992fd29ebe43846484"; + sha256 = "bc15cf950bfddaf704d70eeedbddf710c7a53a4d0791e79d260a6a518fcbcad9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/trs/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/trs/firefox-135.0.1.tar.xz"; locale = "trs"; arch = "linux-i686"; - sha256 = "4ab7871247486004fa019cc56166328222b5109066aee74f9436e0412c7483a9"; + sha256 = "ca2511c660fb97be8da00e8ad5b06d7e188b64b71f8d1ed1881d1150e1ff2a30"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/uk/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/uk/firefox-135.0.1.tar.xz"; locale = "uk"; arch = "linux-i686"; - sha256 = "8754b818af913d3abacf617b896c41526d0ca1b196ea3186e2b69e206190903e"; + sha256 = "e7dae85ef3bdf6b8b82bb79a38764106ac7077283e7fd39aa663ca424b9ed9ba"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/ur/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/ur/firefox-135.0.1.tar.xz"; locale = "ur"; arch = "linux-i686"; - sha256 = "1a24847487d6bd763b8d037cfe9194d4602bd575b7c9fc01deaf119301d2234b"; + sha256 = "83c97adb1e15085a39e470f07b53f06a2db7d98a4daf7439d41484f063ce6445"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/uz/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/uz/firefox-135.0.1.tar.xz"; locale = "uz"; arch = "linux-i686"; - sha256 = "90747f2eb59822d559136292766c94c204d3f057ae46afd454c9ac25a08460d9"; + sha256 = "ad03d75ac68688f7aba2a801017639e3510e46fd42b12f602b8aa66482d21bc4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/vi/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/vi/firefox-135.0.1.tar.xz"; locale = "vi"; arch = "linux-i686"; - sha256 = "3f5ce919bc24311f405a245960e60e16defd64a90c48ee021fcf8b6173492122"; + sha256 = "04d36020a4601df78adf1c18634765aed3e574fc709751eafa811e6a473738b3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/xh/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/xh/firefox-135.0.1.tar.xz"; locale = "xh"; arch = "linux-i686"; - sha256 = "632f6447fa0bc0d837c8a73c9d2c560b8fdeb2db1cecd14427242294a3444bf2"; + sha256 = "eca2beedc5ed43f9928c7fc83186f4beafa6b48e870f467dd06d1f9412383fa0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/zh-CN/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/zh-CN/firefox-135.0.1.tar.xz"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "0048673d6bb16efc9bcc0e6ce96de2bce6de9892c39876bb75095569fce246e9"; + sha256 = "80d155ac20cbbf3960fa4a9f108fa0ca6bc97ec5eeb64f684757019c9bb05ac2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/135.0/linux-i686/zh-TW/firefox-135.0.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/135.0.1/linux-i686/zh-TW/firefox-135.0.1.tar.xz"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "ec8d89d995d7c06f36ca4360f50f99a474a2d6c2670357eebcc6f82eef80d343"; + sha256 = "ad7a84f4151bac75ff3d4e720fb2af7f329c115c510d6aa4cdc2f7fbf2ec3bcf"; } ]; } From 306f4436bcac26c12d183c9d65dc79a0e7ded21b Mon Sep 17 00:00:00 2001 From: Aaron VerDow Date: Mon, 17 Feb 2025 11:14:41 -0600 Subject: [PATCH 0908/1107] flamelens: init at 0.3.1 --- pkgs/by-name/fl/flamelens/package.nix | 28 +++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 pkgs/by-name/fl/flamelens/package.nix diff --git a/pkgs/by-name/fl/flamelens/package.nix b/pkgs/by-name/fl/flamelens/package.nix new file mode 100644 index 000000000000..d001696af476 --- /dev/null +++ b/pkgs/by-name/fl/flamelens/package.nix @@ -0,0 +1,28 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "flamelens"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "YS-L"; + repo = "flamelens"; + tag = "v${version}"; + hash = "sha256-cvsBeV9pdgr8V+82Fw/XZS1Ljq/7ff4JYMHnNxqNvOM="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-FIIt8RwPaPrVG3D9FoMjR4L81NzUrKZsAeW2AJkBG1o="; + + meta = { + description = "Interactive flamegraph viewer in the terminal"; + homepage = "https://github.com/YS-L/flamelens"; + changelog = "https://github.com/YS-L/flamelens/releases/tag/v${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.averdow ]; + }; +} From b240039f813a76ea7c6acc1d3e10af1b422f2c7d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 16:56:10 +0000 Subject: [PATCH 0909/1107] frankenphp: 1.4.2 -> 1.4.3 --- pkgs/by-name/fr/frankenphp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fr/frankenphp/package.nix b/pkgs/by-name/fr/frankenphp/package.nix index d7395131df7f..acbe4c5e0366 100644 --- a/pkgs/by-name/fr/frankenphp/package.nix +++ b/pkgs/by-name/fr/frankenphp/package.nix @@ -31,13 +31,13 @@ let in buildGoModule rec { pname = "frankenphp"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "dunglas"; repo = "frankenphp"; tag = "v${version}"; - hash = "sha256-lY0nZCaevAlTOLHozOvH1xtLFTLOv093N4mrETt4Lhg="; + hash = "sha256-k5kLPUI3dV8C4rBeAM3ghmwXtas/Q16v332M3JlL8jk="; }; sourceRoot = "${src.name}/caddy"; @@ -45,7 +45,7 @@ buildGoModule rec { # frankenphp requires C code that would be removed with `go mod tidy` # https://github.com/golang/go/issues/26366 proxyVendor = true; - vendorHash = "sha256-LqsdX2oivCYhXBGZBKP+V7iNUoZuW6lRFO9kUpeEvL4="; + vendorHash = "sha256-snSkbgZPc92uQnpDc9+zdyiFnO35vCXYk1e80AwbVGA="; buildInputs = [ phpUnwrapped From e44860ab2737c21ee0fce2c8140e4a114485c840 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 16:57:07 +0000 Subject: [PATCH 0910/1107] cnspec: 11.41.0 -> 11.42.0 --- pkgs/tools/security/cnspec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index ccedb83598c2..abebb20ecdff 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.41.0"; + version = "11.42.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; tag = "v${version}"; - hash = "sha256-MAJFTlzBa9thdyVKS1zH9PKpIy2HXYESZR5zfOURIgI="; + hash = "sha256-Occ64wXqYzUw6RZ4fVb85ZotaLRw6R9EcF36BMLJ4ww="; }; proxyVendor = true; - vendorHash = "sha256-k9/SfOZvq7o0SzY7UP8MD2LUG7//z8p6ZJL6UXUZrIA="; + vendorHash = "sha256-rdNFH2DbZqilA9Qk+8MJeMBziRDoNQRQ7qbhdc1FUbU="; subPackages = [ "apps/cnspec" ]; From 9daef8fef075e38d1be163470b43386a8ff6301a Mon Sep 17 00:00:00 2001 From: David McFarland Date: Fri, 14 Feb 2025 15:25:18 -0400 Subject: [PATCH 0911/1107] dotnet: add passthru.icu to VMR runtimes This matches what's exposed in the binary packages. --- pkgs/development/compilers/dotnet/packages.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/compilers/dotnet/packages.nix b/pkgs/development/compilers/dotnet/packages.nix index a82b5c3f62f0..aca1af07c603 100644 --- a/pkgs/development/compilers/dotnet/packages.nix +++ b/pkgs/development/compilers/dotnet/packages.nix @@ -197,6 +197,10 @@ let runHook postInstall ''; + passthru = { + inherit (vmr) icu; + }; + meta = vmr.meta // { mainProgram = "dotnet"; }; @@ -224,6 +228,10 @@ let runHook postInstall ''; + passthru = { + inherit (vmr) icu; + }; + meta = vmr.meta // { mainProgram = "dotnet"; }; From e052beef878e79264ea61c1ab9d6b6a4d071568d Mon Sep 17 00:00:00 2001 From: David McFarland Date: Fri, 14 Feb 2025 13:53:43 -0400 Subject: [PATCH 0912/1107] dotnet: use source-built runtime in hybrid SDKs --- pkgs/development/compilers/dotnet/default.nix | 97 ++++++++++++++----- 1 file changed, 71 insertions(+), 26 deletions(-) diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 2d246642b8f6..02f1f411cb5f 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -11,6 +11,7 @@ recurseIntoAttrs, generateSplicesForMkScope, makeScopeWithSplicing', + stdenvNoCC, }: let @@ -89,39 +90,83 @@ let } ); }; + + # combine an SDK with the runtime/packages from a base SDK + combineSdk = + base: overlay: + if (overlay.runtime.version != base.runtime.version) then + throw "combineSdk: unable to combine ${overlay.name} with ${base.name} because runtime versions don't match (${overlay.runtime.version} != ${base.runtime.version})" + else + pkgs.callPackage ./wrapper.nix { } "sdk" ( + (pkgs.combinePackages [ + base.runtime + base.aspnetcore + (overlay.overrideAttrs (old: { + passthru = old.passthru // { + inherit (base) + packages + targetPackages + ; + }; + })) + ]).unwrapped.overrideAttrs + (old: { + name = overlay.unwrapped.name; + # resolve symlinks so DOTNET_ROOT is self-contained + postBuild = + '' + mv "$out"/share/dotnet{,~} + cp -Lr "$out"/share/dotnet{~,} + rm -r "$out"/share/dotnet~ + '' + + old.postBuild; + passthru = + old.passthru + // ( + let + # if only overlay has a working ILCompiler, use it + hostRid = pkgs.systemToDotnetRid base.stdenv.hostPlatform.system; + hasILCompiler = base.hasILCompiler || overlay.hasILCompiler; + packageName = "runtime.${hostRid}.Microsoft.DotNet.ILCompiler"; + packages = + if !base.hasILCompiler && overlay.hasILCompiler then + lib.filter (x: x.pname != packageName) base.packages + ++ lib.filter (x: x.pname == packageName) overlay.packages + else + base.packages; + in + { + inherit hasILCompiler packages; + inherit (base) + targetPackages + runtime + aspnetcore + ; + inherit (overlay.unwrapped) + pname + version + ; + } + ); + }) + ); + in pkgs // rec { # use binary SDK here to avoid downgrading feature band sdk_8_0_1xx = if !pkgs.dotnet_8.vmr.meta.broken then pkgs.dotnet_8.sdk else pkgs.sdk_8_0_1xx-bin; - # source-built SDK only exists for _1xx feature band - sdk_8_0_4xx = pkgs.callPackage ./wrapper.nix { } "sdk" ( - pkgs.sdk_8_0_4xx-bin.unwrapped.overrideAttrs (old: { - passthru = - old.passthru - // { - inherit (sdk_8_0_1xx) - runtime - aspnetcore - ; - } - # We can't use the source-built packages until ilcompiler is fixed (see vmr.nix) - // lib.optionalAttrs sdk_8_0_1xx.hasILCompiler { - inherit (sdk_8_0_1xx) - packages - targetPackages - ; - }; - }) - ); - sdk_8_0 = sdk_8_0_4xx; - sdk_8_0-source = sdk_8_0_1xx; - runtime_8_0 = sdk_8_0.runtime; - aspnetcore_8_0 = sdk_8_0.aspnetcore; -} -// rec { sdk_9_0_1xx = if !pkgs.dotnet_9.vmr.meta.broken then pkgs.dotnet_9.sdk else pkgs.sdk_9_0_1xx-bin; + # source-built SDK only exists for _1xx feature band + # https://github.com/dotnet/source-build/issues/3667 + sdk_8_0_3xx = combineSdk sdk_8_0_1xx pkgs.sdk_8_0_3xx-bin; + sdk_8_0_4xx = combineSdk sdk_8_0_1xx pkgs.sdk_8_0_4xx-bin; + sdk_8_0 = sdk_8_0_4xx; sdk_9_0 = sdk_9_0_1xx; + sdk_8_0-source = sdk_8_0_1xx; + sdk_9_0-source = sdk_9_0_1xx; + runtime_8_0 = sdk_8_0.runtime; runtime_9_0 = sdk_9_0.runtime; + aspnetcore_8_0 = sdk_8_0.aspnetcore; aspnetcore_9_0 = sdk_9_0.aspnetcore; } From b86de9c214d643ccd8d3e19e1b0a9a46d9d150be Mon Sep 17 00:00:00 2001 From: David McFarland Date: Wed, 12 Feb 2025 13:32:55 +0000 Subject: [PATCH 0913/1107] dotnet-sdk: 8.0.405 -> 8.0.406 --- .../compilers/dotnet/versions/8.0.nix | 620 +++++++++--------- 1 file changed, 310 insertions(+), 310 deletions(-) diff --git a/pkgs/development/compilers/dotnet/versions/8.0.nix b/pkgs/development/compilers/dotnet/versions/8.0.nix index eefa66d5763f..69fecfc2de59 100644 --- a/pkgs/development/compilers/dotnet/versions/8.0.nix +++ b/pkgs/development/compilers/dotnet/versions/8.0.nix @@ -11,43 +11,43 @@ let commonPackages = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; - version = "8.0.12"; - hash = "sha512-IU0eI4OrQYkabBlA2WpJTv4ySiWm9d7fnnX99k4m1aEq1XnffJIg+a2YOHwbJRR94GdQMHTb0Ug87OdX10Z+JQ=="; + version = "8.0.13"; + hash = "sha512-MgSCr3Rq6GgXQajJ7r3j96vIGlfwKdJd+i5gp9FSfKFMagJ69dzdqxaAHvvpxiuyR+b4ssUW+c/3gNmpze3eKA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; - version = "8.0.12"; - hash = "sha512-vX8WpwQ9zE4VMheMIXm8pvQL1BYAvTTFeDxuiZ2U7edUHl+dTBA2gizqKG5x8nVJ+hBLEOnd6NVe/IQ/4jJZQA=="; + version = "8.0.13"; + hash = "sha512-YMKye+unHqv+lLVHmy/H2YTbs8DaRpcG+K4D3WqivPCoWGX6fjNvtg8g4zR6axVrFNnKczwQJEL34wetUGx61w=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; - version = "8.0.12"; - hash = "sha512-Njr8IyfftNDLVifJfppsfU8Fq0e/HM/dkll9pVVZGyEzFyaQVN2irOcwdLXxZeH/npWaBD0x9T3980vhkMbt+A=="; + version = "8.0.13"; + hash = "sha512-pWiKiUc9qaTLlZ8/kVD6s7jEYJTCAfqnphxCOJEXkP1wOcEpMWN9d21GK9ubOSq63IVAAeKmA2DoRFItcyha6g=="; }) (fetchNupkg { pname = "Microsoft.NETCore.DotNetHost"; - version = "8.0.12"; - hash = "sha512-8rjYi83EF7eBOT1xfUkQA3QxH1sZ3GDbVwX4keXHE2x5PTVg93AdNymis+6hrng1cRCmsQHXqLd7TKYaBv+IZQ=="; + version = "8.0.13"; + hash = "sha512-ZtwZhoOO0WvuptMPZmvj9QUzTNu19OroTihw6qtJS8vUreRc7UjvqH7PvOFdwgKtX1r1bDLfdR/4nRuIwoBRoA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.12"; - hash = "sha512-QO0rXIEDNJxhuxwu5DG9dSy9z2zgb2rkzQ1chPRwTKc6DQ6aM/Am9ip/ZGctBwOkd+U//rk3mAtiyt4urSkFtA=="; + version = "8.0.13"; + hash = "sha512-tJMoj/QZpYDleN/H3UghIynxnXPRgMPdrx1uqvX/3wnjsIme1ExM3ZTkZ6enJjAt73i6FVEWQyXTVczczgabDA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.12"; - hash = "sha512-62zfQPVBxlPMyBXwGoxtjGa6wG+3X7DxDBMUeXVkazAvmskE6K3oDlxizpvicC/ixs9qP9XfPG29Xnk4C2OO8g=="; + version = "8.0.13"; + hash = "sha512-UMv8jGREl+mz8P9MS20y2sWWbkGZyn5BISDz7IVlEgoY+qxRkZX8l7sQqq8XxAM1BkZLy9PM6JtHQSv+VMI7Qg=="; }) (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; - version = "8.0.12"; - hash = "sha512-r6NUtAtfVD/yrl5I32Tgvp2omJeEudvcJKHP4P48QAq4yTcNxfIwSrnpTNala4rdesPN0oCT1EVYjjM5Zsx90w=="; + version = "8.0.13"; + hash = "sha512-suZh3YYsbkaRQOHRRtdozciCJHdxCEWV73tGBQZJzc0dFYRh3FsfYxUtDACpbWRQ2IZTYJawrEo7mZHUwXcPtQ=="; }) (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; - version = "8.0.12"; - hash = "sha512-x8415TsDFy1pMt6c/PvjO6N42DxS8H53M8dfXgtAETiXAhZAx20mR35MshFn/LFP1TIgk92F3XEn4jzN8alWbQ=="; + version = "8.0.13"; + hash = "sha512-W9UdnWxyclcioXrchdCpsQDJqnUtCS+m4aWRWV+2ejskgjNjUyiOrpYjQy+XVE5bW9krwd9ynOkD3KXL91sDFw=="; }) ]; @@ -55,118 +55,118 @@ let linux-arm = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; - version = "8.0.12"; - hash = "sha512-+mObcz+CfLpcmBUBLi0dkPyapyBWusj1xBBuEZz8Aeka6MWy5WS2ln2Tes4tKv4HKdbEQZJjI9wDH+9P+7GJdA=="; + version = "8.0.13"; + hash = "sha512-wPiH6xLRHVjd6LiOc9xEOJH+LSIamyZBPPb3VxdAOeHxcD5WjyoS7rUhI/M6DqufG6Gi7VMhehP9lLejW+2zFQ=="; }) ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; - version = "8.0.12"; - hash = "sha512-SpNIfhe1CdGsbt6F7iP0rKJZ+4qPJug3l2T33XospN7AGhHewHIQadRQqG/dQBab1e1ur3w8dCnmYlf/48gymA=="; + version = "8.0.13"; + hash = "sha512-eDzhFaPa70k8gUeu6rbr7s2aOfFSvwRkwTCoY4mVERmsbKtrwCLERhv7vuw/ze8lqloK2oXwwybL1ekOUKa94A=="; }) (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; - version = "8.0.12"; - hash = "sha512-XkM73Yq41AFG1IAwBvusNpSDn8OuPmkJEKJpPFlccX/GYlT5V/LihRlNVS4OHmlJhvklpuro8x+c6arLSnv8qA=="; + version = "8.0.13"; + hash = "sha512-OE4/Anisy5MjaOKxAhIU4b4bFjNaKW3vZpCVwIgIBcVz/WUVKYrTywEH/UzhEPqbJ/P6PJ6SMjYmdQ+bColVDQ=="; }) ]; linux-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; - version = "8.0.12"; - hash = "sha512-ix41sJBqRfoNp3zg2+QBX18XEEwA2iVcGQwrHOOgAM5IcJdbe8wO+K7Hqmb4+gtfonTuVzxf6hvDi32luuSUFw=="; + version = "8.0.13"; + hash = "sha512-UR/FmEeb+HuVKOGLxbCF8ksc928eqxLy23ifwRBX8dFiWs8z8s7zXtpFIvH1t+at5F8BUOv70aneRhQ2Wgs1zw=="; }) (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; - version = "8.0.12"; - hash = "sha512-fuwAxmHlGgVzoMiqtPeYKaKr7UQQYTOdlHddgduPDArxQRJOHFL/ssRTk+9NcaSkSfK/+CO+iP5yweuX27UH2Q=="; + version = "8.0.13"; + hash = "sha512-kWVbJrHvjFz5esVjTElVXjgS3tGH9NsaTHLQty0De7bLqrbrzKKu5OUSNdL61ev7QwF8R6iflfA5+/UvVYVkIQ=="; }) ]; linux-musl-arm = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; - version = "8.0.12"; - hash = "sha512-WEZ5f5D7OpmL48PowylsZO0w/bhuVSbvGjO4VtnVlvk+chNeArAd+mocPcBmleNDMu11YoZvEC8wkHvsdfIOCw=="; + version = "8.0.13"; + hash = "sha512-PUV8GmwwmK9aPFWdNo8HwN8UC35heQNqU75AszWHXkpfqnskuRdFYHoyUjxxvVlBXaen1xymXw/YX76NDoZeyw=="; }) ]; linux-musl-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; - version = "8.0.12"; - hash = "sha512-04gvjzunjfA5J+srNF0ew5KNSNhFwYiZdZ2554nUhG+sO/QtbiTPP9p9QqCqwv3zwf2FYz7/sUuIIC/TFJnPbQ=="; + version = "8.0.13"; + hash = "sha512-U0nbGfOc2+6zSOFNCZGhrJHQnKM3LZcBQqC0XGm4B0S/5wvZmrsLx0GSY09/EPmldWuSzaC3Exot7mC0NvUYuQ=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; - version = "8.0.12"; - hash = "sha512-BRkp66CwQudTw7WCejICFbAMwOaTrvjc8q2g5yj3uyAZAYDQVG9VC+QmsO7EOvZuX0vuxhWkHNg1u0yAjD/swA=="; + version = "8.0.13"; + hash = "sha512-PUsBDtDOVrGhaqyJh6D6vVJ6DBLac87qV7MojLNXEeGKn7ClTSzr78jneOUOeGcHFrinQsX8PoCMehszYjdomg=="; }) ]; linux-musl-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; - version = "8.0.12"; - hash = "sha512-WdlGK6tDI5MwJ5BTFpPhfUn1vU1CHP0UVEKnBhHOhihgQaO6Y+Itdu/erLjaEe1JE9aANdKahvLJTIbXqpDRqw=="; + version = "8.0.13"; + hash = "sha512-OAoCKmvnbiNYswLUGGZeV52PbsYyNN0RB/Tj7UdYc9V3d6LIKrEweKutQ/zJznInNWkU0FwG1M6nKzoXVDNoFw=="; }) (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; - version = "8.0.12"; - hash = "sha512-Arv2j2asHvlV6CjMjw5ahVWQGy9To4oolKcm8Lx3P8zPMjewt5M6ubWfndOcIMhLzxtx9QrmLF1HA6xEqo1JXg=="; + version = "8.0.13"; + hash = "sha512-ug+DJuZxtRkMOFv6Dhg5VkCiwtTJSWdOyfAkg/vwYcJvk1rM6wQwsLb1G393hmEnVqzXmhVaEi7CJE9Kp4cw5w=="; }) ]; osx-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; - version = "8.0.12"; - hash = "sha512-560CmTGtQOStnCIStBedCaPIDxqD4mTLj8W0myxjLUjEai5VwHcdecjhkZ7g6Owx5igQcXdRVhsV1BgRQOfb+Q=="; + version = "8.0.13"; + hash = "sha512-8QTpY+hdI3mtN1cqsv9FeUSiIPeO+SXFAy2A6VXd75Mb21Tmpy+u28p0iU8B7dyxPOYwX/V8qXtvnFfpSJrRVw=="; }) (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; - version = "8.0.12"; - hash = "sha512-jt6Vtq6RHBHBE7Iwmw7MzCMNvNCp5+Bt3PqTIrQ21IttnpESbcLgVlI0VJAqXxIwsWiRn5hScfSm88CLGSNsfQ=="; + version = "8.0.13"; + hash = "sha512-a5TGVeUAzqJ0O9TkZ5QvFwTqLqTqY7XtcYEu8dPGzwyy2xHU0OHuQnpcVbvzNfflBWz0p8wq+O2th8D9DcR4Wg=="; }) ]; osx-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; - version = "8.0.12"; - hash = "sha512-0R3R9Y9ipFnYu/kzEOjJt0VZH0JeyJkuWC6kuQIkmpcbElsCPvQWV1Q7x8Ui6od8ixUlL2Cx0o/RCB8ZeKppIA=="; + version = "8.0.13"; + hash = "sha512-EJ45DHJtHOZAfJ9KbqDnjl5QwY5esccnSlCu1jaopNT6GIVibeRA+gycjrA99vPEqO2kK4fIrsEl9qOg77/oAg=="; }) (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; - version = "8.0.12"; - hash = "sha512-fiP4Lp/fMzye0ShKP6IDUA6+4ICvGdKsIXL4Slq72E6+AUlX0dghW6tNc998ErZphdLX2sbsSc1HQnDICutvpA=="; + version = "8.0.13"; + hash = "sha512-Eb7MuECz+qf8uGFVsGt4AkEt6+1DbIBdeCHqfW+Kxs6iR9zHH+Q8KeT/N2KQHeYPuo+Te6LWr3052XJoCdNnWQ=="; }) ]; win-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; - version = "8.0.12"; - hash = "sha512-10ylliwboh/r2RsZ6JxBaGTlgJFijpATV/Fu57wppCvnIs2n47jDPpF1XHGiGkSFVKuMceLTFRC/5rvY03BafQ=="; + version = "8.0.13"; + hash = "sha512-quVzy/EWr4xHHNo8sWPZIQfDPdMrNubaGdgEGnvmMuxTD+k06nWu3+HV00tNSbx2ruuPJMypR0gH1GUcAvAHiw=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; - version = "8.0.12"; - hash = "sha512-+anxlvYQUscNCsCFQPGHyADxolr4cJlcvYhe6D9t0gfoJObTwe/N16kUv4nqY4orTGbdOVQTAzK/sP/Peexc3w=="; + version = "8.0.13"; + hash = "sha512-fIujBcXM1ZPjkhxdJG3uavyBGC70EPMbmxaEAUy4sq0sMsEwot9XCxk9lGegnN/hro4Pv37IpWWpVYiMXb1GmQ=="; }) ]; win-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; - version = "8.0.12"; - hash = "sha512-cZzBGVhiVMMuauiv7cpo5uGmDCJkp/T3bb/ebf4iPuiBoLpzhj3H6MUMExspoifk9YbuUreRBhFPjehxw6ZMLA=="; + version = "8.0.13"; + hash = "sha512-1cD9zMbdLSEC3U9/ebV5zOPGm15yfXw4coEQ4O1/2+pTwjwa3aYRoVVzYm1ptNOm4OufHW1E5VmurpJ7VJ7ehw=="; }) (fetchNupkg { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; - version = "8.0.12"; - hash = "sha512-FXRkE1G3pOU96QCaLzoR6bK2GMGVJZG8KYxzWG+6YJExOx8Zp7b2cpVRFmqZVzyu73WtSl/gNDXZ16yJG4csCA=="; + version = "8.0.13"; + hash = "sha512-GS1VSLt/2czy8XSLJMpzUcPAeHsKVrQGnHOkFTeJew1wsiMZHmmqftYKm5GAqCloy1wRMaMpiXk2q6Eu47xItg=="; }) ]; win-x86 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; - version = "8.0.12"; - hash = "sha512-CLYlwkALgB7C/u5shyYTfqq/12Og5oAvQrSB2wNvDAfRNo951HvCOU/wDsXHuIUIdPLlHlLMEAWkpm+NeE/QHw=="; + version = "8.0.13"; + hash = "sha512-Gxi/u2nXIVPLA2kFEgChk4flm/1FCvFSth8lwO/9pqyoq5mD0uti4EF3Q9kheTR1YMCykmPPP1RIsJlMKkQBPg=="; }) ]; }; @@ -175,566 +175,566 @@ let linux-arm = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; - version = "8.0.12"; - hash = "sha512-/rSaXqthJBKc6Hpo5XqMDAinY46BfCVeJZpW8FefuPsw1JPj6GcNjzHo/FlkOP1/1quDhIIwR2yibukE+4VW3g=="; + version = "8.0.13"; + hash = "sha512-h6PYukUwYkY3FNBzeLAnUVxmmcOp2cmkasfbd+VU0lNmUP1MrdlOj626v4GY9tG1h3F4+I3Ry3XmgM7aaf7ZsQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; - version = "8.0.12"; - hash = "sha512-Ht+5l1Kt2IUJ/CUj4hDt1mG27X3idPvCIjt2bCFp0Kohi0vwg1KyIhn71O4T25TGjgeIVksMYnui206PyHv3Kw=="; + version = "8.0.13"; + hash = "sha512-R3bpcLl9kzcnJv/t/SZTyYEod5Y9Eq1/DQvDhhLy994z7/2dWq236maUVstpqrNRyGRlk94ZLUDS1SQKVTCnOQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; - version = "8.0.12"; - hash = "sha512-kAYDaWNT7LpzButcbGML1KWVJPpiMT4AB45Ky5p+8rUS7qgItUEEgFXWUoxLoIUv33I83ltnBdk1YvK7wls3FA=="; + version = "8.0.13"; + hash = "sha512-kCjEavVZXespMRjSaY7sYxZiv7DEep+9WQ3fpC+OIy5Wv5nvd4kFEHDY4KuWRQ3DuSdNxEaAdDEib5tp+dSsxw=="; }) (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.12"; - hash = "sha512-e9HuZf9u4oqAV546suSM5gxxL4ya26j78ZoCvg3Q2I7jFwjiqIY5nX2gKNsCqnZvI6QmFcppdtB3pRu1fgKivw=="; + version = "8.0.13"; + hash = "sha512-qumZZHELvPZ7cXndpoTr2TIwd8aLTCME5GYXm85bKo03ruFsvg4sqlHms2XXTOR4U84pugHl6yJnzUSS8WT8Pg=="; }) (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; - version = "8.0.12"; - hash = "sha512-j6SeFxXVMtQmKPQm+cFQyxmreOhqBPxgj/s1Ox/iBjmsfmjZCacPhvZaXBHOAIlofm1Cu7AHw4c/jNti/nmVVg=="; + version = "8.0.13"; + hash = "sha512-pOMUwywBQOla7x5XxBT8bhhTYrt5ZNznp2VjuRWUndJjn1XV5kfVoHgLBleWtjSdqx214+1qUV0daYigcfFjLA=="; }) (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.12"; - hash = "sha512-/VNEwbjjJt8LZamwsKfNulK2eGARbzi1m37Ci3csBXturaOHvhXzECAZvcriPumALGVFBO3Lc3WSs6rsubxiaQ=="; + version = "8.0.13"; + hash = "sha512-XqGPxuqe8+E+BnuL+6ZihrWQbxVUKWsR/9rjDHuGvPZswwGcXLAvzMLgJEmI3aR71yZL2bMskAI4p7w3L/A8dA=="; }) (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.12"; - hash = "sha512-Hv1gGAnrlwk5LoeZeudMJd2G69oI2jJzppWGJGSvXJyHus6XmsVvQwd8276rTm9o95GJzNi6kRwYJ6xLVrCixA=="; + version = "8.0.13"; + hash = "sha512-gE2lw5wRrU4OQTjvOKebfOaWAVoD8qUkU7TiDnlcbUU44nWVY9SZ5Sxg1KTDvLQG+9JQ1ilBWB4xZw7nfoOn7Q=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; - version = "8.0.12"; - hash = "sha512-hRd6hmc60sbTQO25kWoW/y2htMTzWLlk3GMQHjZUxB0b9F6JqzTo1UBmbqkAfZTCrDQ+redeyibbAJ1CdoGIyQ=="; + version = "8.0.13"; + hash = "sha512-g7rwnlk3MNuah6el1YadnzQkaE6W0Keb+sKhw88gXd2rmxRegnmMKM48+p3KlmgbHER9c20doUcpSCgG1FSQCw=="; }) ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; - version = "8.0.12"; - hash = "sha512-DwGq22s4EZo9VMySm0cxAJ2kyHDQzEh0o0N3m7HyoMfdy3BxQFOoO6RGR8HSvpmBk3uPQbIOX73uv4GP2QhJeA=="; + version = "8.0.13"; + hash = "sha512-eu57Vlit1LrSAKnuXPLfcxd9OVDG5o7FGuIJmRcPC6DOtQuO4GvKx6EpHjWpgDvnq58NDonhfpKUVdr6onY8Zg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; - version = "8.0.12"; - hash = "sha512-mJaqr8IqCRiVBf1J2isll8Ay/4R43FgDxPAT5B/NQl+hm2xhp55qyiFSIwLSHF7bmeDyneEFDFi+BzTNQ6KB0A=="; + version = "8.0.13"; + hash = "sha512-ve7hPhZeKIwPt33tozrAODERm2pK0F3o0K0I3U+CPCHa24+47eC3WNMZYoGS/CjZtUSD3X5YZV+U0jXU1nbXtA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; - version = "8.0.12"; - hash = "sha512-8Z0UJe07s/eoPjnyRxA8VshWA3eKTeQRc4BotwZcsgVblxCJPJGAmTFgKuEs3xwTxanuGJPqp2T0FQiSSFb5cQ=="; + version = "8.0.13"; + hash = "sha512-+UTfs0e7mIdkVb8zR0lqkaz9fsxgkoRq7BCsgPjIjyheR3e4AygDouuV/VnQtOXYHO48DIkidKFcg40mLlzAFQ=="; }) (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.12"; - hash = "sha512-agI+Lgn5CaY9okxs9ab3UH6IN7lAHdE86WjPxU69YvtDJIA9Q6efR13fb6cKAU+6/+Vc/SCE4fQm0AKC7hQSlg=="; + version = "8.0.13"; + hash = "sha512-+FfRV8eJwWGTTHhnIKgj+YYVJ80l1atJ6shI+7BF5Pzk8eVM6edk0d9FoxYSrGpvDRvus393c91c6riJbc16fg=="; }) (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; - version = "8.0.12"; - hash = "sha512-tPEWNfOGZVqbHJIIO9nCozIVLdLwvj4ZGAAnBnSG0Zcv+cmXic7ptK/Lta9iUYhVTUUVIGmSRsfyC5ggDAn3IA=="; + version = "8.0.13"; + hash = "sha512-LOgp9W2atSRVSVIknts+VaYJmHht+JCET3nZc5+8eCqR34PoFo2P8e0f/CZf673HS5ZUMEkgmDZN2lA927AB9w=="; }) (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.12"; - hash = "sha512-BvGOuh3A5AuiGbyjOu3e85/+4SBWS5AtLLZkpCfQIXY2KAUP/vt3aBSXn0HwNaaXUWrcq0NHyA5wvZ5M4QCSYA=="; + version = "8.0.13"; + hash = "sha512-TjRXIRUfWjRpJf5rcXqayBRk12WaIWHrtkbmINY1n99Xk3bnw7I5EfJv6ard3y7WrLj//Y3MzPdvlCe8gtOCKw=="; }) (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.12"; - hash = "sha512-RM2A3428VuPrCnAapYC08K1t/trGBC9iqe9Htcq36CMtwhzyV0XWK5diWmDhk4dLAdH3v2tjhePfUx76TFI5Ww=="; + version = "8.0.13"; + hash = "sha512-1rVdbT+vU+uIoQk5bl5LmJH7FZeGVzOKerYwNDYzE/aNIitJLLVAbik+Bv/29m+//E7OZOPdciGALFl8U0rN9g=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; - version = "8.0.12"; - hash = "sha512-RyibsHCts+wVGYxBzkPRkVJEMLzLCZpV/Fa6csnuIIixvvqMwUornjrMVNcXMRq+0HBIlJAgFwcWK7ge2uBmxw=="; + version = "8.0.13"; + hash = "sha512-fxvgW5dSYuaVZGu5NVltyyWZwiZ4MhJVfQoeHEZI9VPEZ1EPBDLYjlIyWiyk0cW5+yEtZmkeNbcQELN6t8ms7w=="; }) ]; linux-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "8.0.12"; - hash = "sha512-67ytUxCcDyaCmVkIo3J5bChFKDJf3CIjJMtBJ+1wnaGqyavoHs9c3kGeppVu+FOyxbduKHNC35IxhtMfr3DEMA=="; + version = "8.0.13"; + hash = "sha512-pXWXxDcUgCm7xBUI10o8o23ZgDSAmG/rOO1bfzY74RnXPIOcraTpUoB4GgVIb3z7ERJek1B5W6roycag6B6WVQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; - version = "8.0.12"; - hash = "sha512-cq5S411xb/jEUFPNlwoDV6PLKbCYmDHujelob530CaYP6/UfiI/Y4vqpyBySG2za+Y41vazDEBw/5Hc2u1sZ6w=="; + version = "8.0.13"; + hash = "sha512-vZcUK6f9IPTM+QBsoNZEuX7pB2p6mnBMcEE0ejK3LNt/3byj216Xw66Ur786bemJtq7AmEvt9173bbFUhqpsvA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; - version = "8.0.12"; - hash = "sha512-jan6vGT7vg8fbtNyJnmEk3jYNTbRnzxx2b37RMZSaub96HLnRARe8EHt+lFmjyxj39BRC9izrxW1GDEUebz6rA=="; + version = "8.0.13"; + hash = "sha512-cJUogvZSX0tEypF9u+fiP4qn2o+6YPrJSCozxGV7fR+NgG/r7TXlEBNEE7zfZykb0ytM51bE5i6Sl4oMZwScJQ=="; }) (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.12"; - hash = "sha512-h3yV4ya3atlf59IJ6H5Eo0+zxX9aYNZAsNJHOZGO1Z9/n6eFrKtgjaBDR3tB4K6/SPjFYrmKfPAPWVkQ40zszQ=="; + version = "8.0.13"; + hash = "sha512-z61zo1KZfSY7duX11vGC/Azgo8iF9BvrNTW7/IdGlcgv/mFM593qbyu5u5P6Slfh6+uPIT+usyyOsmfmwmJLxQ=="; }) (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; - version = "8.0.12"; - hash = "sha512-/Udpwhuv8ukIken2Klg8k/i5lImdl7Zo103aUoZyxcFotGM70cZjEfD8wSgZ5uuybnyvHxK//rU1L7B+2DLlhw=="; + version = "8.0.13"; + hash = "sha512-wLID5tqgV8SIPLcZk74F9S2VJtPVSMKj5IyF4ce2zGIiADhPPdNn2v577xK1nZCySAUUj5gc87TG/mhUP2glTw=="; }) (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.12"; - hash = "sha512-IVQ7bb/+Ay4oTDGrpbBzmLPibWQ1eKQ07xTE+KqFqF1jC/vEWcsVDWQAxTm7c1OVU3rM018flvE6x4oSwMP9PA=="; + version = "8.0.13"; + hash = "sha512-tETOLI9GXl6lQRfc+Nm0zFkmietPL0gNWgNfrDG417PwKCVn67lNOMB4QCGxws4aai4Xss1Nz1DUws8Afowv0g=="; }) (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.12"; - hash = "sha512-7U+tpgXW2+obU+S4SJck81AAri52F1YjfIl5m9fWumni7FLqKiNsWGl3s5AoGy+IwApTBHymKdCrsZcU2uEELg=="; + version = "8.0.13"; + hash = "sha512-znVAeRi4kfoOAzOGH7T3DQNqw2Qr5B4cJ8MQN2ys/v8PDomK245iamkSAzzeEwkX6IsRrB/WoWsHj8t+Tk/w5A=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; - version = "8.0.12"; - hash = "sha512-8D6h096yNgQwd+2sUneE/ne2Po9n9eoVXTL1Pjt3oLhHjB+spEz0VBKtHv5u6ZTNlxiigkhZxYYQmgkidqHvZw=="; + version = "8.0.13"; + hash = "sha512-QskMMrolVlrwJtSRM5yGkeEyybdyd87J7TRRkQ3eKpGEwHRMh9decBVnIT/TF+fQlnFldTkfWtCayPNMjRaeMQ=="; }) ]; linux-musl-arm = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; - version = "8.0.12"; - hash = "sha512-dnof4ysabawNHR/GHmDPhDJNNVIo04vtfe6hdV93bCHodwH8mSXA3+q1wPgtgVVhRH7o8ivabTZtVlCrEDQsRw=="; + version = "8.0.13"; + hash = "sha512-JiSgO5Hb74QjdoOD+pDUl+zd7XyD5xg9v1gTOD1eBMueuNHG4rbziMkX6ZXw0OHDdeidtfl3CO1HZe6WG2rYZw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; - version = "8.0.12"; - hash = "sha512-UNHaTj1t8NSwSuBZt2+M4iFFSsXUwrWxGakl/cfxe5Q9O5byqeTgRncZeYoXJccnZocBb0/KJEukSLUq//uwnA=="; + version = "8.0.13"; + hash = "sha512-h8nywzrG0FLBePMdKUR7ypath0Bhdijo5mUuBfGvi41RNH/RnQYrE5G+UgSJFVJ80z+/0U0mqAvCz5tDHt6frg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; - version = "8.0.12"; - hash = "sha512-KYeu+MHDm9YuXW6r48+6y16K6luIA00DaxQ/IyVJ/d4wGGRlRbfSuezFi1UPzlVG+2rlJSXYl9Ar5dDb3hmWEA=="; + version = "8.0.13"; + hash = "sha512-dbHgT93bdY2UPLWrDvhFP5RRbujswSxnBagSBAAsluiZ9NExyyOpLH/YVT6HX6o7ZFDu5SV/toIhBqSaoknrQg=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.12"; - hash = "sha512-uViRfO8fKV/V46GOydgeiPxjMv+9xrGsESLGgdBBzqQHS+fwmmmkL6kNhEr5YNPrcTgkfID4VjXsTBNcX3UFoQ=="; + version = "8.0.13"; + hash = "sha512-CHN1Zo8QAxbmEBE8Ec8W8D+gWFIbSS5jAE0kmjpJF5zpco1XX1W/B/q8P0FtoQHqMy3c4lHKsgnSPResPOjROg=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; - version = "8.0.12"; - hash = "sha512-wptP67Kbz5h7pv/i7eC1J/fBP09d4y3xOzhP/9nhTmm81LkfatTa/7diXpz135ON5Y2HRvtOf/Bs8Jt9A60BrQ=="; + version = "8.0.13"; + hash = "sha512-78reLCILq4xHBnubuzHLcET1YQ5exI6ZC85GHrph9OJxi0OSfYtoved1qsqUvJfVnLf0gBCZ3EDFHk2YOgEKrA=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.12"; - hash = "sha512-rxDXgjhW13dFRIuFwAXj4ANY26fxU2/kb9OqEfWEZ27+z8Ltfp94YLPo11t6OG+1zXt8oSfWg4qWODSfZ2LTMw=="; + version = "8.0.13"; + hash = "sha512-lXhhyD/0HSr3F3Z+A+4AFw/KraH2ZPglwsoVVY+pVUgSD8SxeIWe3DG4T0UnJIzsB6S/pSQZtvMw4luYV6wMjA=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.12"; - hash = "sha512-JAVp2YOMpHCX3yYAVGlOmESbuP9NIJ4uETuzsbREPpi5bxo1DNEEaWXiGl/w+R2b2Udf0lLQbf430zSMZy30qA=="; + version = "8.0.13"; + hash = "sha512-HWB4Hv9iNPIT+IEpve3O1Veo0NEakX0F1nRRssA8OjN2SSgaK99ziwnSBBMNdu9MsqZxRStmfvllE3TqSsm5Zg=="; }) ]; linux-musl-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; - version = "8.0.12"; - hash = "sha512-3hTYxYIO/eAqxsJol8bVNp9g2i54jFziO9RUjZ5V1RcCs3fXh6JvBuPipxBxgLpmWOeZFvr6oqecBmuNphiWvw=="; + version = "8.0.13"; + hash = "sha512-am+xIHI7h+W4ZBVRh4/Fkbl4SFB4T8pwgmYnLH7EE7cuBR+EFpxDXdG0NWtkVQQotTRbVLEG7W/WjYxkPYGlUA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; - version = "8.0.12"; - hash = "sha512-ebP8KcwMcLozFzphxFEpgnAb4dL6Oi1WGuvpodmVqr2k6ZFYVBsHcZ+IISUyz4n4xb2fqPHzfNIJHJGeBBYoVg=="; + version = "8.0.13"; + hash = "sha512-yfse5S0eD1JtJAqre5f8wIEoQSiyuv1zjmzckaiQ9aV7a8v0OlUAsic0X4X+SutrBaEMEChPEkW1qrhIz+FzSw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; - version = "8.0.12"; - hash = "sha512-seZ5qw4wLxMZO0R7DspDiPpNklPfBMG/Kw/6SIggVxrozB6HS01mZD84wZsQddQCrA5u+QQnd9w6SiQyByr0Ew=="; + version = "8.0.13"; + hash = "sha512-HssZ+9XVCf0R8gOYB48tEJyBwhMSv8Wtb2IrlmIdp49Ph2xNhn/RYod3NEB2iWqtgappx6Z0RiCBW3Y8VpzQsA=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.12"; - hash = "sha512-gobM3kaSrjSkmW7tRfhj1sQkCpFWwKO9i0o4FcOzreY2yezUk2yh0BflBZM0kdKQLnuUeXL7JA7E3FBvEYebZw=="; + version = "8.0.13"; + hash = "sha512-7d/XVFppfcjW/jzy9lh+M0y7QMwjfPL4A6/DC6HCNmjVTwfbV5rF6lEwZk4M8GKxnRBgKnawOQgi1KuTMrUPaA=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; - version = "8.0.12"; - hash = "sha512-hcHaF6X4WURPtHJjrZfJHtz+X0FdD7ILo7iM0EwotEadJZEtyjxqSMKMbz8UKZMgTMEOoG4joYgcou2cN0eM4w=="; + version = "8.0.13"; + hash = "sha512-V5zIiUWCdEt+h6xfp48jmV8zd7w+SAvYmm9jEmy9Ik96gbMH9Sc2mdCu1eJn8POfBCF1iT231M4bUinhmHddgQ=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.12"; - hash = "sha512-w8lBF8Kv57bqSeAt1hvACf0he5v0dn4rQ/Xy+IbJ7KT+xaa/hkOR+KMg+o9ixttHTdMhFBGZT5j/E/qaW27nmA=="; + version = "8.0.13"; + hash = "sha512-V0exrjENWzL2ktHPEdxW/bdjiPhG+8GymsPPqZosneY/9nnDqAFbDeVgwu4DpDLr/LzWa8Im9W0w6lXVe03Ttg=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.12"; - hash = "sha512-CeYo95/17pXA33pND+nPGgvZbMuhnyURqPM18y6C2F6NIRF+tgSFv0Q4GU+y2T2+OyvmOKbb2AlLRxCaIDIM2Q=="; + version = "8.0.13"; + hash = "sha512-Qz6KG2nCsFyee92YeedAPxs4tVe8i3CtuYB13A+qTSmIeL5LFbGOeOBdCY0kUv55sZ7s/qHCcQ1GSNCLHydS9g=="; }) ]; linux-musl-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; - version = "8.0.12"; - hash = "sha512-ejn6wj4QD2SaXZjU2kqo+3FFf6IgNeK1nKAwkroDVCuNm4U2vItl0nSkCP/P8D+Azsc/20qnADWsMGc4bNygvg=="; + version = "8.0.13"; + hash = "sha512-Hm5rfo+3bCHOJtoY24Fzqh5/drvQnT+JPblM1SzabMa+f1PYew0gcxGLG6KludoGP9M8aQQhJbtb09EJrINpQA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; - version = "8.0.12"; - hash = "sha512-9QsWEMiK59ByypH9UN1fyzbR2ssDD8xUaxR79nyykN4vQMAvOnmFFJVh5Tez+tnIK8V98bFxQlo4PbkM729tDQ=="; + version = "8.0.13"; + hash = "sha512-NJk1E6+TtuZDc9N+tkTcnPhtHC6p1CC+CTE8EiXfUgBVmQUzrF4NX/YZ3kmT572H00X4pbwmoFQrXu2RuoPP7w=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; - version = "8.0.12"; - hash = "sha512-BtWP7zx4UFX6mm94kUdtGyaEnhsjZDYN/m4oMvcpcKGuS1BZ1IZZcVraLTOFzoPXgxHWXJXCCkL0oSx4eeHrww=="; + version = "8.0.13"; + hash = "sha512-FBFmvl5TVxqvWhpmdXkbQvlYBT2XqIv/29u/xeuvNL5lSA1PqMDA8fAeuXzGeGmTZOVvPrjpr6To7ngQ3g6Pfg=="; }) (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.12"; - hash = "sha512-AVkiT55B5xqGixGbjxmwefC5I+uvyK9UFMe+047bjep1PA5HZIU0+iT5NdMeJsXJCSor9+FPplYP5XwFQPfGVQ=="; + version = "8.0.13"; + hash = "sha512-DNEFRTH5gtEM31R4M3KimG6EJltwPFte/D4nqAJb/06ErjEU855/4IgkpHHh6w+y73wvJL2T+o0+7s37VLCCSw=="; }) (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; - version = "8.0.12"; - hash = "sha512-aK5BtsYX8vxGuSsI8JEcgTQaSJGo5+yXkm4NrenqBXFvexuqTfsKT65i215dGz2aBOFhEITWCAXf6JzTmBaxCw=="; + version = "8.0.13"; + hash = "sha512-8/B5klBMKulU5Cium01CfdQynUQqMNjoBhgb0KAVfExIQlk9zKeDXVI4ObmvmsAyqa0h/jrkyjb8NF11j9EGJQ=="; }) (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.12"; - hash = "sha512-L9j7kDdn3Q4FxQ132wUkdn0DhxYdyLxlQtPhTUAwibwsP8eqjGpaXLCUFgC75aDNZnmHhWnwxjniNPSlJg0oiA=="; + version = "8.0.13"; + hash = "sha512-avlyzKD0lmY/sOQMYgzcAUyEhwy9IIuOlmNPHGJgaW170Pwyj9TI1pDLyebHF0ySaBgpGS+Gl5x6UPnIlS/AhA=="; }) (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.12"; - hash = "sha512-f9BbwJT5N9cCkK2qaf81E0OEJCp332mqCHP2J1vXtSIYujYF2ZMW4nuObgZEnYlBd06r/Q7aIAqxO44zzn7QRg=="; + version = "8.0.13"; + hash = "sha512-f+AMJ0675qIFAWUNwIJpZ9FDbNJYsvRwbGXIOUAHy1eh9aJoEU1XFM6CTvP2MKwU3ZPIyBbUr0qbwo72ni/31Q=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; - version = "8.0.12"; - hash = "sha512-91MXcB81uqgVuia/TDNonD/Rxy+8k4AaDxZ2jf/JOEqMNMwtSRTaPp7cBb43pQ/x5TUw11+XTzk7ju9fENuHoQ=="; + version = "8.0.13"; + hash = "sha512-mJiSalZsnxHGssprUyk+WhXqDg8HclKscJ3Kod+ZVNqvLMIX0HA/WULzrZyfERccXMmlOG8BVo+IHxFnkgMIKQ=="; }) ]; osx-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; - version = "8.0.12"; - hash = "sha512-cyo0lyxMMB8t6LH0Tn//R1MvWg/v0ezguSWKgXTR7Vk/hkJzwKLYyrhgM+Q5Pk2vhltAzBTJNdIovVtei8RzLw=="; + version = "8.0.13"; + hash = "sha512-fZJ00cBTW5K+NFuKPwTcEhGMvOS3CWECpnFCdEWzcAbbjynTmukixV+fW3q5S+/x4vFnlWX+VDWOHaVakXN3eQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; - version = "8.0.12"; - hash = "sha512-8G21b6Fs4JU/hwYonLvJ3z4MHgwOsW3WHCRGq0O2YV0gLhz/HgUihfgrvTPwsQX7zRfIgbtdjv42PLZiCBe+eA=="; + version = "8.0.13"; + hash = "sha512-WWUll8LGK3xmb8ri39/40tkOlJtbwWOqHIpIcKSc9rhD2UzmlnlCkKaeXORze8kcEIClUPok5m1fcOhpmMeJjg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; - version = "8.0.12"; - hash = "sha512-a/d+seYGVkpGTtYotJyVgg/pzuk61p7ETOOghcd62vp/LMuuMLqI9o3N/xsk7+KDDlm+DLFZpQZTMgDOOa4ZsQ=="; + version = "8.0.13"; + hash = "sha512-K83CeF/OvmznT9Sw26GkAm+zYkrIgqOx8Hy2dLvXZpdOBNe9R8JvBWq0DcIN7ksc+K92F1PxVc2S/pR9ZXrHlg=="; }) (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.12"; - hash = "sha512-137EsmMMjMBT7JFpQ8w0FEZyAG/6I0KWUBvnuamdpLtKXcd6B+8ua9rlcmNBEkN6mFbxS5m6qXwwn66GvSLx5Q=="; + version = "8.0.13"; + hash = "sha512-dmuNR3DsR9BjvayJEEXk74eAZXqYjoPL4tYPXF7QUZ0LQE3WUoTHv4QD7QMEgb+HLNuPDNzHYj8EsAsQ0lZeQA=="; }) (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; - version = "8.0.12"; - hash = "sha512-KHnmVudTJSlyzdpx17lkJFKysFickorqE2/7duIknz/zhkrB6fsgD+fT/DA0j/Nz43ezzIo796rIS68X0ByOog=="; + version = "8.0.13"; + hash = "sha512-Er7lYCDr0YqkbNCqzqBvJyIExkdtS5YRP5Xjce6pXi+YEn8s/BlrK0zr+/4OJWL0v9pJ3ZIB32QrfA80HxBcvw=="; }) (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.12"; - hash = "sha512-nhFohFnSuFpLyyKEfEUpfKe+AwJ9PCxcnZK5Gqd+na/MylLUkg2iuNYx7CX6RDgazg+bvvEUf3in8rMWdczf6A=="; + version = "8.0.13"; + hash = "sha512-i/WIhfsMSxxxy5IVEtMPjJ1CmOZEEdgNui2TiirYs6AgxYWQE7Z2UDsrTrfaHp4sftG35DpfFtryXZrztRV+og=="; }) (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.12"; - hash = "sha512-QHgRha5tGSwRVy67PSW1yBZfcJNthI77IJaV85sOCbSRQNCQxUU7DmGb9aeI/7quGWUzM1BahaZqQfOXiOmdAw=="; + version = "8.0.13"; + hash = "sha512-lPTnUhWp03b1mMj2wzmiLcDpGA7iqtaDo028cKhAMOsKre8ffyVyl7rwc5c6rMeSRgAB+lj+3qFXi5AgYsh9uQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; - version = "8.0.12"; - hash = "sha512-VQNqkmSpLIbHFpVSpOKNO/6JMm0SSrMV3ptcIzHSvw66Gsqr5jjo/E8S2Q5dAUlS0b/psdOiulND3rYOQaYk3A=="; + version = "8.0.13"; + hash = "sha512-mhoMYBBulekGcEv29c5H9pXZToA56zKCi+pVqU7q03dByoZ2y2YmFFrfQ1326N+4WdnyjBTITK9txRglF4O3Pw=="; }) ]; osx-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; - version = "8.0.12"; - hash = "sha512-Op9dXXTWqam9pw9UqX826kPhNvOTUS4QJPPRscD3yJKMT09Fdxp36Sz2gT3Q8ToA0RhoHTlRj98I4ZF8M0qjXg=="; + version = "8.0.13"; + hash = "sha512-MbwFIWq80Gc7HR3AfZ0xXJxowY6kaBwyMYJybQetBr8fV51k2NSOwQ7dbbbXQqFAYYbKv4/e+27anCOwUex9fg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; - version = "8.0.12"; - hash = "sha512-Wi42A4IiXMx8/qWmiktaidyZXg0NfbMM8d0aSbPtHGOVUNI1BoiZARdXci+t+HXmBYV7cxr+/hJKMV/suw83wg=="; + version = "8.0.13"; + hash = "sha512-LStx1UzEEdHLfFl1mqNwZeRIDMSpGbpumQqXOJyKwudmZ9Nvly8xe1DGKHWKUy7bETnwdT+T989V1AHinaDdgw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; - version = "8.0.12"; - hash = "sha512-+QeWCI8Z0puUM08mIsfVsBVvc/jQX1PDxySTnv0BlHQ35saacdOEwa6Hf5mCxwrIsaKW4p7j9cY9MJSFjdmBRw=="; + version = "8.0.13"; + hash = "sha512-MY7r8G+jwzfr2aKpqZxtLaBSgWoeieq1JYDXaw88Arq+z27I4H3wdztzmq15zRG9R1o6gxSG1/8/0RlZAJESIA=="; }) (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.12"; - hash = "sha512-/usq+rObnkCjKYd2utS1b+GYDSV/ZeJMbSpFv7CelQGbvmQ24w3Zd4jHE1jqMfbBzf15/OHqBHXHdi4Nu+XRRg=="; + version = "8.0.13"; + hash = "sha512-eZFSPMMA30+lum8u9BXmUu/By8RpfrFWqmI9G6/3aT3fxobup/ohVsW8SFgQ6TQL7qqi9DNmh284jNXxd7IyWQ=="; }) (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; - version = "8.0.12"; - hash = "sha512-4unTG4jtyBU2SkT5fjYQEWKCjnlNu8rTYySGCCbjClIzi7O8z3fxYWlng+B1tnA4NpKh5y5fYI+dvaXeiI2UnA=="; + version = "8.0.13"; + hash = "sha512-TnFmdxCBFtD9CPncmvZRGttCxq6QiYgj0n0lkY4C5JtFLvbjTt0r7DzZ/UHp0sC1fxowhAmpr9a/2GQLQRaAxw=="; }) (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.12"; - hash = "sha512-Na4e35U88a8KvpRqAeG2OmnQcOwavnGPVNl9BnWTPcNdT7RbQ7o2hqDOSvT8jsqwMcZt+L5yGxYtGY1widnTlQ=="; + version = "8.0.13"; + hash = "sha512-snaYORwJAa6Wp6rDdnb8RLibvNUFCbP51rhnZqXA6puxeygsCfcDfMkmKz0i1GvfVpoYAIeaZU2o+Q/kSKL5yg=="; }) (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.12"; - hash = "sha512-SmlxLDqwOSkq51ffwjidZfJEnBNZ2kQBWNPOhzD/NKms0OrGD6ssCTwID1xGwiVDKcyHyeWp/kpZaSgb+/SWmQ=="; + version = "8.0.13"; + hash = "sha512-wcHRpb+C+bSXxKaMPkzGyPZJZoJP0XzRgOondr+DIDD8MqarJgGUCnFyEH36Uv9orS/3FufQAv5uQGsdpvveHQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; - version = "8.0.12"; - hash = "sha512-pTM9MIEvOaIGzu2Djz7CNqtBSU/4ytuN7T47SySP/N/VnJB4QfOCEz4MYFWG5Rpqz1Zx5gV4eEfV+DFUJlZ+dQ=="; + version = "8.0.13"; + hash = "sha512-v8lYi57qnbb0VBekj6GtnTtr0FQMwPtozdrNDZ9s5Hvhb1z8pwYdXtkVXtJgv8q6hhjoaZwKYarcjnC5xw6Abg=="; }) ]; win-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; - version = "8.0.12"; - hash = "sha512-RtGa0QmyL+DxjypnrrfFr9AjPfGVbLOlAqQcIVr3xYOjhlm0+XsKanRycjOiQpY7PYJGIED1nICm610kxTpHzA=="; + version = "8.0.13"; + hash = "sha512-/T3731bLrjLbWiMLmC7ziRxnVQraFy4OSUircxxMkzEV48uIM03Y7sF/414vjLbtOP4aLWua6fiL7Gk/LKOQwg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; - version = "8.0.12"; - hash = "sha512-4b4nmMBlWXn/rILg/kgfLsXYfzRBRgmuuapWgHYtmyZPKmP/8QndobpmbIKN65KgkcJoLW+6E1BggutpEeWYdg=="; + version = "8.0.13"; + hash = "sha512-iXbeKa6+JdsdV4ZBo/hmSHx2A5zKN0XXh0+I3fwJd6dv1sgDTZ6LFOcq1oUVD30XRnbDOYUYUGPodoWQJefJLg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; - version = "8.0.12"; - hash = "sha512-AbdCpfp1Zr0hKzcbOC0XD84G6RP8sc2hJfjd2hkUNoQX6rTH6zw++ZahCA9GAiNawqGQtlzu3YJG6ELLmwmP7Q=="; + version = "8.0.13"; + hash = "sha512-Mw9nFoDzI11sc/RuquWRHBvwHPvXfzAJls5pgW5CIMTCCk/DzB8Jp6YwUlfS++L/VU/1j+cb+Ecce336Ozh0qQ=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.12"; - hash = "sha512-L6Bva94q7LHaYa9GIATU5L9mrcaZ2TKD3UV7U2gbeL2hqyHjtKC32CzMJgiJpqaidO2lgf46r5ATLhBIpgv0hw=="; + version = "8.0.13"; + hash = "sha512-LnNGrhF33hiudP8mltLgiIqg8afLiNM264RcfNPZYw99t4rT0OyUuvrtSifpWExjZ3AnTyPWb2ALwdgvaIifiw=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; - version = "8.0.12"; - hash = "sha512-UhlCsMqxKcT9vf3v8xygojEypCCVdWY1wUD2UXdwsQaYopOKPVrBOrK0me9+vDQxXpRwmJ8q92x83NnGsq7pDw=="; + version = "8.0.13"; + hash = "sha512-pG5Fbq35FZHbuGlZeICyGzI/uVE2zi34ODn0sCd5duzt1Jld68r7pSdN+wCzTAeC0rgbZk07g1L5JNbrIJounA=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.12"; - hash = "sha512-LryE5guy2qJZR613WmgBSVbnmGBu4wJWn8Cd/pLVhvloFpI9qodruqZN0VmO7wXEsc4m6ukq0sfv3u/qKmWLHA=="; + version = "8.0.13"; + hash = "sha512-ayq2R7iJji+qmpTN/I0CqdiTAS+Vyz66MhUlU8PGQcjdzJj4EAxkViExpRsHU+JfJxgK2ZdRmFbQOW/0xD0PPQ=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.12"; - hash = "sha512-iLAQ4BaR5cDX0DPP9s/wEq5A8He/nqJu6i2nGUOEiOYKlYGNTHQEyKqc4b1sh0XCAQPQ5gn/7NMBrqo1/0hjWA=="; + version = "8.0.13"; + hash = "sha512-8UGHyAfbMnZlrxrLC6elkWv6UBwbleZQeDajV/bceyK/cVkDfI5dBs3MOt/LUWOPBxbpvcRu7Jix8c2Q9Fw44Q=="; }) ]; win-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; - version = "8.0.12"; - hash = "sha512-fFUUZcpljb2Z6/Duwtp1RThdOEvEFuI3lYijFTVpu94oRjw5sbtH+5qO1KeqrxCkY+Fnpwe1ABBy91zdoPus1g=="; + version = "8.0.13"; + hash = "sha512-BiodKX5nKXd7JNji43HFVhZwTLNabd9ZHMifgYY2tyTqrDwBmsqmUBF/iODtDIAqHLw1fhIpqbbnBMyJKJZUCA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; - version = "8.0.12"; - hash = "sha512-GsgHWhLYhuzBlBp2XlL1OBXyQyUHQJOpR4bR4bwG31qoxIhjUOQrgbiXD9pVKaKVHJxHO00nLSQN8mKEg7YKsA=="; + version = "8.0.13"; + hash = "sha512-8XvPrzp8W2jUt++6uo/WaYhg0Hf0fHCPsxaAmxhnbuq7/IV5Iw0B69bvWuyuUiEcI7VYGWheUNmfy3Db+2iu1g=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; - version = "8.0.12"; - hash = "sha512-nCHMRmxs2ZdwPEDy1Gh6mpwA38c/TskLYLcF/DALeEsQEtCXltP7FirPHVlYASOj1k+72xV/XPm9BQ60xgrOEA=="; + version = "8.0.13"; + hash = "sha512-PHxRlaZoaexI0Pk/VdEhYs5+k3SVnsVxQktSIIDU62WOwS9LnQ/zJJnvbyCgU5rkuzwES/+Z4lZvBhWohH5WXg=="; }) (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.12"; - hash = "sha512-/AzCzNAiKUaHOgyGaGw63jBJOan9TtPFEpoQVtVK/OeyJFGrAokcL7LZxEmYZHCOAB/McmVl9ktOdebe1Ip36A=="; + version = "8.0.13"; + hash = "sha512-BwGWANBtOuGWcyKHPRyC59Xz0Q01gOceosvTsxHd0azriG2j7GdJLWgBndBrk+Dh9plVE56PG/WpR9dCqznthQ=="; }) (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; - version = "8.0.12"; - hash = "sha512-OjWkp6to2inzfmTnMiKuCQAei74AsWgoZXHJFOU73AfLErCLRY3vdzVEE0mR7vXki8jljzpBqPG7DVH2utO6Tw=="; + version = "8.0.13"; + hash = "sha512-fA4AgGkm/30M+H4h92PvJ+wDFvRkodn4VFJWBqwU5CnjQoSAiJtqMNF7InRo8fYScIXcurHabcK8Mg4/zxHy6g=="; }) (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.12"; - hash = "sha512-HH8rUT8WfI8co30Fed0+V2kcH9H0Dt4CQ4REQHL0d18Ef4BsyNilXeeYIupGUYV/oJbJJfuCENuDP4Nn4o4XVg=="; + version = "8.0.13"; + hash = "sha512-OuhVyzUqBcj/UK4t7PjBr8xtns/UvQ471V7ggmv7NiguciaqAjZPMYUvlZ5X6BY08gGkW8OeQS6ucLXobymxpg=="; }) (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.12"; - hash = "sha512-A3gyFcNiSrVZ1D/IdmpUlJ1iGYdV23L8yA8jo6PgeeYas8fWnUV5fC3BXq5/zhwpy+I61Ma1fqL3pn8WJWcCfQ=="; + version = "8.0.13"; + hash = "sha512-hFAn1Re+hn8cxLfMj2e4oN9lUD1n0hqhpW/k4tTClK8Mol+Sxkr8YgzNIW5CHQYrIrNMWSy93fXTiyuHRW8ExA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; - version = "8.0.12"; - hash = "sha512-Rcs2Tn4y+jEo6oLSbi7fkxg50eODt3tjZNzM0iJBnkmMI9ZdtT9PSp7ExSn7NlqjpilPzP9YRCYhPrra7MfIbg=="; + version = "8.0.13"; + hash = "sha512-83RSeioZopBFRX5AWLvPT9FpPGv1biseVQzovj5Man3TiEhfSLF9VzrTe+Ag7tVf84mp0+baLc9lrglGep6sUg=="; }) ]; win-x86 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; - version = "8.0.12"; - hash = "sha512-j+NocH9tAxjaCICEVP3g8YhQm28A7yBg3GnNI0B2aXtba8vlFomvu509icbAp0g10YTGbqlOdmt82pIOyhcBjw=="; + version = "8.0.13"; + hash = "sha512-PZr+xxwsxZ2WECruHG43ypvNhvEaSwl0aVp6ykMH70RWrp0SkeWDwSiP+U5qcSNzg8G2xZS/sq0pdSzZkdlPAg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; - version = "8.0.12"; - hash = "sha512-qL1rcHqe9ZRFVlU1PTABx9AS9x+zrk9gZ+zW4nDr5Ai5AgeXo1cYSH0nzEv94cScH7ipGaCrYItF6tCoquK+Tw=="; + version = "8.0.13"; + hash = "sha512-uk/07Gg+y9caMZyfG7ZRopXpXWpnl4198lkhb/IqEka1Lq2DiN4bWsejbA5Fy6U2KHxSlBr5fQ80JHzOg9atyw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; - version = "8.0.12"; - hash = "sha512-pgyneHJjNT8ZqOoRunpxLh1ZilEvh9xRV16LOeigV5ROmZ/cyUCB+5/vKnsuC0Yz3noErwfpukpLUGe6TTQOsw=="; + version = "8.0.13"; + hash = "sha512-6n6dSU6+rv4b+6wNj8OOaNjRJirBqVCrsfvSCD9e701hwub5dzUTh80ZueSi0goBmbafwD8clZE3fDoCueIWFg=="; }) (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.12"; - hash = "sha512-mwOme5QW7MSs0xZP3cPDTHVqLD4uZCVMkkDwajj5IGyOstFSqjOkMD9d8tW0LJZM0PbtXz4NkbS4OfZvlztetQ=="; + version = "8.0.13"; + hash = "sha512-AUqe2XlIVMqDvSiMnOL/j86s3s+wS25pwHfYS9fXNF7uJ0KDOHOKkmI/oh9UsOXHp0viCf3VqFeZecYIQ8JG3A=="; }) (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; - version = "8.0.12"; - hash = "sha512-s4TAfOSVe5loFWXz17EI12BcKZKrsrBiaaOS924f9agg2Ko1KTZ4Q5fzBZbQ9ArfKe3LpTpkgagAb4qkR9xQDA=="; + version = "8.0.13"; + hash = "sha512-FfnHphaf2+fPOm1Sjer2IC0r31V3IRx/yaPFCvPuTaieuATQ1OLqBN6oomFTySaO6nLcqgcJ/Q8UmuScsEFfnw=="; }) (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.12"; - hash = "sha512-Q5KIhosisJXxTfiHVthJKuIM9FLrl6crL0nMplRQ97pg3LKhg/YstZCdrzSYoKEB6fCns3BQIXWzjYXVQl2pSA=="; + version = "8.0.13"; + hash = "sha512-OFvAeGSGCK63/9OQQcgYsVr0acd0BjXQMqPXvfafbkO4SxCK8Vs9VE7DJghYesZ/wGDgu6zuHfIfc+/LkJ8m+Q=="; }) (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.12"; - hash = "sha512-tDX7X6kN5m6U6Vxb9PvHPXWXLW4gSq/VwWlfUy8B2TBknEV4/FBkYCwwXhKOkfrguhBGW9Y3fYpw+Gk7lSdg/w=="; + version = "8.0.13"; + hash = "sha512-D2dx4sp/lUJ7S/bMCj6ZMLxZ4OY0O1hazlwpUgafxcfQHXia4lV15iW/NiuwlTf7RdyXLwsxR5IjAu1zk3tyUA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; - version = "8.0.12"; - hash = "sha512-jn2v2QIk6ti9qvSQDeEdI8gtUoSojX3gifYQuyn8dBYsrf9izKopL5WhxVsiA/L/ysYSx/ciMdm71j/FhSMUtA=="; + version = "8.0.13"; + hash = "sha512-a88O6Ce4XyTTejrznAhAKyqssctCpHgzt0XPpe/GPpK09SP5n5lDIxBFw6DZ3AXRFdsMgQFKV7o52DqW1Fvqow=="; }) ]; }; in rec { - release_8_0 = "8.0.12"; + release_8_0 = "8.0.13"; aspnetcore_8_0 = buildAspNetCore { - version = "8.0.12"; + version = "8.0.13"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/26fe9c15-40f6-4eb5-88fd-63d98eb259fa/c36789f8460b7e20371c38129d7fc160/aspnetcore-runtime-8.0.12-linux-arm.tar.gz"; - hash = "sha512-FEvX1FAlN6KAbRfuFhLks8Jidmxdg9qLEDHKYfKh6r0bulpTGxv8r6uZnwhNuWHJeVgE3mUdh/gd1tZJdjNZSA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/2c764efa-2f8b-44d1-9308-87dcafaeff2f/cd8f6383aa8adb1dd9493520b57f08ef/aspnetcore-runtime-8.0.13-linux-arm.tar.gz"; + hash = "sha512-3lo9z6uqfwGq/7eLIVbZ151hTw5S6+YZZXByVoqw/Ef01T57V3p2IjklAs06c5QAr2wmmZJHzFDCmBO2qUz80A=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/8953c6fe-3542-4cee-b022-a50e029882a5/1bbce821b1ae97ed11b305dd708c0437/aspnetcore-runtime-8.0.12-linux-arm64.tar.gz"; - hash = "sha512-kyP2WEv5hQD+AjAJ3qW5Dkm7s0zc6gho6NGML+JgsIcxVDjKLfeD8lkAPBoO4x8tc1yM6oXCxPsE9tr+BThFMQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/3167f98c-e2ef-4d19-bd00-178c27ed7f3d/8f9eb25b9899009f11ae837612b52c0e/aspnetcore-runtime-8.0.13-linux-arm64.tar.gz"; + hash = "sha512-1nEwMQ6B9yfx1IBkY/Sa8Y4BLW3HZslAg4hUkis6Pn9xcch9WVxNwJ4cY0cPrjAXtU1RvphhiYUSn/N9alrAsw=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/df752f45-7e9f-4d13-8568-a88adda5aa04/9d59726fb38525b4956cbb1e1fe8a2c8/aspnetcore-runtime-8.0.12-linux-x64.tar.gz"; - hash = "sha512-A6f9N9zkbDHX502nzU2aq9gtXgh4WdAGX0cOv30LYq0f61n8P3RpAzepKPV1HgS8t4OIluZLP40lrgNcW39cgw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/2115caf0-c47f-448a-8ad6-107a742d2b9e/52036588ffe8f8abd87a3d033fd93b67/aspnetcore-runtime-8.0.13-linux-x64.tar.gz"; + hash = "sha512-eyGv9Fw8p8zcBSfG3gXCCdWKVqFc8Q5lZSImH4hM8nKpK+E2lrGg8a4rqqDYJf/aWNlUhxoXs8OoZZqfOjbH5g=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/d7cca8a1-ed7d-4dd1-a993-6766287f2f39/2775af53e9a24ddc6afac345ad417b5e/aspnetcore-runtime-8.0.12-linux-musl-arm.tar.gz"; - hash = "sha512-F0GJyFHrF43HtWJLIgsKDfisv0HEzXPhVanR79LmrSrXescZ9R7bukmE5L6Qdjom7rv5WMGneuMuJvcoAWURtg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/d0f6f5ae-d965-4836-a1cc-97e382e9e919/9bbf8231f856157d4538180e92f24b53/aspnetcore-runtime-8.0.13-linux-musl-arm.tar.gz"; + hash = "sha512-IKYyJAnkbwZPc505SNz6Nlh507/B5wTsJPdKzPnI9GSsV4LqyIzr821nMqPUXW7/K7SonjkDIzIojeJeQQZboA=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/90290d06-b7b6-4ad0-99d6-1bab0a557051/3ba84f7ecb0f681b8f7cead66124c373/aspnetcore-runtime-8.0.12-linux-musl-arm64.tar.gz"; - hash = "sha512-d65Io007lHiqEbgHf3sdb16kdpn5Lj3CnQXMzRayXgI1h6lg2bwqXCWTnLt0lBAs565/1sCfWXkUmBpeftknFg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/9f700310-0300-4863-aa9b-469020d64bfb/025c0192fbc5ff3fab066ecba8cd76c1/aspnetcore-runtime-8.0.13-linux-musl-arm64.tar.gz"; + hash = "sha512-zsHu/r/5w7hYJBf8iDzRmlzxdB8A7V315Cojk5jDKG+fjh/myaZf+9dvqVMYzyP3lB9H9hMvA6+8H6+jpIYBxw=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/8f3afd94-2927-4be9-a935-da9f4dcdb004/c594a54091b5b85063f38879d50123a4/aspnetcore-runtime-8.0.12-linux-musl-x64.tar.gz"; - hash = "sha512-p9O64tp7TalGhR02GW1BBTWTr0E40a4CDOS5sUHH6E1TRGywiR4SeYOr1efAEdfJ0gOSJ9ypQJ1vrrY4NYM4mg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/e3b6a163-097f-4fc4-9ac4-3e42f5d98a69/8ca03a327bd2dcb6b55ac066b54b99a0/aspnetcore-runtime-8.0.13-linux-musl-x64.tar.gz"; + hash = "sha512-9JksLLyAGTeK8MhGPTbJeMqpQ+U9SVIgN7gC90duydgqb2nfshePgvYZvO3WYg/wwaugJHYIZOsPc85wwE/Y+Q=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/16c2edb0-5977-4a8d-9060-1d8a673c6b44/6802cfea6e93712b7872614bf47ebb9f/aspnetcore-runtime-8.0.12-osx-arm64.tar.gz"; - hash = "sha512-l75lVblM/eIlULQ0wOuNwykYGzC5MLYsUvQEeAmUbQVYs8gJVQnNByE8ddUfXSYCB8+wkzXxYO1cVe6LaeY3Tg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/a91349c2-bbe8-4a89-a5c1-bf42b6916fed/9d25c6514ce8983ea8fd494ef8491bfe/aspnetcore-runtime-8.0.13-osx-arm64.tar.gz"; + hash = "sha512-RqGbkmHxPtWFqUpzJdsY1ifYRqNtlbY0IRNv5vVVfmWSXjluFAD4+3T1CYEW4g6JUEwUZ4ibRhjsrjqat5k7nA=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/2d69b57b-d997-4364-a898-220293f49d9f/c192bee87281e416703f53da103925d3/aspnetcore-runtime-8.0.12-osx-x64.tar.gz"; - hash = "sha512-qzE801RZhvMFrxH1SVo5bPXn1mJtDkaRfv7fSveqspy58t4RTJ1SGAgdZzndUvlpiZBrEFNplfVnK3HMhliUpw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/08747374-3c8d-4ff8-9ccd-76428ede4b69/d09395b7026ad4825c0fa73342f98a42/aspnetcore-runtime-8.0.13-osx-x64.tar.gz"; + hash = "sha512-umZ0LKuqeo4/9SeIpZtbprPrrEdOYGREYjyZGeJXsgue3XTpxvDSMs5+gj2/rXaH4klc0tcL9GZJ4ZAudLZMDw=="; }; }; }; runtime_8_0 = buildNetRuntime { - version = "8.0.12"; + version = "8.0.13"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/a50c2f56-3ee5-4387-a9a7-4338b75fb5c9/41676fb7ec43d9108a65fc0d76c15717/dotnet-runtime-8.0.12-linux-arm.tar.gz"; - hash = "sha512-C448N/IFz5Za+9cJav1fxuICJIs+PBdHEuG880trZKt7Dvhm7rbhahFDZ+NWZtrLUusLoQ3eizFDMUoFHrGh0A=="; + url = "https://download.visualstudio.microsoft.com/download/pr/e42f6ab0-c3df-46db-83dc-47205f5cb6fd/0c1cf07866e0674a18748cfed2b747b2/dotnet-runtime-8.0.13-linux-arm.tar.gz"; + hash = "sha512-XQGPtQ7qlvPppWFCICzLHHOnJSGdclew3rvu8+8ZbGmwdrmN+28JiBjAUUCE3zP2cEvBOkeNFyewEta6nuoEkg=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/4bfa2e49-fd4b-4aa7-b5c7-cd344beb72e8/d04a3458f047737f9343430e901efadb/dotnet-runtime-8.0.12-linux-arm64.tar.gz"; - hash = "sha512-wwCofkF5j6565JIMFAu+NJmhCT1BhFD5v6RpsEXr4uWEDZVIfpN+7b6KsiHhOIrtdv3MGMktgXeO5DODun/jOw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/7613adb2-d77c-40ac-b9b4-28f0f571489c/0943d0483052418201c63456b52a1908/dotnet-runtime-8.0.13-linux-arm64.tar.gz"; + hash = "sha512-5sQqwXWCOUBcinQBlAI7St4QF97zvzMFV9wWMSsvQFmb4wqL/I2wVVlknPDtpfxDrxUzIPU3jctIcq8TZ5vOiw=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/14263fc6-1fdc-46cb-b692-df3e0f4204d0/24c37267d4f4e166df57ea3ec9acff18/dotnet-runtime-8.0.12-linux-x64.tar.gz"; - hash = "sha512-4NIW1U6aIarvwSCkgQUPETfMcIy70XIE8LGkfbtkJAeOi0TchClXpmkQJc2hSQ5QYQkoAkhLX9EsWQP1umNEgQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/d26516b7-7049-4c18-974c-467190461f3a/667fb6101ef1f43f624e175b49f8ab49/dotnet-runtime-8.0.13-linux-x64.tar.gz"; + hash = "sha512-hkntoU6LyZP4yz1CHUSkq7IYrPKZlqweyTloa/ZX51tg8raQGApGVO4V67e5U4bqvJaeqYIJ4x4oAWIP+Q/OQw=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/d77d220f-ba55-45b2-9013-5def3d55d558/8293468a0a39b4a61ce94f3ae5a65fdf/dotnet-runtime-8.0.12-linux-musl-arm.tar.gz"; - hash = "sha512-7JsDT1UOgHtNT/WwfGx9kJWetNbbXZe4skUmnaa6hz/ieCJJEYH+NOSbbpiGFGQLJ1QkpYWG8CKRXqSKzekGsg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/2a7efa56-7d1d-4fe5-9913-bebde112ff7a/959441c7558e14cf628c30ceee03dda4/dotnet-runtime-8.0.13-linux-musl-arm.tar.gz"; + hash = "sha512-qMKEQGzbu475Cu3gqVB96vPO/Hlmyo3gRXa7s7riYLgbFrJEHU1DhXkuzDQX6hqzrs6rVJf4Zl5w36Ve9+WvKw=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/3b021406-40a7-4609-8046-5877ae6b2c2d/8ca6aefd8b95ee56512416448d7ccc52/dotnet-runtime-8.0.12-linux-musl-arm64.tar.gz"; - hash = "sha512-s2m3G0g63HzVPTxXzOoe2SnkQVguIfMZiUKdMf9r2qDm/nVUlAKow80t3bk1wYxDLSxyxIbQNGfyelLgCaGJYw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/88255cf7-e65f-4fa7-b9ca-5d4ce68ad28c/4f0cd54be0d4c52ada9c105e8641c434/dotnet-runtime-8.0.13-linux-musl-arm64.tar.gz"; + hash = "sha512-e0aRlkle0A2c+xZlWHBMIqxXK+EfxN+TbYaRLZwwaxAbo0EbaOlcjRmfhrpIyqQtnisGjOrie0c0fcULe5atGA=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/bcf1eef7-7287-4076-9ad0-f5c308605952/d70135d19e557c3730f5b801d67d4e84/dotnet-runtime-8.0.12-linux-musl-x64.tar.gz"; - hash = "sha512-Kpegfp+y3MgiWFDJV0oBT5oREUfYfe1ik+t78mz2vubMUWcTwCwToI6Xdtut1YNifwXm5i2qr5b2U+KMCzeyXg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/c02c39f9-a695-4924-ab27-e1935b9f1bb0/860d07a99820abb189489d8e340e01b9/dotnet-runtime-8.0.13-linux-musl-x64.tar.gz"; + hash = "sha512-+sennennnKBVg6ywTAhrGlc62giVt8cwF2wYHw052oKsK6VCZoHe1tWx2QTpfFhQgsybVtjFIH/uPpO4ixOVBQ=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/30fcac13-8a78-4495-84e6-00ae9445c76b/4989e4834115de71774568b0e606f09c/dotnet-runtime-8.0.12-osx-arm64.tar.gz"; - hash = "sha512-i+qRfQ89iqJ/Brlbl66iINRKP2sMZMZhLf41PdTfiBi9pWV7Y7yhFo619IZsqLizjHCrxe/8ovw1ik3InvEGCw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/dd971173-c30c-4fdc-aaec-015aa6a5e149/dee0d19d43982cdf456a7ab9aec99094/dotnet-runtime-8.0.13-osx-arm64.tar.gz"; + hash = "sha512-eUjTe908x/ovDVO0DhmXoQQLhm+UKoLrfjNJ2jiPYUr3iZA4ZIO8p4miK0GwuPXCUWC/fFgSsffzlK+d8btadA=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/3458a9c3-f34a-4d61-896c-1551ee66d5fe/bf3c24436ad390578caf1ccf185e3151/dotnet-runtime-8.0.12-osx-x64.tar.gz"; - hash = "sha512-sYToXFX9D/0Ue93laVtYbMGHnNqhG4MswxWJk9sphihmFwOe0voPRtq6CgHo7Om+awoWjYc0eB2XTHfI3DbVug=="; + url = "https://download.visualstudio.microsoft.com/download/pr/0803f323-5b8a-4891-be36-731d42760b4f/13078be8c22cc327924445a898e74995/dotnet-runtime-8.0.13-osx-x64.tar.gz"; + hash = "sha512-iRZgXw1wKKgZAqRpLKY4ZSGJKr9NwgmDyI4EchA2h4sE+AoLkyneBSSr5ESKWShFh8SLc4CA1nXH51PjjX2abA=="; }; }; }; sdk_8_0_4xx = buildNetSdk { - version = "8.0.405"; + version = "8.0.406"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/0d09934d-c272-40e0-b7fc-8a015604d647/7e48c4791acda1a7d5d5fa6ce25e6c2e/dotnet-sdk-8.0.405-linux-arm.tar.gz"; - hash = "sha512-+cQiIhzhuUYOR3juJRK444x47qd+l1d5rwP4L+tWZLlNM8V9EDd3g5uedywDlBnfXuqkebVbeNcAE1Qqh9K2Ag=="; + url = "https://download.visualstudio.microsoft.com/download/pr/18b5dd5a-24cb-4e2b-a440-1089c67d112d/dace5ece95d3ba00c984c41c52ae2e4f/dotnet-sdk-8.0.406-linux-arm.tar.gz"; + hash = "sha512-GKK/V1ptiVzgZxsi5PCFMAOSDwt/LzP/Ra/FHTRFO/1rh7KqXlM0nQxq6fbDf2Zj03+Hou5UTImn9bqI1vZUCA=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/bb17a3ab-7122-41bd-96cf-33e35b1d4318/7b09327fdd49b7130cf94838f2979aa6/dotnet-sdk-8.0.405-linux-arm64.tar.gz"; - hash = "sha512-B5iLeEv3GRP2B84M7VBDTGmYCucVymL7avaPfqomgQw/n/4k3x2HBtGlV8Prd1YUPlNXAWCJzxUIcUuqHM6Cig=="; + url = "https://download.visualstudio.microsoft.com/download/pr/50bfbf66-b057-4bec-a9cc-69a43d4b32b2/489a1c7042dd654df0a71bcb9813067f/dotnet-sdk-8.0.406-linux-arm64.tar.gz"; + hash = "sha512-m5OfCfvaiggLEmaRTKAsTWCpXoX6ahNEw3jTlGl95pNet9lB3Zo665d62jqrVhxhSl/puXOCSJnLAqp06cCZiA=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/a91ddad4-a3c2-4303-9efc-1ca6b7af850c/be1763df9211599df1cf1c6f504b3c41/dotnet-sdk-8.0.405-linux-x64.tar.gz"; - hash = "sha512-JJn6oVIOj9mih6Z5h1XeGj/+8xwNw0FiE8ipvsZIYUGb/IGPHBxBC4a7coSM5W1LbHSDmv2BdakiNF/GSQY+xg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/d2abdb4c-a96e-4123-9351-e4dd2ea20905/e8010ae2688786ffc1ebca4ebb52f41b/dotnet-sdk-8.0.406-linux-x64.tar.gz"; + hash = "sha512-1v3P69DfRpWfeFfPs76sfebIhDUV7OKLJIAnZf2c+2x+lwGzIBNMtJBzIpN6uJyukU3cIb9IubYxPpqa9cHySg=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/96e5d348-c2f7-4a67-acc4-0f602a484c22/365b77a304001e7db5dbc078c144acd5/dotnet-sdk-8.0.405-linux-musl-arm.tar.gz"; - hash = "sha512-+DrMsO1FtMk3ilTCx0/Y9VkFa3t3GvcK0l1i1B3Rw4S3lcuJ+95olZ24aIOx6J/mdJEAwFXy8wieNDsqXh8XBA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/542665a3-2d4a-4d29-bbcd-4ed8b8fcf247/2a1d158de1064dedef1d1df00335b172/dotnet-sdk-8.0.406-linux-musl-arm.tar.gz"; + hash = "sha512-xDOK0Yri4EJcTp1tUd0mYhfzPntkdUSDpuszuBuW9ugIYxQBBzAWYhHLlsyHyaR/t2rvw0MbA/KFzcriEZp8vQ=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/55055690-d867-4443-b7ce-58cff24277e0/cf31a6b9a5a66098e0d1f248d0e9b11a/dotnet-sdk-8.0.405-linux-musl-arm64.tar.gz"; - hash = "sha512-r3KGMN7kIF+VUvUvSgb0jd9K/yOKuzLt/QGBTMDnEME59I71aa2Q7eUZVkubwFe6/7dOtgtU7Ec2TFHFwc94nA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/f7de890b-abc8-469d-b019-a974ae2bab28/7ebf3f9b60fdcc4eaa48ddf154658260/dotnet-sdk-8.0.406-linux-musl-arm64.tar.gz"; + hash = "sha512-GWH+w/rmA5E0pVLRnoag6TAQ/I1dPUwilZ7dtFpR7rAMRwNzE5f/yoAgZNc7mEoaVX3apoN0tanaAU4TW16nUQ=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/e97e02d1-0d81-4c05-9e6a-13ce436f1420/d883d1822ee94205d593234ab7ddeaf3/dotnet-sdk-8.0.405-linux-musl-x64.tar.gz"; - hash = "sha512-BQeP++s1t6rc+JJ8C/Cuxq9d5OYWWF3rVXQwgMCzS7bkvsqi4jwubDhWvAgm1eVPlqtpg4Z8Wxr2MHxi7MAYNw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/31d8e702-aa88-4d2e-8346-59943c20aa82/cdcc353bf803f5584a823a866c969288/dotnet-sdk-8.0.406-linux-musl-x64.tar.gz"; + hash = "sha512-DH6y41MPlB/ButQ94fsIqk0jCYr0fgSMujJbPMSAd8qxtuxjWc3IjC7PZBPRusFKQ5h4sg1q2yxiKXRgGMLhMA=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/5ad12484-1bf7-4c4e-9633-a09b7cd036a6/c544b4a3f03d8c98fbc015bb3b134e4e/dotnet-sdk-8.0.405-osx-arm64.tar.gz"; - hash = "sha512-NhC9rde8DBN/KD6VsB5FwYburHZSB/t20isQh2qPCFGQYJCA4HTfnIsccLO2R1WfVCteExNwASW/8D9sB9nyXg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/def16517-1bfd-42a2-98a9-fc2c2e95f47a/6ff352d2eb373495453fe9e4c220493e/dotnet-sdk-8.0.406-osx-arm64.tar.gz"; + hash = "sha512-29a/hwyhd2qPRjdmvF0LWErGNulH8tomJwi3myHUhHXR9q+DLfD1CeBLTnHZuyw3d16YeGKd6/ztfrazdsLESQ=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/485c72db-0004-4f65-a37f-1f80bb445fd5/dc59499a684b6c8677ae7f43ff0e0062/dotnet-sdk-8.0.405-osx-x64.tar.gz"; - hash = "sha512-kqAW1FMGWGZfknQJXYflfc+C/woiJPOjkq9h0Dwfg25FF5gSHY3e4+TlziCUOvdxIbAxLyepyQDzmzlzgenbZQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/23552ac2-5161-402d-a7d7-397c909d945e/28a0315d5442c2a4da5374e421e41e3e/dotnet-sdk-8.0.406-osx-x64.tar.gz"; + hash = "sha512-nBf1xz2zViAahWEMmUA41AZY0PaQprA4GHiwJsNd13WXE2qlboOdY5ou7OTPrW2ISGdVw/q2oaQkCqeTy5/rSg=="; }; }; inherit commonPackages hostPackages targetPackages; @@ -743,39 +743,39 @@ rec { }; sdk_8_0_3xx = buildNetSdk { - version = "8.0.308"; + version = "8.0.309"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/faa351a2-48ab-46be-b7cb-88444c642735/7c711c1cdd133f3e9eb3243bf51af198/dotnet-sdk-8.0.308-linux-arm.tar.gz"; - hash = "sha512-fJX5yM7abqOJLNi21tOA6emR1VtT3Rv96jQFLv0435e846Rr94AltChIP+cnYJlmoNgBPYBXLri1XMZ8ytiQEw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/099e0b19-f77d-4d12-beab-83aa92307726/daa887cc504b1faea56de7a422bd6be1/dotnet-sdk-8.0.309-linux-arm.tar.gz"; + hash = "sha512-S2/S+EMQCQ7SkEJiRL0/QRUCHl+s+S1m+x8/VljkJ9syV6X4dUN0NXKWY8UfXol5kOTv6h6a/JptqaoT22wN3g=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/086519bb-5612-4c2c-8b80-c7984a46a276/4d4117e088dcda14516a8af754f25249/dotnet-sdk-8.0.308-linux-arm64.tar.gz"; - hash = "sha512-be5U3FW1njDm8y/8+XZskcqTHf/vi4p5SoOb0S8gLsxXTnAIVTf3sUDoobZ9NjkYZLvRRCoM5giOMuEfWzNHCg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/bce5ec8b-ca1b-4186-b059-82dbc61d3482/64f97623037cd1975e06be3304f64e4e/dotnet-sdk-8.0.309-linux-arm64.tar.gz"; + hash = "sha512-QoGJHp7x5QK+/nvqXl8//oQRBYNhHx/EZ/JbKLf5Xs1uWMHFKoKshgS7M4Bvt1MhqrmvqYaXvdsHLLBGIQFStA=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/d7207d3f-a42e-4304-b4c7-73aeac93577d/156593f4ffbc65dc2dab850ba37ca270/dotnet-sdk-8.0.308-linux-x64.tar.gz"; - hash = "sha512-8m1Nq7xU55JkNT0NFKjfXfcgIDwdBFXmX02UVx6FsZQLkRGpu7FW5tsdRnVulTS7PJ8YQKIMlhkB1DC48bvmsg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/54c4141f-ffd9-4492-b224-50edbb478d50/5a9a16cb9918e3035a788f4f294225db/dotnet-sdk-8.0.309-linux-x64.tar.gz"; + hash = "sha512-8hOqvH9FjOIMoQ9yp+YAApfFdzfmGBgAXvA8RckH0Ls3J8+egoyrudbT+zvaSrwYvNjkU7xaAKxNd+YrMjf8tA=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/711b3696-81d7-4369-b9d4-a80190675959/4c08677a37df7a25e2eb44e05eec9ea3/dotnet-sdk-8.0.308-linux-musl-arm.tar.gz"; - hash = "sha512-t3BbTokac4uvhzwjrI/2B1hIJGf1CPVD7lJDOL/hyy2geKGWSSf3I7e+7Ojvw3nQrMFmwHRpEj9m2tZByzNGqQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/72f58242-4dd9-4e83-a251-dd331bf84895/724c31f93ccb5468646c0596846abeec/dotnet-sdk-8.0.309-linux-musl-arm.tar.gz"; + hash = "sha512-aBRheF0bKrfEAwm3LOcC0BfpV+LG6gwrPqPTlyIZb/mrZgSHFexCPOi5zzVCriTkKxUi0Xw1JMFzzHqjVCjFEw=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/6f538f52-0116-408d-aee8-0e87d24c2f1a/14bbb255527d485953c961ae93b77778/dotnet-sdk-8.0.308-linux-musl-arm64.tar.gz"; - hash = "sha512-uymg37bO1Zaes+NSWM1SYmu8erZ5jTH8p7HNnIpbFUtatgbY4LLjkS+Cd9LrD6o2xdU1vmMEIJ9WACC9j9x51Q=="; + url = "https://download.visualstudio.microsoft.com/download/pr/b43c92c1-69da-4ec2-8f31-2c214e1e19dd/69d274a6bc86ed72f7191726918377f3/dotnet-sdk-8.0.309-linux-musl-arm64.tar.gz"; + hash = "sha512-2+J98xfPaqFwHQjNmgdB5o66JNX0BAlSeVtzVRS0cdMmkEVRwqNJr8Od2zdzOpB8Z/2ewgu1RcKQIDc4QhCt+g=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/4801adb8-3aeb-4a4a-a2b4-78d213f7732c/a5f025926bd2463241d8774f4f6edf3f/dotnet-sdk-8.0.308-linux-musl-x64.tar.gz"; - hash = "sha512-0uRsDETmchy1IT+60JtTl5nEiOvqMp5C0CbR/8mzf6b/U9IYKknjmkBWPGzKhejNMqMIfzWHPbnzKbLaq8d49g=="; + url = "https://download.visualstudio.microsoft.com/download/pr/de135166-9d03-40d8-9890-bcc49686d2e5/52222baa4072cd556802523cff3fc3d7/dotnet-sdk-8.0.309-linux-musl-x64.tar.gz"; + hash = "sha512-/sYUa1bvfWF06mQoa0Mb/0DH1dyn7K8fYYDH2jB8ue56lAWqkjCFuEmry0EQDKa+/RUWw4ALS7YucTEEyU1MdQ=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/32218f90-bf6d-403a-9a62-35ba8d60bcad/175821940686b243c81ff8321414a79d/dotnet-sdk-8.0.308-osx-arm64.tar.gz"; - hash = "sha512-SHkJ6KNt9vK4o8iGdqLYBMza59dZv7li1VbqRv2Dbif65sCySwDVSXbTI/BNvrJxUGvNKrKEpWSkZdzeXpSDsw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/3770f177-a18b-4ecf-a596-280060759ab8/1bdf94195662387d2d0fc4c90b5909c7/dotnet-sdk-8.0.309-osx-arm64.tar.gz"; + hash = "sha512-Y5m8756r2FOgnKafFougoiS3RD0ZNVfzvSJOn+b7TQVTbSH827z1qe8hH2GhByoeiFBEr1MdZ4Nc1VwthnrCiA=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/0776860a-7d0e-4e55-94f6-b87f0f219b0a/a0400cc3a044fb101a2dab8616f6ae4a/dotnet-sdk-8.0.308-osx-x64.tar.gz"; - hash = "sha512-oWfJHRwDZyLHyv8SYaibVwd00eICCWQlc3fwZOmQ8FSMZo+/K2Kzcn8QEUbAV7AAcQbJfXO+r5i0h2WimpNwRw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/a17ba63e-bf54-4591-996e-d74d5e1138bc/343b525bc3bc5d3be10025136afc2e47/dotnet-sdk-8.0.309-osx-x64.tar.gz"; + hash = "sha512-EWcrhD3Yk03LInsGitmRE74mFnlcG+2XkoOvR4AZ/20ApYVhGK5NGpKXg0NyHpOkansng1PTtXE7tRqZATz7ag=="; }; }; inherit commonPackages hostPackages targetPackages; @@ -784,39 +784,39 @@ rec { }; sdk_8_0_1xx = buildNetSdk { - version = "8.0.112"; + version = "8.0.113"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/e9e78298-4150-465c-969b-8b1d2fb069e9/88bfb81d6fc900bf1b68ca3ab7631443/dotnet-sdk-8.0.112-linux-arm.tar.gz"; - hash = "sha512-YUD+PrzTdQD7AY3JmoRyGROee7sTIlUM1SHgP/Litz5sWn6y5g/dqhDTDIqeJVje3rhFP4UjH4EfTU2ZkjjRgw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/b2b1ff12-96c2-4de8-89a3-a17d533ca8aa/d45afb562e840be15870b23453dd672d/dotnet-sdk-8.0.113-linux-arm.tar.gz"; + hash = "sha512-LqHqv9emav1vtIkSujqKemJvw7sQ9fNUu+ir84QcSJ2CGuFnCyxklQfdNKW33GbprFSADK8GT+fGeg8GXGjCRA=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/f6d8b6bf-4e75-4ba0-a1e6-cb79255b48ab/b8cb663305eff90d17ac97e46e1e0066/dotnet-sdk-8.0.112-linux-arm64.tar.gz"; - hash = "sha512-LXwd90Dp4lxsNyJuuuZBIY0unjn/kKks4aWV7a4ADhmJ36iRvs/FOTQO3NkPu5is4yuOFrmY/wbHdBGh1CBBQA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/617f9650-3648-4813-a80b-ae9376f9926d/9d31940b65fe9e2a4debed7e52779e86/dotnet-sdk-8.0.113-linux-arm64.tar.gz"; + hash = "sha512-w8soWKF91NvqXTxWh+nGSLKLGdtSLwKXBanc9hSH5SZ01aDt3Wx/a83cIpcrTpP72b/6EOKvuv7azjElkL8GCA=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/1f338ac7-da1a-4d21-b78c-6c769b9c2dbe/5fd0e2846ef9f7c8bf6095ce201f50de/dotnet-sdk-8.0.112-linux-x64.tar.gz"; - hash = "sha512-3smWKLZ8p87unQvm423udnI6IQE43sBap4GkX0dBAnVkRC50qYav6HSRmiYxw+dVVexo5MPkdb0vgHpqyqmJ/Q=="; + url = "https://download.visualstudio.microsoft.com/download/pr/906a5846-9fc6-4755-9e58-5cd276b62752/05b51efa10b6b81fcd5efae1e71b6b8e/dotnet-sdk-8.0.113-linux-x64.tar.gz"; + hash = "sha512-58OBRcqO2yP5mSq6I4tnJe8L/MGGyHnnA8eUULd3IJdomHUaKFhadtObKltJnldj6OshZciKXS+rLDEpo1MRbw=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/672126ac-5134-4b27-ba18-28cb02fdb168/1eaaea4bc9a463f692abca1a45e9b5fb/dotnet-sdk-8.0.112-linux-musl-arm.tar.gz"; - hash = "sha512-qXiriguzCicsRzDD+TVU3qAw1mZlkrt2BAR+vzW6ZlGbrl5eRK0YhVXwHETvAAkn80Mc/Ewt13E5e5hee95gpA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/fe9c5dad-1d0a-44bc-991b-b7261a101acc/f92f4c4ccd929728a5be49219a77cea2/dotnet-sdk-8.0.113-linux-musl-arm.tar.gz"; + hash = "sha512-qN/OC2Q60jySwzz6ajYmnT0iy+7BzbUGGhw1+Syg8zd4sLKN2f/xFthUUepH1gC5t2LhN0q/9FDqf15gNueSvg=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/933119f6-9819-4a3b-b6d9-e737054bdf60/9d27ea1e7a5d00226f4a343f2cda76ad/dotnet-sdk-8.0.112-linux-musl-arm64.tar.gz"; - hash = "sha512-eQub61Y/9dwGzjLt0m5tv8O+a/nNY+Wls7SG76PBpZX9n01CVMv37948MuhUL39u6DKQ5qbl4fchnruj733M+w=="; + url = "https://download.visualstudio.microsoft.com/download/pr/6e40c625-e084-43a2-a20a-84ec80538994/f7c8c888a5e65ffdb84b3adadf6c234c/dotnet-sdk-8.0.113-linux-musl-arm64.tar.gz"; + hash = "sha512-U5Xsmc+UiglUUFSZXvio2S1iK33R9nq3uwk0Zj6gZ/+ZKaiYOo3efbPt4KzdSeS/id3xRIcpcEjSjV+047GhvQ=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/7c1c61b0-ea00-4eb6-a97a-31560c81b5b0/f5a5ede05aca2fbaca5b1486c2571462/dotnet-sdk-8.0.112-linux-musl-x64.tar.gz"; - hash = "sha512-SIMgFeCtdPw2dwhgRODuUAT8C5yvKeohE0RKBBlD4hOO/r00eAq0tjGUt5TfgKOJN7RgltmiDIMttU/gWEPSSw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/2db21b6b-c8a3-4963-bff9-51e95e9400bb/16b322c3e86f65cd7c65c78aa114f341/dotnet-sdk-8.0.113-linux-musl-x64.tar.gz"; + hash = "sha512-7BOirKMAOYyHOLHg1Ixu6PfvIY2qS8DWnd/AT+L75AwrLT1rHawZD4P8eUU4TWa0qDCTYy53iG+1S3i8ojvmNg=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/30dda97f-e407-4887-9218-96062c82d51d/1fba1e21b5e514a007cc39f97e38d60a/dotnet-sdk-8.0.112-osx-arm64.tar.gz"; - hash = "sha512-4o/vqA6KXu+huO18x79/pZIfOBz9OxbC138V7TthiPLe1OFYKBqSwn7lNJ0EoEJeTKZN7Oo8oHGLMEfh58ureA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/3b72fb20-4b11-4fba-a251-5485e059b6f0/24211930ac082fffd82011261a38060e/dotnet-sdk-8.0.113-osx-arm64.tar.gz"; + hash = "sha512-GCR0ebqmsXOS1tjT6iNQ6leGWAtBnUHoYvOxo7ndZazHMCpqv2t88VnwdiN1aoSYItEVBB5yHfA50Xk4Jg3uVw=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/ce94ae9c-4627-4b7a-8857-eb50cac41a0f/2c8804a1a59de1abcadf19deb68ef59b/dotnet-sdk-8.0.112-osx-x64.tar.gz"; - hash = "sha512-KU3LITZvQjGU2tlWqG4K7ZoOPMImX/mxv2HHjxrHg8YUwloG9k5rNXkBNbyJnkFN138dco9Plcla1XuAAVBroA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/4447b07a-1f8a-4088-8de2-cc880f630c11/1738874168616ec1522ed1effecc15e0/dotnet-sdk-8.0.113-osx-x64.tar.gz"; + hash = "sha512-ZPGThYjblhBKU8c4GrFwdJ5cQ2TEmUTcqPfJGNUirczNy8PPcGAVmbMGvejoEISafYt4P6sqve43Z9FJZTXpKw=="; }; }; inherit commonPackages hostPackages targetPackages; From c0ecb34102a2b7e120ba0d92dffff73470125ccc Mon Sep 17 00:00:00 2001 From: David McFarland Date: Wed, 12 Feb 2025 13:33:06 +0000 Subject: [PATCH 0914/1107] dotnetCorePackages.sdk_9_0-bin: 9.0.102 -> 9.0.200 --- .../compilers/dotnet/versions/9.0.nix | 421 ++++++++++-------- 1 file changed, 231 insertions(+), 190 deletions(-) diff --git a/pkgs/development/compilers/dotnet/versions/9.0.nix b/pkgs/development/compilers/dotnet/versions/9.0.nix index f95c7d72fc17..61db016b83d4 100644 --- a/pkgs/development/compilers/dotnet/versions/9.0.nix +++ b/pkgs/development/compilers/dotnet/versions/9.0.nix @@ -11,28 +11,28 @@ let commonPackages = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; - version = "9.0.1"; - hash = "sha512-j59whFHFna8m2rgyONETv2AyVTcGgNYhynz7sljGIQI9UejOz4lMtoF6ETztgdKcxLM/PQpe3iXrc/1s6cL6uw=="; + version = "9.0.2"; + hash = "sha512-5UdlvQgLHbSf3jWNIQsIgQXX8bpLPwT7Ula86VPEKYTNsxzati7wSst3w84cafWrQMIGkVrOWdhAbQWBM0LAFQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; - version = "9.0.1"; - hash = "sha512-MWBkM9EBf2IXGLRhtwOOXm9h/adAUyEoYEjyxvwDPJbBLX/aWCCvEzKRH3AR3WqxSCIuXMy6ylte86SiPuU2yA=="; + version = "9.0.2"; + hash = "sha512-zkZ5R92aVAnzQvvVo5GEUgw7LtC/EGEgScLcPxcAy9+wKn22ttlC6Y0jJVbmpvn8lSw65k4v4vZB9JTa3p0zVw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; - version = "9.0.1"; - hash = "sha512-yGd0EFC4wluxps8taqReKJk5fsmSf6k6SuqUnnwrw6UNtvUtJqWLiIThkzl4g2I5ECxqt+ttnN3iKnvxoSKc6A=="; + version = "9.0.2"; + hash = "sha512-Vj3zAxAV4RbAOv84QgWXFWfAPD2899tCGxAWYoeA4lbK/+piihilqglICYNUOUaOpWZk9lp1JH8YqzvUGL8gSg=="; }) (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; - version = "9.0.1"; - hash = "sha512-IqKgv7kZ6BG8s31dCHqBgLuP96YHHSUvndDw1gCSkZ4kwtxuo4/gIonNuz9Y2BxJFVyWPpSDjNIwbOBgpUrnFg=="; + version = "9.0.2"; + hash = "sha512-XMUBd3Zp2dMhtPfaI1uKzIwoyTLml+HPOpokh37gP2XLTyq9n/oXVbsyy4c5Qb9DoArrDxTjH3kZVpRYGCXM/w=="; }) (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; - version = "9.0.1"; - hash = "sha512-w3hS2Z0dQpqktohyL76mSk1qKnP1CTHYg0n6LzlP8DVoCGyDW0GKOPYM6PWzgmsv62PV0spUJtdiJZxAPmF0FA=="; + version = "9.0.2"; + hash = "sha512-UqcE/MYZ954B09TZaoWziBOArkLQIjTLTs5j80iqo9G26HkukEvxn4fQ3OG7+hONoIGATR8QAi6C4c5GxRGg6g=="; }) ]; @@ -40,118 +40,118 @@ let linux-arm = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; - version = "9.0.1"; - hash = "sha512-ITqGyFkabgmC8HDqEvKTy1T6eAI5Jzt+FQibZqD7mXx3HezY+Vug35QIhKoZsGvBgGZePXXlXGbQXojv24oBRQ=="; + version = "9.0.2"; + hash = "sha512-UA3vQVkpqQKjUZMERbbute1QxpwOM8bZjVjcZ7ZhbzZ7mIBDv6XgJPKubLwukk7GHxCkPf2AV+XXm2ECieUjtw=="; }) ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; - version = "9.0.1"; - hash = "sha512-pJjbOtu4hjHVLu+ohoe3HW7z7D/VDlpnO8gCSZetd/DStLhBkgHx9Ne0bida9+UADDqk657d6tBNlKmk53Xe3g=="; + version = "9.0.2"; + hash = "sha512-Cmib09h/yribffQnq5cU6jaxi4DpfhFr+lLaWrxPfVstmBsx/1oQgsWl+U5zSRim40ZdH1EixJoRRbwEhFf1rw=="; }) (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; - version = "9.0.1"; - hash = "sha512-58uQG/MEDkL5KtUGOcyAbXQwPM2hguHALO2GzrRolb/G9cZBWxPdzsz/Znac44IXjPr8ELq+L1Tdj4DOYabrgg=="; + version = "9.0.2"; + hash = "sha512-/RkAhGaGWD5xlj+lgwEsje+nHEjauGvK/iNWVSwLyi4FSek38rTO35HqwLZovqKCGJqZQtLQQ3eC6CjHhR7scg=="; }) ]; linux-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; - version = "9.0.1"; - hash = "sha512-szJlHztrwdlPp3rRxcvKPuV7XUYHbYW4QOf53Md2bfz5hSZu1O/fH/Md516vGD13NXykF1sK8/+YlI/Zg1flPA=="; + version = "9.0.2"; + hash = "sha512-ld8hVstWuRRJZodUxLd5jdAPMK71xt30NLeMZIVcFsQcsQ9CP9qt0PpjDyR0y+ZSwIQkm7pnvl7BEq7xTCVcQQ=="; }) (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; - version = "9.0.1"; - hash = "sha512-9qpCPG+jgL3DG8KUycZFef6bC1Kayo1IP+h9syZYdrcLXDmbZTJu3hcAL4S94O/fSx7kNCJNfZ1IiPFc5OfafQ=="; + version = "9.0.2"; + hash = "sha512-D31woF6UsteTEHnFFxddJmpX3amTkUi/hGvnOt3FX4i6BVOKkqsJIf1x45MQUXf+O5E9q7nDDprgJPxOHA7wPw=="; }) ]; linux-musl-arm = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; - version = "9.0.1"; - hash = "sha512-L5D1Q+sTwN0cqr7yMFHJVialh+G9sbZYaOOQP9eBa1/rWxn/FUAGbPSDpKJTyILFPu1aiykYk+7zvBzyWUxXJQ=="; + version = "9.0.2"; + hash = "sha512-kQDgMou1CnrcX9ADD4nIcy0zkjT65pBlS2GUzoFhXdS8mAqkbCxANlHS4JBCeTZ8eZSZjT0QapAkD7DVKEwvww=="; }) ]; linux-musl-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; - version = "9.0.1"; - hash = "sha512-4re15jU1KkriWUfIzAvl/JgRWqNPIdoP5V9tbX2SW7+xJo/UQ4IQkJ4W9Ct33e8gmv74kqpOaUAW8Ufc3AEvZg=="; + version = "9.0.2"; + hash = "sha512-gacWyUCxmriKo66scvwafULnOI6xClFtKAqIymOx0os27ZJD/SPEvDdkPKykkqSCNPse00qUW/W36xgcfIhlGg=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; - version = "9.0.1"; - hash = "sha512-iFr8JbqjJuAX/358K6rVsnSxLtOi/fHufP5tDypK9OpUHeExhRw7stDKfDaZRccGfVIu3h4WG/hFzEnkAipEWQ=="; + version = "9.0.2"; + hash = "sha512-wbdVbAVjSh0H3TXg8BywEiAtAwCjcHTKYNIhYscjhWaXRW3fm6Lc7Cud9XUsaiM4K7OPDzWfgjGp8CTydvccYA=="; }) ]; linux-musl-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; - version = "9.0.1"; - hash = "sha512-BGXpmXcXPRylzaWOrojpjwa0TNPU1keLVptsJ4F4Pbd6eD0vW7aG+tIWhRDmj1hn0u2lXWpQhdUHuE9kzQokuw=="; + version = "9.0.2"; + hash = "sha512-a8M6vtlcxrbJ2J1E0bvNTKNj4ryTw5fUeIdRydIY94TPWKfU33BB3GGq2VJJhgRObKZx4+OI+Iv8k7BAU9TCuw=="; }) (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; - version = "9.0.1"; - hash = "sha512-ZO/XMhmqlAlcFVk7LFK6X3Zw1309qMD9CQtBH0lJWqcKCoCJ/M/kR3MFC3LPehH+tmRGeiLOzTdJoXzUDQlesA=="; + version = "9.0.2"; + hash = "sha512-cv0CJDz5owemAyOBOMXhVVaavPgs/H73iSwcsv7ddB0BAxhH9RarCKgX579cKbeaD+gtCdZkT7pNN8lufUAPWg=="; }) ]; osx-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; - version = "9.0.1"; - hash = "sha512-j38WbOTxvqiOycqA+UkCdoOmAGNleiSmoaYbmR0vx8Gt/jiQ0dWUP272r4kOfytFsPvXDSq/8BClx6d5auUjbg=="; + version = "9.0.2"; + hash = "sha512-SXlfpzNHG40IJq1KE9Ypc4pExnlY13HECPQ7F1hc0u55LGWoEieYE4se+rZq6ygpfY+lG8jYXhYZ38dX1iz1VA=="; }) (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; - version = "9.0.1"; - hash = "sha512-cXNoNxA8DEwlf7r7slfLqnecqmuEkKntXwrG937SL3fEeazGsImV0dVr46k13dbIA56NyBS3vQ9DuxtqnDy2Sg=="; + version = "9.0.2"; + hash = "sha512-OmoWAZ9xkufpTtLaSGPKmJBq4Fhf+vSxPjACtDUO341k6rGXt3KTtgv2Axl9hERQIGxJIErGDAfB4Kvtpaxe+g=="; }) ]; osx-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; - version = "9.0.1"; - hash = "sha512-CMu+1kW/TMcHSe9tmM9JKPm3BPr8fE81qv5shG0EOcovBu8Z2FB4x4cj7tdQIZjC/M+yxfL09lmO2joO06mLZQ=="; + version = "9.0.2"; + hash = "sha512-eu+OoIif75S+08+bSlHOHhb/St2DheAjjP5NyNu+bpoIpjIsRJJFU1l3Ozfsfva8ZolJOwO43PhmSIGBEBh7eA=="; }) (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; - version = "9.0.1"; - hash = "sha512-lw1vFGvva0T6DYbI3258wS8Aw9qHDzDR+hxaWwAJUVxPGGa5aDSeFfZ/hP2qtdn17cnlUEhCR28S2rimkJnc5A=="; + version = "9.0.2"; + hash = "sha512-a80YIRtzJ4liuCAI13NKFVzWXhJH9pIvlPHGC/OD4nXsF3sJ+3xrQLSCSKVRyLoPQzMMhYTAvZY+DnzPEpCS0A=="; }) ]; win-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; - version = "9.0.1"; - hash = "sha512-Bcm+qKreOBnsaTPZA8Tf0OPKnFLdaeDmNLjgNEdQptMH4s7s6RJkSzTK24brSKTsGJWD3ku76415Jt+cHAUl3g=="; + version = "9.0.2"; + hash = "sha512-4/ly70hswwZqiiFn8N/hkjQpRl5l/CiYMKjZr2QEmZqOvgwsO/JztISm72sFEnrhl64zZDUsValNspfV3dz0Fw=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; - version = "9.0.1"; - hash = "sha512-BJJsB434xCwvhwoBc0yS8bqoO9goLqGeoAHuSOqCC5hDNhheI52cX065vZ7dwH8gtNLXp1MLsOs8/vXD45NaNw=="; + version = "9.0.2"; + hash = "sha512-DW9WHmEenrCXtzxmU6k9M/YeypSgJcyJ2YxLSVpzgc6yYUpLloS3eZu000bdNuqJjmRsMbO+YbeDlXvofsJMaQ=="; }) ]; win-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; - version = "9.0.1"; - hash = "sha512-Z3ZAGYzDjE9Q/D4YRmhfTjEMsrCb88l3PEfOQmnptmmjxWxpNJTJuVldhPy5caKbviw1iSje2dvjwLQ92+0zNg=="; + version = "9.0.2"; + hash = "sha512-6npczhggIdAm8+WV/58LMfczmhac4PruV1SNXRrfEdiu83eONsiXU/RA+79hchTPIjoDx34sAlnQlFv3GJPUEQ=="; }) (fetchNupkg { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; - version = "9.0.1"; - hash = "sha512-WLYp1Nf/K8SSTK/TF+O70LkHkrk+S5KU3WwforX2QAlN9Xa6zscHSbiRulvVNLbdrb5Bx/8xcsps2DzbuJgeoQ=="; + version = "9.0.2"; + hash = "sha512-7G8+mwyW5PTEyG4K8xfVvvTWHvbpVDdV08VlbhRqlNpbJlffBtLWaQtnyCt0lPFsKi8w6NT2JEjZYerKsPqz0A=="; }) ]; win-x86 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; - version = "9.0.1"; - hash = "sha512-qPEOgS79oAsERd8UydEo2MHY1Waiez+XdHnUSrBCHoSL8qTwlurXtDyLkGLKPqQkkWNlKBx3jGXFAewYThzifQ=="; + version = "9.0.2"; + hash = "sha512-xAisQfDV6+gbh0DVYd+74hdDL3n2gu+uwvrHvOcjS0O16xjK8F4v+hQEJ4QAg2/lFKo4W7a4MMH6cg2ICsBFIg=="; }) ]; }; @@ -160,361 +160,361 @@ let linux-arm = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; - version = "9.0.1"; - hash = "sha512-fyD5GczwLT7IhFnWup+0Mh/2RZtO7lHrA/NMB4QFkn77R3vIS+aOcWaoS6Pk/3X7K+71L6z0WP4+4IsN6ayn1g=="; + version = "9.0.2"; + hash = "sha512-B2nakKuJA99k9cm+LMPc4UmEP/jAuQpj+yEMTIVsPS+l6kTDXw9ApjJVwzL0V8BwhNxBbV4248SxFLE+aK7jVA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; - version = "9.0.1"; - hash = "sha512-99Pkg2wyoEdNxQwn9h8VEtMxmYid1ieI2+dv3uzO4XtHN71H+mR98HMAlXFD8eBaFXm0FCIFCjrDC+OLAiiElg=="; + version = "9.0.2"; + hash = "sha512-jz4BsoVvrlBctPmLVSP3+w5Nw02baXDvpf/hzIC+BfMDjupS/MZOKQc1dy8V5an2QIEPqaUmboRtvaMHOGh6Ug=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; - version = "9.0.1"; - hash = "sha512-/nTipuxWKqvQkgSM5IB/yIWQ0OyRmQUdZM5JTaK0SJ6ZnbLiNlWHo2INZE/8syLhHjc3JXCzY0Zqh0Wd8+dHTA=="; + version = "9.0.2"; + hash = "sha512-vvtkrG6HJep4qsNI7PQzIAOnY5AYc0qJ2KQkTMXlFpsg1pl/ZyalXD5xsIfWBPJ7/LfF5dNR1SkG8H8sCpsMSQ=="; }) (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.1"; - hash = "sha512-vjgEIRRMOnS1BU0v4EB+ljQaiiRdwDG8Mt9vLfWti61mzQPuSI9UuZSVEQAhGUOZBazBrgEFi3L2/VcLKym4Gg=="; + version = "9.0.2"; + hash = "sha512-yfP6uokF49n0udnmwxYEy3zje+qIlv+oQ//CqXZug9qxPX4DABfSgTixVXdAH01iCtxWS4MDZJkcv3h6oKCFZA=="; }) ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; - version = "9.0.1"; - hash = "sha512-CLzfEJ20LhF2QEx3Oa/p4G3kSE17OEWZ5s5yKP3voW8sw/+MoMk5Y8R57O+jSyn3ZMfauoVPB8TIcOlrl/3+kQ=="; + version = "9.0.2"; + hash = "sha512-wrydWg56hOFX+IMX8iJrsXwv2rbb5klrPdAov8KqNcYSMUL+RPWRMxJk6nCvsLVX2ISbrEJD57J/xDjB9kTB/w=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; - version = "9.0.1"; - hash = "sha512-rGQNTsy0aS0TTAko2m1cWUwxsbKJKUMD3u2qO+3K/QlepA+gFBylCfijENB8SaTOCwyPwI6PUiSOBlPdaPbo5A=="; + version = "9.0.2"; + hash = "sha512-hkiJZ53XdVrUW4Tbb+vEpoFgS68UcJZ/8OtbXrXCeuKKo0NlFEPggQH9UAeRfHiT1/MxT3U6RmdOwOLPF+oOAg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; - version = "9.0.1"; - hash = "sha512-SMApYm/3kuQbxNDwyy7BvY9SkusCm6Iwu4wPPX7fKnQ/GyGwNeABJIqq15nAwJSZR1EKAlQe8amrXpgmrkrrig=="; + version = "9.0.2"; + hash = "sha512-OhSG4c0DlZ+UsVlHlOKSj7jaJ4ec7ZseHKbBq4OM0uIqDLenhYH99b4e4ZF+rXT9tUdMWlv4KidQY+0s136Itg=="; }) (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.1"; - hash = "sha512-UFntJ1OeRdixs4nmhMxLcyXfwjmNew5EkmbquA9UKI4kKViEZEYWOPLPOYTGGhdfUJGRHbkXqIrsGAglFeLyog=="; + version = "9.0.2"; + hash = "sha512-mkwMXr+Pnm3I+Urp+TZEFGqrPtflW0Ja/19YpnYDrjKhB/OxTOotb44sRmZFfGIcxflR8e2QK5KVawSz8ulSWw=="; }) ]; linux-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "9.0.1"; - hash = "sha512-NMon6hn1ZcNwqv76Y3kPuOGhcR/l/dH1JcT1bN/qrtNIvtEPMmaSpnUXVA9/AazVGwNitsRbVI9uZ0CfWm9sjg=="; + version = "9.0.2"; + hash = "sha512-TH4+wHu2vvICyB8t5kWqJosqkdCT4vXVWZh73m8Ddafa1d7Cqa3EMruOX7dBBYt2MdT5IvLNpyPZEKPc9fF4zQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; - version = "9.0.1"; - hash = "sha512-IqVXfM1Iwip/V8Xy4/xvGbz/Uvp/We05Mt1V9WLD1pcEVFU7Lm5KRFN3+NckqhnHAgbENEjQWiqcII/0pKWvPw=="; + version = "9.0.2"; + hash = "sha512-JPEfNNTf972F9GRgXT3YwkL80I9VySIGliVHp6QU72mgBn/YQtzICLnHdKZLPfjdjLB8jCRHzyYofAjAImdXRQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; - version = "9.0.1"; - hash = "sha512-4lprzdBSYv2uvTFcYuVddGmzkqDsgCIuzOusJ2HFowxHJt3mdNS+9fbFKTMUGYxTeysQpNdyd5pTEYnswnaTug=="; + version = "9.0.2"; + hash = "sha512-wiVQYMRoujDTzCo7n7LtkQ4LTPmyhDM9/sm3nfKCEL5sAEQFsNTVdPGF5ltDqPHILOjrkOI6BvGbxq7OMbnh2Q=="; }) (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.1"; - hash = "sha512-el5p+CAqxwjmvRajBNgWiQKwLDfqZq6zT4CPaoD/9zOhJhsXrR066vXzCE0FrVyP8QYj1iJlet3+oBNKoaW4lw=="; + version = "9.0.2"; + hash = "sha512-6jxM428hmJM3RpuvwsRhyjJrsb42+P/fFQBJVb6l7S4zXZHX2yLnN9np2Nbii31w+26wiujl4J8Z3IihJ0q1vQ=="; }) ]; linux-musl-arm = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; - version = "9.0.1"; - hash = "sha512-bB55+r+vjLwYcO0mAj/NgvfVvn5k338nJ41qIJUcMrnBLymZMhPKNmMDlxSrraNVqflhmzwBGX3mlk99YUssXQ=="; + version = "9.0.2"; + hash = "sha512-9OdCIs8uygtDrvr3SrY0s6bl7FnlvEe5sxGjuIqoel2XanAAo2O7YSJrQx8aDVyXkyQnizzlEb16oCA4EWf1vg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; - version = "9.0.1"; - hash = "sha512-dXGlvBXlEFhXtxslCQI64Ax8q6fWf/s+LsfrhNzbgmH1EJdhrtij1eLDU8+ByRiCQs4nNj9r08+2FKgDNRSEBg=="; + version = "9.0.2"; + hash = "sha512-tCVrizZ+4iH4SDobtoVzqBdOADYfe68bdulktuwUC5sWPW1LHdmGLMSKaJiqupXphuWDOAbHUpGtCzBV9/L0TA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; - version = "9.0.1"; - hash = "sha512-G25u4rIqRuf6PWUOq/QR4yBqoKT8yff/W8hQmJcVSCXCIudrmiqwdr8XGt9RVO/wpKNyq2TRsr/uz37P8lCfQg=="; + version = "9.0.2"; + hash = "sha512-aKgwBz7d3SEpLl43k7tkds2bDJcjvpQzjUJTaPwR3haX3ueeTO3e3RHKEfSuINDrsj2xBQopQmVtuAAfogtg7g=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.1"; - hash = "sha512-Q0DvC9HdZDWHw5j3OUPkC/0vD138RtCyrb1v59/09s+Nx9UziTyD9g1VCMV6ulRlJwVbNEM5cfOin9jnVa+aFw=="; + version = "9.0.2"; + hash = "sha512-bYxwKSniEPSnPLXdhsNrXM3xnT6BWZDBJAW4EPEsx7+U8ncwQyhck7M/Ta//J/ay8pJNVu78oS31kN8TKFusYA=="; }) ]; linux-musl-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; - version = "9.0.1"; - hash = "sha512-wif1X7iiUq2V1kwXmfZQgtHtG2GvST3W7U9bjGRApW1a4z7DX4SE0JMTqfaHdkBVroUh1M1o9tE6zX1gGkxOHQ=="; + version = "9.0.2"; + hash = "sha512-VmF7l4TWo5c/iKCK8ZqyVW8LrsgPRO17g7cGT7+aXFul7iZ8DvHZ92MKvB8GOU8ituiw1DzfshPCp68eX0gwIA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; - version = "9.0.1"; - hash = "sha512-/6Q+UtzMeunuT01kjF3WXAG0U0wAZgEZqcEteomAGKBAYncTKXAnsslQk0GLlLxG7Cks0ZetOxARURNjF84ZpQ=="; + version = "9.0.2"; + hash = "sha512-p6QlmeC3ZZNFSAN/0KkMHZeYNVY6G0+d65e/wtyGwKjTQ9tnsJ5tmfLxLgSuh5sASGNWTtfkji9WzcrpGrKKNA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; - version = "9.0.1"; - hash = "sha512-xUDRlzgeLcyG52I652qzQc9QKlW3/LwzINgfMs223EYO+sIcI/vNJxdoC05s2NVby47Y3s/bXoNU1rMdfHfEIA=="; + version = "9.0.2"; + hash = "sha512-q+SsGrAvPxIWpOXxiqeE+f/LSHd7p//ohIfmWd2K1+tk+RO6mVVnAo8LVzoFun2ooLca+nrzhKJgOYziB+gYuw=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.1"; - hash = "sha512-4+AFlX4G0far0LT8WzuVjjsYEpWnyHn9G9yK/aulaB7coCeLG/RA552MnEITGwr6RiUwvgjPFHw4RmMvvLXlbg=="; + version = "9.0.2"; + hash = "sha512-3c7noA+xvmQ0jHXPY5sKtsiVHeyTaXbz22Z90kjiruH9eyX5bmx1w2HN3mBjVxWTPA4QulFhv+oHMlfBlK3cEA=="; }) ]; linux-musl-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; - version = "9.0.1"; - hash = "sha512-9co3xS3uaCXoMQuuyMSP77T4ACIjz5zjrflm/UMiVFjzvrmb6sSByHvZYO8DOPW14pnA4aRlCr4qhcoILliUmA=="; + version = "9.0.2"; + hash = "sha512-Sa8owRalIJoJhmGGVfaqfiQhL7QPn4KOXcitPJYRCIDg8TnZ1VE43uyDgr/UCF6IbR++9m5kPzQIvns8F1Tkfw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; - version = "9.0.1"; - hash = "sha512-aOewuGT2fyUyiRLgfCP8H5p35ixkIDbegEOxnAQc8NcCvh17SG7xZCk/I+8vELcXw6QTVoFNc1Z0f7OlSAImmQ=="; + version = "9.0.2"; + hash = "sha512-wZdjJQJAvvqkUNGNiSi9zwbXEp1wNKCFGc20acagFEq9xAvYBNTyc4L/5BaPr39Rsfd3wAZQGdYx3Zyt2R3P5g=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; - version = "9.0.1"; - hash = "sha512-Y3K03HiKY4EAlTaBTCWhQkBMtupuxUabOcFsBWhwzYFVNwJDgmWeS8EBIMGK5DgxKvn2GtR6hLShucSNfgHE9A=="; + version = "9.0.2"; + hash = "sha512-3xhjfDSMN41fJi3wj5IEqfGBRw5p6L9zZxuE51gCHZwCdbl1j78Jhuh0IZZGhfy6TG6AItEi6YpIB5nLq5dIJQ=="; }) (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.1"; - hash = "sha512-vUSFlMJBvIilcgSX0/lO/6oslEdVMeNpKXK8XRSQfaa3jfdAiosvN540E3Y87i700yT7T1r5qbEbW0v5P0dqUA=="; + version = "9.0.2"; + hash = "sha512-SZ4waJ4GjoeTc+CY9QywCCLtl9x6Kon5Ylrh3dxDRUoiCMpzVlCLZM0DkaIUrAdcXX7VomWtwW/FeCCpOTNW/A=="; }) ]; osx-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; - version = "9.0.1"; - hash = "sha512-rO0C4vvuGQI1fokFIG4W6u4uscFrtZiH+wBIcwB3oVp/8z5CHDUQ0mqfaxjKtQ0pWS1eBpt68ZvfRKK6giIiTw=="; + version = "9.0.2"; + hash = "sha512-0F/LPTF2uXNC6U0dQcumlQ9gBenLZF3nFOmTQnZAmXrm+3ej/b3t7JMNCwcbmclMUvhks0d95QJRDQkZ7qRbmg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; - version = "9.0.1"; - hash = "sha512-VbCfkSCgIZC/CSqe6SIbMbQ8OC/tFZbF/J7GTjwSenxEq3dZu7njH+CdyUcRoN+voxNSLXDc0PTH2icTX8sa1g=="; + version = "9.0.2"; + hash = "sha512-9OPvQJzgQOMiG1+drj/50D4QhJxNV9lQFVy9XTdoj2FUO6fDyCvAQm10acq5KKeLUnEZO4hFcYakZjmb8Z6XQg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; - version = "9.0.1"; - hash = "sha512-UWsVcwp7L/dKGN/E1YbiLhAzUare1IQc1NiOeKlB9XetS81MkSllasLViFG7TF1G4FNiy+bsh0G4JKE3PNXKrw=="; + version = "9.0.2"; + hash = "sha512-tbL6fllK0UxBFjmsdi8Cf+iAHTrCpRxSmPxrgfXNbdyUQrBHTT7yUlKGIlzW2CQKlTZGPSURsAWCSvAr+519fg=="; }) (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.1"; - hash = "sha512-yzF4l/m0FV+MDtQjlx0Y8MooG5AOINYuIWTd7hLuvhQlD5xcFQCVrf2+8d3JEwFXryxn9f4coMMxG55/kNoq4g=="; + version = "9.0.2"; + hash = "sha512-oVbhX4JUS7hqqVNgCwX+hWzm8CGLK5zMo7J2PXRwzYR/xVWkWuVuf73LFs2Gz8YtJZlq8PzPT1S9iWzceUp6WA=="; }) ]; osx-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; - version = "9.0.1"; - hash = "sha512-sIyKf2ll8Fva8UMzQhHowskA+xp6f9pA/X+wnWLWrdErrI//95niLTo3MgqCZQq25n9Jo811H9gG430tdOEvrg=="; + version = "9.0.2"; + hash = "sha512-9z+jtQjmhrbMva7eQjNVDJdEDhWHF2T4ubeqafnUTEueewGDrX/TLLVpVyU5Def/ChWZDgrEnuMX4g+4jlGFiw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; - version = "9.0.1"; - hash = "sha512-m3uywgan3uYgy2sQ/tZt3v5XsnFhoqGdb3IAu3vZn/AmTp6Mi24obM2We6N/HlJJ+U+M8+fb9fdxwRRg5De9cA=="; + version = "9.0.2"; + hash = "sha512-F46Ir5AWTR9894CZYAAJH1fewZs1tRJ1VRE5PS7sdDD1UmeDASWQcHAt2uBVA8JSSTOQqiojr1xokwSSR/YcHg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; - version = "9.0.1"; - hash = "sha512-QtjQWyB4NJLf/3WMXCl2D6NDXd7lBDt8jGkN+4lswz/jnBpIAyHkYVY01evcUOGK1/13QtCIQSkJjQaybXlI0w=="; + version = "9.0.2"; + hash = "sha512-Br9R3iEAfP0CGhfkxdxxZwZqF4Wbivu/TQkC2TaQTb9LUX6P+K9Oytjx1ilVgXoyclWPv9aR0dG0Uk+ppq+hvA=="; }) (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.1"; - hash = "sha512-d1MDpDyn3Yc5ddPe2I7cgvrfUALxPZppiF6VhavkzybpEVq5RPPNdM5S8R/Rhq612H/Hl3C1dKmeraYjCQ0uNw=="; + version = "9.0.2"; + hash = "sha512-jpr8CwD5Cwl2vUTgl4xj9FcEELZjho2HACniNAXIHJVXTZewFz0S2gqn2is3C2xwc/MBo4F2SW202gVr4V0SjQ=="; }) ]; win-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; - version = "9.0.1"; - hash = "sha512-N2LRmh6Iz4Gc9XmSiGOgTYZhHltLY8TUjFGfcykwAKu4Dx5dXuwru2zX+4I4AstYqGWACz6rlJDFIqrzEGIvbQ=="; + version = "9.0.2"; + hash = "sha512-EQ9eXimPClVlGs6fyuoJfxMFzZOl4DUZcGxANknqDpGddoF2VZke8LfLAtgvKTGMlOm0BxX6QwBQxe4f0Po61g=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; - version = "9.0.1"; - hash = "sha512-WjdTpBYhgsDflMrvj8laO7tH/Y+UHzDm7FMlt75Oa8k+AunOqjpo8hLgs3ztQcPw+rvqRNe4HTHoswVSUJg7TA=="; + version = "9.0.2"; + hash = "sha512-Fg3H4EbOJDus6sf3/Syq5RVX/C45npjCwrlH6cVllKN3O9N9Esz6gvLkDJ/k3sXqg1a9qExCHuR6K2Ni/wqDtQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; - version = "9.0.1"; - hash = "sha512-j4tValfWVEG+UhmS3NGs6nb0Gjwa1tJZjk4kFxaC5iCSXQSd8Qs+0DdH6bOiF5O4GQt9br2WJH8+UlE8S4YbCQ=="; + version = "9.0.2"; + hash = "sha512-tFQXOeDQ0/h5ArqFHYBVNo93xLPJGL1aA/PC5Gg7zoL6dTRhI2lTltED70Km9cKMC6X00Hq1vee6FvOuLs1hHA=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.1"; - hash = "sha512-WkYnRk7SmmU/iZRz+HEAtCHQWDz718HvEJ7zsrA1bNgA5TI4APWPe0xHnwb9uUmmE9BUyUvEtK+gRxYuA8kLww=="; + version = "9.0.2"; + hash = "sha512-EfCw4g9OheETWmZvwEpCYXG2Xv7ZO9fGHtH+Typ7bcvw/TztkqB9ybMbMvFWujdec3j8lL50mAJb2oAgVcQt0Q=="; }) ]; win-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; - version = "9.0.1"; - hash = "sha512-yrQ8Mq4CdJ6MO5Pc/8PrlA5yU8XozxuXg4MCRbOIYcOWgJL/S6zW6t0rmspyAlJ3j2PS89NF5bwZyLogM6IZdQ=="; + version = "9.0.2"; + hash = "sha512-rm+2rIw0XKUPfyccDpp7UMjM6IZfHVgK7OePJFU8a1NMeUZvH00haqLpERtRKJ4xghPU2ZfliL0dICbL2AGjhQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; - version = "9.0.1"; - hash = "sha512-m4gtvFK+OpEDeL587Zb6KYddFrWrtb1z9yoG4ts1hU1mYytiZImZbcej8OMm13/eG09JTWFxfgxecJMcwAuhhw=="; + version = "9.0.2"; + hash = "sha512-GyRAQXiq2mcespMH8nRnxWKMKeUovUSmRzufrqxB8PyVNehhbcpEDJOon23BpNrO1+YggN6G2eQ2KDNUQCmoXw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; - version = "9.0.1"; - hash = "sha512-DZKhEHctFy4d9v2XCIm2tKYfirXNvcMTNf2KBpV1j7mnDAop+S+d9OJ8962JJKqkZFYeDHp5R32RqgI4PDfqsQ=="; + version = "9.0.2"; + hash = "sha512-y2t/JAwRgRe6PtfSX+gU2oap5/ekL6Fm93LJBNt2awvTpgRtTnsSks0LS+2VebsUAHWnVwCg6NcwuFOPcOu1WQ=="; }) (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.1"; - hash = "sha512-NGny5Tp4IrpCIUUmt9kosbuFOxLuB/glkrZHvULR/2v1IeUstsW0lP56rds+PBtkN9DY603J6LbikmwUfC/Jyw=="; + version = "9.0.2"; + hash = "sha512-j8Q2Qi4Tzv7EO5FvBqVVLtHnV3+40fX8Z9dHkB+jkf+O6ASmDnev1XS4GSOb1peHpJeCauhNxzfrNlBtD2MmyQ=="; }) ]; win-x86 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; - version = "9.0.1"; - hash = "sha512-JmmvPGzjAhPzt/OJfMqEOSPMCbFKjLSjI3JW+spalcj9R2kze2G3xR23TeTIppSY6M6UqHfYtEDLSRQ2mLjBdg=="; + version = "9.0.2"; + hash = "sha512-Lyycaaagwj36GD1DNHR2HyiojLtpwAqYJ38k2IPCCyepzkULrvjt2QQ3KpLNikSLjZJuVbpUskNrh4vkoLI5Zw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; - version = "9.0.1"; - hash = "sha512-K4s84fKknMNlenkFs0sSDoVV+m+tRxoZzXJ4QsqqoXYBF940T1Ryxf1Dv88vHmg4QUIEF6t4LeItQHQXQa5xZg=="; + version = "9.0.2"; + hash = "sha512-H54xNMNGYpV2+BUcRcvvVwbXQ7S/Do5iagFGxzFkCPOkTC2MyyvJYSCY4vlRf6O9r76H1xZImABmI7oQSjaraA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; - version = "9.0.1"; - hash = "sha512-/RZKZuUCUw/V0BTxfFU867msMi28ATMN15TS2AKOboZMFagDXCYaMYGX+IUNDzGxDF0m2B+uE8I+Eh5QHpdHYQ=="; + version = "9.0.2"; + hash = "sha512-nGU66NCplmHBPWtSoWaeZiK9Z9VJLWC9/PG4fnywm6ZCnbIMHR8nDrMmFvSXO8RGaE8WMqA1BoK9ogVliXYpAQ=="; }) (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.1"; - hash = "sha512-/MFc3XgEWV3Wt14/f/qSEitWlbZSzbSJ3uki3ln35HZAlAae4roj1MuZWfW2DL+Dtx7957N34Jndx1nXAAeHvw=="; + version = "9.0.2"; + hash = "sha512-KAttjZ45azXcqQZcUquI3CU1YM6xzpUz55lJsD2UnG4eyhEm/1J9zTYregb3K1mbVl6mcJuksUGPspxK+xWsRQ=="; }) ]; }; in rec { - release_9_0 = "9.0.1"; + release_9_0 = "9.0.2"; aspnetcore_9_0 = buildAspNetCore { - version = "9.0.1"; + version = "9.0.2"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/463fb01d-fcad-46bf-8e5f-0e568bb9ccf4/a3ac380fdc1e29ec25e5fa0a292a61df/aspnetcore-runtime-9.0.1-linux-arm.tar.gz"; - hash = "sha512-+nXY1a6ZreDRq5ABiDn+P13cTnt0YXFcrysL96iMjobh1PEKtpcD0jGLKJwHAIRuIVV0bXuxrOPS0S4XWrGL4Q=="; + url = "https://download.visualstudio.microsoft.com/download/pr/0b7ddf3f-d43d-49c2-be1d-bf59075d85e7/b1da14023ea7fef1fada6c8898635fbb/aspnetcore-runtime-9.0.2-linux-arm.tar.gz"; + hash = "sha512-VXZ1HqlBREmt0QDLYMkX9yMFIJ3IMezTaYuO9qaeKoAoUBSLM8r1oF0Em+ZrGcdARTHqbs1kPMH9auYReeEkmw=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/2a193300-e0b1-4e9e-acc4-a4a695c7b94a/f197be75380aaa333c949bb8a1fe0510/aspnetcore-runtime-9.0.1-linux-arm64.tar.gz"; - hash = "sha512-433BRF5TwAvZUKUx+rgzVN77vgbG9zr0u+8gv87cBIOpj0eDaae8fX5S41srM61zeB4lW0aQDYMeJ3DNRF1pxQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/744cd467-ac89-4656-9633-ed22e3afb35e/4277cdc84219d6515cb14220ddc0bde3/aspnetcore-runtime-9.0.2-linux-arm64.tar.gz"; + hash = "sha512-qpXtOW5QEst4Fdsl8HsZYmG5Hkyi57oHNSiW4as1GpYjL9tpL73h0d3RyRaYc1PS0zgunha9epfOS0EcZCbg9g=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/78308995-ac02-4bed-b5c3-eefb06ff907c/795e0c20df95d8c432fda2a189235b67/aspnetcore-runtime-9.0.1-linux-x64.tar.gz"; - hash = "sha512-5fwwk67VdW3q4+YfmLn0uwyEcxnbMMvRZowlEeBlKcL2peGRfsd2/is2ofe7fgCfySX+5X+HaWqNUCpsj13GEw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/36ab7b0d-966a-44ce-ad19-bc0d7e835724/a38c1f97ccc9f4ccce58427c830c32fb/aspnetcore-runtime-9.0.2-linux-x64.tar.gz"; + hash = "sha512-SKOd1L7j5xknOk5EBLVW4uWef2Wd70n4l0WuV1/Jdvfr8SHZJjw9AJ22CBl2+CYcqC3jSu9psHdqKP0EhbttOw=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/2cfd68f3-5259-451d-83b1-6b5e80932813/bae5e023e887e42639426dd0824ac6bf/aspnetcore-runtime-9.0.1-linux-musl-arm.tar.gz"; - hash = "sha512-PqVcxQmNwIkJo4Uhn60eOGNfbu9s1m6lJrkt1X92XcNIOAQi5eC5yK3ihuGOcTyqS3/y0Gojw/7TG4tckdLcaw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/5eeaba7e-4140-4e62-b96c-7223293f3bd5/9d8d51b099c3141cdf63597816bd1eb4/aspnetcore-runtime-9.0.2-linux-musl-arm.tar.gz"; + hash = "sha512-+WpmRC99tVjkBJHx3rpCpYtpcoaoxZLyC5sXAGBAVEw83jhR2+nV3Qvk/2hmZXWhCo4SJdyXBpCBpmcmqfD8iw=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/f3b0e483-26b2-4115-8a8d-983c9b0ca58a/4d0058d82438c8de99347f40d3dee091/aspnetcore-runtime-9.0.1-linux-musl-arm64.tar.gz"; - hash = "sha512-6afiV/awnkjFIrclvoq0mOVxidZof4QKN6uf5BkumFvd2ZpmNBjF1dlu58fCufcOCPeGqkobIHVIWGvT/MNxDg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/07c2a8a7-1b36-4ed3-b8c6-48674ad102e7/ed621013baa55acb77a88013d28ae14d/aspnetcore-runtime-9.0.2-linux-musl-arm64.tar.gz"; + hash = "sha512-XnSHHZEzxSOJVZ6zTugu17j/LumQhX74Dr8rJ8QF4N7hrpUcmoc1UWiQHZis++N71tUW1qC09fSVxYMmJDwGMA=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/d55550d5-16dc-4b17-90c7-e8bf65657e09/b3d4c31dd4c933aaa50e920f5465b111/aspnetcore-runtime-9.0.1-linux-musl-x64.tar.gz"; - hash = "sha512-0/YJGElZhJ91JP37VcXPmoOR0KdzSDqmZZ2bqhUmVoNfJsL+m6Mi5xio63eB+5lutOvGlTvq9v37VijvMb/IUw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/435eb32e-b24f-4c82-b044-6f4b97e7338f/5e79b00ea13180f349e28f127cf1c26a/aspnetcore-runtime-9.0.2-linux-musl-x64.tar.gz"; + hash = "sha512-/wcOv6ux+ndt9pzm+x5pkAaf9uS3ld0OoO4CjczqonhQD2lcm6a2yDkxDuDZqso5jgeevZCB7DbB4tWmPFvBCQ=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/26f85624-0eaf-4edc-a83f-428472ab31df/ba32371bac29f1738b9b0eb959dab0a3/aspnetcore-runtime-9.0.1-osx-arm64.tar.gz"; - hash = "sha512-uKs4mbELhxFZsBiJaUSEzD2bOueKFZY41oZJoiw/Myi5LENcW830moa8SIu70PynFD9vZk9llMVSQjw36tmZmA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/0e3c0776-3b1b-4e34-8dc5-1f764e435f68/3fc575fd1def4bba8258cdf39cf24e35/aspnetcore-runtime-9.0.2-osx-arm64.tar.gz"; + hash = "sha512-ZvzXoFifsWbYXK69bwjBYEm90MrP0Bqz8ZnEQrmNVPhhDCJaKppvUrxLzhK7qKMAHiNokkCZbGl+K8OgCJVyJg=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/6655b880-82dc-43d1-b5b2-f76d6a3c431c/4752d9d4811a2148de7eef5dcfd08441/aspnetcore-runtime-9.0.1-osx-x64.tar.gz"; - hash = "sha512-SusJQ4d9v5NfZVTGN9KqGPjvIulpLmzT1xbd4t1UEeSIF2fL6cVUvY7EPCCahqJhlMJhjGDRFboGOOkugEI8wA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/80ab707c-4568-4bb3-998d-04b1935648dd/cec09318721d7d5e3cdd64e987a1dd8e/aspnetcore-runtime-9.0.2-osx-x64.tar.gz"; + hash = "sha512-Tjt2vEI+kxK1VEn/FWv2UET1ZkRcQQb8RzFFF2UdTVEMBBix+PF4U7HLwUdpEAuEb0FPgNapzuX5X1pvuFR9mg=="; }; }; }; runtime_9_0 = buildNetRuntime { - version = "9.0.1"; + version = "9.0.2"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/f8762afd-ce2a-461c-9280-0f6c377b92a7/9ca2330917e1ed7dadd5f1838b6ba44d/dotnet-runtime-9.0.1-linux-arm.tar.gz"; - hash = "sha512-sczLhtqZEvy4FkE3GOJk2Jnp78QqGf2KbMuCZbZc5P6Mh40LjVwGM7Hg5LL/PuUzE6ZuP5LDsVP73+METxvMlg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/6ad62cc2-7db5-4961-9192-84d50536b636/19e78b86ce8b40becdca65a7b7e8d8df/dotnet-runtime-9.0.2-linux-arm.tar.gz"; + hash = "sha512-vjG3kMilNHwaf7dey7qxbGdf9eY1JWFjEiC5TUF/Ge7QciDVw5cpBRI3BN1r1n0AE4/0JISBXg3vfYrZFqMNlA=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/8a8a85c8-3364-42e4-a9fa-bc4d33e4a263/cb6b67c1ef5a8fd779dc43096c1f2a14/dotnet-runtime-9.0.1-linux-arm64.tar.gz"; - hash = "sha512-ODmbYTn3LvHYNuQYRVSUqAQov0HzqvI1F0n/FEMRdmSHUz1aPJvTWcGJuTc/JDd66IaCf0UnLEAZ4itZR3O4ew=="; + url = "https://download.visualstudio.microsoft.com/download/pr/3658cac0-6e40-4467-af08-02cf5bc0309c/ad2d0efa6e2bf05fd1078182d232f052/dotnet-runtime-9.0.2-linux-arm64.tar.gz"; + hash = "sha512-RgEz3cJYKiCb2AZzch57mt0rmyln7xUDp9wpvid3hwhwmQ7nVJNR6CB8Pj6E2r7KbVvbvep15ePnSesWvRPn7w=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/4ec0d4e4-9774-4d69-b9a2-db99ccb24a1a/b108f97029f83c8a27d041e90583ba5c/dotnet-runtime-9.0.1-linux-x64.tar.gz"; - hash = "sha512-1KMZRKWrBjA33KUUHbyEZtDIlLjSVgJWeCvb5ajoZYXoxMeJxA++UdVrOFPhWtugmFvcaukchadjVlMW4cPPyw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/a15e92d8-e1db-402c-b06d-b6dcf7ad58eb/8c4233bceadcf8f57b40f64aceda69f7/dotnet-runtime-9.0.2-linux-x64.tar.gz"; + hash = "sha512-3EryTV0pg5L9U0kaVsbU49HoXj4pTLSoSMesjw3OKH8R3LJ08Y+V99txlWgThuXGsNmVAICMGz5oucYJejSE1w=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/391e3ee0-16aa-4294-8641-3438307e624d/d244e58fbeff1482b0f8d3aacc6cc621/dotnet-runtime-9.0.1-linux-musl-arm.tar.gz"; - hash = "sha512-rIp746sIlVOYE8H2fDOqk+5y4qx/LYjuPKIfFEeeEaQGTN6afhWilEIiuNfChY3dOd6fbC0ni0Ep9eO6i5w44w=="; + url = "https://download.visualstudio.microsoft.com/download/pr/efa5ec39-7af0-4941-9886-6c37758df9cd/9b0910cf8f0be4645fd7bde1f2665e5c/dotnet-runtime-9.0.2-linux-musl-arm.tar.gz"; + hash = "sha512-OOA9jBL6RSDjEc8tFfssLw4BnHFlsT/L5Y/EaRR0Ps6o4KxNkUOFsUMM+14N89timUJM/czqb/5GmmgeLZ2Ttw=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/966184c6-ae9d-42d9-a5d6-1f14c46ffafd/fc65efc3447d3f1dced1c156742be6fa/dotnet-runtime-9.0.1-linux-musl-arm64.tar.gz"; - hash = "sha512-z2hldU48KLY79Oc9uVogeQKLkTL/xr7kqnrwPuFcdWChPQcmCWWDO0OYXYteL1Cndv8Xv1NDYFscG8I53a88XA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/5a74dfdf-3b5d-4e92-bd17-878401c55dd5/a9fcf25e0571144a1cf08b23da3476fc/dotnet-runtime-9.0.2-linux-musl-arm64.tar.gz"; + hash = "sha512-C7DcekOIxbldT+yf58oSc/mvpQICHHPrlG7Sko1tbQg2QUQA9mfv8w2pe4OwT2bTAywjRLslhwB7QAHXW2lqFg=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/dec9d9de-effe-48df-83b1-0c83f54e4cbc/cfe914fe2e2e9edb6138ce9328051f10/dotnet-runtime-9.0.1-linux-musl-x64.tar.gz"; - hash = "sha512-ObxzvnEq/KtBQlwuQqpQmBM8+aIID5HUxl8nTCxrxvgSeToX+O1rOlvKveTMXuW+g9yb750/OxDXnQ0/ALS1Xw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/e848109e-b3a7-4496-ae31-345b92345a81/78db157b0850dd7d9ce22c908d53154f/dotnet-runtime-9.0.2-linux-musl-x64.tar.gz"; + hash = "sha512-3xFu+bf2txe3x/BX6CbJ4fHtDXQ/prJukin8NuUAq4NNGa4atV68KLHJuMtKf0HGLt0Iwt0s3LbpEt7+ooEP+w=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/5c1d13ac-90d1-4f76-bcb1-d404b1ef6748/137435417c82ec2a5a519555b93b2344/dotnet-runtime-9.0.1-osx-arm64.tar.gz"; - hash = "sha512-9l9lDuPCicoJL6FRo9nPNP6i9UJvCYgsGU/nFlXsrypoGy1Qi5x4SdbJCMpnliXcSBcdAFgM3/f5gfBRioQ8ZQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/4e559996-ff59-4cdb-8a91-e6c7d7235f4e/e5766287ef607672cc47be8119afc28a/dotnet-runtime-9.0.2-osx-arm64.tar.gz"; + hash = "sha512-WtiQMRYHpfsU+aZBA6zXY4V4Hkt1CFqOdV2kdP/B1Qcwu4Bk6Lr7EXr9udBM6svVhFJTnx4OY74LlzHhn9ZRVg=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/36d3662e-b23c-46cb-994c-3a46bf2b9759/2c090a2be99f96cb33a56183e747e27b/dotnet-runtime-9.0.1-osx-x64.tar.gz"; - hash = "sha512-uZfCwPA1DvKbpuhlrAnr7LHTYy4qdWG1q+I70PtqvIwMpziNbPF8WcqH3YFoYE3taDmnsWzqGvvjbKVyNFFeGw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/b5a5d3a4-2054-499f-99e2-cf64bbc7ad24/bf987a5f19a84196621b725b9e41b332/dotnet-runtime-9.0.2-osx-x64.tar.gz"; + hash = "sha512-q+B1LzQ3zg4kFdH3CHm2sGLf2lkSjvW5bblGY5tQalTKyBhFtnddGQFNUicavrjfqs/reDRSuY9mJlxe+xs7VQ=="; }; }; }; - sdk_9_0_1xx = buildNetSdk { - version = "9.0.102"; + sdk_9_0_2xx = buildNetSdk { + version = "9.0.200"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/8f7ff743-f739-4b7c-835b-9405b3f7604f/b903530c774c08f30d3de3029f2e0bf9/dotnet-sdk-9.0.102-linux-arm.tar.gz"; - hash = "sha512-LExp1Gw+V+2ZBRip2CljZl2DXGalfaVLnSHiLCog6AGAINyxkO71Tf5owAH8zjhTYesr0piWMRoWg1mf+eandw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/3dde7d92-2a9d-44a5-8e83-6ef57d976c93/dddb3f71a8145f2729c38570694f95c3/dotnet-sdk-9.0.200-linux-arm.tar.gz"; + hash = "sha512-R2qaaGryNEguqZ71P9Gjtr1l5O9fJOseLpS2DxRue357mVGaZqiWg2aC5wIAcCegThDt6Ff8RUDDuuVrFss3gA=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/555b12ca-d25f-4d4a-8c62-03b57998981e/b8f8f88c7809ea6c0e1d127deb18d8c6/dotnet-sdk-9.0.102-linux-arm64.tar.gz"; - hash = "sha512-y3iTHcu5SKUEiR8RLxEhXyeS0WnwoLU+qoHAP8S6eNMakcYKQYCa5uLdyuhkAIWhWeSSA1zt/aaNJlu+tL+LLg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/b94570d9-8cb1-4672-be62-4acaa8675749/2697b4ae3923b16e72f6443f30333f5d/dotnet-sdk-9.0.200-linux-arm64.tar.gz"; + hash = "sha512-wtGGRCQ9Z9EDRxcT8Om6ZZ3wwNXgmL1EExBBjdA3mNalqFOdp8jMMg1XCFwZPHU/94vf+Kl6l8UfUAQzU4+3Ig=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/0e717d01-aad7-475a-8b67-50c59cf043b1/6eaa1c636e15ec8e1b97b3438360c770/dotnet-sdk-9.0.102-linux-x64.tar.gz"; - hash = "sha512-8JNQfvY1w/jlcr97bqfhRLhcz2t8b5FNPxgveCIApgiHKGY99cmr4GOMm9Jz/eN2nsgkplFvX85zTEpGZM4wmQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/3606de37-1325-4f5f-bbe9-1bc44b3c1c7f/91872629e9f0c205cace9c462d5e89a4/dotnet-sdk-9.0.200-linux-x64.tar.gz"; + hash = "sha512-GvXzpERBmz9c+ZywPudAciciR4Im0K/yetQbHRHmnXNJfiXAfvBqbfnnP7D73EubrKmszslWVNnue+TVpcOsIw=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/db81a835-d9dc-4094-9c5c-cda20e684556/2d80354042afe6c8a2ef2f54c48a86cf/dotnet-sdk-9.0.102-linux-musl-arm.tar.gz"; - hash = "sha512-42Pj1O3Kk4MNGLzr1B4BvyhWsJWucOGiSwUzq7ClB+TB8VQv8wRsKFaJMY2sfitccaFmvLWTOoq2jYAL8+7fAw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/f65430d6-4ddf-4ed4-a91c-025933457f61/8e0766a17389dd840585ddc440431e19/dotnet-sdk-9.0.200-linux-musl-arm.tar.gz"; + hash = "sha512-QpftO08RLh1kpmF8uWGRv7Tr9qX70Bx13mwFkolxc/ARrvPZvn5hc44MjOi6GBWwbyjgwlHIQPLg3iYw02YWyg=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/a35ae2c2-e906-4bb1-b12a-a9d435231626/d0da093a240d41c06da2f49dc3011a13/dotnet-sdk-9.0.102-linux-musl-arm64.tar.gz"; - hash = "sha512-XamORsKA4hw3NKDJCB5923itYndaUaEptCpvAhMw0mOoddovRKeq/oFW58muD5uyG1AgV2krNg8q/giC8OYRMg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/071e3ccf-eb10-4658-814b-c86dc60525ee/2ef91c84593fb6f465082ee069502085/dotnet-sdk-9.0.200-linux-musl-arm64.tar.gz"; + hash = "sha512-8acIB+Cite4nK91xRTWi+j0xu4wiFrQ8FRpyyzZPZKb4k1kLruvH37K3j/UOS6EcPkyt8Rx1dEQE/vq9x/8I2w=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/5e11d2af-f335-44f6-90a0-a99cdf806855/97268da6caffc1e8182525c7a2f01b74/dotnet-sdk-9.0.102-linux-musl-x64.tar.gz"; - hash = "sha512-YOCRhU0X2ppgEVafCkgZ6scs5v4G0BdX/uuDrVbBdkX6Q4JXYx7Lv27pSsOpc+/5rU0+Et6t2j60HBtpyo1TCA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/625fe095-f8b3-4666-a4ab-b44931f482bf/bbc206404c3e402749523e37063931b3/dotnet-sdk-9.0.200-linux-musl-x64.tar.gz"; + hash = "sha512-lrAy1SCag46XUiUolj4ulYn4OE3/QpLlZwMLDaCEkQSlfNbQ8F5ft+d4dzD0fGESoBTfF8dgEIZPVcEQqXHyFg=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/1b4a1593-695b-4496-aa2a-55fa572bd71a/3b44622f52d4695513dff04f0bbcc404/dotnet-sdk-9.0.102-osx-arm64.tar.gz"; - hash = "sha512-E2MsnljY+kbxkSVtGA7RkIngiyQogYJd02gvCC1lvMbZdWYp/v2rYJwRJltgQ9wRY1Jj/odhM5ty02YIrLQ1dA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/be46fe4d-4225-4681-a301-8d2bd5c2e044/362014a73e57d02b9ffce618c5ab46e9/dotnet-sdk-9.0.200-osx-arm64.tar.gz"; + hash = "sha512-pF1ab+XwRunNCkSCpB8IhIIpAxNLzS8l+s5x4TInSdrMUyIc7iH4FMYXEybaD2T0IgTr159jOjvRB1wE+nPRvA=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/373e3b64-d88b-4d83-adf3-eb48a6d6e76c/0d24e9cdbb0e75999fc0c17dafb1ea17/dotnet-sdk-9.0.102-osx-x64.tar.gz"; - hash = "sha512-Aj6RC2SBmZGDGqDlMEQ/qYX6Zzkg/ykVQa17ekpTLiD1rIn5qRsulWz2mzgh7xNpgoz0bFROGDqFQlrktyXhhw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/9983e36c-5e9f-4895-8f56-1d0a61cfa9cf/945b1788d8624457b631a383d55f109b/dotnet-sdk-9.0.200-osx-x64.tar.gz"; + hash = "sha512-84pkHRfe3wviTHIcxPeHhAUM1RhPtcxsBMSy5vdgLFX8WjyA3PKh317Fmu2tQpR3IFEPB7KzxZthhbka/yAQrg=="; }; }; inherit commonPackages hostPackages targetPackages; @@ -522,5 +522,46 @@ rec { aspnetcore = aspnetcore_9_0; }; - sdk_9_0 = sdk_9_0_1xx; + sdk_9_0_1xx = buildNetSdk { + version = "9.0.103"; + srcs = { + linux-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/c2cb3c08-be1a-4b0f-95f3-3c2b2c2371fb/04c3b5830bb78065424666956d65a503/dotnet-sdk-9.0.103-linux-arm.tar.gz"; + hash = "sha512-m53bvYoJDuePQFdqyfPaylpoRe45RIsQw7tRsrT55+CpebagDDHaCPPmhgH6d6aHpVbQecGdUyruTX8lvJ8TyQ=="; + }; + linux-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/226328f5-ac73-4daa-99dc-04961042c422/18787af4ca8bd7d646534c559e4a3c75/dotnet-sdk-9.0.103-linux-arm64.tar.gz"; + hash = "sha512-MrVJTndokIbo1bk2Q05Oh6jYgDn3fDOB2WWSdX59cW9Y3hAD/kHH7zogiTZqMgUYf1bXM9X50vFQXYOxwW06Cw=="; + }; + linux-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/053d1161-da60-4c43-bcf4-cfb91d3d3201/18cad0308294c91e3ca9913a33cb4371/dotnet-sdk-9.0.103-linux-x64.tar.gz"; + hash = "sha512-r9pIc2XPLQgvHcRi/wFgfq4QZX3oKBxTxOh3XfcvXtWzG0J+qK/QkXiG5zsQSiXbTGB+BRD4vjp2HelEXXl7dQ=="; + }; + linux-musl-arm = { + url = "https://download.visualstudio.microsoft.com/download/pr/63a41de4-93be-4cbd-ac13-93d1feec6a30/a6bb2018d1a952daadf70852064686c9/dotnet-sdk-9.0.103-linux-musl-arm.tar.gz"; + hash = "sha512-ZjwzUe2w04sl+oVL4JKiz3tv79Vo9NdFj/QHQLljdgU5C0ikrNuzVkDUDcnv5mam7ilH8Q/pyaFrl0P9dbzw0A=="; + }; + linux-musl-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/bac1de02-acf7-442c-9caa-5267f24060c0/e94ab7e0015a34f7a76d33d3d0955fbf/dotnet-sdk-9.0.103-linux-musl-arm64.tar.gz"; + hash = "sha512-vMUBmDH5Y22BqHNp4c9W5w3FLCmT62RGj2IClimmEDM7I8IGLj+TZHvry9994qrvp+nJbW6W7BYeOnRXZq4Qnw=="; + }; + linux-musl-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/0211b6cf-e6b2-4034-b2a4-f47828046fe3/fcbc490417d2ea0114a74aafbb46b92b/dotnet-sdk-9.0.103-linux-musl-x64.tar.gz"; + hash = "sha512-rE4hFvmZmfJJwpDpqHxij2I29Zxl63Zyu7SEzBFZv3OclYXa2AtQ/3JzNeS/Ym4XWRMVaxOig/F12uf2qWWlQg=="; + }; + osx-arm64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/c54a9a42-e212-42ce-b00e-ac352d2fc848/3cbf76fac85c39e1eb8ba4a4bd9fcd55/dotnet-sdk-9.0.103-osx-arm64.tar.gz"; + hash = "sha512-UvKdGPd4m8U9FbDh6WuDuIEerss+tgNd+5Ti0vK7GgEdCLRpEoBaKGDFdJE60zj18ICK1mMQ3YfPeBY8OwJZJQ=="; + }; + osx-x64 = { + url = "https://download.visualstudio.microsoft.com/download/pr/7306a1d9-153d-4417-9d94-950e2d2d0426/fa4dfb44bce429d39ebbc916e949c3cf/dotnet-sdk-9.0.103-osx-x64.tar.gz"; + hash = "sha512-es76FxqsumY1idXJ6tCAqAjuYGlreJzomv+I4GJvIIXTKhmBVKfslKjNXNJy9wvVfhmYGbPsiZl+pS48D2uW8A=="; + }; + }; + inherit commonPackages hostPackages targetPackages; + runtime = runtime_9_0; + aspnetcore = aspnetcore_9_0; + }; + + sdk_9_0 = sdk_9_0_2xx; } From 8d8a9543b21cb6fb5a1cd0536448da95b1df046e Mon Sep 17 00:00:00 2001 From: David McFarland Date: Wed, 12 Feb 2025 14:36:35 +0000 Subject: [PATCH 0915/1107] dotnetCorePackages.dotnet_8.vmr: 8.0.12 -> 8.0.13 --- .../compilers/dotnet/8/bootstrap-sdk.nix | 552 +++++++++--------- pkgs/development/compilers/dotnet/8/deps.json | 48 +- .../compilers/dotnet/8/release-info.json | 6 +- .../compilers/dotnet/8/release.json | 12 +- 4 files changed, 309 insertions(+), 309 deletions(-) diff --git a/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix index aaa4241b8297..6c9b7f9dac2f 100644 --- a/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix +++ b/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix @@ -11,43 +11,43 @@ let commonPackages = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; - version = "8.0.11"; - hash = "sha512-0ow+3BClZm2xlEXC7g+vr7vxmBkXnNwxjCSqhxCcPqRHkXYNW1rdHmzrCLmGYRzGFxk7wktqOUkRV0ipgSQXOw=="; + version = "8.0.12"; + hash = "sha512-IU0eI4OrQYkabBlA2WpJTv4ySiWm9d7fnnX99k4m1aEq1XnffJIg+a2YOHwbJRR94GdQMHTb0Ug87OdX10Z+JQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; - version = "8.0.11"; - hash = "sha512-hRfXvd55c2xE9g3qOegrES0SkqFFKFid/wScWpANLT/yf6wEV6bn7c7cPrE/fyuw6MiaT86noYsGzj4WWezYuA=="; + version = "8.0.12"; + hash = "sha512-vX8WpwQ9zE4VMheMIXm8pvQL1BYAvTTFeDxuiZ2U7edUHl+dTBA2gizqKG5x8nVJ+hBLEOnd6NVe/IQ/4jJZQA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; - version = "8.0.11"; - hash = "sha512-oMIPTmsRuaFIosXYWzEHFCu2pQK0JdtkuQdT4j1szfZ8BVTHtYsBqWdjGV3u9uaWiJld6V7FanVVU+Z8HWFQ6Q=="; + version = "8.0.12"; + hash = "sha512-Njr8IyfftNDLVifJfppsfU8Fq0e/HM/dkll9pVVZGyEzFyaQVN2irOcwdLXxZeH/npWaBD0x9T3980vhkMbt+A=="; }) (fetchNupkg { pname = "Microsoft.NETCore.DotNetHost"; - version = "8.0.11"; - hash = "sha512-bknpGqBWIN0R0hiUU6VhrrCEY4T0P2F953t1AyPlt2LfzRij921w+I+zPhAlA3CRWDgq8ppX5iJTPhabnjrBSg=="; + version = "8.0.12"; + hash = "sha512-8rjYi83EF7eBOT1xfUkQA3QxH1sZ3GDbVwX4keXHE2x5PTVg93AdNymis+6hrng1cRCmsQHXqLd7TKYaBv+IZQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.11"; - hash = "sha512-QRSkkJ5ECtxL/pOBwqS2h+WY01Z5SYOLnL82cP6li8jpeP/h9TnClUjovMa5hk/ny3FM79J1cwIIwuSTGgv6kA=="; + version = "8.0.12"; + hash = "sha512-QO0rXIEDNJxhuxwu5DG9dSy9z2zgb2rkzQ1chPRwTKc6DQ6aM/Am9ip/ZGctBwOkd+U//rk3mAtiyt4urSkFtA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.11"; - hash = "sha512-mOgsZb1/yibFbb4nwVCvPk7KCa7S671zqjKdQGvwBxwr2vF20SW4Yw9me7bo9XMXHgR+25GlMnf3nKXkO/jgaw=="; + version = "8.0.12"; + hash = "sha512-62zfQPVBxlPMyBXwGoxtjGa6wG+3X7DxDBMUeXVkazAvmskE6K3oDlxizpvicC/ixs9qP9XfPG29Xnk4C2OO8g=="; }) (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; - version = "8.0.11"; - hash = "sha512-MrWOJYbQCVUn4yAcAfRBekLNhAs/UPNlPOUCXq/HwTX0wLqT4Rcgg5MIlzA6w3QIGmLWHMh60QOmEFdUXjwghw=="; + version = "8.0.12"; + hash = "sha512-r6NUtAtfVD/yrl5I32Tgvp2omJeEudvcJKHP4P48QAq4yTcNxfIwSrnpTNala4rdesPN0oCT1EVYjjM5Zsx90w=="; }) (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; - version = "8.0.11"; - hash = "sha512-BDUnx2LSv8CWK3WAbPnNWt7deVdLBn4VZ5ZNUSRg4WN/Wi1x+M4WQgd2yrW+qnSSR5ll9AKhWNUsiGVWf+OsaQ=="; + version = "8.0.12"; + hash = "sha512-x8415TsDFy1pMt6c/PvjO6N42DxS8H53M8dfXgtAETiXAhZAx20mR35MshFn/LFP1TIgk92F3XEn4jzN8alWbQ=="; }) ]; @@ -55,118 +55,118 @@ let linux-arm = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; - version = "8.0.11"; - hash = "sha512-vNLg/on8vgsoDhsYxvU724nX9g1vmD8/GaaTHpNr9953L3/hkmoyuXU6V4BL0iZsz/IDcRNs1cFlMqVHaDWzSw=="; + version = "8.0.12"; + hash = "sha512-+mObcz+CfLpcmBUBLi0dkPyapyBWusj1xBBuEZz8Aeka6MWy5WS2ln2Tes4tKv4HKdbEQZJjI9wDH+9P+7GJdA=="; }) ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; - version = "8.0.11"; - hash = "sha512-Fwm4IFjRnNtoHDEhwHcK5esu8kxznT+aZYRe7T5/7HHwaHOZYwnwVAb+1yG9zmpWsQAwVCy2Dy98T/KuraxY2Q=="; + version = "8.0.12"; + hash = "sha512-SpNIfhe1CdGsbt6F7iP0rKJZ+4qPJug3l2T33XospN7AGhHewHIQadRQqG/dQBab1e1ur3w8dCnmYlf/48gymA=="; }) (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; - version = "8.0.11"; - hash = "sha512-HCYA8CKNlcAdvJ7xJYPVMFyG2ZklrC/j7HJA5iNm0yI7IOtsBbrWbYbz8glc8h6gT4FrOAPu71IUot9Iika0EQ=="; + version = "8.0.12"; + hash = "sha512-XkM73Yq41AFG1IAwBvusNpSDn8OuPmkJEKJpPFlccX/GYlT5V/LihRlNVS4OHmlJhvklpuro8x+c6arLSnv8qA=="; }) ]; linux-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; - version = "8.0.11"; - hash = "sha512-JuZSeAmow4Xx9+VUnm7TYfSUU/p7l/SjSVoQKdoLdpOHSMm/pnSEOjHc4pKmAr4G6OS3dUgVY/IZyGxtS5g9VA=="; + version = "8.0.12"; + hash = "sha512-ix41sJBqRfoNp3zg2+QBX18XEEwA2iVcGQwrHOOgAM5IcJdbe8wO+K7Hqmb4+gtfonTuVzxf6hvDi32luuSUFw=="; }) (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; - version = "8.0.11"; - hash = "sha512-9epOV/0PK9EYPPXLif6YwQo4O51muFM5iMVZOvOtTDYKN3MYlZcvwKMirJaAkvAhp5o71oRcfQcZc5srkvy4ZA=="; + version = "8.0.12"; + hash = "sha512-fuwAxmHlGgVzoMiqtPeYKaKr7UQQYTOdlHddgduPDArxQRJOHFL/ssRTk+9NcaSkSfK/+CO+iP5yweuX27UH2Q=="; }) ]; linux-musl-arm = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; - version = "8.0.11"; - hash = "sha512-Cm/rntnyMTnImcRzuL5VRpgN5AaoRElhyVi9Q+askyi0GnKX0Y6YPX/xmUIQcCCTOOzz6+i8xLBb85+oemUvGA=="; + version = "8.0.12"; + hash = "sha512-WEZ5f5D7OpmL48PowylsZO0w/bhuVSbvGjO4VtnVlvk+chNeArAd+mocPcBmleNDMu11YoZvEC8wkHvsdfIOCw=="; }) ]; linux-musl-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; - version = "8.0.11"; - hash = "sha512-BSaP3Yvv5DGh/fuoefbPtstxzyz0meQ6F3p33+3HO8YJwX34hSpuINdzUVsRKNoqWbCm4pHy8DmFh0dftCEwyQ=="; + version = "8.0.12"; + hash = "sha512-04gvjzunjfA5J+srNF0ew5KNSNhFwYiZdZ2554nUhG+sO/QtbiTPP9p9QqCqwv3zwf2FYz7/sUuIIC/TFJnPbQ=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; - version = "8.0.11"; - hash = "sha512-XJDQvhTRCV/7UTck+0WHM/YdGuXqvfYXBKv6pvvy7fOqrgv96ozy6XhkAZB1FT/ernqM7C4tBviPKg6u9sWfMw=="; + version = "8.0.12"; + hash = "sha512-BRkp66CwQudTw7WCejICFbAMwOaTrvjc8q2g5yj3uyAZAYDQVG9VC+QmsO7EOvZuX0vuxhWkHNg1u0yAjD/swA=="; }) ]; linux-musl-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; - version = "8.0.11"; - hash = "sha512-uOEs8EvkUOrCae/OGKy4Ek6zeY6HrjN0ppOK2VmcMsiwogP3XkkLjg6/grLiGvhMXbEpXUReSSGPd1wo48W/cg=="; + version = "8.0.12"; + hash = "sha512-WdlGK6tDI5MwJ5BTFpPhfUn1vU1CHP0UVEKnBhHOhihgQaO6Y+Itdu/erLjaEe1JE9aANdKahvLJTIbXqpDRqw=="; }) (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; - version = "8.0.11"; - hash = "sha512-AjkGqrKxLuz0v+29koSdfx8l+9g8l7GCAe45nLvno1BWQaRJp0YZ0watG3Cs5UBQuOHz6QBTpxrtv21ABCn5AQ=="; + version = "8.0.12"; + hash = "sha512-Arv2j2asHvlV6CjMjw5ahVWQGy9To4oolKcm8Lx3P8zPMjewt5M6ubWfndOcIMhLzxtx9QrmLF1HA6xEqo1JXg=="; }) ]; osx-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; - version = "8.0.11"; - hash = "sha512-+ONYpLs/Awwr0JhKj0uTlzV7Dz/w8JDcMWZn/IaODTyboFafxTcQx9zBvZGs2U8pAuDig5jA19tihfZfxtqPSg=="; + version = "8.0.12"; + hash = "sha512-560CmTGtQOStnCIStBedCaPIDxqD4mTLj8W0myxjLUjEai5VwHcdecjhkZ7g6Owx5igQcXdRVhsV1BgRQOfb+Q=="; }) (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; - version = "8.0.11"; - hash = "sha512-ICRHCPlohKZNi2Kxdy7VfHVDcY8GaWg9zapIvVwPbp8y+LIjEHSYBx920gftF+3+eNlOi0Vw4WIYGkBAKhgwzA=="; + version = "8.0.12"; + hash = "sha512-jt6Vtq6RHBHBE7Iwmw7MzCMNvNCp5+Bt3PqTIrQ21IttnpESbcLgVlI0VJAqXxIwsWiRn5hScfSm88CLGSNsfQ=="; }) ]; osx-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; - version = "8.0.11"; - hash = "sha512-9UR5zvygPAvdP92H+iGKqWRyUu1xawnnDo8p1N58mUpt67y6kPdDW4lHZzZg1nn61bgDvS/Wp+jQjmb2+x7ybQ=="; + version = "8.0.12"; + hash = "sha512-0R3R9Y9ipFnYu/kzEOjJt0VZH0JeyJkuWC6kuQIkmpcbElsCPvQWV1Q7x8Ui6od8ixUlL2Cx0o/RCB8ZeKppIA=="; }) (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; - version = "8.0.11"; - hash = "sha512-sOg03F0H7CjWTTFGDNfTsPq5pkziy6GcsAqdaANeh4sGRsRAeANFBp11ewAfk8P0fZVeWoRTaPtGjCZQ9dRpoQ=="; + version = "8.0.12"; + hash = "sha512-fiP4Lp/fMzye0ShKP6IDUA6+4ICvGdKsIXL4Slq72E6+AUlX0dghW6tNc998ErZphdLX2sbsSc1HQnDICutvpA=="; }) ]; win-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; - version = "8.0.11"; - hash = "sha512-NXHH++Pg3fpeFWTISDya9f8JZIvxqdfE3Ebj6tWxmBu/pR5OpDiD6mEwyK6BKuANMYpEAD/mzo/tFzc51IOZEQ=="; + version = "8.0.12"; + hash = "sha512-10ylliwboh/r2RsZ6JxBaGTlgJFijpATV/Fu57wppCvnIs2n47jDPpF1XHGiGkSFVKuMceLTFRC/5rvY03BafQ=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; - version = "8.0.11"; - hash = "sha512-NALt9Nbl6bu/f5ke11Cmc5tF8e3JkUXEzkJAfClel5zW6462xe/0WeqRrTg4MaaiDTga+ve/GYB7AXGrenyB/w=="; + version = "8.0.12"; + hash = "sha512-+anxlvYQUscNCsCFQPGHyADxolr4cJlcvYhe6D9t0gfoJObTwe/N16kUv4nqY4orTGbdOVQTAzK/sP/Peexc3w=="; }) ]; win-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; - version = "8.0.11"; - hash = "sha512-d+8q1xYCNc1PNYfHHzJJXRNHCRM/LnQlfs36LzxeaJzgx2LbBFRzxO/mUKSnDWMAP4i1P4BqqjZ7idjcIxV7uQ=="; + version = "8.0.12"; + hash = "sha512-cZzBGVhiVMMuauiv7cpo5uGmDCJkp/T3bb/ebf4iPuiBoLpzhj3H6MUMExspoifk9YbuUreRBhFPjehxw6ZMLA=="; }) (fetchNupkg { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; - version = "8.0.11"; - hash = "sha512-ZDOVXgkXU+RSEV7lB/WSXkUpdczXANpMGuFToyVZJCuA41DwQwCZoJfVI9cXHStQUaEGn81HOfS6GQsRmEdjGg=="; + version = "8.0.12"; + hash = "sha512-FXRkE1G3pOU96QCaLzoR6bK2GMGVJZG8KYxzWG+6YJExOx8Zp7b2cpVRFmqZVzyu73WtSl/gNDXZ16yJG4csCA=="; }) ]; win-x86 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; - version = "8.0.11"; - hash = "sha512-uEV87iNIuLAont7ESYEPOoF42ZmAlhmU20U3Lx5mwH7iaKt11VjuLeqvhxZKuSkL/ds1+ZzvLHhzAn0c2Z6JPA=="; + version = "8.0.12"; + hash = "sha512-CLYlwkALgB7C/u5shyYTfqq/12Og5oAvQrSB2wNvDAfRNo951HvCOU/wDsXHuIUIdPLlHlLMEAWkpm+NeE/QHw=="; }) ]; }; @@ -175,566 +175,566 @@ let linux-arm = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; - version = "8.0.11"; - hash = "sha512-qiP7GkxUqsROiAZ4NCgYbxP1PrvsTEyiNZZ1WC/MEexzj95xwTioAMbihGOzaB5neB3byZ1aZn9KZ8NA4wn6hQ=="; + version = "8.0.12"; + hash = "sha512-/rSaXqthJBKc6Hpo5XqMDAinY46BfCVeJZpW8FefuPsw1JPj6GcNjzHo/FlkOP1/1quDhIIwR2yibukE+4VW3g=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; - version = "8.0.11"; - hash = "sha512-ukSAJJxyz+arYNuzXsP2om0or3f+d2cu1kHvWfe79JmaBzAmT3kBObCa3tYVsrtNZ4ck2g9fN4JnV8zsFvw/bg=="; + version = "8.0.12"; + hash = "sha512-Ht+5l1Kt2IUJ/CUj4hDt1mG27X3idPvCIjt2bCFp0Kohi0vwg1KyIhn71O4T25TGjgeIVksMYnui206PyHv3Kw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; - version = "8.0.11"; - hash = "sha512-nATBKJ9/Suku621bOi+AVmQTRcVyyjGFOZattJROHnv3FsvrhY4hmuZXf8jNbKAgSgqYdHxLvgLX2bqBqzwKHQ=="; + version = "8.0.12"; + hash = "sha512-kAYDaWNT7LpzButcbGML1KWVJPpiMT4AB45Ky5p+8rUS7qgItUEEgFXWUoxLoIUv33I83ltnBdk1YvK7wls3FA=="; }) (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.11"; - hash = "sha512-TI00Komhy29vOUv8/UC8RJNnSro7/X7rQ2J/8b4cCaVyRCYr7URV3cuuJYANasSV/lkjSoEuhpRXtnDCIUIYPQ=="; + version = "8.0.12"; + hash = "sha512-e9HuZf9u4oqAV546suSM5gxxL4ya26j78ZoCvg3Q2I7jFwjiqIY5nX2gKNsCqnZvI6QmFcppdtB3pRu1fgKivw=="; }) (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; - version = "8.0.11"; - hash = "sha512-eLPVwuPLnr4PZagAVBlVJOH/P5QYCdb0nwbq+Y8N6pePLzeexQmKs8FrXjdWEdtDQOtsgm5Rvw/2Y9eWCXUYFA=="; + version = "8.0.12"; + hash = "sha512-j6SeFxXVMtQmKPQm+cFQyxmreOhqBPxgj/s1Ox/iBjmsfmjZCacPhvZaXBHOAIlofm1Cu7AHw4c/jNti/nmVVg=="; }) (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.11"; - hash = "sha512-FqZlpdIhuhfAgzy7VC/r7xtiMML3hERUGXQ2rWxPgTArAo7puYXfPBjROmU1JYCXiaTd7uXBbrkSaFIbl9srwQ=="; + version = "8.0.12"; + hash = "sha512-/VNEwbjjJt8LZamwsKfNulK2eGARbzi1m37Ci3csBXturaOHvhXzECAZvcriPumALGVFBO3Lc3WSs6rsubxiaQ=="; }) (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.11"; - hash = "sha512-rs+Z0i4ZMj/9oacyL3hyKgNm/2qRtC6NfAciF+vdaG9HxmAdGTooCOYZEJutKs8KByZn80eVKtxwtPNuRV/5wQ=="; + version = "8.0.12"; + hash = "sha512-Hv1gGAnrlwk5LoeZeudMJd2G69oI2jJzppWGJGSvXJyHus6XmsVvQwd8276rTm9o95GJzNi6kRwYJ6xLVrCixA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; - version = "8.0.11"; - hash = "sha512-TEN2ZHFkIvbQwl/tu7cskgdRzzrqEvhzB1zhkmtN3FKO9h2KvtQqEuOc3+sEZj2RHGqUYGFvT5JyiEp2jfK0xA=="; + version = "8.0.12"; + hash = "sha512-hRd6hmc60sbTQO25kWoW/y2htMTzWLlk3GMQHjZUxB0b9F6JqzTo1UBmbqkAfZTCrDQ+redeyibbAJ1CdoGIyQ=="; }) ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; - version = "8.0.11"; - hash = "sha512-z6lwljPpEYS90GGVG/SA5m2oYXU4Tjo1zMnrvHaPIHeFgHvEhij9QQHs9jNqlJX7ycsCrqPAuVQ8Auc/uW+0+A=="; + version = "8.0.12"; + hash = "sha512-DwGq22s4EZo9VMySm0cxAJ2kyHDQzEh0o0N3m7HyoMfdy3BxQFOoO6RGR8HSvpmBk3uPQbIOX73uv4GP2QhJeA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; - version = "8.0.11"; - hash = "sha512-YpkUhlr8il3zMSVx/7Q9ZFl7CS3x/tcgdSI2wAXyoKxIw6NOj1l7ilEBdq2qJ1nPZFbgc5JfTUJTBMG6ahSzsA=="; + version = "8.0.12"; + hash = "sha512-mJaqr8IqCRiVBf1J2isll8Ay/4R43FgDxPAT5B/NQl+hm2xhp55qyiFSIwLSHF7bmeDyneEFDFi+BzTNQ6KB0A=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; - version = "8.0.11"; - hash = "sha512-1A65EZfcbAjJ4sxycI+rke3saNMiWglG6NTxhZ5TEDRhlHy4l8Ft/GPnwofFBD5y8sDs5Hbs318q5XVbpqEL2A=="; + version = "8.0.12"; + hash = "sha512-8Z0UJe07s/eoPjnyRxA8VshWA3eKTeQRc4BotwZcsgVblxCJPJGAmTFgKuEs3xwTxanuGJPqp2T0FQiSSFb5cQ=="; }) (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.11"; - hash = "sha512-J2Yd5bSkcY7V1wRXmkR8pDxbiZBoPp9NOs1j9TJbJ0fDKaGxCq0pAneU7OXt+F57BM+4ZGbF9VaYCYw9M8h1dw=="; + version = "8.0.12"; + hash = "sha512-agI+Lgn5CaY9okxs9ab3UH6IN7lAHdE86WjPxU69YvtDJIA9Q6efR13fb6cKAU+6/+Vc/SCE4fQm0AKC7hQSlg=="; }) (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; - version = "8.0.11"; - hash = "sha512-k4fuLpGJEZF/X3kuUffTXMOUeq0JyANojJn63IpTeODTkXg17UhFgPy4CpnpHqfL+7PJYn5JHRY5WI5DZqG9vQ=="; + version = "8.0.12"; + hash = "sha512-tPEWNfOGZVqbHJIIO9nCozIVLdLwvj4ZGAAnBnSG0Zcv+cmXic7ptK/Lta9iUYhVTUUVIGmSRsfyC5ggDAn3IA=="; }) (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.11"; - hash = "sha512-RSuEuq0f1sjyXMQLoCykoFakvuztp0XsVwp1r5xTSvtUq1e5sYEIN5DK7hqFhVXCfb0TM7GkwsaHCmIAjgW7dQ=="; + version = "8.0.12"; + hash = "sha512-BvGOuh3A5AuiGbyjOu3e85/+4SBWS5AtLLZkpCfQIXY2KAUP/vt3aBSXn0HwNaaXUWrcq0NHyA5wvZ5M4QCSYA=="; }) (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.11"; - hash = "sha512-Uro1N0GVumpdj0SLieARjzuvnw+94i1TVK6jOmRZd4EZx3eJlHPD+d/HXjT4FOanVRg3LqlzjLZuMk5nNfJzHQ=="; + version = "8.0.12"; + hash = "sha512-RM2A3428VuPrCnAapYC08K1t/trGBC9iqe9Htcq36CMtwhzyV0XWK5diWmDhk4dLAdH3v2tjhePfUx76TFI5Ww=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; - version = "8.0.11"; - hash = "sha512-qB2NfZk+EYPkLCRSXhVh6xnVsTAsXGBXcB55e7nKxB8d3+LDYOcYWy0L/njBZi/3oBbEFPhwTrTfVpiHLrmigA=="; + version = "8.0.12"; + hash = "sha512-RyibsHCts+wVGYxBzkPRkVJEMLzLCZpV/Fa6csnuIIixvvqMwUornjrMVNcXMRq+0HBIlJAgFwcWK7ge2uBmxw=="; }) ]; linux-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "8.0.11"; - hash = "sha512-U3PF933HdVRLctSZQQHKwGGMqIVRikS5KM2IgIb5KH9zoXrzZCprAXJCvrZQDoOtaKOn+euyF+gy69CveB+gOw=="; + version = "8.0.12"; + hash = "sha512-67ytUxCcDyaCmVkIo3J5bChFKDJf3CIjJMtBJ+1wnaGqyavoHs9c3kGeppVu+FOyxbduKHNC35IxhtMfr3DEMA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; - version = "8.0.11"; - hash = "sha512-CYyQU33vn02h5xowEBEfRXIcLYm6GyXGhLmrDUJiHjJOZkAca1mbJZ39Fal/pEhzosnSN53Ld+HRGxe+9yijWg=="; + version = "8.0.12"; + hash = "sha512-cq5S411xb/jEUFPNlwoDV6PLKbCYmDHujelob530CaYP6/UfiI/Y4vqpyBySG2za+Y41vazDEBw/5Hc2u1sZ6w=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; - version = "8.0.11"; - hash = "sha512-gQyj1KtYGgFJWTn4tTM1bH4xvTyVyk5pLCYZHlkYmfXwo1oDVvLrXiOC3rKdHxA+c8tRePJsNDIQKIAlJlmgAg=="; + version = "8.0.12"; + hash = "sha512-jan6vGT7vg8fbtNyJnmEk3jYNTbRnzxx2b37RMZSaub96HLnRARe8EHt+lFmjyxj39BRC9izrxW1GDEUebz6rA=="; }) (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.11"; - hash = "sha512-bH0iaT0WlU2WXpStLFzqv2BsG8kVt5znYQ5S+7PGzZjTN8OSo9VfacgwL+NrP4yGZEir/RCqx5YRymm/ttKZUA=="; + version = "8.0.12"; + hash = "sha512-h3yV4ya3atlf59IJ6H5Eo0+zxX9aYNZAsNJHOZGO1Z9/n6eFrKtgjaBDR3tB4K6/SPjFYrmKfPAPWVkQ40zszQ=="; }) (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; - version = "8.0.11"; - hash = "sha512-RUhpon8Kanv+g0dP7DvXMIbJbxcQCrxgZZA8C4w/eRHvprvldOW9laat2DdF+c5Yxkz4gs1rarfX5Hys3hLCqw=="; + version = "8.0.12"; + hash = "sha512-/Udpwhuv8ukIken2Klg8k/i5lImdl7Zo103aUoZyxcFotGM70cZjEfD8wSgZ5uuybnyvHxK//rU1L7B+2DLlhw=="; }) (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.11"; - hash = "sha512-J2l2TxZcxtK8dHPdT0BZVlsf2dkPUvfq/PnkzprQBrePbvtTbpaGv6HYfShUHzUS6lAb8oPx8E36fj25T2TzYg=="; + version = "8.0.12"; + hash = "sha512-IVQ7bb/+Ay4oTDGrpbBzmLPibWQ1eKQ07xTE+KqFqF1jC/vEWcsVDWQAxTm7c1OVU3rM018flvE6x4oSwMP9PA=="; }) (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.11"; - hash = "sha512-Z8yrkHD415e1ZTpXvPTG19DkfR9DBafXwx2Bqmy6adx6maWlzZqrppk7IgfmCobas4nNnI1INBKXvDxxYm4Ziw=="; + version = "8.0.12"; + hash = "sha512-7U+tpgXW2+obU+S4SJck81AAri52F1YjfIl5m9fWumni7FLqKiNsWGl3s5AoGy+IwApTBHymKdCrsZcU2uEELg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; - version = "8.0.11"; - hash = "sha512-rDMKYcBghoj2gWaUeWYZXNuNuO1HWbu9vEaHjyl6Y0o/OSIy2T3em3NZdc38OfG9dykCz4pgT9tdD6BZ7Ivwhw=="; + version = "8.0.12"; + hash = "sha512-8D6h096yNgQwd+2sUneE/ne2Po9n9eoVXTL1Pjt3oLhHjB+spEz0VBKtHv5u6ZTNlxiigkhZxYYQmgkidqHvZw=="; }) ]; linux-musl-arm = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; - version = "8.0.11"; - hash = "sha512-ensFnmyolPu1SHBFsxfnxrI+ldHqN6n62eS0+MXZ+kaMAfnyQtYT3u3NXWanHZHgXKdlV8+9+T2KvOpQUXdu3g=="; + version = "8.0.12"; + hash = "sha512-dnof4ysabawNHR/GHmDPhDJNNVIo04vtfe6hdV93bCHodwH8mSXA3+q1wPgtgVVhRH7o8ivabTZtVlCrEDQsRw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; - version = "8.0.11"; - hash = "sha512-DioWImEMGjRM4UN+7on+2VK7D/kv3vVGGaPAIoLNw3JYhJylj1Y2AqSd1uwQ9a3WGU/7amRAcTMX2p1/NMxWCQ=="; + version = "8.0.12"; + hash = "sha512-UNHaTj1t8NSwSuBZt2+M4iFFSsXUwrWxGakl/cfxe5Q9O5byqeTgRncZeYoXJccnZocBb0/KJEukSLUq//uwnA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; - version = "8.0.11"; - hash = "sha512-AB/BBjg1QmNjKix97nGsnyYALk3ABZAtqbkLTxKlC/GVuITZ05cQOKfKbbHLgYAiKZQtDPG/XMiEt7UTpm8BFQ=="; + version = "8.0.12"; + hash = "sha512-KYeu+MHDm9YuXW6r48+6y16K6luIA00DaxQ/IyVJ/d4wGGRlRbfSuezFi1UPzlVG+2rlJSXYl9Ar5dDb3hmWEA=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.11"; - hash = "sha512-znw0LiorYDW0fCWwYQHiEwTRx5JrKrBfbPlwAKURJWq1YaLDy2eygO3hXlMdSLdMWkJlDPZpjcbqt5+mx7dBnQ=="; + version = "8.0.12"; + hash = "sha512-uViRfO8fKV/V46GOydgeiPxjMv+9xrGsESLGgdBBzqQHS+fwmmmkL6kNhEr5YNPrcTgkfID4VjXsTBNcX3UFoQ=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; - version = "8.0.11"; - hash = "sha512-4lNoHmvKzqUpCZhUofSMITLANHj1UrAHtMHzUtcA9rHUuqi8WKOG6hAyVXp7qhNPaWTPWlwkwG1vyp89fhsqAg=="; + version = "8.0.12"; + hash = "sha512-wptP67Kbz5h7pv/i7eC1J/fBP09d4y3xOzhP/9nhTmm81LkfatTa/7diXpz135ON5Y2HRvtOf/Bs8Jt9A60BrQ=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.11"; - hash = "sha512-7wyt+/TT0T2EoPpqdLUbjvoVzGyzDtArThboeX7hYdx2J0Wh2O7821XIo/1XZoGUVI72wEVxX/mvylUgsNyrWQ=="; + version = "8.0.12"; + hash = "sha512-rxDXgjhW13dFRIuFwAXj4ANY26fxU2/kb9OqEfWEZ27+z8Ltfp94YLPo11t6OG+1zXt8oSfWg4qWODSfZ2LTMw=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.11"; - hash = "sha512-O1Kw599sjBL7neUB2rQU5fNveeFLm0QbBTIvzupfmKSPpON7MI9Ir28LJqwjFbSqhdO/9SYmpeTUzAJqsbGQjw=="; + version = "8.0.12"; + hash = "sha512-JAVp2YOMpHCX3yYAVGlOmESbuP9NIJ4uETuzsbREPpi5bxo1DNEEaWXiGl/w+R2b2Udf0lLQbf430zSMZy30qA=="; }) ]; linux-musl-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; - version = "8.0.11"; - hash = "sha512-KvNikPRuWtyDgZkbneySfA6MjX5VUfOwfq22GK5tRKc8xOtlsv08he6zx33Q8SW4ldu8f4K4uzMkO71EdQQmkQ=="; + version = "8.0.12"; + hash = "sha512-3hTYxYIO/eAqxsJol8bVNp9g2i54jFziO9RUjZ5V1RcCs3fXh6JvBuPipxBxgLpmWOeZFvr6oqecBmuNphiWvw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; - version = "8.0.11"; - hash = "sha512-lPAmNTIsRdMcvaN7rjnkvVc9a56RuNrDMi3H6rKo0ZS06Njoee1BFDeQ5wuUDWnvaMxnAwxZH5wPKAvt6LdT3Q=="; + version = "8.0.12"; + hash = "sha512-ebP8KcwMcLozFzphxFEpgnAb4dL6Oi1WGuvpodmVqr2k6ZFYVBsHcZ+IISUyz4n4xb2fqPHzfNIJHJGeBBYoVg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; - version = "8.0.11"; - hash = "sha512-+lz9eo9eSsaPNisaAeaUM7GtSaBilFyXnOFsVqt8nIn3tR/azvXAgzNj00Zy4QLJLiDMcr27eeNp8E7LKVI1mQ=="; + version = "8.0.12"; + hash = "sha512-seZ5qw4wLxMZO0R7DspDiPpNklPfBMG/Kw/6SIggVxrozB6HS01mZD84wZsQddQCrA5u+QQnd9w6SiQyByr0Ew=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.11"; - hash = "sha512-9faK+Tt1Lh0cttVCwWxL3KTW8gPyi6uGBRGtEuexwB1HlyPuiHDlXXOWMCzDKTg4Bsj2NkkgZQ6R7KlWB/0xGQ=="; + version = "8.0.12"; + hash = "sha512-gobM3kaSrjSkmW7tRfhj1sQkCpFWwKO9i0o4FcOzreY2yezUk2yh0BflBZM0kdKQLnuUeXL7JA7E3FBvEYebZw=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; - version = "8.0.11"; - hash = "sha512-WpEunjmasr6EtDwl/Pts5pWq4XcgdOOX+qPtXrY5h+AnvEbagGGu7yTetroVy1yWkAXfWRxC2jp1KcPq+5b1Qg=="; + version = "8.0.12"; + hash = "sha512-hcHaF6X4WURPtHJjrZfJHtz+X0FdD7ILo7iM0EwotEadJZEtyjxqSMKMbz8UKZMgTMEOoG4joYgcou2cN0eM4w=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.11"; - hash = "sha512-Wjx3q+xYAF1D62cjLodPV8k/i72yTKkQwYAUhXvlfdzddZvnkW18dWlw1twZm8TUx33JRbPAl8jokhEfnwPMQg=="; + version = "8.0.12"; + hash = "sha512-w8lBF8Kv57bqSeAt1hvACf0he5v0dn4rQ/Xy+IbJ7KT+xaa/hkOR+KMg+o9ixttHTdMhFBGZT5j/E/qaW27nmA=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.11"; - hash = "sha512-1lU3Ir0DjkJyog5r/JZrFxzhSgQh/Mgt9fA216ixJyB3hwrDoi5H6mM49ORl6Y1K5gsFZFrYgT0ieB9y7B84KQ=="; + version = "8.0.12"; + hash = "sha512-CeYo95/17pXA33pND+nPGgvZbMuhnyURqPM18y6C2F6NIRF+tgSFv0Q4GU+y2T2+OyvmOKbb2AlLRxCaIDIM2Q=="; }) ]; linux-musl-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; - version = "8.0.11"; - hash = "sha512-SgTHU/z8LNomJAGsKH5HUvx5OizjB1WeqKsMzymgOubaRY7SgwH3mzrkO1ApZriU4UdDqr97pciMbxhlfaw89g=="; + version = "8.0.12"; + hash = "sha512-ejn6wj4QD2SaXZjU2kqo+3FFf6IgNeK1nKAwkroDVCuNm4U2vItl0nSkCP/P8D+Azsc/20qnADWsMGc4bNygvg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; - version = "8.0.11"; - hash = "sha512-2H8/Pdrzex0K/3zI1TMciRlgz7Z7od83gC9qk9Fm6UI8cElOjfd1uFP8Fry4hd77cfAFEGLOH08nhSYVnpMFnw=="; + version = "8.0.12"; + hash = "sha512-9QsWEMiK59ByypH9UN1fyzbR2ssDD8xUaxR79nyykN4vQMAvOnmFFJVh5Tez+tnIK8V98bFxQlo4PbkM729tDQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; - version = "8.0.11"; - hash = "sha512-IH1SXwkdekKugXK6ODphFR1MhQKkrBjFgt4zvCeKqL38sv7pfXLmGQOYBmstdxsSbV47VXcKzoi28E2TbOVi+g=="; + version = "8.0.12"; + hash = "sha512-BtWP7zx4UFX6mm94kUdtGyaEnhsjZDYN/m4oMvcpcKGuS1BZ1IZZcVraLTOFzoPXgxHWXJXCCkL0oSx4eeHrww=="; }) (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.11"; - hash = "sha512-V4y3EK0FOhOJ0gNCgkH1zb0jajXi3G/1fTRLFjmHYwHJN1xLnEyBFcQxZ/iKXSl8KhDJIoCZhq6PgXxy5FCw6w=="; + version = "8.0.12"; + hash = "sha512-AVkiT55B5xqGixGbjxmwefC5I+uvyK9UFMe+047bjep1PA5HZIU0+iT5NdMeJsXJCSor9+FPplYP5XwFQPfGVQ=="; }) (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; - version = "8.0.11"; - hash = "sha512-HZojWDGgsYfjMvNvwOqSI7BQrH0nn8CqHNJH29z2kv2Xf95wqAZAxOeWoURYiPINHi9MC2/zgxYOQ/OvBOHhYQ=="; + version = "8.0.12"; + hash = "sha512-aK5BtsYX8vxGuSsI8JEcgTQaSJGo5+yXkm4NrenqBXFvexuqTfsKT65i215dGz2aBOFhEITWCAXf6JzTmBaxCw=="; }) (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.11"; - hash = "sha512-4ejFZQ55fKOR4efL+0zdjJNJgDsMbdLq/yahNWtaowMpVaIwCkb8crxZ5GnOFJbXm1QQ6iEWfw2n8PfHhXEbDA=="; + version = "8.0.12"; + hash = "sha512-L9j7kDdn3Q4FxQ132wUkdn0DhxYdyLxlQtPhTUAwibwsP8eqjGpaXLCUFgC75aDNZnmHhWnwxjniNPSlJg0oiA=="; }) (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.11"; - hash = "sha512-ZsS4BXtP1sl8vT9w4Zg4F1lnukUytSXjHALELUasI7tt5DthDPKfWb0ZPWxPOBIjqicx+fC6DrRlm5bLXxiAcQ=="; + version = "8.0.12"; + hash = "sha512-f9BbwJT5N9cCkK2qaf81E0OEJCp332mqCHP2J1vXtSIYujYF2ZMW4nuObgZEnYlBd06r/Q7aIAqxO44zzn7QRg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; - version = "8.0.11"; - hash = "sha512-ieQVL36ljos0aLxaEUEZiVcNbpHFI0jXxkN6b5PEgl7FgI23wK21DfKCDjzLmSsq5Sc9KWTsjhGVZ113gRcT6g=="; + version = "8.0.12"; + hash = "sha512-91MXcB81uqgVuia/TDNonD/Rxy+8k4AaDxZ2jf/JOEqMNMwtSRTaPp7cBb43pQ/x5TUw11+XTzk7ju9fENuHoQ=="; }) ]; osx-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; - version = "8.0.11"; - hash = "sha512-djBsHftYzC802MFtYmZLn82/XcjKzVY+mV12PrfxrTqcyjw46HlY1ii5uJVQ0Bm4cbX7Oz1dHdzfDnpgAmQkYg=="; + version = "8.0.12"; + hash = "sha512-cyo0lyxMMB8t6LH0Tn//R1MvWg/v0ezguSWKgXTR7Vk/hkJzwKLYyrhgM+Q5Pk2vhltAzBTJNdIovVtei8RzLw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; - version = "8.0.11"; - hash = "sha512-Z7XeUhut6aToHi/cclEUICL45EdVBHv/rFjSPbz3/SARoDFoKia7wl3H61vKxpodTB2HmzFVmABTrdEF8N5uoA=="; + version = "8.0.12"; + hash = "sha512-8G21b6Fs4JU/hwYonLvJ3z4MHgwOsW3WHCRGq0O2YV0gLhz/HgUihfgrvTPwsQX7zRfIgbtdjv42PLZiCBe+eA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; - version = "8.0.11"; - hash = "sha512-O0fvdSX/MwFSsueeQ7pM/jDagmwDi4V+J/utor3emVDtI8xjabav11icQJdM9HE0L62vppg1uT8IMUx9wuH1mg=="; + version = "8.0.12"; + hash = "sha512-a/d+seYGVkpGTtYotJyVgg/pzuk61p7ETOOghcd62vp/LMuuMLqI9o3N/xsk7+KDDlm+DLFZpQZTMgDOOa4ZsQ=="; }) (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.11"; - hash = "sha512-gjmmfG6V7HTSaVNvu06+NG+6/rH4Dpj7a4EM57MkRCEy3bNNVJ0S5DO8l6YveX3Ocx2k9XJtf8d2sRd9y+wyFQ=="; + version = "8.0.12"; + hash = "sha512-137EsmMMjMBT7JFpQ8w0FEZyAG/6I0KWUBvnuamdpLtKXcd6B+8ua9rlcmNBEkN6mFbxS5m6qXwwn66GvSLx5Q=="; }) (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; - version = "8.0.11"; - hash = "sha512-1in90CWWJXmQ25lJs8WLsmLTNqGhCg38qd7n1PcaJ+hGZbJDloeoxvrYgDMib94G7zkMUSCCpNQkLWdS+AZZcg=="; + version = "8.0.12"; + hash = "sha512-KHnmVudTJSlyzdpx17lkJFKysFickorqE2/7duIknz/zhkrB6fsgD+fT/DA0j/Nz43ezzIo796rIS68X0ByOog=="; }) (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.11"; - hash = "sha512-rqZJszTVrJ1AKSMLpg8o0lvFeJv9sYlfMWu2VGlsxnVJ7bXhx3zUTdPizpkfXLEkumsJHIyzA0dAU9JxG4aGBw=="; + version = "8.0.12"; + hash = "sha512-nhFohFnSuFpLyyKEfEUpfKe+AwJ9PCxcnZK5Gqd+na/MylLUkg2iuNYx7CX6RDgazg+bvvEUf3in8rMWdczf6A=="; }) (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.11"; - hash = "sha512-54Y0CX4mpsMWF9gybFTYSPlRY0yp5N27pCidIxZwh1QNZRJgRadMS2J6uYKSBP5UNHxX4CZ2bP3mg/VU2YGixQ=="; + version = "8.0.12"; + hash = "sha512-QHgRha5tGSwRVy67PSW1yBZfcJNthI77IJaV85sOCbSRQNCQxUU7DmGb9aeI/7quGWUzM1BahaZqQfOXiOmdAw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; - version = "8.0.11"; - hash = "sha512-5fNhWcWZf6r9dQe/gv1nAxgyBPyXZ8I3ta8C86R3oz2+6tv2hxYDioVgnQ3/pfY2RbaRXz/bv6s3/dK6+rtQ+w=="; + version = "8.0.12"; + hash = "sha512-VQNqkmSpLIbHFpVSpOKNO/6JMm0SSrMV3ptcIzHSvw66Gsqr5jjo/E8S2Q5dAUlS0b/psdOiulND3rYOQaYk3A=="; }) ]; osx-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; - version = "8.0.11"; - hash = "sha512-XCnfmeGZy/faPQMhAa6ZSm2ij3s7poqYEhGdbWEds1LjqO6WBB0KkqtMiYGotZ9jJRXFbzMBXaTmAFE65iOGYA=="; + version = "8.0.12"; + hash = "sha512-Op9dXXTWqam9pw9UqX826kPhNvOTUS4QJPPRscD3yJKMT09Fdxp36Sz2gT3Q8ToA0RhoHTlRj98I4ZF8M0qjXg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; - version = "8.0.11"; - hash = "sha512-zt3fmvA9clYIVjPsuFXfcB2nDpEkWYU2+5GsNPzTQSiyGfhWkXygGCLpbYvkpbXCH1q57Ax5Bxk/e1FR0Iipig=="; + version = "8.0.12"; + hash = "sha512-Wi42A4IiXMx8/qWmiktaidyZXg0NfbMM8d0aSbPtHGOVUNI1BoiZARdXci+t+HXmBYV7cxr+/hJKMV/suw83wg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; - version = "8.0.11"; - hash = "sha512-dvh/3bJAzZEwKTxzhLojdmFebW/iu/+AAAJH1FiYlZsT9684etdqWWn9vfuYPwqUBBXUTNLkPMH9iRJNPtPP1g=="; + version = "8.0.12"; + hash = "sha512-+QeWCI8Z0puUM08mIsfVsBVvc/jQX1PDxySTnv0BlHQ35saacdOEwa6Hf5mCxwrIsaKW4p7j9cY9MJSFjdmBRw=="; }) (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.11"; - hash = "sha512-IcNYQJJ/wyqMjoib08W0Rgcnk841akaWAwesG28QIElxSNC8z5yh1dSM3QtatbyOALhckoWkI5ymTyzn9SDGrA=="; + version = "8.0.12"; + hash = "sha512-/usq+rObnkCjKYd2utS1b+GYDSV/ZeJMbSpFv7CelQGbvmQ24w3Zd4jHE1jqMfbBzf15/OHqBHXHdi4Nu+XRRg=="; }) (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; - version = "8.0.11"; - hash = "sha512-p4QIeC7fy4fjphQIKSQ5+ykhfVE3/b+QS1/UmVqVnU5z7ch9eUjvxlliqwTDjpqCCW0yOXuvNhw/AFPH677LTA=="; + version = "8.0.12"; + hash = "sha512-4unTG4jtyBU2SkT5fjYQEWKCjnlNu8rTYySGCCbjClIzi7O8z3fxYWlng+B1tnA4NpKh5y5fYI+dvaXeiI2UnA=="; }) (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.11"; - hash = "sha512-Q7F6ADk8beaPyGTlVSBIRJLujUmrFOqZ9P4qnnXSUFLiOAZRTHv59KRT1en0P5L+sf0hNjI2ngDkZJ9+BwfHgw=="; + version = "8.0.12"; + hash = "sha512-Na4e35U88a8KvpRqAeG2OmnQcOwavnGPVNl9BnWTPcNdT7RbQ7o2hqDOSvT8jsqwMcZt+L5yGxYtGY1widnTlQ=="; }) (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.11"; - hash = "sha512-grFkU1QmSjuqeclCBBPjkw/SHMIHjie0khK010q6E7GpMzmHDNas3sB/hfEeheJ9q0hkuV9eFlGkHp5abHp1kw=="; + version = "8.0.12"; + hash = "sha512-SmlxLDqwOSkq51ffwjidZfJEnBNZ2kQBWNPOhzD/NKms0OrGD6ssCTwID1xGwiVDKcyHyeWp/kpZaSgb+/SWmQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; - version = "8.0.11"; - hash = "sha512-ha4JEhQExJugVmd4qMLi3Oot+NO5u9Vfqg5Cj/ndFoBq+qBQF88rsw0SqbmPbkpDJ9AW14sqgrWs1p4ixMIN6g=="; + version = "8.0.12"; + hash = "sha512-pTM9MIEvOaIGzu2Djz7CNqtBSU/4ytuN7T47SySP/N/VnJB4QfOCEz4MYFWG5Rpqz1Zx5gV4eEfV+DFUJlZ+dQ=="; }) ]; win-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; - version = "8.0.11"; - hash = "sha512-Z1yy2Lm+mF/pNfun1zTI4WcWfkB5J80pRbRY+Bi3zpVcuTYARaCIqqYCcs+RSsdGZyIsyxY5GCVtNnnS/Mr2gw=="; + version = "8.0.12"; + hash = "sha512-RtGa0QmyL+DxjypnrrfFr9AjPfGVbLOlAqQcIVr3xYOjhlm0+XsKanRycjOiQpY7PYJGIED1nICm610kxTpHzA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; - version = "8.0.11"; - hash = "sha512-UwOxMcccBMa+nayzQINw98K8TdOe2gtInabbUhAtPglu9mn5KFplImezdd5ZctE1YPuVrsa79abrTnY+eHdsXg=="; + version = "8.0.12"; + hash = "sha512-4b4nmMBlWXn/rILg/kgfLsXYfzRBRgmuuapWgHYtmyZPKmP/8QndobpmbIKN65KgkcJoLW+6E1BggutpEeWYdg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; - version = "8.0.11"; - hash = "sha512-afq9u/kUUNRlECwgdngwlaCEIJVYzdKzJZfjklHK9UBoK61OpmrIhXYfhSIAr6/yOlkoWeq5Hn7uPoLEDWxwnA=="; + version = "8.0.12"; + hash = "sha512-AbdCpfp1Zr0hKzcbOC0XD84G6RP8sc2hJfjd2hkUNoQX6rTH6zw++ZahCA9GAiNawqGQtlzu3YJG6ELLmwmP7Q=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.11"; - hash = "sha512-0HUP7epr4Szr5mgx0UHtU/B5o1PcC4SuJPUrmCFVkua4gZ7liNd5In0GE5Tmbt53+bqT1C3NyD6v3Rqhqzi7EQ=="; + version = "8.0.12"; + hash = "sha512-L6Bva94q7LHaYa9GIATU5L9mrcaZ2TKD3UV7U2gbeL2hqyHjtKC32CzMJgiJpqaidO2lgf46r5ATLhBIpgv0hw=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; - version = "8.0.11"; - hash = "sha512-8m49BIg9HtqZLxXt9N8rT/NlcUlLTaQMPHYzs2LbHMrlAXDatTVxZHW9lF312BBWjn1zQfAJqMtyibQtfmVKrg=="; + version = "8.0.12"; + hash = "sha512-UhlCsMqxKcT9vf3v8xygojEypCCVdWY1wUD2UXdwsQaYopOKPVrBOrK0me9+vDQxXpRwmJ8q92x83NnGsq7pDw=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.11"; - hash = "sha512-rCM/d2VWCY+GpW6nTlFPICc1rMyw+qM+67X7r5yJDOwGrNSqYz3xeqi7ewP+aXYmIoQV71Od+Jb86oqOB2SDXg=="; + version = "8.0.12"; + hash = "sha512-LryE5guy2qJZR613WmgBSVbnmGBu4wJWn8Cd/pLVhvloFpI9qodruqZN0VmO7wXEsc4m6ukq0sfv3u/qKmWLHA=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.11"; - hash = "sha512-PfwwvgpVmN83swqQhY4feqInM34XqsVbOeiXlKJEOgmwyKUj0cjHVidiu4HYBhy6jcOKla2uK25KTYebKqTx2Q=="; + version = "8.0.12"; + hash = "sha512-iLAQ4BaR5cDX0DPP9s/wEq5A8He/nqJu6i2nGUOEiOYKlYGNTHQEyKqc4b1sh0XCAQPQ5gn/7NMBrqo1/0hjWA=="; }) ]; win-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; - version = "8.0.11"; - hash = "sha512-VkSu/oOIMPemlIf5ARuFXmmndocYjub5ut3/5JXAz5sSBKrpeWciGnsUDnnshaWHP3jK4JCj3TBds7heldom3Q=="; + version = "8.0.12"; + hash = "sha512-fFUUZcpljb2Z6/Duwtp1RThdOEvEFuI3lYijFTVpu94oRjw5sbtH+5qO1KeqrxCkY+Fnpwe1ABBy91zdoPus1g=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; - version = "8.0.11"; - hash = "sha512-MmTlraMVCA4AWhuhG0ceYMOOjzCFLM5sydkoAUCLh43VoQOgzHMCa6BhxSzdXdcOuJ6VTHukMG72+NEm4TvL5w=="; + version = "8.0.12"; + hash = "sha512-GsgHWhLYhuzBlBp2XlL1OBXyQyUHQJOpR4bR4bwG31qoxIhjUOQrgbiXD9pVKaKVHJxHO00nLSQN8mKEg7YKsA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; - version = "8.0.11"; - hash = "sha512-9gYW5whLNQolY5oTcOSv9cQxfHujDOOUXjorA/GMlOhTM1iXvzrBbPuWnDjFywYznZBkE0ZiYc1jVKQUKJ2D7w=="; + version = "8.0.12"; + hash = "sha512-nCHMRmxs2ZdwPEDy1Gh6mpwA38c/TskLYLcF/DALeEsQEtCXltP7FirPHVlYASOj1k+72xV/XPm9BQ60xgrOEA=="; }) (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.11"; - hash = "sha512-+rAOixUutqpDATvg/QBxT1Wr5kAG0GOUWR1f3d7QjwTnzz2rQI7I2e+oDa+RYy0yMv0+Ih6AhHFuBC+52H2ZCA=="; + version = "8.0.12"; + hash = "sha512-/AzCzNAiKUaHOgyGaGw63jBJOan9TtPFEpoQVtVK/OeyJFGrAokcL7LZxEmYZHCOAB/McmVl9ktOdebe1Ip36A=="; }) (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; - version = "8.0.11"; - hash = "sha512-bhY1zLDtLxQf/DRCLy/V4/tXZGeBI0rWA7epKyItxfvlhEh77GOnmIc9VGyLH4B+WXNJFfWB/rTUhWGaJyzpww=="; + version = "8.0.12"; + hash = "sha512-OjWkp6to2inzfmTnMiKuCQAei74AsWgoZXHJFOU73AfLErCLRY3vdzVEE0mR7vXki8jljzpBqPG7DVH2utO6Tw=="; }) (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.11"; - hash = "sha512-NOZYMy4egQP04ohvziFDIRDEm1tHyMme4SCxWKh6y3BVHZ0BoENVryLq2Ko/DqoBuMF4tDjUFPi1bcofEl7Xtg=="; + version = "8.0.12"; + hash = "sha512-HH8rUT8WfI8co30Fed0+V2kcH9H0Dt4CQ4REQHL0d18Ef4BsyNilXeeYIupGUYV/oJbJJfuCENuDP4Nn4o4XVg=="; }) (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.11"; - hash = "sha512-wDwiNdA0vNfgwZgCe+a7FpbAiUENRcOoy3CUW7Y/5Kfc25qYWNONz9v2BfyBDLRYExth534ZpILww3QkPmsiaQ=="; + version = "8.0.12"; + hash = "sha512-A3gyFcNiSrVZ1D/IdmpUlJ1iGYdV23L8yA8jo6PgeeYas8fWnUV5fC3BXq5/zhwpy+I61Ma1fqL3pn8WJWcCfQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; - version = "8.0.11"; - hash = "sha512-eEgNGyaapr2MeHDmvfJuVPMavmtS7XdBd8xSgKWF64Yuo7mXoCtcgWzagG7BGDg65mW2vyFKE1iidZ9viVNbAQ=="; + version = "8.0.12"; + hash = "sha512-Rcs2Tn4y+jEo6oLSbi7fkxg50eODt3tjZNzM0iJBnkmMI9ZdtT9PSp7ExSn7NlqjpilPzP9YRCYhPrra7MfIbg=="; }) ]; win-x86 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; - version = "8.0.11"; - hash = "sha512-OPIUdM0ZFxcAzoVqJIy1qr4X6Tc8jQw8J1rsjrUL5iR24YGPT1kcSyC78G4S5F7kIRykjg8bnMRgLxiJ2B3THA=="; + version = "8.0.12"; + hash = "sha512-j+NocH9tAxjaCICEVP3g8YhQm28A7yBg3GnNI0B2aXtba8vlFomvu509icbAp0g10YTGbqlOdmt82pIOyhcBjw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; - version = "8.0.11"; - hash = "sha512-KF5x+GlRfAUjPvNz02f4UrwuyWydvu8kSlKpZCxH0EArR1rOX+8jgpEZGJQxl7NzPSpbkPoRcvwTicX+s5jLrQ=="; + version = "8.0.12"; + hash = "sha512-qL1rcHqe9ZRFVlU1PTABx9AS9x+zrk9gZ+zW4nDr5Ai5AgeXo1cYSH0nzEv94cScH7ipGaCrYItF6tCoquK+Tw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; - version = "8.0.11"; - hash = "sha512-BlTSt0qIs80/SxvdNEtiGl+kLn1ThEcKroQtc4gqoK3FPRIOyMFBfp9qEJZnVZdcDHVt7hGN1mPKUup+Qbesxw=="; + version = "8.0.12"; + hash = "sha512-pgyneHJjNT8ZqOoRunpxLh1ZilEvh9xRV16LOeigV5ROmZ/cyUCB+5/vKnsuC0Yz3noErwfpukpLUGe6TTQOsw=="; }) (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.11"; - hash = "sha512-gGiAe5PJBNcmIRevQZnyBBM4KOgR+oLvMPGQxOvb5nGRxCXO41LnBtTQO+iZY8A6C4nBfD5pmis4+kluDbgxuA=="; + version = "8.0.12"; + hash = "sha512-mwOme5QW7MSs0xZP3cPDTHVqLD4uZCVMkkDwajj5IGyOstFSqjOkMD9d8tW0LJZM0PbtXz4NkbS4OfZvlztetQ=="; }) (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; - version = "8.0.11"; - hash = "sha512-hZJfqP/8rnKc3jKJVLnAvcdsJzFIkFh80eBVatyeAGjUpp1I+lbmqGgnMbsWmA0Av4kBtylpmrv09ZId1g0GjA=="; + version = "8.0.12"; + hash = "sha512-s4TAfOSVe5loFWXz17EI12BcKZKrsrBiaaOS924f9agg2Ko1KTZ4Q5fzBZbQ9ArfKe3LpTpkgagAb4qkR9xQDA=="; }) (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.11"; - hash = "sha512-UW/jpK2X+Wvpj/lymy/31jZBQK+Q7oTSeNUxMZxEiv/1sk740ah4kGYsxVSlQmx+D6M2T+Yn/JCYgCBEDaTfug=="; + version = "8.0.12"; + hash = "sha512-Q5KIhosisJXxTfiHVthJKuIM9FLrl6crL0nMplRQ97pg3LKhg/YstZCdrzSYoKEB6fCns3BQIXWzjYXVQl2pSA=="; }) (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.11"; - hash = "sha512-Zxw2Fnc7jzpqT0M36wTYAeqJ1qZKXrStOBfjKY3OYMfGIsLd10dEwiHYcNAKbDlzmOFxU7UlZoxWcBCz1pMFag=="; + version = "8.0.12"; + hash = "sha512-tDX7X6kN5m6U6Vxb9PvHPXWXLW4gSq/VwWlfUy8B2TBknEV4/FBkYCwwXhKOkfrguhBGW9Y3fYpw+Gk7lSdg/w=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; - version = "8.0.11"; - hash = "sha512-Kr/G3KP5rXMURU82OJ0jSTCweYg3vnCcUXk6D+SvR64JYEC0DC5x5nDnMLnbTulB4S4NRJvFClVwFUzTJyzc6g=="; + version = "8.0.12"; + hash = "sha512-jn2v2QIk6ti9qvSQDeEdI8gtUoSojX3gifYQuyn8dBYsrf9izKopL5WhxVsiA/L/ysYSx/ciMdm71j/FhSMUtA=="; }) ]; }; in rec { - release_8_0 = "8.0.11"; + release_8_0 = "8.0.12"; aspnetcore_8_0 = buildAspNetCore { - version = "8.0.11"; + version = "8.0.12"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/003f180b-e695-4094-bc3f-ef6473883d43/e861cb56edd58b05b03b5a92cf995f12/aspnetcore-runtime-8.0.11-linux-arm.tar.gz"; - hash = "sha512-dmRfEpRlNGxd58VDvqU4KSKKmRKXHEWa5IJDMXxz9H3sI9e1LX2U/zxwG40t5lHzN13qs4EA+XvoH1d8O4zOHw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/26fe9c15-40f6-4eb5-88fd-63d98eb259fa/c36789f8460b7e20371c38129d7fc160/aspnetcore-runtime-8.0.12-linux-arm.tar.gz"; + hash = "sha512-FEvX1FAlN6KAbRfuFhLks8Jidmxdg9qLEDHKYfKh6r0bulpTGxv8r6uZnwhNuWHJeVgE3mUdh/gd1tZJdjNZSA=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/64a9f696-b039-4a73-b705-288fbf9c2e8f/c36bc24d6d359c019408b4f94ee67b59/aspnetcore-runtime-8.0.11-linux-arm64.tar.gz"; - hash = "sha512-dbWIi31lz56XGSXkiWLAgi9jA5Cj8PBM4dhFRpkP7TEuiuhRPILK6toUXCrI3isin9Ha0tLfNsjp2w359lWVrA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/8953c6fe-3542-4cee-b022-a50e029882a5/1bbce821b1ae97ed11b305dd708c0437/aspnetcore-runtime-8.0.12-linux-arm64.tar.gz"; + hash = "sha512-kyP2WEv5hQD+AjAJ3qW5Dkm7s0zc6gho6NGML+JgsIcxVDjKLfeD8lkAPBoO4x8tc1yM6oXCxPsE9tr+BThFMQ=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/6f89757c-3dde-4c3a-96a0-b04b1bde2c92/6a3591b360ed0f9d1118b97560b89625/aspnetcore-runtime-8.0.11-linux-x64.tar.gz"; - hash = "sha512-56z53Fz6Sap+ww27lYa8e+qsnjEWx1MDtRF3DjWXsglznyjHVLIQfAJVrKyQGHzRAAwe53JGP8gok0pN2jX1ww=="; + url = "https://download.visualstudio.microsoft.com/download/pr/df752f45-7e9f-4d13-8568-a88adda5aa04/9d59726fb38525b4956cbb1e1fe8a2c8/aspnetcore-runtime-8.0.12-linux-x64.tar.gz"; + hash = "sha512-A6f9N9zkbDHX502nzU2aq9gtXgh4WdAGX0cOv30LYq0f61n8P3RpAzepKPV1HgS8t4OIluZLP40lrgNcW39cgw=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/915433cc-c272-42c4-8599-e4dad1f37169/fb50da250331d885f108ef5147a55383/aspnetcore-runtime-8.0.11-linux-musl-arm.tar.gz"; - hash = "sha512-B0gkLqy8R5U2lOGWVUy6FNkfww15f+afkEUEpwUigEXsRssN4ZVFIIzK10JoLUNZIfslMsI7W76CKV/uCAT7qQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/d7cca8a1-ed7d-4dd1-a993-6766287f2f39/2775af53e9a24ddc6afac345ad417b5e/aspnetcore-runtime-8.0.12-linux-musl-arm.tar.gz"; + hash = "sha512-F0GJyFHrF43HtWJLIgsKDfisv0HEzXPhVanR79LmrSrXescZ9R7bukmE5L6Qdjom7rv5WMGneuMuJvcoAWURtg=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/52d8da68-2c23-462b-8714-947d9c92f4c1/e57551e568e148dc30c3301382a0076f/aspnetcore-runtime-8.0.11-linux-musl-arm64.tar.gz"; - hash = "sha512-hiynzzSelFQgOhOJq4UoPJGhBNfWtwrmbDm31BOjUd8gde26UgZzFTEQueutFYAbayKE2vsiva+TVVuWQ2ffQA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/90290d06-b7b6-4ad0-99d6-1bab0a557051/3ba84f7ecb0f681b8f7cead66124c373/aspnetcore-runtime-8.0.12-linux-musl-arm64.tar.gz"; + hash = "sha512-d65Io007lHiqEbgHf3sdb16kdpn5Lj3CnQXMzRayXgI1h6lg2bwqXCWTnLt0lBAs565/1sCfWXkUmBpeftknFg=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/2c532eff-49e5-4177-9d37-54e1eabc1a6c/7cd1d4612b9bd15ccb555bc2a3ada721/aspnetcore-runtime-8.0.11-linux-musl-x64.tar.gz"; - hash = "sha512-kSDvDKwgAv7+5KuQD8AIX7VtyuWFZ8+Pj2HwT29WI9yZXPuo9twsYfpNlt2jou4O3IUwtA/bwW0mrvW6MnIcTQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/8f3afd94-2927-4be9-a935-da9f4dcdb004/c594a54091b5b85063f38879d50123a4/aspnetcore-runtime-8.0.12-linux-musl-x64.tar.gz"; + hash = "sha512-p9O64tp7TalGhR02GW1BBTWTr0E40a4CDOS5sUHH6E1TRGywiR4SeYOr1efAEdfJ0gOSJ9ypQJ1vrrY4NYM4mg=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/67a3d635-a541-43c4-88ce-6f7882908693/5701a1609eb7231e65fc4e415cd9f2b8/aspnetcore-runtime-8.0.11-osx-arm64.tar.gz"; - hash = "sha512-ay0+tY13i2P5gqDVdTlzhqbQf8pknxuU3fCPxE6YhN9UdCqguChUzVlBIJhKOcYsecFUYviYTNwEGIVC3LYSwQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/16c2edb0-5977-4a8d-9060-1d8a673c6b44/6802cfea6e93712b7872614bf47ebb9f/aspnetcore-runtime-8.0.12-osx-arm64.tar.gz"; + hash = "sha512-l75lVblM/eIlULQ0wOuNwykYGzC5MLYsUvQEeAmUbQVYs8gJVQnNByE8ddUfXSYCB8+wkzXxYO1cVe6LaeY3Tg=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/2e82f0c0-2d31-4fdf-b289-ae4157be0304/c82a8ccd41f2aa7918c7f888df1a40e5/aspnetcore-runtime-8.0.11-osx-x64.tar.gz"; - hash = "sha512-k+TxKd3fsVPyQYN1kmbQ0kohMefycjYbwF57G1UHHBxqLgN196ogQicSyFySJgfo4jRC65JB7nNgjS8gFcfcVA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/2d69b57b-d997-4364-a898-220293f49d9f/c192bee87281e416703f53da103925d3/aspnetcore-runtime-8.0.12-osx-x64.tar.gz"; + hash = "sha512-qzE801RZhvMFrxH1SVo5bPXn1mJtDkaRfv7fSveqspy58t4RTJ1SGAgdZzndUvlpiZBrEFNplfVnK3HMhliUpw=="; }; }; }; runtime_8_0 = buildNetRuntime { - version = "8.0.11"; + version = "8.0.12"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/b4d8f2f3-a0fd-4d48-b584-cae2c3af5c06/97479f98b5746e515d7d99f72b67c852/dotnet-runtime-8.0.11-linux-arm.tar.gz"; - hash = "sha512-J5uTv2tcXC9FQntiDFa/8OIuyPP7mk83SeemoNDQ7oFjhRtb0IHGgUt1gGjfe6G5QByES6WQWyeoMAIIRu9kBg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/a50c2f56-3ee5-4387-a9a7-4338b75fb5c9/41676fb7ec43d9108a65fc0d76c15717/dotnet-runtime-8.0.12-linux-arm.tar.gz"; + hash = "sha512-C448N/IFz5Za+9cJav1fxuICJIs+PBdHEuG880trZKt7Dvhm7rbhahFDZ+NWZtrLUusLoQ3eizFDMUoFHrGh0A=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/501c5677-1a80-4232-9223-2c1ad336a304/867b5afc628837835a409cf4f465211d/dotnet-runtime-8.0.11-linux-arm64.tar.gz"; - hash = "sha512-8n1m3N0kmmovhyQbRgI4lgJA0WP/wIHY57Qr1icCB58aZ4TjUD29Tqj56BbYIUL8gpx1nL+aFoKwNA8M6+FttQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/4bfa2e49-fd4b-4aa7-b5c7-cd344beb72e8/d04a3458f047737f9343430e901efadb/dotnet-runtime-8.0.12-linux-arm64.tar.gz"; + hash = "sha512-wwCofkF5j6565JIMFAu+NJmhCT1BhFD5v6RpsEXr4uWEDZVIfpN+7b6KsiHhOIrtdv3MGMktgXeO5DODun/jOw=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/805cdca8-ac43-4d76-8ce8-efd11f1997f2/17aeb8b0cd34c6f8d80217bf6a4ed3cd/dotnet-runtime-8.0.11-linux-x64.tar.gz"; - hash = "sha512-cepSiQDG/HtU6VFiIpZCHSqWGRhwxH6TcRe4Syj5G/QH0CBG3f7P5Kw33GGCxl0ZQJJ8M+Rfo9bwF5+BaSSQ1g=="; + url = "https://download.visualstudio.microsoft.com/download/pr/14263fc6-1fdc-46cb-b692-df3e0f4204d0/24c37267d4f4e166df57ea3ec9acff18/dotnet-runtime-8.0.12-linux-x64.tar.gz"; + hash = "sha512-4NIW1U6aIarvwSCkgQUPETfMcIy70XIE8LGkfbtkJAeOi0TchClXpmkQJc2hSQ5QYQkoAkhLX9EsWQP1umNEgQ=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/a7c1c05c-3295-4564-92d2-896f35807f4c/2eda12f650084627e0430a52477a98b9/dotnet-runtime-8.0.11-linux-musl-arm.tar.gz"; - hash = "sha512-4p7HxMEj3r+xwgqknszby2xJOgvKjUgMET0OQTsrVG7QF2exBW3aSw9YApwUf1E8OvlWadKcsrq9vaTTWLLQ/Q=="; + url = "https://download.visualstudio.microsoft.com/download/pr/d77d220f-ba55-45b2-9013-5def3d55d558/8293468a0a39b4a61ce94f3ae5a65fdf/dotnet-runtime-8.0.12-linux-musl-arm.tar.gz"; + hash = "sha512-7JsDT1UOgHtNT/WwfGx9kJWetNbbXZe4skUmnaa6hz/ieCJJEYH+NOSbbpiGFGQLJ1QkpYWG8CKRXqSKzekGsg=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/103ae393-f13f-4467-a050-cb437a0fc95d/49e6ee2de95017554e161b7048746a29/dotnet-runtime-8.0.11-linux-musl-arm64.tar.gz"; - hash = "sha512-apTOiI6wYPY6DslVSYUZjEjFxWEld9t8ECBLWLLvNu+WpZcGfXVXSr3KYah0cpFLXfMxK+dHc6wy+nBD1gNw2A=="; + url = "https://download.visualstudio.microsoft.com/download/pr/3b021406-40a7-4609-8046-5877ae6b2c2d/8ca6aefd8b95ee56512416448d7ccc52/dotnet-runtime-8.0.12-linux-musl-arm64.tar.gz"; + hash = "sha512-s2m3G0g63HzVPTxXzOoe2SnkQVguIfMZiUKdMf9r2qDm/nVUlAKow80t3bk1wYxDLSxyxIbQNGfyelLgCaGJYw=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/38650024-417b-4fe4-b0b3-aff0ad98dee2/a48665c0f7099dd0672e6c277f5e5064/dotnet-runtime-8.0.11-linux-musl-x64.tar.gz"; - hash = "sha512-/wDRnO1+ogTKzMbBHEhOWh7Nuf+prJprjtL398kImq0JjltB0uvlwky7wJVt9kAyti7XJ3+sPTtkt0LFAgm+YQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/bcf1eef7-7287-4076-9ad0-f5c308605952/d70135d19e557c3730f5b801d67d4e84/dotnet-runtime-8.0.12-linux-musl-x64.tar.gz"; + hash = "sha512-Kpegfp+y3MgiWFDJV0oBT5oREUfYfe1ik+t78mz2vubMUWcTwCwToI6Xdtut1YNifwXm5i2qr5b2U+KMCzeyXg=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/e5b4d32a-09a7-4028-accb-3b6c51828282/e4ecc94db4507f16a9916dc3be9b6706/dotnet-runtime-8.0.11-osx-arm64.tar.gz"; - hash = "sha512-LhXZOqWVFvLnefDC88e1Dv48RUfVRr/70dryP6ZQPWk2SbKpNV4DiLcIni3gcue4hKsEs4rWZUSuXJfC8gidHA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/30fcac13-8a78-4495-84e6-00ae9445c76b/4989e4834115de71774568b0e606f09c/dotnet-runtime-8.0.12-osx-arm64.tar.gz"; + hash = "sha512-i+qRfQ89iqJ/Brlbl66iINRKP2sMZMZhLf41PdTfiBi9pWV7Y7yhFo619IZsqLizjHCrxe/8ovw1ik3InvEGCw=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/f32ae8ed-e8e3-4d1b-8425-852696e4dbe6/1f67d82ebd50b27574ccc4a06b2500b8/dotnet-runtime-8.0.11-osx-x64.tar.gz"; - hash = "sha512-wtAIyscrGZnqka1UDARAKqjCxVuZKoUHadOczq61Y09vfwTR27ylG92eEvBF/uMVtla1hTC1etL2FIDsrcyj0w=="; + url = "https://download.visualstudio.microsoft.com/download/pr/3458a9c3-f34a-4d61-896c-1551ee66d5fe/bf3c24436ad390578caf1ccf185e3151/dotnet-runtime-8.0.12-osx-x64.tar.gz"; + hash = "sha512-sYToXFX9D/0Ue93laVtYbMGHnNqhG4MswxWJk9sphihmFwOe0voPRtq6CgHo7Om+awoWjYc0eB2XTHfI3DbVug=="; }; }; }; sdk_8_0_1xx = buildNetSdk { - version = "8.0.111"; + version = "8.0.112"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/0aca42a5-6e85-43e4-8fed-0a5af898c82d/0ee32409bad9aec0608e1bcf2f767a32/dotnet-sdk-8.0.111-linux-arm.tar.gz"; - hash = "sha512-Lw32CwWHjgLBaFXElC6PR/CaNWxZi1WEbKO4bppaSQDndP11rWmADaKZDRbm1PFu3MU+X9m7BpmOtKvg2p0shg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/e9e78298-4150-465c-969b-8b1d2fb069e9/88bfb81d6fc900bf1b68ca3ab7631443/dotnet-sdk-8.0.112-linux-arm.tar.gz"; + hash = "sha512-YUD+PrzTdQD7AY3JmoRyGROee7sTIlUM1SHgP/Litz5sWn6y5g/dqhDTDIqeJVje3rhFP4UjH4EfTU2ZkjjRgw=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/c6a51c8e-3dbe-4f8b-a642-6e4be0ea0171/e98afd2817656cd96445fed528776661/dotnet-sdk-8.0.111-linux-arm64.tar.gz"; - hash = "sha512-mtGoNJ1MtlL76Z6ytWsscU8Ju0nswjGNhZch7b0MLB5fM4RE6h7m3S8C59EBvODTyVaRMxJncDcFlkR3lJilTw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/f6d8b6bf-4e75-4ba0-a1e6-cb79255b48ab/b8cb663305eff90d17ac97e46e1e0066/dotnet-sdk-8.0.112-linux-arm64.tar.gz"; + hash = "sha512-LXwd90Dp4lxsNyJuuuZBIY0unjn/kKks4aWV7a4ADhmJ36iRvs/FOTQO3NkPu5is4yuOFrmY/wbHdBGh1CBBQA=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/71b9adff-5d7d-4567-aba4-d0da010e293f/88bd38320ab4a4524e71aec64bf88676/dotnet-sdk-8.0.111-linux-x64.tar.gz"; - hash = "sha512-5G45p3Gyl0Tc5mWofNUyLfqRKrKQS8wQ8FB9/PTKBWhM9kw04SxwhK9Jp4TMBOtTKjrSvkzrZoF2NH/rS+N/gQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/1f338ac7-da1a-4d21-b78c-6c769b9c2dbe/5fd0e2846ef9f7c8bf6095ce201f50de/dotnet-sdk-8.0.112-linux-x64.tar.gz"; + hash = "sha512-3smWKLZ8p87unQvm423udnI6IQE43sBap4GkX0dBAnVkRC50qYav6HSRmiYxw+dVVexo5MPkdb0vgHpqyqmJ/Q=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/23273a60-23a0-4fbd-8ffb-8eddb2880ee2/65a67bebc6cc7d85fde858fb501e5c4d/dotnet-sdk-8.0.111-linux-musl-arm.tar.gz"; - hash = "sha512-KX+iiMjBdOwWrp13VBFmioJ70iJ3cisPKIXuYJfAqCfZ81w0BSzlipDxbU/uyr5zjGPxyQKzqP6jZ3GjveSvvg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/672126ac-5134-4b27-ba18-28cb02fdb168/1eaaea4bc9a463f692abca1a45e9b5fb/dotnet-sdk-8.0.112-linux-musl-arm.tar.gz"; + hash = "sha512-qXiriguzCicsRzDD+TVU3qAw1mZlkrt2BAR+vzW6ZlGbrl5eRK0YhVXwHETvAAkn80Mc/Ewt13E5e5hee95gpA=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/60fc0fcc-1f82-497f-8ed2-89b75ef19388/d78cb2271cfa396e119dacb534a0e8bb/dotnet-sdk-8.0.111-linux-musl-arm64.tar.gz"; - hash = "sha512-fNb6Mz/BleX1UVu2dbhuwxYKTRqCxolrOdBHebsdKqhndJjqcqfT6Fq8CGRlUtNhonfZpvuMQYr3B335TyrgOg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/933119f6-9819-4a3b-b6d9-e737054bdf60/9d27ea1e7a5d00226f4a343f2cda76ad/dotnet-sdk-8.0.112-linux-musl-arm64.tar.gz"; + hash = "sha512-eQub61Y/9dwGzjLt0m5tv8O+a/nNY+Wls7SG76PBpZX9n01CVMv37948MuhUL39u6DKQ5qbl4fchnruj733M+w=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/6b36b2f4-0a10-40a8-96b6-b222860f9820/22605ad401868ae796ec1911984c46a5/dotnet-sdk-8.0.111-linux-musl-x64.tar.gz"; - hash = "sha512-pRdTdDsBRQYPfbF8M6RwjaBfH/ftoEOunzmjx0xadVN9AW6M1rGBisLQPtANNTm0oc/0s2BySgmCK6qKiW+SAg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/7c1c61b0-ea00-4eb6-a97a-31560c81b5b0/f5a5ede05aca2fbaca5b1486c2571462/dotnet-sdk-8.0.112-linux-musl-x64.tar.gz"; + hash = "sha512-SIMgFeCtdPw2dwhgRODuUAT8C5yvKeohE0RKBBlD4hOO/r00eAq0tjGUt5TfgKOJN7RgltmiDIMttU/gWEPSSw=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/92958c4d-e15c-4554-9ab7-b6b251fa95e0/d931778a5156b6d739583cd1af0139d8/dotnet-sdk-8.0.111-osx-arm64.tar.gz"; - hash = "sha512-tH//G/XZ4rXKe2hNcqBQTDzPizN0uNei445Bci9+EXSAAfzTRI5iYBS5/KeAgr/tnA5G9asUGmRkIevCGRuaWw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/30dda97f-e407-4887-9218-96062c82d51d/1fba1e21b5e514a007cc39f97e38d60a/dotnet-sdk-8.0.112-osx-arm64.tar.gz"; + hash = "sha512-4o/vqA6KXu+huO18x79/pZIfOBz9OxbC138V7TthiPLe1OFYKBqSwn7lNJ0EoEJeTKZN7Oo8oHGLMEfh58ureA=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/2c694b43-e8e5-49b4-a26b-a8d1850d8974/aacd6da4f057a37d12074b076368eda6/dotnet-sdk-8.0.111-osx-x64.tar.gz"; - hash = "sha512-QZ8qZeVxRTexhWkcmnFSq9Tl+F9uWAZghuPzQepPFuD1ZL/cZM3B54djqMO4crds7CXL93/PZl19dIGcYf3Jag=="; + url = "https://download.visualstudio.microsoft.com/download/pr/ce94ae9c-4627-4b7a-8857-eb50cac41a0f/2c8804a1a59de1abcadf19deb68ef59b/dotnet-sdk-8.0.112-osx-x64.tar.gz"; + hash = "sha512-KU3LITZvQjGU2tlWqG4K7ZoOPMImX/mxv2HHjxrHg8YUwloG9k5rNXkBNbyJnkFN138dco9Plcla1XuAAVBroA=="; }; }; inherit commonPackages hostPackages targetPackages; diff --git a/pkgs/development/compilers/dotnet/8/deps.json b/pkgs/development/compilers/dotnet/8/deps.json index e173811fc0aa..f1849483280c 100644 --- a/pkgs/development/compilers/dotnet/8/deps.json +++ b/pkgs/development/compilers/dotnet/8/deps.json @@ -13,50 +13,50 @@ }, { "pname": "runtime.linux-arm64.Microsoft.NETCore.ILAsm", - "sha256": "1d20ae351bbc623ff9591eac7e955ab6a3e53af78c14246654eacd7f0eaab8be", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/8.0.11-servicing.24517.7/runtime.linux-arm64.microsoft.netcore.ilasm.8.0.11-servicing.24517.7.nupkg", - "version": "8.0.11-servicing.24517.7" + "sha256": "851481e92d9f365ab8f1a2f91d9ba8c1d3b1e186c97b6a53ad2e41e31cfcdf1a", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/8.0.12-servicing.24603.5/runtime.linux-arm64.microsoft.netcore.ilasm.8.0.12-servicing.24603.5.nupkg", + "version": "8.0.12-servicing.24603.5" }, { "pname": "runtime.linux-arm64.Microsoft.NETCore.ILDAsm", - "sha256": "4daf66754e00f84aab022d05584d74acfaba0576029581821c5be874c7982813", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/8.0.11-servicing.24517.7/runtime.linux-arm64.microsoft.netcore.ildasm.8.0.11-servicing.24517.7.nupkg", - "version": "8.0.11-servicing.24517.7" + "sha256": "fa426fe7acb104bdf5d031ac14d1293be89902cf6cf0bcf90aa788febd5c2a99", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/8.0.12-servicing.24603.5/runtime.linux-arm64.microsoft.netcore.ildasm.8.0.12-servicing.24603.5.nupkg", + "version": "8.0.12-servicing.24603.5" }, { - "hash": "sha256-0AGOEntGw7uEv4yTzpBN9i1o1g05JqxP+bIANoPx4HQ=", + "hash": "sha256-GVvmtd1xUASxlm4v1dQ2fOWTvOAT+u2HNd/wYKX9gJ8=", "pname": "runtime.linux-x64.Microsoft.NETCore.ILAsm", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/8.0.11-servicing.24517.7/runtime.linux-x64.microsoft.netcore.ilasm.8.0.11-servicing.24517.7.nupkg", - "version": "8.0.11-servicing.24517.7" + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/8.0.12-servicing.24603.5/runtime.linux-x64.microsoft.netcore.ilasm.8.0.12-servicing.24603.5.nupkg", + "version": "8.0.12-servicing.24603.5" }, { - "hash": "sha256-NHMJMsphsYrpA6tOhd9XBK5N0KH8zIck9lwIAvEPHME=", + "hash": "sha256-b/40wRNiM24qb0HTFu0Dqb4xlykzlUcnH3tap916oyc=", "pname": "runtime.linux-x64.Microsoft.NETCore.ILDAsm", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/8.0.11-servicing.24517.7/runtime.linux-x64.microsoft.netcore.ildasm.8.0.11-servicing.24517.7.nupkg", - "version": "8.0.11-servicing.24517.7" + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/8.0.12-servicing.24603.5/runtime.linux-x64.microsoft.netcore.ildasm.8.0.12-servicing.24603.5.nupkg", + "version": "8.0.12-servicing.24603.5" }, { "pname": "runtime.osx-arm64.Microsoft.NETCore.ILAsm", - "sha256": "4191d170ed0e07547e1a64747b240bb0f51f560ce08e359e5aeff2bd77373feb", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/8.0.11-servicing.24517.7/runtime.osx-arm64.microsoft.netcore.ilasm.8.0.11-servicing.24517.7.nupkg", - "version": "8.0.11-servicing.24517.7" + "sha256": "b3dc437c856b3f9aeac1932ea0fab8bfdf7539f69b8f0be783f35ed821a0242f", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/8.0.12-servicing.24603.5/runtime.osx-arm64.microsoft.netcore.ilasm.8.0.12-servicing.24603.5.nupkg", + "version": "8.0.12-servicing.24603.5" }, { "pname": "runtime.osx-arm64.Microsoft.NETCore.ILDAsm", - "sha256": "9f5366cbc877eec7bb1b3eb8670a20c6018dd8223f6623349f2426a64e752047", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/8.0.11-servicing.24517.7/runtime.osx-arm64.microsoft.netcore.ildasm.8.0.11-servicing.24517.7.nupkg", - "version": "8.0.11-servicing.24517.7" + "sha256": "3e682ef54f63322e5ce385b3e290e26847f0d4b2ef3493e0426b4e105ad74b4c", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/8.0.12-servicing.24603.5/runtime.osx-arm64.microsoft.netcore.ildasm.8.0.12-servicing.24603.5.nupkg", + "version": "8.0.12-servicing.24603.5" }, { "pname": "runtime.osx-x64.Microsoft.NETCore.ILAsm", - "sha256": "3a6561a3556cd01d52f38ad068c3e4991424c3b686289a64c58c945813680879", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/8.0.11-servicing.24517.7/runtime.osx-x64.microsoft.netcore.ilasm.8.0.11-servicing.24517.7.nupkg", - "version": "8.0.11-servicing.24517.7" + "sha256": "3d8661b680ec675db354d55c8063f172275a526f349770d21e01bd029a2640fe", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/8.0.12-servicing.24603.5/runtime.osx-x64.microsoft.netcore.ilasm.8.0.12-servicing.24603.5.nupkg", + "version": "8.0.12-servicing.24603.5" }, { "pname": "runtime.osx-x64.Microsoft.NETCore.ILDAsm", - "sha256": "0a54d38c6f31778f8b3cecc586e93b946d10a11a4768e88b81e05b64eca31cbc", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/8.0.11-servicing.24517.7/runtime.osx-x64.microsoft.netcore.ildasm.8.0.11-servicing.24517.7.nupkg", - "version": "8.0.11-servicing.24517.7" + "sha256": "080c6d1098320b8fe9c5c160094f79ee0976d4f5b731279347bc5bb4411b2e96", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/8.0.12-servicing.24603.5/runtime.osx-x64.microsoft.netcore.ildasm.8.0.12-servicing.24603.5.nupkg", + "version": "8.0.12-servicing.24603.5" } ] diff --git a/pkgs/development/compilers/dotnet/8/release-info.json b/pkgs/development/compilers/dotnet/8/release-info.json index 1e0e706de146..2de4dffa62f3 100644 --- a/pkgs/development/compilers/dotnet/8/release-info.json +++ b/pkgs/development/compilers/dotnet/8/release-info.json @@ -1,5 +1,5 @@ { - "tarballHash": "sha256-j0LNvn08bF0fPOOKBSSBJV3G7BzqmvNYTpSYC9XrbcQ=", - "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.111-servicing.24523.1.centos.9-x64.tar.gz", - "artifactsHash": "sha256-Y9v+IYeAvuwddtQnDNUwBEWXGsDZACs596nQrdGOdaY=" + "tarballHash": "sha256-CpSHgYJoLHlFcSwtuurN+a6sKZbGsPSZIZE+C0f9uM0=", + "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.112-servicing.24604.1.centos.9-x64.tar.gz", + "artifactsHash": "sha256-wx3ov1hW6ck1I/zygzGxnS6Y5wxS9cxtg6pLl7LQn7I=" } diff --git a/pkgs/development/compilers/dotnet/8/release.json b/pkgs/development/compilers/dotnet/8/release.json index ed9ca06b63b1..c309f6cfbbcc 100644 --- a/pkgs/development/compilers/dotnet/8/release.json +++ b/pkgs/development/compilers/dotnet/8/release.json @@ -1,10 +1,10 @@ { - "release": "8.0.12", + "release": "8.0.13", "channel": "8.0", - "tag": "v8.0.12", - "sdkVersion": "8.0.112", - "runtimeVersion": "8.0.12", - "aspNetCoreVersion": "8.0.12", + "tag": "v8.0.13", + "sdkVersion": "8.0.113", + "runtimeVersion": "8.0.13", + "aspNetCoreVersion": "8.0.13", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "ab5d79b36d4f8a16f9f91f53fd6504b354c977b1" + "sourceVersion": "a970a1cfdd960e99b4b8b9bdc3099b943f70adde" } From 383ceb66d1f04b5f6820fe1bff32db1c2058381f Mon Sep 17 00:00:00 2001 From: David McFarland Date: Wed, 12 Feb 2025 15:04:21 +0000 Subject: [PATCH 0916/1107] dotnetCorePackages.dotnet_9.vmr: 9.0.1 -> 9.0.2 --- .../compilers/dotnet/9/bootstrap-sdk.nix | 376 +++++++++--------- pkgs/development/compilers/dotnet/9/deps.json | 48 +-- .../compilers/dotnet/9/release-info.json | 6 +- .../compilers/dotnet/9/release.json | 12 +- pkgs/development/compilers/dotnet/default.nix | 3 +- 5 files changed, 223 insertions(+), 222 deletions(-) diff --git a/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix index 76a9dfc9dbc9..0129afdb1672 100644 --- a/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix +++ b/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix @@ -11,28 +11,28 @@ let commonPackages = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; - version = "9.0.0"; - hash = "sha512-Gw0hOfzWemlJgdGucGfWdU0H7kFmE57x1lFLNJddRzbGi6r5Dv4T9+ySMXHj5MEU09iBRUig6rxsGu0XDsB1ZQ=="; + version = "9.0.1"; + hash = "sha512-j59whFHFna8m2rgyONETv2AyVTcGgNYhynz7sljGIQI9UejOz4lMtoF6ETztgdKcxLM/PQpe3iXrc/1s6cL6uw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; - version = "9.0.0"; - hash = "sha512-pJWUhSWVDFIk8Cq/lWdBuedQk2m+uWBqKvGCmkpTXrx+22s/qE+D5gNvqMNX55QyyERg8hK3L3wMpbFkf2Mjyw=="; + version = "9.0.1"; + hash = "sha512-MWBkM9EBf2IXGLRhtwOOXm9h/adAUyEoYEjyxvwDPJbBLX/aWCCvEzKRH3AR3WqxSCIuXMy6ylte86SiPuU2yA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; - version = "9.0.0"; - hash = "sha512-s9us2abMLwrWpH1glRbjlMhbwCLvq6MhVBwcAjCqeD36kgBT6rx8PA9Ro8W6715QvRz9luJPJLUd1A1Im5QjAA=="; + version = "9.0.1"; + hash = "sha512-yGd0EFC4wluxps8taqReKJk5fsmSf6k6SuqUnnwrw6UNtvUtJqWLiIThkzl4g2I5ECxqt+ttnN3iKnvxoSKc6A=="; }) (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; - version = "9.0.0"; - hash = "sha512-VlXpaCL4/ZBq1vlW/58bwm9hNd2MXRiwPXhvfclsLMJ2j6fJaaX2AmB3XsgIWYlageW0FY1v+QmyhrIfmKJGxg=="; + version = "9.0.1"; + hash = "sha512-IqKgv7kZ6BG8s31dCHqBgLuP96YHHSUvndDw1gCSkZ4kwtxuo4/gIonNuz9Y2BxJFVyWPpSDjNIwbOBgpUrnFg=="; }) (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; - version = "9.0.0"; - hash = "sha512-xg196uBfnUmJlc5aizfTi588MyruI9Hlvaqj3mMbx1J9GfpF+t3gdWR6uKbH0lVW9oxzJ7FgX7NWZEZj33j0ag=="; + version = "9.0.1"; + hash = "sha512-w3hS2Z0dQpqktohyL76mSk1qKnP1CTHYg0n6LzlP8DVoCGyDW0GKOPYM6PWzgmsv62PV0spUJtdiJZxAPmF0FA=="; }) ]; @@ -40,118 +40,118 @@ let linux-arm = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; - version = "9.0.0"; - hash = "sha512-MkXLF7urjdN5Qk0oFktLozf9TlM4q7WP+6z4eHa2Cwu3YWWnsbkxjTg+z04nNZA9OI0LLMRrxrJyVEg5HuIrTg=="; + version = "9.0.1"; + hash = "sha512-ITqGyFkabgmC8HDqEvKTy1T6eAI5Jzt+FQibZqD7mXx3HezY+Vug35QIhKoZsGvBgGZePXXlXGbQXojv24oBRQ=="; }) ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; - version = "9.0.0"; - hash = "sha512-Dn/V8lDW3q3C/U13fkAn1wJLNgwZ6XaMcb0vOXZROW32Ae1mEk9jFOnpRNbzCpFKQUGJX6Sg8/ift5ltX3/4dQ=="; + version = "9.0.1"; + hash = "sha512-pJjbOtu4hjHVLu+ohoe3HW7z7D/VDlpnO8gCSZetd/DStLhBkgHx9Ne0bida9+UADDqk657d6tBNlKmk53Xe3g=="; }) (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; - version = "9.0.0"; - hash = "sha512-3FZilMq21HAH5zXmB0KL7WnMdqHitJLkzqw/FgEiVdG3rECHttxo09htp+jIenDs8J8HitoYW/Xw2Drm7UaU0g=="; + version = "9.0.1"; + hash = "sha512-58uQG/MEDkL5KtUGOcyAbXQwPM2hguHALO2GzrRolb/G9cZBWxPdzsz/Znac44IXjPr8ELq+L1Tdj4DOYabrgg=="; }) ]; linux-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; - version = "9.0.0"; - hash = "sha512-tnBxVIvOo6DjRViwBjJcyljpsMZnM46Y1vBqM8AbMM1fO0BcKPbJS88GmnQ3q0rNWmi6G2VY7UYHl/+9phcGCA=="; + version = "9.0.1"; + hash = "sha512-szJlHztrwdlPp3rRxcvKPuV7XUYHbYW4QOf53Md2bfz5hSZu1O/fH/Md516vGD13NXykF1sK8/+YlI/Zg1flPA=="; }) (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; - version = "9.0.0"; - hash = "sha512-m9rQyHa8k6tmG9ZV2JyXYqG8o1gEFw8uh8mP7lRKWetA1ceXjPfZUEwKBXMxa+749G2ELibL696YL2YY+Z+C0A=="; + version = "9.0.1"; + hash = "sha512-9qpCPG+jgL3DG8KUycZFef6bC1Kayo1IP+h9syZYdrcLXDmbZTJu3hcAL4S94O/fSx7kNCJNfZ1IiPFc5OfafQ=="; }) ]; linux-musl-arm = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; - version = "9.0.0"; - hash = "sha512-URG+5zlHdvC03qzMEzlb8i8bYaY5j5BaVm3u9+6qDE/1xcb0SZrzvJK2TS5UjszUmCEyYeloFDBx6FQtEk4bag=="; + version = "9.0.1"; + hash = "sha512-L5D1Q+sTwN0cqr7yMFHJVialh+G9sbZYaOOQP9eBa1/rWxn/FUAGbPSDpKJTyILFPu1aiykYk+7zvBzyWUxXJQ=="; }) ]; linux-musl-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; - version = "9.0.0"; - hash = "sha512-Ycj0j/VDvek7/rM8hYldSVHtkk3UBntDz/D+iwHVF3oc3QkEyEwPQFhM9uINEFTHIR9vwRE4DdhQfTgdsvlong=="; + version = "9.0.1"; + hash = "sha512-4re15jU1KkriWUfIzAvl/JgRWqNPIdoP5V9tbX2SW7+xJo/UQ4IQkJ4W9Ct33e8gmv74kqpOaUAW8Ufc3AEvZg=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; - version = "9.0.0"; - hash = "sha512-+64gZ7mG3UKNt0ijOiYcyfVBGsFTM0n2Buyf6EFJNTExqfyaH1G/YjrVO8XM4q2KTV5MrWLSYyhIVvl/ZhaitA=="; + version = "9.0.1"; + hash = "sha512-iFr8JbqjJuAX/358K6rVsnSxLtOi/fHufP5tDypK9OpUHeExhRw7stDKfDaZRccGfVIu3h4WG/hFzEnkAipEWQ=="; }) ]; linux-musl-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; - version = "9.0.0"; - hash = "sha512-kdpajBOhxRjilUH7obuBN8Vj4yTlZlhemNTJ6FTHp60hNv4cINCs7IEnvzkC9TNuDAJNJyP543y+61QpIie4Cg=="; + version = "9.0.1"; + hash = "sha512-BGXpmXcXPRylzaWOrojpjwa0TNPU1keLVptsJ4F4Pbd6eD0vW7aG+tIWhRDmj1hn0u2lXWpQhdUHuE9kzQokuw=="; }) (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; - version = "9.0.0"; - hash = "sha512-S3FR1/F/xxAA/LkqaPT+v8lWXxFvTJsCqyhMtFgYLKlAseXtZx7KE6t6a8xEgRJ5mdjA2d+MJFijfPw7ZKfaPQ=="; + version = "9.0.1"; + hash = "sha512-ZO/XMhmqlAlcFVk7LFK6X3Zw1309qMD9CQtBH0lJWqcKCoCJ/M/kR3MFC3LPehH+tmRGeiLOzTdJoXzUDQlesA=="; }) ]; osx-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; - version = "9.0.0"; - hash = "sha512-2xbup0BwwwyAl9zH8U4WFrs0lh+24/WOoVn3xCaFZ4dzCpScFzE0qLZNhlBkY/EuDrbpVS1xf1toWbsZGju7xw=="; + version = "9.0.1"; + hash = "sha512-j38WbOTxvqiOycqA+UkCdoOmAGNleiSmoaYbmR0vx8Gt/jiQ0dWUP272r4kOfytFsPvXDSq/8BClx6d5auUjbg=="; }) (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; - version = "9.0.0"; - hash = "sha512-wMon7mG3IkoRuzmtu/XSaUA7k93y7zUp84/cIzbRPHn2kc3bpBf1ICBgEibi+buNAsicGXgDa28hEjlI9ij/vA=="; + version = "9.0.1"; + hash = "sha512-cXNoNxA8DEwlf7r7slfLqnecqmuEkKntXwrG937SL3fEeazGsImV0dVr46k13dbIA56NyBS3vQ9DuxtqnDy2Sg=="; }) ]; osx-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; - version = "9.0.0"; - hash = "sha512-KsYxh+x62uTiWcHcFPoB4inYAShiQoORJf8mUtqdpI1CEDgUNtnCM5jFiBiuCAekMfA9xNfy0lsU4yHyg8MjzA=="; + version = "9.0.1"; + hash = "sha512-CMu+1kW/TMcHSe9tmM9JKPm3BPr8fE81qv5shG0EOcovBu8Z2FB4x4cj7tdQIZjC/M+yxfL09lmO2joO06mLZQ=="; }) (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; - version = "9.0.0"; - hash = "sha512-l4xnwu5ZQc+J++LyO+cMojdjQw48IdkVqgmUc+SF/U+A6t0Apj0RCtB07XLDtpFzTR9HPY5RaE38+AZhE15Uqg=="; + version = "9.0.1"; + hash = "sha512-lw1vFGvva0T6DYbI3258wS8Aw9qHDzDR+hxaWwAJUVxPGGa5aDSeFfZ/hP2qtdn17cnlUEhCR28S2rimkJnc5A=="; }) ]; win-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; - version = "9.0.0"; - hash = "sha512-JQxa7mSZVVL9H6s/R8/5UOZSe8EekbTE4u4FFVydSyxi+mqryNTGC2Cf7YgbfFzWasDEqNtoSOhqXA7MJFHlDA=="; + version = "9.0.1"; + hash = "sha512-Bcm+qKreOBnsaTPZA8Tf0OPKnFLdaeDmNLjgNEdQptMH4s7s6RJkSzTK24brSKTsGJWD3ku76415Jt+cHAUl3g=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; - version = "9.0.0"; - hash = "sha512-xrNYFUC3PWZuZxiKKBF4Re/zsyrA81uLMTnEENkqPdYI6eNabAvcGsBi7wP5mfaFtRWPbete5k5S+kOlpCpw/Q=="; + version = "9.0.1"; + hash = "sha512-BJJsB434xCwvhwoBc0yS8bqoO9goLqGeoAHuSOqCC5hDNhheI52cX065vZ7dwH8gtNLXp1MLsOs8/vXD45NaNw=="; }) ]; win-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; - version = "9.0.0"; - hash = "sha512-B6Noyuo7Nx6lH+scXSUE0J8IxteoJWzpdgXkb2CO3MhSeaL06KLg51q8ATxmx5gs7emHV4sHxBq87k8U7KZxuw=="; + version = "9.0.1"; + hash = "sha512-Z3ZAGYzDjE9Q/D4YRmhfTjEMsrCb88l3PEfOQmnptmmjxWxpNJTJuVldhPy5caKbviw1iSje2dvjwLQ92+0zNg=="; }) (fetchNupkg { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; - version = "9.0.0"; - hash = "sha512-P59aR9VD9GjI7ONAAK1SVjEJfZEJCpLFo9CVLe8raRdmq1MWg/eQ1sXR2AR50GPmciSCBpIq8rDAYZLsCiLx6w=="; + version = "9.0.1"; + hash = "sha512-WLYp1Nf/K8SSTK/TF+O70LkHkrk+S5KU3WwforX2QAlN9Xa6zscHSbiRulvVNLbdrb5Bx/8xcsps2DzbuJgeoQ=="; }) ]; win-x86 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; - version = "9.0.0"; - hash = "sha512-19GSA4/P5CMvqjkInp7rBySTKmE1i0KjtYtYCv5TAesvFbyY+tJRQjUJsHUB1LxYqdi7MNXR6jvcW1O6x67K3g=="; + version = "9.0.1"; + hash = "sha512-qPEOgS79oAsERd8UydEo2MHY1Waiez+XdHnUSrBCHoSL8qTwlurXtDyLkGLKPqQkkWNlKBx3jGXFAewYThzifQ=="; }) ]; }; @@ -160,361 +160,361 @@ let linux-arm = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; - version = "9.0.0"; - hash = "sha512-yNSYhFO714aiRTgQz+NSxmZ8KaXGYi8MtTyP9pG8H3Q7tQOPvhd3EhJothBasIjNGHeVoedQRBGXLHWLlHr8sQ=="; + version = "9.0.1"; + hash = "sha512-fyD5GczwLT7IhFnWup+0Mh/2RZtO7lHrA/NMB4QFkn77R3vIS+aOcWaoS6Pk/3X7K+71L6z0WP4+4IsN6ayn1g=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; - version = "9.0.0"; - hash = "sha512-doUaAKbTQQTvU+5c0WvENx822NekyJqKlfzLhNDh7v7lC/syq9RUApQxyOffWpLa7a11L9r7yf02ZdKACXgeyA=="; + version = "9.0.1"; + hash = "sha512-99Pkg2wyoEdNxQwn9h8VEtMxmYid1ieI2+dv3uzO4XtHN71H+mR98HMAlXFD8eBaFXm0FCIFCjrDC+OLAiiElg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; - version = "9.0.0"; - hash = "sha512-mDuNiquAA808YwpS+Z3RKbGYnnx7VCINSEYWYNUE55HBfR+lSe7NxRB+Ed4XxVOaBbeG2aP/yqzJjKEYP7kNew=="; + version = "9.0.1"; + hash = "sha512-/nTipuxWKqvQkgSM5IB/yIWQ0OyRmQUdZM5JTaK0SJ6ZnbLiNlWHo2INZE/8syLhHjc3JXCzY0Zqh0Wd8+dHTA=="; }) (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.0"; - hash = "sha512-VLRDQ84utnUvatZO4YTkHJCwdWgHm7zxxNEZ0xtp52dDBye2UVcwXY1ZNrKx2vRfKi5zTLHbOi0fGTAbK+TLOw=="; + version = "9.0.1"; + hash = "sha512-vjgEIRRMOnS1BU0v4EB+ljQaiiRdwDG8Mt9vLfWti61mzQPuSI9UuZSVEQAhGUOZBazBrgEFi3L2/VcLKym4Gg=="; }) ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; - version = "9.0.0"; - hash = "sha512-DyQUA+74c4fjGgqGpTnXXkT5r03GSndeem3J7F2O+WsHg7nn87KHi2LR9y8RJWXHD9ceSOVMBvTLulM+VvRuOg=="; + version = "9.0.1"; + hash = "sha512-CLzfEJ20LhF2QEx3Oa/p4G3kSE17OEWZ5s5yKP3voW8sw/+MoMk5Y8R57O+jSyn3ZMfauoVPB8TIcOlrl/3+kQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; - version = "9.0.0"; - hash = "sha512-f7cPFLvJA1v08v1EtfcC8bKE1WFM6AU2YhhKrid5HZLDD1e71TXFMT2eLawwsoOJxnKG+rD1ERtySgvMYPWh8Q=="; + version = "9.0.1"; + hash = "sha512-rGQNTsy0aS0TTAko2m1cWUwxsbKJKUMD3u2qO+3K/QlepA+gFBylCfijENB8SaTOCwyPwI6PUiSOBlPdaPbo5A=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; - version = "9.0.0"; - hash = "sha512-0v/YP+0hkr7yzvzGKhNzS9/wAknQtH6uH9k04NfIp5inCjq9LxWsL+S4YCINDwVX1oVeUS//AVv2T4sDuhIzjg=="; + version = "9.0.1"; + hash = "sha512-SMApYm/3kuQbxNDwyy7BvY9SkusCm6Iwu4wPPX7fKnQ/GyGwNeABJIqq15nAwJSZR1EKAlQe8amrXpgmrkrrig=="; }) (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.0"; - hash = "sha512-J0HoXQwGxVap8DLmheMeYu+Gr7UR4k51wV+q30A9rfaT33WJoWVe/aheXdYDgkxmGnKK/Cr8ScEDtD6oS+yb/w=="; + version = "9.0.1"; + hash = "sha512-UFntJ1OeRdixs4nmhMxLcyXfwjmNew5EkmbquA9UKI4kKViEZEYWOPLPOYTGGhdfUJGRHbkXqIrsGAglFeLyog=="; }) ]; linux-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "9.0.0"; - hash = "sha512-ah1ir1EEeGSshjAkKp8lfdl44WOYXFZmcydvORnQIs3IeKCkwhQTZNkgZOwieT1NtGB0TLbc0h1FSV6sURlnuQ=="; + version = "9.0.1"; + hash = "sha512-NMon6hn1ZcNwqv76Y3kPuOGhcR/l/dH1JcT1bN/qrtNIvtEPMmaSpnUXVA9/AazVGwNitsRbVI9uZ0CfWm9sjg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; - version = "9.0.0"; - hash = "sha512-va4ruzadg4nK1wM8PzDoqLFTNypO0kgVVkiV7+3wKWuYflwdYwWNpae5qKjmsLB0uLNrljBT3JSErksU6YpfkQ=="; + version = "9.0.1"; + hash = "sha512-IqVXfM1Iwip/V8Xy4/xvGbz/Uvp/We05Mt1V9WLD1pcEVFU7Lm5KRFN3+NckqhnHAgbENEjQWiqcII/0pKWvPw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; - version = "9.0.0"; - hash = "sha512-tT2j+X8saJn9J+3iM6MoJwv5kEAhWyuwPeZZipq266YDIlwEaW2FDjoWCJJVLC3vCDidHlnTT6IKUv/LMKKpWA=="; + version = "9.0.1"; + hash = "sha512-4lprzdBSYv2uvTFcYuVddGmzkqDsgCIuzOusJ2HFowxHJt3mdNS+9fbFKTMUGYxTeysQpNdyd5pTEYnswnaTug=="; }) (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.0"; - hash = "sha512-DEuteVFMIIUgkI55r+/kTQq2PMcaxj0iGxLs6CG9YFbfwvHqduq7MA2pqdonhL/6Emg1qFASw9LafjaIIfBqJA=="; + version = "9.0.1"; + hash = "sha512-el5p+CAqxwjmvRajBNgWiQKwLDfqZq6zT4CPaoD/9zOhJhsXrR066vXzCE0FrVyP8QYj1iJlet3+oBNKoaW4lw=="; }) ]; linux-musl-arm = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; - version = "9.0.0"; - hash = "sha512-cjxki6OzyNfxncBFL1NjgXruHitIQjlyxjwXewOqkNqYU2EOxyKWhcxxOzavgw00x/izuvooDrvpNari5cSJng=="; + version = "9.0.1"; + hash = "sha512-bB55+r+vjLwYcO0mAj/NgvfVvn5k338nJ41qIJUcMrnBLymZMhPKNmMDlxSrraNVqflhmzwBGX3mlk99YUssXQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; - version = "9.0.0"; - hash = "sha512-PkTgJhN3fhoJuynpjWPi7JZyGgOJ5EpwKWtOUPRiXLJj2Tqp3gKMdYvZz4pjEJm6KK+T6iWyUZRUr/WYRme+UQ=="; + version = "9.0.1"; + hash = "sha512-dXGlvBXlEFhXtxslCQI64Ax8q6fWf/s+LsfrhNzbgmH1EJdhrtij1eLDU8+ByRiCQs4nNj9r08+2FKgDNRSEBg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; - version = "9.0.0"; - hash = "sha512-SgafbwsE40tFUABR9rlfA+9YQenUei89fakk0SlNHUZPX9tkhHo0A5gXY3/Sdt88HlLOUCD+pmM7Nn8R2CdbBQ=="; + version = "9.0.1"; + hash = "sha512-G25u4rIqRuf6PWUOq/QR4yBqoKT8yff/W8hQmJcVSCXCIudrmiqwdr8XGt9RVO/wpKNyq2TRsr/uz37P8lCfQg=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.0"; - hash = "sha512-aLoTcH9BTv7AuFML2fiqFdha09b8ETG+OJTP5mx7ER7taT9quMoUu7WJk2L8r0k/QdBoxh5qcqLKYjRVCoQ6IQ=="; + version = "9.0.1"; + hash = "sha512-Q0DvC9HdZDWHw5j3OUPkC/0vD138RtCyrb1v59/09s+Nx9UziTyD9g1VCMV6ulRlJwVbNEM5cfOin9jnVa+aFw=="; }) ]; linux-musl-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; - version = "9.0.0"; - hash = "sha512-penFoYejLCetGFWNXlUma/LbCZKXQMzGjKaoTMLupQtvjc3ZKM/i+n7uBXbRPTd3o9kYus7fCPtNnjk9lI5cPA=="; + version = "9.0.1"; + hash = "sha512-wif1X7iiUq2V1kwXmfZQgtHtG2GvST3W7U9bjGRApW1a4z7DX4SE0JMTqfaHdkBVroUh1M1o9tE6zX1gGkxOHQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; - version = "9.0.0"; - hash = "sha512-nVvMcj58prH57guq7lLE6de9KgTjAt18JTu9wXTsnNwQrOyAgZevzM3OpB4clZ1aqkqCKZZ8fuMgpPEbfyaTCw=="; + version = "9.0.1"; + hash = "sha512-/6Q+UtzMeunuT01kjF3WXAG0U0wAZgEZqcEteomAGKBAYncTKXAnsslQk0GLlLxG7Cks0ZetOxARURNjF84ZpQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; - version = "9.0.0"; - hash = "sha512-jqfZ0ZboGYYa0KWArvYaO4Ddw0TMnLDkYVHtgKVfdFlaVon+KpM96yykbqmHLr1UUkDXDHNNFtHwnpVXmbmUOw=="; + version = "9.0.1"; + hash = "sha512-xUDRlzgeLcyG52I652qzQc9QKlW3/LwzINgfMs223EYO+sIcI/vNJxdoC05s2NVby47Y3s/bXoNU1rMdfHfEIA=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.0"; - hash = "sha512-h/AXFI687hBz7iO1okAoLFG/r6WNvjqMvwu2IFFN+FtweYjH0MOXVR05fG5Gzqi+RhiNkcF63b6IZDcPvEBKhA=="; + version = "9.0.1"; + hash = "sha512-4+AFlX4G0far0LT8WzuVjjsYEpWnyHn9G9yK/aulaB7coCeLG/RA552MnEITGwr6RiUwvgjPFHw4RmMvvLXlbg=="; }) ]; linux-musl-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; - version = "9.0.0"; - hash = "sha512-LQmhF/z9n7Bp8ygYDpY261u3BU7QscyXfLwX52TFAXaMGNCvryVW5+92TeK5wK9zorlAdZMK5+T4sEeOMMa2PA=="; + version = "9.0.1"; + hash = "sha512-9co3xS3uaCXoMQuuyMSP77T4ACIjz5zjrflm/UMiVFjzvrmb6sSByHvZYO8DOPW14pnA4aRlCr4qhcoILliUmA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; - version = "9.0.0"; - hash = "sha512-2qPiXsxgMn//ucG3xnTJX+kkpL7/cSF6ve6G+9voJk4Y0abbr3kaJqnmuSRIFoRi6gQt73FBEB7U5mcopeidSA=="; + version = "9.0.1"; + hash = "sha512-aOewuGT2fyUyiRLgfCP8H5p35ixkIDbegEOxnAQc8NcCvh17SG7xZCk/I+8vELcXw6QTVoFNc1Z0f7OlSAImmQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; - version = "9.0.0"; - hash = "sha512-7+1WIq+1cod9u6RBu0c5nxIyYhZs4PHPQ7xvFu7u67JiSk6yGZqYStoYSwphme7D6VPqsyzzSUG/92zgwNg+Bw=="; + version = "9.0.1"; + hash = "sha512-Y3K03HiKY4EAlTaBTCWhQkBMtupuxUabOcFsBWhwzYFVNwJDgmWeS8EBIMGK5DgxKvn2GtR6hLShucSNfgHE9A=="; }) (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.0"; - hash = "sha512-fYyTxX42IGf6v3qvEsIwnmFjfPCYO/yQFQizbZ64Y1GejNl6o6pwqS8BMkOQ7gV4WTaO0aQwPigPWboyCp139w=="; + version = "9.0.1"; + hash = "sha512-vUSFlMJBvIilcgSX0/lO/6oslEdVMeNpKXK8XRSQfaa3jfdAiosvN540E3Y87i700yT7T1r5qbEbW0v5P0dqUA=="; }) ]; osx-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; - version = "9.0.0"; - hash = "sha512-x0yxetXr1TKLDGONxhE/xl9726Q9T/iVQALK0wtZMdIEES4J7XehHnzA2+jGK3vEK5ZkevAN9EE6Hoijf6+iGA=="; + version = "9.0.1"; + hash = "sha512-rO0C4vvuGQI1fokFIG4W6u4uscFrtZiH+wBIcwB3oVp/8z5CHDUQ0mqfaxjKtQ0pWS1eBpt68ZvfRKK6giIiTw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; - version = "9.0.0"; - hash = "sha512-SmhcN8JXFuVkmM32zgDtMWP9GFM3kimGr5R3FqzvlLXc1LVndmdsEcvCsLhmYhjr69hPBZtIv6av/LAxiIoKMw=="; + version = "9.0.1"; + hash = "sha512-VbCfkSCgIZC/CSqe6SIbMbQ8OC/tFZbF/J7GTjwSenxEq3dZu7njH+CdyUcRoN+voxNSLXDc0PTH2icTX8sa1g=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; - version = "9.0.0"; - hash = "sha512-pc7A8emc9Rl25slknnQyYSMAyHG48JXAissa9EaOSX8xojisl/GU0sDJnWkZkrd4RERyhekpaSoHGS3znLcUUw=="; + version = "9.0.1"; + hash = "sha512-UWsVcwp7L/dKGN/E1YbiLhAzUare1IQc1NiOeKlB9XetS81MkSllasLViFG7TF1G4FNiy+bsh0G4JKE3PNXKrw=="; }) (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.0"; - hash = "sha512-Zruhm/0uRZ4036v182pLQ/SvqdQ/taJ5zxErdP9LsLypFFCRLWODpQBaYX/UZgQLFtsvv5ri81UZQZboRv4TNg=="; + version = "9.0.1"; + hash = "sha512-yzF4l/m0FV+MDtQjlx0Y8MooG5AOINYuIWTd7hLuvhQlD5xcFQCVrf2+8d3JEwFXryxn9f4coMMxG55/kNoq4g=="; }) ]; osx-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; - version = "9.0.0"; - hash = "sha512-8sJ5cWWtGGMG+NFNOqzzObgaBKAXrewTLMh5b0iHYIgyJ5KoVCpEQHAAe3Fa+zxdVyrmhXsRTekazgEqDKrSJA=="; + version = "9.0.1"; + hash = "sha512-sIyKf2ll8Fva8UMzQhHowskA+xp6f9pA/X+wnWLWrdErrI//95niLTo3MgqCZQq25n9Jo811H9gG430tdOEvrg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; - version = "9.0.0"; - hash = "sha512-DryrXoJ1Y5LAwNfU06r75aak+/raphHgkNwD1Ejy1b5bIPuUDD3VJRfAl0JfWw5e8hsidiA4WEVRdl1gy5LU5w=="; + version = "9.0.1"; + hash = "sha512-m3uywgan3uYgy2sQ/tZt3v5XsnFhoqGdb3IAu3vZn/AmTp6Mi24obM2We6N/HlJJ+U+M8+fb9fdxwRRg5De9cA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; - version = "9.0.0"; - hash = "sha512-SyLkZqTEzTI9rWVbdLeM6F2EuhImVo3HzCaqu7JrFHwRxjFvc6TYa/BxmPhbOiA0wZbIAk7B70EWPeXe/jxzVA=="; + version = "9.0.1"; + hash = "sha512-QtjQWyB4NJLf/3WMXCl2D6NDXd7lBDt8jGkN+4lswz/jnBpIAyHkYVY01evcUOGK1/13QtCIQSkJjQaybXlI0w=="; }) (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.0"; - hash = "sha512-9hG3q82Dfu/5HDoWxGHenwMHk10wZYCXAVzxySS+yJwaM2DPhXutXNIxgzSMVGnBD3umYfzrBHUjynvei3gPPQ=="; + version = "9.0.1"; + hash = "sha512-d1MDpDyn3Yc5ddPe2I7cgvrfUALxPZppiF6VhavkzybpEVq5RPPNdM5S8R/Rhq612H/Hl3C1dKmeraYjCQ0uNw=="; }) ]; win-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; - version = "9.0.0"; - hash = "sha512-APQNj5uwHVbZ28Zvrx7CLEciJrNMTHOh78lvSNp/gpXgHkD4G5yoQSC7sj/B0AqSshrDs006WaCbp3PuTrKIqw=="; + version = "9.0.1"; + hash = "sha512-N2LRmh6Iz4Gc9XmSiGOgTYZhHltLY8TUjFGfcykwAKu4Dx5dXuwru2zX+4I4AstYqGWACz6rlJDFIqrzEGIvbQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; - version = "9.0.0"; - hash = "sha512-2MkdFDpDUQFBNJsytmLbyv51Jeyl7vG4NoO1ekWAhNa+ZzwVOtgl3VJNlHgsgwGqyYc8VPmbT5ZAFrBNSR3hoQ=="; + version = "9.0.1"; + hash = "sha512-WjdTpBYhgsDflMrvj8laO7tH/Y+UHzDm7FMlt75Oa8k+AunOqjpo8hLgs3ztQcPw+rvqRNe4HTHoswVSUJg7TA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; - version = "9.0.0"; - hash = "sha512-mEW0ITYKnBCRuXQDvFkasb4FaeV1GHobQGb6r/DRZED/u4b7qK9QMA8jDr29LzHdfGlZJL7dsBVyUfjOAvhuxQ=="; + version = "9.0.1"; + hash = "sha512-j4tValfWVEG+UhmS3NGs6nb0Gjwa1tJZjk4kFxaC5iCSXQSd8Qs+0DdH6bOiF5O4GQt9br2WJH8+UlE8S4YbCQ=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.0"; - hash = "sha512-w5DtpHfp82nsMcSM9lyOCEj7pxohn4b8/m4MShhA87WigKB6tVdA9j6xnjC6eX16OvKkhbQ4xJhVfzt3G1d4ng=="; + version = "9.0.1"; + hash = "sha512-WkYnRk7SmmU/iZRz+HEAtCHQWDz718HvEJ7zsrA1bNgA5TI4APWPe0xHnwb9uUmmE9BUyUvEtK+gRxYuA8kLww=="; }) ]; win-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; - version = "9.0.0"; - hash = "sha512-BSXo3XZLsboJN72at4TMCxsZL5vjW5p3dMVtqedpXkmovGakcW0loYY22aCt40JC18i6QbsqzII+/jtTFqRoJg=="; + version = "9.0.1"; + hash = "sha512-yrQ8Mq4CdJ6MO5Pc/8PrlA5yU8XozxuXg4MCRbOIYcOWgJL/S6zW6t0rmspyAlJ3j2PS89NF5bwZyLogM6IZdQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; - version = "9.0.0"; - hash = "sha512-7SEHvvDPaYhWyNhUAurZou1oPrTgibn2k9RBW+falSlmXPq5AIqNi4EODJUbydc1QyyD2vQjRVgXvhF6aJ9s1Q=="; + version = "9.0.1"; + hash = "sha512-m4gtvFK+OpEDeL587Zb6KYddFrWrtb1z9yoG4ts1hU1mYytiZImZbcej8OMm13/eG09JTWFxfgxecJMcwAuhhw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; - version = "9.0.0"; - hash = "sha512-ugVn1CngjzNdGzUNJjzukCwrV9MDZ7DhwIQJMHjFPrF9e0SMHTx9BnY1VDqM24AByFrsyymvm1S4Vj540TpGag=="; + version = "9.0.1"; + hash = "sha512-DZKhEHctFy4d9v2XCIm2tKYfirXNvcMTNf2KBpV1j7mnDAop+S+d9OJ8962JJKqkZFYeDHp5R32RqgI4PDfqsQ=="; }) (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.0"; - hash = "sha512-ELSZhNXrn/PdJ/NBJYdDIVR3fhHY3k4y3gbRDqWwQZioJS3q9g26bvRMLC2dlXC5FhFRFuCTg4vGuK7f6JPPYw=="; + version = "9.0.1"; + hash = "sha512-NGny5Tp4IrpCIUUmt9kosbuFOxLuB/glkrZHvULR/2v1IeUstsW0lP56rds+PBtkN9DY603J6LbikmwUfC/Jyw=="; }) ]; win-x86 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; - version = "9.0.0"; - hash = "sha512-eG/2FruILBj/2d1Viu/9gbYuwXIHGL61UKvvRCUGWIgS72E8LQgqSntuGO83LOk+aLUHVn5cXrFkb4bVTCGB7w=="; + version = "9.0.1"; + hash = "sha512-JmmvPGzjAhPzt/OJfMqEOSPMCbFKjLSjI3JW+spalcj9R2kze2G3xR23TeTIppSY6M6UqHfYtEDLSRQ2mLjBdg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; - version = "9.0.0"; - hash = "sha512-mohCLeSgM6dCZB79u9Uz6qgnp7yLyEPszlHPPXI7R66mrot29ApMwDyVjFYNDv3eK/pcCHOroQKcH5qbnVr6pw=="; + version = "9.0.1"; + hash = "sha512-K4s84fKknMNlenkFs0sSDoVV+m+tRxoZzXJ4QsqqoXYBF940T1Ryxf1Dv88vHmg4QUIEF6t4LeItQHQXQa5xZg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; - version = "9.0.0"; - hash = "sha512-CsjUwZKARvTkcPSQuMIQwaMnKnH40SJVS3F6LTWKSHvy3BXMAdnXAeB1DbAegKZyIaRrqjnIlBv9OJ7/G6V5Xw=="; + version = "9.0.1"; + hash = "sha512-/RZKZuUCUw/V0BTxfFU867msMi28ATMN15TS2AKOboZMFagDXCYaMYGX+IUNDzGxDF0m2B+uE8I+Eh5QHpdHYQ=="; }) (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.0"; - hash = "sha512-PatJv/4NYdABL0jlheOf7mNhMUXgIH79pdhQz4lKFWgLnP7dmiGF102MbFwPs5X7jc1bbPAYhr5wVeLhukN7WA=="; + version = "9.0.1"; + hash = "sha512-/MFc3XgEWV3Wt14/f/qSEitWlbZSzbSJ3uki3ln35HZAlAae4roj1MuZWfW2DL+Dtx7957N34Jndx1nXAAeHvw=="; }) ]; }; in rec { - release_9_0 = "9.0.0"; + release_9_0 = "9.0.1"; aspnetcore_9_0 = buildAspNetCore { - version = "9.0.0"; + version = "9.0.1"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/84aa8e86-c6a1-4562-84f3-828e836ef26c/96772a224b9ff3be8904b63f37d7cf63/aspnetcore-runtime-9.0.0-linux-arm.tar.gz"; - hash = "sha512-9xGvH9F/aXbZhgn+ujLbyLAn47hRQ5qw1aaAgrpvqH7jiIz9jN02i5D8OzcQIgvi3phkq1ApfjeXrcS8uqt+mQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/463fb01d-fcad-46bf-8e5f-0e568bb9ccf4/a3ac380fdc1e29ec25e5fa0a292a61df/aspnetcore-runtime-9.0.1-linux-arm.tar.gz"; + hash = "sha512-+nXY1a6ZreDRq5ABiDn+P13cTnt0YXFcrysL96iMjobh1PEKtpcD0jGLKJwHAIRuIVV0bXuxrOPS0S4XWrGL4Q=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/b2029a3e-c67e-4905-ad1f-08b164322520/bd68ea0b77f12df21b935da338fdaf25/aspnetcore-runtime-9.0.0-linux-arm64.tar.gz"; - hash = "sha512-1d9LVJpZyLmyvO5eD/qf3oH8PfdLKZq0mCCva8DM+4nuw3FOpVj/zdKhaCGk0ezcxk6ZgYBJeO4/8dREuBJWgQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/2a193300-e0b1-4e9e-acc4-a4a695c7b94a/f197be75380aaa333c949bb8a1fe0510/aspnetcore-runtime-9.0.1-linux-arm64.tar.gz"; + hash = "sha512-433BRF5TwAvZUKUx+rgzVN77vgbG9zr0u+8gv87cBIOpj0eDaae8fX5S41srM61zeB4lW0aQDYMeJ3DNRF1pxQ=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/e4791376-b70d-431f-bd98-5397c876b946/64ffc29a4edc8fd70b151c2963b38b09/aspnetcore-runtime-9.0.0-linux-x64.tar.gz"; - hash = "sha512-GoECPxGd1eWw+dh7DjxC34mCS5/LcxkqRnDMLGc1jNAYp8nJZSRceIPeRovaiMgdZKIcYPm8aKZVnXbzLTTOlg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/78308995-ac02-4bed-b5c3-eefb06ff907c/795e0c20df95d8c432fda2a189235b67/aspnetcore-runtime-9.0.1-linux-x64.tar.gz"; + hash = "sha512-5fwwk67VdW3q4+YfmLn0uwyEcxnbMMvRZowlEeBlKcL2peGRfsd2/is2ofe7fgCfySX+5X+HaWqNUCpsj13GEw=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/59a041e1-921e-405e-8092-95333f80f9ca/63e83e3feb70e05ca05ed5db3c579be2/aspnetcore-runtime-9.0.0-linux-musl-arm.tar.gz"; - hash = "sha512-lVjIczCM4nWjZ2Q9lTJxrIh34MNTX8FxfO8BPsN/Qhd/AT3YdaEnGb+dHBUztRWSy4+HGV0eOY5SjuXQsE98Hg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/2cfd68f3-5259-451d-83b1-6b5e80932813/bae5e023e887e42639426dd0824ac6bf/aspnetcore-runtime-9.0.1-linux-musl-arm.tar.gz"; + hash = "sha512-PqVcxQmNwIkJo4Uhn60eOGNfbu9s1m6lJrkt1X92XcNIOAQi5eC5yK3ihuGOcTyqS3/y0Gojw/7TG4tckdLcaw=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/e137f557-83cb-4f55-b1c8-e5f59ccd3cba/b8ba6f2ab96d0961757b71b00c201f31/aspnetcore-runtime-9.0.0-linux-musl-arm64.tar.gz"; - hash = "sha512-+1JVYZ+gwQggILdQeJ6Gk2zBoHueMhKX468zavO3911CXCD66fTdnXbAsE1ETh5t0V/VRf7sD2qRN6ZHAa1GMw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/f3b0e483-26b2-4115-8a8d-983c9b0ca58a/4d0058d82438c8de99347f40d3dee091/aspnetcore-runtime-9.0.1-linux-musl-arm64.tar.gz"; + hash = "sha512-6afiV/awnkjFIrclvoq0mOVxidZof4QKN6uf5BkumFvd2ZpmNBjF1dlu58fCufcOCPeGqkobIHVIWGvT/MNxDg=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/86d7a513-fe71-4f37-b9ec-fdcf5566cce8/e72574fc82d7496c73a61f411d967d8e/aspnetcore-runtime-9.0.0-linux-musl-x64.tar.gz"; - hash = "sha512-CeNwlmTwmbQRb4oqrEs2UkfRHQ0Z7K4mKUneOPqdQcxsUhpn5bH/7NY8YQwem0FFm/sY9iudnTtRduOFbprTWw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/d55550d5-16dc-4b17-90c7-e8bf65657e09/b3d4c31dd4c933aaa50e920f5465b111/aspnetcore-runtime-9.0.1-linux-musl-x64.tar.gz"; + hash = "sha512-0/YJGElZhJ91JP37VcXPmoOR0KdzSDqmZZ2bqhUmVoNfJsL+m6Mi5xio63eB+5lutOvGlTvq9v37VijvMb/IUw=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/a9c3126c-91ab-4ab1-bc0a-e6bbeee7a786/3f848ed6f804c50f3a4c24599361e0eb/aspnetcore-runtime-9.0.0-osx-arm64.tar.gz"; - hash = "sha512-SqMDfluLcj9p1Z6nM3gNzstcjhevkk2UWzaSN7/61qahHO+/tttc+y4fKB4jhayI6CUxILGlL025MYYITyMPUQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/26f85624-0eaf-4edc-a83f-428472ab31df/ba32371bac29f1738b9b0eb959dab0a3/aspnetcore-runtime-9.0.1-osx-arm64.tar.gz"; + hash = "sha512-uKs4mbELhxFZsBiJaUSEzD2bOueKFZY41oZJoiw/Myi5LENcW830moa8SIu70PynFD9vZk9llMVSQjw36tmZmA=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/b3d48d74-e9f8-4b6c-9ef7-6f5729873f21/2139bfd7650c0fd8ddce3195ada43ae8/aspnetcore-runtime-9.0.0-osx-x64.tar.gz"; - hash = "sha512-6neKeqfuzSxGw4sYcRngr9sCUydDVQpL28VqkSXjKKCJwWr3TD/+ZJJj9FbvJvX8O5MvTR9202pHy0GfIDxlhw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/6655b880-82dc-43d1-b5b2-f76d6a3c431c/4752d9d4811a2148de7eef5dcfd08441/aspnetcore-runtime-9.0.1-osx-x64.tar.gz"; + hash = "sha512-SusJQ4d9v5NfZVTGN9KqGPjvIulpLmzT1xbd4t1UEeSIF2fL6cVUvY7EPCCahqJhlMJhjGDRFboGOOkugEI8wA=="; }; }; }; runtime_9_0 = buildNetRuntime { - version = "9.0.0"; + version = "9.0.1"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/8f639af4-29e2-474e-ad2d-ad1845c09e21/d6a1fac24aa5bed41dcc8c35017a44f4/dotnet-runtime-9.0.0-linux-arm.tar.gz"; - hash = "sha512-+rVS322IQJCrofZYyIErU2npvqF+ah+QUUXN5RJ3K1fbXVz1hsbCt/Llaoy4PCBvDPdZS89C0yhEuBA1OL2IPw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/f8762afd-ce2a-461c-9280-0f6c377b92a7/9ca2330917e1ed7dadd5f1838b6ba44d/dotnet-runtime-9.0.1-linux-arm.tar.gz"; + hash = "sha512-sczLhtqZEvy4FkE3GOJk2Jnp78QqGf2KbMuCZbZc5P6Mh40LjVwGM7Hg5LL/PuUzE6ZuP5LDsVP73+METxvMlg=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/3ae34de0-5928-47c4-9abb-e0b8f795c256/1ea2ed5a50af003121ebf32cb218258e/dotnet-runtime-9.0.0-linux-arm64.tar.gz"; - hash = "sha512-T5wt1USvC4VAwWNSufAfdfgouOTghAV6MApN7GUvs9ZTKQbN1CRjmcwT8WtXGxdXWBLsL5wpfie77WeLr0sv3g=="; + url = "https://download.visualstudio.microsoft.com/download/pr/8a8a85c8-3364-42e4-a9fa-bc4d33e4a263/cb6b67c1ef5a8fd779dc43096c1f2a14/dotnet-runtime-9.0.1-linux-arm64.tar.gz"; + hash = "sha512-ODmbYTn3LvHYNuQYRVSUqAQov0HzqvI1F0n/FEMRdmSHUz1aPJvTWcGJuTc/JDd66IaCf0UnLEAZ4itZR3O4ew=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/282bb881-c2ae-4250-b814-b362745073bd/6e15021d23f704c0d457c820a69a3de6/dotnet-runtime-9.0.0-linux-x64.tar.gz"; - hash = "sha512-UXa9aGN2Rs02/Oeoj4Pv/hBl+wdebUpGuL48M9WoOUdAV38O1Pi0+xP6af6DsinrVat/RcqskISb8DkqZw7Vrw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/4ec0d4e4-9774-4d69-b9a2-db99ccb24a1a/b108f97029f83c8a27d041e90583ba5c/dotnet-runtime-9.0.1-linux-x64.tar.gz"; + hash = "sha512-1KMZRKWrBjA33KUUHbyEZtDIlLjSVgJWeCvb5ajoZYXoxMeJxA++UdVrOFPhWtugmFvcaukchadjVlMW4cPPyw=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/f2566d5b-8b22-460e-86fa-94388974ab09/a4ae7832d06be1e5ef0b55ecc22b1ad1/dotnet-runtime-9.0.0-linux-musl-arm.tar.gz"; - hash = "sha512-l9wd3KwXfXO1F9ZRMm7EhOrFJQHFBsjIN8P5zq9Hbd+SnM7Om23CwKTn03hXb9c5MKiDWBRpBjGlYGQlJzNbMw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/391e3ee0-16aa-4294-8641-3438307e624d/d244e58fbeff1482b0f8d3aacc6cc621/dotnet-runtime-9.0.1-linux-musl-arm.tar.gz"; + hash = "sha512-rIp746sIlVOYE8H2fDOqk+5y4qx/LYjuPKIfFEeeEaQGTN6afhWilEIiuNfChY3dOd6fbC0ni0Ep9eO6i5w44w=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/51a64e2f-043f-460b-a048-ea79617d9a06/b3274372b27c70fc4da62cc994890f8d/dotnet-runtime-9.0.0-linux-musl-arm64.tar.gz"; - hash = "sha512-M1IzZNkxC3XZgZpIZrEgwDue95Rr02RrFZMON/8eIR3ilMipS0rWwcD30pHLcGAaQYjjltQlL1dno2ptvmhQKg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/966184c6-ae9d-42d9-a5d6-1f14c46ffafd/fc65efc3447d3f1dced1c156742be6fa/dotnet-runtime-9.0.1-linux-musl-arm64.tar.gz"; + hash = "sha512-z2hldU48KLY79Oc9uVogeQKLkTL/xr7kqnrwPuFcdWChPQcmCWWDO0OYXYteL1Cndv8Xv1NDYFscG8I53a88XA=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/53729aa8-9540-4ddc-ad77-4b7126b36b30/5156249a151c4d334c19c89bb63b940d/dotnet-runtime-9.0.0-linux-musl-x64.tar.gz"; - hash = "sha512-nDPXOomPqbToSuGERGi2kIaXn3wsjqazLbD+pipAFFE86gYZAl+e2yPmerSuTi8nJdHZu4koWLun3+jtF67nmQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/dec9d9de-effe-48df-83b1-0c83f54e4cbc/cfe914fe2e2e9edb6138ce9328051f10/dotnet-runtime-9.0.1-linux-musl-x64.tar.gz"; + hash = "sha512-ObxzvnEq/KtBQlwuQqpQmBM8+aIID5HUxl8nTCxrxvgSeToX+O1rOlvKveTMXuW+g9yb750/OxDXnQ0/ALS1Xw=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/013e0f03-e1e4-4f97-a5cc-e6504f684620/0c0ea6a0c124d87027d8ff6abeb7b697/dotnet-runtime-9.0.0-osx-arm64.tar.gz"; - hash = "sha512-ZsSHri9fwk1bqv37QobiNzdmS9PvwYGrwxz13tYNwi5LoXkXRKUG2jQ+YDSx/Not7nYdnnEimUWhd7dQi6bdtg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/5c1d13ac-90d1-4f76-bcb1-d404b1ef6748/137435417c82ec2a5a519555b93b2344/dotnet-runtime-9.0.1-osx-arm64.tar.gz"; + hash = "sha512-9l9lDuPCicoJL6FRo9nPNP6i9UJvCYgsGU/nFlXsrypoGy1Qi5x4SdbJCMpnliXcSBcdAFgM3/f5gfBRioQ8ZQ=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/4be484a1-a095-48cf-8407-cae1d3dcc944/9f373dc1d85022e004df3ac1071ace59/dotnet-runtime-9.0.0-osx-x64.tar.gz"; - hash = "sha512-Hr1ql6t0T+dSBoY51naxRZYNggUBx5J1FARQfo2CzZJo1+I5xDf53nOwgUHDtpO7JO6zzzuvMOO/M7Rgu5XUsA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/36d3662e-b23c-46cb-994c-3a46bf2b9759/2c090a2be99f96cb33a56183e747e27b/dotnet-runtime-9.0.1-osx-x64.tar.gz"; + hash = "sha512-uZfCwPA1DvKbpuhlrAnr7LHTYy4qdWG1q+I70PtqvIwMpziNbPF8WcqH3YFoYE3taDmnsWzqGvvjbKVyNFFeGw=="; }; }; }; sdk_9_0_1xx = buildNetSdk { - version = "9.0.101"; + version = "9.0.102"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/fa0fa6b6-8db2-441e-a393-2dd2f5c841b9/19b664790a03e20ce4069449eaa74b21/dotnet-sdk-9.0.101-linux-arm.tar.gz"; - hash = "sha512-zfiYnQLkpqoh5oCB6VYxjJTGAVg6dX1etDORnr5/pRjyB6oPWKCe4oz5X0RcSGOGwineaYkUM6SikUXvWWqhpA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/8f7ff743-f739-4b7c-835b-9405b3f7604f/b903530c774c08f30d3de3029f2e0bf9/dotnet-sdk-9.0.102-linux-arm.tar.gz"; + hash = "sha512-LExp1Gw+V+2ZBRip2CljZl2DXGalfaVLnSHiLCog6AGAINyxkO71Tf5owAH8zjhTYesr0piWMRoWg1mf+eandw=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/93a7156d-01ef-40a1-b6e9-bbe7602f7e8b/3c93e90c63b494972c44f073e15bfc26/dotnet-sdk-9.0.101-linux-arm64.tar.gz"; - hash = "sha512-xfnBfd7VEBy0tlrRAzrk2C/FsEMDvc5OthptxH76hCAr1ybQXK8RflNqAb14rXc7jSPL9DvGVeXrmRKxIHjgsQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/555b12ca-d25f-4d4a-8c62-03b57998981e/b8f8f88c7809ea6c0e1d127deb18d8c6/dotnet-sdk-9.0.102-linux-arm64.tar.gz"; + hash = "sha512-y3iTHcu5SKUEiR8RLxEhXyeS0WnwoLU+qoHAP8S6eNMakcYKQYCa5uLdyuhkAIWhWeSSA1zt/aaNJlu+tL+LLg=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/d74fd2dd-3384-4952-924b-f5d492326e35/e91d8295d4cbe82ba3501e411d78c9b8/dotnet-sdk-9.0.101-linux-x64.tar.gz"; - hash = "sha512-kbN+/WQkLl8fPCAl0YPrNOF/OpJxxWAvKd33lIRe7hA3I++VXthpeI6/WnMejdxpMoeZySxkyxGOEyjSWaatAQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/0e717d01-aad7-475a-8b67-50c59cf043b1/6eaa1c636e15ec8e1b97b3438360c770/dotnet-sdk-9.0.102-linux-x64.tar.gz"; + hash = "sha512-8JNQfvY1w/jlcr97bqfhRLhcz2t8b5FNPxgveCIApgiHKGY99cmr4GOMm9Jz/eN2nsgkplFvX85zTEpGZM4wmQ=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/5528c94e-1708-4291-917f-c9b693df3389/b851b22328c11e88f9fb61ea3e18582f/dotnet-sdk-9.0.101-linux-musl-arm.tar.gz"; - hash = "sha512-fmVg5puDueZJYekRVfhYVCHDos52iXhx04ZJLGI+koD2byKE3Ek2K8OHOeSBclI85UsiaVJENzlOo+kIcooBGA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/db81a835-d9dc-4094-9c5c-cda20e684556/2d80354042afe6c8a2ef2f54c48a86cf/dotnet-sdk-9.0.102-linux-musl-arm.tar.gz"; + hash = "sha512-42Pj1O3Kk4MNGLzr1B4BvyhWsJWucOGiSwUzq7ClB+TB8VQv8wRsKFaJMY2sfitccaFmvLWTOoq2jYAL8+7fAw=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/a8f1d5c7-c724-451c-8659-fe6ea4e72ea8/1c90dea91c1e117b96198bdccdc0b594/dotnet-sdk-9.0.101-linux-musl-arm64.tar.gz"; - hash = "sha512-am1qbW372stIN0wKyb2xyTeB85cMh3iwvuHxWaIrABdoaCZOYFMx/vgzy5/tgptP/UFCdtDRFAqLDiVxlcLzdA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/a35ae2c2-e906-4bb1-b12a-a9d435231626/d0da093a240d41c06da2f49dc3011a13/dotnet-sdk-9.0.102-linux-musl-arm64.tar.gz"; + hash = "sha512-XamORsKA4hw3NKDJCB5923itYndaUaEptCpvAhMw0mOoddovRKeq/oFW58muD5uyG1AgV2krNg8q/giC8OYRMg=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/73c11b94-0188-458f-b599-f7591718fc28/c44e21ffbf353b50ef88a76122e89e24/dotnet-sdk-9.0.101-linux-musl-x64.tar.gz"; - hash = "sha512-P04U+3tS37V7HjHLWXPm4KM49/Aw8SswgtO1XxL5WH3fSSanxfz4a3ZxOX5E+OXCD7lJ1w6afdDcJ75zpUjf/A=="; + url = "https://download.visualstudio.microsoft.com/download/pr/5e11d2af-f335-44f6-90a0-a99cdf806855/97268da6caffc1e8182525c7a2f01b74/dotnet-sdk-9.0.102-linux-musl-x64.tar.gz"; + hash = "sha512-YOCRhU0X2ppgEVafCkgZ6scs5v4G0BdX/uuDrVbBdkX6Q4JXYx7Lv27pSsOpc+/5rU0+Et6t2j60HBtpyo1TCA=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/6707b71c-f95b-46b9-a4f8-067922291242/93d5be41bfa39461c47bae856a8ad93c/dotnet-sdk-9.0.101-osx-arm64.tar.gz"; - hash = "sha512-xmCO0oDlp2xGzo+bBrjHAUx721SpeVxFhd644FfbTVJAN+ToL5yvMkRO7eQnyctf27ciUI84nviahk8LuuR2ag=="; + url = "https://download.visualstudio.microsoft.com/download/pr/1b4a1593-695b-4496-aa2a-55fa572bd71a/3b44622f52d4695513dff04f0bbcc404/dotnet-sdk-9.0.102-osx-arm64.tar.gz"; + hash = "sha512-E2MsnljY+kbxkSVtGA7RkIngiyQogYJd02gvCC1lvMbZdWYp/v2rYJwRJltgQ9wRY1Jj/odhM5ty02YIrLQ1dA=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/330381bd-72dc-47ba-b5fb-884bd8b0bb44/8f1eef9415fc29a806fbf80a54e28c0e/dotnet-sdk-9.0.101-osx-x64.tar.gz"; - hash = "sha512-DBPjCBNI3SvPLgxrhLw3X4BlUPbDibH8phdnrWuQBDAK9yct4Zk1jzKv7ylVE7pexD9fhhTRJDe7iEvo7KTeAQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/373e3b64-d88b-4d83-adf3-eb48a6d6e76c/0d24e9cdbb0e75999fc0c17dafb1ea17/dotnet-sdk-9.0.102-osx-x64.tar.gz"; + hash = "sha512-Aj6RC2SBmZGDGqDlMEQ/qYX6Zzkg/ykVQa17ekpTLiD1rIn5qRsulWz2mzgh7xNpgoz0bFROGDqFQlrktyXhhw=="; }; }; inherit commonPackages hostPackages targetPackages; diff --git a/pkgs/development/compilers/dotnet/9/deps.json b/pkgs/development/compilers/dotnet/9/deps.json index c42c4683d3f6..972f098ae4a0 100644 --- a/pkgs/development/compilers/dotnet/9/deps.json +++ b/pkgs/development/compilers/dotnet/9/deps.json @@ -1,50 +1,50 @@ [ { "pname": "runtime.linux-arm64.Microsoft.NETCore.ILAsm", - "sha256": "b8f49d6acc5cf38bc6a8d7bc172e20a088f831f2a354a70cb1d94c155434ba20", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/9.0.0/runtime.linux-arm64.microsoft.netcore.ilasm.9.0.0.nupkg", - "version": "9.0.0" + "sha256": "d30418fb378bd58b9ebc313a6a92bbadf47ec40994ffe41b4d4ac65e303f16fc", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/3698578c-d33d-473f-9ffc-769cfbd11be7/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/9.0.1-servicing.24610.10/runtime.linux-arm64.microsoft.netcore.ilasm.9.0.1-servicing.24610.10.nupkg", + "version": "9.0.1-servicing.24610.10" }, { "pname": "runtime.linux-arm64.Microsoft.NETCore.ILDAsm", - "sha256": "2ecf25ffcac73309c42038df1a62a6ca500449ce535d799329fcb348aa04be64", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/9.0.0/runtime.linux-arm64.microsoft.netcore.ildasm.9.0.0.nupkg", - "version": "9.0.0" + "sha256": "a0a4c94e5b5de561fa0b8af865c01deed50801df89fdeb01c164937e09a767c7", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/3698578c-d33d-473f-9ffc-769cfbd11be7/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/9.0.1-servicing.24610.10/runtime.linux-arm64.microsoft.netcore.ildasm.9.0.1-servicing.24610.10.nupkg", + "version": "9.0.1-servicing.24610.10" }, { - "hash": "sha256-3EuR5zM7UiQu0ToG/aMV8L29UHuKILaWhH19enXaews=", + "hash": "sha256-locqMqWx8GnnuCRgzOorkB+60h1EC7j/XD3W06DNyPo=", "pname": "runtime.linux-x64.Microsoft.NETCore.ILAsm", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/9.0.0/runtime.linux-x64.microsoft.netcore.ilasm.9.0.0.nupkg", - "version": "9.0.0" + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/3698578c-d33d-473f-9ffc-769cfbd11be7/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/9.0.1-servicing.24610.10/runtime.linux-x64.microsoft.netcore.ilasm.9.0.1-servicing.24610.10.nupkg", + "version": "9.0.1-servicing.24610.10" }, { - "hash": "sha256-jysSKamLhOajPQTC9V9/5uVusoeOQqBoLtHCySGyFX4=", + "hash": "sha256-02kUppq6iFP6CTbe+WF27pxjWHgYSe1IKhWib2QWQws=", "pname": "runtime.linux-x64.Microsoft.NETCore.ILDAsm", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/9.0.0/runtime.linux-x64.microsoft.netcore.ildasm.9.0.0.nupkg", - "version": "9.0.0" + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/3698578c-d33d-473f-9ffc-769cfbd11be7/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/9.0.1-servicing.24610.10/runtime.linux-x64.microsoft.netcore.ildasm.9.0.1-servicing.24610.10.nupkg", + "version": "9.0.1-servicing.24610.10" }, { "pname": "runtime.osx-arm64.Microsoft.NETCore.ILAsm", - "sha256": "c8ac435b674ae3b5736a6a64a921fdc4334091401c531839f0026d48de90bc25", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/9.0.0/runtime.osx-arm64.microsoft.netcore.ilasm.9.0.0.nupkg", - "version": "9.0.0" + "sha256": "0ef392c9212699a31e864343b7af0bafe69e317f899865390d049e52e9cf0042", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/3698578c-d33d-473f-9ffc-769cfbd11be7/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/9.0.1-servicing.24610.10/runtime.osx-arm64.microsoft.netcore.ilasm.9.0.1-servicing.24610.10.nupkg", + "version": "9.0.1-servicing.24610.10" }, { "pname": "runtime.osx-arm64.Microsoft.NETCore.ILDAsm", - "sha256": "93599b897ef76bdf0de88cdd19e17356bef1e1bab5feb437110470825285d438", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/9.0.0/runtime.osx-arm64.microsoft.netcore.ildasm.9.0.0.nupkg", - "version": "9.0.0" + "sha256": "b591887fe0152c66b7f8994e8b6b869bc33f5a6d6521ae502e953e2164040c2a", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/3698578c-d33d-473f-9ffc-769cfbd11be7/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/9.0.1-servicing.24610.10/runtime.osx-arm64.microsoft.netcore.ildasm.9.0.1-servicing.24610.10.nupkg", + "version": "9.0.1-servicing.24610.10" }, { "pname": "runtime.osx-x64.Microsoft.NETCore.ILAsm", - "sha256": "0d2442c1ff5c7bebf8afcacfed6c44753c1a5a68b449cbd3b3f1d6988a6b30eb", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/9.0.0/runtime.osx-x64.microsoft.netcore.ilasm.9.0.0.nupkg", - "version": "9.0.0" + "sha256": "cf8ac15e33b74d1a43a9502c9a5374f8aaf03dbf85067e33e6872fdc09861226", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/3698578c-d33d-473f-9ffc-769cfbd11be7/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/9.0.1-servicing.24610.10/runtime.osx-x64.microsoft.netcore.ilasm.9.0.1-servicing.24610.10.nupkg", + "version": "9.0.1-servicing.24610.10" }, { "pname": "runtime.osx-x64.Microsoft.NETCore.ILDAsm", - "sha256": "06c524fbade13b87e1db73d3b3399af19d1b08f80317b57d573698bb949699ad", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/9.0.0/runtime.osx-x64.microsoft.netcore.ildasm.9.0.0.nupkg", - "version": "9.0.0" + "sha256": "8f5e4a0ee3e0ecbd03eb5346133cfc5a3ca98408a4414d8d90bcd025c2e8fee9", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/3698578c-d33d-473f-9ffc-769cfbd11be7/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/9.0.1-servicing.24610.10/runtime.osx-x64.microsoft.netcore.ildasm.9.0.1-servicing.24610.10.nupkg", + "version": "9.0.1-servicing.24610.10" } ] diff --git a/pkgs/development/compilers/dotnet/9/release-info.json b/pkgs/development/compilers/dotnet/9/release-info.json index f8b33bdc6057..ae3e59d6c7b2 100644 --- a/pkgs/development/compilers/dotnet/9/release-info.json +++ b/pkgs/development/compilers/dotnet/9/release-info.json @@ -1,5 +1,5 @@ { - "tarballHash": "sha256-R8bEKOihS0aWGa0YaNvq79O5nJ8WEWp8aVrkSqV7Cms=", - "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.101-servicing.24575.1.centos.9-x64.tar.gz", - "artifactsHash": "sha256-Y9uBWfjTR+WypjxQwi/QBxWAAQAJLuL26+NiKxzNkfs=" + "tarballHash": "sha256-HK/T1lBzQ4PwAY+KZfQ/TJQ8aauPwwDLQbmuj9a1Jmo=", + "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.102-servicing.24611.1.centos.9-x64.tar.gz", + "artifactsHash": "sha256-xW5OiDOKi5+dkCA7DdeLOizpDUDHuquQ5A1R5Pk7S6U=" } diff --git a/pkgs/development/compilers/dotnet/9/release.json b/pkgs/development/compilers/dotnet/9/release.json index 9a11ff05c578..852b8a0db6f1 100644 --- a/pkgs/development/compilers/dotnet/9/release.json +++ b/pkgs/development/compilers/dotnet/9/release.json @@ -1,10 +1,10 @@ { - "release": "9.0.1", + "release": "9.0.2", "channel": "9.0", - "tag": "v9.0.1", - "sdkVersion": "9.0.102", - "runtimeVersion": "9.0.1", - "aspNetCoreVersion": "9.0.1", + "tag": "v9.0.2", + "sdkVersion": "9.0.103", + "runtimeVersion": "9.0.2", + "aspNetCoreVersion": "9.0.2", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "1cf154a56d078c531cc830e95a7cfdbc4fe1113c" + "sourceVersion": "c4e5fd73fe5d8c004bf46cb4f1ded77ca8124b1a" } diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 02f1f411cb5f..6b6d9391f45d 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -161,8 +161,9 @@ pkgs # https://github.com/dotnet/source-build/issues/3667 sdk_8_0_3xx = combineSdk sdk_8_0_1xx pkgs.sdk_8_0_3xx-bin; sdk_8_0_4xx = combineSdk sdk_8_0_1xx pkgs.sdk_8_0_4xx-bin; + sdk_9_0_2xx = combineSdk sdk_9_0_1xx pkgs.sdk_9_0_2xx-bin; sdk_8_0 = sdk_8_0_4xx; - sdk_9_0 = sdk_9_0_1xx; + sdk_9_0 = sdk_9_0_2xx; sdk_8_0-source = sdk_8_0_1xx; sdk_9_0-source = sdk_9_0_1xx; runtime_8_0 = sdk_8_0.runtime; From 0e971ddda5062488ea32c96711b1bd1dcfda17fe Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 18 Feb 2025 13:54:53 -0400 Subject: [PATCH 0917/1107] bicep: relax dotnet SDK rollForward --- pkgs/by-name/bi/bicep/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/bi/bicep/package.nix b/pkgs/by-name/bi/bicep/package.nix index 2f72cd05cdcf..6a35c139b3c4 100644 --- a/pkgs/by-name/bi/bicep/package.nix +++ b/pkgs/by-name/bi/bicep/package.nix @@ -5,6 +5,7 @@ fetchFromGitHub, dotnetCorePackages, mono, + jq, }: buildDotnetModule rec { @@ -20,6 +21,9 @@ buildDotnetModule rec { postPatch = '' substituteInPlace src/Directory.Build.props --replace-fail "true" "" + # Upstream uses rollForward = disable, which pins to an *exact* .NET SDK version. + jq '.sdk.rollForward = "latestMinor"' < global.json > global.json.tmp + mv global.json.tmp global.json ''; projectFile = [ @@ -33,6 +37,8 @@ buildDotnetModule rec { dotnet-runtime = dotnetCorePackages.runtime_8_0; + nativeBuildInputs = [ jq ]; + doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); # mono is not available on aarch64-darwin nativeCheckInputs = [ mono ]; From b921710b503a3244aeb739e5e2465c8ad903875c Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Tue, 18 Feb 2025 09:55:14 -0800 Subject: [PATCH 0918/1107] maintainers: add josh --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9d90ff6dd4f4..6b8313b1653e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11477,6 +11477,12 @@ github = "josephsurin"; githubId = 14977484; }; + josh = { + name = "Joshua Peek"; + email = "josh@joshpeek.com"; + github = "josh"; + githubId = 137; + }; joshainglis = { name = "Josha Inglis"; email = "joshainglis@gmail.com"; From b9ae16305487198d1553e78a7ad9c7b8e2cfa1af Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Sun, 16 Feb 2025 09:49:59 -0800 Subject: [PATCH 0919/1107] age-plugin-tpm: 0.2.0 -> 0.3.0 --- nixos/tests/age-plugin-tpm-decrypt.nix | 33 +++++++++++++++++++ nixos/tests/all-tests.nix | 1 + pkgs/by-name/ag/age-plugin-tpm/package.nix | 19 ++++++++--- .../ag/age-plugin-tpm/tests/encrypt.nix | 18 ++++++++++ 4 files changed, 66 insertions(+), 5 deletions(-) create mode 100644 nixos/tests/age-plugin-tpm-decrypt.nix create mode 100644 pkgs/by-name/ag/age-plugin-tpm/tests/encrypt.nix diff --git a/nixos/tests/age-plugin-tpm-decrypt.nix b/nixos/tests/age-plugin-tpm-decrypt.nix new file mode 100644 index 000000000000..d46bc875be18 --- /dev/null +++ b/nixos/tests/age-plugin-tpm-decrypt.nix @@ -0,0 +1,33 @@ +{ pkgs, lib, ... }: +{ + name = "age-plugin-tpm-decrypt"; + meta = with lib.maintainers; { + maintainers = [ + sgo + josh + ]; + }; + + nodes.machine = + { pkgs, ... }: + { + virtualisation.tpm.enable = true; + environment.systemPackages = with pkgs; [ + age + age-plugin-tpm + ]; + }; + + testScript = '' + machine.start() + + machine.succeed("age-plugin-tpm --generate --output identity.txt") + machine.succeed("age-plugin-tpm --convert identity.txt --output recipient.txt") + machine.succeed("echo -n 'Hello World' >data.txt") + + machine.succeed("age --encrypt --recipients-file recipient.txt --output data.age data.txt") + data = machine.succeed("age --decrypt --identity identity.txt data.age") + + assert data == "Hello World" + ''; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 23beacd88d27..80eac3c033a9 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -112,6 +112,7 @@ in { aesmd = runTestOn ["x86_64-linux"] ./aesmd.nix; agate = runTest ./web-servers/agate.nix; agda = handleTest ./agda.nix {}; + age-plugin-tpm-decrypt = runTest ./age-plugin-tpm-decrypt.nix; agorakit = runTest ./web-apps/agorakit.nix; airsonic = handleTest ./airsonic.nix {}; akkoma = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./akkoma.nix {}; diff --git a/pkgs/by-name/ag/age-plugin-tpm/package.nix b/pkgs/by-name/ag/age-plugin-tpm/package.nix index 0e8dc385600d..73437e75bd37 100644 --- a/pkgs/by-name/ag/age-plugin-tpm/package.nix +++ b/pkgs/by-name/ag/age-plugin-tpm/package.nix @@ -1,27 +1,31 @@ { lib, + callPackage, buildGoModule, fetchFromGitHub, + nixosTests, swtpm, openssl, + age, }: buildGoModule rec { pname = "age-plugin-tpm"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "Foxboron"; repo = "age-plugin-tpm"; - rev = "v${version}"; - hash = "sha256-oTvK8U5j+llHgoChhGb+vcUrUf9doVYxd3d5MEuCNz8="; + tag = "v${version}"; + hash = "sha256-yr1PSSmcUoOrQ8VMQEoaCLNvDO+3+6N7XXdNUyYVz9M="; }; proxyVendor = true; - vendorHash = "sha256-veduD0K3Onkqvyg9E5v854a6/8UIRQZEH098lUepRNU="; + vendorHash = "sha256-VEx6qP02QcwETOQUkMsrqVb+cOElceXcTDaUr480ngs="; nativeCheckInputs = [ + age swtpm ]; @@ -34,12 +38,17 @@ buildGoModule rec { "-w" ]; + passthru.tests = { + encrypt = callPackage ./tests/encrypt.nix { }; + decrypt = nixosTests.age-plugin-tpm-decrypt; + }; + meta = with lib; { description = "TPM 2.0 plugin for age (This software is experimental, use it at your own risk)"; mainProgram = "age-plugin-tpm"; homepage = "https://github.com/Foxboron/age-plugin-tpm"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ kranzes sgo diff --git a/pkgs/by-name/ag/age-plugin-tpm/tests/encrypt.nix b/pkgs/by-name/ag/age-plugin-tpm/tests/encrypt.nix new file mode 100644 index 000000000000..fe652b30792b --- /dev/null +++ b/pkgs/by-name/ag/age-plugin-tpm/tests/encrypt.nix @@ -0,0 +1,18 @@ +{ + runCommand, + age, + age-plugin-tpm, +}: +runCommand "age-plugin-tpm-encrypt" + { + nativeBuildInputs = [ + age + age-plugin-tpm + ]; + # example pubkey from Foxboron/age-plugin-tpm README + env.AGE_RECIPIENT = "age1tpm1qg86fn5esp30u9h6jy6zvu9gcsvnac09vn8jzjxt8s3qtlcv5h2x287wm36"; + } + '' + echo "Hello World" | age --encrypt --armor --recipient "$AGE_RECIPIENT" + touch $out + '' From 613a39c66e9e3ad85d50a7ca2ea052f70475f356 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 18 Feb 2025 17:38:32 +0300 Subject: [PATCH 0920/1107] kdePackages: Plasma 6.3.0 -> 6.3.1 --- pkgs/kde/generated/sources/plasma.json | 402 +++++++++--------- pkgs/kde/plasma/kwin/default.nix | 7 - pkgs/kde/plasma/plasma-desktop/default.nix | 5 + .../kde/plasma/plasma-desktop/fix-build.patch | 107 +++++ 4 files changed, 313 insertions(+), 208 deletions(-) create mode 100644 pkgs/kde/plasma/plasma-desktop/fix-build.patch diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json index 4fcd394c04a1..9b10cdc176d1 100644 --- a/pkgs/kde/generated/sources/plasma.json +++ b/pkgs/kde/generated/sources/plasma.json @@ -1,337 +1,337 @@ { "bluedevil": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/bluedevil-6.3.0.tar.xz", - "hash": "sha256-uqgVjWesGDHzIwx828RAw9Vt6BRwg8gZUv2i2azssoQ=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/bluedevil-6.3.1.tar.xz", + "hash": "sha256-qRNYzGSs6s6Sc8KTnOMlyROu7f6Jb1NYHJ7ECHJY/6s=" }, "breeze": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/breeze-6.3.0.tar.xz", - "hash": "sha256-e7UN1mLjXf2u7JWPrUIU5sPBRISRmrEqVFoRCfvgiZU=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/breeze-6.3.1.tar.xz", + "hash": "sha256-LHP1WTyXZh/CX7GveqApzbv5N0y4QrA2tVPAvMSZlRw=" }, "breeze-grub": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/breeze-grub-6.3.0.tar.xz", - "hash": "sha256-sQCf31ZSG9KEAnRjnM5AXRDiDldJKrYrWSuBWmGFvhw=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/breeze-grub-6.3.1.tar.xz", + "hash": "sha256-coKBDmb3kZouawD3JVqke8l1ObzY8Jmj+IYhxbBqA/s=" }, "breeze-gtk": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/breeze-gtk-6.3.0.tar.xz", - "hash": "sha256-Jrd9zu3h8mh99jZlxLoODnnbyarO/HSFhQL4Fu0yZfg=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/breeze-gtk-6.3.1.tar.xz", + "hash": "sha256-QMpeQYixJ6p2L8SXKicHQcMvbOsYScQd9WkrjE4qJ6U=" }, "breeze-plymouth": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/breeze-plymouth-6.3.0.tar.xz", - "hash": "sha256-BYlAsh647wIQ3RHMsOwfjiDBe2jOi404vE7qImBQBII=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/breeze-plymouth-6.3.1.tar.xz", + "hash": "sha256-Gd4ZnckVgpspWoN9FD92Y4VUgh/GYm+vmUHAEWDXTg4=" }, "discover": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/discover-6.3.0.tar.xz", - "hash": "sha256-v1kqF0opluIQgfK+wGjb7umrlF3w7s8tRlvkSOAj6ps=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/discover-6.3.1.tar.xz", + "hash": "sha256-RKgnKj/JEiaNiyRh/tbnGT4OZtJ4WO1bus0LjlMZpxg=" }, "drkonqi": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/drkonqi-6.3.0.tar.xz", - "hash": "sha256-ZSu8VecEccp6zxONgKI3/PXhB+QNKssOx58DqtUAlIk=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/drkonqi-6.3.1.tar.xz", + "hash": "sha256-01sur6jzbogJxHrMlh4b5PhTSLZVF4wkzXLckSbWj5c=" }, "flatpak-kcm": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/flatpak-kcm-6.3.0.tar.xz", - "hash": "sha256-9XmPHQzO6bUCicy0EHFdNf7N5f0a181ITJGPFJxtUSE=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/flatpak-kcm-6.3.1.tar.xz", + "hash": "sha256-zmVSFjhLPODKYh/xz7gUe3TMv7r+cwZOYHwU08aSSYU=" }, "kactivitymanagerd": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/kactivitymanagerd-6.3.0.tar.xz", - "hash": "sha256-Il9k5WjlWePm7I6aBS2E+zxVfhbp1PgbVnGZCBGnVe4=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/kactivitymanagerd-6.3.1.tar.xz", + "hash": "sha256-tDX7BE9mZIt8l2l5y7jeFWf846UR6E1hJ20WNxGc3qQ=" }, "kde-cli-tools": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/kde-cli-tools-6.3.0.tar.xz", - "hash": "sha256-zMvNc38fQz8u6xfuHjuMwQtnOhO2hbwNYKORl4/Jezs=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/kde-cli-tools-6.3.1.tar.xz", + "hash": "sha256-MvjUlbbKSwmNIoXpRyEcAZXuVTsYfeeSyirUoLA8upA=" }, "kde-gtk-config": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/kde-gtk-config-6.3.0.tar.xz", - "hash": "sha256-9SkQ8j7zamMDfkASSozxU2JygK45s/ijHtHy20iHmE8=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/kde-gtk-config-6.3.1.tar.xz", + "hash": "sha256-45cnMqaWl2csiTPeoh/cMohbKKRwcbvP2HkScNWC1io=" }, "kdecoration": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/kdecoration-6.3.0.tar.xz", - "hash": "sha256-dPf0r8oQoKN5FSM8gAM82zMqf59Fr8ZNDDjGCrotXdM=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/kdecoration-6.3.1.tar.xz", + "hash": "sha256-Ct+xvI7dkHqLOdiQjd9May0WvAMdMFsYw74QQZJiHUg=" }, "kdeplasma-addons": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/kdeplasma-addons-6.3.0.tar.xz", - "hash": "sha256-WZnR7hIK9Wc+cM8X8wMM5JK8zOeZfNTJLcBB+hgQmbk=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/kdeplasma-addons-6.3.1.tar.xz", + "hash": "sha256-aWzrQArHNGazMpcepOcPwLkT1w8YlDECiuS9HbIBBYo=" }, "kgamma": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/kgamma-6.3.0.tar.xz", - "hash": "sha256-yxNocFCZ9vbwmwjT+IVgHR9HkHSaK7xM6XdXTUTxcQI=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/kgamma-6.3.1.tar.xz", + "hash": "sha256-Tcj6WvP0ANV2HRMzycebZqJQdgF2TE3mSqe8XhOcDHQ=" }, "kglobalacceld": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/kglobalacceld-6.3.0.tar.xz", - "hash": "sha256-YSSYgpexkQhGtK8qApAraSM5g4NENBL0G5XMiL8N4LM=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/kglobalacceld-6.3.1.tar.xz", + "hash": "sha256-3cy7KJyr1on6srWuyxQ+kg+Xw6RE+A8/nEDbmb1GcYo=" }, "kinfocenter": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/kinfocenter-6.3.0.tar.xz", - "hash": "sha256-IPtgc2bRZjkNwYvsqPkyGBOSQwWgrf7pH3leTgXq0xE=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/kinfocenter-6.3.1.tar.xz", + "hash": "sha256-g3C63bXjiXacZRA9cQWs+tFaE7wSyY/jUakTJk/4WHw=" }, "kmenuedit": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/kmenuedit-6.3.0.tar.xz", - "hash": "sha256-9oK736Q25leu7LRh+doF1w5dbNsCNt/bcWNdMHcXRWM=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/kmenuedit-6.3.1.tar.xz", + "hash": "sha256-tOmL2pdwj267LqBqDLrmAC/JGLlLVYDNrb8DTmuvGfE=" }, "kpipewire": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/kpipewire-6.3.0.tar.xz", - "hash": "sha256-N38NIPvx84BzE28XtZlcg+XH+oClCJZtVp41xPGA3yo=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/kpipewire-6.3.1.tar.xz", + "hash": "sha256-L0I5TMQBg8GTxFFaFXLMg6ThUMdQwOOQJNSoV/eD2No=" }, "krdp": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/krdp-6.3.0.tar.xz", - "hash": "sha256-HpdFCwXazBteJamcSRVsQaGYZvsvGW7KHR4nWlfXJFA=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/krdp-6.3.1.tar.xz", + "hash": "sha256-DCDM8OpX/Z4n1CiMvAX0BvT2TQ3mSQ1NrVerF3qpjbE=" }, "kscreen": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/kscreen-6.3.0.tar.xz", - "hash": "sha256-Vtngpgfy+3mDEeFx32eykJZBf1BkLfhxCTflCvTR1/U=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/kscreen-6.3.1.tar.xz", + "hash": "sha256-sHz48SuraNNvu1YS9ePP/cnpqWZFSxxHt7N/t7zwQLI=" }, "kscreenlocker": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/kscreenlocker-6.3.0.tar.xz", - "hash": "sha256-rYa6DX3IdUql3YCXqyUojN+qRMAeMaEIE6tNDWmH9l4=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/kscreenlocker-6.3.1.tar.xz", + "hash": "sha256-xp/mipWGPq7kFA+Mx+Qsgyy8j2ENfGhyuGXIkFKQFOg=" }, "ksshaskpass": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/ksshaskpass-6.3.0.tar.xz", - "hash": "sha256-EXk3lsXE9ut7BgG8AD2Ezo5CFHvwUhLCpr0g38dKNiI=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/ksshaskpass-6.3.1.tar.xz", + "hash": "sha256-7MFsTcIxmK4CmPbT9B/NG90kwezOHoIqsKu6sPz8qx8=" }, "ksystemstats": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/ksystemstats-6.3.0.tar.xz", - "hash": "sha256-ZAr5jGsHagdDan1rka4wGOHlrImea4Q/BNSABZSydzo=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/ksystemstats-6.3.1.tar.xz", + "hash": "sha256-sISrYbK3O1HSJQvc/r5svL8/0PaltxQa0hGhQaZqTts=" }, "kwallet-pam": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/kwallet-pam-6.3.0.tar.xz", - "hash": "sha256-Gie/yXAB5MDFEg7sGjbTcwuqbvnfRPv2jyOjTNVRxn8=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/kwallet-pam-6.3.1.tar.xz", + "hash": "sha256-fo1V6tlAM9YRgZ1oyLnQFTX2i0a1hVytsYAU5PerRfw=" }, "kwayland": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/kwayland-6.3.0.tar.xz", - "hash": "sha256-L21ouJ2rIQN7puzJGmNT0fWjFPe4Bou25gW/XhtrJaw=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/kwayland-6.3.1.tar.xz", + "hash": "sha256-Ouk8BGplQl1xAgUWyjKtpdl7k+ekICODjHr9sx3SGmI=" }, "kwayland-integration": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/kwayland-integration-6.3.0.tar.xz", - "hash": "sha256-S8VCEZQ4TZvDfFRqKg85ZT6VdPK6FqnONqvoyctUOv0=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/kwayland-integration-6.3.1.tar.xz", + "hash": "sha256-oL+Xas3ZXJ6tYYBcVa/4lNYDB+0jdT4RJD4PzqyATeM=" }, "kwin": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/kwin-6.3.0.tar.xz", - "hash": "sha256-Gtl4/FKyG/3SGIQ1VKAVskaJ4MBJBNHLAOLkr8pPSvQ=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/kwin-6.3.1.tar.xz", + "hash": "sha256-mlC6DqpiCXg73vu2aOV9DL36cc6Ov70X/kRtttdz8kI=" }, "kwrited": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/kwrited-6.3.0.tar.xz", - "hash": "sha256-/H0YFVieKNBsbalnsYMSzlB+rMJ+9YG9rtwYNzm2Llw=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/kwrited-6.3.1.tar.xz", + "hash": "sha256-DxQuRQ4Qh0E3Ur4Z1OPdhnCAxegVbaKBIqdkD+zD2SU=" }, "layer-shell-qt": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/layer-shell-qt-6.3.0.tar.xz", - "hash": "sha256-oJiKEqI2ZM/jV7AHDT2Mrs6jsIiC7lIIalpONLiF1EM=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/layer-shell-qt-6.3.1.tar.xz", + "hash": "sha256-jhnqJly7pLAQ4tSZcUDgyaC7taEbUKzMi9Qzjnr36X8=" }, "libkscreen": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/libkscreen-6.3.0.tar.xz", - "hash": "sha256-nveR7vL1xulUKKnaP7c15NIjAIHFRyliyVyDU8AaZDo=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/libkscreen-6.3.1.tar.xz", + "hash": "sha256-hjJ+7bQsSmMuN2EWwo4QioH8oOxmWGiLoiqq5hZMiKI=" }, "libksysguard": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/libksysguard-6.3.0.tar.xz", - "hash": "sha256-vBu7OFslwGQj9vLQRLAMEGy9tVHFz4NIvVkixj1MvLk=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/libksysguard-6.3.1.tar.xz", + "hash": "sha256-wiPlKQVitSqRDHAmCzyiczRyjmpjWRHrZyaocucXi6Y=" }, "libplasma": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/libplasma-6.3.0.tar.xz", - "hash": "sha256-nCzelhWpQ5faaOQpMYJ2jh+9wvQZzbjwDosTo2bVl40=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/libplasma-6.3.1.tar.xz", + "hash": "sha256-ZFW0r/XYPxWGtLupf/qumziBtrAhguwVNfhy9/CPRgw=" }, "milou": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/milou-6.3.0.tar.xz", - "hash": "sha256-gbSDavVLQsHY3zJ1KgcIWtkYYjft2KQ0RV6qk9m9xpE=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/milou-6.3.1.tar.xz", + "hash": "sha256-pNC/qsu9K9UT4vew2Mu9eqFQnX/yKLjA4dGy5cHgKI0=" }, "ocean-sound-theme": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/ocean-sound-theme-6.3.0.tar.xz", - "hash": "sha256-g9nF9oc8uQ4tcepUVUh8QnN+BTUTOM7xnj+MrT68JNo=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/ocean-sound-theme-6.3.1.tar.xz", + "hash": "sha256-FwsjcbxKmhJj93hxSizL9Hr3xjtN6XWymwewNt387cE=" }, "oxygen": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/oxygen-6.3.0.tar.xz", - "hash": "sha256-SpCO5h552/wlIFJ8ZJPvuSeWVXUMxxXx4z2FKk8JaDQ=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/oxygen-6.3.1.tar.xz", + "hash": "sha256-lpa4pMtcz5N3yxpq0/4dgZG3ZPXPX9Ryb85dPQAAfr4=" }, "oxygen-sounds": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/oxygen-sounds-6.3.0.tar.xz", - "hash": "sha256-vqL+XEFKN65mnzmSLMutwUB3kkcEUpfsLQEfoX7MDys=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/oxygen-sounds-6.3.1.tar.xz", + "hash": "sha256-/vEbkcstwzACPIzqVNUg/AF7srpGzfNvUZKIfoku8L8=" }, "plasma-activities": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/plasma-activities-6.3.0.tar.xz", - "hash": "sha256-zLHKLcHeseI13UlvQjVfAFT1gGHs+adZ2fqgopmlbHs=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/plasma-activities-6.3.1.tar.xz", + "hash": "sha256-bh5PI/nos/je6pME3xF56jCwq2oRy59NfKIbFeV5Gm4=" }, "plasma-activities-stats": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/plasma-activities-stats-6.3.0.tar.xz", - "hash": "sha256-tKO4AhZgGP5NTTXNDXxBG1LRy3T/0iochOSUrTA1aC4=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/plasma-activities-stats-6.3.1.tar.xz", + "hash": "sha256-yAGQHGIUTzDs1+T3sXvI4FpFqxyz2AjI0KHVafAStaY=" }, "plasma-browser-integration": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/plasma-browser-integration-6.3.0.tar.xz", - "hash": "sha256-nF7TyOy+Co7PFpdBbL+fNBaUHp339avhebZnvYB4+20=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/plasma-browser-integration-6.3.1.tar.xz", + "hash": "sha256-kaSXmq4aChMZSLCz+JcIvREGsH59sPwdU708omjaYSc=" }, "plasma-desktop": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/plasma-desktop-6.3.0.tar.xz", - "hash": "sha256-u9v6h0tsBOO7M2g+oNCeMmFt6CfflqG2ZKILL1nWnQ4=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/plasma-desktop-6.3.1.tar.xz", + "hash": "sha256-EZydNhJ0NnBIMghky6/8YSUwy6TqYtbf1QTz7+WyVKQ=" }, "plasma-dialer": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/plasma-dialer-6.3.0.tar.xz", - "hash": "sha256-yVB0e4yD15DsY+5YXu0tMw10C3ZcYUFSPQlGNicgV6o=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/plasma-dialer-6.3.1.tar.xz", + "hash": "sha256-tAHrvzbg2H7Ahaks9jhi3Qtc+Q1arJf+MOuaoRglaY0=" }, "plasma-disks": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/plasma-disks-6.3.0.tar.xz", - "hash": "sha256-p2meDmgZMRlSw1FZE5xqESYS3fOVHrdC60zf+2rYbT0=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/plasma-disks-6.3.1.tar.xz", + "hash": "sha256-6ugUwDPoNzPwklsMvYpADX8wolJOl7IDJmlZazXmbL4=" }, "plasma-firewall": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/plasma-firewall-6.3.0.tar.xz", - "hash": "sha256-ll172oqLjZCW6UeLCcRqfR3Mh9z//tHCe3h3kdvjx/A=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/plasma-firewall-6.3.1.tar.xz", + "hash": "sha256-rSJxJsaGCJ+TadzMlCfAoLzED6bIbI38rmedhMY/Iz0=" }, "plasma-integration": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/plasma-integration-6.3.0.tar.xz", - "hash": "sha256-4IL0XHGAfkpBpf7g7uPyc0couMje0EHi+US3UwaGlDM=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/plasma-integration-6.3.1.tar.xz", + "hash": "sha256-RGVnVx3ItDRHt7ev17gtm6KmBCE5PIXLsQm7ZfVAqcI=" }, "plasma-mobile": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/plasma-mobile-6.3.0.tar.xz", - "hash": "sha256-tDkNwsSouZcT1FxR8kG3H/7RGLmKuJqsQND4sL07s5E=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/plasma-mobile-6.3.1.tar.xz", + "hash": "sha256-6pV4E9pESUQEIBNxnyjGYDAjcQaJd5Ohkq07SaC5aN8=" }, "plasma-nano": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/plasma-nano-6.3.0.tar.xz", - "hash": "sha256-q0uhUTOq8nPsHHkfw39FzjBPKH96FwaEn8TtrhtLHQM=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/plasma-nano-6.3.1.tar.xz", + "hash": "sha256-cnbTzAC4dhIm5Srj9L5MZnHnkckLtTNkMd46d0WZg18=" }, "plasma-nm": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/plasma-nm-6.3.0.tar.xz", - "hash": "sha256-IakXwSdy9+KBzi5rewgnN55E97VHomHfRhWdVy0NxeA=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/plasma-nm-6.3.1.tar.xz", + "hash": "sha256-r8cJO2AMMVzRr3UvitP3mVcxov/FL7ibB04vqIsAAGQ=" }, "plasma-pa": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/plasma-pa-6.3.0.tar.xz", - "hash": "sha256-3gT7Kgwe7H+Ek1DVoXyOhP+XLYILXjTTja4LiSJhae0=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/plasma-pa-6.3.1.tar.xz", + "hash": "sha256-tsXEATNDjxrqSrwoCNwgEl8d8XqUAVbOd65vGV1JtUg=" }, "plasma-sdk": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/plasma-sdk-6.3.0.tar.xz", - "hash": "sha256-PXXSJLK3p9ZcextB1NqxIizyXFnqTpwBcK23J9fvQWg=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/plasma-sdk-6.3.1.tar.xz", + "hash": "sha256-lVEIrjJz6aS87xadFbQCXPP6Dw1Pbgc2flbTlke09wk=" }, "plasma-systemmonitor": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/plasma-systemmonitor-6.3.0.tar.xz", - "hash": "sha256-/kZ/X+uSlaAtoQNTCYoC8wBWu5ZAFjV+LOTQwH0wXIg=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/plasma-systemmonitor-6.3.1.tar.xz", + "hash": "sha256-rgufAUhIlwE8Ds5NXy+wAj2ox/JDnCjtfPA5BJrXG7o=" }, "plasma-thunderbolt": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/plasma-thunderbolt-6.3.0.tar.xz", - "hash": "sha256-oMPbVanG0+QMf0t49iH2uF4R9mzPwEkTMzn7jJzh/mw=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/plasma-thunderbolt-6.3.1.tar.xz", + "hash": "sha256-2SE1dprNJtc2ZGcbJ1rdZXk0aCwJQmNkccU15K+8HxM=" }, "plasma-vault": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/plasma-vault-6.3.0.tar.xz", - "hash": "sha256-QU/lNg6xMv8kYyLs6aVkUEES+pWkxGKz8XK5hhPcJdg=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/plasma-vault-6.3.1.tar.xz", + "hash": "sha256-NmlP79pR3/5L2qU1Ba6JmFGOTHeu1Uc6F+wz7qKvYcQ=" }, "plasma-welcome": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/plasma-welcome-6.3.0.tar.xz", - "hash": "sha256-x+iEF4wc0aoKwmBzvZzxJNCjvjkmwCQLeXR3gGchGYQ=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/plasma-welcome-6.3.1.tar.xz", + "hash": "sha256-QNtYD3aSZXENGY12+Q34faxezQ8c+4RwyZyMPx/WKxs=" }, "plasma-workspace": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/plasma-workspace-6.3.0.tar.xz", - "hash": "sha256-FBZ9trlmsVZ7S4uPt77RjZUvK02UR7Uiij9aH7s4xDk=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/plasma-workspace-6.3.1.tar.xz", + "hash": "sha256-YX0qMjAwStou3Kx9h1nTZt2vmbWb2IU7zkcc9EuTQcU=" }, "plasma-workspace-wallpapers": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/plasma-workspace-wallpapers-6.3.0.tar.xz", - "hash": "sha256-1OhrrEgzpN8jmNCBXV+SwH6+W6+X2lIGP0b/XFEPEAo=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/plasma-workspace-wallpapers-6.3.1.tar.xz", + "hash": "sha256-9ElLw7vxa2dlfx/Pa/YmAr6m6ZSaTgQHRNVX5+F3xg8=" }, "plasma5support": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/plasma5support-6.3.0.tar.xz", - "hash": "sha256-uVIBaVez+AM9gfxY+QvxPwL5fuzWbKTmtrCAUHTKYoM=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/plasma5support-6.3.1.tar.xz", + "hash": "sha256-ZmOW904n3B+0Gqgvyv1aszyHjx6waueTxFviK3CmuWE=" }, "plymouth-kcm": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/plymouth-kcm-6.3.0.tar.xz", - "hash": "sha256-pGqGc06TgiXSh8HPpJnVv3jWzFsAjAxD45rdmvd3JS4=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/plymouth-kcm-6.3.1.tar.xz", + "hash": "sha256-FOGUUdBQ4LwAh7WB3T9n7rghmahyKjPfpjP4/BFW2RE=" }, "polkit-kde-agent-1": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/polkit-kde-agent-1-6.3.0.tar.xz", - "hash": "sha256-4H+0PlDvqaRZn/Eo7FExy75nBJ8b/yRnPOkfVbXkQes=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/polkit-kde-agent-1-6.3.1.tar.xz", + "hash": "sha256-+KzSVw3ok3YF1XFxAXiWV1uG8tXVbmCI7ec/EG2fC7I=" }, "powerdevil": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/powerdevil-6.3.0.tar.xz", - "hash": "sha256-y0y+bKuw6j0JipkQNcEc/BhNnJvQZfu6nvNPbAgsE6g=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/powerdevil-6.3.1.tar.xz", + "hash": "sha256-vG3tC8vCF+g9Eb6CcmqKc35+XzBB19F9PkCz7/ueY5E=" }, "print-manager": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/print-manager-6.3.0.tar.xz", - "hash": "sha256-wsR6LEvcOKMuzZaFbVvZzRa/UBFleeV1tbw6T3HHmAw=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/print-manager-6.3.1.tar.xz", + "hash": "sha256-Wr1OGleC5MMQnFqTLM0YOI7GuSqGYVcRfhwY0vzjCYA=" }, "qqc2-breeze-style": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/qqc2-breeze-style-6.3.0.tar.xz", - "hash": "sha256-6x7qYWDPcFIoeYt+zv/DVP1+k/saimSobl059T64on8=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/qqc2-breeze-style-6.3.1.tar.xz", + "hash": "sha256-KekUqfsUBVIEa/gUEpqGFcGM+08V2n+74bGeb4i9wlo=" }, "sddm-kcm": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/sddm-kcm-6.3.0.tar.xz", - "hash": "sha256-o44ChGGmqwQkF9GfLyTFufTEKDias3E4Rjb3C8q3dkw=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/sddm-kcm-6.3.1.tar.xz", + "hash": "sha256-jpz5ajBr/a5PHPV16X45Mw6k88526wkhZq3R/spcRgw=" }, "spacebar": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/spacebar-6.3.0.tar.xz", - "hash": "sha256-Q56khGQDJ4FyYYFITcXkHcAOhfQX7Sbf81XY/U+lW0k=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/spacebar-6.3.1.tar.xz", + "hash": "sha256-vy5JcIKk5bYpa4NZKYkNI9qbobPbSU+GEjfWlvbEmb8=" }, "spectacle": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/spectacle-6.3.0.tar.xz", - "hash": "sha256-voCrvB6AvESTcRCJWAqQWEhJlgiiSXvj1+uBy7+HYJk=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/spectacle-6.3.1.tar.xz", + "hash": "sha256-DzZLBd/MDGPB62luWTGPg6nIPUFi9WVrT6X+KdrMgU4=" }, "systemsettings": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/systemsettings-6.3.0.tar.xz", - "hash": "sha256-dxubbLveFf6GDKZewJo4xuF1yRSCnlVt5WwTYmkaxoA=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/systemsettings-6.3.1.tar.xz", + "hash": "sha256-DQMlonuIM5JbSGx8DtfKVvcflNH8ou6K/YyH7BJva28=" }, "wacomtablet": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/wacomtablet-6.3.0.tar.xz", - "hash": "sha256-wFdo6kWRe1WZojxYze8xzRIcQhOvD/xwDK8qGcvBWDU=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/wacomtablet-6.3.1.tar.xz", + "hash": "sha256-1jYb+u2eItJy9Di+5TY5GUvF+Z5Mb5E4Et9mTXGTdX8=" }, "xdg-desktop-portal-kde": { - "version": "6.3.0", - "url": "mirror://kde/stable/plasma/6.3.0/xdg-desktop-portal-kde-6.3.0.tar.xz", - "hash": "sha256-swz1cWaFvqkWG3rD3LqqMRVmJzmYUNdFksBunNTdD1E=" + "version": "6.3.1", + "url": "mirror://kde/stable/plasma/6.3.1/xdg-desktop-portal-kde-6.3.1.tar.xz", + "hash": "sha256-/ynkBVLbb6tvJxf5dCtgWYPGqeDtvzYEId4ZADpelWc=" } } \ No newline at end of file diff --git a/pkgs/kde/plasma/kwin/default.nix b/pkgs/kde/plasma/kwin/default.nix index 97906adebdfb..e213e27843f5 100644 --- a/pkgs/kde/plasma/kwin/default.nix +++ b/pkgs/kde/plasma/kwin/default.nix @@ -30,13 +30,6 @@ mkKdeDerivation { ./0003-plugins-qpa-allow-using-nixos-wrapper.patch ./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch ./0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch - - # Backport recommended crash fix - # FIXME: remove in 6.3.1 - (fetchpatch { - url = "https://invent.kde.org/plasma/kwin/-/commit/c97bc26ca9de8b1462f6ccb05fb2dafe01cd82cb.patch"; - hash = "sha256-g8CsSKt3flTXAm80NbFuq+sT8l93mfyUBl2aBpP5zqY="; - }) ]; postPatch = '' diff --git a/pkgs/kde/plasma/plasma-desktop/default.nix b/pkgs/kde/plasma/plasma-desktop/default.nix index 7933541b4501..2a8e8df9d740 100644 --- a/pkgs/kde/plasma/plasma-desktop/default.nix +++ b/pkgs/kde/plasma/plasma-desktop/default.nix @@ -43,6 +43,11 @@ mkKdeDerivation { (replaceVars ./wallpaper-paths.patch { wallpapers = "${lib.getBin breeze}/share/wallpapers"; }) + + # Fix build failure due to C++ template nonsense + # Submitted upstream: https://invent.kde.org/plasma/plasma-desktop/-/merge_requests/2833 + # FIXME: remove when merged + ./fix-build.patch ]; extraNativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/kde/plasma/plasma-desktop/fix-build.patch b/pkgs/kde/plasma/plasma-desktop/fix-build.patch new file mode 100644 index 000000000000..9729ffb46bb5 --- /dev/null +++ b/pkgs/kde/plasma/plasma-desktop/fix-build.patch @@ -0,0 +1,107 @@ +diff --git a/kcms/libkwindevices/inputdevice.cpp b/kcms/libkwindevices/inputdevice.cpp +index 9a437137077390a61152be96ac69b4f5e992d062..aea0952143a29a4b2bf06777f737a84cbd6e5b6d 100644 +--- a/kcms/libkwindevices/inputdevice.cpp ++++ b/kcms/libkwindevices/inputdevice.cpp +@@ -10,44 +10,6 @@ + + #include "logging.h" + +-template +-bool InputDevice::Prop::save() +-{ +- if (!isSupported() || !m_value || m_prop.isConstant()) { +- qCDebug(LIBKWINDEVICES) << "skipping" << this << m_value.has_value() << isSupported() << m_prop.name(); +- return false; +- } +- +- auto iface = m_device->m_iface.get(); +- const bool ret = m_prop.write(iface, *m_value); +- if (ret) { +- m_configValue = *m_value; +- } +- return ret; +-} +- +-template +-void InputDevice::Prop::set(T newVal) +-{ +- if (!m_value) { +- value(); +- } +- +- Q_ASSERT(isSupported()); +- if (m_value != newVal) { +- m_value = newVal; +- if (m_changedSignalFunction) { +- (m_device->*m_changedSignalFunction)(); +- } +- } +-} +- +-template +-bool InputDevice::Prop::changed() const +-{ +- return m_value.has_value() && m_value.value() != m_configValue; +-} +- + InputDevice::InputDevice(const QString &dbusName, QObject *parent) + : QObject(parent) + { +diff --git a/kcms/libkwindevices/inputdevice.h b/kcms/libkwindevices/inputdevice.h +index 93f9753cfae3c8795c5493566f7e51c806710983..f5589b095f39aa76071f67b8ee544a71585a479a 100644 +--- a/kcms/libkwindevices/inputdevice.h ++++ b/kcms/libkwindevices/inputdevice.h +@@ -269,12 +269,29 @@ private: + } + } + +- void set(T newVal); ++ void set(T newVal) { ++ if (!m_value) { ++ value(); ++ } ++ ++ Q_ASSERT(isSupported()); ++ if (m_value != newVal) { ++ m_value = newVal; ++ if (m_changedSignalFunction) { ++ (m_device->*m_changedSignalFunction)(); ++ } ++ } ++ } ++ + T defaultValue() const + { + return m_defaultValueFunction ? (m_device->m_iface.get()->*m_defaultValueFunction)() : T(); + } +- bool changed() const; ++ ++ bool changed() const { ++ return m_value.has_value() && m_value.value() != m_configValue; ++ } ++ + void set(const Prop &p) + { + set(p.value()); +@@ -286,7 +303,20 @@ private: + return !m_supportedFunction || (iface->*m_supportedFunction)(); + } + +- bool save(); ++ bool save() { ++ if (!isSupported() || !m_value || m_prop.isConstant()) { ++ qDebug() << "skipping" << this << m_value.has_value() << isSupported() << m_prop.name(); ++ return false; ++ } ++ ++ auto iface = m_device->m_iface.get(); ++ const bool ret = m_prop.write(iface, *m_value); ++ if (ret) { ++ m_configValue = *m_value; ++ } ++ return ret; ++ } ++ + bool isDefaults() const + { + return m_value == defaultValue(); From 3b70ca57e3f59df509ed513c5e3a248d0d63d424 Mon Sep 17 00:00:00 2001 From: evils <30512529+evils@users.noreply.github.com> Date: Tue, 18 Feb 2025 19:39:13 +0100 Subject: [PATCH 0921/1107] readexe: init at 0.1.3 (#247799) --- pkgs/by-name/re/readexe/package.nix | 31 +++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/re/readexe/package.nix diff --git a/pkgs/by-name/re/readexe/package.nix b/pkgs/by-name/re/readexe/package.nix new file mode 100644 index 000000000000..6a0173652806 --- /dev/null +++ b/pkgs/by-name/re/readexe/package.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "readexe"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "segin"; + repo = "readexe"; + tag = "v${finalAttrs.version}"; + hash = "sha256-CT1EZQ3t7+5onmcUz5yGxDI24dyelUwYZFcL8YWZgPw="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with lib; { + description = "Reads out structural information on Microsoft .exe formats"; + homepage = "https://github.com/segin/readexe"; + license = with licenses; [ + isc + bsd3 + ]; + maintainers = with maintainers; [ evils ]; + mainProgram = "readexe"; + }; +}) From cdf6aac5b5eedca56608c37548a1273014e73417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Boris=20Pr=C3=BC=C3=9Fmann?= Date: Tue, 18 Feb 2025 17:34:23 +0100 Subject: [PATCH 0922/1107] rmpc: 0.7.0 -> 0.8.0 --- pkgs/by-name/rm/rmpc/package.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/rm/rmpc/package.nix b/pkgs/by-name/rm/rmpc/package.nix index 4be8297ac6ba..f124d38c0dc7 100644 --- a/pkgs/by-name/rm/rmpc/package.nix +++ b/pkgs/by-name/rm/rmpc/package.nix @@ -9,17 +9,22 @@ rustPlatform.buildRustPackage rec { pname = "rmpc"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "mierak"; repo = "rmpc"; rev = "v${version}"; - hash = "sha256-IgkYUl1ccwzFgooqZGxmpJFzACEz3wmblostPsTnzSQ="; + hash = "sha256-RfYaWoVGdeE5y/hkRH+gZgnc0Hrp9V+Pttvjcu3Q14g="; }; useFetchCargoVendor = true; - cargoHash = "sha256-s8aXDDERy4IxUrXVEFMGny5B5HGE8xsi6I+b/HCHc6w="; + cargoHash = "sha256-m25lo7mufGS7m1QSnhYdXMaXfjdqtJ8hVLdbuRsxbKY="; + + checkFlags = [ + # Test currently broken, needs to be removed. See https://github.com/mierak/rmpc/issues/254 + "--skip=core::scheduler::tests::interleaves_repeated_and_scheduled_jobs" + ]; nativeBuildInputs = [ installShellFiles From 395e796b0b36bb27b6ae2dcfeb4fcdfc1a6ef5f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 19:32:28 +0000 Subject: [PATCH 0923/1107] wiremock: 3.11.0 -> 3.12.0 --- pkgs/by-name/wi/wiremock/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wi/wiremock/package.nix b/pkgs/by-name/wi/wiremock/package.nix index f12271f0d84d..29d2dfd26ad5 100644 --- a/pkgs/by-name/wi/wiremock/package.nix +++ b/pkgs/by-name/wi/wiremock/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "wiremock"; - version = "3.11.0"; + version = "3.12.0"; src = fetchurl { url = "mirror://maven/org/wiremock/wiremock-standalone/${finalAttrs.version}/wiremock-standalone-${finalAttrs.version}.jar"; - hash = "sha256-hfR+7NVN32qidcmjzq+OIAytMNJrUppwbdVeO/OkeH4="; + hash = "sha256-xBylDIazUsvIVGitrdF/cdHiTm3N4yh032sPESmfe0E="; }; dontUnpack = true; From bd4cd0aee876c5006f6e36e5f13def9343bb804c Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Tue, 18 Feb 2025 20:35:43 +0100 Subject: [PATCH 0924/1107] freshBootstrapTools.bootstrapTools: fix by using bashNonInteractive https://hydra.nixos.org/build/289942887/nixlog/1/tail This gets it back after PR #379368 --- pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix b/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix index c678d2d20f2c..1dde0a42e4ba 100644 --- a/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix @@ -1,7 +1,7 @@ { lib, stdenv, - bash, + bashNonInteractive, bzip2, coreutils, cpio, @@ -131,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: { cp ${getBin coreutils_}/bin/* $out/bin (cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users) - cp -d ${getBin bash}/bin/{ba,}sh $out/bin + cp -d ${getBin bashNonInteractive}/bin/{ba,}sh $out/bin cp -d ${getBin diffutils}/bin/* $out/bin cp ${getBin findutils}/bin/{find,xargs} $out/bin cp -d ${getBin gawk}/bin/{g,}awk $out/bin @@ -192,7 +192,7 @@ stdenv.mkDerivation (finalAttrs: { # tools needed to unpack bootstrap archive mkdir -p unpack/bin unpack/lib - cp -d ${getBin bash}/bin/{bash,sh} unpack/bin + cp -d ${getBin bashNonInteractive}/bin/{ba,}sh unpack/bin cp ${getBin coreutils_}/bin/mkdir unpack/bin cp ${getBin gnutar}/bin/tar unpack/bin cp ${getBin xz}/bin/xz unpack/bin From 9c68d12ebaab271e72375ec275b7887114284be3 Mon Sep 17 00:00:00 2001 From: TGRCDev Date: Mon, 10 Feb 2025 00:19:01 -0800 Subject: [PATCH 0925/1107] nixos/gitea: add CAPTCHA support --- .../manual/release-notes/rl-2505.section.md | 2 + nixos/modules/services/misc/gitea.nix | 97 ++++++++++++++++++- 2 files changed, 98 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 6c08e06874bd..62e0129ccb80 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -469,6 +469,8 @@ - `services.kmonad` now creates a determinate symlink (in `/dev/input/by-id/`) to each of KMonad virtual devices. +- `services.gitea` now supports CAPTCHA usage through the `services.gitea.captcha` variable. + - `bind.cacheNetworks` now only controls access for recursive queries, where it previously controlled access for all queries. - [`services.mongodb.enableAuth`](#opt-services.mongodb.enableAuth) now uses the newer [mongosh](https://github.com/mongodb-js/mongosh) shell instead of the legacy shell to configure the initial superuser. You can configure the mongosh package to use through the [`services.mongodb.mongoshPackage`](#opt-services.mongodb.mongoshPackage) option. diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index d43250c88268..d8f72a4cb9fd 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -163,6 +163,58 @@ in }; }; + captcha = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enables Gitea to display a CAPTCHA challenge on registration. + ''; + }; + + secretFile = mkOption { + type = types.nullOr types.str; + default = null; + example = "/var/lib/secrets/gitea/captcha_secret"; + description = "Path to a file containing the CAPTCHA secret key."; + }; + + siteKey = mkOption { + type = types.nullOr types.str; + default = null; + example = "my_site_key"; + description = "CAPTCHA site key to use for Gitea."; + }; + + url = mkOption { + type = types.nullOr types.str; + default = null; + example = "https://google.com/recaptcha"; + description = "CAPTCHA url to use for Gitea. Only relevant for `recaptcha` and `mcaptcha`."; + }; + + type = mkOption { + type = types.enum [ "image" "recaptcha" "hcaptcha" "mcaptcha" "cfturnstile" ]; + default = "image"; + example = "recaptcha"; + description = "The type of CAPTCHA to use for Gitea."; + }; + + requireForLogin = mkOption { + type = types.bool; + default = false; + example = true; + description = "Displays a CAPTCHA challenge whenever a user logs in."; + }; + + requireForExternalRegistration = mkOption { + type = types.bool; + default = false; + example = true; + description = "Displays a CAPTCHA challenge for users that register externally."; + }; + }; + dump = { enable = mkOption { type = types.bool; @@ -404,9 +456,30 @@ in and `ensureDatabases` doesn't have any effect. ''; } + { + assertion = cfg.captcha.enable -> cfg.captcha.type != "image" -> (cfg.captcha.secretFile != null && cfg.captcha.siteKey != null); + message = '' + Using a CAPTCHA service that is not `image` requires providing a CAPTCHA secret through + the `captcha.secretFile` option and a CAPTCHA site key through the `captcha.siteKey` option. + ''; + } + { + assertion = cfg.captcha.url != null -> (builtins.elem cfg.captcha.type ["mcaptcha" "recaptcha"]); + message = '' + `captcha.url` is only relevant when `captcha.type` is `mcaptcha` or `recaptcha`. + ''; + } ]; - services.gitea.settings = { + services.gitea.settings = let + captchaPrefix = optionalString cfg.captcha.enable ({ + image = "IMAGE"; + recaptcha = "RECAPTCHA"; + hcaptcha = "HCAPTCHA"; + mcaptcha = "MCAPTCHA"; + cfturnstile = "CF_TURNSTILE"; + }."${cfg.captcha.type}"); + in { "cron.update_checker".ENABLED = lib.mkDefault false; database = mkMerge [ @@ -450,6 +523,24 @@ in INSTALL_LOCK = true; }; + service = mkIf cfg.captcha.enable (mkMerge [ + { + ENABLE_CAPTCHA = true; + CAPTCHA_TYPE = cfg.captcha.type; + REQUIRE_CAPTCHA_FOR_LOGIN = cfg.captcha.requireForLogin; + REQUIRE_EXTERNAL_REGISTRATION_CAPTCHA = cfg.captcha.requireForExternalRegistration; + } + (mkIf (cfg.captcha.secretFile != null) { + "${captchaPrefix}_SECRET" = "#captchasecret#"; + }) + (mkIf (cfg.captcha.siteKey != null) { + "${captchaPrefix}_SITEKEY" = cfg.captcha.siteKey; + }) + (mkIf (cfg.captcha.url != null) { + "${captchaPrefix}_URL" = cfg.captcha.url; + }) + ]); + mailer = mkIf (cfg.mailerPasswordFile != null) { PASSWD = "#mailerpass#"; }; @@ -592,6 +683,10 @@ in ${lib.optionalString (cfg.metricsTokenFile != null) '' ${replaceSecretBin} '#metricstoken#' '${cfg.metricsTokenFile}' '${runConfig}' ''} + + ${lib.optionalString (cfg.captcha.secretFile != null) '' + ${replaceSecretBin} '#captchasecret#' '${cfg.captcha.secretFile}' '${runConfig}' + ''} chmod u-w '${runConfig}' } (umask 027; gitea_setup) From 98c0410b9d35146408878f4ab1e3c6f16bf8c2e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 00:41:24 +0000 Subject: [PATCH 0926/1107] conftest: 0.56.0 -> 0.57.0 --- pkgs/by-name/co/conftest/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/conftest/package.nix b/pkgs/by-name/co/conftest/package.nix index 34b5a95e295d..08b74ca8e982 100644 --- a/pkgs/by-name/co/conftest/package.nix +++ b/pkgs/by-name/co/conftest/package.nix @@ -7,15 +7,15 @@ buildGoModule rec { pname = "conftest"; - version = "0.56.0"; + version = "0.57.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; tag = "v${version}"; - hash = "sha256-7R6qMjwPtlpnsm6xej7jQntv9709//q4VVbatuzLuwk="; + hash = "sha256-Cr0TFPs4VHvLdSdlASxz1dbeXwBkIBruCl4Ui5VNCcc="; }; - vendorHash = "sha256-QPFLHP4nyJqB7tVVk00J+V+1YXGSsRvCZ1aLEMg0kfc="; + vendorHash = "sha256-bQl2jyBM0ebv7m1Y/OFXFPnXodv1GxyrwXuPfcyVsPM="; ldflags = [ "-s" From 0884072072a283daecdcf2296a1ec9a010e5535d Mon Sep 17 00:00:00 2001 From: Jan Solanti Date: Sun, 2 Feb 2025 01:05:36 +0200 Subject: [PATCH 0927/1107] tauon: 7.8.3 -> 7.9.0 --- pkgs/by-name/ta/tauon/package.nix | 56 ++++++++++++++----------------- 1 file changed, 25 insertions(+), 31 deletions(-) diff --git a/pkgs/by-name/ta/tauon/package.nix b/pkgs/by-name/ta/tauon/package.nix index 3ed875b668ba..56071dcbeb30 100644 --- a/pkgs/by-name/ta/tauon/package.nix +++ b/pkgs/by-name/ta/tauon/package.nix @@ -26,15 +26,16 @@ withDiscordRPC ? true, }: -stdenv.mkDerivation (finalAttrs: { +python3Packages.buildPythonApplication rec { pname = "tauon"; - version = "7.8.3"; + version = "7.9.0"; + pyproject = true; src = fetchFromGitHub { owner = "Taiko2k"; repo = "Tauon"; - rev = "v${finalAttrs.version}"; - hash = "sha256-A7JRJ0Eh0ynuwPYZFLEeqWLf6OKdN59jM2vozdpSZC8="; + tag = "v${version}"; + hash = "sha256-6aEUniLoE5Qtfht3OAe+zvC9yZwjH+KpskmjGowDuuU="; }; postUnpack = '' @@ -46,25 +47,16 @@ stdenv.mkDerivation (finalAttrs: { ''; postPatch = '' - substituteInPlace tauon.py \ - --replace-fail 'install_mode = False' 'install_mode = True' \ - --replace-fail 'install_directory = os.path.dirname(os.path.abspath(__file__))' 'install_directory = "${placeholder "out"}/share/tauon"' + substituteInPlace requirements.txt \ + --replace-fail "pysdl2-dll # Don't rely on system SDL2 https://github.com/py-sdl/py-sdl2#requirements" "" \ + --replace-fail "opencc; sys_platform != 'win32' # optional" "" \ + --replace-fail 'tekore # optional' "" - substituteInPlace t_modules/t_main.py \ - --replace-fail 'install_mode = False' 'install_mode = True' \ - --replace-fail 'libopenmpt.so' '${lib.getLib libopenmpt}/lib/libopenmpt.so' + substituteInPlace src/tauon/__main__.py \ + --replace-fail 'install_mode = False' 'install_mode = True' - substituteInPlace t_modules/t_phazor.py \ - --replace-fail 'lib/libphazor' '../../lib/libphazor' - - substituteInPlace compile-phazor*.sh --replace-fail 'gcc' '${stdenv.cc.targetPrefix}cc' - - substituteInPlace extra/tauonmb.desktop --replace-fail 'Exec=/opt/tauon-music-box/tauonmb.sh' 'Exec=${placeholder "out"}/bin/tauon' - ''; - - postBuild = '' - bash ./compile-phazor.sh - bash ./compile-phazor-pipewire.sh + substituteInPlace src/tauon/t_modules/t_phazor.py \ + --replace-fail 'base_path = Path(pctl.install_directory).parent.parent / "build"' 'base_path = Path("${placeholder "out"}/${python3Packages.python.sitePackages}")' ''; nativeBuildInputs = [ @@ -73,6 +65,11 @@ stdenv.mkDerivation (finalAttrs: { gobject-introspection ]; + build-system = with python3Packages; [ + setuptools + setuptools-scm + ]; + buildInputs = [ flac game-music-emu @@ -94,6 +91,7 @@ stdenv.mkDerivation (finalAttrs: { with python3Packages; [ beautifulsoup4 + colored-traceback dbus-python unidecode jxlpy @@ -110,6 +108,7 @@ stdenv.mkDerivation (finalAttrs: { requests send2trash setproctitle + tidalapi ] ++ lib.optional withDiscordRPC pypresence ++ lib.optional stdenv.hostPlatform.isLinux pulsectl; @@ -119,6 +118,7 @@ stdenv.mkDerivation (finalAttrs: { "--prefix LD_LIBRARY_PATH : ${ lib.makeLibraryPath [ game-music-emu + libopenmpt pulseaudio ] }" @@ -126,14 +126,8 @@ stdenv.mkDerivation (finalAttrs: { "--set GI_TYPELIB_PATH $GI_TYPELIB_PATH" ]; - installPhase = '' - install -Dm755 tauon.py $out/bin/tauon - mkdir -p $out/share/tauon - cp -r lib $out - cp -r assets input.txt t_modules theme templates $out/share/tauon - - wrapPythonPrograms - + postInstall = '' + mv $out/bin/tauonmb $out/bin/tauon mkdir -p $out/share/applications install -Dm755 extra/tauonmb.desktop $out/share/applications/tauonmb.desktop mkdir -p $out/share/icons/hicolor/scalable/apps @@ -144,9 +138,9 @@ stdenv.mkDerivation (finalAttrs: { description = "Linux desktop music player from the future"; mainProgram = "tauon"; homepage = "https://tauonmusicbox.rocks/"; - changelog = "https://github.com/Taiko2k/TauonMusicBox/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/Taiko2k/TauonMusicBox/releases/tag/v${version}"; license = licenses.gpl3; maintainers = with maintainers; [ jansol ]; platforms = platforms.linux ++ platforms.darwin; }; -}) +} From a283ed4c75b930e51fb138640a4efb3558bbb7d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Feb 2025 14:04:27 +0000 Subject: [PATCH 0928/1107] kubernetes-helmPlugins.helm-unittest: 0.7.1 -> 0.7.2 --- .../networking/cluster/helm/plugins/helm-unittest.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix index 7d06c2a6f6d6..3aa5904f0a20 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm-unittest"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-TZ2qY0aJHIJq9gd522NJyNkUDYQuICyTsUnQBf34Pq0="; + hash = "sha256-RWucFZlyVYV5pHFGP7x5I+SILAJ9k12R7l5o7WKGS/c="; }; - vendorHash = "sha256-kMQIXN7Qu39MUFUHtLl1vnNv2qOUUcDhGes1MJ2Nh64="; + vendorHash = "sha256-tTM9n/ahtAJoQt0fwf1jrSokWER+cOnpPX7NTNrhKc4="; # NOTE: Remove the install and upgrade hooks. postPatch = '' From d68c3095d2d666f35654b332650cd10c6dff8dfb Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Wed, 19 Feb 2025 06:09:11 +0900 Subject: [PATCH 0929/1107] ytmdesktop: 2.0.6 -> 2.0.7 Changelog: github.com/ytmdesktop/ytmdesktop/releases/tag/v2.0.7 Closes #383172 Signed-off-by: Ludovico Piero --- pkgs/by-name/yt/ytmdesktop/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/yt/ytmdesktop/package.nix b/pkgs/by-name/yt/ytmdesktop/package.nix index b1df83104aa2..d5e537c4d43d 100644 --- a/pkgs/by-name/yt/ytmdesktop/package.nix +++ b/pkgs/by-name/yt/ytmdesktop/package.nix @@ -12,7 +12,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ytmdesktop"; - version = "2.0.6"; + version = "2.0.7"; desktopItems = [ (makeDesktopItem { @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/ytmdesktop/ytmdesktop/releases/download/v${finalAttrs.version}/youtube-music-desktop-app_${finalAttrs.version}_amd64.deb"; - hash = "sha256-uLTnVA9ooGlbtmUGoYtrT9IlOhTAJpEXMr1GSs3ae/8="; + hash = "sha256-bdP6vIAUoFYLvEvxtG69tBuL94EQQVwNyeuQibRMMbk="; }; unpackPhase = '' @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { asar extract resources/app.asar patched-asar # workaround for https://github.com/electron/electron/issues/31121 - substituteInPlace patched-asar/.webpack/main/index.js \ + substituteInPlace patched-asar/.vite/main/index.js \ --replace-fail "process.resourcesPath" "'$out/lib/resources'" asar pack patched-asar resources/app.asar From 964b5727cb21746ab91e70a4bfc6cf16e423b51d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luka=20Bla=C5=A1kovi=C4=87?= Date: Mon, 17 Feb 2025 10:40:59 +0000 Subject: [PATCH 0930/1107] python310/python311: fix failing tests with openssl >= 3.4 --- .../3.10/raise-OSError-for-ERR_LIB_SYS.patch | 28 +++++++++++++++++++ .../interpreters/python/cpython/default.nix | 9 ++++++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/interpreters/python/cpython/3.10/raise-OSError-for-ERR_LIB_SYS.patch diff --git a/pkgs/development/interpreters/python/cpython/3.10/raise-OSError-for-ERR_LIB_SYS.patch b/pkgs/development/interpreters/python/cpython/3.10/raise-OSError-for-ERR_LIB_SYS.patch new file mode 100644 index 000000000000..dd1fe891bf25 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.10/raise-OSError-for-ERR_LIB_SYS.patch @@ -0,0 +1,28 @@ +diff --git a/Modules/_ssl.c b/Modules/_ssl.c +index e637830..80728d2 100644 +--- a/Modules/_ssl.c ++++ b/Modules/_ssl.c +@@ -656,6 +656,11 @@ PySSL_SetError(PySSLSocket *sslsock, int ret, const char *filename, int lineno) + errstr = "Some I/O error occurred"; + } + } else { ++ if (ERR_GET_LIB(e) == ERR_LIB_SYS) { ++ // A system error is being reported; reason is set to errno ++ errno = ERR_GET_REASON(e); ++ return PyErr_SetFromErrno(PyExc_OSError); ++ } + p = PY_SSL_ERROR_SYSCALL; + } + break; +@@ -681,6 +686,11 @@ PySSL_SetError(PySSLSocket *sslsock, int ret, const char *filename, int lineno) + errstr = "EOF occurred in violation of protocol"; + } + #endif ++ if (ERR_GET_LIB(e) == ERR_LIB_SYS) { ++ // A system error is being reported; reason is set to errno ++ errno = ERR_GET_REASON(e); ++ return PyErr_SetFromErrno(PyExc_OSError); ++ } + break; + } + default: diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index d0fab0f83a66..8a052a55b7da 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -299,6 +299,15 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { ] ++ optionals (pythonOlder "3.12") [ # https://github.com/python/cpython/issues/90656 ./loongarch-support.patch + # fix failing tests with openssl >= 3.4 + # https://github.com/python/cpython/pull/127361 + ] ++ optionals (pythonAtLeast "3.10" && pythonOlder "3.11") [ + ./3.10/raise-OSError-for-ERR_LIB_SYS.patch + ] ++ optionals (pythonAtLeast "3.11" && pythonOlder "3.12") [ + (fetchpatch { + url = "https://github.com/python/cpython/commit/f4b31edf2d9d72878dab1f66a36913b5bcc848ec.patch"; + sha256 = "sha256-w7zZMp0yqyi4h5oG8sK4z9BwNEkqg4Ar+en3nlWcxh0="; + }) ] ++ optionals (pythonAtLeast "3.11" && pythonOlder "3.13") [ # backport fix for https://github.com/python/cpython/issues/95855 ./platform-triplet-detection.patch From b8d8bf1409b0043a86de36b17016945ac0982f23 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 21:36:43 +0000 Subject: [PATCH 0931/1107] ghost-cli: 1.26.1 -> 1.27.0 --- pkgs/by-name/gh/ghost-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gh/ghost-cli/package.nix b/pkgs/by-name/gh/ghost-cli/package.nix index 43a9ee51388a..c1845b632b6b 100644 --- a/pkgs/by-name/gh/ghost-cli/package.nix +++ b/pkgs/by-name/gh/ghost-cli/package.nix @@ -11,18 +11,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "ghost-cli"; - version = "1.26.1"; + version = "1.27.0"; src = fetchFromGitHub { owner = "TryGhost"; repo = "Ghost-CLI"; tag = "v${finalAttrs.version}"; - hash = "sha256-2zyRkPTQBzF+7nmlHPMi4S0BAdmUwIBkwD71y1y7Pn8="; + hash = "sha256-xOchKEktagamLJQONI9SJsv5vypVpBOAy/SWGdSzjLc="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-No+Hkb2ivrCSd0S9L5QxZ8ReX9NANMRITKHFvjzRSuc="; + hash = "sha256-Dgy+Ab0OaapjuuuRMcfHtzpsrfI5uPItXDY4XE9iK3A="; }; nativeBuildInputs = [ From 937fba9c5e53ad6e30bdf748ce054c6699d65d05 Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Tue, 18 Feb 2025 22:36:37 +0100 Subject: [PATCH 0932/1107] gurk-rs: 0.6.1 -> 0.6.2 --- pkgs/by-name/gu/gurk-rs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gu/gurk-rs/package.nix b/pkgs/by-name/gu/gurk-rs/package.nix index 172490f3a449..a26e7fc32de1 100644 --- a/pkgs/by-name/gu/gurk-rs/package.nix +++ b/pkgs/by-name/gu/gurk-rs/package.nix @@ -18,13 +18,13 @@ let in rustPlatform.buildRustPackage rec { pname = "gurk-rs"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "boxdot"; repo = "gurk-rs"; tag = "v${version}"; - hash = "sha256-cNKUQlCzhOgyWoitHjRoVdehj8AUEslHBCGxH9nRWF4="; + hash = "sha256-FSnKBSRhnHwjMzC8zGU/AHBuPX44EjMLS+3wHkf6IZw="; }; postPatch = '' @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; - cargoHash = "sha256-eh7ZD8ZX1oKiJbJcVtk6pczb6HxNM6md93P/22Qn5u0="; + cargoHash = "sha256-6+AFyQjbtxKHbMhYhfu9pUoz/cWGtl5o+IA6kFO4Zjk="; nativeBuildInputs = [ protobuf From 954f98d37cde9f2279f4a69f477b77da5c8ca3bb Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 18 Feb 2025 22:38:58 +0100 Subject: [PATCH 0933/1107] lexical: 0.7.2 -> 0.7.3 Diff: https://github.com/lexical-lsp/lexical/compare/refs/tags/v0.7.2...v0.7.3 Changelog: https://github.com/lexical-lsp/lexical/releases/tag/v0.7.3 --- pkgs/by-name/le/lexical/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/le/lexical/package.nix b/pkgs/by-name/le/lexical/package.nix index e89199f6e416..dbdbfa298ae0 100644 --- a/pkgs/by-name/le/lexical/package.nix +++ b/pkgs/by-name/le/lexical/package.nix @@ -9,19 +9,19 @@ beamPackages.mixRelease rec { pname = "lexical"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "lexical-lsp"; repo = "lexical"; tag = "v${version}"; - hash = "sha256-mgchXc46sMN1UcgyO8uWusl2bEJr/5PqfwJ2c6j6SoI="; + hash = "sha256-p8XSJBX1igwC+ssEJGD8wb/ZYaEgLGozlY8N6spo3cA="; }; mixFodDeps = beamPackages.fetchMixDeps { inherit pname version src; - hash = "sha256-Ee8RbLkb7jkdK91G4TAUIlPthBP5OyeynHJGg87UvBI="; + hash = "sha256-g6BZGJ33oBDXmjbb/kBfPhart4En/iDlt4yQJYeuBzw="; }; installPhase = '' From 76de542f6606efe5d147392b17ab4148070b654a Mon Sep 17 00:00:00 2001 From: Joshua Trees Date: Tue, 18 Feb 2025 22:48:30 +0100 Subject: [PATCH 0934/1107] android-backup-extractor: 20210909062443-4c55371 -> 0-unstable-2025-01-15-62310d4 (#379853) android-backup-extractor: update to latest version --- pkgs/by-name/an/android-backup-extractor/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/an/android-backup-extractor/package.nix b/pkgs/by-name/an/android-backup-extractor/package.nix index 61d8f55ea538..99cb71e60bd0 100644 --- a/pkgs/by-name/an/android-backup-extractor/package.nix +++ b/pkgs/by-name/an/android-backup-extractor/package.nix @@ -6,13 +6,13 @@ jre, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "android-backup-extractor"; - version = "20210909062443-4c55371"; + version = "0-unstable-2025-01-15-62310d4"; src = fetchurl { - url = "https://github.com/nelenkov/android-backup-extractor/releases/download/${version}/abe.jar"; - sha256 = "0ms241kb4h9y9apr637sb4kw5mml40c1ac0q4jcxhnwr3dr05w1q"; + url = "https://github.com/nelenkov/android-backup-extractor/releases/download/latest/abe-62310d4.jar"; + hash = "sha256-KY85I8OJCH7z6U6y9UbelFb3rvBVCid+AjJcucNGLdA="; }; dontUnpack = true; From eca34552eb2485bf9876ce1ec203fbfe9a2b63e3 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Tue, 18 Feb 2025 17:05:11 +0100 Subject: [PATCH 0935/1107] coqPackages.coq-elpi: rstore overridability on Coq < 9.0 --- .../coq-modules/coq-elpi/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index 9fe57b01822c..815e792d4b38 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -132,9 +132,9 @@ patched-derivation3 = patched-derivation2.overrideAttrs patched-derivation4 = patched-derivation3.overrideAttrs ( o: - # this is just a wrapper for rocPackages.bignums for Rocq >= 9.0 - lib.optionalAttrs (coq.version != null && (coq.version == "dev" - || lib.versions.isGe "9.0" coq.version)) { + # this is just a wrapper for rocPackages.rocq-elpi for Rocq >= 9.0 + if coq.version != null && (coq.version == "dev" + || lib.versions.isGe "9.0" coq.version) then { configurePhase = '' echo no configuration ''; @@ -146,6 +146,19 @@ patched-derivation4 = patched-derivation3.overrideAttrs ''; propagatedBuildInputs = o.propagatedBuildInputs ++ [ rocqPackages.rocq-elpi ]; + } else lib.optionalAttrs (o.version != null && (o.version == "dev" + || lib.versions.isGe "2.5.0" o.version)) { + configurePhase = '' + make dune-files || true + ''; + buildPhase = '' + dune build -p rocq-elpi @install ''${enableParallelBuilding:+-j $NIX_BUILD_CORES} + ''; + installPhase = '' + dune install --root . rocq-elpi --prefix=$out --libdir $OCAMLFIND_DESTDIR + mkdir $out/lib/coq/ + mv $OCAMLFIND_DESTDIR/coq $out/lib/coq/${coq.coq-version} + ''; } ); in patched-derivation4 From e9422823b88e174b694c8bdbd5b4dddac60a7ee6 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Tue, 18 Feb 2025 17:05:41 +0100 Subject: [PATCH 0936/1107] coqPackages.coqeal: 2.0.3 -> 2.1.0 --- .../coq-modules/coqeal/default.nix | 81 +++---------------- 1 file changed, 13 insertions(+), 68 deletions(-) diff --git a/pkgs/development/coq-modules/coqeal/default.nix b/pkgs/development/coq-modules/coqeal/default.nix index d748b956c42b..bc658fcfa7ed 100644 --- a/pkgs/development/coq-modules/coqeal/default.nix +++ b/pkgs/development/coq-modules/coqeal/default.nix @@ -18,75 +18,20 @@ derivation = mkCoqDerivation { inherit version; defaultVersion = with lib.versions; - lib.switch - [ coq.version mathcomp.version ] - [ - { - cases = [ - (range "8.16" "8.20") - (isGe "2.1.0") - ]; - out = "2.0.3"; - } - { - cases = [ - (range "8.16" "8.20") - (isGe "2.0.0") - ]; - out = "2.0.1"; - } - { - cases = [ - (range "8.16" "8.17") - (isGe "2.0.0") - ]; - out = "2.0.0"; - } - { - cases = [ - (range "8.15" "8.18") - (range "1.15.0" "1.18.0") - ]; - out = "1.1.3"; - } - { - cases = [ - (range "8.13" "8.17") - (range "1.13.0" "1.18.0") - ]; - out = "1.1.1"; - } - { - cases = [ - (range "8.10" "8.15") - (range "1.12.0" "1.18.0") - ]; - out = "1.1.0"; - } - { - cases = [ - (isGe "8.10") - (range "1.11.0" "1.12.0") - ]; - out = "1.0.5"; - } - { - cases = [ - (isGe "8.7") - "1.11.0" - ]; - out = "1.0.4"; - } - { - cases = [ - (isGe "8.7") - "1.10.0" - ]; - out = "1.0.3"; - } - ] - null; + lib.switch [ coq.version mathcomp.version ] [ + { cases = [ (range "9.0" "9.0") (isGe "2.3.0") ]; out = "2.1.0"; } + { cases = [ (range "8.16" "8.20") (isGe "2.1.0") ]; out = "2.0.3"; } + { cases = [ (range "8.16" "8.20") (isGe "2.0.0") ]; out = "2.0.1"; } + { cases = [ (range "8.16" "8.17") (isGe "2.0.0") ]; out = "2.0.0"; } + { cases = [ (range "8.15" "8.18") (range "1.15.0" "1.18.0") ]; out = "1.1.3"; } + { cases = [ (range "8.13" "8.17") (range "1.13.0" "1.18.0") ]; out = "1.1.1"; } + { cases = [ (range "8.10" "8.15") (range "1.12.0" "1.18.0") ]; out = "1.1.0"; } + { cases = [ (isGe "8.10") (range "1.11.0" "1.12.0") ]; out = "1.0.5"; } + { cases = [ (isGe "8.7") "1.11.0" ]; out = "1.0.4"; } + { cases = [ (isGe "8.7") "1.10.0" ]; out = "1.0.3"; } + ] null; + release."2.1.0".sha256 = "sha256-UoDxy2BKraDyRsO42GXRo26O74OF51biZQGkIMWLf8Y="; release."2.0.3".sha256 = "sha256-5lDq7IWlEW0EkNzYPu+dA6KOvRgy53W/alikpDr/Kd0="; release."2.0.1".sha256 = "sha256-d/IQ4IdS2tpyPewcGobj2S6m2HU+iXQmlvR+ITNIcjI="; release."2.0.0".sha256 = "sha256-SG/KVnRJz2P+ZxkWVp1dDOnc/JVgigoexKfRUh1Y0GM"; From 3d6d4aa397108aa38801c1d32a937777e550d4d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 22:15:38 +0000 Subject: [PATCH 0937/1107] harper: 0.21.1 -> 0.22.0 --- pkgs/by-name/ha/harper/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index 4671e4a0d58a..48f4bbe407bf 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "harper"; - version = "0.21.1"; + version = "0.22.0"; src = fetchFromGitHub { owner = "Automattic"; repo = "harper"; rev = "v${version}"; - hash = "sha256-UTohTnIUMpyQGvkuOD2L7bViF3b5QnbDjRD4VSmf4lE="; + hash = "sha256-MwShWO1XXV2Ln70+w5KGPDChtnAOhsa2fENTNql3bo4="; }; buildAndTestSubdir = "harper-ls"; useFetchCargoVendor = true; - cargoHash = "sha256-wHXo4yfFc77osCamK0NidbrIYyIFMEpfBr0B6aniBmQ="; + cargoHash = "sha256-+rtFGD/go5W+RCpE0+3Tkb2TbwzH8J2nl0/VkipSjI0="; passthru.updateScript = nix-update-script { }; From 5cf57e19690d06e4ff1a129ef8075f7ef5e18446 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Wed, 19 Feb 2025 07:20:43 +1100 Subject: [PATCH 0938/1107] python312Packages.blosc2: make torch tests optional, enabled by default Update pkgs/development/python-modules/blosc2/default.nix Co-authored-by: Nick Cao --- pkgs/development/python-modules/blosc2/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/blosc2/default.nix b/pkgs/development/python-modules/blosc2/default.nix index 611303a52016..e0dfb4974072 100644 --- a/pkgs/development/python-modules/blosc2/default.nix +++ b/pkgs/development/python-modules/blosc2/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -24,6 +25,8 @@ # tests psutil, pytestCheckHook, + torch, + runTorchTests ? lib.meta.availableOn stdenv.hostPlatform torch, }: buildPythonPackage rec { @@ -68,7 +71,7 @@ buildPythonPackage rec { nativeCheckInputs = [ psutil pytestCheckHook - ]; + ] ++ lib.optionals runTorchTests [ torch ]; disabledTests = [ # RuntimeError: Error while getting the slice From cded24ddc2507f299ad19a91c320d8eb74c0c020 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 18 Feb 2025 16:33:09 +0100 Subject: [PATCH 0939/1107] python312Packages.apache-beam: 2.62.0 -> 2.63.0 Diff: https://github.com/apache/beam/compare/refs/tags/v2.62.0...v2.63.0 Changelog: https://github.com/apache/beam/blob/release-2.63.0/CHANGES.md --- .../python-modules/apache-beam/default.nix | 339 ++++++++++-------- 1 file changed, 182 insertions(+), 157 deletions(-) diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index 19df48ce1bd8..b38ad2e8ee05 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -42,6 +42,7 @@ # tests python, + docstring-parser, freezegun, hypothesis, mock, @@ -57,18 +58,19 @@ sqlalchemy, tenacity, testcontainers, + pythonAtLeast, }: buildPythonPackage rec { pname = "apache-beam"; - version = "2.62.0"; + version = "2.63.0"; pyproject = true; src = fetchFromGitHub { owner = "apache"; repo = "beam"; tag = "v${version}"; - hash = "sha256-vLvnRZAQg9nhUOI0SIUn+9Y8O7edK3445PkdhPbhO3Y="; + hash = "sha256-ixJstawgU3UGtNKVzkwMCLkdY7QKTbxNe6JJ7vG+vmA="; }; pythonRelaxDeps = [ @@ -148,6 +150,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "apache_beam" ]; nativeCheckInputs = [ + docstring-parser freezegun hypothesis mock @@ -171,170 +174,192 @@ buildPythonPackage rec { cd $out/${python.sitePackages} ''; - disabledTestPaths = [ - # Fails with - # _______ ERROR collecting apache_beam/io/external/xlang_jdbcio_it_test.py _______ - # apache_beam/io/external/xlang_jdbcio_it_test.py:80: in - # class CrossLanguageJdbcIOTest(unittest.TestCase): - # apache_beam/io/external/xlang_jdbcio_it_test.py:99: in CrossLanguageJdbcIOTest - # container_init: Callable[[], Union[PostgresContainer, MySqlContainer]], - # E NameError: name 'MySqlContainer' is not defined - # - "apache_beam/io/external/xlang_jdbcio_it_test.py" + disabledTestPaths = + [ + # Fails with + # _______ ERROR collecting apache_beam/io/external/xlang_jdbcio_it_test.py _______ + # apache_beam/io/external/xlang_jdbcio_it_test.py:80: in + # class CrossLanguageJdbcIOTest(unittest.TestCase): + # apache_beam/io/external/xlang_jdbcio_it_test.py:99: in CrossLanguageJdbcIOTest + # container_init: Callable[[], Union[PostgresContainer, MySqlContainer]], + # E NameError: name 'MySqlContainer' is not defined + # + "apache_beam/io/external/xlang_jdbcio_it_test.py" - # These tests depend on the availability of specific servers backends. - "apache_beam/runners/portability/flink_runner_test.py" - "apache_beam/runners/portability/samza_runner_test.py" - "apache_beam/runners/portability/spark_runner_test.py" + # These tests depend on the availability of specific servers backends. + "apache_beam/runners/portability/flink_runner_test.py" + "apache_beam/runners/portability/samza_runner_test.py" + "apache_beam/runners/portability/spark_runner_test.py" - # Fails starting from dill 0.3.6 because it tries to pickle pytest globals: - # https://github.com/uqfoundation/dill/issues/482#issuecomment-1139017499. - "apache_beam/transforms/window_test.py" + # Fails starting from dill 0.3.6 because it tries to pickle pytest globals: + # https://github.com/uqfoundation/dill/issues/482#issuecomment-1139017499. + "apache_beam/transforms/window_test.py" - # See https://github.com/apache/beam/issues/25390. - "apache_beam/coders/slow_coders_test.py" - "apache_beam/dataframe/pandas_doctests_test.py" - "apache_beam/typehints/typed_pipeline_test.py" - "apache_beam/coders/fast_coders_test.py" - "apache_beam/dataframe/schemas_test.py" + # See https://github.com/apache/beam/issues/25390. + "apache_beam/coders/slow_coders_test.py" + "apache_beam/dataframe/pandas_doctests_test.py" + "apache_beam/typehints/typed_pipeline_test.py" + "apache_beam/coders/fast_coders_test.py" + "apache_beam/dataframe/schemas_test.py" - # Fails with TypeError: cannot pickle 'EncodedFile' instances - # Upstream issue https://github.com/apache/beam/issues/33889 - "apache_beam/options/pipeline_options_validator_test.py" - "apache_beam/yaml/main_test.py" - "apache_beam/yaml/programming_guide_test.py" - "apache_beam/yaml/readme_test.py" - "apache_beam/yaml/yaml_combine_test.py" - "apache_beam/yaml/yaml_enrichment_test.py" - "apache_beam/yaml/yaml_io_test.py" - "apache_beam/yaml/yaml_join_test.py" - "apache_beam/yaml/yaml_mapping_test.py" - "apache_beam/yaml/yaml_ml_test.py" - "apache_beam/yaml/yaml_provider_unit_test.py" + # Fails with TypeError: cannot pickle 'EncodedFile' instances + # Upstream issue https://github.com/apache/beam/issues/33889 + "apache_beam/options/pipeline_options_validator_test.py" + "apache_beam/yaml/main_test.py" + "apache_beam/yaml/programming_guide_test.py" + "apache_beam/yaml/readme_test.py" + "apache_beam/yaml/yaml_combine_test.py" + "apache_beam/yaml/yaml_enrichment_test.py" + "apache_beam/yaml/yaml_io_test.py" + "apache_beam/yaml/yaml_join_test.py" + "apache_beam/yaml/yaml_mapping_test.py" + "apache_beam/yaml/yaml_ml_test.py" + "apache_beam/yaml/yaml_provider_unit_test.py" - # FIXME All those fails due to a single- AttributeError: 'MaybeReshuffle' object has no attribute 'side_inputs' - # Upstream issue https://github.com/apache/beam/issues/33854 - "apache_beam/coders/row_coder_test.py" - "apache_beam/examples/avro_nyc_trips_test.py" - "apache_beam/examples/complete/autocomplete_test.py" - "apache_beam/examples/complete/estimate_pi_test.py" - "apache_beam/examples/complete/game/game_stats_test.py" - "apache_beam/examples/complete/game/hourly_team_score_test.py" - "apache_beam/examples/complete/game/leader_board_test.py" - "apache_beam/examples/complete/game/user_score_test.py" - "apache_beam/examples/complete/tfidf_test.py" - "apache_beam/examples/complete/top_wikipedia_sessions_test.py" - "apache_beam/examples/cookbook/bigquery_side_input_test.py" - "apache_beam/examples/cookbook/bigquery_tornadoes_test.py" - "apache_beam/examples/cookbook/coders_test.py" - "apache_beam/examples/cookbook/combiners_test.py" - "apache_beam/examples/cookbook/custom_ptransform_test.py" - "apache_beam/examples/cookbook/filters_test.py" - "apache_beam/examples/matrix_power_test.py" - "apache_beam/examples/snippets/snippets_test.py" - "apache_beam/examples/snippets/transforms/aggregation/approximatequantiles_test.py" - "apache_beam/examples/snippets/transforms/aggregation/approximateunique_test.py" - "apache_beam/examples/snippets/transforms/aggregation/batchelements_test.py" - "apache_beam/examples/snippets/transforms/aggregation/cogroupbykey_test.py" - "apache_beam/examples/snippets/transforms/aggregation/combineglobally_test.py" - "apache_beam/examples/snippets/transforms/aggregation/combineperkey_test.py" - "apache_beam/examples/snippets/transforms/aggregation/combinevalues_test.py" - "apache_beam/examples/snippets/transforms/aggregation/count_test.py" - "apache_beam/examples/snippets/transforms/aggregation/distinct_test.py" - "apache_beam/examples/snippets/transforms/aggregation/groupbykey_test.py" - "apache_beam/examples/snippets/transforms/aggregation/groupintobatches_test.py" - "apache_beam/examples/snippets/transforms/aggregation/latest_test.py" - "apache_beam/examples/snippets/transforms/aggregation/max_test.py" - "apache_beam/examples/snippets/transforms/aggregation/mean_test.py" - "apache_beam/examples/snippets/transforms/aggregation/min_test.py" - "apache_beam/examples/snippets/transforms/aggregation/sample_test.py" - "apache_beam/examples/snippets/transforms/aggregation/sum_test.py" - "apache_beam/examples/snippets/transforms/aggregation/tolist_test.py" - "apache_beam/examples/snippets/transforms/aggregation/top_test.py" - "apache_beam/examples/snippets/transforms/elementwise/filter_test.py" - "apache_beam/examples/snippets/transforms/elementwise/flatmap_test.py" - "apache_beam/examples/snippets/transforms/elementwise/keys_test.py" - "apache_beam/examples/snippets/transforms/elementwise/kvswap_test.py" - "apache_beam/examples/snippets/transforms/elementwise/map_test.py" - "apache_beam/examples/snippets/transforms/elementwise/pardo_test.py" - "apache_beam/examples/snippets/transforms/elementwise/partition_test.py" - "apache_beam/examples/snippets/transforms/elementwise/regex_test.py" - "apache_beam/examples/snippets/transforms/elementwise/tostring_test.py" - "apache_beam/examples/snippets/transforms/elementwise/values_test.py" - "apache_beam/examples/snippets/transforms/elementwise/withtimestamps_test.py" - "apache_beam/examples/snippets/transforms/other/create_test.py" - "apache_beam/examples/snippets/transforms/other/flatten_test.py" - "apache_beam/examples/snippets/transforms/other/window_test.py" - "apache_beam/examples/snippets/util_test.py" - "apache_beam/io/avroio_test.py" - "apache_beam/io/concat_source_test.py" - "apache_beam/io/filebasedsink_test.py" - "apache_beam/io/filebasedsource_test.py" - "apache_beam/io/fileio_test.py" - "apache_beam/io/mongodbio_test.py" - "apache_beam/io/parquetio_test.py" - "apache_beam/io/sources_test.py" - "apache_beam/io/textio_test.py" - "apache_beam/io/tfrecordio_test.py" - "apache_beam/metrics/metric_test.py" - "apache_beam/ml/inference/base_test.py" - "apache_beam/ml/inference/sklearn_inference_test.py" - "apache_beam/ml/inference/utils_test.py" - "apache_beam/ml/rag/chunking/base_test.py" - "apache_beam/pipeline_test.py" - "apache_beam/runners/direct/direct_runner_test.py" - "apache_beam/runners/direct/sdf_direct_runner_test.py" - "apache_beam/runners/interactive/interactive_beam_test.py" - "apache_beam/runners/interactive/interactive_runner_test.py" - "apache_beam/runners/interactive/non_interactive_runner_test.py" - "apache_beam/runners/interactive/recording_manager_test.py" - "apache_beam/runners/portability/fn_api_runner/translations_test.py" - "apache_beam/runners/portability/fn_api_runner/trigger_manager_test.py" - "apache_beam/runners/portability/stager_test.py" - "apache_beam/testing/synthetic_pipeline_test.py" - "apache_beam/testing/test_stream_test.py" - "apache_beam/testing/util_test.py" - "apache_beam/transforms/combiners_test.py" - "apache_beam/transforms/core_test.py" - "apache_beam/transforms/create_test.py" - "apache_beam/transforms/deduplicate_test.py" - "apache_beam/transforms/periodicsequence_test.py" - "apache_beam/transforms/ptransform_test.py" - "apache_beam/transforms/sideinputs_test.py" - "apache_beam/transforms/stats_test.py" - "apache_beam/transforms/transforms_keyword_only_args_test.py" - "apache_beam/transforms/trigger_test.py" - "apache_beam/transforms/userstate_test.py" - "apache_beam/transforms/util_test.py" - "apache_beam/transforms/write_ptransform_test.py" + # FIXME All those fails due to a single- AttributeError: 'MaybeReshuffle' object has no attribute 'side_inputs' + # Upstream issue https://github.com/apache/beam/issues/33854 + "apache_beam/coders/row_coder_test.py" + "apache_beam/examples/avro_nyc_trips_test.py" + "apache_beam/examples/complete/autocomplete_test.py" + "apache_beam/examples/complete/estimate_pi_test.py" + "apache_beam/examples/complete/game/game_stats_test.py" + "apache_beam/examples/complete/game/hourly_team_score_test.py" + "apache_beam/examples/complete/game/leader_board_test.py" + "apache_beam/examples/complete/game/user_score_test.py" + "apache_beam/examples/complete/tfidf_test.py" + "apache_beam/examples/complete/top_wikipedia_sessions_test.py" + "apache_beam/examples/cookbook/bigquery_side_input_test.py" + "apache_beam/examples/cookbook/bigquery_tornadoes_test.py" + "apache_beam/examples/cookbook/coders_test.py" + "apache_beam/examples/cookbook/combiners_test.py" + "apache_beam/examples/cookbook/custom_ptransform_test.py" + "apache_beam/examples/cookbook/filters_test.py" + "apache_beam/examples/matrix_power_test.py" + "apache_beam/examples/snippets/snippets_test.py" + "apache_beam/examples/snippets/transforms/aggregation/approximatequantiles_test.py" + "apache_beam/examples/snippets/transforms/aggregation/approximateunique_test.py" + "apache_beam/examples/snippets/transforms/aggregation/batchelements_test.py" + "apache_beam/examples/snippets/transforms/aggregation/cogroupbykey_test.py" + "apache_beam/examples/snippets/transforms/aggregation/combineglobally_test.py" + "apache_beam/examples/snippets/transforms/aggregation/combineperkey_test.py" + "apache_beam/examples/snippets/transforms/aggregation/combinevalues_test.py" + "apache_beam/examples/snippets/transforms/aggregation/count_test.py" + "apache_beam/examples/snippets/transforms/aggregation/distinct_test.py" + "apache_beam/examples/snippets/transforms/aggregation/groupbykey_test.py" + "apache_beam/examples/snippets/transforms/aggregation/groupintobatches_test.py" + "apache_beam/examples/snippets/transforms/aggregation/latest_test.py" + "apache_beam/examples/snippets/transforms/aggregation/max_test.py" + "apache_beam/examples/snippets/transforms/aggregation/mean_test.py" + "apache_beam/examples/snippets/transforms/aggregation/min_test.py" + "apache_beam/examples/snippets/transforms/aggregation/sample_test.py" + "apache_beam/examples/snippets/transforms/aggregation/sum_test.py" + "apache_beam/examples/snippets/transforms/aggregation/tolist_test.py" + "apache_beam/examples/snippets/transforms/aggregation/top_test.py" + "apache_beam/examples/snippets/transforms/elementwise/filter_test.py" + "apache_beam/examples/snippets/transforms/elementwise/flatmap_test.py" + "apache_beam/examples/snippets/transforms/elementwise/keys_test.py" + "apache_beam/examples/snippets/transforms/elementwise/kvswap_test.py" + "apache_beam/examples/snippets/transforms/elementwise/map_test.py" + "apache_beam/examples/snippets/transforms/elementwise/pardo_test.py" + "apache_beam/examples/snippets/transforms/elementwise/partition_test.py" + "apache_beam/examples/snippets/transforms/elementwise/regex_test.py" + "apache_beam/examples/snippets/transforms/elementwise/tostring_test.py" + "apache_beam/examples/snippets/transforms/elementwise/values_test.py" + "apache_beam/examples/snippets/transforms/elementwise/withtimestamps_test.py" + "apache_beam/examples/snippets/transforms/other/create_test.py" + "apache_beam/examples/snippets/transforms/other/flatten_test.py" + "apache_beam/examples/snippets/transforms/other/window_test.py" + "apache_beam/examples/snippets/util_test.py" + "apache_beam/io/avroio_test.py" + "apache_beam/io/concat_source_test.py" + "apache_beam/io/filebasedsink_test.py" + "apache_beam/io/filebasedsource_test.py" + "apache_beam/io/fileio_test.py" + "apache_beam/io/mongodbio_test.py" + "apache_beam/io/parquetio_test.py" + "apache_beam/io/sources_test.py" + "apache_beam/io/textio_test.py" + "apache_beam/io/tfrecordio_test.py" + "apache_beam/metrics/metric_test.py" + "apache_beam/ml/inference/base_test.py" + "apache_beam/ml/inference/sklearn_inference_test.py" + "apache_beam/ml/inference/utils_test.py" + "apache_beam/ml/rag/chunking/base_test.py" + "apache_beam/ml/rag/ingestion/base_test.py" + "apache_beam/pipeline_test.py" + "apache_beam/runners/direct/direct_runner_test.py" + "apache_beam/runners/direct/sdf_direct_runner_test.py" + "apache_beam/runners/interactive/interactive_beam_test.py" + "apache_beam/runners/interactive/interactive_runner_test.py" + "apache_beam/runners/interactive/non_interactive_runner_test.py" + "apache_beam/runners/interactive/recording_manager_test.py" + "apache_beam/runners/portability/fn_api_runner/translations_test.py" + "apache_beam/runners/portability/fn_api_runner/trigger_manager_test.py" + "apache_beam/runners/portability/stager_test.py" + "apache_beam/testing/synthetic_pipeline_test.py" + "apache_beam/testing/test_stream_test.py" + "apache_beam/testing/util_test.py" + "apache_beam/transforms/combiners_test.py" + "apache_beam/transforms/core_test.py" + "apache_beam/transforms/create_test.py" + "apache_beam/transforms/deduplicate_test.py" + "apache_beam/transforms/periodicsequence_test.py" + "apache_beam/transforms/ptransform_test.py" + "apache_beam/transforms/sideinputs_test.py" + "apache_beam/transforms/stats_test.py" + "apache_beam/transforms/transforms_keyword_only_args_test.py" + "apache_beam/transforms/trigger_test.py" + "apache_beam/transforms/userstate_test.py" + "apache_beam/transforms/util_test.py" + "apache_beam/transforms/write_ptransform_test.py" - # FIXME AttributeError: 'Namespace' object has no attribute 'test_pipeline_options' - # Upstream issue https://github.com/apache/beam/issues/33853 - "apache_beam/runners/portability/prism_runner_test.py" + # FIXME AttributeError: 'Namespace' object has no attribute 'test_pipeline_options' + # Upstream issue https://github.com/apache/beam/issues/33853 + "apache_beam/runners/portability/prism_runner_test.py" - # FIXME ValueError: Unable to run pipeline with requirement: unsupported_requirement - # Upstream issuehttps://github.com/apache/beam/issues/33853 - "apache_beam/yaml/yaml_transform_scope_test.py" - "apache_beam/yaml/yaml_transform_test.py" - "apache_beam/yaml/yaml_transform_unit_test.py" - "apache_beam/yaml/yaml_udf_test.py" - "apache_beam/dataframe/frames_test.py" + # FIXME ValueError: Unable to run pipeline with requirement: unsupported_requirement + # Upstream issuehttps://github.com/apache/beam/issues/33853 + "apache_beam/yaml/yaml_transform_scope_test.py" + "apache_beam/yaml/yaml_transform_test.py" + "apache_beam/yaml/yaml_transform_unit_test.py" + "apache_beam/yaml/yaml_udf_test.py" + "apache_beam/dataframe/frames_test.py" - # FIXME Those tests do not terminate due to a grpc error (threading issue) - # grpc_status:14, grpc_message:"Cancelling all calls"}" - # Upstream issue https://github.com/apache/beam/issues/33851 - "apache_beam/runners/portability/portable_runner_test.py" - ]; + # FIXME Those tests do not terminate due to a grpc error (threading issue) + # grpc_status:14, grpc_message:"Cancelling all calls"}" + # Upstream issue https://github.com/apache/beam/issues/33851 + "apache_beam/runners/portability/portable_runner_test.py" + ] + ++ lib.optionals (pythonAtLeast "3.13") [ + # > instruction = ofs_table[pc] + # E KeyError: 18 + "apache_beam/typehints/trivial_inference_test.py" + ]; - disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ - # PermissionError: [Errno 13] Permission denied: '/tmp/...' - "test_cache_manager_uses_local_ib_cache_root" - "test_describe_all_recordings" - "test_find_out_correct_user_pipeline" - "test_get_cache_manager_creates_cache_manager_if_absent" - "test_streaming_cache_uses_local_ib_cache_root" - "test_track_user_pipeline_cleanup_non_inspectable_pipeline" - ]; + disabledTests = + lib.optionals stdenv.hostPlatform.isDarwin [ + # PermissionError: [Errno 13] Permission denied: '/tmp/...' + "test_cache_manager_uses_local_ib_cache_root" + "test_describe_all_recordings" + "test_find_out_correct_user_pipeline" + "test_get_cache_manager_creates_cache_manager_if_absent" + "test_streaming_cache_uses_local_ib_cache_root" + "test_track_user_pipeline_cleanup_non_inspectable_pipeline" + ] + ++ lib.optionals (pythonAtLeast "3.12") [ + # TypeError: Could not determine schema for type hint Any. + "test_batching_beam_row_input" + "test_auto_convert" + "test_unbatching_series" + "test_batching_beam_row_to_dataframe" + + # AssertionError: Any != + "test_pycallable_map" + "testAlwaysReturnsEarly" + + # TypeError: Expected Iterator in return type annotatio + "test_get_output_batch_type" + ]; meta = { description = "Unified model for defining both batch and streaming data-parallel processing pipelines"; From 0cf76e6962ca4124794a7471b5f9cd770461799c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 23:03:17 +0000 Subject: [PATCH 0940/1107] supabase-cli: 2.10.2 -> 2.15.0 --- pkgs/by-name/su/supabase-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix index 4e10f68be199..fde07867f389 100644 --- a/pkgs/by-name/su/supabase-cli/package.nix +++ b/pkgs/by-name/su/supabase-cli/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "2.10.2"; + version = "2.15.0"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-OuX2fD+b5B5d3ir638ZuNQpt/HuEUhc1chrPyq03qSE="; + hash = "sha256-SMjP+9YRmU7FVBeM7n+iZri2LBZDtZw52EjXmlBIbyQ="; }; - vendorHash = "sha256-8CMmwMBqrfeiXp2XgpXruOkBhdUUf7W4okvn2Z3+MYA="; + vendorHash = "sha256-WFTnaZ+qOYkKE9vy3GWBbPK/TppUKCIwdU25KU318Lc="; ldflags = [ "-s" From 91d63d47b4f77d20de51dce780bb6a17962f50eb Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 19 Feb 2025 00:39:40 +0100 Subject: [PATCH 0941/1107] python312Packages.stumpy: mark as broken on aarch64-linux --- .../python-modules/stumpy/default.nix | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/stumpy/default.nix b/pkgs/development/python-modules/stumpy/default.nix index 9e6c11b17283..383325b15e0b 100644 --- a/pkgs/development/python-modules/stumpy/default.nix +++ b/pkgs/development/python-modules/stumpy/default.nix @@ -2,16 +2,21 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system setuptools, setuptools-scm, + + # dependencies + numba, numpy, scipy, - numba, - pandas, + + # tests dask, distributed, + pandas, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { @@ -19,8 +24,6 @@ buildPythonPackage rec { version = "1.13.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "TDAmeritrade"; repo = "stumpy"; @@ -34,15 +37,15 @@ buildPythonPackage rec { ]; dependencies = [ + numba numpy scipy - numba ]; nativeCheckInputs = [ - pandas dask distributed + pandas pytestCheckHook ]; @@ -56,9 +59,14 @@ buildPythonPackage rec { meta = { description = "Library that can be used for a variety of time series data mining tasks"; - changelog = "https://github.com/TDAmeritrade/stumpy/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/TDAmeritrade/stumpy/blob/v${version}/CHANGELOG.md"; homepage = "https://github.com/TDAmeritrade/stumpy"; license = lib.licenses.bsd3; maintainers = [ ]; + badPlatforms = [ + # Multiple tests fail with: + # Segmentation fault (core dumped) + "aarch64-linux" + ]; }; } From 74222f6e4661652e72597e0edd14b4bace8f3584 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 00:02:06 +0000 Subject: [PATCH 0942/1107] slackdump: 3.0.5 -> 3.0.7 --- pkgs/by-name/sl/slackdump/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sl/slackdump/package.nix b/pkgs/by-name/sl/slackdump/package.nix index 7e41a183b7d7..667d9ff7a7b1 100644 --- a/pkgs/by-name/sl/slackdump/package.nix +++ b/pkgs/by-name/sl/slackdump/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "slackdump"; - version = "3.0.5"; + version = "3.0.7"; src = fetchFromGitHub { owner = "rusq"; repo = "slackdump"; tag = "v${version}"; - hash = "sha256-iNXCqiDTD5z1dNIsQiTNAmVqx2HpTNDCdhY5X2FoC8k="; + hash = "sha256-IlWnlWCtcp/vT9hUaWyQXyaieOnhI1eW8PluJu4buHk="; }; nativeCheckInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.IOKitTools; @@ -32,7 +32,7 @@ buildGoModule rec { "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; - vendorHash = "sha256-c3Z4p/u7+fMV9kydh7fqRxSEERJI3cw1XoIPcMp0mL4="; + vendorHash = "sha256-g38rP8h3+eo92S/0gqP8F/BY5HoxK1uCdHTKGCFv2dE="; __darwinAllowLocalNetworking = true; From 5ee30e862c071f95e4a9067553ff3f5608dd4224 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Wed, 19 Feb 2025 01:25:00 +0100 Subject: [PATCH 0943/1107] home-assistant-custom-components.localtuya: init at 2025.2.1 --- .../custom-components/localtuya/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/localtuya/package.nix b/pkgs/servers/home-assistant/custom-components/localtuya/package.nix index 2b0e06cf1b4b..75be76ebd3c5 100644 --- a/pkgs/servers/home-assistant/custom-components/localtuya/package.nix +++ b/pkgs/servers/home-assistant/custom-components/localtuya/package.nix @@ -5,21 +5,21 @@ }: buildHomeAssistantComponent rec { - owner = "rospogrigio"; + owner = "xZetsubou"; domain = "localtuya"; - version = "5.2.2"; + version = "2025.2.1"; src = fetchFromGitHub { - owner = "rospogrigio"; - repo = "localtuya"; - rev = "v${version}"; - hash = "sha256-GexGUu4hevRDGF7gv7Jklr5YZJV+QH3kZN7p+eK9HlM="; + owner = "xZetsubou"; + repo = "hass-localtuya"; + rev = version; + hash = "sha256-on/KuZSJOCBGNRnGtxgGB5bquznjeJ+xMYNVnW67m0s="; }; meta = with lib; { - changelog = "https://github.com/rospogrigio/localtuya/releases/tag/${version}"; - description = "Home Assistant custom Integration for local handling of Tuya-based devices"; - homepage = "https://github.com/rospogrigio/localtuya"; + changelog = "https://github.com/xZetsubou/hass-localtuya/releases/tag/${version}"; + description = "Home Assistant custom Integration for local handling of Tuya-based devices, fork from local-tuya"; + homepage = "https://github.com/xZetsubou/hass-localtuya"; maintainers = with maintainers; [ rhoriguchi ]; license = licenses.gpl3Only; }; From 4e13f15d517e8f44fe7d020b5ce570eb0aeb3355 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 00:34:49 +0000 Subject: [PATCH 0944/1107] bio-gappa: 0.8.5 -> 0.9.0 --- pkgs/by-name/bi/bio-gappa/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bi/bio-gappa/package.nix b/pkgs/by-name/bi/bio-gappa/package.nix index fdb38563321e..329ffab3fed3 100644 --- a/pkgs/by-name/bi/bio-gappa/package.nix +++ b/pkgs/by-name/bi/bio-gappa/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bio-gappa"; - version = "0.8.5"; + version = "0.9.0"; src = fetchFromGitHub { owner = "lczech"; repo = "gappa"; rev = "v${finalAttrs.version}"; - hash = "sha256-YuvJyLMfGUKXvJyMe/HadrCc6HRnn4bipepX2FOuGfM="; + hash = "sha256-WV8PO0v+e14tyjEm+xQGveQ0Pslgeh+osEMCqF8mue0="; fetchSubmodules = true; }; From 786885dcc2cd8c48554dfad0550a23b54ddb4255 Mon Sep 17 00:00:00 2001 From: L-Trump Date: Tue, 18 Feb 2025 19:08:49 +0800 Subject: [PATCH 0945/1107] easytier: fix build --- pkgs/by-name/ea/easytier/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ea/easytier/package.nix b/pkgs/by-name/ea/easytier/package.nix index ba56c33b08f8..954b1f4d2aaf 100644 --- a/pkgs/by-name/ea/easytier/package.nix +++ b/pkgs/by-name/ea/easytier/package.nix @@ -24,7 +24,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-U2ZK9GlfTjXsA7Fjd288YDlqSZNl3vHryLG1FE/GH5c="; - nativeBuildInputs = [ protobuf ]; + nativeBuildInputs = [ + protobuf + rustPlatform.bindgenHook + ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security From 5553f68fab67f8886a5b5352dddf8def9b5d2c8a Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Tue, 18 Feb 2025 17:03:46 -0800 Subject: [PATCH 0946/1107] doc: include no-broken-symlinks and nixLog in release notes --- doc/release-notes/rl-2505.section.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index 6e5ad92b4240..301cb6d172a0 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -8,6 +8,14 @@ - `services.rippleDataApi` has been removed, as `ripple-data-api` was broken and had not been updated since 2022. +- The [`no-broken-symlinks` hook](#no-broken-symlinks.sh) was added to catch builds containing dangling or reflexive symlinks, as these are indicative of problems with packaging. + The hook can be disabled by providing `dontCheckForBrokenSymlinks = true;` as an argument to `mkDerivation`. + For more information, [check the docs](#no-broken-symlinks.sh) or [see this PR](https://github.com/NixOS/nixpkgs/pull/370750). + +- The `nixLog*` family of functions made available through the standard environment have been rewritten to prefix messages with both the debug level and the function name of the caller. + The `nixLog` function, which logs unconditionally, was also re-introduced and modified to prefix messages with the function name of the caller. + For more information, [see this PR](https://github.com/NixOS/nixpkgs/pull/370742). + - The `rustPlatform.fetchCargoTarball` function is deprecated, because it relied on `cargo vendor` not changing its output format to keep fixed-output derivation hashes the same, which is a Nix invariant, and Cargo 1.84.0 changed `cargo vendor`'s output format. It should generally be replaced with `rustPlatform.fetchCargoVendor`, but `rustPlatform.importCargoLock` may also be appropriate in some circumstances. `rustPlatform.buildRustPackage` users must set `useFetchCargoVendor` to `true` and regenerate the `cargoHash`. From 540ebe4a95ec9c5225789191b8b197b6e0cf5411 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 01:04:08 +0000 Subject: [PATCH 0947/1107] clusterctl: 1.9.4 -> 1.9.5 --- pkgs/by-name/cl/clusterctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/clusterctl/package.nix b/pkgs/by-name/cl/clusterctl/package.nix index 199199163add..dd1b1d0010bd 100644 --- a/pkgs/by-name/cl/clusterctl/package.nix +++ b/pkgs/by-name/cl/clusterctl/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - hash = "sha256-XNGSO9czfF+fCMNoF6BIboQeKKvysyF6e7sC7lY+1Ds="; + hash = "sha256-4n+7/4ZMD0VzlD4PzEWVDut+rt8/4Vz3gAgCDAj+SVs="; }; - vendorHash = "sha256-89fq5ANspfHw7aU6b3L7Kdt0Y7oVLpUYxhHmnVdLP/Q="; + vendorHash = "sha256-SdLeME6EFraGUXE1zUdEfxTETUKLDmecYpWEg5DE4PQ="; subPackages = [ "cmd/clusterctl" ]; From f41e5341645367e0e75bd7114052543e082d5a72 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 01:07:34 +0000 Subject: [PATCH 0948/1107] enumer: 1.5.9 -> 1.5.11 --- pkgs/by-name/en/enumer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/en/enumer/package.nix b/pkgs/by-name/en/enumer/package.nix index d4eae263e383..5905e63146c8 100644 --- a/pkgs/by-name/en/enumer/package.nix +++ b/pkgs/by-name/en/enumer/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "enumer"; - version = "1.5.9"; + version = "1.5.11"; src = fetchFromGitHub { owner = "dmarkham"; repo = "enumer"; tag = "v${version}"; - hash = "sha256-NYL36GBogFM48IgIWhFa1OLZNUeEi0ppS6KXybnPQks="; + hash = "sha256-zFx4Djar2nC/kanoEkmHTumon2MwKMsoZU6/heUPW2I="; }; - vendorHash = "sha256-CJCay24FlzDmLjfZ1VBxih0f+bgBNu+Xn57QgWT13TA="; + vendorHash = "sha256-w9T9PWMJjBJP2MmhGC7e78zbszgCwtVrfO5AQlu/ugQ="; meta = with lib; { description = "Go tool to auto generate methods for enums"; From 96479fa93f02b1dceaaed6c5d04dcd07cbd6bef2 Mon Sep 17 00:00:00 2001 From: Michael Brantley Date: Sun, 16 Feb 2025 12:40:03 -0500 Subject: [PATCH 0949/1107] tracelinks: init at 1.0.1 Co-authored-by: nayeko <196556004+nayeko@users.noreply.github.com> --- pkgs/by-name/tr/tracelinks/package.nix | 36 ++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/tr/tracelinks/package.nix diff --git a/pkgs/by-name/tr/tracelinks/package.nix b/pkgs/by-name/tr/tracelinks/package.nix new file mode 100644 index 000000000000..f3e413b87f0c --- /dev/null +++ b/pkgs/by-name/tr/tracelinks/package.nix @@ -0,0 +1,36 @@ +{ + fetchFromGitHub, + help2man, + lib, + nix-update-script, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "tracelinks"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "flox"; + repo = "tracelinks"; + tag = "v${finalAttrs.version}"; + hash = "sha256-GftF2s2eRrkfzw2NpzTZ6Uhehcg2tMSOcsjHJssQJzU="; + }; + + makeFlags = [ + "PREFIX=$(out)" + "VERSION=${finalAttrs.version}" + ]; + nativeBuildInputs = [ help2man ]; + doCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Report on symbolic links encountered in path traversals"; + homepage = "https://github.com/flox/tracelinks"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ limeytexan ]; + platforms = lib.platforms.unix; + }; +}) From 71da13f41e68f3ccf5c7f2c380a1a34b588f0fad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 01:39:52 +0000 Subject: [PATCH 0950/1107] ibus-engines.anthy: 1.5.16 -> 1.5.17 --- pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix index 867f31a7203e..bea6d96121d6 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "ibus-anthy"; - version = "1.5.16"; + version = "1.5.17"; src = fetchurl { url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-FVIiFLWK2ISsydmx2hPxXbfc12w7GKiFCQRuXsYT0a4="; + sha256 = "sha256-nh0orX2ivl4NnA6w2Pt1V/yJdwqiI3Jy3r4Ze9YavUA="; }; buildInputs = [ From 213da5a54729c8d323b4ee92681ca5ce6128ca46 Mon Sep 17 00:00:00 2001 From: Michael Brantley Date: Sun, 16 Feb 2025 11:48:38 -0500 Subject: [PATCH 0951/1107] t3: init at 1.0.8 Co-authored-by: nayeko <196556004+nayeko@users.noreply.github.com> Co-authored-by: Moraxyc --- pkgs/by-name/t3/t3/package.nix | 38 ++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 pkgs/by-name/t3/t3/package.nix diff --git a/pkgs/by-name/t3/t3/package.nix b/pkgs/by-name/t3/t3/package.nix new file mode 100644 index 000000000000..c1b05db9d3ce --- /dev/null +++ b/pkgs/by-name/t3/t3/package.nix @@ -0,0 +1,38 @@ +{ + fetchFromGitHub, + help2man, + lib, + nix-update-script, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "t3"; + version = "1.0.8"; + + src = fetchFromGitHub { + owner = "flox"; + repo = "t3"; + tag = "v${finalAttrs.version}"; + hash = "sha256-SaSBFqMh6zOty0mnYL4RJxAxbB1LJusKLdMn7Atv+As="; + }; + + makeFlags = [ + "PREFIX=$(out)" + "VERSION=${finalAttrs.version}" + ]; + nativeBuildInputs = [ help2man ]; + doCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Next generation tee with colorized output streams and precise time stamping"; + homepage = "https://github.com/flox/t3"; + changelog = "https://github.com/flox/t3/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ limeytexan ]; + platforms = lib.platforms.unix; + mainProgram = "t3"; + }; +}) From 0edfca8337208b8656923cccad5414e99dc4420e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 01:42:40 +0000 Subject: [PATCH 0952/1107] filesender: 2.51 -> 2.52 --- pkgs/by-name/fi/filesender/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fi/filesender/package.nix b/pkgs/by-name/fi/filesender/package.nix index 32eb0249d55b..bfaa8b09db89 100644 --- a/pkgs/by-name/fi/filesender/package.nix +++ b/pkgs/by-name/fi/filesender/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "filesender"; - version = "2.51"; + version = "2.52"; src = fetchFromGitHub { owner = "filesender"; repo = "filesender"; tag = "filesender-${finalAttrs.version}"; - hash = "sha256-HQ5/Df4F4Gwon0OhlIRTZ0NHTb9SJgQD+BDbH/aIeKw="; + hash = "sha256-Nl/3Kpo67dr5t/9+EWTyPmzi+sqW8pg5lzLC/jVtCkg="; }; patches = [ From a1a3fa8f9c8cb8bd1f20fe701e02d78949c2d2e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 01:47:15 +0000 Subject: [PATCH 0953/1107] ibus-engines.table-others: 1.3.18 -> 1.3.19 --- .../inputmethods/ibus-engines/ibus-table-others/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix index b473188a6a57..42a92b11b2fd 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "ibus-table-others"; - version = "1.3.18"; + version = "1.3.19"; src = fetchurl { url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-4ZM5WZPh6Y5M50KDS+86j00v4pWTRdcdVYh4DcEYXAA="; + hash = "sha256-3kNEM3RaSQX5doerqALtKHQ9P+Jt8twC5inNFmDS/gg="; }; nativeBuildInputs = [ From 0551e55853a4b6f3b54c3d8008d549564af795d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 01:47:58 +0000 Subject: [PATCH 0954/1107] mdbook-katex: 0.9.2 -> 0.9.3 --- pkgs/by-name/md/mdbook-katex/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/md/mdbook-katex/package.nix b/pkgs/by-name/md/mdbook-katex/package.nix index 1771778f5f76..42378e78607a 100644 --- a/pkgs/by-name/md/mdbook-katex/package.nix +++ b/pkgs/by-name/md/mdbook-katex/package.nix @@ -6,15 +6,15 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-katex"; - version = "0.9.2"; + version = "0.9.3"; src = fetchCrate { inherit pname version; - hash = "sha256-O2hFv/9pqrs8cSDvHLAUnXx4mX6TN8hvPLroWgoCgwE="; + hash = "sha256-5EYskcYEDZENK7ehws36+5MrTY2rNTXoFnWYOC+LuiQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-EoWsjuvvWeAI3OnVRJQT2hwoYq4BNqqvitH9LT0XGnA="; + cargoHash = "sha256-j0BdEnPP7/0i1hg7GNgc+F4EeElVm6AZIWZNelYZLIU="; meta = { description = "Preprocessor for mdbook, rendering LaTeX equations to HTML at build time"; From 3f9d8a1fea87660f8d0d5ad78f5a10737cd498cf Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Wed, 19 Feb 2025 09:03:18 +0700 Subject: [PATCH 0955/1107] lib/pathWith: keep old typename, to avoid breakage in downstream projects --- lib/types.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/types.nix b/lib/types.nix index 07d8a28d1394..069d7b170327 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -579,7 +579,7 @@ rec { absolute ? null, }: throwIf (inStore != null && absolute != null && inStore && !absolute) "In pathWith, inStore means the path must be absolute" mkOptionType { - name = "pathWith"; + name = "path"; description = ( (if absolute == null then "" else (if absolute then "absolute " else "relative ")) + "path" + @@ -588,7 +588,7 @@ rec { descriptionClass = "noun"; merge = mergeEqualOption; - functor = defaultFunctor "pathWith" // { + functor = defaultFunctor "path" // { type = pathWith; payload = {inherit inStore absolute; }; binOp = lhs: rhs: if lhs == rhs then lhs else null; From 2a9c8fa1cdac56bf2db8767c7012406482dd59af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 02:04:05 +0000 Subject: [PATCH 0956/1107] kubedb-cli: 0.51.0 -> 0.52.0 --- pkgs/by-name/ku/kubedb-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ku/kubedb-cli/package.nix b/pkgs/by-name/ku/kubedb-cli/package.nix index 5ee91afb4066..3b8ede1ec336 100644 --- a/pkgs/by-name/ku/kubedb-cli/package.nix +++ b/pkgs/by-name/ku/kubedb-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.51.0"; + version = "0.52.0"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; tag = "v${version}"; - hash = "sha256-e3kP1N6uhLKrOWfvl29vVB9D/bpj1W+1dGlaAuc8es0="; + hash = "sha256-3NnQLgrcxiz2KqRMbQWxgwbe1JPFF1VforGvMwhZfoo="; }; vendorHash = null; From eef1847d2f2996f53152aa6f67f0c983c1dc0698 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 02:05:49 +0000 Subject: [PATCH 0957/1107] fastly: 10.18.0 -> 10.19.0 --- pkgs/misc/fastly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index 45b65560eb81..3e642a252c66 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "fastly"; - version = "10.18.0"; + version = "10.19.0"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; tag = "v${version}"; - hash = "sha256-gO0l7Gx/lw/r5VZ2PgglTFv+XyfRyefG6YM/EFdty8o="; + hash = "sha256-uHF8YjA1j3bbAmdqthObeewmJGepyGsf/o4UBjXt3l8="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -33,7 +33,7 @@ buildGoModule rec { "cmd/fastly" ]; - vendorHash = "sha256-NGO4SB2wl5ivehHgm+cQnTee4XTwaztLTno5POpCVuw="; + vendorHash = "sha256-FfJFbgjrBddAtSq8eLsCM+GXMWbSNU4EyjExv7C8W54="; nativeBuildInputs = [ installShellFiles From 2907d2f837dbe155dad687853ddbb2ea2f5f135b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Moreira?= Date: Tue, 18 Feb 2025 23:07:44 -0300 Subject: [PATCH 0958/1107] josm: fix for working on tiling Window managers such as Xmonad --- pkgs/by-name/jo/josm/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/jo/josm/package.nix b/pkgs/by-name/jo/josm/package.nix index b44109aa1df8..b0432820a45c 100644 --- a/pkgs/by-name/jo/josm/package.nix +++ b/pkgs/by-name/jo/josm/package.nix @@ -47,7 +47,9 @@ stdenv.mkDerivation rec { # Add libXxf86vm to path because it is needed by at least Kendzi3D plugin makeWrapper ${jre}/bin/java $out/bin/josm \ --add-flags "${baseJavaOpts} ${extraJavaOpts} -jar $out/share/josm/josm.jar" \ - --prefix LD_LIBRARY_PATH ":" '${libXxf86vm}/lib' + --prefix LD_LIBRARY_PATH ":" '${libXxf86vm}/lib' \ + --prefix _JAVA_AWT_WM_NONREPARENTING : 1 \ + --prefix _JAVA_OPTIONS : "-Dawt.useSystemAAFontSettings=on" ''; meta = { From 37fb5d204f5f9db97a51ac0a937a6710706c5d9a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 02:33:05 +0000 Subject: [PATCH 0959/1107] twilio-cli: 5.22.10 -> 5.22.11 --- pkgs/by-name/tw/twilio-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tw/twilio-cli/package.nix b/pkgs/by-name/tw/twilio-cli/package.nix index acfa7428ceba..16bacec316d2 100644 --- a/pkgs/by-name/tw/twilio-cli/package.nix +++ b/pkgs/by-name/tw/twilio-cli/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.22.10"; + version = "5.22.11"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - hash = "sha256-ZesjUeAoOuNWITzM1qjWsvh2DMehyy8XJDhecylx4V4="; + hash = "sha256-SeSv16lZ2Dmfngkq1TtvzlM3oIJkVPsdnkc1hRuSZU4="; }; buildInputs = [ nodejs-slim ]; From 7de5a08d36a55dfd10998e74d02678c3fa03e0f9 Mon Sep 17 00:00:00 2001 From: Peter Romfeld Date: Mon, 17 Feb 2025 15:59:02 +0800 Subject: [PATCH 0960/1107] pysigma-backend-loki: init at 0.12.3 --- pkgs/by-name/si/sigma-cli/package.nix | 1 + .../pysigma-backend-loki/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/pysigma-backend-loki/default.nix diff --git a/pkgs/by-name/si/sigma-cli/package.nix b/pkgs/by-name/si/sigma-cli/package.nix index 2dec38c22050..0b23e7b71ff5 100644 --- a/pkgs/by-name/si/sigma-cli/package.nix +++ b/pkgs/by-name/si/sigma-cli/package.nix @@ -33,6 +33,7 @@ python3.pkgs.buildPythonApplication rec { pysigma-backend-opensearch pysigma-backend-qradar pysigma-backend-splunk + pysigma-backend-loki pysigma-pipeline-crowdstrike pysigma-pipeline-sysmon pysigma-pipeline-windows diff --git a/pkgs/development/python-modules/pysigma-backend-loki/default.nix b/pkgs/development/python-modules/pysigma-backend-loki/default.nix new file mode 100644 index 000000000000..86675b22a6bf --- /dev/null +++ b/pkgs/development/python-modules/pysigma-backend-loki/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + pysigma, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "pysigma-backend-loki"; + version = "0.12.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "grafana"; + repo = "pySigma-backend-loki"; + tag = "v${version}"; + hash = "sha256-tsAtD98vWU8mB+Y3ePp2S54dSDu5R7DIDYDin+JJgSg="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ pysigma ]; + + pythonRelaxDeps = [ "pysigma" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "sigma.backends.loki" ]; + + meta = with lib; { + description = "Library to support the loki backend for pySigma"; + homepage = "https://github.com/grafana/pySigma-backend-loki"; + license = with licenses; [ lgpl21Only ]; + maintainers = with maintainers; [ peterromfeldhk ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dff69ccf21bc..cccc5d6c0b51 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12788,6 +12788,8 @@ self: super: with self; { pysigma-backend-insightidr = callPackage ../development/python-modules/pysigma-backend-insightidr { }; + pysigma-backend-loki = callPackage ../development/python-modules/pysigma-backend-loki { }; + pysigma-pipeline-crowdstrike = callPackage ../development/python-modules/pysigma-pipeline-crowdstrike { }; pysigma-pipeline-sysmon = callPackage ../development/python-modules/pysigma-pipeline-sysmon { }; From 61e75bf4306eed3e3b9fd8e72b0841cfd48b30db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 04:04:15 +0000 Subject: [PATCH 0961/1107] retrospy: 6.8.2 -> 6.8.3 --- pkgs/by-name/re/retrospy/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/retrospy/package.nix b/pkgs/by-name/re/retrospy/package.nix index 9b0d85e0f082..3f4e951ed29a 100644 --- a/pkgs/by-name/re/retrospy/package.nix +++ b/pkgs/by-name/re/retrospy/package.nix @@ -8,13 +8,13 @@ runCommandLocal, }: let - version = "6.8.2"; + version = "6.8.3"; src = fetchFromGitHub { owner = "retrospy"; repo = "RetroSpy"; rev = "v${version}"; - hash = "sha256-0f4rtBGjPSdCl3M72YPD6A6T4pOnpm9fde6ktvHcPLY="; + hash = "sha256-NuLfFSRGOIB6h4b5XZ7Qs8y5L+fqozQfMr8q0xZAurQ="; }; executables = [ From 876b7e256419a1493bf34146073eaa315f7b95e9 Mon Sep 17 00:00:00 2001 From: MattKang <2027430+MattKang@users.noreply.github.com> Date: Thu, 25 Jul 2024 21:28:08 -0400 Subject: [PATCH 0962/1107] maintainers: add mattkang --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 12f86d649603..5c224ebff586 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12667,6 +12667,12 @@ githubId = 279868; name = "Matti Kariluoma"; }; + mattkang = { + email = "wavy-wisdom-volley@duck.com"; + github = "mattkang"; + githubId = 2027430; + name = "Matthew Kang"; + }; mattpolzin = { email = "matt.polzin@gmail.com"; github = "mattpolzin"; From 394c14c5c8bc668e584240c404f176f285d7be6e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 04:41:18 +0000 Subject: [PATCH 0963/1107] earthlyls: 0.5.3 -> 0.5.5 --- pkgs/by-name/ea/earthlyls/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ea/earthlyls/package.nix b/pkgs/by-name/ea/earthlyls/package.nix index da1c33c626e0..274c71c9d748 100644 --- a/pkgs/by-name/ea/earthlyls/package.nix +++ b/pkgs/by-name/ea/earthlyls/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "earthlyls"; - version = "0.5.3"; + version = "0.5.5"; src = fetchFromGitHub { owner = "glehmann"; repo = "earthlyls"; rev = version; - hash = "sha256-wn+6Aa4xTC5o4S+N7snB/vlyw0i23XkmaXUmrhfXuaA="; + hash = "sha256-GnFzfCjT4kjb9WViKIFDkIU7zVpiI6HDuUeddgHGQuc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Xc1m5WpZEKBP8fGtrQmwHFdqxdQ6wZzgSihSmXnLOhE="; + cargoHash = "sha256-sWbYN92Jfr/Pr3qoHWkew/ASIdq8DQg0WHpdyklGBLo="; passthru = { updateScript = nix-update-script { }; From 256cc8ac8ed5c10dfdb53ff923bc3e68ea683067 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 05:27:21 +0000 Subject: [PATCH 0964/1107] home-assistant-custom-components.solis-sensor: 3.8.1 -> 3.9.0 --- .../home-assistant/custom-components/solis-sensor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix b/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix index ca9f788e2454..2d1a056407cf 100644 --- a/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix +++ b/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix @@ -9,13 +9,13 @@ buildHomeAssistantComponent rec { owner = "hultenvp"; domain = "solis"; - version = "3.8.1"; + version = "3.9.0"; src = fetchFromGitHub { owner = "hultenvp"; repo = "solis-sensor"; rev = "v${version}"; - hash = "sha256-sjLHridYiF2x5XzW869BNjH9y2WtfvXXsNICKUmpOYM="; + hash = "sha256-RgsKIav3ozWYO9CXzvhMVmvOW74L/AHGOW8OWOMFBcQ="; }; dependencies = [ aiofiles ]; From 5e27c8f9fef4cdf0a33474c261e12538853c8754 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 05:30:37 +0000 Subject: [PATCH 0965/1107] python312Packages.ancp-bids: 0.2.6 -> 0.2.9 --- pkgs/development/python-modules/ancp-bids/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ancp-bids/default.nix b/pkgs/development/python-modules/ancp-bids/default.nix index 9b8c610dfcfd..751704006be0 100644 --- a/pkgs/development/python-modules/ancp-bids/default.nix +++ b/pkgs/development/python-modules/ancp-bids/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "ancp-bids"; - version = "0.2.6"; + version = "0.2.9"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "ANCPLabOldenburg"; repo = pname; tag = version; - hash = "sha256-JxF1W4yMPFIQXPH7QHfcHssWMP/Uci07e66WE5qVJx4="; + hash = "sha256-vmw8SAikvbaHnPOthBQxTbyvDwnnZwCOV97aUogIgxw="; }; build-system = [ setuptools ]; @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://ancpbids.readthedocs.io"; description = "Read/write/validate/query BIDS datasets"; - changelog = "https://github.com/ANCPLabOldenburg/ancp-bids/releases/tag/${version}"; + changelog = "https://github.com/ANCPLabOldenburg/ancp-bids/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; }; From eda3f940b127a115bfdd6de115fc2b1e296acedd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 05:40:34 +0000 Subject: [PATCH 0966/1107] python312Packages.pygmt: 0.14.1 -> 0.14.2 --- pkgs/development/python-modules/pygmt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix index 9bd66ac91c0c..2be1633af886 100644 --- a/pkgs/development/python-modules/pygmt/default.nix +++ b/pkgs/development/python-modules/pygmt/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pygmt"; - version = "0.14.1"; + version = "0.14.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "GenericMappingTools"; repo = "pygmt"; tag = "v${version}"; - hash = "sha256-F0BwKr8DTYa5mHvVpTFd4rds/esQ+tgPJn8shr3VUsk="; + hash = "sha256-UwqkJxO+LbJz7BVbQnulxm4sMrKHoY3ayqLHfZy7Ji4="; }; postPatch = '' @@ -65,7 +65,7 @@ buildPythonPackage rec { description = "Python interface for the Generic Mapping Tools"; homepage = "https://github.com/GenericMappingTools/pygmt"; license = lib.licenses.bsd3; - changelog = "https://github.com/GenericMappingTools/pygmt/releases/tag/v${version}"; + changelog = "https://github.com/GenericMappingTools/pygmt/releases/tag/${src.tag}"; maintainers = lib.teams.geospatial.members; }; } From dab601686d67d0c8fda19308012166c7394bb1b0 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 12 Feb 2025 03:55:54 +0100 Subject: [PATCH 0967/1107] ocamlPackages.dream-pure: init at 1.0.0-alpha8 --- pkgs/development/ocaml-modules/dream/pure.nix | 38 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/ocaml-modules/dream/pure.nix diff --git a/pkgs/development/ocaml-modules/dream/pure.nix b/pkgs/development/ocaml-modules/dream/pure.nix new file mode 100644 index 000000000000..884715f67cf3 --- /dev/null +++ b/pkgs/development/ocaml-modules/dream/pure.nix @@ -0,0 +1,38 @@ +{ + lib, + buildDunePackage, + fetchurl, + lwt_ppx, + base64, + hmap, + lwt, + ptime, + uri, +}: + +buildDunePackage rec { + pname = "dream-pure"; + version = "1.0.0-alpha8"; + + src = fetchurl { + url = "https://github.com/aantron/dream/releases/download/${version}/dream-${version}.tar.gz"; + hash = "sha256-I+2BKJDAP+XJl0pJYano5iEmvte8fX0UQLhGUslc8pY="; + }; + + buildInputs = [ lwt_ppx ]; + + propagatedBuildInputs = [ + base64 + hmap + lwt + ptime + uri + ]; + + meta = { + description = "Shared HTTP types for Dream (server) and Hyper (client)"; + homepage = "https://aantron.github.io/dream/"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 73a1ce489819..89ff519e88a9 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -383,6 +383,8 @@ let dot-merlin-reader = callPackage ../development/tools/ocaml/merlin/dot-merlin-reader.nix { }; + dream-pure = callPackage ../development/ocaml-modules/dream/pure.nix { }; + dscheck = callPackage ../development/ocaml-modules/dscheck { }; dssi = callPackage ../development/ocaml-modules/dssi { }; From cd5ff2ed4f3d38e90437ee18f10b44daab43dbce Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 12 Feb 2025 03:55:59 +0100 Subject: [PATCH 0968/1107] ocamlPackages.dream-httpaf: init at 1.0.0-alpha8 --- .../ocaml-modules/dream/httpaf.nix | 23 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/ocaml-modules/dream/httpaf.nix diff --git a/pkgs/development/ocaml-modules/dream/httpaf.nix b/pkgs/development/ocaml-modules/dream/httpaf.nix new file mode 100644 index 000000000000..6ba186bceb7a --- /dev/null +++ b/pkgs/development/ocaml-modules/dream/httpaf.nix @@ -0,0 +1,23 @@ +{ + lib, + buildDunePackage, + dream-pure, + lwt_ppx, + httpun-ws, +}: + +buildDunePackage { + pname = "dream-httpaf"; + + inherit (dream-pure) version src; + + buildInputs = [ lwt_ppx ]; + propagatedBuildInputs = [ + dream-pure + httpun-ws + ]; + + meta = dream-pure.meta // { + description = "Shared http/af stack for Dream (server) and Hyper (client)"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 89ff519e88a9..4418bb88d782 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -383,6 +383,8 @@ let dot-merlin-reader = callPackage ../development/tools/ocaml/merlin/dot-merlin-reader.nix { }; + dream-httpaf = callPackage ../development/ocaml-modules/dream/httpaf.nix { }; + dream-pure = callPackage ../development/ocaml-modules/dream/pure.nix { }; dscheck = callPackage ../development/ocaml-modules/dscheck { }; From 2ce8716c081c29a63720c13e3b32159aed43a15a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 12 Feb 2025 03:56:02 +0100 Subject: [PATCH 0969/1107] ocamlPackages.dream: init at 1.0.0-alpha8 --- .../ocaml-modules/dream/default.nix | 67 +++++++++++++++++++ .../ocaml-modules/dream/httpun.patch | 20 ++++++ pkgs/top-level/ocaml-packages.nix | 2 + 3 files changed, 89 insertions(+) create mode 100644 pkgs/development/ocaml-modules/dream/default.nix create mode 100644 pkgs/development/ocaml-modules/dream/httpun.patch diff --git a/pkgs/development/ocaml-modules/dream/default.nix b/pkgs/development/ocaml-modules/dream/default.nix new file mode 100644 index 000000000000..d35993507938 --- /dev/null +++ b/pkgs/development/ocaml-modules/dream/default.nix @@ -0,0 +1,67 @@ +{ + lib, + buildDunePackage, + dream-pure, + lwt_ppx, + camlp-streams, + caqti-lwt, + cstruct, + digestif, + dream-httpaf, + graphql-lwt, + h2-lwt-unix, + httpun-lwt-unix, + httpun-ws, + lambdasoup, + lwt_ssl, + magic-mime, + markup, + mirage-clock, + mirage-crypto-rng, + mirage-crypto-rng-lwt, + multipart_form-lwt, + ssl, + unstrctrd, + uri, + yojson, +}: + +buildDunePackage { + pname = "dream"; + + inherit (dream-pure) version src; + + # Compatibility with httpun 0.2.0 and h2 0.13 + patches = [ ./httpun.patch ]; + + buildInputs = [ lwt_ppx ]; + + propagatedBuildInputs = [ + camlp-streams + caqti-lwt + cstruct + digestif + dream-httpaf + dream-pure + graphql-lwt + h2-lwt-unix + httpun-lwt-unix + httpun-ws + lambdasoup + lwt_ssl + magic-mime + markup + mirage-clock + mirage-crypto-rng + mirage-crypto-rng-lwt + multipart_form-lwt + ssl + unstrctrd + uri + yojson + ]; + + meta = dream-pure.meta // { + description = "Tidy, feature-complete Web framework"; + }; +} diff --git a/pkgs/development/ocaml-modules/dream/httpun.patch b/pkgs/development/ocaml-modules/dream/httpun.patch new file mode 100644 index 000000000000..fe47b4e6ba45 --- /dev/null +++ b/pkgs/development/ocaml-modules/dream/httpun.patch @@ -0,0 +1,20 @@ +diff --git a/src/http/adapt.ml b/src/http/adapt.ml +index c6bd416..5b01e17 100644 +--- a/src/http/adapt.ml ++++ b/src/http/adapt.ml +@@ -74,7 +74,7 @@ let forward_body + response + (Httpun.Body.Writer.write_string body) + (Httpun.Body.Writer.write_bigstring body) +- (Httpun.Body.Writer.flush body) ++ (fun f -> Httpun.Body.Writer.flush body (fun _ -> f ())) + (fun _code -> Httpun.Body.Writer.close body) + + let forward_body_h2 +@@ -85,5 +85,5 @@ let forward_body_h2 + response + (H2.Body.Writer.write_string body) + (H2.Body.Writer.write_bigstring body) +- (H2.Body.Writer.flush body) ++ (fun f -> H2.Body.Writer.flush body (fun _ -> f ())) + (fun _code -> H2.Body.Writer.close body) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 4418bb88d782..fcd91264cbb5 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -383,6 +383,8 @@ let dot-merlin-reader = callPackage ../development/tools/ocaml/merlin/dot-merlin-reader.nix { }; + dream = callPackage ../development/ocaml-modules/dream { }; + dream-httpaf = callPackage ../development/ocaml-modules/dream/httpaf.nix { }; dream-pure = callPackage ../development/ocaml-modules/dream/pure.nix { }; From 12a603b817573f4c867bb62341d2e73a01e39b17 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 06:18:19 +0000 Subject: [PATCH 0970/1107] opencomposite: 0-unstable-2025-01-23 -> 0-unstable-2025-02-08 --- pkgs/by-name/op/opencomposite/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/opencomposite/package.nix b/pkgs/by-name/op/opencomposite/package.nix index 620f58daf5d8..72263a013b89 100644 --- a/pkgs/by-name/op/opencomposite/package.nix +++ b/pkgs/by-name/op/opencomposite/package.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation { pname = "opencomposite"; - version = "0-unstable-2025-01-23"; + version = "0-unstable-2025-02-08"; src = fetchFromGitLab { owner = "znixian"; repo = "OpenOVR"; - rev = "d37c9e7a4bc41f2b636282064eb39efb9e50d48b"; + rev = "175e3b3a5408ff120bd21036faa703deb57159fc"; fetchSubmodules = true; - hash = "sha256-Bc+lQdQeiojaHjglj7gZhXB5BMho0vb/HErfh50pcmA="; + hash = "sha256-kwu8eM/rQBcZfs91loh7QAB46a01F9n5Xm1DmMd53MQ="; }; nativeBuildInputs = [ From 9688bac8c0697a0b8bbeb65748715f4d6e301c6b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 06:27:13 +0000 Subject: [PATCH 0971/1107] turso-cli: 0.97.2 -> 0.98.0 --- pkgs/by-name/tu/turso-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tu/turso-cli/package.nix b/pkgs/by-name/tu/turso-cli/package.nix index b050c1ef68d7..d8532a4a0347 100644 --- a/pkgs/by-name/tu/turso-cli/package.nix +++ b/pkgs/by-name/tu/turso-cli/package.nix @@ -8,13 +8,13 @@ }: buildGoModule rec { pname = "turso-cli"; - version = "0.97.2"; + version = "0.98.0"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${version}"; - hash = "sha256-6Ci1QESSN6wNpUAQoWtTyHWrGaI/3xs/jGCSkJsYC8o="; + hash = "sha256-/e1AZVTSS7xH0oa2akPN/Tf3F/Jp2JaWj3qcnk9f458="; }; vendorHash = "sha256-tBO21IgUczwMgrEyV7scV3YTY898lYHASaLeXqvBopU="; From 9fabdffafc2ba4f9d7ac29609f93c85d9c859bd2 Mon Sep 17 00:00:00 2001 From: Brian McGillion Date: Wed, 19 Feb 2025 11:00:56 +0400 Subject: [PATCH 0972/1107] snort: 3.6.3.0 -> 3.7.0.0 update snort changelog: https://github.com/snort3/snort3/releases/tag/3.7.0.0/CHANGELOG.md Signed-off-by: Brian McGillion --- pkgs/by-name/li/libdaq/package.nix | 4 ++++ pkgs/by-name/sn/snort/package.nix | 10 +++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libdaq/package.nix b/pkgs/by-name/li/libdaq/package.nix index c182572de779..36c4df30b053 100644 --- a/pkgs/by-name/li/libdaq/package.nix +++ b/pkgs/by-name/li/libdaq/package.nix @@ -5,6 +5,7 @@ autoreconfHook, pkg-config, libpcap, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -46,6 +47,8 @@ stdenv.mkDerivation (finalAttrs: { done ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Data AcQuisition library (libDAQ), for snort packet I/O"; homepage = "https://www.snort.org"; @@ -53,6 +56,7 @@ stdenv.mkDerivation (finalAttrs: { aycanirican brianmcgillion ]; + changelog = "https://github.com/snort3/libdaq/releases/tag/v${finalAttrs.version}/changelog.md"; license = lib.licenses.gpl2; outputsToInstall = [ "lib" diff --git a/pkgs/by-name/sn/snort/package.nix b/pkgs/by-name/sn/snort/package.nix index 0fd10533ad91..390edbac2cd8 100644 --- a/pkgs/by-name/sn/snort/package.nix +++ b/pkgs/by-name/sn/snort/package.nix @@ -14,17 +14,18 @@ pkg-config, zlib, xz, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "snort"; - version = "3.6.3.0"; + version = "3.7.0.0"; src = fetchFromGitHub { owner = "snort3"; repo = "snort3"; - rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-loMmmpoaEncW31FUIE9Zf9w635Prvke6vCY+mIt6oGI="; + tag = finalAttrs.version; + hash = "sha256-KwKgKY+zcH7bZrtfMpkwb0LopGeImTwOf79hqZeYv/k="; }; nativeBuildInputs = [ @@ -53,6 +54,8 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; + passthru.updateScript = nix-update-script { }; + meta = { description = "Network intrusion prevention and detection system (IDS/IPS)"; homepage = "https://www.snort.org"; @@ -60,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: { aycanirican brianmcgillion ]; + changelog = "https://github.com/snort3/snort3/releases/tag/${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.gpl2; platforms = with lib.platforms; linux; }; From 7a6bb7c38258d1755067af3392aed4fa3dd33062 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 07:10:25 +0000 Subject: [PATCH 0973/1107] python312Packages.cvss: 3.3 -> 3.4 --- pkgs/development/python-modules/cvss/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cvss/default.nix b/pkgs/development/python-modules/cvss/default.nix index 0ada48e67d44..791bd43df9fe 100644 --- a/pkgs/development/python-modules/cvss/default.nix +++ b/pkgs/development/python-modules/cvss/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "cvss"; - version = "3.3"; + version = "3.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "RedHatProductSecurity"; repo = "cvss"; tag = "v${version}"; - hash = "sha256-+8aKNPcHFPcDyBvOO9QCVb1OIbpQHAEeJgt8fob0+lM="; + hash = "sha256-g6+ccoIgqs7gZPrTuKm3em+PzLvpupb9JXOGMqf2Uv0="; }; build-system = [ setuptools ]; @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for CVSS2/3/4"; homepage = "https://github.com/RedHatProductSecurity/cvss"; - changelog = "https://github.com/RedHatProductSecurity/cvss/releases/tag/v${version}"; + changelog = "https://github.com/RedHatProductSecurity/cvss/releases/tag/${src.tag}"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ fab ]; mainProgram = "cvss_calculator"; From b659f50342c0eaa76e0bd2d01d4e063992d5dd57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 07:21:23 +0000 Subject: [PATCH 0974/1107] python312Packages.aiocomelit: 0.10.1 -> 0.11.0 --- pkgs/development/python-modules/aiocomelit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aiocomelit/default.nix b/pkgs/development/python-modules/aiocomelit/default.nix index fe285194d4b5..cd329446bef3 100644 --- a/pkgs/development/python-modules/aiocomelit/default.nix +++ b/pkgs/development/python-modules/aiocomelit/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiocomelit"; - version = "0.10.1"; + version = "0.11.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiocomelit"; tag = "v${version}"; - hash = "sha256-1XH2RwdnXDi57FUf1R7HLiFFNxyT3A6MroZ+kk1xIGo="; + hash = "sha256-6eTeBisAt5vP1+140qfMJ3GqSqclzHGiNpN3lzBvoqQ="; }; build-system = [ poetry-core ]; @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to control Comelit Simplehome"; homepage = "https://github.com/chemelli74/aiocomelit"; - changelog = "https://github.com/chemelli74/aiocomelit/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/chemelli74/aiocomelit/blob/${src.tag}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From 39dd19122fdabf519c256796df0ed998515990a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 19 Feb 2025 14:33:33 +0700 Subject: [PATCH 0975/1107] install-grub: add missing rmtree --- nixos/modules/system/boot/loader/grub/install-grub.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 4a588a75da14..f5ae844da21f 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -3,7 +3,7 @@ use warnings; use Class::Struct; use XML::LibXML; use File::Basename; -use File::Path qw(make_path); +use File::Path qw(make_path rmtree); use File::stat; use File::Copy; use File::Copy::Recursive qw(rcopy pathrm); From a2281c7ac726715eb21ea08fb25d806ecfe4f406 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 14 Feb 2025 16:45:11 +0300 Subject: [PATCH 0976/1107] fluidd: 1.31.4 -> 1.32.3, build from source --- pkgs/by-name/fl/fluidd/hardcode-version.patch | 15 ++++++++ pkgs/by-name/fl/fluidd/package.nix | 37 +++++++++++-------- 2 files changed, 36 insertions(+), 16 deletions(-) create mode 100644 pkgs/by-name/fl/fluidd/hardcode-version.patch diff --git a/pkgs/by-name/fl/fluidd/hardcode-version.patch b/pkgs/by-name/fl/fluidd/hardcode-version.patch new file mode 100644 index 000000000000..4b12a7823464 --- /dev/null +++ b/pkgs/by-name/fl/fluidd/hardcode-version.patch @@ -0,0 +1,15 @@ +diff --git a/vite.config.inject-version.ts b/vite.config.inject-version.ts +index d1321fcf..fb3e4c6d 100644 +--- a/vite.config.inject-version.ts ++++ b/vite.config.inject-version.ts +@@ -29,9 +29,7 @@ const vitePluginInjectVersion = (): Plugin => { + return { + name: 'version', + config: () => { +- const git_hash = child_process +- .execSync('git rev-parse --short HEAD') +- .toString() ++ const git_hash = '@version@' + + return { + define: { diff --git a/pkgs/by-name/fl/fluidd/package.nix b/pkgs/by-name/fl/fluidd/package.nix index 275be923db0e..dea7aeb2f819 100644 --- a/pkgs/by-name/fl/fluidd/package.nix +++ b/pkgs/by-name/fl/fluidd/package.nix @@ -1,28 +1,33 @@ -{ lib, stdenvNoCC, fetchurl, unzip, nixosTests }: +{ + lib, + buildNpmPackage, + fetchFromGitHub, + replaceVars, + nixosTests, +}: -stdenvNoCC.mkDerivation rec { +buildNpmPackage rec { pname = "fluidd"; - version = "1.31.4"; + version = "1.32.3"; - src = fetchurl { - name = "fluidd-v${version}.zip"; - url = "https://github.com/fluidd-core/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-gqwVZg37pZA+XjT3FpTMYkrOIT1KKUN6upg7e1vh1t0="; + src = fetchFromGitHub { + owner = "fluidd-core"; + repo = "fluidd"; + tag = "v${version}"; + hash = "sha256-3sfjwwfanmRy45hrjG9X0lYVPsC41S2oZkbISz6YzYo="; }; - nativeBuildInputs = [ unzip ]; + patches = [ + (replaceVars ./hardcode-version.patch { + inherit version; + }) + ]; - dontConfigure = true; - dontBuild = true; - - unpackPhase = '' - mkdir fluidd - unzip $src -d fluidd - ''; + npmDepsHash = "sha256-bwdlBXq1Z6ZoxwGhfMtPQy74/oxRt2aGxh+HXjREWMQ="; installPhase = '' mkdir -p $out/share/fluidd - cp -r fluidd $out/share/fluidd/htdocs + cp -r dist $out/share/fluidd/htdocs ''; passthru.tests = { inherit (nixosTests) fluidd; }; From 22393388bca6cc54f744fc8c8b65f97102ff38b7 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 14 Feb 2025 17:02:05 +0300 Subject: [PATCH 0977/1107] klipper-estimator: report version correctly --- pkgs/applications/misc/klipper-estimator/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/klipper-estimator/default.nix b/pkgs/applications/misc/klipper-estimator/default.nix index 967eac699f01..609414f21d7f 100644 --- a/pkgs/applications/misc/klipper-estimator/default.nix +++ b/pkgs/applications/misc/klipper-estimator/default.nix @@ -24,6 +24,8 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-wMgFkzgoHjvE+5t+cA5OW2COXbUj/5tWXz0Zp9cd5lw="; + env.TOOL_VERSION = "v${version}"; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ From 220a833bea7d89d5d89023259849f7de69ba42c2 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 14 Feb 2025 16:17:14 +0300 Subject: [PATCH 0978/1107] moonraker: 0.9.3-unstable-2024-11-17 -> 0.9.3-unstable-2025-02-18 --- pkgs/by-name/mo/moonraker/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/mo/moonraker/package.nix b/pkgs/by-name/mo/moonraker/package.nix index 7e4f3bd45acb..300b4edfedff 100644 --- a/pkgs/by-name/mo/moonraker/package.nix +++ b/pkgs/by-name/mo/moonraker/package.nix @@ -25,7 +25,7 @@ let zeroconf preprocess-cancellation jinja2 - dbus-next + dbus-fast apprise python-periphery ldap3 @@ -35,13 +35,13 @@ let in stdenvNoCC.mkDerivation rec { pname = "moonraker"; - version = "0.9.3-unstable-2024-11-17"; + version = "0.9.3-unstable-2025-02-18"; src = fetchFromGitHub { owner = "Arksine"; repo = "moonraker"; - rev = "ccfe32f2368a5ff6c2497478319909daeeeb8edf"; - sha256 = "sha256-aCYE3EmflMRIHnGnkZ/0+zScVA5liHSbavScQ7XRf/4="; + rev = "62051108ea16d5db5fa382651e01a51d89c041c9"; + sha256 = "sha256-mKbWnEnpCWhoiYY9T5HrNI0vVGM4LwrJqAzhJa+Rj4Y="; }; nativeBuildInputs = [ makeWrapper ]; From 550696628ccffb598c7cec6491717b0eebe82ed9 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 14 Feb 2025 16:22:05 +0300 Subject: [PATCH 0979/1107] nixos/moonraker: allow configuring analysis --- nixos/modules/services/misc/moonraker.nix | 28 +++++++++++++++++------ 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/misc/moonraker.nix b/nixos/modules/services/misc/moonraker.nix index 620eb71bd74f..43d46a690915 100644 --- a/nixos/modules/services/misc/moonraker.nix +++ b/nixos/modules/services/misc/moonraker.nix @@ -110,6 +110,8 @@ in for details on what clients are able to do. ''; }; + + analysis.enable = lib.mkEnableOption "Runtime analysis with klipper-estimator"; }; }; @@ -170,9 +172,15 @@ in in format.generate "moonraker.cfg" fullConfig; - systemd.tmpfiles.rules = [ - "d '${cfg.stateDir}' - ${cfg.user} ${cfg.group} - -" - ] ++ lib.optional (cfg.configDir != null) "d '${cfg.configDir}' - ${cfg.user} ${cfg.group} - -"; + systemd.tmpfiles.rules = + [ + "d '${cfg.stateDir}' - ${cfg.user} ${cfg.group} - -" + ] + ++ lib.optional (cfg.configDir != null) "d '${cfg.configDir}' - ${cfg.user} ${cfg.group} - -" + ++ lib.optionals cfg.analysis.enable [ + "d '${cfg.stateDir}/tools/klipper_estimator' - ${cfg.user} ${cfg.group} - -" + "L+ '${cfg.stateDir}/tools/klipper_estimator/klipper_estimator_linux' - - - - ${lib.getExe pkgs.klipper-estimator}" + ]; systemd.services.moonraker = { description = "Moonraker, an API web server for Klipper"; @@ -206,10 +214,16 @@ in }; }; - # set this to false, otherwise we'll get a warning indicating that `/etc/klipper.cfg` - # is not located in the moonraker config directory. - services.moonraker.settings = lib.mkIf (!config.services.klipper.mutableConfig) { - file_manager.check_klipper_config_path = false; + services.moonraker.settings = { + # set this to false, otherwise we'll get a warning indicating that `/etc/klipper.cfg` + # is not located in the moonraker config directory. + file_manager.check_klipper_config_path = lib.mkIf (!config.services.klipper.mutableConfig) false; + + # enable analysis with our own klipper-estimator, disable updating it + analysis = lib.mkIf (cfg.analysis.enable) { + platform = "linux"; + enable_estimator_updates = false; + }; }; security.polkit.extraConfig = lib.optionalString cfg.allowSystemControl '' From 04be434adbe49a46c20a825ae6ca0b94676a5668 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=BA=E0=B8=95=E0=B8=B1?= =?UTF-8?q?=E0=B8=A5?= Date: Wed, 19 Feb 2025 15:16:06 +0700 Subject: [PATCH 0980/1107] h2o: mruby on by default After playing around with configs & examples, too many things are under the expectation that Mruby is on by default. It seems this would be a better default for Nix users. --- pkgs/by-name/h2/h2o/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index d908919589d4..66f1e5712bef 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -13,7 +13,7 @@ libuv, wslay, zlib, - withMruby ? false, + withMruby ? true, bison, ruby, }: From 52b329edeff0b54b798e71051fcf0e06aa01a38e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 19 Feb 2025 09:20:13 +0100 Subject: [PATCH 0981/1107] python3Packages.m2crypto: 0.43.0 -> 0.44.0 https://gitlab.com/m2crypto/m2crypto/-/tags/0.44.0 Also pull a Debian patch to fix build: https://hydra.nixos.org/build/289647638/nixlog/3/tail --- pkgs/development/python-modules/m2crypto/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix index 4b1f3ca07aa2..1767050052fc 100644 --- a/pkgs/development/python-modules/m2crypto/default.nix +++ b/pkgs/development/python-modules/m2crypto/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchPypi, + fetchurl, openssl, pytestCheckHook, pythonOlder, @@ -12,15 +13,21 @@ buildPythonPackage rec { pname = "m2crypto"; - version = "0.43.0"; + version = "0.44.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bCwce7DoqnaPfKgD2n28JmbUADsmvXrfcCM6/FnYzzM="; + hash = "sha256-OEu0y9F47g50AVMRt7H58sN342huA/oHCz7C9JRnHA8="; }; + patches = [ + (fetchurl { + url = "https://sources.debian.org/data/main/m/m2crypto/0.42.0-2.1/debian/patches/0004-swig-Workaround-for-reading-sys-select.h-ending-with.patch"; + hash = "sha256-/Bkuqu/Od+S56AUWo0ZzpZF7FGMxP766K2GJnfKXrOI="; + }) + ]; build-system = [ setuptools ]; From 42e7b59a9d157e1e0443a31051e02b5619ea0021 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Wed, 19 Feb 2025 19:24:10 +1100 Subject: [PATCH 0982/1107] nodejs_20: nixfmt --- pkgs/development/web/nodejs/v20.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index 66dbd357f028..dca76d89b8b4 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -1,4 +1,3 @@ - { callPackage, fetchpatch2, From fdbcd907e9bd05c11d9b5c90b5bb553d7ed4be31 Mon Sep 17 00:00:00 2001 From: a-kenji Date: Wed, 19 Feb 2025 15:44:05 +0700 Subject: [PATCH 0983/1107] nixos/syncthing: Fix typos --- nixos/modules/services/networking/syncthing.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index 2d32cf451706..62fb1d200413 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -21,7 +21,7 @@ let # note that the dot in front of `${path}` is the hostname, which is # required. then "--unix-socket ${cfg.guiAddress} http://.${path}" - # no adjustements are needed if cfg.guiAddress is a network address + # no adjustments are needed if cfg.guiAddress is a network address else "${cfg.guiAddress}${path}" ; @@ -68,7 +68,7 @@ let /* Syncthing's rest API for the folders and devices is almost identical. Hence we iterate them using lib.pipe and generate shell commands for both at - the sime time. */ + the same time. */ (lib.pipe { # The attributes below are the only ones that are different for devices / # folders. From af9597de5d7f83cf8e7c8c1218bdb3a3414f8467 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 09:48:44 +0100 Subject: [PATCH 0984/1107] python312Packages.mypy-boto3-amplify: 1.36.0 -> 1.36.22 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index b79f7a46a8e2..10e7907a8ae0 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -66,8 +66,8 @@ rec { "sha256-i04sOKNlMSATWWF3LXzvxrVf0H4oM542RBNZd4Zt6tc="; mypy-boto3-amplify = - buildMypyBoto3Package "amplify" "1.36.0" - "sha256-mtmY1VpEEo3Nrcbjs7lO0YLsGxAEZ7gRn8MhJEUWQiU="; + buildMypyBoto3Package "amplify" "1.36.22" + "sha256-8PT6vH55v0HTFzpXq9zLOzgEZP1+FwA1fDpE4yTzEjY="; mypy-boto3-amplifybackend = buildMypyBoto3Package "amplifybackend" "1.36.0" From 9064b0c277787396e29818b390dc57b04ac3b1b6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 09:48:54 +0100 Subject: [PATCH 0985/1107] python312Packages.mypy-boto3-batch: 1.36.3 -> 1.36.23 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 10e7907a8ae0..ba0969a8a137 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -166,8 +166,8 @@ rec { "sha256-mvC8pHHoNIK8xgiwGuoRcYsr1UkP57ZwQtuvRfYazk8="; mypy-boto3-batch = - buildMypyBoto3Package "batch" "1.36.3" - "sha256-LGhvJhNkuXjvJ99QYgrFSzbaUZRh0ROui5JvL7OYTeo="; + buildMypyBoto3Package "batch" "1.36.23" + "sha256-FBjHqVc9cjhDd3JiHeBPTO9xvYq5musA/X1DiwYuzfw="; mypy-boto3-billingconductor = buildMypyBoto3Package "billingconductor" "1.36.0" From 05145970cd24ee64c1a26e3ee8c85bb44d325110 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 09:49:17 +0100 Subject: [PATCH 0986/1107] python312Packages.mypy-boto3-dms: 1.36.21 -> 1.36.22 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index ba0969a8a137..01c7cc61a64b 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -414,8 +414,8 @@ rec { "sha256-si7pjgKzxg++SfVdOsIQP37rXG84IZM0ltcwc2+wn3I="; mypy-boto3-dms = - buildMypyBoto3Package "dms" "1.36.21" - "sha256-N6MW2zZyoAHYkhe6bwPa4VK/tlzfFPZaPEYAjBcH180="; + buildMypyBoto3Package "dms" "1.36.22" + "sha256-Pc4KEedGm6ASBM0nBnOrnyTgv46rQ3D+hRsdP2x/xvs="; mypy-boto3-docdb = buildMypyBoto3Package "docdb" "1.36.0" From ab01c83275f7d8e30ae83c16b9797d028433d55b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 09:49:25 +0100 Subject: [PATCH 0987/1107] python312Packages.mypy-boto3-emr-containers: 1.36.0 -> 1.36.23 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 01c7cc61a64b..9dbde84a5130 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -502,8 +502,8 @@ rec { "sha256-j61F+3E2FfQ7hpsnT9M/7maaL/uKNNlRhm8cKH5RoAo="; mypy-boto3-emr-containers = - buildMypyBoto3Package "emr-containers" "1.36.0" - "sha256-2YTbWlv98Ldoj7w/MDcKNH40V88NjSYN+CwnZugufE4="; + buildMypyBoto3Package "emr-containers" "1.36.23" + "sha256-fLHB86UPQH/q6nItMngOxiXZyC34n+giryXQcuypPQw="; mypy-boto3-emr-serverless = buildMypyBoto3Package "emr-serverless" "1.36.3" From b99cd6d36af9bdc913bdba6d2bce6c31dc2737a9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 09:49:59 +0100 Subject: [PATCH 0988/1107] python312Packages.mypy-boto3-medialive: 1.36.19 -> 1.36.23 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 9dbde84a5130..cc332fbaa41d 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -866,8 +866,8 @@ rec { "sha256-Zs7r18i4H2k2XnqvRN/d+b5W+0bjfNonNL1EI1rK7aw="; mypy-boto3-medialive = - buildMypyBoto3Package "medialive" "1.36.19" - "sha256-546c5x+TddUlNzw5Wqruap7O8zvAXlgvszHo/psBRuo="; + buildMypyBoto3Package "medialive" "1.36.23" + "sha256-BoQr6Zei1WNmBGt6/AIp2OHCzX7VicNnn16jfpWWPVU="; mypy-boto3-mediapackage = buildMypyBoto3Package "mediapackage" "1.36.0" From 3ec52358bca7edbfd6747a7f5f7b0b1f8b024477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 19 Feb 2025 09:55:07 +0100 Subject: [PATCH 0989/1107] rubyPackages.charlock_holmes: 0.7.7 -> 0.7.9 Also the same inside schleuder gem-lock. https://github.com/brianmario/charlock_holmes/compare/v0.7.7...v0.7.9 In particular this fixes build, probably after icu upgrade: https://hydra.nixos.org/build/289930518/nixlog/3/tail --- pkgs/tools/security/schleuder/Gemfile.lock | 2 +- pkgs/tools/security/schleuder/gemset.nix | 4 ++-- pkgs/top-level/ruby-packages.nix | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/schleuder/Gemfile.lock b/pkgs/tools/security/schleuder/Gemfile.lock index 96970097b875..5fa592457fe8 100644 --- a/pkgs/tools/security/schleuder/Gemfile.lock +++ b/pkgs/tools/security/schleuder/Gemfile.lock @@ -16,7 +16,7 @@ GEM tzinfo (~> 2.0) zeitwerk (~> 2.3) bcrypt (3.1.20) - charlock_holmes (0.7.7) + charlock_holmes (0.7.9) concurrent-ruby (1.3.1) daemons (1.4.1) eventmachine (1.2.7) diff --git a/pkgs/tools/security/schleuder/gemset.nix b/pkgs/tools/security/schleuder/gemset.nix index ec334c67ac5f..025c6aa9e997 100644 --- a/pkgs/tools/security/schleuder/gemset.nix +++ b/pkgs/tools/security/schleuder/gemset.nix @@ -56,10 +56,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0hybw8jw9ryvz5zrki3gc9r88jqy373m6v46ynxsdzv1ysiyr40p"; + sha256 = "1c1dws56r7p8y363dhyikg7205z59a3bn4amnv2y488rrq8qm7ml"; type = "gem"; }; - version = "0.7.7"; + version = "0.7.9"; }; concurrent-ruby = { groups = [ "default" ]; diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 3bf08ddf5be8..b321a80017f4 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -322,10 +322,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hybw8jw9ryvz5zrki3gc9r88jqy373m6v46ynxsdzv1ysiyr40p"; + sha256 = "1c1dws56r7p8y363dhyikg7205z59a3bn4amnv2y488rrq8qm7ml"; type = "gem"; }; - version = "0.7.7"; + version = "0.7.9"; }; childprocess = { dependecnies = ["logger"]; From 2fd7063d496cb4c2dafd512858889a6723bb52be Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 10:26:39 +0100 Subject: [PATCH 0990/1107] checkov: 3.2.370 -> 3.2.372 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.370...3.2.372 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.372 --- pkgs/by-name/ch/checkov/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix index 905fd2bfa585..cb51223eb4e1 100644 --- a/pkgs/by-name/ch/checkov/package.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -25,14 +25,14 @@ with py.pkgs; python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.370"; + version = "3.2.372"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = version; - hash = "sha256-IaE2Mg8Fk1Xb3ujPRHTY1N4ev75qM8Kj5o7IPtKuNsk="; + hash = "sha256-c7qhfWs68BMkOrhaJprdgZXQJe0i2wSuc/0WRCHFQeY="; }; pythonRelaxDeps = [ From 5d9a457aa4377a9dba45b70409a73d6a0861d36b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 09:27:25 +0000 Subject: [PATCH 0991/1107] ente-cli: 0.2.2 -> 0.2.3 --- pkgs/by-name/en/ente-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/en/ente-cli/package.nix b/pkgs/by-name/en/ente-cli/package.nix index 42fde2888a6d..0f89c077239b 100644 --- a/pkgs/by-name/en/ente-cli/package.nix +++ b/pkgs/by-name/en/ente-cli/package.nix @@ -9,7 +9,7 @@ testers, }: let - version = "0.2.2"; + version = "0.2.3"; canExecute = stdenv.buildPlatform.canExecute stdenv.hostPlatform; in @@ -21,7 +21,7 @@ buildGoModule { owner = "ente-io"; repo = "ente"; tag = "cli-v${version}"; - hash = "sha256-ynbljYl73XwCnt3RUNmOYdrN8FX3sJ+3qDhWa8m2YJs="; + hash = "sha256-qKMFoNtD5gH0Y+asD0LR5d3mxGpr2qVWXIUzJTSezeI="; sparseCheckout = [ "cli" ]; }; From 873a6da96e2694674009ee6b938fd13d4557a59c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 10:28:10 +0100 Subject: [PATCH 0992/1107] python313Packages.tencentcloud-sdk-python: 3.0.1319 -> 3.0.1320 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1319...3.0.1320 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1320/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index a25c6387e559..22af195333a6 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1319"; + version = "3.0.1320"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-AwWUvIx+BWfUelhGjYvzxLc08nNx/NXYDip5Et/hMdo="; + hash = "sha256-2ZT6uTUP6oEuHlkxp5EJxZNw3hN8LUUDV9Mt8dNXF58="; }; build-system = [ setuptools ]; From d1082a9bbc991b2c33f504f8d065c2fbf2617b11 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 10:28:55 +0100 Subject: [PATCH 0993/1107] python313Packages.boto3-stubs: 1.36.21 -> 1.36.23 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 0ce3352f54a2..3c149cd96a0a 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.36.21"; + version = "1.36.23"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-DLQbzGBJDI8vaRbSRoObABcYT//zH2X8LpIFvs6vU7o="; + hash = "sha256-4JAW8G2vd5TRGBWJG5YvWIxRPF9e5sCrLARcN195jJo="; }; build-system = [ setuptools ]; From 00f010cef920e82fbb5704a82ca4105f9bc6a80c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 10:28:59 +0100 Subject: [PATCH 0994/1107] python313Packages.botocore-stubs: 1.36.21 -> 1.36.23 --- pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 06b3da567146..8578be6c480b 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.36.21"; + version = "1.36.23"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-tJUgpxxHu1bftNr+p1HEDg/vzXBw/vfqfw1UzJF9gqo="; + hash = "sha256-IoPPbpJqMj0qK6AyIiiWDbf0AGHf7hl4WBGDWdhAKBY="; }; nativeBuildInputs = [ setuptools ]; From 32e043d959ddcb66ffe61c2ce33703407e93e462 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 10:29:15 +0100 Subject: [PATCH 0995/1107] python313Packages.publicsuffixlist: 1.0.2.20250213 -> 1.0.2.20250219 Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20250219-gha/CHANGES.md --- pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index e48bb58fe4fb..99493b64b27e 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20250213"; + version = "1.0.2.20250219"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gbT6n/jr+GgYDh0046DsTiQesJ6jp7WQS/wvwe/0NCw="; + hash = "sha256-sFhC19nKDpZBj5W/RgWPC9XdwlHoJAuY1tBEgO+r52o="; }; build-system = [ setuptools ]; From f20e36df25f966df0900e122d7868919bf9abdf7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 10:31:45 +0100 Subject: [PATCH 0996/1107] cdncheck: 1.1.1 -> 1.1.6 Diff: https://github.com/projectdiscovery/cdncheck/compare/refs/tags/v1.1.1...v1.1.6 Changelog: https://github.com/projectdiscovery/cdncheck/releases/tag/v1.1.6 --- pkgs/by-name/cd/cdncheck/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix index 54490c56a6ee..df976af41474 100644 --- a/pkgs/by-name/cd/cdncheck/package.nix +++ b/pkgs/by-name/cd/cdncheck/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cdncheck"; - version = "1.1.1"; + version = "1.1.6"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cdncheck"; tag = "v${version}"; - hash = "sha256-vz/PAu/YMrlUQ6oXERNm1bl3fZ0YDrvYCv64Qe0+zUo="; + hash = "sha256-4dW0HcJuEJt9Yf3SccCJbPGYQMRo+eGAxhUhfbdcYD8="; }; vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4="; From 5d7ab90d3e9585499b4dd4081b6f79d937189c37 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Wed, 19 Feb 2025 10:35:28 +0100 Subject: [PATCH 0997/1107] yt-dlp: 2025.1.26 -> 2025.2.19 Changelog: https://github.com/yt-dlp/yt-dlp/releases/tag/2025.02.19 Diff: https://github.com/yt-dlp/yt-dlp/compare/2025.01.26...2025.02.19 --- pkgs/by-name/yt/yt-dlp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix index 3bcc39c4e495..baa38c319ea5 100644 --- a/pkgs/by-name/yt/yt-dlp/package.nix +++ b/pkgs/by-name/yt/yt-dlp/package.nix @@ -17,13 +17,13 @@ python3Packages.buildPythonApplication rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2025.1.26"; + version = "2025.2.19"; pyproject = true; src = fetchPypi { inherit version; pname = "yt_dlp"; - hash = "sha256-HJc4JmkhrUPFaK0BrDNi+3x69Uknb77JK9cvFA2hYkA="; + hash = "sha256-8zynbfLk2zGIDy/kCNRPUFjZ8TUBWxPlBhDfvngkW+o="; }; build-system = with python3Packages; [ From 91b8d9be91e2e92cd269ba17fc218ebb6db572e1 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 19 Feb 2025 09:35:24 +0000 Subject: [PATCH 0998/1107] wesnoth: 1.18.3 -> 1.18.4 Changes: https://github.com/wesnoth/wesnoth/blob/1.18.4/changelog.md --- pkgs/games/wesnoth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 92ac3e6b4c08..c99ec363944b 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.18.3"; + version = "1.18.4"; src = fetchFromGitHub { rev = version; owner = "wesnoth"; repo = "wesnoth"; - hash = "sha256-Uk8omtXYZaneyBr4TASRtIKEyJLGwfKWu9vRQNVpdVA="; + hash = "sha256-c3BoTFnSUqtp71QeSCsC2teVuzsQwV8hOJtIcZdP+1E="; }; nativeBuildInputs = [ cmake pkg-config ]; From 99a65b1c4a808d86ab73f1b8816ff0b91a95f0a1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 10:41:02 +0100 Subject: [PATCH 0999/1107] python313Packages.aiortm: 0.9.45 -> 0.10.0 Diff: https://github.com/MartinHjelmare/aiortm/compare/refs/tags/v0.9.45...v0.10.0 Changelog: https://github.com/MartinHjelmare/aiortm/blob/v0.10.0/CHANGELOG.md --- .../python-modules/aiortm/default.nix | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/aiortm/default.nix b/pkgs/development/python-modules/aiortm/default.nix index b41a55fc219c..15d9bee935be 100644 --- a/pkgs/development/python-modules/aiortm/default.nix +++ b/pkgs/development/python-modules/aiortm/default.nix @@ -4,22 +4,20 @@ aioresponses, buildPythonPackage, ciso8601, - click, fetchFromGitHub, mashumaro, - poetry-core, pytest-asyncio, pytest-cov-stub, pytestCheckHook, pythonOlder, - rich, + setuptools, typer, yarl, }: buildPythonPackage rec { pname = "aiortm"; - version = "0.9.45"; + version = "0.10.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -28,29 +26,30 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiortm"; tag = "v${version}"; - hash = "sha256-5PbfadI80hIdqUh/7tenTD3buiM7tcGauDqhv2uHNDs="; + hash = "sha256-YclrU24eyk88eOc/nlgeWJ/Fo9SveCzRqQCKYAA9Y9s="; }; pythonRelaxDeps = [ "typer" ]; - build-system = [ poetry-core ]; + build-system = [ setuptools ]; dependencies = [ aiohttp ciso8601 - click mashumaro - rich - typer yarl ]; + optional-dependencies = { + cli = [ typer ]; + }; + nativeCheckInputs = [ aioresponses pytest-asyncio pytest-cov-stub pytestCheckHook - ]; + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "aiortm" ]; @@ -58,7 +57,7 @@ buildPythonPackage rec { description = "Library for the Remember the Milk API"; homepage = "https://github.com/MartinHjelmare/aiortm"; changelog = "https://github.com/MartinHjelmare/aiortm/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; mainProgram = "aiortm"; }; From f7f4b564dba9528309bb6e32c2ee4ba2d9de2d7b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 10:43:25 +0100 Subject: [PATCH 1000/1107] python313Packages.androidtvremote2: 0.1.2 -> 0.2.0 Diff: https://github.com/tronikos/androidtvremote2/compare/refs/tags/v0.1.2...v0.2.0 Changelog: https://github.com/tronikos/androidtvremote2/releases/tag/v0.2.0 --- pkgs/development/python-modules/androidtvremote2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/androidtvremote2/default.nix b/pkgs/development/python-modules/androidtvremote2/default.nix index de94696c0a3f..2e40d4dab65f 100644 --- a/pkgs/development/python-modules/androidtvremote2/default.nix +++ b/pkgs/development/python-modules/androidtvremote2/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "androidtvremote2"; - version = "0.1.2"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "androidtvremote2"; tag = "v${version}"; - hash = "sha256-4iVM7BCqOFHrW2BvPakXxp3MfZa+WlB7g/ix239NldE="; + hash = "sha256-mvkOz57R2OLYUeSD2GSyslgbWFHPOzdO4DpSMemUT5U="; }; build-system = [ setuptools ]; From 23e7ddc1e362920630708ae84803ec6c688064d1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 10:43:55 +0100 Subject: [PATCH 1001/1107] python313Packages.cyclopts: 3.7.0 -> 3.9.0 Diff: https://github.com/BrianPugh/cyclopts/compare/refs/tags/v3.7.0...v3.9.0 Changelog: https://github.com/BrianPugh/cyclopts/releases/tag/v3.9.0 --- pkgs/development/python-modules/cyclopts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index d510f1fbd13d..6843cec106ff 100644 --- a/pkgs/development/python-modules/cyclopts/default.nix +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cyclopts"; - version = "3.7.0"; + version = "3.9.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "BrianPugh"; repo = "cyclopts"; tag = "v${version}"; - hash = "sha256-Zv0q8m7BS9MF2xyRRgVn1Bc8iwycmaXbP9S6yNl0yUk="; + hash = "sha256-08+LuMVayVpZQ/7Mw/zdYrnMovKwoBc2kgPE1D7wTWM="; }; build-system = [ From fcdd8263cb89b15882bf2164af5d8492e36c3b2a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 10:44:56 +0100 Subject: [PATCH 1002/1107] python313Packages.holidays: 0.66 -> 0.67 Diff: https://github.com/vacanza/python-holidays/compare/refs/tags/v0.66...v0.67 Changelog: https://github.com/vacanza/python-holidays/releases/tag/v0.67 --- pkgs/development/python-modules/holidays/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index b9daea61b4ac..1a5550d505ba 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.66"; + version = "0.67"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "python-holidays"; tag = "v${version}"; - hash = "sha256-9VX+g7p9YmwahikVnQQ1kbm82VZLm5nqMQktQhbflBw="; + hash = "sha256-R/T6rvL+UKajF8RKYTQc8WndKqRsqFdiPoKaA2ti6yI="; }; build-system = [ From c062809be018bc3b7be725b95397eb2af419909f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 10:45:45 +0100 Subject: [PATCH 1003/1107] python313Packages.jsonargparse: 4.36.0 -> 4.37.0 Diff: https://github.com/omni-us/jsonargparse/compare/refs/tags/v4.36.0...v4.37.0 Changelog: https://github.com/omni-us/jsonargparse/blob/v4.37.0/CHANGELOG.rst --- pkgs/development/python-modules/jsonargparse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonargparse/default.nix b/pkgs/development/python-modules/jsonargparse/default.nix index b02ad887e890..55543c75dfb6 100644 --- a/pkgs/development/python-modules/jsonargparse/default.nix +++ b/pkgs/development/python-modules/jsonargparse/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "jsonargparse"; - version = "4.36.0"; + version = "4.37.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "omni-us"; repo = "jsonargparse"; tag = "v${version}"; - hash = "sha256-wtYE6DQ6EgTFJjzx3IdavnV6TUIGmvPM3PR/+9oeJAk="; + hash = "sha256-ApM4M4VMAvhrZ2KFk7js3snBx+hV5xzufGFuuN14iQM="; }; build-system = [ setuptools ]; From 78a91f03eef6c63837cc88cbaac7e91765ef3f7d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 10:47:46 +0100 Subject: [PATCH 1004/1107] python313Packages.playwrightcapture: 1.27.8 -> 1.28.0 Diff: https://github.com/Lookyloo/PlaywrightCapture/compare/refs/tags/v1.27.8...v1.28.0 Changelog: https://github.com/Lookyloo/PlaywrightCapture/releases/tag/v1.28.0 --- pkgs/development/python-modules/playwrightcapture/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index 10495f4898c4..38279a37a568 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.27.8"; + version = "1.28.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; tag = "v${version}"; - hash = "sha256-iIUwBX3MQHeEmYwesW2Dm45tr9FYyq9GtLGbyV784RA="; + hash = "sha256-WgxGS54OMv6JRsB9IRmKzQIPeoVcvpl28V5vvvEQ6WU="; }; pythonRelaxDeps = [ From 80cb8a8149646f2fbb83b62b88641c0cca232a88 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 10:48:08 +0100 Subject: [PATCH 1005/1107] python313Packages.lacuscore: 1.12.10 -> 1.13.0 Diff: https://github.com/ail-project/LacusCore/compare/refs/tags/v1.12.10...v1.13.0 Changelog: https://github.com/ail-project/LacusCore/releases/tag/v1.13.0 --- pkgs/development/python-modules/lacuscore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix index 1fd803cbbd99..68ed2081bc1c 100644 --- a/pkgs/development/python-modules/lacuscore/default.nix +++ b/pkgs/development/python-modules/lacuscore/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "lacuscore"; - version = "1.12.10"; + version = "1.13.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "LacusCore"; tag = "v${version}"; - hash = "sha256-IKH7c1/MgjlfJ9tKVeTXW8MdLIc7P+jitvQkZn9f75Y="; + hash = "sha256-4+YA+kWdohroFO1EMw7Nwy5w+bTGRrkaOwv1iaV9pZ0="; }; pythonRelaxDeps = [ From c4a66891b7f073fb0d1fe5b35fc0b7cb0f7843a5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 10:50:09 +0100 Subject: [PATCH 1006/1107] python313Packages.mailchecker: 6.0.15 -> 6.0.16 Changelog: https://github.com/FGRibreau/mailchecker/blob/v6.0.16/CHANGELOG.md --- pkgs/development/python-modules/mailchecker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mailchecker/default.nix b/pkgs/development/python-modules/mailchecker/default.nix index 6cc2b0804cb9..0a4db11e4e1c 100644 --- a/pkgs/development/python-modules/mailchecker/default.nix +++ b/pkgs/development/python-modules/mailchecker/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mailchecker"; - version = "6.0.15"; + version = "6.0.16"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kC1ILRtdQQbt0u7MBnNAxots5OJHkJZDgThPZ9NbnlU="; + hash = "sha256-XZT70Nc1L/WGPM4tRgOrjs1N1AUD4O1V/evjcqS5qOk="; }; build-system = [ setuptools ]; From 7a908b5111fec58d2681f595087ba3d68b608a4e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 10:50:48 +0100 Subject: [PATCH 1007/1107] python313Packages.nomadnet: 0.6.0 -> 0.6.1 Diff: https://github.com/markqvist/NomadNet/compare/refs/tags/0.6.0...0.6.1 Changelog: https://github.com/markqvist/NomadNet/releases/tag/0.6.1 --- pkgs/development/python-modules/nomadnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index 15862aa0f3a1..3041b8b0a9e9 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "nomadnet"; - version = "0.6.0"; + version = "0.6.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; tag = version; - hash = "sha256-3n+CoB8SLSjpmif2qBd9+gyF55JpwtJQuxcJEyXaWtk="; + hash = "sha256-TKn35rrWsHo/5bGriMcPx+lPvhWzmVXU3EG4KU/ebwI="; }; build-system = [ setuptools ]; From d12314be65435bd3d5a09c57f5e1f020017acfe1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 10:51:29 +0100 Subject: [PATCH 1008/1107] python313Packages.model-checker: 0.7.17 -> 0.8.2 --- pkgs/development/python-modules/model-checker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix index 08ec5b909432..249d3190dd4b 100644 --- a/pkgs/development/python-modules/model-checker/default.nix +++ b/pkgs/development/python-modules/model-checker/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "model-checker"; - version = "0.7.17"; + version = "0.8.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "model_checker"; inherit version; - hash = "sha256-u9WHYglZG+SytH2qiUJV7YI+zCZ6UIdORXgSgcYgFYc="; + hash = "sha256-zOAyPK70OS55D6aKG4uVhmuNAZ+JUJDEHuk97tnnuK0="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail From 800efa1d8bab029c267eea466f86937e2776b4bf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 10:52:08 +0100 Subject: [PATCH 1009/1107] python313Packages.pyexploitdb: 0.2.67 -> 0.2.68 Changelog: https://github.com/Hackman238/pyExploitDb/blob/master/ChangeLog.md --- pkgs/development/python-modules/pyexploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index 417e035062f7..186c692f435c 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.67"; + version = "0.2.68"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-sz6fI1iSa6aRk5QSsKrSncDI2XFTNbpSjMt2ch8+gfA="; + hash = "sha256-Vl+bASC473mOSL9mTWKWwfH9n7iT0BFcUd9D/rLB3/Y="; }; build-system = [ setuptools ]; From 031e4fbb59ba7d0ef7c93acebcdc7c08a7951cb3 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Wed, 19 Feb 2025 10:44:50 +0100 Subject: [PATCH 1010/1107] nixos-manual: fix build We cannot refer directly to sections that are defined in the nixpkgs manual from the release notes, since the release notes are included in both the nixpkgs and the nixos manuals. Currently the nixos manual fails to build on master. --- doc/release-notes/rl-2505.section.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index 301cb6d172a0..544c54218b0c 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -8,9 +8,9 @@ - `services.rippleDataApi` has been removed, as `ripple-data-api` was broken and had not been updated since 2022. -- The [`no-broken-symlinks` hook](#no-broken-symlinks.sh) was added to catch builds containing dangling or reflexive symlinks, as these are indicative of problems with packaging. +- The [`no-broken-symlinks` hook](https://nixos.org/manual/nixpkgs/unstable/#no-broken-symlinks.sh) was added to catch builds containing dangling or reflexive symlinks, as these are indicative of problems with packaging. The hook can be disabled by providing `dontCheckForBrokenSymlinks = true;` as an argument to `mkDerivation`. - For more information, [check the docs](#no-broken-symlinks.sh) or [see this PR](https://github.com/NixOS/nixpkgs/pull/370750). + For more information, [check the docs](https://nixos.org/manual/nixpkgs/unstable/#no-broken-symlinks.sh) or [see this PR](https://github.com/NixOS/nixpkgs/pull/370750). - The `nixLog*` family of functions made available through the standard environment have been rewritten to prefix messages with both the debug level and the function name of the caller. The `nixLog` function, which logs unconditionally, was also re-introduced and modified to prefix messages with the function name of the caller. From c8b910a4848498bfccaf313240917feda47d0823 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 10:56:55 +0100 Subject: [PATCH 1011/1107] python313Packages.photutils: 2.1.0 -> 2.2.0 Diff: https://github.com/astropy/photutils/compare/refs/tags/2.1.0...2.2.0 Changelog: https://github.com/astropy/photutils/blob/2.2.0/CHANGES.rst --- pkgs/development/python-modules/photutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/photutils/default.nix b/pkgs/development/python-modules/photutils/default.nix index 648fd21a2a20..cb0f50f27ce1 100644 --- a/pkgs/development/python-modules/photutils/default.nix +++ b/pkgs/development/python-modules/photutils/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "photutils"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "astropy"; repo = "photutils"; tag = version; - hash = "sha256-p1MQgIYmiTekKV6oNKql/dnp5CAahXzecrTl25tz1g0="; + hash = "sha256-DNdbCISuBAy3jbKgwWA0Adq2gpRP3AacU1ZorcBkjZo="; }; build-system = [ From 20fe96061cacbbb2a93fe6c8a0a1b65ecfb3bed2 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 19 Feb 2025 12:58:07 +0300 Subject: [PATCH 1012/1107] maintainers/scripts/kde: handle duplicate tarballs properly --- maintainers/scripts/kde/generate-sources.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/maintainers/scripts/kde/generate-sources.py b/maintainers/scripts/kde/generate-sources.py index b03ef3cc5f6b..e4241cced120 100755 --- a/maintainers/scripts/kde/generate-sources.py +++ b/maintainers/scripts/kde/generate-sources.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i python3 -p "python3.withPackages(ps: [ ps.beautifulsoup4 ps.click ps.httpx ps.jinja2 ps.pyyaml ])" +#!nix-shell -i python3 -p "python3.withPackages(ps: [ ps.beautifulsoup4 ps.click ps.httpx ps.jinja2 ps.packaging ps.pyyaml ])" import base64 import binascii import json @@ -11,6 +11,7 @@ import bs4 import click import httpx import jinja2 +import packaging.version as v import utils @@ -104,6 +105,12 @@ def main(set: str, version: str, nixpkgs: pathlib.Path, sources_url: Optional[st hash = client.get(url + ".sha256").text.split(" ", maxsplit=1)[0] assert hash + if existing := results.get(project_name): + old_version = existing["version"] + if v.parse(old_version) > v.parse(version): + print(f"{project_name} {old_version} is newer than {version}, skipping...") + continue + results[project_name] = { "version": version, "url": "mirror://kde" + urlparse(url).path, From 8ddfa70f499ffb7dfcbe8a988b1ab4c73567cf88 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 19 Feb 2025 12:58:27 +0300 Subject: [PATCH 1013/1107] kdePackages.spectacle: 6.3.1 -> 6.3.1.2 --- pkgs/kde/generated/sources/plasma.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json index 9b10cdc176d1..ce5a54b7fa28 100644 --- a/pkgs/kde/generated/sources/plasma.json +++ b/pkgs/kde/generated/sources/plasma.json @@ -315,9 +315,9 @@ "hash": "sha256-vy5JcIKk5bYpa4NZKYkNI9qbobPbSU+GEjfWlvbEmb8=" }, "spectacle": { - "version": "6.3.1", - "url": "mirror://kde/stable/plasma/6.3.1/spectacle-6.3.1.tar.xz", - "hash": "sha256-DzZLBd/MDGPB62luWTGPg6nIPUFi9WVrT6X+KdrMgU4=" + "version": "6.3.1.2", + "url": "mirror://kde/stable/plasma/6.3.1/spectacle-6.3.1.2.tar.xz", + "hash": "sha256-g35ejQ745SL01qN9pInk+G2DZJkfz3lsWP0FJvgc+go=" }, "systemsettings": { "version": "6.3.1", From 67f79e9a91bfb0fce366ff42df0cbc0ca850b3bd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 10:59:04 +0100 Subject: [PATCH 1014/1107] python313Packages.meilisearch: 0.33.1 -> 0.34.0 Diff: https://github.com/meilisearch/meilisearch-python/compare/refs/tags/v0.33.1...v0.34.0 Changelog: https://github.com/meilisearch/meilisearch-python/releases/tag/v0.34.0 --- pkgs/development/python-modules/meilisearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix index f4cd85fd778c..4d3ac68bb345 100644 --- a/pkgs/development/python-modules/meilisearch/default.nix +++ b/pkgs/development/python-modules/meilisearch/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "meilisearch"; - version = "0.33.1"; + version = "0.34.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "meilisearch"; repo = "meilisearch-python"; tag = "v${version}"; - hash = "sha256-8x6Q0nGFz1pJ1jPfbepE7YL6z/HPkeyRYvwS9jJblRI="; + hash = "sha256-2AiQorAkDKHiq4DhwzUjJPCj6KCB6A2FAMgEqSrSrRg="; }; build-system = [ setuptools ]; From d7b2b8ded518960020e9662e4dff9d7d1fa5cb5e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 11:02:34 +0100 Subject: [PATCH 1015/1107] python313Packages.ocifs: add missing input --- pkgs/development/python-modules/ocifs/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ocifs/default.nix b/pkgs/development/python-modules/ocifs/default.nix index af0194f2f0c8..55d9ddc790dd 100644 --- a/pkgs/development/python-modules/ocifs/default.nix +++ b/pkgs/development/python-modules/ocifs/default.nix @@ -6,6 +6,7 @@ fsspec, oci, pythonOlder, + requests, }: buildPythonPackage rec { @@ -22,11 +23,12 @@ buildPythonPackage rec { hash = "sha256-IGl9G4NyzhcqrfYfgeZin+wt1OwHmh6780MPfZBwsXA="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ fsspec oci + requests ]; # Module has no tests @@ -38,7 +40,7 @@ buildPythonPackage rec { description = "Oracle Cloud Infrastructure Object Storage fsspec implementation"; homepage = "https://ocifs.readthedocs.io"; changelog = "https://github.com/oracle/ocifs/releases/tag/v${version}"; - license = with licenses; [ upl ]; + license = licenses.upl; maintainers = with maintainers; [ fab ]; }; } From 8f7981b825fda28c6714c356057e372edbe1a679 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 10:04:42 +0000 Subject: [PATCH 1016/1107] thunderbird-128-unwrapped: 128.6.1esr -> 128.7.1esr --- .../networking/mailreaders/thunderbird/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 5929d9800110..90e6e9cde7b8 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -98,8 +98,8 @@ rec { thunderbird-esr = thunderbird-128; thunderbird-128 = common { - version = "128.6.1esr"; - sha512 = "f41936b90aaefde5c6a31a03d1f7ed4b6560729584061d82d032efde3df0836eede807a318d4a403de4a3cd5d6a6f7eace483e08fcc284699176f1b3ad01437a"; + version = "128.7.1esr"; + sha512 = "3f84e1f1a83379da1f154b66dbb5f941d04548ad017aab32aa9520f4315edb524e3754ac1fe9a7ae27f7aa33e2881c6783f11ccc53cda713f107760b7d880667"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-128"; From 83377f8253f985a8dd25e57c046b89d7ec23bc4b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 18 Feb 2025 10:39:59 +0100 Subject: [PATCH 1017/1107] linux_6_12: 6.12.14 -> 6.12.15 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 3284b4d54aa0..c0508af46707 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -28,8 +28,8 @@ "hash": "sha256:1z2913y38clnlmhvwj49h7p4pic24s4d8np7nmd4lk7m2xz8w532" }, "6.12": { - "version": "6.12.14", - "hash": "sha256:054gi5fp60d2536z06b1lmys9zlraixh22yb75z42xfqnjzz88wl" + "version": "6.12.15", + "hash": "sha256:02k3yzlri0h9s4hcx20sif5jvafhjk9vab9h6wsca8hfxa2bvxaz" }, "6.13": { "version": "6.13.3", From ec74d6f9733ee918f9f03731e641b667ed36ecee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luka=20Bla=C5=A1kovi=C4=87?= Date: Mon, 17 Feb 2025 06:19:12 +0000 Subject: [PATCH 1018/1107] python3Packages.pytest-doctestplus: 1.3.0 -> 1.4.0 --- .../python-modules/pytest-doctestplus/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index f97f5d6f3b77..5729927f62af 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytest-doctestplus"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "scientific-python"; repo = "pytest-doctestplus"; tag = "v${version}"; - hash = "sha256-jXT+b0aMZo8byAXNR4WcmNkMNYtwkTwsthPVXvAO2K8="; + hash = "sha256-hKxTniN7BHDdIHqxNGOuvD7Rk5ChSh1Zn6fo6G+Uty4="; }; postPatch = '' @@ -58,6 +58,7 @@ buildPythonPackage rec { "test_remote_data_ellipsis" "test_remote_data_requires" "test_remote_data_ignore_warnings" + "test_remote_data_all" ]; meta = with lib; { From c2a000ed852a198f9a4f38f53597846efb0491f2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 11:18:11 +0100 Subject: [PATCH 1019/1107] python313Packages.aiogram: 3.17.0 -> 3.18.0 Diff: https://github.com/aiogram/aiogram/compare/refs/tags/v3.17.0...v3.18.0 Changelog: https://github.com/aiogram/aiogram/releases/tag/v3.18.0 --- pkgs/development/python-modules/aiogram/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix index ca0248f8210d..fc4c9a6d3941 100644 --- a/pkgs/development/python-modules/aiogram/default.nix +++ b/pkgs/development/python-modules/aiogram/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "aiogram"; - version = "3.17.0"; + version = "3.18.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "aiogram"; repo = "aiogram"; tag = "v${version}"; - hash = "sha256-47PWd1geTALgO7MDglHqaoMmZ+u1BnKSlj6Jxj7fkBQ="; + hash = "sha256-3JyMkLixemKZN9XSpN/4SdpdYfR3WqGUKQ9Bfy6bB+Q="; }; build-system = [ hatchling ]; From 595e32f82fd6e713261f98503eeb87244c395c2c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 11:20:51 +0100 Subject: [PATCH 1020/1107] python313Packages.google-cloud-org-policy: 1.12.0 -> 1.13.0 Changelog: https://github.com/googleapis/python-org-policy/blob/v1.13.0/CHANGELOG.md --- .../python-modules/google-cloud-org-policy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 343eca87786f..09808261b134 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "1.12.0"; + version = "1.13.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_org_policy"; inherit version; - hash = "sha256-xM9fJH21AbNOrNZG1Ahs+NuhKOxCuKv41mSrJQXjH2Y="; + hash = "sha256-ajFHKQI6fD/X/gYrasb1qwZNbOzrFyJg8mUaxa9CeM4="; }; build-system = [ setuptools ]; From 8863b15639712978a004b891e72e4a0112c8b1f1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 11:21:24 +0100 Subject: [PATCH 1021/1107] python313Packages.google-cloud-speech: 2.30.0 -> 2.31.0 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-speech-v2.31.0/packages/google-cloud-speech/CHANGELOG.md --- .../python-modules/google-cloud-speech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index ce6b2df45ccc..5f7d42c2d116 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.30.0"; + version = "2.31.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_speech"; inherit version; - hash = "sha256-7GPL1MK72wMGRioPMAgvRJXe3FBvDEoaKZDubmNGVEw="; + hash = "sha256-15mMJqlF9Ykzxg4tOAPtBZPrQWusnUOBwDBZ0QJy7wM="; }; build-system = [ setuptools ]; From 90d449e6cc5915ac81fd9d1c45b18e6922a7399f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 11:21:51 +0100 Subject: [PATCH 1022/1107] python313Packages.google-cloud-network-connectivity: 2.6.0 -> 2.7.0 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-network-connectivity-v2.7.0/packages/google-cloud-network-connectivity/CHANGELOG.md --- .../google-cloud-network-connectivity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix b/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix index d231c6ec3cab..6933c020c487 100644 --- a/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix +++ b/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-network-connectivity"; - version = "2.6.0"; + version = "2.7.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "google_cloud_network_connectivity"; - hash = "sha256-tEO50cklPrVOT6gUZ1uvTzyLx4XrysnPvDbD2Wgj7ZI="; + hash = "sha256-RzYM+qqALaTtxyOJQz7G6xqUUznSg+7uVN/ZUOjSg90="; }; build-system = [ setuptools ]; From ce9f304215e6646ee95c74cae69f759da1f7f221 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 10:23:59 +0000 Subject: [PATCH 1023/1107] bearer: 1.48.0 -> 1.49.0 --- pkgs/by-name/be/bearer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/be/bearer/package.nix b/pkgs/by-name/be/bearer/package.nix index 0171b16322c9..924bc54d3bf5 100644 --- a/pkgs/by-name/be/bearer/package.nix +++ b/pkgs/by-name/be/bearer/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "bearer"; - version = "1.48.0"; + version = "1.49.0"; src = fetchFromGitHub { owner = "bearer"; repo = "bearer"; tag = "v${version}"; - hash = "sha256-M9Usz+qQH4QNA/0TgtvjuqwnaCpyxr9OMIc8pJ/FjDE="; + hash = "sha256-mIjIcJzu3BatV4OQ18yHvwuUjS+zJHe4EFPYEFUwCjo="; }; - vendorHash = "sha256-A0zy5O2+afhn6jAfLd/k7wvL3z1PVI0e6bO39cnYrhM="; + vendorHash = "sha256-+2iiMb2+/a3GCUMVA9boJJxuFgB3NmxpTePyMEA46jw="; subPackages = [ "cmd/bearer" ]; From 44024d594b48cf80c635fa9fdda4fb19d01b4fbf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 11:25:00 +0100 Subject: [PATCH 1024/1107] python312Packages.llama-index-readers-file: 0.4.4 -> 0.4.5 --- .../python-modules/llama-index-readers-file/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix index f92751824544..5f092dee3231 100644 --- a/pkgs/development/python-modules/llama-index-readers-file/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "llama-index-readers-file"; - version = "0.4.4"; + version = "0.4.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_file"; inherit version; - hash = "sha256-4Haz+h5o7qFZTUfOwfZLOE+2Bn8ml8qKriK0ohrSfKc="; + hash = "sha256-POXIrX8oW7f/goxbLiAIiFasZc+WZAKH7Kdwtpoh34g="; }; pythonRelaxDeps = [ From 26838e47673f32f2b6b4986fc7df30f7fe5218c0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 11:29:08 +0100 Subject: [PATCH 1025/1107] python312Packages.prometheus-async: 22.1.0 -> 25.1.0 Diff: https://github.com/hynek/prometheus-async/compare/22.1.0...25.1.0 Changelog: https://github.com/hynek/prometheus-async/blob/25.1.0/CHANGELOG.md --- .../prometheus-async/default.nix | 37 ++++++++----------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/prometheus-async/default.nix b/pkgs/development/python-modules/prometheus-async/default.nix index 9f35acd96b1a..a8c89b503d61 100644 --- a/pkgs/development/python-modules/prometheus-async/default.nix +++ b/pkgs/development/python-modules/prometheus-async/default.nix @@ -1,52 +1,45 @@ { lib, + aiohttp, buildPythonPackage, fetchFromGitHub, - - flit-core, - + hatch-vcs, + hatchling, prometheus-client, + pytest-asyncio, + pytestCheckHook, + twisted, typing-extensions, wrapt, - aiohttp, - twisted, - - pytestCheckHook, - pytest-asyncio, }: buildPythonPackage rec { pname = "prometheus-async"; - version = "22.1.0"; + version = "25.1.0"; pyproject = true; src = fetchFromGitHub { owner = "hynek"; repo = "prometheus-async"; rev = version; - hash = "sha256-2C4qr0gLYHndd49UfjtuF/v05Hl2PuyegPUhCAmd5/E="; + hash = "sha256-e/BVxATpafxddq26Rt7XTiK4ajY+saUApXbmTG0/I6I="; }; - nativeBuildInputs = [ - flit-core + build-system = [ + hatch-vcs + hatchling ]; - propagatedBuildInputs = [ + dependencies = [ prometheus-client typing-extensions wrapt ]; optional-dependencies = { - aiohttp = [ - aiohttp - ]; - consul = [ - aiohttp - ]; - twisted = [ - twisted - ]; + aiohttp = [ aiohttp ]; + consul = [ aiohttp ]; + twisted = [ twisted ]; }; nativeCheckInputs = [ From 41f3fbb18ee5b75ed3831fe4327daaf6462e0d7f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 11:30:22 +0100 Subject: [PATCH 1026/1107] python312Packages.prometheus-api-client: 0.5.6 -> 0.5.7 Diff: https://github.com/4n4nd/prometheus-api-client-python/compare/refs/tags/v0.5.6...v0.5.7 Changelog: https://github.com/4n4nd/prometheus-api-client-python/blob/v0.5.7/CHANGELOG.md --- .../python-modules/prometheus-api-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prometheus-api-client/default.nix b/pkgs/development/python-modules/prometheus-api-client/default.nix index 93cf3ed6f1b3..f97c8001ef11 100644 --- a/pkgs/development/python-modules/prometheus-api-client/default.nix +++ b/pkgs/development/python-modules/prometheus-api-client/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "prometheus-api-client"; - version = "0.5.6"; + version = "0.5.7"; format = "setuptools"; src = fetchFromGitHub { owner = "4n4nd"; repo = "prometheus-api-client-python"; tag = "v${version}"; - hash = "sha256-0vnG0m+RV2Z9GIMJ/R0edjcjyPH1OvB8zERCMeyRuRg="; + hash = "sha256-XmsBEGerEA7kEigkVpDYpe1UfEKvEzV/0uY3sffRC7s="; }; propagatedBuildInputs = [ From c9f27209a10b0516e15de3a7c1e84a479d81e05d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 11:31:42 +0100 Subject: [PATCH 1027/1107] python312Packages.prometheus-api-client: refactor --- .../python-modules/prometheus-api-client/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prometheus-api-client/default.nix b/pkgs/development/python-modules/prometheus-api-client/default.nix index f97c8001ef11..6578c348c889 100644 --- a/pkgs/development/python-modules/prometheus-api-client/default.nix +++ b/pkgs/development/python-modules/prometheus-api-client/default.nix @@ -8,13 +8,14 @@ matplotlib, numpy, pandas, + setuptools, requests, }: buildPythonPackage rec { pname = "prometheus-api-client"; version = "0.5.7"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "4n4nd"; @@ -23,7 +24,9 @@ buildPythonPackage rec { hash = "sha256-XmsBEGerEA7kEigkVpDYpe1UfEKvEzV/0uY3sffRC7s="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ dateparser matplotlib numpy From 707565040ac4d01663a538c3074881e7c65803c6 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Wed, 19 Feb 2025 11:32:17 +0100 Subject: [PATCH 1028/1107] .github/workflows: build the nixos manual also when doc/ changed We import things like the nixpkgs release notes, and the css and js files from doc/ into nixos/doc/, so building the nixos manual whenever doc/ was modified, avoids failures reaching master. --- .github/workflows/manual-nixos-v2.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/manual-nixos-v2.yml b/.github/workflows/manual-nixos-v2.yml index c83d53e8a51a..687dc6eaf64e 100644 --- a/.github/workflows/manual-nixos-v2.yml +++ b/.github/workflows/manual-nixos-v2.yml @@ -5,7 +5,11 @@ on: branches: - master paths: - - 'nixos/**' + - "nixos/**" + # Also build when the nixpkgs doc changed, since we take things like + # the release notes and some css and js files from there. + # See nixos/doc/manual/default.nix + - "doc/**" permissions: {} From 9d9ae935ad7f2cc748537d52280985b7c64c9559 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 10:34:12 +0000 Subject: [PATCH 1029/1107] python312Packages.stookwijzer: 1.5.2 -> 1.5.4 --- pkgs/development/python-modules/stookwijzer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/stookwijzer/default.nix b/pkgs/development/python-modules/stookwijzer/default.nix index fd1bd32df1ed..5a7b618e7000 100644 --- a/pkgs/development/python-modules/stookwijzer/default.nix +++ b/pkgs/development/python-modules/stookwijzer/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "stookwijzer"; - version = "1.5.2"; + version = "1.5.4"; pyproject = true; src = fetchFromGitHub { owner = "fwestenberg"; repo = "stookwijzer"; tag = "v${version}"; - hash = "sha256-ES9atB0KricNI5KWQC5Eoftwd/Le7Id3855977KuEy4="; + hash = "sha256-ZbXXpmyu4sczYlM0rFn1xIUYmQtxLv4SiQrk8qox8Dk="; }; build-system = [ setuptools ]; @@ -32,7 +32,7 @@ buildPythonPackage rec { doCheck = false; meta = { - changelog = "https://github.com/fwestenberg/stookwijzer/releases/tag/v${version}"; + changelog = "https://github.com/fwestenberg/stookwijzer/releases/tag/${src.tag}"; description = "Python package for the Stookwijzer API"; homepage = "https://github.com/fwestenberg/stookwijzer"; license = lib.licenses.mit; From fa449f6ad1b8ab50d3e40947195acaa0808647b4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 11:34:52 +0100 Subject: [PATCH 1030/1107] python312Packages.pyloadapi: 1.4.0 -> 1.4.1 Diff: https://github.com/tr4nt0r/pyloadapi/compare/refs/tags/v1.4.0...v1.4.1 Changelog: https://github.com/tr4nt0r/pyloadapi/blob/1.4.1/CHANGELOG.md --- pkgs/development/python-modules/pyloadapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyloadapi/default.nix b/pkgs/development/python-modules/pyloadapi/default.nix index 934a5f06401f..fe0c95b42727 100644 --- a/pkgs/development/python-modules/pyloadapi/default.nix +++ b/pkgs/development/python-modules/pyloadapi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyloadapi"; - version = "1.4.0"; + version = "1.4.1"; pyproject = true; disabled = pythonOlder "3.12"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "tr4nt0r"; repo = "pyloadapi"; tag = "v${version}"; - hash = "sha256-USSTXHHhtUc8QF9U3t3rARXn5Iqo6KOGBa3VAfRMbiQ="; + hash = "sha256-UEzVbgMd/kplKGPxZjo9bk8WFtkFW463dd3D+e7S3bI="; }; postPatch = '' From dc080d6cf6459ae15c430696702be4896134b4e1 Mon Sep 17 00:00:00 2001 From: Brian McGillion Date: Wed, 19 Feb 2025 08:28:33 +0400 Subject: [PATCH 1031/1107] optinix: enable auto-update with nix-update ask the bot to do the bumps. Signed-off-by: Brian McGillion --- pkgs/by-name/op/optinix/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/op/optinix/package.nix b/pkgs/by-name/op/optinix/package.nix index 1f0e0466b5f9..221b72130dae 100644 --- a/pkgs/by-name/op/optinix/package.nix +++ b/pkgs/by-name/op/optinix/package.nix @@ -3,6 +3,7 @@ fetchFromGitLab, buildGoModule, installShellFiles, + nix-update-script, }: buildGoModule rec { pname = "optinix"; @@ -11,7 +12,7 @@ buildGoModule rec { src = fetchFromGitLab { owner = "hmajid2301"; repo = "optinix"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-OuzLTygfJj1ILT0lAcBC28vU5YLuq0ErZHsLHoQNWBA="; }; @@ -31,6 +32,8 @@ buildGoModule rec { --zsh <($out/bin/optinix completion zsh) ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Tool for searching options in Nix"; homepage = "https://gitlab.com/hmajid2301/optinix"; From 4ba2c1d45a06ad312fa39bbbd300adcd317ab9b9 Mon Sep 17 00:00:00 2001 From: Brian McGillion Date: Wed, 19 Feb 2025 08:30:54 +0400 Subject: [PATCH 1032/1107] optinix: add myself to maintainers Signed-off-by: Brian McGillion --- pkgs/by-name/op/optinix/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/op/optinix/package.nix b/pkgs/by-name/op/optinix/package.nix index 221b72130dae..044b190e4e20 100644 --- a/pkgs/by-name/op/optinix/package.nix +++ b/pkgs/by-name/op/optinix/package.nix @@ -38,7 +38,10 @@ buildGoModule rec { description = "Tool for searching options in Nix"; homepage = "https://gitlab.com/hmajid2301/optinix"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ hmajid2301 ]; + maintainers = with lib.maintainers; [ + hmajid2301 + brianmcgillion + ]; changelog = "https://gitlab.com/hmajid2301/optinix/-/releases/v${version}"; mainProgram = "optinix"; }; From 792713fb3faa9c54ef95fd6b255506944effd377 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 11:42:45 +0100 Subject: [PATCH 1033/1107] python312Packages.yaramod: 4.0.2 -> 4.3.0 Diff: https://github.com/avast/yaramod/compare/refs/tags/v4.0.2...v4.3.0 Changelog: https://github.com/avast/yaramod/blob/v4.3.0/CHANGELOG.md --- pkgs/development/python-modules/yaramod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yaramod/default.nix b/pkgs/development/python-modules/yaramod/default.nix index a40ce157c785..7012ed6ad906 100644 --- a/pkgs/development/python-modules/yaramod/default.nix +++ b/pkgs/development/python-modules/yaramod/default.nix @@ -21,14 +21,14 @@ let in buildPythonPackage rec { pname = "yaramod"; - version = "4.0.2"; + version = "4.3.0"; pyproject = true; src = fetchFromGitHub { owner = "avast"; repo = "yaramod"; tag = "v${version}"; - hash = "sha256-npEg6eJpxX4ZTS7KFRIBoVVk+JnA6vTqU7aD3zmnxk0="; + hash = "sha256-cgqVUBSDjT7xuCnSY76v8pAvA3W8tFu0fJZaFAF2caU="; }; postPatch = '' From b9c73c179b5f85494dc66c8423a857495c9a6a73 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 11:43:16 +0100 Subject: [PATCH 1034/1107] python312Packages.yfinance: 0.2.52 -> 0.2.54 Diff: https://github.com/ranaroussi/yfinance/compare/refs/tags/0.2.52...0.2.54 Changelog: https://github.com/ranaroussi/yfinance/blob/0.2.54/CHANGELOG.rst --- pkgs/development/python-modules/yfinance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index cae0692bd32f..9ae0e9d47450 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.2.52"; + version = "0.2.54"; pyproject = true; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = "yfinance"; tag = version; - hash = "sha256-bXscFrrsIz/mGqV00VqPN1URyJB7G/jH5bzcKWus44g="; + hash = "sha256-Jdp1X62cPalAHRGU4nsQEZGSicbZsZnYjW1idYX13tA="; }; build-system = [ setuptools ]; From ffed5a94967344a2aafb97782330a541d8a2a57c Mon Sep 17 00:00:00 2001 From: Ingo Reitz <9l@9lo.re> Date: Wed, 19 Feb 2025 11:37:51 +0100 Subject: [PATCH 1035/1107] breeze-icons: add qtsvg as a propagatedBuildInput --- pkgs/kde/frameworks/breeze-icons/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/kde/frameworks/breeze-icons/default.nix b/pkgs/kde/frameworks/breeze-icons/default.nix index e7c75aad85fb..e01f7f6b1896 100644 --- a/pkgs/kde/frameworks/breeze-icons/default.nix +++ b/pkgs/kde/frameworks/breeze-icons/default.nix @@ -2,6 +2,7 @@ mkKdeDerivation, python3, libxml2, + qtsvg, }: mkKdeDerivation { pname = "breeze-icons"; @@ -11,6 +12,11 @@ mkKdeDerivation { libxml2 ]; + # This package contains an SVG icon theme and an API forcing its use + extraPropagatedBuildInputs = [ + qtsvg + ]; + # lots of icons, takes forever, does absolutely nothing dontStrip = true; } From f4dce3bdabeb6139390ab1dbe447360dc8fbc227 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 10:59:43 +0000 Subject: [PATCH 1036/1107] errcheck: 1.8.0 -> 1.9.0 --- pkgs/by-name/er/errcheck/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/er/errcheck/package.nix b/pkgs/by-name/er/errcheck/package.nix index 7ec574b4b4ce..fd0a880cce74 100644 --- a/pkgs/by-name/er/errcheck/package.nix +++ b/pkgs/by-name/er/errcheck/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "errcheck"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "kisielk"; repo = "errcheck"; rev = "v${version}"; - hash = "sha256-KEDUXZ720fntrQ8XIpbArU8Q1xEiOw32nYcNhXnQO7Q="; + hash = "sha256-DhOoJL4InJHl4ImIrhV086a++srC5E4LF2VQb838+L8="; }; - vendorHash = "sha256-rO2FoFksN3OdKXwlJBuISs6FmCtepc4FDLdOa5AHvC4="; + vendorHash = "sha256-znkT0S13wCB47InP2QBCZqeWxDdEeIwQPoVWoxiAosQ="; subPackages = [ "." ]; From 6cce173f4a7c2278fb92ebabfea75a262d62a3c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 11:00:39 +0000 Subject: [PATCH 1037/1107] python312Packages.imap-tools: 1.9.1 -> 1.10.0 --- pkgs/development/python-modules/imap-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index 15c2c3031194..e71956c5835e 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "1.9.1"; + version = "1.10.0"; pyproject = true; src = fetchFromGitHub { owner = "ikvk"; repo = "imap_tools"; tag = "v${version}"; - hash = "sha256-tlShiI90PAbWztrL5PgmE1D+/h6bUoSxAHxwGlQHvus="; + hash = "sha256-lan12cHkoxCKadgyFey4ShcnwFg3Gl/VqKWlYAkvF3Y="; }; build-system = [ setuptools ]; From a56a3d7d3530b84b23bf49d6ae01fa3a722ae40d Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 19 Feb 2025 14:15:44 +0300 Subject: [PATCH 1038/1107] kdePackages.plasma-desktop: 6.3.1 -> 6.3.1.1 Includes the build fix upstream. --- pkgs/kde/generated/sources/plasma.json | 6 +- pkgs/kde/plasma/plasma-desktop/default.nix | 5 - .../kde/plasma/plasma-desktop/fix-build.patch | 107 ------------------ 3 files changed, 3 insertions(+), 115 deletions(-) delete mode 100644 pkgs/kde/plasma/plasma-desktop/fix-build.patch diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json index ce5a54b7fa28..fa0a9437ff7f 100644 --- a/pkgs/kde/generated/sources/plasma.json +++ b/pkgs/kde/generated/sources/plasma.json @@ -195,9 +195,9 @@ "hash": "sha256-kaSXmq4aChMZSLCz+JcIvREGsH59sPwdU708omjaYSc=" }, "plasma-desktop": { - "version": "6.3.1", - "url": "mirror://kde/stable/plasma/6.3.1/plasma-desktop-6.3.1.tar.xz", - "hash": "sha256-EZydNhJ0NnBIMghky6/8YSUwy6TqYtbf1QTz7+WyVKQ=" + "version": "6.3.1.1", + "url": "mirror://kde/stable/plasma/6.3.1/plasma-desktop-6.3.1.1.tar.xz", + "hash": "sha256-zgKHR9MeF2vem/RoA7LaVKy8Beu8/52cWFzALpsmrP0=" }, "plasma-dialer": { "version": "6.3.1", diff --git a/pkgs/kde/plasma/plasma-desktop/default.nix b/pkgs/kde/plasma/plasma-desktop/default.nix index 2a8e8df9d740..7933541b4501 100644 --- a/pkgs/kde/plasma/plasma-desktop/default.nix +++ b/pkgs/kde/plasma/plasma-desktop/default.nix @@ -43,11 +43,6 @@ mkKdeDerivation { (replaceVars ./wallpaper-paths.patch { wallpapers = "${lib.getBin breeze}/share/wallpapers"; }) - - # Fix build failure due to C++ template nonsense - # Submitted upstream: https://invent.kde.org/plasma/plasma-desktop/-/merge_requests/2833 - # FIXME: remove when merged - ./fix-build.patch ]; extraNativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/kde/plasma/plasma-desktop/fix-build.patch b/pkgs/kde/plasma/plasma-desktop/fix-build.patch deleted file mode 100644 index 9729ffb46bb5..000000000000 --- a/pkgs/kde/plasma/plasma-desktop/fix-build.patch +++ /dev/null @@ -1,107 +0,0 @@ -diff --git a/kcms/libkwindevices/inputdevice.cpp b/kcms/libkwindevices/inputdevice.cpp -index 9a437137077390a61152be96ac69b4f5e992d062..aea0952143a29a4b2bf06777f737a84cbd6e5b6d 100644 ---- a/kcms/libkwindevices/inputdevice.cpp -+++ b/kcms/libkwindevices/inputdevice.cpp -@@ -10,44 +10,6 @@ - - #include "logging.h" - --template --bool InputDevice::Prop::save() --{ -- if (!isSupported() || !m_value || m_prop.isConstant()) { -- qCDebug(LIBKWINDEVICES) << "skipping" << this << m_value.has_value() << isSupported() << m_prop.name(); -- return false; -- } -- -- auto iface = m_device->m_iface.get(); -- const bool ret = m_prop.write(iface, *m_value); -- if (ret) { -- m_configValue = *m_value; -- } -- return ret; --} -- --template --void InputDevice::Prop::set(T newVal) --{ -- if (!m_value) { -- value(); -- } -- -- Q_ASSERT(isSupported()); -- if (m_value != newVal) { -- m_value = newVal; -- if (m_changedSignalFunction) { -- (m_device->*m_changedSignalFunction)(); -- } -- } --} -- --template --bool InputDevice::Prop::changed() const --{ -- return m_value.has_value() && m_value.value() != m_configValue; --} -- - InputDevice::InputDevice(const QString &dbusName, QObject *parent) - : QObject(parent) - { -diff --git a/kcms/libkwindevices/inputdevice.h b/kcms/libkwindevices/inputdevice.h -index 93f9753cfae3c8795c5493566f7e51c806710983..f5589b095f39aa76071f67b8ee544a71585a479a 100644 ---- a/kcms/libkwindevices/inputdevice.h -+++ b/kcms/libkwindevices/inputdevice.h -@@ -269,12 +269,29 @@ private: - } - } - -- void set(T newVal); -+ void set(T newVal) { -+ if (!m_value) { -+ value(); -+ } -+ -+ Q_ASSERT(isSupported()); -+ if (m_value != newVal) { -+ m_value = newVal; -+ if (m_changedSignalFunction) { -+ (m_device->*m_changedSignalFunction)(); -+ } -+ } -+ } -+ - T defaultValue() const - { - return m_defaultValueFunction ? (m_device->m_iface.get()->*m_defaultValueFunction)() : T(); - } -- bool changed() const; -+ -+ bool changed() const { -+ return m_value.has_value() && m_value.value() != m_configValue; -+ } -+ - void set(const Prop &p) - { - set(p.value()); -@@ -286,7 +303,20 @@ private: - return !m_supportedFunction || (iface->*m_supportedFunction)(); - } - -- bool save(); -+ bool save() { -+ if (!isSupported() || !m_value || m_prop.isConstant()) { -+ qDebug() << "skipping" << this << m_value.has_value() << isSupported() << m_prop.name(); -+ return false; -+ } -+ -+ auto iface = m_device->m_iface.get(); -+ const bool ret = m_prop.write(iface, *m_value); -+ if (ret) { -+ m_configValue = *m_value; -+ } -+ return ret; -+ } -+ - bool isDefaults() const - { - return m_value == defaultValue(); From 4449897334d51a14053f658e3a5aeac9dea8b409 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 11:20:09 +0000 Subject: [PATCH 1039/1107] gitu: 0.28.0 -> 0.28.1 --- pkgs/by-name/gi/gitu/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gitu/package.nix b/pkgs/by-name/gi/gitu/package.nix index 7498d125383d..8c1a2cbdca6d 100644 --- a/pkgs/by-name/gi/gitu/package.nix +++ b/pkgs/by-name/gi/gitu/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "gitu"; - version = "0.28.0"; + version = "0.28.1"; src = fetchFromGitHub { owner = "altsem"; repo = "gitu"; rev = "v${version}"; - hash = "sha256-eG3ORk4nD8htdZpboEgcR4P94aKUX7eDHo6uTfSw2Zo="; + hash = "sha256-ukbCWdWJpdRtqF9VSIbky+DgpwdtBPt1JelWK42wHM8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-HiP4fE3rU8j7DZ+qNkrtohXgrljN0PPlg6aYj575L3Q="; + cargoHash = "sha256-DqUqs3G+v3I9phxf8ojogYELuskTt1amZT8U2oAuBlE="; nativeBuildInputs = [ pkg-config From b50420db3cb41dfee43bce1c737248471e4fd96d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 11:35:25 +0000 Subject: [PATCH 1040/1107] markuplinkchecker: 0.19.2 -> 0.21.0 --- pkgs/by-name/ma/markuplinkchecker/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/markuplinkchecker/package.nix b/pkgs/by-name/ma/markuplinkchecker/package.nix index 546d45221681..baabb4624d87 100644 --- a/pkgs/by-name/ma/markuplinkchecker/package.nix +++ b/pkgs/by-name/ma/markuplinkchecker/package.nix @@ -8,7 +8,7 @@ darwin, }: let - version = "0.19.2"; + version = "0.21.0"; in rustPlatform.buildRustPackage { pname = "markuplinkchecker"; @@ -18,11 +18,11 @@ rustPlatform.buildRustPackage { owner = "becheran"; repo = "mlc"; rev = "v${version}"; - hash = "sha256-NsGgUAe8CYAZhQMR/Jg+MGGKmL2ziFqK+MalrDSLcJQ="; + hash = "sha256-16ZGYUP7h6WmwjadLHqOQClejZ35LwavFgjs9x3NYVo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-4H5dsLOggB/KlDcZ/eCxZxreczkg5rXsGyCO9P+OLvw="; + cargoHash = "sha256-u60hjpQaF+EnWzMcM7T8UjcERF0+0ArltKcQXkEaxmc="; nativeBuildInputs = [ pkg-config ]; From 87124a75de0374be5182dd20144a8c448b03cd28 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Thu, 26 Dec 2024 12:26:04 +0100 Subject: [PATCH 1041/1107] nixos/mobilizon: restart mobilizon-postgresql service on-failure The motivation behind this is that sometimes postgresql signals readiness to systemd, even though it doesn't accept yet connections. --- nixos/modules/services/web-apps/mobilizon.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-apps/mobilizon.nix b/nixos/modules/services/web-apps/mobilizon.nix index c78f7104715d..539f64ba94c6 100644 --- a/nixos/modules/services/web-apps/mobilizon.nix +++ b/nixos/modules/services/web-apps/mobilizon.nix @@ -393,6 +393,7 @@ in serviceConfig = { Type = "oneshot"; User = config.services.postgresql.superUser; + Restart = "on-failure"; }; }; From 1241e0e5e32c7234516ca9ab79fdd3a7e9e32524 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 11:50:25 +0000 Subject: [PATCH 1042/1107] pinact: 1.2.0 -> 1.2.1 --- pkgs/by-name/pi/pinact/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/pinact/package.nix b/pkgs/by-name/pi/pinact/package.nix index f3eae241bfc9..bb16b0d35110 100644 --- a/pkgs/by-name/pi/pinact/package.nix +++ b/pkgs/by-name/pi/pinact/package.nix @@ -8,19 +8,19 @@ let pname = "pinact"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "suzuki-shunsuke"; repo = "pinact"; tag = "v${version}"; - hash = "sha256-OmWt4EyUHZyQDIj1Uro+bnC29MNi6wlXO2ksRP84F2U="; + hash = "sha256-WBKe398W9NXwZwiK6P5SDay45bFGkOf1+cmGlS+fWRc="; }; mainProgram = "pinact"; in buildGoModule { inherit pname version src; - vendorHash = "sha256-sZv91EYksNmMhWbT/5PUQTM2gND/8b4ORVfMNtlAI2A="; + vendorHash = "sha256-Ix7C+Xs8Y4LoI06Xb5qVGwoJ+J87wTjYjmQp6aAeFhw="; env.CGO_ENABLED = 0; From d8ec4aae752a36084924552176dafa157d54e4bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 11:54:47 +0000 Subject: [PATCH 1043/1107] crates-tui: 0.1.24 -> 0.1.25 --- pkgs/by-name/cr/crates-tui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cr/crates-tui/package.nix b/pkgs/by-name/cr/crates-tui/package.nix index 35d448d97937..8037259b6f85 100644 --- a/pkgs/by-name/cr/crates-tui/package.nix +++ b/pkgs/by-name/cr/crates-tui/package.nix @@ -8,7 +8,7 @@ nix-update-script, }: let - version = "0.1.24"; + version = "0.1.25"; in rustPlatform.buildRustPackage { pname = "crates-tui"; @@ -18,11 +18,11 @@ rustPlatform.buildRustPackage { owner = "ratatui"; repo = "crates-tui"; tag = "v${version}"; - hash = "sha256-yAMVl+3DP9NCjHc9X0qOd6zlJvaY3kcvnVBSS8JHtgU="; + hash = "sha256-XQ19hfaCm7Ib9gPqu9mlmf3b8HgoyxLuBApaPeW53pI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-/w3M5I9IOO2e37dnL8iE3LY5z1N07RkD3mMGJrswVMI="; + cargoHash = "sha256-cGpmiUtMP/rM+712Un8GEQ51gb12maopKn0o0GTQf7M="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; From f01af3a8b4ff6e346092ccae4f95ef51724a03c4 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Wed, 19 Feb 2025 12:47:31 +0100 Subject: [PATCH 1044/1107] mobilizon: 5.1.1 -> 5.1.2 Changelog: https://framagit.org/framasoft/mobilizon/-/releases/5.1.2 --- pkgs/servers/mobilizon/0001-fix-version.patch | 2 +- pkgs/servers/mobilizon/common.nix | 9 +++++---- pkgs/servers/mobilizon/default.nix | 8 +++++--- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/mobilizon/0001-fix-version.patch b/pkgs/servers/mobilizon/0001-fix-version.patch index da4d8f436a52..8bf6b2dcda86 100644 --- a/pkgs/servers/mobilizon/0001-fix-version.patch +++ b/pkgs/servers/mobilizon/0001-fix-version.patch @@ -7,7 +7,7 @@ index 8338abf8..883e6987 100644 use Mix.Project - @version "5.1.0" -+ @version "5.1.1" ++ @version "5.1.2" def project do [ diff --git a/pkgs/servers/mobilizon/common.nix b/pkgs/servers/mobilizon/common.nix index f6fa1a72cb76..1bf19e3245d4 100644 --- a/pkgs/servers/mobilizon/common.nix +++ b/pkgs/servers/mobilizon/common.nix @@ -1,13 +1,14 @@ -{ fetchFromGitLab }: rec { +{ fetchFromGitLab }: +rec { pname = "mobilizon"; - version = "5.1.1"; + version = "5.1.2"; src = fetchFromGitLab { domain = "framagit.org"; owner = "framasoft"; repo = pname; - rev = version; - sha256 = "sha256-zH/F+8rqzlMh0itVBOgDDzAx6n1nJH81lMzaBfjzhXU="; + tag = version; + sha256 = "sha256-5xHLk5/ogtRN3mfJPP1/gIVlALerT9KEUHjLA2Ou3aM="; }; } diff --git a/pkgs/servers/mobilizon/default.nix b/pkgs/servers/mobilizon/default.nix index f8ae27a81ece..390f9879bbff 100644 --- a/pkgs/servers/mobilizon/default.nix +++ b/pkgs/servers/mobilizon/default.nix @@ -8,6 +8,7 @@ git, cmake, nixosTests, + nixfmt-rfc-style, mobilizon-frontend, ... }: @@ -20,9 +21,8 @@ mixRelease rec { inherit (common) pname version src; patches = [ - # Version 5.1.1 failed to bump their internal package version, + # Version 5.1.2 failed to bump their internal package version, # which causes issues with static file serving in the NixOS module. - # See https://github.com/NixOS/nixpkgs/pull/370277 ./0001-fix-version.patch # Mobilizon uses chunked Transfer-Encoding for the media proxy but also # sets the Content-Length header. This is a HTTP/1.1 protocol violation @@ -153,11 +153,12 @@ mixRelease rec { ''; passthru = { - tests.smoke-test = nixosTests.mobilizon; + tests = { inherit (nixosTests) mobilizon; }; updateScript = writeShellScriptBin "update.sh" '' set -eou pipefail ${mix2nix}/bin/mix2nix '${src}/mix.lock' > pkgs/servers/mobilizon/mix.nix + ${nixfmt-rfc-style}/bin/nixfmt pkgs/servers/mobilizon/mix.nix ''; elixirPackage = beamPackages.elixir; }; @@ -165,6 +166,7 @@ mixRelease rec { meta = with lib; { description = "Mobilizon is an online tool to help manage your events, your profiles and your groups"; homepage = "https://joinmobilizon.org/"; + changelog = "https://framagit.org/framasoft/mobilizon/-/releases/${src.tag}"; license = licenses.agpl3Plus; maintainers = with maintainers; [ minijackson From a71d0cbd8d1af7bf727c21d2f7fbbdc3769e448e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 12:01:24 +0000 Subject: [PATCH 1045/1107] python312Packages.aiolifx-themes: 0.6.5 -> 0.6.7 --- pkgs/development/python-modules/aiolifx-themes/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix index 093e9c9d295d..39ff6f2d5686 100644 --- a/pkgs/development/python-modules/aiolifx-themes/default.nix +++ b/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiolifx-themes"; - version = "0.6.5"; + version = "0.6.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Djelibeybi"; repo = "aiolifx-themes"; tag = "v${version}"; - hash = "sha256-mqxqlfpxfR5IH3MbYsLhBE36qkM7MgnyXdR0dlMr+t8="; + hash = "sha256-Y0UJYxeYcKhDLcQOm/7vju9OD8f58oDPJ5l5Ep7Flcc="; }; build-system = [ poetry-core ]; @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Color themes for LIFX lights running on aiolifx"; homepage = "https://github.com/Djelibeybi/aiolifx-themes"; - changelog = "https://github.com/Djelibeybi/aiolifx-themes/releases/tag/v${version}"; + changelog = "https://github.com/Djelibeybi/aiolifx-themes/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ lukegb ]; }; From b109863c255f8c84ee3e3452400f4702bd20121c Mon Sep 17 00:00:00 2001 From: isabel Date: Thu, 13 Feb 2025 15:28:35 +0000 Subject: [PATCH 1046/1107] lib.strings: init toSentenceCase --- lib/default.nix | 2 +- lib/strings.nix | 36 ++++++++++++++++++++++++++++++++++++ lib/tests/misc.nix | 9 +++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/lib/default.nix b/lib/default.nix index f931524002f2..910a4aeb0770 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -109,7 +109,7 @@ let isStorePath isStringLike isValidPosixName toShellVar toShellVars trim trimWith escapeRegex escapeURL escapeXML replaceChars lowerChars - upperChars toLower toUpper addContextFrom splitString + upperChars toLower toUpper toSentenceCase addContextFrom splitString removePrefix removeSuffix versionOlder versionAtLeast getName getVersion match split cmakeOptionType cmakeBool cmakeFeature diff --git a/lib/strings.nix b/lib/strings.nix index 5ea86e0d7e07..bcaaab9af4fb 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -1424,6 +1424,42 @@ rec { */ toUpper = replaceStrings lowerChars upperChars; + /** + Converts the first character of a string `s` to upper-case. + + # Inputs + + `str` + : The string to convert to sentence case. + + # Type + + ``` + toSentenceCase :: string -> string + ``` + + # Examples + :::{.example} + ## `lib.strings.toSentenceCase` usage example + + ```nix + toSentenceCase "home" + => "Home" + ``` + + ::: + */ + toSentenceCase = str: + lib.throwIfNot (isString str) + "toSentenceCase does only accepts string values, but got ${typeOf str}" + ( + let + firstChar = substring 0 1 str; + rest = substring 1 (stringLength str) str; + in + addContextFrom str (toUpper firstChar + toLower rest) + ); + /** Appends string context from string like object `src` to `target`. diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 7618fd23383d..e886a2777b5b 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -678,6 +678,15 @@ runTests { ("%20%3F%26%3D%23%2B%25%21%3C%3E%23%22%7B%7D%7C%5C%5E%5B%5D%60%09%3A%2F%40%24%27%28%29%2A%2C%3B" == strings.escapeURL " ?&=#+%!<>#\"{}|\\^[]`\t:/@$'()*,;") ]; + testToSentenceCase = { + expr = strings.toSentenceCase "hello world"; + expected = "Hello world"; + }; + + testToSentenceCasePath = testingThrow ( + strings.toSentenceCase ./. + ); + testToInt = testAllTrue [ # Naive (123 == toInt "123") From dcd3f71dc763a695ba936ef1eec625a97f2e3539 Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 19 Feb 2025 13:24:47 +0100 Subject: [PATCH 1047/1107] imv: pin icu to 7.5 --- pkgs/by-name/im/imv/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/im/imv/package.nix b/pkgs/by-name/im/imv/package.nix index 775c82585cc4..45005c77bebb 100644 --- a/pkgs/by-name/im/imv/package.nix +++ b/pkgs/by-name/im/imv/package.nix @@ -9,7 +9,7 @@ meson, ninja, pkg-config, - icu, + icu75, pango, inih, withWindowSystem ? null, @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmocka - icu + icu75 libxkbcommon pango inih From d2a08c5e60bc5ffdbd97edaf58612a58c0bf03f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 12:46:59 +0000 Subject: [PATCH 1048/1107] rasm: 2.3.3 -> 2.3.4 --- pkgs/by-name/ra/rasm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/rasm/package.nix b/pkgs/by-name/ra/rasm/package.nix index 2c84af6b1509..31551db83407 100644 --- a/pkgs/by-name/ra/rasm/package.nix +++ b/pkgs/by-name/ra/rasm/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "rasm"; - version = "2.3.3"; + version = "2.3.4"; src = fetchFromGitHub { owner = "EdouardBERGE"; repo = "rasm"; rev = "v${version}"; - hash = "sha256-AV01XbjbF2pyIJ7lO/4mzWSREC2+aX4w5YJ8AI3GrqI="; + hash = "sha256-Yi4E8sgaQmUkQL7sxpbGDG6IPsL9RfMW2xXBCBhYXwg="; }; # by default the EXEC variable contains `rasm.exe` From 93da98f97bbeb14103c355d0b96c28f4924794dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 13:31:36 +0000 Subject: [PATCH 1049/1107] workshop-runner: 0.2.2 -> 0.2.3 --- pkgs/by-name/wo/workshop-runner/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wo/workshop-runner/package.nix b/pkgs/by-name/wo/workshop-runner/package.nix index 0723c1b2515c..ed44154c1f0f 100644 --- a/pkgs/by-name/wo/workshop-runner/package.nix +++ b/pkgs/by-name/wo/workshop-runner/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "workshop-runner"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "mainmatter"; repo = "rust-workshop-runner"; rev = "v${version}"; - hash = "sha256-8Qq3kXFR4z9k7I6b9hN1JKOGNkzydo/wA99/X17iSkk="; + hash = "sha256-PfQPRbOPK1Y/j8Xtg78oDzBFUx8eiM3ZwRul/ao0SgI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-lbmmmMDlQDf91D1ivpaJCo4Dw0eJ9QTzKBNuYieDwH8="; + cargoHash = "sha256-opV2IrqMIwdgrXY6V0jxFtrdP8NVmdlUdsLdfFNimt0="; meta = { description = "CLI tool to drive test-driven Rust workshops"; From 23cb8f2f6217ddd0742ebc4b652c1c7c0b5acfa3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 13:56:38 +0000 Subject: [PATCH 1050/1107] byedpi: 0.16.4 -> 0.16.6 --- pkgs/by-name/by/byedpi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/by/byedpi/package.nix b/pkgs/by-name/by/byedpi/package.nix index 65dc374819fc..226b402eb609 100644 --- a/pkgs/by-name/by/byedpi/package.nix +++ b/pkgs/by-name/by/byedpi/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "byedpi"; - version = "0.16.4"; + version = "0.16.6"; src = fetchFromGitHub { owner = "hufrea"; repo = "byedpi"; tag = "v${finalAttrs.version}"; - hash = "sha256-l9Clkdq4E8mgCQM4AsdDv6pB/3SBChp71P0yQKRtMSY="; + hash = "sha256-8iGmEfc/7ZLZmMdxuH6SjO1Wb/KuiLUJeYjrtnplalE="; }; installPhase = '' From 6efbf32d94b3c8018f782ae29365de89e110bcd6 Mon Sep 17 00:00:00 2001 From: emilylange Date: Wed, 19 Feb 2025 14:40:11 +0100 Subject: [PATCH 1051/1107] chromium,chromedriver: 133.0.6943.98 -> 133.0.6943.126 https://chromereleases.googleblog.com/2025/02/stable-channel-update-for-desktop_18.html This update includes 3 security fixes. CVEs: CVE-2025-0999 CVE-2025-1426 CVE-2025-1006 --- .../networking/browsers/chromium/info.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 93f5f1d7dd83..775b9f76932e 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,9 +1,9 @@ { "chromium": { - "version": "133.0.6943.98", + "version": "133.0.6943.126", "chromedriver": { - "hash_darwin": "sha256-OD/E+h4APHs8qBXdDyhBtZ42D3PvbBJHhbRXMxWY/34=", - "hash_darwin_aarch64": "sha256-H3JEby9RZPT2cCmuzOvc7n6+SOy1EMcH0v71g7Z1yio=" + "hash_darwin": "sha256-UeRQgrMG89DHywbvWUnjjlhkkyKR9eFE1i3ESPAElls=", + "hash_darwin_aarch64": "sha256-cpJOw+f+AybAtLu7w+g+Vojmjkl+r3sHzt4x6TjbBJI=" }, "deps": { "depot_tools": { @@ -19,8 +19,8 @@ "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "da53563ceb66412e2637507c8724bd0cab05e453", - "hash": "sha256-yltjJNXU+YQD/sFEa8+ZKqUJpVZ2Yi0YDx27bnekcng=", + "rev": "cffa127ce7b6be72885391527c15b452056a2e81", + "hash": "sha256-WOd3FsqaZlKEroWg763LQhQS5S1964vAoZWxstxGS3U=", "recompress": true }, "src/third_party/clang-format/script": { @@ -575,8 +575,8 @@ }, "src/third_party/pdfium": { "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "b57762c6c6ad261024f11fc724687593c03cce67", - "hash": "sha256-ksN/7volHAeQLJSFQMV/YOfkXyZ97GSawXp31uca4oc=" + "rev": "a6637ded97c46aa4879769b1a6b0f2128e6ea257", + "hash": "sha256-Y2quVCJS62YFwxBSB42Wg03QQ10M8C1GTrRvhr73IN8=" }, "src/third_party/perfetto": { "url": "https://android.googlesource.com/platform/external/perfetto.git", @@ -785,8 +785,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "79c3c1ab7faee8247b740b4ec660a998f2881633", - "hash": "sha256-fmd2mIjJs6l9zRTJ2bFIMQNnApFN3epeS+57TBlF/Uk=" + "rev": "4e04a09a1a0ef90841656e210e976bfc2a81ed57", + "hash": "sha256-XbeU9L2IRHMP5pTzM3MPW1L2PMHViNRP/6u/HcBq96M=" } } }, From 8472b6993805cb7200dac3f030152f23d15ab2d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 14:09:45 +0000 Subject: [PATCH 1052/1107] skypeforlinux: 8.136.0.202 -> 8.136.0.203 --- pkgs/by-name/sk/skypeforlinux/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sk/skypeforlinux/package.nix b/pkgs/by-name/sk/skypeforlinux/package.nix index 730fc685cfed..814316d21c03 100644 --- a/pkgs/by-name/sk/skypeforlinux/package.nix +++ b/pkgs/by-name/sk/skypeforlinux/package.nix @@ -42,8 +42,8 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.136.0.202"; - revision = "380"; + version = "8.136.0.203"; + revision = "382"; rpath = lib.makeLibraryPath [ @@ -103,7 +103,7 @@ let fetchurl { name = "skypeforlinux-${version}-${revision}.snap"; url = "https://api.snapcraft.io/api/v1/snaps/download/QRDEfjn4WJYnm0FzDKwqqRZZI77awQEV_${revision}.snap"; - hash = "sha512-dpPpA9/EeBKf2J48aKoDhYJlDdULirp17WI199MN38ceb/KhCUuen8KslH70cJpAlMgAPMYC7sRlgMKdS8wTdQ=="; + hash = "sha512-zEhgde/UdN5rm866uqPAouHrexDC/vxquFyfp5bLtWDUWhGhzTHQlo+Mnkicju1IaY3jGVh4u5fRZrg24/9PBw=="; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; From 1901e438504226005a807baed80cd0b1cddb69ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 14:12:00 +0000 Subject: [PATCH 1053/1107] rippkgs: 1.1.2 -> 1.2.0 --- pkgs/by-name/ri/rippkgs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ri/rippkgs/package.nix b/pkgs/by-name/ri/rippkgs/package.nix index 33055ab193c1..dc40f4a09d6a 100644 --- a/pkgs/by-name/ri/rippkgs/package.nix +++ b/pkgs/by-name/ri/rippkgs/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "rippkgs"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = "replit"; repo = "rippkgs"; tag = "v${version}"; - hash = "sha256-CQGmTXzAj3wA7UTwdeL7gujbT4duS8QE5yZzGKwvzog="; + hash = "sha256-nRaGbJg1zCHTL8y/Tk5dM1dSu2v06ECsZYyMPIQTlvg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-RW7FBg5aLaNVFDEM4IvpS5gnb2luqWH2ya/7gKKOp4A="; + cargoHash = "sha256-bSgQ/dmOffWOYpgeNn0vTdzrM/aFkD3znN9c1u/sjQ0="; nativeBuildInputs = [ pkg-config From 310cfc1193d51b69ca6c51c823cd0876b12366ec Mon Sep 17 00:00:00 2001 From: Fernando Ayats Date: Wed, 19 Feb 2025 15:14:57 +0100 Subject: [PATCH 1054/1107] aichat: 0.27.0 -> 0.28.0 --- pkgs/by-name/ai/aichat/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ai/aichat/package.nix b/pkgs/by-name/ai/aichat/package.nix index a1d7adc32900..63b99c08d560 100644 --- a/pkgs/by-name/ai/aichat/package.nix +++ b/pkgs/by-name/ai/aichat/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "aichat"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "sigoden"; repo = "aichat"; tag = "v${version}"; - hash = "sha256-rKvnbauJpyZnJuLtGSjJKwe9wy/y/KLPyorH5u9t0H8="; + hash = "sha256-gs2nkZhz26tmFbAShLsFOgYt/RlPiqKTmdaPSG96m3E="; }; useFetchCargoVendor = true; - cargoHash = "sha256-WtEV+JkSaegshF8VB/OfuvnnKX5hDshCC/v5B2McA6M="; + cargoHash = "sha256-cDYxT8WvryTLzBeMtp/iObdSfF84W1XT8ZN/nmoZfFY="; nativeBuildInputs = [ pkg-config From 502d6431d065d0920d26cc642a45f68c7c6f2148 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 14:20:48 +0000 Subject: [PATCH 1055/1107] xeol: 0.10.4 -> 0.10.7 --- pkgs/by-name/xe/xeol/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xe/xeol/package.nix b/pkgs/by-name/xe/xeol/package.nix index 086b30c9c6d9..eb66888eb3a6 100644 --- a/pkgs/by-name/xe/xeol/package.nix +++ b/pkgs/by-name/xe/xeol/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "xeol"; - version = "0.10.4"; + version = "0.10.7"; src = fetchFromGitHub { owner = "xeol-io"; repo = "xeol"; tag = "v${version}"; - hash = "sha256-zm8PIYWFLEiWuZGt5Fev35d8EYOfzduIXX6SmJZ27o0="; + hash = "sha256-I7+gR4y0wVpQeDoRH2OYr38PGuyZ/lk5M3bX0VeAqfQ="; }; vendorHash = "sha256-hPWjXTxk/jRkzvLYNgVlgj0hjzfikwel1bxSqWquVhk="; From 121d14ed5cff0ad0570d81bb9771ce378cfdd9cf Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Wed, 19 Feb 2025 15:22:25 +0100 Subject: [PATCH 1056/1107] gitea: 1.23.3 -> 1.23.4 --- pkgs/by-name/gi/gitea/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix index 9ec714fabbab..3da303afab20 100644 --- a/pkgs/by-name/gi/gitea/package.nix +++ b/pkgs/by-name/gi/gitea/package.nix @@ -35,13 +35,13 @@ let in buildGoModule rec { pname = "gitea"; - version = "1.23.3"; + version = "1.23.4"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; tag = "v${gitea.version}"; - hash = "sha256-XVaNqnvTbB3d6ksyEzHOqrKhtzU4YLSpBs8RrqG1/hw="; + hash = "sha256-gcz3R3AcOOujpI++oF8MBGGnCjDbl5mXuvGpVNHS92g="; }; proxyVendor = true; From f709c8ec639c963fc314851107903df1e8794398 Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Wed, 19 Feb 2025 11:18:52 +0100 Subject: [PATCH 1057/1107] audiothekar: init at 1.0.1 --- pkgs/by-name/au/audiothekar/deps.json | 57 +++++++++++++++++++++++++ pkgs/by-name/au/audiothekar/package.nix | 56 ++++++++++++++++++++++++ pkgs/by-name/au/audiothekar/update.sh | 18 ++++++++ 3 files changed, 131 insertions(+) create mode 100644 pkgs/by-name/au/audiothekar/deps.json create mode 100644 pkgs/by-name/au/audiothekar/package.nix create mode 100755 pkgs/by-name/au/audiothekar/update.sh diff --git a/pkgs/by-name/au/audiothekar/deps.json b/pkgs/by-name/au/audiothekar/deps.json new file mode 100644 index 000000000000..69596e3ba375 --- /dev/null +++ b/pkgs/by-name/au/audiothekar/deps.json @@ -0,0 +1,57 @@ +[ + { + "pname": "GraphQL", + "version": "7.8.0", + "hash": "sha256-/wyyrDN/0FFoHF1abjUGccEFAYsH5sj3QnPXsKPbqsI=" + }, + { + "pname": "GraphQL-Parser", + "version": "8.4.2", + "hash": "sha256-wcXfsK4sQENAj3oRX9+5GlSAtyqA94l8Y5pSnyLCYHM=" + }, + { + "pname": "GraphQL.Analyzers", + "version": "7.8.0", + "hash": "sha256-6O9A1dBIbUzUNXdQT1hv0x9QnpYCFFmGL6r3LCkAjbg=" + }, + { + "pname": "GraphQL.Client", + "version": "6.1.0", + "hash": "sha256-snZ/7uvNQUwy1+p6X3m558Tl50J8W1C+HX5AA28gIv4=" + }, + { + "pname": "GraphQL.Client.Abstractions", + "version": "6.1.0", + "hash": "sha256-qRiGaJbKcCXY/78TTT38x02ljmWoIx82xG4ZZGbWqSU=" + }, + { + "pname": "GraphQL.Client.Abstractions.Websocket", + "version": "6.1.0", + "hash": "sha256-EmPuIS+gAwmsoh0EkQ3mO8tQACuxza6W4xR3DWiMyhw=" + }, + { + "pname": "GraphQL.Client.Serializer.SystemTextJson", + "version": "6.1.0", + "hash": "sha256-5U29jAhTkbsLQsZeSonSRFZzoVp9dmE7IoCVnr3TLT8=" + }, + { + "pname": "GraphQL.Primitives", + "version": "6.1.0", + "hash": "sha256-giNMmftzJu5LChFNU8Xqm6+q6l4vtXIEVF9LBKThBuI=" + }, + { + "pname": "GraphQL.SystemTextJson", + "version": "7.8.0", + "hash": "sha256-1/AjzAbg1jCYm0lTf20rVURMjm+m0ODeFkqdWqbH3aI=" + }, + { + "pname": "Spectre.Console", + "version": "0.49.1", + "hash": "sha256-tqSVojyuQjuB34lXo759NOcyLgNIw815mKXJPq5JFDo=" + }, + { + "pname": "System.Reactive", + "version": "6.0.0", + "hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y=" + } +] diff --git a/pkgs/by-name/au/audiothekar/package.nix b/pkgs/by-name/au/audiothekar/package.nix new file mode 100644 index 000000000000..c39867f7a575 --- /dev/null +++ b/pkgs/by-name/au/audiothekar/package.nix @@ -0,0 +1,56 @@ +{ + lib, + fetchFromGitHub, + buildDotnetModule, + dotnetCorePackages, + audiothekar, + testers, +}: + +buildDotnetModule rec { + pname = "audiothekar"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "fxsth"; + repo = "audiothekar"; + tag = "v${version}"; + sha256 = "sha256-DZ4E8numXJdkvX5WYM6cioW5J89YuD9Hi8NfK+Z39cY="; + }; + + projectFile = "Audiothekar.sln"; + + doCheck = false; + + nugetDeps = ./deps.json; + + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; + + postInstall = '' + install -m 644 -D -t "$out/share/doc/${pname}" License.md + ''; + + passthru = { + updateScript = ./update.sh; + tests.version = testers.testVersion { + package = audiothekar; + command = "audiothekar-cli --version"; + }; + }; + + meta = with lib; { + description = "Download-Client für die ARD-Audiothek"; + longDescription = '' + Audiothekar is a command line client to browse and download programs from + German public broadcast online offering at https://www.ardaudiothek.de/. + ''; + homepage = "https://github.com/fxsth/Audiothekar"; + license = licenses.mit; + maintainers = with maintainers; [ + wamserma + ]; + platforms = [ "x86_64-linux" ]; # needs some work to enable dotnet-sdk.meta.platforms; + mainProgram = "audiothekar-cli"; + }; +} diff --git a/pkgs/by-name/au/audiothekar/update.sh b/pkgs/by-name/au/audiothekar/update.sh new file mode 100755 index 000000000000..f21ef010d03f --- /dev/null +++ b/pkgs/by-name/au/audiothekar/update.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts +#shellcheck shell=bash + +set -eu -o pipefail + +version=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + https://api.github.com/repos/fxsth/audiothekar/releases/latest | jq -e -r .tag_name | tail -c +2) +old_version=$(nix-instantiate --eval -A audiothekar.version | jq -e -r) + +if [[ $version == "$old_version" ]]; then + echo "New version same as old version, nothing to do." >&2 + exit 0 +fi + +update-source-version audiothekar "$version" + +$(nix-build -A audiothekar.fetch-deps --no-out-link) From 6fd7d0fcc9d810a09b15f1233fec8d587e45ee29 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 15:08:23 +0000 Subject: [PATCH 1058/1107] python312Packages.geoalchemy2: 0.17.0 -> 0.17.1 --- pkgs/development/python-modules/geoalchemy2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index fe6dc53da4c8..df1ed39d0dff 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "geoalchemy2"; - version = "0.17.0"; + version = "0.17.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "geoalchemy"; repo = "geoalchemy2"; tag = version; - hash = "sha256-MxoX5WGJATIvzfeuHFqYGlnaxPNzvqD/v82Zm4Iav1g="; + hash = "sha256-ze0AWwlmBsMUhbmaCNUeEwhFcLxRDeal0IDO421++ck="; }; build-system = [ @@ -66,7 +66,7 @@ buildPythonPackage rec { meta = with lib; { description = "Toolkit for working with spatial databases"; homepage = "https://geoalchemy-2.readthedocs.io/"; - changelog = "https://github.com/geoalchemy/geoalchemy2/releases/tag/${version}"; + changelog = "https://github.com/geoalchemy/geoalchemy2/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ nickcao ]; }; From 45b7d954deeea5df915c07e80c2963d2afa2db08 Mon Sep 17 00:00:00 2001 From: Brian McGillion Date: Wed, 19 Feb 2025 19:13:32 +0400 Subject: [PATCH 1059/1107] surrealdb: fix build Fixes: #383379 Signed-off-by: Brian McGillion --- pkgs/by-name/su/surrealdb/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix index e9e40d9c0922..b18bfec4f9b7 100644 --- a/pkgs/by-name/su/surrealdb/package.nix +++ b/pkgs/by-name/su/surrealdb/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { }; useFetchCargoVendor = true; - cargoHash = "sha256-OXcQsDCiT3seMQhyKEKfC8pcd4MXwbql5+ZDGGkhPMI="; + cargoHash = "sha256-Y2KtlFmN/Lp33GEe3RP4zFzmld3vYnKA6T4+YIgbFBE="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' From 0034d8f393259017124b9f74b12702b1bc9e45bc Mon Sep 17 00:00:00 2001 From: mattkang <2027430+mattkang@users.noreply.github.com> Date: Tue, 18 Feb 2025 23:47:31 -0500 Subject: [PATCH 1060/1107] python312Packages.mdformat-wikilink: init at 0.2.0 --- .../mdformat-wikilink/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 1 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/mdformat-wikilink/default.nix diff --git a/pkgs/development/python-modules/mdformat-wikilink/default.nix b/pkgs/development/python-modules/mdformat-wikilink/default.nix new file mode 100644 index 000000000000..0c3c119a632b --- /dev/null +++ b/pkgs/development/python-modules/mdformat-wikilink/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + markdown-it-py, + mdformat, + pytestCheckHook, + pytest-cov-stub, +}: + +buildPythonPackage rec { + pname = "mdformat-wikilink"; + version = "0.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tmr232"; + repo = "mdformat-wikilink"; + tag = "v${version}"; + hash = "sha256-KOPh9iZfb3GCvslQeYBgqNaOyqtWi2llkaiWE7nmcJo="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + markdown-it-py + mdformat + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; + + pythonImportsCheck = [ "mdformat_wikilink" ]; + + meta = { + description = "Mdformat plugin for ensuring that wiki-style links are preserved during formatting"; + homepage = "https://github.com/tmr232/mdformat-wikilink"; + changelog = "https://github.com/tmr232/mdformat-wikilink/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mattkang ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c4cc55a5389..b94d2dcd005b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7517,6 +7517,7 @@ self: super: with self; { mdformat-simple-breaks = callPackage ../development/python-modules/mdformat-simple-breaks { }; mdformat-tables = callPackage ../development/python-modules/mdformat-tables { }; mdformat-toc = callPackage ../development/python-modules/mdformat-toc { }; + mdformat-wikilink = callPackage ../development/python-modules/mdformat-wikilink { }; mdit-py-plugins = callPackage ../development/python-modules/mdit-py-plugins { }; From b601637a74c84eb4ffa6f5495da4dbba7982cd93 Mon Sep 17 00:00:00 2001 From: Nadir Ishiguro <23151917+nadir-ishiguro@users.noreply.github.com> Date: Wed, 19 Feb 2025 16:19:04 +0100 Subject: [PATCH 1061/1107] pcloud: 1.14.9 -> 1.14.10 --- pkgs/by-name/pc/pcloud/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pc/pcloud/package.nix b/pkgs/by-name/pc/pcloud/package.nix index a418ac534d51..351a2e6af053 100644 --- a/pkgs/by-name/pc/pcloud/package.nix +++ b/pkgs/by-name/pc/pcloud/package.nix @@ -39,13 +39,13 @@ let pname = "pcloud"; - version = "1.14.9"; - code = "XZjcLF5ZnbPpMxAlI5FuU39vntbjAhMhVEVV"; + version = "1.14.10"; + code = "XZLHKH5Z2KieO7jdb34LVHFY8okPD8bpqXM7"; # Archive link's codes: https://www.pcloud.com/release-notes/linux.html src = fetchzip { url = "https://api.pcloud.com/getpubzip?code=${code}&filename=pcloud-${version}.zip"; - hash = "sha256-9YgXF2oAbIN8k33wveCPnc4fU3mYv1RB2/jeHmbockY="; + hash = "sha256-yIsUScXGmIoZc1Mawq/SVrpJWMYFn1G/ovukLWMYVa8="; }; appimageContents = appimageTools.extractType2 { From f0d609cff8d2f3242e25798d216d8e9d22218bbf Mon Sep 17 00:00:00 2001 From: Dillon Beliveau Date: Wed, 19 Feb 2025 07:31:44 -0800 Subject: [PATCH 1062/1107] bicep: fix building on arm64-linux and x86_64-darwin by downgrading Grpc.Tools (#383277) --- ...pc.Tools-from-2.68.1-to-2.69.0-16097.patch | 33 +++++++++++++++++++ pkgs/by-name/bi/bicep/deps.json | 4 +-- pkgs/by-name/bi/bicep/package.nix | 4 +++ 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/bi/bicep/0001-Revert-Bump-Grpc.Tools-from-2.68.1-to-2.69.0-16097.patch diff --git a/pkgs/by-name/bi/bicep/0001-Revert-Bump-Grpc.Tools-from-2.68.1-to-2.69.0-16097.patch b/pkgs/by-name/bi/bicep/0001-Revert-Bump-Grpc.Tools-from-2.68.1-to-2.69.0-16097.patch new file mode 100644 index 000000000000..4a454d0e7dc9 --- /dev/null +++ b/pkgs/by-name/bi/bicep/0001-Revert-Bump-Grpc.Tools-from-2.68.1-to-2.69.0-16097.patch @@ -0,0 +1,33 @@ +diff --git a/src/Bicep.Local.Extension/Bicep.Local.Extension.csproj b/src/Bicep.Local.Extension/Bicep.Local.Extension.csproj +index e02412540..7e0fb5e90 100644 +--- a/src/Bicep.Local.Extension/Bicep.Local.Extension.csproj ++++ b/src/Bicep.Local.Extension/Bicep.Local.Extension.csproj +@@ -17,7 +17,7 @@ + + + +- ++ + all + runtime; build; native; contentfiles; analyzers; buildtransitive + +diff --git a/src/Bicep.Local.Extension/packages.lock.json b/src/Bicep.Local.Extension/packages.lock.json +index e7297d0af..c262f0849 100644 +--- a/src/Bicep.Local.Extension/packages.lock.json ++++ b/src/Bicep.Local.Extension/packages.lock.json +@@ -32,9 +32,9 @@ + }, + "Grpc.Tools": { + "type": "Direct", +- "requested": "[2.69.0, )", +- "resolved": "2.69.0", +- "contentHash": "W5hW4R1h19FCzKb8ToqIJMI5YxnQqGmREEpV8E5XkfCtLPIK5MSHztwQ8gZUfG8qu9fg5MhItjzyPRqQBjnrbA==" ++ "requested": "[2.68.1, )", ++ "resolved": "2.68.1", ++ "contentHash": "BZ96s7ijKAhJoRpIK+pqCeLaGaSwyc5/CAZFwgCcBuAnkU2naYvH0P6qnYCkl0pWDY/JBOnE2RvX9IvRX1Yc5Q==" + }, + "Microsoft.CodeAnalysis.BannedApiAnalyzers": { + "type": "Direct", +-- +2.47.2 + diff --git a/pkgs/by-name/bi/bicep/deps.json b/pkgs/by-name/bi/bicep/deps.json index 47e0375287cb..7568382f7db2 100644 --- a/pkgs/by-name/bi/bicep/deps.json +++ b/pkgs/by-name/bi/bicep/deps.json @@ -156,8 +156,8 @@ }, { "pname": "Grpc.Tools", - "version": "2.69.0", - "hash": "sha256-3nye4UcU2J7tnruKhoacD0S+fPN6d0A34K1yxlYrfxI=" + "version": "2.68.1", + "hash": "sha256-sbJWCrzK2UAcHdWw/wRY+hmwcqoTc02+fYsFHG6tiFY=" }, { "pname": "Humanizer.Core", diff --git a/pkgs/by-name/bi/bicep/package.nix b/pkgs/by-name/bi/bicep/package.nix index 6a35c139b3c4..473b9f75e5ad 100644 --- a/pkgs/by-name/bi/bicep/package.nix +++ b/pkgs/by-name/bi/bicep/package.nix @@ -19,6 +19,10 @@ buildDotnetModule rec { hash = "sha256-5XrFIgblr2WIMBPoVwRZ6X2dokbXw+nS8J7WzhHEzpU="; }; + patches = [ + ./0001-Revert-Bump-Grpc.Tools-from-2.68.1-to-2.69.0-16097.patch + ]; + postPatch = '' substituteInPlace src/Directory.Build.props --replace-fail "true" "" # Upstream uses rollForward = disable, which pins to an *exact* .NET SDK version. From 80825e284a21a9e7f663dacd1755bbb2adfbde40 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 20 Feb 2025 00:41:37 +0900 Subject: [PATCH 1063/1107] jsonschema-cli: init at 0.29.0 (#382774) Co-authored-by: Tert0 --- pkgs/by-name/js/jsonschema-cli/package.nix | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/js/jsonschema-cli/package.nix diff --git a/pkgs/by-name/js/jsonschema-cli/package.nix b/pkgs/by-name/js/jsonschema-cli/package.nix new file mode 100644 index 000000000000..c5752dc7f37d --- /dev/null +++ b/pkgs/by-name/js/jsonschema-cli/package.nix @@ -0,0 +1,40 @@ +{ + lib, + fetchCrate, + rustPlatform, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "jsonschema-cli"; + version = "0.29.0"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-kpdvvCnMsHfogXmAqNeo1Cl1hZtCPHqkfhYm8ipWToo="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-Yti1KKJDRXMhDo84/ymZk2AkWp9HtU2LW2h63gfzIGY="; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; + versionCheckProgramArg = [ "--version" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Fast command-line tool for JSON Schema validation"; + homepage = "https://github.com/Stranger6667/jsonschema"; + changelog = "https://github.com/Stranger6667/jsonschema/releases/tag/rust-v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + kachick + ]; + mainProgram = "jsonschema-cli"; + }; +} From 374e00a6c07e087f334c3bd45ccf221112e2e444 Mon Sep 17 00:00:00 2001 From: Nicky Mouha Date: Wed, 19 Feb 2025 10:44:20 -0500 Subject: [PATCH 1064/1107] john: fix broken symlinks (#381628) --- pkgs/by-name/jo/john/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/jo/john/package.nix b/pkgs/by-name/jo/john/package.nix index 7fb41a69d582..305bb32f1696 100644 --- a/pkgs/by-name/jo/john/package.nix +++ b/pkgs/by-name/jo/john/package.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { cp -vt "$out/etc/john" ../run/*.conf cp -vt "$out/share/john" ../run/*.chr ../run/password.lst cp -vt "$out/share/john/rules" ../run/rules/*.rule - cp -vrt "$out/share/doc/john" ../doc/* + cp -vLrt "$out/share/doc/john" ../doc/* cp -vt "$out/${perlPackages.perl.libPrefix}" ../run/lib/* ''; From 1796d201600921eeeaa14626486d15fec34e046f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 19 Feb 2025 15:59:38 +0100 Subject: [PATCH 1065/1107] esphome: 2024.12.4 -> 2025.2.0 https://github.com/esphome/esphome/releases/tag/2025.2.0 --- pkgs/tools/misc/esphome/dashboard.nix | 6 +++--- pkgs/tools/misc/esphome/default.nix | 12 +++++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix index 8cc6f8faa9f4..4c059307e757 100644 --- a/pkgs/tools/misc/esphome/dashboard.nix +++ b/pkgs/tools/misc/esphome/dashboard.nix @@ -13,19 +13,19 @@ buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20241217.1"; + version = "20250212.0"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "dashboard"; rev = "refs/tags/${version}"; - hash = "sha256-Mirihvts8G2D4e5Jn7S0dWEJ+sOHZ+fvzsNaLpAOyMA="; + hash = "sha256-9yXG9jwB284xTM6L3HWQCRD9Ki1F8yHaEl1vDNDxogw="; }; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-fWQvDMeuRjyToHhhZH1KtLWuhgAvq900cCja2dvLQyU="; + hash = "sha256-B0Lx4aH+7NVSMY9qUUOiVeLgIL5wI3JolC9eLzjbRRA="; }; build-system = [ setuptools ]; diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 45a2367e42ed..121ec50a0ad7 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -22,14 +22,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2024.12.4"; + version = "2025.2.0"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; tag = version; - hash = "sha256-Ff3NuLHKRLoBbjqb92vvDcSbSJnjCwm5FmSDwnEI0p4="; + hash = "sha256-V9nDDgRgMOko271lQ3D3BQIMtZmFnUhAuFavyPFufEM="; }; build-systems = with python.pkgs; [ @@ -72,9 +72,9 @@ python.pkgs.buildPythonApplication rec { colorama cryptography esphome-dashboard + esphome-glyphsets freetype-py icmplib - glyphsets kconfiglib packaging paho-mqtt @@ -125,6 +125,12 @@ python.pkgs.buildPythonApplication rec { pytestCheckHook ]; + disabledTests = [ + # race condition, also visible in upstream tests + # tests/dashboard/test_web_server.py:78: IndexError + "test_devices_page" + ]; + postCheck = '' $out/bin/esphome --help > /dev/null ''; From 25063132eeb1770b9016088e2647347687dd5304 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 19 Feb 2025 16:05:38 +0100 Subject: [PATCH 1066/1107] python313Packages.aioesphomeapi: 29.1.0 -> 29.1.1 https://github.com/esphome/aioesphomeapi/releases/tag/v29.1.1 --- .../python-modules/aioesphomeapi/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index c6f618b22e88..8aaccf7b594b 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "29.1.0"; + version = "29.1.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "esphome"; repo = "aioesphomeapi"; tag = "v${version}"; - hash = "sha256-/4/FNb6lGlitsAzO0OadWqP02Wx+mnlrA6yzXFm72sg="; + hash = "sha256-umCjsBn0lS94SArvXXGuOfJ1oXmcVLOlrC35Crik9pA="; }; build-system = [ @@ -61,16 +61,13 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # https://github.com/esphome/aioesphomeapi/pull/1081 - "test_request_while_handshaking" - ]; - disabledTestPaths = [ # benchmarking requires pytest-codespeed "tests/benchmarks" ]; + __darwinAllowLocalNetworking = true; + pythonImportsCheck = [ "aioesphomeapi" ]; meta = with lib; { From 9010d1b5343fa9da7853282ee35a12dd447fa443 Mon Sep 17 00:00:00 2001 From: Auguste Baum Date: Wed, 19 Feb 2025 16:37:34 +0100 Subject: [PATCH 1067/1107] serpl: add ast-grep feature This makes it possible to use serpl in "ast-grep" mode. --- pkgs/by-name/se/serpl/package.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/se/serpl/package.nix b/pkgs/by-name/se/serpl/package.nix index 8a21f6d78432..ef54917a760d 100644 --- a/pkgs/by-name/se/serpl/package.nix +++ b/pkgs/by-name/se/serpl/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, gitUpdater, makeWrapper, + ast-grep, ripgrep, }: let @@ -19,6 +20,8 @@ rustPlatform.buildRustPackage { hash = "sha256-koD5aFqL+XVxc5Iq3reTYIHiPm0z7hAQ4K59IfbY4Hg="; }; + buildFeatures = [ "ast_grep" ]; + nativeBuildInputs = [ makeWrapper ]; cargoHash = "sha256-8XYEZQfoizVmOuh0hymzMj2UDiXNkSeHqBAWOqaMY84="; @@ -26,7 +29,12 @@ rustPlatform.buildRustPackage { postFixup = '' # Serpl needs ripgrep to function properly. wrapProgram $out/bin/serpl \ - --prefix PATH : "${lib.strings.makeBinPath [ ripgrep ]}" + --prefix PATH : "${ + lib.strings.makeBinPath [ + ripgrep + ast-grep + ] + }" ''; passthru.updateScript = gitUpdater { }; From d560acb2cd29ef054dd13f3c522851f843bed343 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 15:56:27 +0000 Subject: [PATCH 1068/1107] fritz-exporter: 2.5.1 -> 2.5.2 --- pkgs/by-name/fr/fritz-exporter/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fr/fritz-exporter/package.nix b/pkgs/by-name/fr/fritz-exporter/package.nix index cd0d327c8dc7..7c18ee1f1932 100644 --- a/pkgs/by-name/fr/fritz-exporter/package.nix +++ b/pkgs/by-name/fr/fritz-exporter/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "fritz-exporter"; - version = "2.5.1"; + version = "2.5.2"; pyproject = true; src = fetchFromGitHub { owner = "pdreker"; repo = "fritz_exporter"; tag = "fritzexporter-v${version}"; - hash = "sha256-qqvvoOQRFNl9IUjaBc/qzg9AevT5c2JDsfDVAZW6d6E="; + hash = "sha256-xQLTI6b8X22aU6dj7Tmkzxn7vE4y8r/djUetG3Qg9Qw="; }; postPatch = '' @@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec { ]; meta = { - changelog = "https://github.com/pdreker/fritz_exporter/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/pdreker/fritz_exporter/blob/${src.tag}/CHANGELOG.md"; description = "Prometheus exporter for Fritz!Box home routers"; homepage = "https://github.com/pdreker/fritz_exporter"; license = lib.licenses.asl20; From c47719a799e06bfbaf2158e634a52f033b406657 Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Wed, 19 Feb 2025 17:25:39 +0100 Subject: [PATCH 1069/1107] nixos/profiles/hardened: don't enable by default --- nixos/modules/profiles/hardened.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index dc3bf597cd4b..f9526b91222c 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -22,10 +22,7 @@ let ; in { - options.profiles.hardened = mkEnableOption "hardened" // { - default = true; - example = false; - }; + options.profiles.hardened = mkEnableOption "hardened"; config = mkIf config.profiles.hardened { meta = { maintainers = [ From 27b8f7af1299c3ab169e48a22bbac501b166fa7b Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 19 Feb 2025 19:32:09 +0300 Subject: [PATCH 1070/1107] Revert "nixos/profiles/hardened: add to module list" --- nixos/modules/module-list.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 86622e544705..14aed8fdb3af 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -145,7 +145,6 @@ ./misc/passthru.nix ./misc/version.nix ./misc/wordlist.nix - ./profiles/hardened.nix ./programs/_1password-gui.nix ./programs/_1password.nix ./programs/adb.nix From 1fb04b5d472712431392e5f8317600c90de41958 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Wed, 19 Feb 2025 11:33:58 -0500 Subject: [PATCH 1071/1107] zed-editor: 0.173.11 -> 0.174.4 --- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 818afbe97867..f4dba881b345 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -96,7 +96,7 @@ let in rustPlatform.buildRustPackage rec { pname = "zed-editor"; - version = "0.173.11"; + version = "0.174.4"; outputs = [ "out" ] ++ lib.optional buildRemoteServer "remote_server"; @@ -104,7 +104,7 @@ rustPlatform.buildRustPackage rec { owner = "zed-industries"; repo = "zed"; tag = "v${version}"; - hash = "sha256-iHojGnVW8cNRVwHghDAymPrznFYWaC4n/WfjRYGsHtw="; + hash = "sha256-Nvd4SvjnuyepYY/B8s7gafp3ZlOheOFqnIwncoq2Dhg="; }; patches = [ @@ -124,7 +124,7 @@ rustPlatform.buildRustPackage rec { ''; useFetchCargoVendor = true; - cargoHash = "sha256-Gen/WJUoYgGYDYS1hW563dQc8zDMMQnvF0Mk49TNWJo="; + cargoHash = "sha256-9rnnYf0bJr0BzBXL3sI5yRnCMKgWMfbvvRdbyaqZVi0="; nativeBuildInputs = [ From b964d0d6686bcc131a942da65daa757c286eb521 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 19 Feb 2025 19:53:15 +0300 Subject: [PATCH 1072/1107] Revert "nixos/profiles/hardened: don't enable by default" --- nixos/modules/profiles/hardened.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index f9526b91222c..dc3bf597cd4b 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -22,7 +22,10 @@ let ; in { - options.profiles.hardened = mkEnableOption "hardened"; + options.profiles.hardened = mkEnableOption "hardened" // { + default = true; + example = false; + }; config = mkIf config.profiles.hardened { meta = { maintainers = [ From ad53fe242b304b70f85ec168b62efde507755537 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 19 Feb 2025 18:06:00 +0100 Subject: [PATCH 1073/1107] typst: 0.12.0 -> 0.13.0 Diff: https://github.com/typst/typst/compare/refs/tags/v0.12.0...v0.13.0 Changelog: https://github.com/typst/typst/releases/tag/v0.13.0 --- pkgs/by-name/ty/typst/package.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ty/typst/package.nix b/pkgs/by-name/ty/typst/package.nix index 37abf902a5b6..854d4edf7e4b 100644 --- a/pkgs/by-name/ty/typst/package.nix +++ b/pkgs/by-name/ty/typst/package.nix @@ -12,19 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "typst"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "typst"; repo = "typst"; tag = "v${version}"; - hash = "sha256-OfTMJ7ylVOJjL295W3Flj2upTiUQXmfkyDFSE1v8+a4="; + hash = "sha256-3YLdHwDgQDQyW4R3BpZAEL49BBpgigev/5lbnhDIFgI="; }; - cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; - hash = "sha256-dphMJ1KkZARSntvyEayAtlYw8lL39K7Iw0X4n8nz3z8="; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-ey5pFGLgj17+RZGjpLOeN7Weh29jJyvuRrJ8wsIlC58="; nativeBuildInputs = [ installShellFiles From 6b37e6f9d8ed4e49f424daf99da18eaef02d7090 Mon Sep 17 00:00:00 2001 From: Fernando Ayats Date: Wed, 19 Feb 2025 18:35:47 +0100 Subject: [PATCH 1074/1107] vimPlugins.avante-nvim: 0.0.18 -> 0.0.19 --- .../vim/plugins/non-generated/avante-nvim/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix index c90219bb7890..15cd25a1926f 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix @@ -10,19 +10,19 @@ vimUtils, }: let - version = "0.0.18"; + version = "0.0.19"; src = fetchFromGitHub { owner = "yetone"; repo = "avante.nvim"; tag = "v${version}"; - hash = "sha256-HSXqD+bC0sdvNbmV8hIU99cLrVyIMAzbWf5cqUpIhZU="; + hash = "sha256-/WvkMsyhaYa3TLOg6QBVz1dvHO4vr1PdeSF7zVIOUcY="; }; avante-nvim-lib = rustPlatform.buildRustPackage { pname = "avante-nvim-lib"; inherit version src; useFetchCargoVendor = true; - cargoHash = "sha256-XDxWeEbsDf4r346OkQkZPmYLANgtydspPk1uLrnvrnY="; + cargoHash = "sha256-XDxWeEbsDf4r346OkQkZPmYLANgtydspPk1uLrnvrnY"; nativeBuildInputs = [ pkg-config From fb67610781706f9cd2b17bdaf938bf5927d74633 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 17:42:01 +0000 Subject: [PATCH 1075/1107] python312Packages.asdf-astropy: 0.7.0 -> 0.7.1 --- pkgs/development/python-modules/asdf-astropy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/asdf-astropy/default.nix b/pkgs/development/python-modules/asdf-astropy/default.nix index 47e42cee8738..07cb21e01322 100644 --- a/pkgs/development/python-modules/asdf-astropy/default.nix +++ b/pkgs/development/python-modules/asdf-astropy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "asdf-astropy"; - version = "0.7.0"; + version = "0.7.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "astropy"; repo = "asdf-astropy"; tag = version; - hash = "sha256-xtDpKlAExMTYNopS9cAhLU2ZnHhtHHaV3KjWCq0yapE="; + hash = "sha256-hP77qhNTE89cuz9Z8vWlWYo2En0SV4uoHaBnxQDNEvI="; }; nativeBuildInputs = [ @@ -61,7 +61,7 @@ buildPythonPackage rec { meta = with lib; { description = "Extension library for ASDF to provide support for Astropy"; homepage = "https://github.com/astropy/asdf-astropy"; - changelog = "https://github.com/astropy/asdf-astropy/blob/${version}/CHANGES.rst"; + changelog = "https://github.com/astropy/asdf-astropy/blob/${src.tag}/CHANGES.rst"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; From b7e0543c2079a799e400a8e50a74a8c7874e6a7d Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Wed, 19 Feb 2025 12:44:29 -0500 Subject: [PATCH 1076/1107] crystal_1_12: drop --- pkgs/development/compilers/crystal/default.nix | 7 ------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index f8195c2e7775..e13bca5fcc5e 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -259,13 +259,6 @@ rec { llvmPackages = llvmPackages_15; }; - crystal_1_12 = generic { - version = "1.12.1"; - sha256 = "sha256-Q6uI9zPZ3IOGyUuWdC179GPktPGFPRbRWKtOF4YWCBw="; - binary = binaryCrystal_1_10; - llvmPackages = llvmPackages_18; - }; - crystal_1_14 = generic { version = "1.14.1"; sha256 = "sha256-cQWK92BfksOW8GmoXn4BmPGJ7CLyLAeKccOffQMh5UU="; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index eab448cc7a3c..a902583045ee 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -254,6 +254,7 @@ mapAliases { crystal_1_7 = throw "'crystal_1_7' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13 crystal_1_8 = throw "'crystal_1_8' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13 crystal_1_9 = throw "'crystal_1_9' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13 + crystal_1_12 = throw "'crystal_1_12' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-19 clash-geoip = throw "'clash-geoip' has been removed. Consider using 'dbip-country-lite' instead."; # added 2024-10-19 clash-verge = throw "'clash-verge' has been removed, as it was broken and unmaintained. Consider using 'clash-verge-rev' or 'clash-nyanpasu' instead"; # Added 2024-09-17 clasp = clingo; # added 2022-12-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4f12eea38b5..b3668bbb39c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5705,7 +5705,6 @@ with pkgs; inherit (darwin.apple_sdk_11_0.callPackage ../development/compilers/crystal { }) crystal_1_11 - crystal_1_12 crystal_1_14 crystal_1_15 crystal; From c6bafa204cc3b6ccc392957bcd55193c80df1da5 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Wed, 19 Feb 2025 17:54:23 +0000 Subject: [PATCH 1077/1107] alt-tab-macos: 7.19.1 -> 7.20.0 Changelog: https://github.com/lwouis/alt-tab-macos/releases/tag/v7.20.0 Diff: https://github.com/lwouis/alt-tab-macos/compare/v7.19.1...v7.20.0 --- pkgs/by-name/al/alt-tab-macos/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/alt-tab-macos/package.nix b/pkgs/by-name/al/alt-tab-macos/package.nix index e669f75d5244..3ea1aa088bb9 100644 --- a/pkgs/by-name/al/alt-tab-macos/package.nix +++ b/pkgs/by-name/al/alt-tab-macos/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "alt-tab-macos"; - version = "7.19.1"; + version = "7.20.0"; src = fetchurl { url = "https://github.com/lwouis/alt-tab-macos/releases/download/v${finalAttrs.version}/AltTab-${finalAttrs.version}.zip"; - hash = "sha256-eT/HZDBDtOh9uQEffLhlBXfWuPSM/bnpgp5OFnSuCBk="; + hash = "sha256-B1cRQWXjlvj0/4HNyymT8dKySFflNRhH4O9J37CyhqM="; }; sourceRoot = "."; From 2607578cc46d757bb7640307ccba1742f21a4939 Mon Sep 17 00:00:00 2001 From: Martin Fink Date: Wed, 19 Feb 2025 13:55:55 +0000 Subject: [PATCH 1078/1107] lib.systems.architectures: add sierra forest --- lib/systems/architectures.nix | 2 ++ pkgs/build-support/cc-wrapper/default.nix | 1 + 2 files changed, 3 insertions(+) diff --git a/lib/systems/architectures.nix b/lib/systems/architectures.nix index d277ac9ce70f..a448398449d3 100644 --- a/lib/systems/architectures.nix +++ b/lib/systems/architectures.nix @@ -29,6 +29,7 @@ rec { alderlake = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "fma" ]; sapphirerapids = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "avx512" "fma" ]; emeraldrapids = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "avx512" "fma" ]; + sierraforest = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "fma" ]; # x86_64 AMD btver1 = [ "sse3" "ssse3" "sse4_1" "sse4_2" ]; btver2 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" ]; @@ -82,6 +83,7 @@ rec { # CX16 does not exist on alderlake, while it does on nearly all other intel CPUs alderlake = [ ]; + sierraforest = [ "alderlake" ] ++ inferiors.alderlake; # x86_64 AMD # TODO: fill this (need testing) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 134fe3782799..23a6319ba1eb 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -166,6 +166,7 @@ let alderlake = versionAtLeast ccVersion "12.0"; sapphirerapids = versionAtLeast ccVersion "11.0"; emeraldrapids = versionAtLeast ccVersion "13.0"; + sierraforest = versionAtLeast ccVersion "13.0"; # AMD znver1 = true; From b6a44e91a8931ebb93570f4f4828df450ce93a56 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 18:31:46 +0000 Subject: [PATCH 1079/1107] pixi-pack: 0.3.1 -> 0.3.2 --- pkgs/by-name/pi/pixi-pack/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/pixi-pack/package.nix b/pkgs/by-name/pi/pixi-pack/package.nix index b0dd0001fc7c..d3f3f0f4c0d6 100644 --- a/pkgs/by-name/pi/pixi-pack/package.nix +++ b/pkgs/by-name/pi/pixi-pack/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "pixi-pack"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "Quantco"; repo = "pixi-pack"; tag = "v${version}"; - hash = "sha256-gzP/01pck14cMN0PopoCO27dxncWz4yIZFAzXU+4IQ0="; + hash = "sha256-fTQSSrmfWvyGD1+YM2I6Lly6gYwMlB/h8VRbDsvG3mU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-dTpwlE/o7YzLWfJSEOgHfI64l9XNLt3gC1GE4IhL66o="; + cargoHash = "sha256-ujrEUXQGaESNSZndBblM/4e/zl376FRdj4Hp3AA2yJA="; buildInputs = [ openssl ]; From 4cebf9c071e1cc4cd0a74657bdf8295c5521a394 Mon Sep 17 00:00:00 2001 From: Marek Fajkus Date: Wed, 19 Feb 2025 19:29:56 +0100 Subject: [PATCH 1080/1107] gf: update to latest HEAD --- pkgs/by-name/gf/gf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gf/gf/package.nix b/pkgs/by-name/gf/gf/package.nix index 7a3ce5677280..ec50399ac3bc 100644 --- a/pkgs/by-name/gf/gf/package.nix +++ b/pkgs/by-name/gf/gf/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation { pname = "gf"; - version = "0-unstable-2024-08-21"; + version = "0-unstable-2025-02-04"; src = fetchFromGitHub { repo = "gf"; owner = "nakst"; - rev = "40f2ae604f3b94b7f818680ac53d4683c629bcf3"; - hash = "sha256-Z8hW/GQjnnojoLeetrBlMnAJ9sP9ELv1lSQJjYPxtRc="; + rev = "9c1686439f97ae6e1ca8f1fb785b545303adfebc"; + hash = "sha256-0uABsjAVn+wAN8hMkM38CepSV4gYtIL0WHDq25TohZ0="; }; nativeBuildInputs = [ From 4750c1592090d81cb2c24de10b187ed59256dc15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 18:44:16 +0000 Subject: [PATCH 1081/1107] svdtools: 0.4.3 -> 0.4.4 --- pkgs/by-name/sv/svdtools/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sv/svdtools/package.nix b/pkgs/by-name/sv/svdtools/package.nix index d26f0e747a43..6d510db665d7 100644 --- a/pkgs/by-name/sv/svdtools/package.nix +++ b/pkgs/by-name/sv/svdtools/package.nix @@ -6,15 +6,15 @@ rustPlatform.buildRustPackage rec { pname = "svdtools"; - version = "0.4.3"; + version = "0.4.4"; src = fetchCrate { inherit version pname; - hash = "sha256-ftT9EgICfy8vnb6XWEUUtX351+f5aex8xaY11nnWcAY="; + hash = "sha256-gZK0PdvubxyDD9wqhz3vuXeP33ibsZE5AZin7H2mnNQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-aNdEvmHnc0LqcjIJbh8gi3SfHnFPnlkO5CwO38ezfr8="; + cargoHash = "sha256-gunDbKMGd0f+TDt5tqh5siw0jnTtlpohteA4NNQHj24="; meta = with lib; { description = "Tools to handle vendor-supplied, often buggy SVD files"; From bee4983973110ecf21e7b8d8790f2992f5f4596e Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 11 Feb 2025 21:23:44 -0500 Subject: [PATCH 1082/1107] nomad_1_9: 1.9.5 -> 1.9.6 Diff: https://github.com/hashicorp/nomad/compare/v1.9.5...v1.9.6 --- pkgs/applications/networking/cluster/nomad/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index b8d547a21b18..370a5d20bdb7 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -110,9 +110,9 @@ rec { nomad_1_9 = generic { buildGoModule = buildGo123Module; - version = "1.9.5"; - sha256 = "sha256-NIv3QPSYoYrDQxxtNDHc3DdBLb45oUdA5Jyjke+XzD8="; - vendorHash = "sha256-y4WBOSfkRYNQRWu5B/j2JBLPAxJ1fyLD0DEAjB10Sl8="; + version = "1.9.6"; + sha256 = "sha256-j+3ecQsFicdYX4GddwaKEwoIFu88kdjI5Kl8bHUQQwE="; + vendorHash = "sha256-frHIP86NsW6C9GRdPaZQc3PilolXJ2ojaNZYlrMcbOg="; license = lib.licenses.bsl11; passthru.tests.nomad = nixosTests.nomad; preCheck = '' From 26b4bfc2dcd70c5591815f1aacd09a8e8a9c3bf2 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 11 Feb 2025 21:26:29 -0500 Subject: [PATCH 1083/1107] nomad: change default version --- pkgs/applications/networking/cluster/nomad/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 370a5d20bdb7..55a98cdfd0de 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -82,7 +82,7 @@ rec { # Upstream partially documents used Go versions here # https://github.com/hashicorp/nomad/blob/master/contributing/golang.md - nomad = nomad_1_8; + nomad = nomad_1_9; nomad_1_7 = generic { buildGoModule = buildGo122Module; From 4400dd230e82de8b26b7a0fdac20de196740e719 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 19:18:18 +0000 Subject: [PATCH 1084/1107] emacsPackages.lsp-bridge: 0-unstable-2025-02-03 -> 0-unstable-2025-02-10 --- .../elisp-packages/manual-packages/lsp-bridge/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix index 559890798b6f..7283c68f0a0c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix @@ -32,13 +32,13 @@ let in melpaBuild { pname = "lsp-bridge"; - version = "0-unstable-2025-02-03"; + version = "0-unstable-2025-02-10"; src = fetchFromGitHub { owner = "manateelazycat"; repo = "lsp-bridge"; - rev = "16c9054be6e40a254e096715b1acf80ca36918aa"; - hash = "sha256-u1NWrSLsc+SRiK9BZwAujrzYb7vU+lEqyT+wozbXaiY="; + rev = "4401d1396dce89d1fc5dc5414565818dd1c30ae0"; + hash = "sha256-lWbFbYwJoy4UAezKUK7rnjQlDcnszHQwK5I7fuHfE8Y="; }; patches = [ From c1aa53d9a5f7c6eb9a79164dbe6a703b3ef78f87 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 03:10:54 +0800 Subject: [PATCH 1085/1107] stig: use python3Package instead of python310Packages --- pkgs/by-name/st/stig/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/st/stig/package.nix b/pkgs/by-name/st/stig/package.nix index 7c6dec75cee6..03e1ea67b271 100644 --- a/pkgs/by-name/st/stig/package.nix +++ b/pkgs/by-name/st/stig/package.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, - python310Packages, + python3Packages, testers, stig, }: -python310Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "stig"; # This project has a different concept for pre release / alpha, # Read the project's README for details: https://github.com/rndusr/stig#stig @@ -19,7 +19,7 @@ python310Packages.buildPythonApplication rec { sha256 = "sha256-lSFI4/DxWl17KFgLXZ7c5nW/e5IUGN7s8Gm6wTM5ZWg="; }; - propagatedBuildInputs = with python310Packages; [ + propagatedBuildInputs = with python3Packages; [ urwid urwidtrees aiohttp @@ -30,7 +30,7 @@ python310Packages.buildPythonApplication rec { setproctitle ]; - nativeCheckInputs = with python310Packages; [ + nativeCheckInputs = with python3Packages; [ asynctest pytestCheckHook ]; From a848111a6bd27367b0e34fb640ec599a21be64e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 19:34:33 +0000 Subject: [PATCH 1086/1107] composer-require-checker: 4.15.0 -> 4.16.1 --- pkgs/by-name/co/composer-require-checker/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/composer-require-checker/package.nix b/pkgs/by-name/co/composer-require-checker/package.nix index e454634e00a4..2a4473205f9f 100644 --- a/pkgs/by-name/co/composer-require-checker/package.nix +++ b/pkgs/by-name/co/composer-require-checker/package.nix @@ -6,16 +6,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "composer-require-checker"; - version = "4.15.0"; + version = "4.16.1"; # Upstream no longer provides the composer.lock in their release artifact src = fetchgit { url = "https://github.com/maglnet/ComposerRequireChecker"; tag = finalAttrs.version; - hash = "sha256-ku4IXiUNFfTie+umVOWx8v5vcmO51uRM/n7XN50cSjE="; + hash = "sha256-UAofdc8mqSnJXhCTABSf9JZERqur86lzNDI66EHgEQE="; }; - vendorHash = "sha256-AdRnqecNoDteuhGp/gWCg/xKxBRnv8I2FkuJYs4WslE="; + vendorHash = "sha256-bNeQEfwXly3LFuEKeSK6J6pRfQF6TNwUqu3SdTswmFI="; meta = { description = "CLI tool to check whether a specific composer package uses imported symbols that aren't part of its direct composer dependencies"; From c3fd0b941ff948a97b7cc2b85d0b82b5805e85c0 Mon Sep 17 00:00:00 2001 From: griffi-gh Date: Fri, 17 Jan 2025 06:22:20 +0100 Subject: [PATCH 1087/1107] ocelot-desktop: init at 1.13.1 --- pkgs/by-name/oc/ocelot-desktop/package.nix | 149 +++++++++++++++++++++ 1 file changed, 149 insertions(+) create mode 100644 pkgs/by-name/oc/ocelot-desktop/package.nix diff --git a/pkgs/by-name/oc/ocelot-desktop/package.nix b/pkgs/by-name/oc/ocelot-desktop/package.nix new file mode 100644 index 000000000000..a8441efb34eb --- /dev/null +++ b/pkgs/by-name/oc/ocelot-desktop/package.nix @@ -0,0 +1,149 @@ +{ + lib, + stdenv, + fetchurl, + + makeBinaryWrapper, + makeDesktopItem, + copyDesktopItems, + + jre, + + # deps + alsa-lib, + libjack2, + libpulseaudio, + pipewire, + libGL, + libX11, + libXcursor, + libXext, + libXrandr, + libXxf86vm, + + # runtime (path) + xrandr, + + # native + unzip, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "ocelot-desktop"; + version = "1.13.1"; + + __darwinAllowLocalNetworking = true; + + # Cannot build from source because sbt/scala support is completely non-existent in nixpkgs + src = fetchurl { + url = "https://gitlab.com/api/v4/projects/9941848/packages/generic/ocelot-desktop/v${finalAttrs.version}/ocelot-desktop-v${finalAttrs.version}.jar"; + hash = "sha256-aXjz2H4vO8D7BGHxhanbmpxqd8op31v1Gwk/si4CBfg="; + }; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + preferLocal = true; + + nativeBuildInputs = [ + makeBinaryWrapper + copyDesktopItems + unzip + ]; + + installPhase = + let + # does darwin need any deps? + runtimeLibs = lib.optionals stdenv.hostPlatform.isLinux [ + # openal + alsa-lib + libjack2 + libpulseaudio + pipewire + + # lwjgl + libGL + libX11 + libXcursor + libXext + libXrandr + libXxf86vm + ]; + runtimePrograms = lib.optionals stdenv.hostPlatform.isLinux [ + # https://github.com/LWJGL/lwjgl/issues/128 + xrandr + ]; + in + '' + runHook preInstall + + mkdir -p $out/{bin,share/${finalAttrs.pname}} + install -Dm644 ${finalAttrs.src} $out/share/${finalAttrs.pname}/ocelot-desktop.jar + + makeBinaryWrapper ${jre}/bin/java $out/bin/ocelot-desktop \ + --set JAVA_HOME ${jre.home} \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeLibs}" \ + --prefix PATH : "${lib.makeBinPath runtimePrograms}" \ + --add-flags "-jar $out/share/${finalAttrs.pname}/ocelot-desktop.jar" + + # copy icons from zip file + # ocelot/desktop/images/icon*.png + # 16,32,64,128,256 + + for size in 16 32 64 128 256; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + unzip -p $out/share/${finalAttrs.pname}/ocelot-desktop.jar \ + ocelot/desktop/images/icon"$size".png > $out/share/icons/hicolor/"$size"x"$size"/apps/ocelot-desktop.png + done + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "ocelot-desktop"; + desktopName = "Ocelot Desktop"; + genericName = "OpenComputers Emulator"; + comment = "An advanced OpenComputers emulator"; + tryExec = "ocelot-desktop"; + exec = "ocelot-desktop -w %f"; + icon = "ocelot-desktop"; + startupNotify = true; + startupWMClass = "Ocelot Desktop"; # (maybe broken) + terminal = false; + keywords = [ + "Ocelot" + "OpenComputers" + "Emulator" + "oc" + "lua" + "OpenOS" + "ocemu" + "mc" + "Minecraft" + ]; + categories = [ + "Development" + "Emulator" + ]; + mimeTypes = [ + "inode/directory" + ]; + }) + ]; + + meta = { + description = "An advanced OpenComputers emulator"; + homepage = "https://ocelot.fomalhaut.me/desktop"; + changelog = "https://gitlab.com/cc-ru/ocelot/ocelot-desktop/-/releases/v${finalAttrs.version}"; + license = lib.licenses.mit; + mainProgram = "ocelot-desktop"; + platforms = with lib.platforms; linux ++ darwin; + badPlatforms = [ + # missing compatible lwjgl.dylib + "aarch64-darwin" + ]; + maintainers = with lib.maintainers; [ griffi-gh ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + }; +}) From 7eed548611fd3d0ef92de774c1b31891c9525ff5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 19 Feb 2025 20:38:28 +0100 Subject: [PATCH 1088/1107] slop: pin back to icu74 https://hydra.nixos.org/build/289715936/nixlog/3/tail Hmm, no meta.maintainers, basically no changes upstream during the past few years. --- pkgs/by-name/sl/slop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sl/slop/package.nix b/pkgs/by-name/sl/slop/package.nix index 3233dfe822bf..7bf6fc1f0779 100644 --- a/pkgs/by-name/sl/slop/package.nix +++ b/pkgs/by-name/sl/slop/package.nix @@ -12,7 +12,7 @@ libX11, libXext, libXrender, - icu, + icu74, libSM, }: @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { libX11 libXext libXrender - icu + icu74 libSM ]; From a8368cf6df5760d57cadb6f0402d0ea37e5a686f Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 17 Feb 2025 23:31:44 +0100 Subject: [PATCH 1089/1107] flashprog: Install udev rules Signed-off-by: Felix Singer --- pkgs/by-name/fl/flashprog/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/fl/flashprog/package.nix b/pkgs/by-name/fl/flashprog/package.nix index 260effa1a4e7..c0eae095ee8f 100644 --- a/pkgs/by-name/fl/flashprog/package.nix +++ b/pkgs/by-name/fl/flashprog/package.nix @@ -45,6 +45,11 @@ stdenv.mkDerivation (finalAttrs: { libgpiod ]; + postInstall = '' + cd "$src" + install -Dm644 util/50-flashprog.rules "$out/lib/udev/rules.d/50-flashprog.rules" + ''; + meta = with lib; { homepage = "https://flashprog.org"; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; From a5bdd8e8a4340a7464a4f48779268eeda0a57806 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 17 Feb 2025 23:31:56 +0100 Subject: [PATCH 1090/1107] flashprog: Change license from GPL2+ to GPL2 flashprog is licensed under GPLv2. So change it accordingly. Signed-off-by: Felix Singer --- pkgs/by-name/fl/flashprog/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fl/flashprog/package.nix b/pkgs/by-name/fl/flashprog/package.nix index c0eae095ee8f..d3063aa97ff0 100644 --- a/pkgs/by-name/fl/flashprog/package.nix +++ b/pkgs/by-name/fl/flashprog/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://flashprog.org"; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; - license = with licenses; [ gpl2Plus ]; + license = with licenses; [ gpl2 ]; maintainers = with maintainers; [ felixsinger funkeleinhorn From 43fccee556f92bcb9abcd90038047e252ea6d1f6 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 17 Feb 2025 23:37:56 +0100 Subject: [PATCH 1091/1107] nixos/flashprog: Introduce flashprog module Introduce the flashprog module. By enabling, its udev rules are applied in addition to installing the package. Signed-off-by: Felix Singer --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/flashprog.nix | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 nixos/modules/programs/flashprog.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 14aed8fdb3af..0c7cd28ccf69 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -199,6 +199,7 @@ ./programs/firefox.nix ./programs/firejail.nix ./programs/fish.nix + ./programs/flashprog.nix ./programs/flashrom.nix ./programs/flexoptix-app.nix ./programs/foot diff --git a/nixos/modules/programs/flashprog.nix b/nixos/modules/programs/flashprog.nix new file mode 100644 index 000000000000..be153c1b6f18 --- /dev/null +++ b/nixos/modules/programs/flashprog.nix @@ -0,0 +1,28 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.programs.flashprog; +in +{ + options.programs.flashprog = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Installs flashprog and configures udev rules for programmers + used by flashprog. + ''; + }; + package = lib.mkPackageOption pkgs "flashprog" { }; + }; + + config = lib.mkIf cfg.enable { + services.udev.packages = [ cfg.package ]; + environment.systemPackages = [ cfg.package ]; + }; +} From 7a9e4a3a3d3e7d8686df9fbb80f805989b48fb8b Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Tue, 18 Feb 2025 03:25:05 +0100 Subject: [PATCH 1092/1107] flashprog: Apply patch for fixing compiler warnings Quoting the original commit message: Some toolchains complain that this shadows the global from . Alas, toolchains seem inconsistent in the decision when to warn about shadowing of globals from system headers and when not to. Hence, just rename `optarg' -> `opt_arg'. Fixes compiler warnings on Darwin and enables building. Signed-off-by: Felix Singer --- pkgs/by-name/fl/flashprog/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/fl/flashprog/package.nix b/pkgs/by-name/fl/flashprog/package.nix index d3063aa97ff0..67c5805073a2 100644 --- a/pkgs/by-name/fl/flashprog/package.nix +++ b/pkgs/by-name/fl/flashprog/package.nix @@ -1,5 +1,6 @@ { fetchgit, + fetchpatch, lib, libftdi1, libgpiod, @@ -24,6 +25,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-S+UKDtpKYenwm+zR+Bg8HHxb2Jr7mFHAVCZdZTqCyRQ="; }; + patches = [ + # fixes compiler warnings on Darwin + (fetchpatch { + url = "https://review.sourcearcade.org/changes/flashprog~309/revisions/2/patch?download"; + hash = "sha256-eiEenR8+CHCJcNx9YY09I7gxRGUQWmaQlmXtykvXyMU="; + decode = "base64 -d"; + }) + ]; + nativeBuildInputs = [ meson ninja From 16c44ff390ab47efab2770492fea182a6f57815d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 Feb 2025 20:48:58 +0100 Subject: [PATCH 1093/1107] python312Packages.asdf-astropy: refactor --- pkgs/development/python-modules/asdf-astropy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asdf-astropy/default.nix b/pkgs/development/python-modules/asdf-astropy/default.nix index 07cb21e01322..ff7d3b23719c 100644 --- a/pkgs/development/python-modules/asdf-astropy/default.nix +++ b/pkgs/development/python-modules/asdf-astropy/default.nix @@ -31,12 +31,12 @@ buildPythonPackage rec { hash = "sha256-hP77qhNTE89cuz9Z8vWlWYo2En0SV4uoHaBnxQDNEvI="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ asdf asdf-coordinates-schemas asdf-standard From 2816b3f08825b758064acd8b0bdc8458bcdc73d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 19:53:49 +0000 Subject: [PATCH 1094/1107] sysdig-cli-scanner: 1.19.2 -> 1.20.0 --- .../sysdig-cli-scanner.versions.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix index 18c2494b8965..812b1b7f5a79 100644 --- a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix +++ b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix @@ -1,23 +1,23 @@ { - version = "1.19.2"; + version = "1.20.0"; x86_64-linux = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.19.2/linux/amd64/sysdig-cli-scanner"; - hash = "sha256-H8qYf6s2OTHjHwhZlqXkrYxdCWuuqPhKXRDkpCYGfhM="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.20.0/linux/amd64/sysdig-cli-scanner"; + hash = "sha256-zN8s7Ztc1yz6bbLlbIesnbv6CfrsB8VFaXyixPVR40E="; }; aarch64-linux = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.19.2/linux/arm64/sysdig-cli-scanner"; - hash = "sha256-uC1U9Zbt8mSSiEWKWWMJawdYQwIW6N7rxnmduO1E5DA="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.20.0/linux/arm64/sysdig-cli-scanner"; + hash = "sha256-b1SE9q1NZQeHjjX3dyXzCc5/ZuiOWKON623eu8TlzhI="; }; x86_64-darwin = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.19.2/darwin/amd64/sysdig-cli-scanner"; - hash = "sha256-byLOKPD4DuSd5LYTPr81XBHUW5cM+ngxTxon1A2rfPQ="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.20.0/darwin/amd64/sysdig-cli-scanner"; + hash = "sha256-Rwq8en8dt1VKoPdHWTIYr67ppBlFI+br/H8jKepfqKQ="; }; aarch64-darwin = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.19.2/darwin/arm64/sysdig-cli-scanner"; - hash = "sha256-rKlsodq5YJT4k69iDLvkELYUV7kQ24cgDh5sGrsT9ns="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.20.0/darwin/arm64/sysdig-cli-scanner"; + hash = "sha256-LWlCemjODa29NA+/Skzw8hWtbOmtMWYSI3G3e1PvUDo="; }; } From 4e9ac6f2d0a85661ed76d5f1e0f9b895cb500756 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Feb 2025 04:57:14 +0000 Subject: [PATCH 1095/1107] kops_1_30: 1.30.3 -> 1.30.4 --- pkgs/applications/networking/cluster/kops/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 7a61313f4425..419101f4126b 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -68,8 +68,8 @@ rec { }; kops_1_30 = mkKops rec { - version = "1.30.3"; - sha256 = "sha256-gTae30V03zB5FfkRaGuRB9aBzb2ouXEKs8OV8KovOpM="; + version = "1.30.4"; + sha256 = "sha256-f+VdgQj6tHWrn+LG6qkArjcADYfpKjuOp+bU0BTYsWY="; rev = "v${version}"; }; } From b4ac7980bc0b0dadb14066bdd0be11dc876542af Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Wed, 19 Feb 2025 21:38:26 +0100 Subject: [PATCH 1096/1107] bitwarden-desktop: 2025.1.1 -> 2025.2.0 (#381008) * bitwarden-desktop: 2025.1.1 -> 2025.2.0 * bitwarden-desktop: remove unused inputs --------- Co-authored-by: Sandro --- .../dont-auto-setup-biometrics.patch | 10 +++++----- pkgs/by-name/bi/bitwarden-desktop/package.nix | 19 ++++++++++++------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/bi/bitwarden-desktop/dont-auto-setup-biometrics.patch b/pkgs/by-name/bi/bitwarden-desktop/dont-auto-setup-biometrics.patch index b6307f43ed27..4102caca56ae 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/dont-auto-setup-biometrics.patch +++ b/pkgs/by-name/bi/bitwarden-desktop/dont-auto-setup-biometrics.patch @@ -1,8 +1,8 @@ -diff --git a/apps/desktop/src/key-management/biometrics/biometric.unix.main.ts b/apps/desktop/src/key-management/biometrics/biometric.unix.main.ts -index 8962e7f3ec..a7291420f2 100644 ---- a/apps/desktop/src/key-management/biometrics/biometric.unix.main.ts -+++ b/apps/desktop/src/key-management/biometrics/biometric.unix.main.ts -@@ -109,7 +109,7 @@ export default class BiometricUnixMain implements OsBiometricService { +diff --git a/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.ts b/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.ts +index 791b4d6f88..dfee0bbf8d 100644 +--- a/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.ts ++++ b/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.ts +@@ -115,7 +115,7 @@ export default class OsBiometricsServiceLinux implements OsBiometricService { // The user needs to manually set up the polkit policy outside of the sandbox // since we allow access to polkit via dbus for the sandboxed clients, the authentication works from // the sandbox, once the policy is set up outside of the sandbox. diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index 40912b780968..ab168b804a28 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -3,7 +3,7 @@ buildNpmPackage, cargo, copyDesktopItems, - electron_33, + electron_34, fetchFromGitHub, gnome-keyring, jq, @@ -23,7 +23,7 @@ let description = "Secure and free password manager for all of your devices"; icon = "bitwarden"; - electron = electron_33; + electron = electron_34; bitwardenDesktopNativeArch = { @@ -36,13 +36,13 @@ let in buildNpmPackage rec { pname = "bitwarden-desktop"; - version = "2025.1.1"; + version = "2025.2.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; - hash = "sha256-0NXrTBkCyo9Hw+fyFTfXfa1efBlaM6xWd9Uvsbathpw="; + hash = "sha256-+RMeo+Kyum1WNm7citUe9Uk5yOtfhMPPlQRtnYL3Pj8="; }; patches = [ @@ -66,8 +66,13 @@ buildNpmPackage rec { "--engine-strict" "--legacy-peer-deps" ]; + + npmRebuildFlags = [ + # FIXME one of the esbuild versions fails to download @esbuild/linux-x64 + "--ignore-scripts" + ]; npmWorkspace = "apps/desktop"; - npmDepsHash = "sha256-DDsPkvLGOhjmdYEOmhZfe4XHGFyowvWO24YcCA5griM="; + npmDepsHash = "sha256-fYZJA6qV3mqxO2g+yxD0MWWQc9QYmdWJ7O7Vf88Qpbs="; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; @@ -79,7 +84,7 @@ buildNpmPackage rec { ) patches; patchFlags = [ "-p4" ]; sourceRoot = "${src.name}/${cargoRoot}"; - hash = "sha256-IL8+n+rhRbvRO1jxJSy9PjUMb/tI4S/gzpUNOojBPWk="; + hash = "sha256-OldVFMI+rcGAbpDg7pHu/Lqbw5I6/+oXULteQ9mXiFc="; }; cargoRoot = "apps/desktop/desktop_native"; @@ -162,7 +167,7 @@ buildNpmPackage rec { # This may break in the future but its better than copy-pasting it manually. mkdir -p $out/share/polkit-1/actions/ pushd apps/desktop/src/key-management/biometrics - awk '/const polkitPolicy = `/{gsub(/^.*`/, ""); print; str=1; next} str{if (/`;/) str=0; gsub(/`;/, ""); print}' biometric.unix.main.ts > $out/share/polkit-1/actions/com.bitwarden.Bitwarden.policy + awk '/const polkitPolicy = `/{gsub(/^.*`/, ""); print; str=1; next} str{if (/`;/) str=0; gsub(/`;/, ""); print}' os-biometrics-linux.service.ts > $out/share/polkit-1/actions/com.bitwarden.Bitwarden.policy popd pushd apps/desktop/resources/icons From 75007d54ed7860afe4fd9f462dfecdbc2d30e07a Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 04:56:27 +0800 Subject: [PATCH 1097/1107] stig: remove dontUseSetuptoolsCheck specification setuptooolsCheckHooks has been removed. --- pkgs/by-name/st/stig/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/st/stig/package.nix b/pkgs/by-name/st/stig/package.nix index 03e1ea67b271..307995c9bfc9 100644 --- a/pkgs/by-name/st/stig/package.nix +++ b/pkgs/by-name/st/stig/package.nix @@ -35,8 +35,6 @@ python3Packages.buildPythonApplication rec { pytestCheckHook ]; - dontUseSetuptoolsCheck = true; - preCheck = '' export LC_ALL=C ''; From 6cd88104d77f2a92594eb24c5a6dd918c0aa5640 Mon Sep 17 00:00:00 2001 From: Solomon Date: Wed, 19 Feb 2025 14:04:03 -0700 Subject: [PATCH 1098/1107] nixos/openssh: allow post-quantum KexAlgorithms introduced in v9.9 (#378875) `mlkem768x25519-sha256` and the vendor-neutral `sntrup761x25519-sha512` name are new in OpenSSH 9.9 Co-authored-by: Mynacol --- nixos/modules/services/networking/ssh/sshd.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index ddab9f24b0b8..54e1273ad9db 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -415,6 +415,8 @@ in KexAlgorithms = lib.mkOption { type = lib.types.nullOr (lib.types.listOf lib.types.str); default = [ + "mlkem768x25519-sha256" + "sntrup761x25519-sha512" "sntrup761x25519-sha512@openssh.com" "curve25519-sha256" "curve25519-sha256@libssh.org" From 55f746e1c4715610b1962397bd743818af9f78ed Mon Sep 17 00:00:00 2001 From: networkException Date: Wed, 19 Feb 2025 22:27:11 +0100 Subject: [PATCH 1099/1107] ungoogled-chromium: 133.0.6943.98-1 -> 133.0.6943.126-1 https://chromereleases.googleblog.com/2025/02/stable-channel-update-for-desktop_18.html This update includes 3 security fixes. CVEs: CVE-2025-0999 CVE-2025-1426 CVE-2025-1006 --- .../networking/browsers/chromium/info.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 775b9f76932e..65a00af75d99 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -791,7 +791,7 @@ } }, "ungoogled-chromium": { - "version": "133.0.6943.98", + "version": "133.0.6943.126", "deps": { "depot_tools": { "rev": "423f1e1914ab4aa7b2bdf804e216d4c097853ba2", @@ -802,16 +802,16 @@ "hash": "sha256-T2dcISln9WCODoI/LsE2ldkRfFdMwVOmqqjQinAmZss=" }, "ungoogled-patches": { - "rev": "133.0.6943.98-1", - "hash": "sha256-lSRJD8tKmZ89MJr6MkldV8/50iB/l8FEwl6ZM/KtZHA=" + "rev": "133.0.6943.126-1", + "hash": "sha256-bOtkMuGYu/iovgj0ZOecxQBmBvUhbF0px/M3Zp7ixKI=" }, "npmHash": "sha256-oVoTruhxTymYiGkELd2Oa1wOfjGLtChQZozP4GzOO1A=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "da53563ceb66412e2637507c8724bd0cab05e453", - "hash": "sha256-yltjJNXU+YQD/sFEa8+ZKqUJpVZ2Yi0YDx27bnekcng=", + "rev": "cffa127ce7b6be72885391527c15b452056a2e81", + "hash": "sha256-WOd3FsqaZlKEroWg763LQhQS5S1964vAoZWxstxGS3U=", "recompress": true }, "src/third_party/clang-format/script": { @@ -1366,8 +1366,8 @@ }, "src/third_party/pdfium": { "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "b57762c6c6ad261024f11fc724687593c03cce67", - "hash": "sha256-ksN/7volHAeQLJSFQMV/YOfkXyZ97GSawXp31uca4oc=" + "rev": "a6637ded97c46aa4879769b1a6b0f2128e6ea257", + "hash": "sha256-Y2quVCJS62YFwxBSB42Wg03QQ10M8C1GTrRvhr73IN8=" }, "src/third_party/perfetto": { "url": "https://android.googlesource.com/platform/external/perfetto.git", @@ -1576,8 +1576,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "79c3c1ab7faee8247b740b4ec660a998f2881633", - "hash": "sha256-fmd2mIjJs6l9zRTJ2bFIMQNnApFN3epeS+57TBlF/Uk=" + "rev": "4e04a09a1a0ef90841656e210e976bfc2a81ed57", + "hash": "sha256-XbeU9L2IRHMP5pTzM3MPW1L2PMHViNRP/6u/HcBq96M=" } } } From 1ba73f22dffd49920ca4949c5b9f7f2306f28412 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 21:54:22 +0000 Subject: [PATCH 1100/1107] airwindows: 0-unstable-2025-02-02 -> 0-unstable-2025-02-16 --- pkgs/by-name/ai/airwindows/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ai/airwindows/package.nix b/pkgs/by-name/ai/airwindows/package.nix index a6e8d1b0e110..b65b357de558 100644 --- a/pkgs/by-name/ai/airwindows/package.nix +++ b/pkgs/by-name/ai/airwindows/package.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation { pname = "airwindows"; - version = "0-unstable-2025-02-02"; + version = "0-unstable-2025-02-16"; src = fetchFromGitHub { owner = "airwindows"; repo = "airwindows"; - rev = "14f348fe83cfd42a6402856d3d15a1866b157996"; - hash = "sha256-IHOEpVykX1416wQBqymFgYHA8AnNH9mfUU53IkVVs6Y="; + rev = "6a9e1e2913c85edc21f4554b49089668f19cc924"; + hash = "sha256-Lb7IawTn/JKm/UF8ArwYalJGzX0yZwhKden5e2TlBeI="; }; # we patch helpers because honestly im spooked out by where those variables From a0a2932ac2fc0bfd338da1ccc5b077139a0ade99 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 03:15:20 +0800 Subject: [PATCH 1101/1107] stig: disable checks and get rid of checkInputs to resolve dependency conflicts. The chekck dependency asynctest is unmaintained by the upstream and only supports Python<=3.9. With such dependency, it is impossible to find a Python interpreter version for stig to evaluate. --- pkgs/by-name/st/stig/package.nix | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/pkgs/by-name/st/stig/package.nix b/pkgs/by-name/st/stig/package.nix index 307995c9bfc9..a9bf6a747d48 100644 --- a/pkgs/by-name/st/stig/package.nix +++ b/pkgs/by-name/st/stig/package.nix @@ -30,25 +30,11 @@ python3Packages.buildPythonApplication rec { setproctitle ]; - nativeCheckInputs = with python3Packages; [ - asynctest - pytestCheckHook - ]; - - preCheck = '' - export LC_ALL=C - ''; - - disabledTestPaths = [ - # Almost all tests fail in this file, it is reported upstream in: - # https://github.com/rndusr/stig/issues/214 , and upstream fails to - # reproduce the issue unfortunately. - "tests/client_test/aiotransmission_test/api_settings_test.py" - ]; - disabledTests = [ - # Another failure with similar circumstances to the above - "test_candidates_are_sorted_case_insensitively" - ]; + # According to the upstream author, + # stig no longer has working tests + # since asynctest (former test dependency) got abandoned. + # See https://github.com/rndusr/stig/issues/206#issuecomment-2669636320 + doCheck = false; passthru.tests = testers.testVersion { package = stig; @@ -56,9 +42,6 @@ python3Packages.buildPythonApplication rec { version = "stig version ${version}"; }; - # https://github.com/rndusr/stig/issues/214#issuecomment-1995651219 - dontUsePytestCheck = true; - meta = with lib; { description = "TUI and CLI for the BitTorrent client Transmission"; homepage = "https://github.com/rndusr/stig"; From 14fc7a9020804ba79bbdba888d6af252414cb194 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 20 Feb 2025 06:00:23 +0800 Subject: [PATCH 1102/1107] stig: modernise MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Use "pyproject = true" and "build-system = [ setuptools ]" - Specify run-time Python dependencies via "dependencies" Co-authored-by: Robert Schütz --- pkgs/by-name/st/stig/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/st/stig/package.nix b/pkgs/by-name/st/stig/package.nix index a9bf6a747d48..1f82c837e928 100644 --- a/pkgs/by-name/st/stig/package.nix +++ b/pkgs/by-name/st/stig/package.nix @@ -11,6 +11,7 @@ python3Packages.buildPythonApplication rec { # This project has a different concept for pre release / alpha, # Read the project's README for details: https://github.com/rndusr/stig#stig version = "0.12.10a0"; + pyproject = true; src = fetchFromGitHub { owner = "rndusr"; @@ -19,7 +20,11 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-lSFI4/DxWl17KFgLXZ7c5nW/e5IUGN7s8Gm6wTM5ZWg="; }; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ urwid urwidtrees aiohttp From cf9c9529a137600fd983a326f537986a81a240df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Feb 2025 23:10:56 +0000 Subject: [PATCH 1103/1107] mmctl: 9.11.8 -> 9.11.9 --- pkgs/by-name/ma/mattermost/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix index eec0732b6f73..1804d9a86e37 100644 --- a/pkgs/by-name/ma/mattermost/package.nix +++ b/pkgs/by-name/ma/mattermost/package.nix @@ -19,10 +19,10 @@ # # Ensure you also check ../mattermostLatest/package.nix. regex = "^v(9\\.11\\.[0-9]+)$"; - version = "9.11.8"; - srcHash = "sha256-mTEAsY3Dw5n6sqLWyNfS4EGgZuUOol27UwqsZ2kEXZY="; - vendorHash = "sha256-alLPBfnA1o6bUUgPRqvYW/98UKR9wltmFTzKIGtVEm4="; - npmDepsHash = "sha256-ysz38ywGxJ5DXrrcDmcmezKbc5Y7aug9jOWUzHRAs/0="; + version = "9.11.9"; + srcHash = "sha256-sEu5s+yMCPYxvyc7kuiA9AE/qBi08iTqhYxwO7J9xiE="; + vendorHash = "sha256-h/hcdVImU3wFp7BGHS/TxYBEWGv9v06y8etaz9OrHTA="; + npmDepsHash = "sha256-B7pXMHwyf7dQ2x2VJu+mdZz03/9FyyYvFYOw8XguTH8="; }, }: From 96475414e7b33b0783abcc94ed3f7a83c3239381 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Feb 2025 00:30:03 +0000 Subject: [PATCH 1104/1107] erigon: 2.61.0 -> 2.61.1 --- pkgs/by-name/er/erigon/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/er/erigon/package.nix b/pkgs/by-name/er/erigon/package.nix index 5fcc6673d107..6b277ab3305e 100644 --- a/pkgs/by-name/er/erigon/package.nix +++ b/pkgs/by-name/er/erigon/package.nix @@ -7,7 +7,7 @@ let pname = "erigon"; - version = "2.61.0"; + version = "2.61.1"; in buildGoModule { inherit pname version; @@ -16,11 +16,11 @@ buildGoModule { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - hash = "sha256-B9FDGBx5ac1v0PqVK/2LhDH2seRthZxtaGu3G9flo0A="; + hash = "sha256-fSDAUdhSFTzqZji2bYxky8Orf64ZWvuQLZ/GqoPwNTM="; fetchSubmodules = true; }; - vendorHash = "sha256-bGVHIrICYWyHPgWWgEAIT+J/IIPjcWqTHeuqbT6lung="; + vendorHash = "sha256-1LB2T0o9LjFdpl86NPMKx1lFLrQZefAGldcSQyL6O7M="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: From 4757858b15afbf1b81f75baca10289c2e5a4bef7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 20 Feb 2025 03:15:23 +0100 Subject: [PATCH 1105/1107] python312Packages.esphome-glyphsets: 0.1.0 -> 0.2.0 https://github.com/esphome/esphome-glyphsets/blob/v0.2.0/CHANGELOG.md --- pkgs/development/python-modules/esphome-glyphsets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/esphome-glyphsets/default.nix b/pkgs/development/python-modules/esphome-glyphsets/default.nix index faa4c5663464..47c490861652 100644 --- a/pkgs/development/python-modules/esphome-glyphsets/default.nix +++ b/pkgs/development/python-modules/esphome-glyphsets/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "esphome-glyphsets"; - version = "0.1.0"; + version = "0.2.0"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "esphome-glyphsets"; tag = "v${version}"; - hash = "sha256-kST2AsZRWZrVmInUNN153+FOXa/t9vbHN3hAReKQJaU="; + hash = "sha256-nM8omtLIWwIY6AGVqVR2/4twmMlOj21+9cSuyXzAAXY="; fetchSubmodules = true; }; From d93bc078f66c161c290cdd43a53e2f66177ca818 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 20 Feb 2025 03:36:40 +0100 Subject: [PATCH 1106/1107] python313Packages.pyfritzhome: 0.6.14 -> 0.6.15 https://github.com/hthiery/python-fritzhome/releases/tag/0.6.15 --- pkgs/development/python-modules/pyfritzhome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyfritzhome/default.nix b/pkgs/development/python-modules/pyfritzhome/default.nix index 7efc9f45d612..827e17237609 100644 --- a/pkgs/development/python-modules/pyfritzhome/default.nix +++ b/pkgs/development/python-modules/pyfritzhome/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyfritzhome"; - version = "0.6.14"; + version = "0.6.15"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "hthiery"; repo = "python-fritzhome"; tag = version; - hash = "sha256-49Ap4SSeEMlqOnzd1/oyQ1wKwFVxsC+apx+FVCWqNVI="; + hash = "sha256-UVn+RJRLlLPhhnuJpWv5b15TtY0EkwccE3aj4f/fP6Q="; }; build-system = [ setuptools ]; From d3f8c4d4954e956640b5f22d9d494699df7e6b8c Mon Sep 17 00:00:00 2001 From: Hadi Date: Fri, 29 Nov 2024 10:20:52 -0500 Subject: [PATCH 1107/1107] androidenv: upgradde to repository2-3 androidenv: apply numinit patch to have a nice error message androidenv handle unsupported systems, and make tests running by default! androidenv run nixfmt androidenv: support emulator/systemimages/NDK only for certain systems androidenv: apply nixfmt androidenv: give a warning if archive doesn't exist --- .../mobile/androidenv/build-tools.nix | 7 +- pkgs/development/mobile/androidenv/cmake.nix | 2 +- .../androidenv/compose-android-packages.nix | 51 +- .../development/mobile/androidenv/default.nix | 12 +- .../androidenv/deploy-androidpackages.nix | 6 +- .../mobile/androidenv/emulator.nix | 7 +- .../examples/shell-with-emulator.nix | 11 +- .../examples/shell-without-emulator.nix | 8 +- .../mobile/androidenv/examples/shell.nix | 11 +- .../mobile/androidenv/fetchrepo.sh | 6 +- pkgs/development/mobile/androidenv/mkrepo.rb | 8 +- pkgs/development/mobile/androidenv/mkrepo.sh | 18 +- .../mobile/androidenv/ndk-bundle/default.nix | 2 +- .../mobile/androidenv/platform-tools.nix | 2 +- pkgs/development/mobile/androidenv/repo.json | 5596 +++++++++++++++-- .../mobile/androidenv/test-suite.nix | 12 +- pkgs/development/mobile/androidenv/tools.nix | 6 +- 17 files changed, 5014 insertions(+), 751 deletions(-) diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index 018298d322e8..53a80dd14967 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -1,10 +1,11 @@ -{deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgsi686Linux, postInstall}: +{deployAndroidPackage, lib, stdenv, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgsi686Linux, postInstall}: deployAndroidPackage { - inherit package os; + inherit package; nativeBuildInputs = [ makeWrapper ] ++ lib.optionals (os == "linux") [ autoPatchelfHook ]; - buildInputs = lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgsi686Linux.glibc pkgsi686Linux.zlib pkgsi686Linux.ncurses5 pkgs.libcxx ]; + buildInputs = lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs.libcxx ] + ++ lib.optionals (os == "linux" && stdenv.isx86_64) (with pkgsi686Linux; [ glibc zlib ncurses5 ]); patchInstructions = '' ${lib.optionalString (os == "linux") '' addAutoPatchelfSearchPath $packageBaseDir/lib diff --git a/pkgs/development/mobile/androidenv/cmake.nix b/pkgs/development/mobile/androidenv/cmake.nix index 833c96a2691c..02c5ab24aab2 100644 --- a/pkgs/development/mobile/androidenv/cmake.nix +++ b/pkgs/development/mobile/androidenv/cmake.nix @@ -1,7 +1,7 @@ {deployAndroidPackage, lib, package, os, autoPatchelfHook, pkgs, stdenv}: deployAndroidPackage { - inherit package os; + inherit package; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = lib.optionals (os == "linux") [ pkgs.stdenv.cc.libc pkgs.stdenv.cc.cc pkgs.ncurses5 ]; patchInstructions = lib.optionalString (os == "linux") '' diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index 65b48dd1419f..5dad457d6b89 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -7,7 +7,7 @@ , platformToolsVersion ? "35.0.2" , buildToolsVersions ? [ "35.0.0" ] , includeEmulator ? false -, emulatorVersion ? "35.3.10" +, emulatorVersion ? "35.5.2" , platformVersions ? [] , includeSources ? false , includeSystemImages ? false @@ -27,9 +27,20 @@ let # Determine the Android os identifier from Nix's system identifier - os = if stdenv.hostPlatform.isLinux then "linux" - else if stdenv.hostPlatform.isDarwin then "macosx" - else throw "No Android SDK tarballs are available for system architecture: ${stdenv.system}"; + os = { + x86_64-linux = "linux"; + x86_64-darwin = "macosx"; + aarch64-linux = "linux"; + aarch64-darwin = "macosx"; + }.${stdenv.hostPlatform.system} or "all"; + + # Determine the Android arch identifier from Nix's system identifier + arch = { + x86_64-linux = "x64"; + x86_64-darwin = "x64"; + aarch64-linux = "aarch64"; + aarch64-darwin = "aarch64"; + }.${stdenv.hostPlatform.system} or "all"; # Uses mkrepo.rb to create a repo spec. mkRepoJson = { packages ? [], images ? [], addons ? [] }: let @@ -71,9 +82,23 @@ let lib.attrsets.mapAttrsRecursive (path: value: if (builtins.elemAt path ((builtins.length path) - 1)) == "archives" then - (builtins.listToAttrs - (builtins.map - (archive: lib.attrsets.nameValuePair archive.os (fetchurl { inherit (archive) url sha1; })) value)) + let + validArchives = builtins.filter (archive: + let + isTargetOs = if builtins.hasAttr "os" archive then + archive.os == os || archive.os == "all" else true; + isTargetArc = if builtins.hasAttr "arch" archive then + archive.arch == arch || archive.arch == "all" else true; + in + isTargetOs && isTargetArc + ) value; + in + lib.warnIf (builtins.length validArchives == 0) + "No valid archives for ${lib.concatMapStringsSep "." (x: ''"${x}"'') path} for os=${os}, arch=${arch}" + (lib.optionals (builtins.length validArchives > 0) + (lib.last (map (archive: + (fetchurl { inherit (archive) url sha1; }) + ) validArchives))) else value ) attrSet; @@ -117,12 +142,12 @@ rec { inherit stdenv lib mkLicenses; }; - deployAndroidPackage = ({package, os ? null, buildInputs ? [], patchInstructions ? "", meta ? {}, ...}@args: + deployAndroidPackage = ({package, buildInputs ? [], patchInstructions ? "", meta ? {}, ...}@args: let extraParams = removeAttrs args [ "package" "os" "buildInputs" "patchInstructions" ]; in deployAndroidPackages ({ - inherit os buildInputs meta; + inherit buildInputs; packages = [ package ]; patchesInstructions = { "${package.name}" = patchInstructions; }; } // extraParams @@ -139,8 +164,7 @@ rec { ''; platform-tools = callPackage ./platform-tools.nix { - inherit deployAndroidPackage; - os = if stdenv.system == "aarch64-darwin" then "macosx" else os; # "macosx" is a universal binary here + inherit deployAndroidPackage os; package = check-version packages "platform-tools" platformToolsVersion; }; @@ -176,14 +200,12 @@ rec { platforms = map (version: deployAndroidPackage { - inherit os; package = check-version packages "platforms" version; } ) platformVersions; sources = map (version: deployAndroidPackage { - inherit os; package = check-version packages "sources" version; } ) platformVersions; @@ -218,7 +240,6 @@ rec { in lib.optionals (availablePackages != []) (deployAndroidPackages { - inherit os; packages = availablePackages; patchesInstructions = instructions; }) @@ -247,14 +268,12 @@ rec { google-apis = map (version: deployAndroidPackage { - inherit os; package = (check-version addons "addons" version).google_apis; } ) (builtins.filter (platformVersion: platformVersion < "26") platformVersions); # API level 26 and higher include Google APIs by default google-tv-addons = map (version: deployAndroidPackage { - inherit os; package = (check-version addons "addons" version).google_tv_addon; } ) platformVersions; diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 2f4efd5b4e1f..d461afa1c322 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -29,9 +29,15 @@ rec { "34" "35" ]; - includeEmulator = true; - includeSystemImages = true; - includeNDK = true; + includeEmulator = + with pkgs.stdenv.hostPlatform; + system == "x86_64-linux" || system == "x86_64-darwin" || system == "aarch64-darwin"; + includeSystemImages = + with pkgs.stdenv.hostPlatform; + system == "x86_64-linux" || system == "x86_64-darwin" || system == "aarch64-darwin"; + includeNDK = + with pkgs.stdenv.hostPlatform; + system == "x86_64-linux" || system == "x86_64-darwin" || system == "aarch64-darwin"; }; test-suite = pkgs.callPackage ./test-suite.nix { }; diff --git a/pkgs/development/mobile/androidenv/deploy-androidpackages.nix b/pkgs/development/mobile/androidenv/deploy-androidpackages.nix index 36d5842d9f68..1cfa3f7e9fc7 100644 --- a/pkgs/development/mobile/androidenv/deploy-androidpackages.nix +++ b/pkgs/development/mobile/androidenv/deploy-androidpackages.nix @@ -1,5 +1,5 @@ {stdenv, lib, unzip, mkLicenses}: -{packages, os ? null, nativeBuildInputs ? [], buildInputs ? [], patchesInstructions ? {}, meta ? {}, ...}@args: +{packages, nativeBuildInputs ? [], buildInputs ? [], patchesInstructions ? {}, meta ? {}, ...}@args: let extraParams = removeAttrs args [ "packages" "os" "buildInputs" "nativeBuildInputs" "patchesInstructions" ]; @@ -62,9 +62,7 @@ stdenv.mkDerivation ({ inherit buildInputs; pname = "android-sdk-${lib.concatMapStringsSep "-" (package: package.name) sortedPackages}"; version = lib.concatMapStringsSep "-" (package: package.revision) sortedPackages; - src = map (package: - if os != null && builtins.hasAttr os package.archives then package.archives.${os} else package.archives.all - ) packages; + src = map (package: package.archives) packages; nativeBuildInputs = [ unzip ] ++ nativeBuildInputs; preferLocalBuild = true; diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix index 3d23c5071a5d..765bf40df364 100644 --- a/pkgs/development/mobile/androidenv/emulator.nix +++ b/pkgs/development/mobile/androidenv/emulator.nix @@ -1,7 +1,7 @@ -{ deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgsi686Linux, postInstall }: +{ deployAndroidPackage, lib, stdenv, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgsi686Linux, postInstall }: deployAndroidPackage { - inherit package os; + inherit package; nativeBuildInputs = [ makeWrapper ] ++ lib.optionals (os == "linux") [ autoPatchelfHook ]; buildInputs = lib.optionals (os == "linux") (with pkgs; [ @@ -16,7 +16,6 @@ deployAndroidPackage { ncurses5 libdrm stdenv.cc.cc - pkgsi686Linux.glibc expat freetype nss @@ -36,7 +35,7 @@ deployAndroidPackage { libICE libSM libxkbfile - ]); + ]) ++ lib.optional (os == "linux" && stdenv.isx86_64) pkgsi686Linux.glibc; patchInstructions = lib.optionalString (os == "linux") '' addAutoPatchelfSearchPath $packageBaseDir/lib addAutoPatchelfSearchPath $packageBaseDir/lib64 diff --git a/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix b/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix index 7fc07fa4d10c..9cd207611c25 100644 --- a/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix +++ b/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix @@ -20,6 +20,9 @@ }, config ? pkgs.config, + # You probably need to set it to true to express consent. + licenseAccepted ? + config.android_sdk.accept_license or (builtins.getEnv "NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE" == "1"), }: # Copy this file to your Android project. @@ -48,9 +51,7 @@ let # Otherwise, just use the in-tree androidenv: androidEnv = pkgs.callPackage ./.. { - inherit config pkgs; - # You probably need to uncomment below line to express consent. - # licenseAccepted = true; + inherit config pkgs licenseAccepted; }; sdkArgs = { @@ -97,7 +98,6 @@ pkgs.mkShell rec { platformTools androidEmulator jdk - pkgs.android-studio ]; LANG = "C.UTF-8"; @@ -196,6 +196,9 @@ pkgs.mkShell rec { ]; } '' + export ANDROID_USER_HOME=$PWD/.android + mkdir -p $ANDROID_USER_HOME + avdmanager delete avd -n testAVD || true echo "" | avdmanager create avd --force --name testAVD --package 'system-images;android-35;google_apis;x86_64' result=$(avdmanager list avd) diff --git a/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix b/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix index 5e239942e653..b4266eb4f74c 100644 --- a/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix +++ b/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix @@ -19,6 +19,9 @@ config.allowUnfree = true; }, config ? pkgs.config, + # You probably need to set it to true to express consent. + licenseAccepted ? + config.android_sdk.accept_license or (builtins.getEnv "NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE" == "1"), }: # Copy this file to your Android project. @@ -50,9 +53,7 @@ let # Otherwise, just use the in-tree androidenv: androidEnv = pkgs.callPackage ./.. { - inherit config pkgs; - # You probably need to uncomment below line to express consent. - # licenseAccepted = true; + inherit config pkgs licenseAccepted; }; sdkArgs = { @@ -92,7 +93,6 @@ pkgs.mkShell rec { androidSdk platformTools jdk - pkgs.android-studio ]; LANG = "C.UTF-8"; diff --git a/pkgs/development/mobile/androidenv/examples/shell.nix b/pkgs/development/mobile/androidenv/examples/shell.nix index 2c0491ce67cc..05e078a03f9e 100644 --- a/pkgs/development/mobile/androidenv/examples/shell.nix +++ b/pkgs/development/mobile/androidenv/examples/shell.nix @@ -16,7 +16,10 @@ config.allowUnfree = true; }, - config ? pkgs.config + config ? pkgs.config, + # You probably need to set it to true to express consent. + licenseAccepted ? + config.android_sdk.accept_license or (builtins.getEnv "NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE" == "1"), }: # Copy this file to your Android project. @@ -57,9 +60,7 @@ let # Otherwise, just use the in-tree androidenv: androidEnv = pkgs.callPackage ./.. { - inherit config pkgs; - # You probably need to uncomment below line to express consent. - # licenseAccepted = true; + inherit config pkgs licenseAccepted; }; androidComposition = androidEnv.composeAndroidPackages { @@ -121,7 +122,7 @@ let in pkgs.mkShell rec { name = "androidenv-demo"; - packages = [ androidSdk platformTools jdk pkgs.android-studio ]; + packages = [ androidSdk platformTools jdk ]; LANG = "C.UTF-8"; LC_ALL = "C.UTF-8"; diff --git a/pkgs/development/mobile/androidenv/fetchrepo.sh b/pkgs/development/mobile/androidenv/fetchrepo.sh index ab5bf419c31a..10c106ff96c5 100755 --- a/pkgs/development/mobile/androidenv/fetchrepo.sh +++ b/pkgs/development/mobile/androidenv/fetchrepo.sh @@ -16,11 +16,11 @@ pushd "$(dirname "$0")" &>/dev/null || exit 1 mkdir -p xml -fetch repository2-1.xml xml/repository2-1.xml +fetch repository2-3.xml xml/repository2-3.xml for img in android android-tv android-wear android-wear-cn android-automotive google_apis google_apis_playstore do - fetch sys-img/$img/sys-img2-1.xml xml/$img-sys-img2-1.xml + fetch sys-img/$img/sys-img2-3.xml xml/$img-sys-img2-3.xml done -fetch addon2-1.xml xml/addon2-1.xml +fetch addon2-3.xml xml/addon2-3.xml popd &>/dev/null diff --git a/pkgs/development/mobile/androidenv/mkrepo.rb b/pkgs/development/mobile/androidenv/mkrepo.rb index 8c38a09c513a..eef50b463a38 100644 --- a/pkgs/development/mobile/androidenv/mkrepo.rb +++ b/pkgs/development/mobile/androidenv/mkrepo.rb @@ -157,8 +157,12 @@ def package_archives package archives = {} package.css('> archives > archive').each do |archive| host_os = text archive.at_css('> host-os') + host_arch = text archive.at_css('> host-arch') host_os = 'all' if empty?(host_os) - archives[host_os] = { + host_arch = 'all' if empty?(host_arch) + archives[host_os + host_arch] = { + 'os' => host_os, + 'arch' => host_arch, 'size' => Integer(text(archive.at_css('> complete > size'))), 'sha1' => text(archive.at_css('> complete > checksum')), 'url' => yield(text(archive.at_css('> complete > url'))) @@ -184,7 +188,7 @@ def fixup value Hash[value.map do |k, v| if k == 'archives' && v.is_a?(Hash) [k, v.map do |os, archive| - fixup({'os' => os}.merge(archive)) + fixup(archive) end] elsif v.is_a?(Hash) [k, fixup(v)] diff --git a/pkgs/development/mobile/androidenv/mkrepo.sh b/pkgs/development/mobile/androidenv/mkrepo.sh index 70ceeb8f43be..81dfdbdb210c 100755 --- a/pkgs/development/mobile/androidenv/mkrepo.sh +++ b/pkgs/development/mobile/androidenv/mkrepo.sh @@ -7,15 +7,15 @@ pushd "$(dirname "$0")" &>/dev/null || exit 1 echo "Writing repo.json" >&2 cat ./repo.json | ruby mkrepo.rb \ - --packages ./xml/repository2-1.xml \ - --images ./xml/android-sys-img2-1.xml \ - --images ./xml/android-tv-sys-img2-1.xml \ - --images ./xml/android-wear-cn-sys-img2-1.xml \ - --images ./xml/android-wear-sys-img2-1.xml \ - --images ./xml/android-automotive-sys-img2-1.xml \ - --images ./xml/google_apis-sys-img2-1.xml \ - --images ./xml/google_apis_playstore-sys-img2-1.xml \ - --addons ./xml/addon2-1.xml \ + --packages ./xml/repository2-3.xml \ + --images ./xml/android-sys-img2-3.xml \ + --images ./xml/android-tv-sys-img2-3.xml \ + --images ./xml/android-wear-cn-sys-img2-3.xml \ + --images ./xml/android-wear-sys-img2-3.xml \ + --images ./xml/android-automotive-sys-img2-3.xml \ + --images ./xml/google_apis-sys-img2-3.xml \ + --images ./xml/google_apis_playstore-sys-img2-3.xml \ + --addons ./xml/addon2-3.xml \ | sponge repo.json popd &>/dev/null diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix index f72fa0c8bd4a..b57d0c84d7bc 100644 --- a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix +++ b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -8,7 +8,7 @@ let ]) + ":${platform-tools}/platform-tools"; in deployAndroidPackage rec { - inherit package os; + inherit package; nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; autoPatchelfIgnoreMissingDeps = [ "*" ]; diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index 05542ae6dc02..478259e812c9 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -1,7 +1,7 @@ {deployAndroidPackage, lib, package, os, autoPatchelfHook, pkgs}: deployAndroidPackage { - inherit package os; + inherit package; nativeBuildInputs = lib.optionals (os == "linux") [ autoPatchelfHook ]; buildInputs = lib.optionals (os == "linux") [ pkgs.glibc (lib.getLib pkgs.stdenv.cc.cc) pkgs.zlib pkgs.ncurses5 ]; diff --git a/pkgs/development/mobile/androidenv/repo.json b/pkgs/development/mobile/androidenv/repo.json index 2d116dd6778b..77295eeaa17a 100644 --- a/pkgs/development/mobile/androidenv/repo.json +++ b/pkgs/development/mobile/androidenv/repo.json @@ -4,6 +4,7 @@ "google_apis": { "archives": [ { + "arch": "all", "os": "all", "sha1": "cc0711857c881fa7534f90cf8cc09b8fe985484d", "size": 65781578, @@ -11,7 +12,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-10", @@ -21,6 +22,7 @@ }, "type-details": { "api-level:0": "10", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -42,13 +44,37 @@ } } }, + "libraries:5": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + } + }, "tag:3": { "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:4": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -57,6 +83,7 @@ "google_apis": { "archives": [ { + "arch": "all", "os": "all", "sha1": "5eab5e81addee9f3576d456d205208314b5146a5", "size": 83477179, @@ -64,7 +91,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-11", @@ -74,6 +101,7 @@ }, "type-details": { "api-level:0": "11", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -88,13 +116,30 @@ } } }, + "libraries:5": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + } + }, "tag:3": { "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:4": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -103,6 +148,7 @@ "google_apis": { "archives": [ { + "arch": "all", "os": "all", "sha1": "e9999f4fa978812174dfeceec0721c793a636e5d", "size": 86099835, @@ -110,7 +156,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-12", @@ -120,6 +166,7 @@ }, "type-details": { "api-level:0": "12", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -141,19 +188,44 @@ } } }, + "libraries:5": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + } + }, "tag:3": { "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:4": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "google_tv_addon": { "archives": [ { + "arch": "all", "os": "all", "sha1": "92128a12e7e8b0fb5bac59153d7779b717e7b840", "size": 78266751, @@ -161,7 +233,7 @@ } ], "displayName": "Google TV Addon", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-googletv-license", "name": "google_tv_addon", "path": "add-ons/addon-google_tv_addon-google-12", @@ -171,6 +243,7 @@ }, "type-details": { "api-level:0": "12", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -180,9 +253,17 @@ "display:1": "Google TV Addon", "id:0": "google_tv_addon" }, + "tag:4": { + "display:1": "Google TV Addon", + "id:0": "google_tv_addon" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -191,6 +272,7 @@ "google_apis": { "archives": [ { + "arch": "all", "os": "all", "sha1": "3b153edd211c27dc736c893c658418a4f9041417", "size": 88615525, @@ -198,7 +280,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-13", @@ -208,6 +290,7 @@ }, "type-details": { "api-level:0": "13", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -229,19 +312,44 @@ } } }, + "libraries:5": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + } + }, "tag:3": { "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:4": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "google_tv_addon": { "archives": [ { + "arch": "all", "os": "all", "sha1": "b73f7c66011ac8180b44aa4e83b8d78c66ea9a09", "size": 87721879, @@ -249,7 +357,7 @@ } ], "displayName": "Google TV Addon", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-googletv-license", "name": "google_tv_addon", "path": "add-ons/addon-google_tv_addon-google-13", @@ -259,6 +367,7 @@ }, "type-details": { "api-level:0": "13", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -268,9 +377,17 @@ "display:1": "Google TV Addon", "id:0": "google_tv_addon" }, + "tag:4": { + "display:1": "Google TV Addon", + "id:0": "google_tv_addon" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -279,6 +396,7 @@ "google_apis": { "archives": [ { + "arch": "all", "os": "all", "sha1": "f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39", "size": 106533714, @@ -286,7 +404,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-14", @@ -296,6 +414,7 @@ }, "type-details": { "api-level:0": "14", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -317,13 +436,37 @@ } } }, + "libraries:5": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + } + }, "tag:3": { "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:4": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -332,6 +475,7 @@ "google_apis": { "archives": [ { + "arch": "all", "os": "all", "sha1": "d0d2bf26805eb271693570a1aaec33e7dc3f45e9", "size": 106624396, @@ -339,7 +483,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-15", @@ -349,6 +493,7 @@ }, "type-details": { "api-level:0": "15", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -377,13 +522,44 @@ } } }, + "libraries:5": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, "tag:3": { "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:4": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -392,6 +568,7 @@ "google_apis": { "archives": [ { + "arch": "all", "os": "all", "sha1": "ee6acf1b01020bfa8a8e24725dbc4478bee5e792", "size": 127341982, @@ -399,7 +576,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-16", @@ -409,6 +586,7 @@ }, "type-details": { "api-level:0": "16", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -437,13 +615,44 @@ } } }, + "libraries:5": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, "tag:3": { "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:4": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -452,6 +661,7 @@ "google_apis": { "archives": [ { + "arch": "all", "os": "all", "sha1": "a076be0677f38df8ca5536b44dfb411a0c808c4f", "size": 137231243, @@ -459,7 +669,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-17", @@ -469,6 +679,7 @@ }, "type-details": { "api-level:0": "17", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -497,13 +708,44 @@ } } }, + "libraries:5": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, "tag:3": { "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:4": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -512,6 +754,7 @@ "google_apis": { "archives": [ { + "arch": "all", "os": "all", "sha1": "6109603409debdd40854d4d4a92eaf8481462c8b", "size": 143195183, @@ -519,7 +762,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-18", @@ -529,6 +772,7 @@ }, "type-details": { "api-level:0": "18", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -557,13 +801,44 @@ } } }, + "libraries:5": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, "tag:3": { "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:4": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -572,6 +847,7 @@ "google_apis": { "archives": [ { + "arch": "all", "os": "all", "sha1": "5b933abe830b2f25b4c0f171d45e9e0651e56311", "size": 147081, @@ -579,7 +855,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-19", @@ -589,6 +865,7 @@ }, "type-details": { "api-level:0": "19", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -617,13 +894,44 @@ } } }, + "libraries:5": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, "tag:3": { "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:4": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -632,6 +940,7 @@ "google_apis": { "archives": [ { + "arch": "all", "os": "all", "sha1": "66a754efb24e9bb07cc51648426443c7586c9d4a", "size": 179499, @@ -639,7 +948,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-21", @@ -649,6 +958,7 @@ }, "type-details": { "api-level:0": "21", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -677,13 +987,44 @@ } } }, + "libraries:5": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, "tag:3": { "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:4": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -692,6 +1033,7 @@ "google_apis": { "archives": [ { + "arch": "all", "os": "all", "sha1": "5def0f42160cba8acff51b9c0c7e8be313de84f5", "size": 179259, @@ -699,7 +1041,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-22", @@ -709,6 +1051,7 @@ }, "type-details": { "api-level:0": "22", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -737,13 +1080,44 @@ } } }, + "libraries:5": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, "tag:3": { "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:4": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -752,6 +1126,7 @@ "google_apis": { "archives": [ { + "arch": "all", "os": "all", "sha1": "04c5cc1a7c88967250ebba9561d81e24104167db", "size": 179900, @@ -759,7 +1134,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-23", @@ -769,6 +1144,7 @@ }, "type-details": { "api-level:0": "23", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -797,13 +1173,44 @@ } } }, + "libraries:5": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, "tag:3": { "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:4": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -812,6 +1219,7 @@ "google_apis": { "archives": [ { + "arch": "all", "os": "all", "sha1": "31361c2868f27343ee917fbd259c1463821b6145", "size": 154865, @@ -819,7 +1227,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-24", @@ -829,6 +1237,7 @@ }, "type-details": { "api-level:0": "24", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -857,13 +1266,44 @@ } } }, + "libraries:5": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, "tag:3": { "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:4": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -872,6 +1312,7 @@ "google_apis": { "archives": [ { + "arch": "all", "os": "all", "sha1": "550e83eea9513ab11c44919ac6da54b36084a9f3", "size": 154871, @@ -879,7 +1320,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-25", @@ -889,6 +1330,7 @@ }, "type-details": { "api-level:0": "23", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -917,13 +1359,44 @@ } } }, + "libraries:5": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, "tag:3": { "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:4": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -932,6 +1405,7 @@ "google_apis": { "archives": [ { + "arch": "all", "os": "all", "sha1": "1f92abf3a76be66ae8032257fc7620acbd2b2e3a", "size": 34908058, @@ -939,7 +1413,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-3", @@ -949,6 +1423,7 @@ }, "type-details": { "api-level:0": "3", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -963,13 +1438,30 @@ } } }, + "libraries:5": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + } + }, "tag:3": { "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:4": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -978,6 +1470,7 @@ "google_apis": { "archives": [ { + "arch": "all", "os": "all", "sha1": "9b6e86d8568558de4d606a7debc4f6049608dbd0", "size": 42435735, @@ -985,7 +1478,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-4", @@ -995,6 +1488,7 @@ }, "type-details": { "api-level:0": "4", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -1009,13 +1503,30 @@ } } }, + "libraries:5": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + } + }, "tag:3": { "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:4": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -1024,6 +1535,7 @@ "google_apis": { "archives": [ { + "arch": "all", "os": "all", "sha1": "46eaeb56b645ee7ffa24ede8fa17f3df70db0503", "size": 49123776, @@ -1031,7 +1543,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-5", @@ -1041,6 +1553,7 @@ }, "type-details": { "api-level:0": "5", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -1055,13 +1568,30 @@ } } }, + "libraries:5": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + } + }, "tag:3": { "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:4": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -1070,6 +1600,7 @@ "google_apis": { "archives": [ { + "arch": "all", "os": "all", "sha1": "5ff545d96e031e09580a6cf55713015c7d4936b2", "size": 53382941, @@ -1077,7 +1608,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-6", @@ -1087,6 +1618,7 @@ }, "type-details": { "api-level:0": "6", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -1101,13 +1633,30 @@ } } }, + "libraries:5": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + } + }, "tag:3": { "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:4": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -1116,6 +1665,7 @@ "google_apis": { "archives": [ { + "arch": "all", "os": "all", "sha1": "2e7f91e0fe34fef7f58aeced973c6ae52361b5ac", "size": 53691339, @@ -1123,7 +1673,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-7", @@ -1133,6 +1683,7 @@ }, "type-details": { "api-level:0": "7", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -1147,13 +1698,30 @@ } } }, + "libraries:5": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + } + }, "tag:3": { "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:4": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -1162,6 +1730,7 @@ "google_apis": { "archives": [ { + "arch": "all", "os": "all", "sha1": "3079958e7ec87222cac1e6b27bc471b27bf2c352", "size": 59505020, @@ -1169,7 +1738,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-8", @@ -1179,6 +1748,7 @@ }, "type-details": { "api-level:0": "8", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -1193,13 +1763,30 @@ } } }, + "libraries:5": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + } + }, "tag:3": { "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:4": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -1208,6 +1795,7 @@ "google_apis": { "archives": [ { + "arch": "all", "os": "all", "sha1": "78664645a1e9accea4430814f8694291a7f1ea5d", "size": 63401546, @@ -1215,7 +1803,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-9", @@ -1225,6 +1813,7 @@ }, "type-details": { "api-level:0": "9", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -1239,13 +1828,30 @@ } } }, + "libraries:5": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + } + }, "tag:3": { "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:4": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -1255,6 +1861,7 @@ "extras;android;m2repository": { "archives": [ { + "arch": "all", "os": "all", "sha1": "a0d22beacc106a6977321f2b07d692ce4979e96a", "size": 355529608, @@ -1262,7 +1869,7 @@ } ], "displayName": "Android Support Repository", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "extras-android-m2repository", "path": "extras/android/m2repository", @@ -1285,6 +1892,7 @@ "extras;google;Android_Emulator_Hypervisor_Driver": { "archives": [ { + "arch": "all", "os": "windows", "sha1": "1a4ef9875cb0adfe5500632ad7140027cfb080d9", "size": 168741, @@ -1292,7 +1900,7 @@ } ], "displayName": "Android Emulator hypervisor driver (installer)", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "extras-google-Android_Emulator_Hypervisor_Driver", "path": "extras/google/Android_Emulator_Hypervisor_Driver", @@ -1315,6 +1923,7 @@ "extras;google;admob_ads_sdk": { "archives": [ { + "arch": "all", "os": "all", "sha1": "0102859d9575baa0bf4fd5eb422af2ad0fe6cb82", "size": 704512, @@ -1322,7 +1931,7 @@ } ], "displayName": "Google AdMob Ads SDK", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "extras-google-admob_ads_sdk", "path": "extras/google/admob_ads_sdk", @@ -1343,6 +1952,7 @@ "extras;google;analytics_sdk_v2": { "archives": [ { + "arch": "all", "os": "all", "sha1": "dc14026bf0ce78315cb5dd00552607de0894de83", "size": 211432, @@ -1350,7 +1960,7 @@ } ], "displayName": "Google Analytics App Tracking SDK", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "extras-google-analytics_sdk_v2", "path": "extras/google/analytics_sdk_v2", @@ -1371,18 +1981,28 @@ "extras;google;auto": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "edd9d9389ac511d5f28e47cdfbf54bbcd7294d7f", + "size": 7572204, + "url": "https://dl.google.com/android/repository/desktop-head-unit-darwin-aarch64_r02.1.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "4f8a3d3e32b27de1fc190d149039842e76a55bdd", "size": 7797329, "url": "https://dl.google.com/android/repository/desktop-head-unit-darwin-x64_r02.1.zip" }, { + "arch": "x64", "os": "linux", "sha1": "5d87eb87a1421e59d528eac1f5cdd406c0b39f51", "size": 6927985, "url": "https://dl.google.com/android/repository/desktop-head-unit-linux-x64_r02.1.zip" }, { + "arch": "x64", "os": "windows", "sha1": "c27bf84e59dda7b79315b6ca2a314063feffd6ac", "size": 7012059, @@ -1390,7 +2010,7 @@ } ], "displayName": "Android Auto Desktop Head Unit Emulator", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "extras-google-auto", "path": "extras/google/auto", @@ -1408,6 +2028,7 @@ "extras;google;gcm": { "archives": [ { + "arch": "all", "os": "all", "sha1": "ad066fd0dc7fc99d8aadac09c65a3c2519fbc7bf", "size": 5901400, @@ -1415,7 +2036,7 @@ } ], "displayName": "Google Cloud Messaging for Android Library", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "extras-google-gcm", "path": "extras/google/gcm", @@ -1436,6 +2057,7 @@ "extras;google;google_play_services": { "archives": [ { + "arch": "all", "os": "all", "sha1": "f95bf19634e2ab0430923247fe2c50246432d2e9", "size": 15456884, @@ -1450,7 +2072,7 @@ } }, "displayName": "Google Play services", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "extras-google-google_play_services", "path": "extras/google/google_play_services", @@ -1471,6 +2093,7 @@ "extras;google;google_play_services_froyo": { "archives": [ { + "arch": "all", "os": "all", "sha1": "92558dbc380bba3d55d0ec181167fb05ce7c79d9", "size": 5265389, @@ -1478,7 +2101,7 @@ } ], "displayName": "Google Play services for Froyo", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "extras-google-google_play_services_froyo", "path": "extras/google/google_play_services_froyo", @@ -1499,6 +2122,7 @@ "extras;google;instantapps": { "archives": [ { + "arch": "all", "os": "all", "sha1": "c498367dcd7db30154b3e70c4ddbb1b0ea4b8d20", "size": 39524850, @@ -1506,7 +2130,7 @@ } ], "displayName": "Google Play Instant Development SDK", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "extras-google-instantapps", "path": "extras/google/instantapps", @@ -1529,6 +2153,7 @@ "extras;google;m2repository": { "archives": [ { + "arch": "all", "os": "all", "sha1": "05086add9e3a0eb1b67111108d7757a4337c3f10", "size": 215426029, @@ -1543,7 +2168,7 @@ } }, "displayName": "Google Repository", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "extras-google-m2repository", "path": "extras/google/m2repository", @@ -1564,6 +2189,7 @@ "extras;google;market_apk_expansion": { "archives": [ { + "arch": "all", "os": "all", "sha1": "5305399dc1a56814e86b8459ce24871916f78b8c", "size": 110201, @@ -1571,7 +2197,7 @@ } ], "displayName": "Google Play APK Expansion library", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "extras-google-market_apk_expansion", "path": "extras/google/market_apk_expansion", @@ -1592,6 +2218,7 @@ "extras;google;market_licensing": { "archives": [ { + "arch": "all", "os": "all", "sha1": "355e8dc304a92a5616db235af8ee7bd554356254", "size": 75109, @@ -1599,7 +2226,7 @@ } ], "displayName": "Google Play Licensing Library", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "extras-google-market_licensing", "path": "extras/google/market_licensing", @@ -1621,6 +2248,7 @@ "extras;google;simulators": { "archives": [ { + "arch": "all", "os": "all", "sha1": "4fb5344e34e8faab4db18af07dace44c50db26a7", "size": 2167286, @@ -1628,7 +2256,7 @@ } ], "displayName": "Android Auto API Simulators", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "extras-google-simulators", "path": "extras/google/simulators", @@ -1649,6 +2277,7 @@ "extras;google;usb_driver": { "archives": [ { + "arch": "all", "os": "windows", "sha1": "08a48c39084e9443f6146c239cbd3be6f91e681b", "size": 8682039, @@ -1656,7 +2285,7 @@ } ], "displayName": "Google USB Driver", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "extras-google-usb_driver", "path": "extras/google/usb_driver", @@ -1677,6 +2306,7 @@ "extras;google;webdriver": { "archives": [ { + "arch": "all", "os": "all", "sha1": "13f3a3b2670a5fc04a7342861644be9a01b07e38", "size": 4055193, @@ -1684,7 +2314,7 @@ } ], "displayName": "Google Web Driver", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "extras-google-webdriver", "path": "extras/google/webdriver", @@ -2339,6 +2969,7 @@ "armeabi-v7a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "8537616a7add47cce24c60f18bc2429e3dc90ae3", "size": 67927049, @@ -2353,7 +2984,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-10-default-armeabi-v7a", "path": "system-images/android-10/default/armeabi-v7a", @@ -2363,7 +2994,9 @@ }, "type-details": { "abi:2": "armeabi-v7a", + "abi:3": "armeabi-v7a", "api-level:0": "10", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -2371,12 +3004,18 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "a166d5ccbb165e1dd5464fbfeec30a61f77790d8", "size": 75386095, @@ -2391,7 +3030,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-10-default-x86", "path": "system-images/android-10/default/x86", @@ -2401,7 +3040,9 @@ }, "type-details": { "abi:2": "x86", + "abi:3": "x86", "api-level:0": "10", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -2409,6 +3050,11 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } } @@ -2417,6 +3063,7 @@ "armeabi-v7a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "970abf3a2a9937a43576afd9bb56e4a8191947f8", "size": 110706432, @@ -2431,7 +3078,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-10-google_apis-armeabi-v7a", "path": "system-images/android-10/google_apis/armeabi-v7a", @@ -2441,7 +3088,9 @@ }, "type-details": { "abi:3": "armeabi-v7a", + "abi:4": "armeabi-v7a", "api-level:0": "10", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -2449,15 +3098,24 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "070a9552e3d358d8e72e8b2042e539e2b7a1b035", "size": 118634346, @@ -2472,7 +3130,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-10-google_apis-x86", "path": "system-images/android-10/google_apis/x86", @@ -2482,7 +3140,9 @@ }, "type-details": { "abi:3": "x86", + "abi:4": "x86", "api-level:0": "10", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -2490,9 +3150,17 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -2503,6 +3171,7 @@ "armeabi-v7a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "d8991b0c06b18d7d6ed4169d67460ee1add6661b", "size": 99621822, @@ -2510,7 +3179,7 @@ } ], "displayName": "ARM EABI v7a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-14-default-armeabi-v7a", "path": "system-images/android-14/default/armeabi-v7a", @@ -2520,7 +3189,9 @@ }, "type-details": { "abi:2": "armeabi-v7a", + "abi:3": "armeabi-v7a", "api-level:0": "14", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -2528,6 +3199,11 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } } @@ -2538,6 +3214,7 @@ "armeabi-v7a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "03d7ed95a9d3b107e3f2e5b166d017ea12529e70", "size": 102452069, @@ -2552,7 +3229,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-15-default-armeabi-v7a", "path": "system-images/android-15/default/armeabi-v7a", @@ -2562,7 +3239,9 @@ }, "type-details": { "abi:2": "armeabi-v7a", + "abi:3": "armeabi-v7a", "api-level:0": "15", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -2570,12 +3249,18 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "61381aef3fd0cdc8255cb3298072a920c80186ca", "size": 116030933, @@ -2590,7 +3275,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-15-default-x86", "path": "system-images/android-15/default/x86", @@ -2600,7 +3285,9 @@ }, "type-details": { "abi:2": "x86", + "abi:3": "x86", "api-level:0": "15", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -2608,6 +3295,11 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } } @@ -2616,6 +3308,7 @@ "armeabi-v7a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "6deb76cf34760a6037cb18d89772c9e986d07497", "size": 148773442, @@ -2630,7 +3323,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-15-google_apis-armeabi-v7a", "path": "system-images/android-15/google_apis/armeabi-v7a", @@ -2640,7 +3333,9 @@ }, "type-details": { "abi:3": "armeabi-v7a", + "abi:4": "armeabi-v7a", "api-level:0": "15", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -2648,15 +3343,24 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "5ef2c5481f5bb8789c0b5224d46fb2e13602a450", "size": 163325511, @@ -2671,7 +3375,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-15-google_apis-x86", "path": "system-images/android-15/google_apis/x86", @@ -2681,7 +3385,9 @@ }, "type-details": { "abi:3": "x86", + "abi:4": "x86", "api-level:0": "15", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -2689,9 +3395,17 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -2702,6 +3416,7 @@ "armeabi-v7a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "69b944b0d5a18c8563fa80d7d229af64890f724e", "size": 118646340, @@ -2716,7 +3431,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-16-default-armeabi-v7a", "path": "system-images/android-16/default/armeabi-v7a", @@ -2726,7 +3441,9 @@ }, "type-details": { "abi:2": "armeabi-v7a", + "abi:3": "armeabi-v7a", "api-level:0": "16", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -2734,12 +3451,18 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } }, "mips": { "archives": [ { + "arch": "all", "os": "all", "sha1": "67943c54fb3943943ffeb05fdd39c0b753681f6e", "size": 122482530, @@ -2747,7 +3470,7 @@ } ], "displayName": "MIPS System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "mips-android-sysimage-license", "name": "system-image-16-default-mips", "path": "system-images/android-16/default/mips", @@ -2757,7 +3480,9 @@ }, "type-details": { "abi:2": "mips", + "abi:3": "mips", "api-level:0": "16", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -2765,12 +3490,18 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "ee6718e7556c8f8bd8d3f470b34f2c5dbf9bcff4", "size": 135305313, @@ -2785,7 +3516,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-16-default-x86", "path": "system-images/android-16/default/x86", @@ -2795,7 +3526,9 @@ }, "type-details": { "abi:2": "x86", + "abi:3": "x86", "api-level:0": "16", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -2803,6 +3536,11 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } } @@ -2811,6 +3549,7 @@ "armeabi-v7a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "5a5ff097680c6dae473c8719296ce6d7b70edb2d", "size": 168845378, @@ -2825,7 +3564,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-16-google_apis-armeabi-v7a", "path": "system-images/android-16/google_apis/armeabi-v7a", @@ -2835,7 +3574,9 @@ }, "type-details": { "abi:3": "armeabi-v7a", + "abi:4": "armeabi-v7a", "api-level:0": "16", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -2843,15 +3584,24 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "246903c75f5aa3db7fb58cac877f2201fbbfd94a", "size": 186372521, @@ -2866,7 +3616,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-16-google_apis-x86", "path": "system-images/android-16/google_apis/x86", @@ -2876,7 +3626,9 @@ }, "type-details": { "abi:3": "x86", + "abi:4": "x86", "api-level:0": "16", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -2884,9 +3636,17 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -2897,6 +3657,7 @@ "armeabi-v7a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "a18a3fd0958ec4ef52507f58e414fc5c7dfd59d6", "size": 124437041, @@ -2911,7 +3672,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-17-default-armeabi-v7a", "path": "system-images/android-17/default/armeabi-v7a", @@ -2921,7 +3682,9 @@ }, "type-details": { "abi:2": "armeabi-v7a", + "abi:3": "armeabi-v7a", "api-level:0": "17", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -2929,12 +3692,18 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } }, "mips": { "archives": [ { + "arch": "all", "os": "all", "sha1": "f0c6e153bd584c29e51b5c9723cfbf30f996a05d", "size": 131781761, @@ -2942,7 +3711,7 @@ } ], "displayName": "MIPS System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "mips-android-sysimage-license", "name": "system-image-17-default-mips", "path": "system-images/android-17/default/mips", @@ -2952,7 +3721,9 @@ }, "type-details": { "abi:2": "mips", + "abi:3": "mips", "api-level:0": "17", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -2960,12 +3731,18 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "1ad5ffb51e31f5fe9fa47411fed2c2ade9a33865", "size": 194811128, @@ -2980,7 +3757,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-17-default-x86", "path": "system-images/android-17/default/x86", @@ -2990,7 +3767,9 @@ }, "type-details": { "abi:3": "x86", + "abi:4": "x86", "api-level:0": "17", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -2998,9 +3777,17 @@ "display:1": "Google APIs", "id:0": "default" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "default" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -3009,6 +3796,7 @@ "armeabi-v7a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "a59f26cb5707da97e869a27d87b83477204ac594", "size": 174631794, @@ -3023,7 +3811,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-17-google_apis-armeabi-v7a", "path": "system-images/android-17/google_apis/armeabi-v7a", @@ -3033,7 +3821,9 @@ }, "type-details": { "abi:3": "armeabi-v7a", + "abi:4": "armeabi-v7a", "api-level:0": "17", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -3041,15 +3831,24 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "1ad5ffb51e31f5fe9fa47411fed2c2ade9a33865", "size": 194811128, @@ -3064,7 +3863,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-17-google_apis-x86", "path": "system-images/android-17/google_apis/x86", @@ -3074,7 +3873,9 @@ }, "type-details": { "abi:3": "x86", + "abi:4": "x86", "api-level:0": "17", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -3082,9 +3883,17 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -3095,6 +3904,7 @@ "armeabi-v7a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "580b583720f7de671040d5917c8c9db0c7aa03fd", "size": 130590545, @@ -3109,7 +3919,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-18-default-armeabi-v7a", "path": "system-images/android-18/default/armeabi-v7a", @@ -3119,7 +3929,9 @@ }, "type-details": { "abi:2": "armeabi-v7a", + "abi:3": "armeabi-v7a", "api-level:0": "18", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -3127,12 +3939,18 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "7a4ced4d9b0ab48047825491b4072dc2eb9b610e", "size": 150097655, @@ -3147,7 +3965,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-18-default-x86", "path": "system-images/android-18/default/x86", @@ -3157,7 +3975,9 @@ }, "type-details": { "abi:2": "x86", + "abi:3": "x86", "api-level:0": "18", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -3165,6 +3985,11 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } } @@ -3173,6 +3998,7 @@ "armeabi-v7a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "7faaccabbcc5f08e410436d3f63eea42521ea974", "size": 179015960, @@ -3187,7 +4013,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-18-google_apis-armeabi-v7a", "path": "system-images/android-18/google_apis/armeabi-v7a", @@ -3197,7 +4023,9 @@ }, "type-details": { "abi:3": "armeabi-v7a", + "abi:4": "armeabi-v7a", "api-level:0": "18", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -3205,15 +4033,24 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "dd674d719cad61602702be4b3d98edccfbfea53e", "size": 199963568, @@ -3228,7 +4065,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-18-google_apis-x86", "path": "system-images/android-18/google_apis/x86", @@ -3238,7 +4075,9 @@ }, "type-details": { "abi:3": "x86", + "abi:4": "x86", "api-level:0": "18", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -3246,9 +4085,17 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -3259,6 +4106,7 @@ "armeabi-v7a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "d1a5fd4f2e1c013c3d3d9bfe7e9db908c3ed56fa", "size": 159871567, @@ -3273,7 +4121,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-19-default-armeabi-v7a", "path": "system-images/android-19/default/armeabi-v7a", @@ -3283,7 +4131,9 @@ }, "type-details": { "abi:2": "armeabi-v7a", + "abi:3": "armeabi-v7a", "api-level:0": "19", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -3291,12 +4141,18 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "2ac82153aae97f7eae4c5a0761224fe04321d03d", "size": 185886274, @@ -3311,7 +4167,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-19-default-x86", "path": "system-images/android-19/default/x86", @@ -3321,7 +4177,9 @@ }, "type-details": { "abi:2": "x86", + "abi:3": "x86", "api-level:0": "19", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -3329,6 +4187,11 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } } @@ -3337,6 +4200,7 @@ "armeabi-v7a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "053741c7ef72c7d41394b8a09a1b86238c59c741", "size": 245902018, @@ -3351,7 +4215,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-19-google_apis-armeabi-v7a", "path": "system-images/android-19/google_apis/armeabi-v7a", @@ -3361,7 +4225,9 @@ }, "type-details": { "abi:3": "armeabi-v7a", + "abi:4": "armeabi-v7a", "api-level:0": "19", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -3369,15 +4235,24 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "67528907f6f4479112f63097f4657dad10783f5a", "size": 297020632, @@ -3392,7 +4267,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-19-google_apis-x86", "path": "system-images/android-19/google_apis/x86", @@ -3402,7 +4277,9 @@ }, "type-details": { "abi:3": "x86", + "abi:4": "x86", "api-level:0": "19", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -3410,9 +4287,17 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -3423,6 +4308,7 @@ "armeabi-v7a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "b63e28a47f11b639dd94981a458b7abfa89ac331", "size": 249428246, @@ -3430,7 +4316,7 @@ } ], "displayName": "Android TV ARM EABI v7a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-21-android-tv-armeabi-v7a", "path": "system-images/android-21/android-tv/armeabi-v7a", @@ -3440,19 +4326,26 @@ }, "type-details": { "abi:2": "armeabi-v7a", + "abi:3": "armeabi-v7a", "api-level:0": "21", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Android TV", "id:0": "android-tv" + }, + "tag:2": { + "display:1": "Android TV", + "id:0": "android-tv" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "2f8a1988188d6abfd6c6395baeb4471a034dc1e8", "size": 268946785, @@ -3460,7 +4353,7 @@ } ], "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-21-android-tv-x86", "path": "system-images/android-21/android-tv/x86", @@ -3470,13 +4363,19 @@ }, "type-details": { "abi:2": "x86", + "abi:3": "x86", "api-level:0": "21", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Android TV", "id:0": "android-tv" + }, + "tag:2": { + "display:1": "Android TV", + "id:0": "android-tv" } } } @@ -3485,6 +4384,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "c4375f1b4b4cd21a8617660e25f621cedcbd8332", "size": 211426314, @@ -3492,7 +4392,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-21-default-arm64-v8a", "path": "system-images/android-21/default/arm64-v8a", @@ -3502,7 +4402,9 @@ }, "type-details": { "abi:2": "arm64-v8a", + "abi:3": "arm64-v8a", "api-level:0": "21", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -3510,12 +4412,18 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } }, "armeabi-v7a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "8c606f81306564b65e41303d2603e4c42ded0d10", "size": 187163871, @@ -3530,7 +4438,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-21-default-armeabi-v7a", "path": "system-images/android-21/default/armeabi-v7a", @@ -3540,7 +4448,9 @@ }, "type-details": { "abi:2": "armeabi-v7a", + "abi:3": "armeabi-v7a", "api-level:0": "21", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -3548,12 +4458,18 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "00f0eb0a1003efe3316347f762e20a85d8749cff", "size": 208212529, @@ -3568,7 +4484,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-21-default-x86", "path": "system-images/android-21/default/x86", @@ -3578,7 +4494,9 @@ }, "type-details": { "abi:2": "x86", + "abi:3": "x86", "api-level:0": "21", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -3586,12 +4504,18 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "9078a095825a69e5e215713f0866c83cef65a342", "size": 292623982, @@ -3606,7 +4530,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-21-default-x86_64", "path": "system-images/android-21/default/x86_64", @@ -3616,7 +4540,9 @@ }, "type-details": { "abi:2": "x86_64", + "abi:3": "x86_64", "api-level:0": "21", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -3624,6 +4550,11 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } } @@ -3632,6 +4563,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "bad07917816ba029ddb09ce0836e4aac4a460d4d", "size": 297671829, @@ -3639,7 +4571,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-21-google_apis-arm64-v8a", "path": "system-images/android-21/google_apis/arm64-v8a", @@ -3649,7 +4581,9 @@ }, "type-details": { "abi:3": "arm64-v8a", + "abi:4": "arm64-v8a", "api-level:0": "21", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -3657,15 +4591,24 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "armeabi-v7a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "7aa0a1971365de1dc7989720c643121087026564", "size": 290282953, @@ -3680,7 +4623,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-21-google_apis-armeabi-v7a", "path": "system-images/android-21/google_apis/armeabi-v7a", @@ -3690,7 +4633,9 @@ }, "type-details": { "abi:3": "armeabi-v7a", + "abi:4": "armeabi-v7a", "api-level:0": "21", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -3698,15 +4643,24 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "c6c1d774cec79e6e71c2a24c96d0c45c043d752c", "size": 319430034, @@ -3721,7 +4675,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-21-google_apis-x86", "path": "system-images/android-21/google_apis/x86", @@ -3731,7 +4685,9 @@ }, "type-details": { "abi:3": "x86", + "abi:4": "x86", "api-level:0": "21", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -3739,15 +4695,24 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "e98ba60a0fc88d9a81a768e62db5850b6610baa4", "size": 415495987, @@ -3762,7 +4727,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-21-google_apis-x86_64", "path": "system-images/android-21/google_apis/x86_64", @@ -3772,7 +4737,9 @@ }, "type-details": { "abi:3": "x86_64", + "abi:4": "x86_64", "api-level:0": "21", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -3780,9 +4747,17 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -3793,6 +4768,7 @@ "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "c78efd5a155622eb490be9d326f5783993375c35", "size": 293118949, @@ -3800,7 +4776,7 @@ } ], "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-22-android-tv-x86", "path": "system-images/android-22/android-tv/x86", @@ -3810,13 +4786,19 @@ }, "type-details": { "abi:2": "x86", + "abi:3": "x86", "api-level:0": "22", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Android TV", "id:0": "android-tv" + }, + "tag:2": { + "display:1": "Android TV", + "id:0": "android-tv" } } } @@ -3825,6 +4807,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "703e27a9a4fb7a6e763cb7d713b89e5249a8fc99", "size": 219124634, @@ -3832,7 +4815,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-22-default-arm64-v8a", "path": "system-images/android-22/default/arm64-v8a", @@ -3842,7 +4825,9 @@ }, "type-details": { "abi:2": "arm64-v8a", + "abi:3": "arm64-v8a", "api-level:0": "22", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -3850,12 +4835,18 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } }, "armeabi-v7a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "2114ec015dbf3a16cbcb4f63e8a84a1b206a07a1", "size": 194596267, @@ -3870,7 +4861,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-22-default-armeabi-v7a", "path": "system-images/android-22/default/armeabi-v7a", @@ -3880,7 +4871,9 @@ }, "type-details": { "abi:2": "armeabi-v7a", + "abi:3": "armeabi-v7a", "api-level:0": "22", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -3888,12 +4881,18 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e", "size": 214268954, @@ -3908,7 +4907,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-22-default-x86", "path": "system-images/android-22/default/x86", @@ -3918,7 +4917,9 @@ }, "type-details": { "abi:2": "x86", + "abi:3": "x86", "api-level:0": "22", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -3926,12 +4927,18 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4", "size": 299976630, @@ -3946,7 +4953,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-22-default-x86_64", "path": "system-images/android-22/default/x86_64", @@ -3956,7 +4963,9 @@ }, "type-details": { "abi:2": "x86_64", + "abi:3": "x86_64", "api-level:0": "22", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -3964,6 +4973,11 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } } @@ -3972,6 +4986,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "fd62e99e278f337fd58cadd37bf4f4c1998c8297", "size": 382307460, @@ -3979,7 +4994,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-22-google_apis-arm64-v8a", "path": "system-images/android-22/google_apis/arm64-v8a", @@ -3989,7 +5004,9 @@ }, "type-details": { "abi:3": "arm64-v8a", + "abi:4": "arm64-v8a", "api-level:0": "22", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -3997,15 +5014,24 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "armeabi-v7a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "6a61dd66ec8ac8e678cc19c1331047dade07509f", "size": 394864140, @@ -4020,7 +5046,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-22-google_apis-armeabi-v7a", "path": "system-images/android-22/google_apis/armeabi-v7a", @@ -4030,7 +5056,9 @@ }, "type-details": { "abi:3": "armeabi-v7a", + "abi:4": "armeabi-v7a", "api-level:0": "22", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -4038,15 +5066,24 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "859ca1d8dcdaaf931effda3f06af95a3740b60d9", "size": 421293384, @@ -4061,7 +5098,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-22-google_apis-x86", "path": "system-images/android-22/google_apis/x86", @@ -4071,7 +5108,9 @@ }, "type-details": { "abi:3": "x86", + "abi:4": "x86", "api-level:0": "22", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -4079,15 +5118,24 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "f99714383c5459d747ac7cdd8043419c6adafe60", "size": 579197399, @@ -4102,7 +5150,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-22-google_apis-x86_64", "path": "system-images/android-22/google_apis/x86_64", @@ -4112,7 +5160,9 @@ }, "type-details": { "abi:3": "x86_64", + "abi:4": "x86_64", "api-level:0": "22", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -4120,9 +5170,17 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -4133,6 +5191,7 @@ "armeabi-v7a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "bd84678ae8caf71d584f5210e866b2807e7b4b52", "size": 304269268, @@ -4140,7 +5199,7 @@ } ], "displayName": "Android TV ARM EABI v7a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-23-android-tv-armeabi-v7a", "path": "system-images/android-23/android-tv/armeabi-v7a", @@ -4150,19 +5209,26 @@ }, "type-details": { "abi:2": "armeabi-v7a", + "abi:3": "armeabi-v7a", "api-level:0": "23", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Android TV", "id:0": "android-tv" + }, + "tag:2": { + "display:1": "Android TV", + "id:0": "android-tv" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "094575ec634a662115a7a4c2b63d1743dfbca43c", "size": 340921232, @@ -4177,7 +5243,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-23-android-tv-x86", "path": "system-images/android-23/android-tv/x86", @@ -4187,13 +5253,19 @@ }, "type-details": { "abi:2": "x86", + "abi:3": "x86", "api-level:0": "23", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Android TV", "id:0": "android-tv" + }, + "tag:2": { + "display:1": "Android TV", + "id:0": "android-tv" } } } @@ -4202,6 +5274,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "ac18f3bd717e02804eee585e029f5dbc1a2616bf", "size": 253807785, @@ -4209,7 +5282,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-23-default-arm64-v8a", "path": "system-images/android-23/default/arm64-v8a", @@ -4219,7 +5292,9 @@ }, "type-details": { "abi:2": "arm64-v8a", + "abi:3": "arm64-v8a", "api-level:0": "23", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -4227,12 +5302,18 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } }, "armeabi-v7a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "7cf2ad756e54a3acfd81064b63cb0cb9dff2798d", "size": 238333358, @@ -4247,7 +5328,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-23-default-armeabi-v7a", "path": "system-images/android-23/default/armeabi-v7a", @@ -4257,7 +5338,9 @@ }, "type-details": { "abi:2": "armeabi-v7a", + "abi:3": "armeabi-v7a", "api-level:0": "23", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -4265,12 +5348,18 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "f6c3e3dd7bd951454795aa75c3a145fd05ac25bb", "size": 260804863, @@ -4285,7 +5374,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-23-default-x86", "path": "system-images/android-23/default/x86", @@ -4295,7 +5384,9 @@ }, "type-details": { "abi:2": "x86", + "abi:3": "x86", "api-level:0": "23", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -4303,12 +5394,18 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "7cbc291483ca07dc67b71268c5f08a5755f50f51", "size": 365009313, @@ -4323,7 +5420,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-23-default-x86_64", "path": "system-images/android-23/default/x86_64", @@ -4333,7 +5430,9 @@ }, "type-details": { "abi:2": "x86_64", + "abi:3": "x86_64", "api-level:0": "23", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -4341,6 +5440,11 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } } @@ -4349,6 +5453,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "2d1ae21b1978e202917b7c6a5f49ab8bc87c6417", "size": 493891214, @@ -4356,7 +5461,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-23-google_apis-arm64-v8a", "path": "system-images/android-23/google_apis/arm64-v8a", @@ -4366,7 +5471,9 @@ }, "type-details": { "abi:3": "arm64-v8a", + "abi:4": "arm64-v8a", "api-level:0": "23", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -4374,15 +5481,24 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "armeabi-v7a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "d03ac51742e9d7eea559cbef4f44d18d1fc9c92d", "size": 468621931, @@ -4397,7 +5513,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-23-google_apis-armeabi-v7a", "path": "system-images/android-23/google_apis/armeabi-v7a", @@ -4407,7 +5523,9 @@ }, "type-details": { "abi:3": "armeabi-v7a", + "abi:4": "armeabi-v7a", "api-level:0": "23", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -4415,15 +5533,24 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "c1d91dfcbaa9f1a6b9698893ce995b2771cd6a16", "size": 499428151, @@ -4438,7 +5565,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-23-google_apis-x86", "path": "system-images/android-23/google_apis/x86", @@ -4448,7 +5575,9 @@ }, "type-details": { "abi:3": "x86", + "abi:4": "x86", "api-level:0": "23", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -4456,15 +5585,24 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "4d80dd38edb565641b3b34e713fe0ec6d1d77698", "size": 667471680, @@ -4479,7 +5617,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-23-google_apis-x86_64", "path": "system-images/android-23/google_apis/x86_64", @@ -4489,7 +5627,9 @@ }, "type-details": { "abi:3": "x86_64", + "abi:4": "x86_64", "api-level:0": "23", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -4497,9 +5637,17 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -4510,6 +5658,7 @@ "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "ef7890e565f4e3544fd23613b437d4418fb10f99", "size": 398227164, @@ -4524,7 +5673,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-24-android-tv-x86", "path": "system-images/android-24/android-tv/x86", @@ -4534,13 +5683,19 @@ }, "type-details": { "abi:2": "x86", + "abi:3": "x86", "api-level:0": "24", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Android TV", "id:0": "android-tv" + }, + "tag:2": { + "display:1": "Android TV", + "id:0": "android-tv" } } } @@ -4549,6 +5704,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "e88ebdf4533efa0370603ee4ab0e7834e0cc364f", "size": 305854153, @@ -4556,7 +5712,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-24-default-arm64-v8a", "path": "system-images/android-24/default/arm64-v8a", @@ -4566,7 +5722,9 @@ }, "type-details": { "abi:2": "arm64-v8a", + "abi:3": "arm64-v8a", "api-level:0": "24", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -4574,12 +5732,18 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } }, "armeabi-v7a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "e22c47afd06398b35f2705ca2e7fa85323351568", "size": 782997866, @@ -4594,7 +5758,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-24-default-armeabi-v7a", "path": "system-images/android-24/default/armeabi-v7a", @@ -4604,7 +5768,9 @@ }, "type-details": { "abi:2": "armeabi-v7a", + "abi:3": "armeabi-v7a", "api-level:0": "24", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -4612,12 +5778,18 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "c1cae7634b0216c0b5990f2c144eb8ca948e3511", "size": 313489224, @@ -4632,7 +5804,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-24-default-x86", "path": "system-images/android-24/default/x86", @@ -4642,7 +5814,9 @@ }, "type-details": { "abi:2": "x86", + "abi:3": "x86", "api-level:0": "24", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -4650,12 +5824,18 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "f6559e1949a5879f31a9662f4f0e50ad60181684", "size": 419261998, @@ -4670,7 +5850,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-24-default-x86_64", "path": "system-images/android-24/default/x86_64", @@ -4680,7 +5860,9 @@ }, "type-details": { "abi:2": "x86_64", + "abi:3": "x86_64", "api-level:0": "24", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -4688,6 +5870,11 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } } @@ -4696,6 +5883,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "d264adca13330b5e50665ab44726e4fecc1ddd1f", "size": 709604485, @@ -4710,7 +5898,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-24-google_apis-arm64-v8a", "path": "system-images/android-24/google_apis/arm64-v8a", @@ -4720,7 +5908,9 @@ }, "type-details": { "abi:3": "arm64-v8a", + "abi:4": "arm64-v8a", "api-level:0": "24", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -4728,15 +5918,24 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "74505c33546fb9f6722fb7aa8fc1472777b924ff", "size": 889204295, @@ -4751,7 +5950,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-24-google_apis-x86", "path": "system-images/android-24/google_apis/x86", @@ -4761,7 +5960,9 @@ }, "type-details": { "abi:3": "x86", + "abi:4": "x86", "api-level:0": "24", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -4769,15 +5970,24 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "46d09c0723b77ddba00f2281099a2c44a88ac971", "size": 1119800108, @@ -4792,7 +6002,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-24-google_apis-x86_64", "path": "system-images/android-24/google_apis/x86_64", @@ -4802,7 +6012,9 @@ }, "type-details": { "abi:3": "x86_64", + "abi:4": "x86_64", "api-level:0": "24", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -4810,9 +6022,17 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -4821,6 +6041,7 @@ "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "b52e9593ffdde65c1a0970256a32e8967c89cc22", "size": 812724041, @@ -4835,7 +6056,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-24-google_apis_playstore-x86", "path": "system-images/android-24/google_apis_playstore/x86", @@ -4845,7 +6066,9 @@ }, "type-details": { "abi:3": "x86", + "abi:4": "x86", "api-level:0": "24", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -4853,9 +6076,17 @@ "display:1": "Google Play", "id:0": "google_apis_playstore" }, + "tag:2": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -4866,6 +6097,7 @@ "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "faae592bc991001b1880a8198d729b25855cc34b", "size": 438201093, @@ -4880,7 +6112,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-25-android-tv-x86", "path": "system-images/android-25/android-tv/x86", @@ -4890,13 +6122,19 @@ }, "type-details": { "abi:2": "x86", + "abi:3": "x86", "api-level:0": "25", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Android TV", "id:0": "android-tv" + }, + "tag:2": { + "display:1": "Android TV", + "id:0": "android-tv" } } } @@ -4905,6 +6143,7 @@ "armeabi-v7a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "76d3568a4e08023047af7d13025a35c9bf1d7e5c", "size": 377841195, @@ -4919,7 +6158,7 @@ } }, "displayName": "Android Wear ARM EABI v7a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-25-android-wear-armeabi-v7a", "path": "system-images/android-25/android-wear/armeabi-v7a", @@ -4929,19 +6168,26 @@ }, "type-details": { "abi:2": "armeabi-v7a", + "abi:3": "armeabi-v7a", "api-level:0": "25", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Android Wear", "id:0": "android-wear" + }, + "tag:2": { + "display:1": "Android Wear", + "id:0": "android-wear" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "693fce7b487a65491a4e88e9f740959688c9dbe6", "size": 397826706, @@ -4956,7 +6202,7 @@ } }, "displayName": "Android Wear Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-25-android-wear-x86", "path": "system-images/android-25/android-wear/x86", @@ -4966,13 +6212,19 @@ }, "type-details": { "abi:2": "x86", + "abi:3": "x86", "api-level:0": "25", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Android Wear", "id:0": "android-wear" + }, + "tag:2": { + "display:1": "Android Wear", + "id:0": "android-wear" } } } @@ -4981,6 +6233,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "b39d359623323a1b4906c071dec396040016ea73", "size": 308416103, @@ -4988,7 +6241,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-25-default-arm64-v8a", "path": "system-images/android-25/default/arm64-v8a", @@ -4998,7 +6251,9 @@ }, "type-details": { "abi:2": "arm64-v8a", + "abi:3": "arm64-v8a", "api-level:0": "25", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -5006,12 +6261,18 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "78ce7eb1387d598685633b9f7cbb300c3d3aeb5f", "size": 316695942, @@ -5026,7 +6287,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-25-default-x86", "path": "system-images/android-25/default/x86", @@ -5036,7 +6297,9 @@ }, "type-details": { "abi:2": "x86", + "abi:3": "x86", "api-level:0": "25", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -5044,12 +6307,18 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "7093d7b39216020226ff430a3b7b81c94d31ad37", "size": 422702097, @@ -5064,7 +6333,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-25-default-x86_64", "path": "system-images/android-25/default/x86_64", @@ -5074,7 +6343,9 @@ }, "type-details": { "abi:2": "x86_64", + "abi:3": "x86_64", "api-level:0": "25", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -5082,6 +6353,11 @@ "display:1": { }, "id:0": "default" + }, + "tag:2": { + "display:1": { + }, + "id:0": "default" } } } @@ -5090,6 +6366,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "23162a2123e9e5cd5a7e930f8ca867676e83c0df", "size": 740445031, @@ -5097,7 +6374,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-25-google_apis-arm64-v8a", "path": "system-images/android-25/google_apis/arm64-v8a", @@ -5107,7 +6384,9 @@ }, "type-details": { "abi:3": "arm64-v8a", + "abi:4": "arm64-v8a", "api-level:0": "25", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -5115,15 +6394,24 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "armeabi-v7a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "a6f7c491e3bb937523dddfa287e07d785934e8a1", "size": 952973150, @@ -5138,7 +6426,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-25-google_apis-armeabi-v7a", "path": "system-images/android-25/google_apis/armeabi-v7a", @@ -5148,7 +6436,9 @@ }, "type-details": { "abi:3": "armeabi-v7a", + "abi:4": "armeabi-v7a", "api-level:0": "25", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -5156,15 +6446,24 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "93872600c58521c8a67dc44c8e17cff4def009f3", "size": 1013657090, @@ -5179,7 +6478,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-25-google_apis-x86", "path": "system-images/android-25/google_apis/x86", @@ -5189,7 +6488,9 @@ }, "type-details": { "abi:3": "x86", + "abi:4": "x86", "api-level:0": "25", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -5197,15 +6498,24 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "0da7b5bca8ff5deff45b942f61f081e038271ba6", "size": 1298264628, @@ -5220,7 +6530,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-25-google_apis-x86_64", "path": "system-images/android-25/google_apis/x86_64", @@ -5230,7 +6540,9 @@ }, "type-details": { "abi:3": "x86_64", + "abi:4": "x86_64", "api-level:0": "25", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -5238,9 +6550,17 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -5249,6 +6569,7 @@ "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "6f6668954f7fd52f896fe7528aa122028c9b026c", "size": 972461719, @@ -5263,7 +6584,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-25-google_apis_playstore-x86", "path": "system-images/android-25/google_apis_playstore/x86", @@ -5273,7 +6594,9 @@ }, "type-details": { "abi:3": "x86", + "abi:4": "x86", "api-level:0": "25", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -5281,9 +6604,17 @@ "display:1": "Google Play", "id:0": "google_apis_playstore" }, + "tag:2": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -5294,6 +6625,7 @@ "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "f908b3c81a03513a756c17a197faecfc91e437df", "size": 401675862, @@ -5323,7 +6655,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "system-image-26-android-tv-x86", "path": "system-images/android-26/android-tv/x86", @@ -5333,13 +6665,19 @@ }, "type-details": { "abi:2": "x86", + "abi:3": "x86", "api-level:0": "26", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Android TV", "id:0": "android-tv" + }, + "tag:2": { + "display:1": "Android TV", + "id:0": "android-tv" } } } @@ -5348,6 +6686,7 @@ "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "fbffa91b936ca18fcc1e0bab2b52a8b0835cbb1c", "size": 370311037, @@ -5362,7 +6701,7 @@ } }, "displayName": "Android Wear Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-26-android-wear-x86", "path": "system-images/android-26/android-wear/x86", @@ -5372,13 +6711,19 @@ }, "type-details": { "abi:2": "x86", + "abi:3": "x86", "api-level:0": "26", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Android Wear", "id:0": "android-wear" + }, + "tag:2": { + "display:1": "Android Wear", + "id:0": "android-wear" } } } @@ -5387,6 +6732,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "12353141d08dd302fbebc03872f0e1ca7357c55f", "size": 330014927, @@ -5406,7 +6752,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-26-default-arm64-v8a", "path": "system-images/android-26/default/arm64-v8a", @@ -5416,19 +6762,26 @@ }, "type-details": { "abi:2": "arm64-v8a", + "abi:3": "arm64-v8a", "api-level:0": "26", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Default Android System Image", "id:0": "default" + }, + "tag:2": { + "display:1": "Default Android System Image", + "id:0": "default" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "e613d6e0da668e30daf547f3c6627a6352846f90", "size": 350195807, @@ -5443,7 +6796,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-26-default-x86", "path": "system-images/android-26/default/x86", @@ -5453,19 +6806,26 @@ }, "type-details": { "abi:2": "x86", + "abi:3": "x86", "api-level:0": "26", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Default Android System Image", "id:0": "default" + }, + "tag:2": { + "display:1": "Default Android System Image", + "id:0": "default" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "432f149c048bffce7f9de526ec65b336daf7a0a3", "size": 474178332, @@ -5480,7 +6840,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-26-default-x86_64", "path": "system-images/android-26/default/x86_64", @@ -5490,13 +6850,19 @@ }, "type-details": { "abi:2": "x86_64", + "abi:3": "x86_64", "api-level:0": "26", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Default Android System Image", "id:0": "default" + }, + "tag:2": { + "display:1": "Default Android System Image", + "id:0": "default" } } } @@ -5505,6 +6871,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "7a9764f1856119c4ceb311f6c76ff975a4c1e65d", "size": 733331565, @@ -5524,7 +6891,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-26-google_apis-arm64-v8a", "path": "system-images/android-26/google_apis/arm64-v8a", @@ -5534,7 +6901,9 @@ }, "type-details": { "abi:3": "arm64-v8a", + "abi:4": "arm64-v8a", "api-level:0": "26", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -5542,15 +6911,24 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "edac36ae459ebc974aac4b51b67b7356fa099f5b", "size": 805108564, @@ -5580,7 +6958,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-26-google_apis-x86", "path": "system-images/android-26/google_apis/x86", @@ -5590,7 +6968,9 @@ }, "type-details": { "abi:3": "x86", + "abi:4": "x86", "api-level:0": "26", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -5598,15 +6978,24 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "0eb13cc91cf164b617eaf85e4030289cb18189de", "size": 980740438, @@ -5636,7 +7025,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-26-google_apis-x86_64", "path": "system-images/android-26/google_apis/x86_64", @@ -5646,7 +7035,9 @@ }, "type-details": { "abi:3": "x86_64", + "abi:4": "x86_64", "api-level:0": "26", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -5654,9 +7045,17 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -5665,6 +7064,7 @@ "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "2c8bee7b97a309f099941532e63c42a7d4a06e19", "size": 769390078, @@ -5694,7 +7094,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "system-image-26-google_apis_playstore-x86", "path": "system-images/android-26/google_apis_playstore/x86", @@ -5704,7 +7104,9 @@ }, "type-details": { "abi:3": "x86", + "abi:4": "x86", "api-level:0": "26", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -5712,9 +7114,17 @@ "display:1": "Google Play", "id:0": "google_apis_playstore" }, + "tag:2": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -5725,6 +7135,7 @@ "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "b7d2a9349cdb1da9dafbd42de7378f6f1933d193", "size": 410757280, @@ -5739,7 +7150,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "system-image-27-android-tv-x86", "path": "system-images/android-27/android-tv/x86", @@ -5749,13 +7160,19 @@ }, "type-details": { "abi:2": "x86", + "abi:3": "x86", "api-level:0": "27", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Android TV", "id:0": "android-tv" + }, + "tag:2": { + "display:1": "Android TV", + "id:0": "android-tv" } } } @@ -5764,6 +7181,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "e014473ac510cc9d8e9b412826332923277fa827", "size": 332173536, @@ -5783,7 +7201,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-27-default-arm64-v8a", "path": "system-images/android-27/default/arm64-v8a", @@ -5793,19 +7211,26 @@ }, "type-details": { "abi:2": "arm64-v8a", + "abi:3": "arm64-v8a", "api-level:0": "27", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Default Android System Image", "id:0": "default" + }, + "tag:2": { + "display:1": "Default Android System Image", + "id:0": "default" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "4ec990fac7b62958decd12e18a4cd389dfe7c582", "size": 360984187, @@ -5820,7 +7245,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-27-default-x86", "path": "system-images/android-27/default/x86", @@ -5830,19 +7255,26 @@ }, "type-details": { "abi:2": "x86", + "abi:3": "x86", "api-level:0": "27", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Default Android System Image", "id:0": "default" + }, + "tag:2": { + "display:1": "Default Android System Image", + "id:0": "default" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "2878261011a59ca3de29dc5b457a495fdb268d60", "size": 491675204, @@ -5857,7 +7289,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-27-default-x86_64", "path": "system-images/android-27/default/x86_64", @@ -5867,13 +7299,19 @@ }, "type-details": { "abi:2": "x86_64", + "abi:3": "x86_64", "api-level:0": "27", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Default Android System Image", "id:0": "default" + }, + "tag:2": { + "display:1": "Default Android System Image", + "id:0": "default" } } } @@ -5882,6 +7320,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "54dd140e1dd2db0fb7879beecf1068bf476ad171", "size": 730732271, @@ -5901,7 +7340,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-27-google_apis-arm64-v8a", "path": "system-images/android-27/google_apis/arm64-v8a", @@ -5911,7 +7350,9 @@ }, "type-details": { "abi:3": "arm64-v8a", + "abi:4": "arm64-v8a", "api-level:0": "27", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -5919,15 +7360,24 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "0a130cad4f6d42c305a61265dc6c738e9e2b45c4", "size": 807298593, @@ -5957,7 +7407,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-27-google_apis-x86", "path": "system-images/android-27/google_apis/x86", @@ -5967,7 +7417,9 @@ }, "type-details": { "abi:3": "x86", + "abi:4": "x86", "api-level:0": "27", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -5975,9 +7427,17 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -5986,6 +7446,7 @@ "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "eb5a944ceb691ca0648d0a6f0d93893a47223b5d", "size": 758636016, @@ -6015,7 +7476,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-27-google_apis_playstore-x86", "path": "system-images/android-27/google_apis_playstore/x86", @@ -6025,7 +7486,9 @@ }, "type-details": { "abi:3": "x86", + "abi:4": "x86", "api-level:0": "27", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -6033,9 +7496,17 @@ "display:1": "Google Play", "id:0": "google_apis_playstore" }, + "tag:2": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -6046,6 +7517,7 @@ "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "a1f224245056ddaa89651e379efbde7357b15046", "size": 859616969, @@ -6065,7 +7537,7 @@ } }, "displayName": "Automotive Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-28-android-automotive-playstore-x86", "path": "system-images/android-28/android-automotive-playstore/x86", @@ -6074,16 +7546,17 @@ "major:0": "5" }, "type-details": { - "abi:3": "x86", + "abi:4": "x86", "api-level:0": "28", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, - "tag:1": { + "tag:2": { "display:1": "Automotive", "id:0": "android-automotive-playstore" }, - "vendor:2": { + "vendor:3": { "display:1": "Google Inc.", "id:0": "google" } @@ -6094,6 +7567,7 @@ "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "4c13edca32c1abb899a0702fe6972087712bcb78", "size": 475216948, @@ -6108,7 +7582,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "system-image-28-android-tv-x86", "path": "system-images/android-28/android-tv/x86", @@ -6118,13 +7592,19 @@ }, "type-details": { "abi:2": "x86", + "abi:3": "x86", "api-level:0": "28", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Android TV", "id:0": "android-tv" + }, + "tag:2": { + "display:1": "Android TV", + "id:0": "android-tv" } } } @@ -6133,6 +7613,7 @@ "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "3dd75066e95327baf8991915a043e53e06a2cfb5", "size": 682327945, @@ -6147,7 +7628,7 @@ } }, "displayName": "Wear OS Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-28-android-wear-x86", "path": "system-images/android-28/android-wear/x86", @@ -6157,13 +7638,19 @@ }, "type-details": { "abi:2": "x86", + "abi:3": "x86", "api-level:0": "28", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Wear OS", "id:0": "android-wear" + }, + "tag:2": { + "display:1": "Wear OS", + "id:0": "android-wear" } } } @@ -6172,6 +7659,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "e209114dd0dfc2f4e0d328f5fd7367fec39ee1bd", "size": 426760297, @@ -6191,7 +7679,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-28-default-arm64-v8a", "path": "system-images/android-28/default/arm64-v8a", @@ -6201,19 +7689,26 @@ }, "type-details": { "abi:2": "arm64-v8a", + "abi:3": "arm64-v8a", "api-level:0": "28", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Default Android System Image", "id:0": "default" + }, + "tag:2": { + "display:1": "Default Android System Image", + "id:0": "default" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "ce03c42d80c0fc6dc47f6455dbee7aa275d02780", "size": 437320152, @@ -6221,7 +7716,7 @@ } ], "displayName": "Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "system-image-28-default-x86", "path": "system-images/android-28/default/x86", @@ -6231,19 +7726,26 @@ }, "type-details": { "abi:2": "x86", + "abi:3": "x86", "api-level:0": "28", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Default Android System Image", "id:0": "default" + }, + "tag:2": { + "display:1": "Default Android System Image", + "id:0": "default" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "d47a85c8f4e9fd57df97814ad8884eeb0f3a0ef0", "size": 564792723, @@ -6251,7 +7753,7 @@ } ], "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "system-image-28-default-x86_64", "path": "system-images/android-28/default/x86_64", @@ -6261,13 +7763,19 @@ }, "type-details": { "abi:2": "x86_64", + "abi:3": "x86_64", "api-level:0": "28", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Default Android System Image", "id:0": "default" + }, + "tag:2": { + "display:1": "Default Android System Image", + "id:0": "default" } } } @@ -6276,6 +7784,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "28f59164bdb4cb18f1a1060f1880450e06cf4d10", "size": 857120029, @@ -6295,7 +7804,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-28-google_apis-arm64-v8a", "path": "system-images/android-28/google_apis/arm64-v8a", @@ -6305,7 +7814,9 @@ }, "type-details": { "abi:3": "arm64-v8a", + "abi:4": "arm64-v8a", "api-level:0": "28", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -6313,15 +7824,24 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "e0541ac9b783ab91a00054e133bda340a2b9c757", "size": 994434707, @@ -6351,7 +7871,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-arm-dbt-license", "name": "system-image-28-google_apis-x86", "path": "system-images/android-28/google_apis/x86", @@ -6361,7 +7881,9 @@ }, "type-details": { "abi:3": "x86", + "abi:4": "x86", "api-level:0": "28", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -6369,15 +7891,24 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "1d93bd994e29c4e9bbe71fd9c278addc5418cbee", "size": 1102721597, @@ -6407,7 +7938,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-28-google_apis-x86_64", "path": "system-images/android-28/google_apis/x86_64", @@ -6417,7 +7948,9 @@ }, "type-details": { "abi:3": "x86_64", + "abi:4": "x86_64", "api-level:0": "28", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -6425,9 +7958,17 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -6436,6 +7977,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "205a4720befd41be99fcdfb2550fa1680e9a2e18", "size": 836861962, @@ -6455,7 +7997,7 @@ } }, "displayName": "Google ARM64-V8a Play ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-arm-dbt-license", "name": "system-image-28-google_apis_playstore-arm64-v8a", "path": "system-images/android-28/google_apis_playstore/arm64-v8a", @@ -6465,7 +8007,9 @@ }, "type-details": { "abi:3": "arm64-v8a", + "abi:4": "arm64-v8a", "api-level:0": "28", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -6473,15 +8017,24 @@ "display:1": "Google ARM64-V8a Play", "id:0": "google_apis_playstore" }, + "tag:2": { + "display:1": "Google ARM64-V8a Play", + "id:0": "google_apis_playstore" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "97d9d4f4a2afa8b0f5d52e90748e19c10406ca93", "size": 918028186, @@ -6511,7 +8064,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-28-google_apis_playstore-x86", "path": "system-images/android-28/google_apis_playstore/x86", @@ -6521,7 +8074,9 @@ }, "type-details": { "abi:3": "x86", + "abi:4": "x86", "api-level:0": "28", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -6529,15 +8084,24 @@ "display:1": "Google Play", "id:0": "google_apis_playstore" }, + "tag:2": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "a767da996fdea7a1f5632a9206fa5c009d6e580c", "size": 1037659724, @@ -6567,7 +8131,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-28-google_apis_playstore-x86_64", "path": "system-images/android-28/google_apis_playstore/x86_64", @@ -6577,7 +8141,9 @@ }, "type-details": { "abi:3": "x86_64", + "abi:4": "x86_64", "api-level:0": "28", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -6585,9 +8151,17 @@ "display:1": "Google Play", "id:0": "google_apis_playstore" }, + "tag:2": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -6598,6 +8172,7 @@ "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "8fb2624c63c34a01c27dd8085277b2a5fb8d7fbc", "size": 923839106, @@ -6617,7 +8192,7 @@ } }, "displayName": "Automotive with Play Store Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-29-android-automotive-playstore-x86", "path": "system-images/android-29/android-automotive-playstore/x86", @@ -6626,16 +8201,17 @@ "major:0": "1" }, "type-details": { - "abi:3": "x86", + "abi:4": "x86", "api-level:0": "29", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, - "tag:1": { + "tag:2": { "display:1": "Automotive with Play Store", "id:0": "android-automotive-playstore" }, - "vendor:2": { + "vendor:3": { "display:1": "Google Inc.", "id:0": "google" } @@ -6646,6 +8222,7 @@ "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "736c2f6c79493b5ee4ca0d2531a25c9eb7f9c7ab", "size": 590809630, @@ -6675,7 +8252,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "system-image-29-android-tv-x86", "path": "system-images/android-29/android-tv/x86", @@ -6685,13 +8262,19 @@ }, "type-details": { "abi:2": "x86", + "abi:3": "x86", "api-level:0": "29", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Android TV", "id:0": "android-tv" + }, + "tag:2": { + "display:1": "Android TV", + "id:0": "android-tv" } } } @@ -6700,6 +8283,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "fa0d67d7430fcc84b2fe2508ea81e92ac644e264", "size": 498049256, @@ -6707,7 +8291,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-29-default-arm64-v8a", "path": "system-images/android-29/default/arm64-v8a", @@ -6717,31 +8301,40 @@ }, "type-details": { "abi:2": "arm64-v8a", + "abi:3": "arm64-v8a", "api-level:0": "29", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Default Android System Image", "id:0": "default" + }, + "tag:2": { + "display:1": "Default Android System Image", + "id:0": "default" } } }, "x86": { "archives": [ { + "arch": "all", "os": "windows", "sha1": "cc4fa13e49cb2e93770d4f2e90ea1dd2a81e315b", "size": 516543600, "url": "https://dl.google.com/android/repository/sys-img/android/x86-29_r08-windows.zip" }, { + "arch": "all", "os": "macosx", "sha1": "cc4fa13e49cb2e93770d4f2e90ea1dd2a81e315b", "size": 516543600, "url": "https://dl.google.com/android/repository/sys-img/android/x86-29_r08-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "cc4fa13e49cb2e93770d4f2e90ea1dd2a81e315b", "size": 516543600, @@ -6761,7 +8354,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-29-default-x86", "path": "system-images/android-29/default/x86", @@ -6771,31 +8364,40 @@ }, "type-details": { "abi:2": "x86", + "abi:3": "x86", "api-level:0": "29", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Default Android System Image", "id:0": "default" + }, + "tag:2": { + "display:1": "Default Android System Image", + "id:0": "default" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "windows", "sha1": "e4b798d6fcddff90d528d74ef22ce3dd4a2ca798", "size": 689676765, "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-29_r08-windows.zip" }, { + "arch": "all", "os": "macosx", "sha1": "e4b798d6fcddff90d528d74ef22ce3dd4a2ca798", "size": 689676765, "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-29_r08-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "e4b798d6fcddff90d528d74ef22ce3dd4a2ca798", "size": 689676765, @@ -6815,7 +8417,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-29-default-x86_64", "path": "system-images/android-29/default/x86_64", @@ -6825,13 +8427,19 @@ }, "type-details": { "abi:2": "x86_64", + "abi:3": "x86_64", "api-level:0": "29", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Default Android System Image", "id:0": "default" + }, + "tag:2": { + "display:1": "Default Android System Image", + "id:0": "default" } } } @@ -6840,6 +8448,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "5ef4888ce47a24a9e96e45418f9fd26f1c8e0f13", "size": 1170272392, @@ -6859,7 +8468,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-arm-dbt-license", "name": "system-image-29-google_apis-arm64-v8a", "path": "system-images/android-29/google_apis/arm64-v8a", @@ -6869,7 +8478,9 @@ }, "type-details": { "abi:3": "arm64-v8a", + "abi:4": "arm64-v8a", "api-level:0": "29", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -6877,15 +8488,24 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "8dc45a7406b922116f2121f6826868c2e7087389", "size": 1133056400, @@ -6905,7 +8525,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-29-google_apis-x86", "path": "system-images/android-29/google_apis/x86", @@ -6915,7 +8535,9 @@ }, "type-details": { "abi:3": "x86", + "abi:4": "x86", "api-level:0": "29", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -6923,15 +8545,24 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "8392b93dc05c380bb0e6b2375ba318c14b263b37", "size": 1313280930, @@ -6951,7 +8582,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-29-google_apis-x86_64", "path": "system-images/android-29/google_apis/x86_64", @@ -6961,7 +8592,9 @@ }, "type-details": { "abi:3": "x86_64", + "abi:4": "x86_64", "api-level:0": "29", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -6969,9 +8602,17 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -6980,12 +8621,14 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "macosx", "sha1": "47705387b8fbbfe87e3679d272c29f7064defba8", "size": 1242979582, "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-29_r09-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "47705387b8fbbfe87e3679d272c29f7064defba8", "size": 1242979582, @@ -7005,7 +8648,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-arm-dbt-license", "name": "system-image-29-google_apis_playstore-arm64-v8a", "path": "system-images/android-29/google_apis_playstore/arm64-v8a", @@ -7015,7 +8658,9 @@ }, "type-details": { "abi:3": "arm64-v8a", + "abi:4": "arm64-v8a", "api-level:0": "29", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -7023,27 +8668,38 @@ "display:1": "Google Play", "id:0": "google_apis_playstore" }, + "tag:2": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86": { "archives": [ { + "arch": "all", "os": "windows", "sha1": "1c45e690e9ee6a44f40549e9fb68d3fd52ba4970", "size": 1153916727, "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-29_r08-windows.zip" }, { + "arch": "all", "os": "macosx", "sha1": "1c45e690e9ee6a44f40549e9fb68d3fd52ba4970", "size": 1153916727, "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-29_r08-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "1c45e690e9ee6a44f40549e9fb68d3fd52ba4970", "size": 1153916727, @@ -7073,7 +8729,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-29-google_apis_playstore-x86", "path": "system-images/android-29/google_apis_playstore/x86", @@ -7083,7 +8739,9 @@ }, "type-details": { "abi:3": "x86", + "abi:4": "x86", "api-level:0": "29", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -7091,27 +8749,38 @@ "display:1": "Google Play", "id:0": "google_apis_playstore" }, + "tag:2": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "windows", "sha1": "94835980b4a6eaeeb41936d7fb1381698e48433a", "size": 1322004798, "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-29_r08-windows.zip" }, { + "arch": "all", "os": "macosx", "sha1": "94835980b4a6eaeeb41936d7fb1381698e48433a", "size": 1322004798, "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-29_r08-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "94835980b4a6eaeeb41936d7fb1381698e48433a", "size": 1322004798, @@ -7141,7 +8810,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-29-google_apis_playstore-x86_64", "path": "system-images/android-29/google_apis_playstore/x86_64", @@ -7151,7 +8820,9 @@ }, "type-details": { "abi:3": "x86_64", + "abi:4": "x86_64", "api-level:0": "29", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -7159,9 +8830,17 @@ "display:1": "Google Play", "id:0": "google_apis_playstore" }, + "tag:2": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -7172,6 +8851,7 @@ "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "7aec48997addb860118a98741458922bdec606c9", "size": 1182802747, @@ -7191,7 +8871,7 @@ } }, "displayName": "Automotive with Play Store Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-30-android-automotive-playstore-x86_64", "path": "system-images/android-30/android-automotive-playstore/x86_64", @@ -7200,16 +8880,17 @@ "major:0": "2" }, "type-details": { - "abi:3": "x86_64", + "abi:4": "x86_64", "api-level:0": "30", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, - "tag:1": { + "tag:2": { "display:1": "Automotive with Play Store", "id:0": "android-automotive-playstore" }, - "vendor:2": { + "vendor:3": { "display:1": "Google Inc.", "id:0": "google" } @@ -7220,6 +8901,7 @@ "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "f4151d2390fc015ddb2a7715bea9bc69a5ee0b4e", "size": 699304963, @@ -7249,7 +8931,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "system-image-30-android-tv-x86", "path": "system-images/android-30/android-tv/x86", @@ -7259,13 +8941,19 @@ }, "type-details": { "abi:2": "x86", + "abi:3": "x86", "api-level:0": "30", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Android TV", "id:0": "android-tv" + }, + "tag:2": { + "display:1": "Android TV", + "id:0": "android-tv" } } } @@ -7274,6 +8962,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "56c0c2550580f2ba1b33009c77db017dbcb3d470", "size": 827418923, @@ -7288,7 +8977,7 @@ } }, "displayName": "Wear OS 3 ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-30-android-wear-arm64-v8a", "path": "system-images/android-30/android-wear/arm64-v8a", @@ -7298,19 +8987,26 @@ }, "type-details": { "abi:2": "arm64-v8a", + "abi:3": "arm64-v8a", "api-level:0": "30", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Wear OS 3", "id:0": "android-wear" + }, + "tag:2": { + "display:1": "Wear OS 3", + "id:0": "android-wear" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "73a96614a2ddcf586e4c659c436d2360bc25badc", "size": 901929440, @@ -7325,7 +9021,7 @@ } }, "displayName": "Wear OS 3 Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-30-android-wear-x86", "path": "system-images/android-30/android-wear/x86", @@ -7335,13 +9031,19 @@ }, "type-details": { "abi:2": "x86", + "abi:3": "x86", "api-level:0": "30", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Wear OS 3", "id:0": "android-wear" + }, + "tag:2": { + "display:1": "Wear OS 3", + "id:0": "android-wear" } } } @@ -7350,6 +9052,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "e96298145a5e0bfd6da4816f51b06c520d8dba72", "size": 548363615, @@ -7357,7 +9060,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-30-default-arm64-v8a", "path": "system-images/android-30/default/arm64-v8a", @@ -7367,19 +9070,26 @@ }, "type-details": { "abi:2": "arm64-v8a", + "abi:3": "arm64-v8a", "api-level:0": "30", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Default Android System Image", "id:0": "default" + }, + "tag:2": { + "display:1": "Default Android System Image", + "id:0": "default" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "5e4de3946d46f88856c35efcc4d797b381456347", "size": 676379777, @@ -7399,7 +9109,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-30-default-x86_64", "path": "system-images/android-30/default/x86_64", @@ -7409,13 +9119,19 @@ }, "type-details": { "abi:2": "x86_64", + "abi:3": "x86_64", "api-level:0": "30", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Default Android System Image", "id:0": "default" + }, + "tag:2": { + "display:1": "Default Android System Image", + "id:0": "default" } } } @@ -7424,6 +9140,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "0e66987d6b4db2e278af83d453ce5d74a7e6ced3", "size": 1244324730, @@ -7443,7 +9160,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-arm-dbt-license", "name": "system-image-30-google_apis-arm64-v8a", "path": "system-images/android-30/google_apis/arm64-v8a", @@ -7453,7 +9170,9 @@ }, "type-details": { "abi:3": "arm64-v8a", + "abi:4": "arm64-v8a", "api-level:0": "30", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -7461,15 +9180,24 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "a58447e540a8581394dd04ee419c6771d62723d8", "size": 1240551553, @@ -7499,7 +9227,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-30-google_apis-x86", "path": "system-images/android-30/google_apis/x86", @@ -7509,7 +9237,9 @@ }, "type-details": { "abi:3": "x86", + "abi:4": "x86", "api-level:0": "30", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -7517,15 +9247,24 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "6ae21030eaadc041078444d3798e4b399f3e787d", "size": 1438186618, @@ -7555,7 +9294,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-30-google_apis-x86_64", "path": "system-images/android-30/google_apis/x86_64", @@ -7565,7 +9304,9 @@ }, "type-details": { "abi:3": "x86_64", + "abi:4": "x86_64", "api-level:0": "30", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -7573,9 +9314,17 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -7584,12 +9333,14 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "macosx", "sha1": "7208c0b72b51adb561595e62891763d7322964a0", "size": 1308440072, "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-30_r10-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "7208c0b72b51adb561595e62891763d7322964a0", "size": 1308440072, @@ -7609,7 +9360,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-arm-dbt-license", "name": "system-image-30-google_apis_playstore-arm64-v8a", "path": "system-images/android-30/google_apis_playstore/arm64-v8a", @@ -7619,7 +9370,9 @@ }, "type-details": { "abi:3": "arm64-v8a", + "abi:4": "arm64-v8a", "api-level:0": "30", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -7627,27 +9380,38 @@ "display:1": "Google Play", "id:0": "google_apis_playstore" }, + "tag:2": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86": { "archives": [ { + "arch": "all", "os": "windows", "sha1": "13c100b62983d64db53cef3d70fea789d89f3232", "size": 1229340756, "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-30_r09-windows.zip" }, { + "arch": "all", "os": "macosx", "sha1": "13c100b62983d64db53cef3d70fea789d89f3232", "size": 1229340756, "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-30_r09-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "13c100b62983d64db53cef3d70fea789d89f3232", "size": 1229340756, @@ -7677,7 +9441,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-30-google_apis_playstore-x86", "path": "system-images/android-30/google_apis_playstore/x86", @@ -7687,7 +9451,9 @@ }, "type-details": { "abi:3": "x86", + "abi:4": "x86", "api-level:0": "30", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -7695,27 +9461,38 @@ "display:1": "Google Play", "id:0": "google_apis_playstore" }, + "tag:2": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "windows", "sha1": "ead1babced6bdfaa8e641faeb6ed115ca603c4a9", "size": 1404405641, "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-30_r10-windows.zip" }, { + "arch": "all", "os": "macosx", "sha1": "ead1babced6bdfaa8e641faeb6ed115ca603c4a9", "size": 1404405641, "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-30_r10-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "ead1babced6bdfaa8e641faeb6ed115ca603c4a9", "size": 1404405641, @@ -7745,7 +9522,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-arm-dbt-license", "name": "system-image-30-google_apis_playstore-x86_64", "path": "system-images/android-30/google_apis_playstore/x86_64", @@ -7755,7 +9532,9 @@ }, "type-details": { "abi:3": "x86_64", + "abi:4": "x86_64", "api-level:0": "30", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -7763,9 +9542,17 @@ "display:1": "Google Play", "id:0": "google_apis_playstore" }, + "tag:2": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -7776,6 +9563,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "e8cec4080464d516e3f863d943c24055155f29bf", "size": 763104604, @@ -7805,7 +9593,7 @@ } }, "displayName": "Android TV ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-31-android-tv-arm64-v8a", "path": "system-images/android-31/android-tv/arm64-v8a", @@ -7815,19 +9603,26 @@ }, "type-details": { "abi:2": "arm64-v8a", + "abi:3": "arm64-v8a", "api-level:0": "31", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Android TV", "id:0": "android-tv" + }, + "tag:2": { + "display:1": "Android TV", + "id:0": "android-tv" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "8c0b848019afade7f2a8ddb5c361178f63ec86ca", "size": 772250386, @@ -7857,7 +9652,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-31-android-tv-x86", "path": "system-images/android-31/android-tv/x86", @@ -7867,13 +9662,19 @@ }, "type-details": { "abi:2": "x86", + "abi:3": "x86", "api-level:0": "31", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Android TV", "id:0": "android-tv" + }, + "tag:2": { + "display:1": "Android TV", + "id:0": "android-tv" } } } @@ -7882,6 +9683,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "1052df2d0afc8fe57138db19d5ebd82d10c607da", "size": 635481190, @@ -7901,7 +9703,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-31-default-arm64-v8a", "path": "system-images/android-31/default/arm64-v8a", @@ -7911,19 +9713,26 @@ }, "type-details": { "abi:2": "arm64-v8a", + "abi:3": "arm64-v8a", "api-level:0": "31", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Default Android System Image", "id:0": "default" + }, + "tag:2": { + "display:1": "Default Android System Image", + "id:0": "default" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "58bff3cb182c79bbfe3980fe77b87b51b9f7ad71", "size": 657246510, @@ -7943,7 +9752,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-31-default-x86_64", "path": "system-images/android-31/default/x86_64", @@ -7953,13 +9762,19 @@ }, "type-details": { "abi:2": "x86_64", + "abi:3": "x86_64", "api-level:0": "31", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Default Android System Image", "id:0": "default" + }, + "tag:2": { + "display:1": "Default Android System Image", + "id:0": "default" } } } @@ -7968,6 +9783,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "21bcb00f4ac3dc91c4040da7980b8c5f3c681781", "size": 1415899687, @@ -7997,7 +9813,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-arm-dbt-license", "name": "system-image-31-google_apis-arm64-v8a", "path": "system-images/android-31/google_apis/arm64-v8a", @@ -8007,7 +9823,9 @@ }, "type-details": { "abi:3": "arm64-v8a", + "abi:4": "arm64-v8a", "api-level:0": "31", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -8015,15 +9833,24 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "9aedd3e85cad7a479146f6858f4a94840c2a3f29", "size": 1470822277, @@ -8053,7 +9880,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "system-image-31-google_apis-x86_64", "path": "system-images/android-31/google_apis/x86_64", @@ -8063,7 +9890,9 @@ }, "type-details": { "abi:3": "x86_64", + "abi:4": "x86_64", "api-level:0": "31", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -8071,9 +9900,17 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -8082,12 +9919,14 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "macosx", "sha1": "8a1fa9a050a3894fb65c785d6b536e182be30e7f", "size": 1468377491, "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-31_r09-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "8a1fa9a050a3894fb65c785d6b536e182be30e7f", "size": 1468377491, @@ -8117,7 +9956,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-arm-dbt-license", "name": "system-image-31-google_apis_playstore-arm64-v8a", "path": "system-images/android-31/google_apis_playstore/arm64-v8a", @@ -8127,7 +9966,9 @@ }, "type-details": { "abi:3": "arm64-v8a", + "abi:4": "arm64-v8a", "api-level:0": "31", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -8135,15 +9976,24 @@ "display:1": "Google Play", "id:0": "google_apis_playstore" }, + "tag:2": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "a80de967f445b3cf71803425f4e4b21b36e11d66", "size": 1423631458, @@ -8173,7 +10023,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-arm-dbt-license", "name": "system-image-31-google_apis_playstore-x86_64", "path": "system-images/android-31/google_apis_playstore/x86_64", @@ -8183,7 +10033,9 @@ }, "type-details": { "abi:3": "x86_64", + "abi:4": "x86_64", "api-level:0": "31", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -8191,9 +10043,17 @@ "display:1": "Google Play", "id:0": "google_apis_playstore" }, + "tag:2": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -8204,6 +10064,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "1b07fe1bc8a4f5a9b249ff12d5bf142cb43a2093", "size": 948247935, @@ -8223,7 +10084,7 @@ } }, "displayName": "Android Automotive with Google Play arm64-v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "system-image-32-android-automotive-playstore-arm64-v8a", "path": "system-images/android-32/android-automotive-playstore/arm64-v8a", @@ -8232,16 +10093,22 @@ "major:0": "2" }, "type-details": { - "abi:3": "arm64-v8a", + "abi:6": "arm64-v8a", "api-level:0": "32", + "base-extension:2": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, - "tag:1": { + "extension-level:1": "1", + "tag:3": { "display:1": "Automotive", "id:0": "android-automotive-playstore" }, - "vendor:2": { + "tag:4": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:5": { "display:1": "Google Inc.", "id:0": "google" } @@ -8250,6 +10117,7 @@ "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "8f8309ae9e25b0c5eeb869bb0cb2515021073693", "size": 1012590435, @@ -8269,7 +10137,7 @@ } }, "displayName": "Android Automotive with Google Play x86_64 System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "system-image-32-android-automotive-playstore-x86_64", "path": "system-images/android-32/android-automotive-playstore/x86_64", @@ -8278,16 +10146,22 @@ "major:0": "2" }, "type-details": { - "abi:3": "x86_64", + "abi:6": "x86_64", "api-level:0": "32", + "base-extension:2": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, - "tag:1": { + "extension-level:1": "1", + "tag:3": { "display:1": "Automotive", "id:0": "android-automotive-playstore" }, - "vendor:2": { + "tag:4": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:5": { "display:1": "Google Inc.", "id:0": "google" } @@ -8298,6 +10172,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "c57d92a4131590b2a3b62f2a728766aa6bbec57f", "size": 643262633, @@ -8317,7 +10192,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-32-default-arm64-v8a", "path": "system-images/android-32/default/arm64-v8a", @@ -8327,19 +10202,26 @@ }, "type-details": { "abi:2": "arm64-v8a", + "abi:3": "arm64-v8a", "api-level:0": "32", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Default Android System Image", "id:0": "default" + }, + "tag:2": { + "display:1": "Default Android System Image", + "id:0": "default" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "238452e27d6854d153b6ed119fa783189598eac4", "size": 667541890, @@ -8359,7 +10241,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-32-default-x86_64", "path": "system-images/android-32/default/x86_64", @@ -8369,13 +10251,19 @@ }, "type-details": { "abi:2": "x86_64", + "abi:3": "x86_64", "api-level:0": "32", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Default Android System Image", "id:0": "default" + }, + "tag:2": { + "display:1": "Default Android System Image", + "id:0": "default" } } } @@ -8384,6 +10272,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "7940d3d7357e35b6f720c2bba1159d185bdb2fd5", "size": 1569899980, @@ -8413,7 +10302,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-arm-dbt-license", "name": "system-image-32-google_apis-arm64-v8a", "path": "system-images/android-32/google_apis/arm64-v8a", @@ -8423,7 +10312,9 @@ }, "type-details": { "abi:3": "arm64-v8a", + "abi:4": "arm64-v8a", "api-level:0": "32", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -8431,15 +10322,24 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "1b52794699c6889a2fd155bf235b67a592eb8f1d", "size": 1538792859, @@ -8469,7 +10369,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "system-image-32-google_apis-x86_64", "path": "system-images/android-32/google_apis/x86_64", @@ -8479,7 +10379,9 @@ }, "type-details": { "abi:3": "x86_64", + "abi:4": "x86_64", "api-level:0": "32", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -8487,9 +10389,17 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -8498,12 +10408,14 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "macosx", "sha1": "0a2cda9c5ee861f924170f07f272652732372f73", "size": 1528883651, "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-32_r04-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "0a2cda9c5ee861f924170f07f272652732372f73", "size": 1528883651, @@ -8533,7 +10445,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-arm-dbt-license", "name": "system-image-32-google_apis_playstore-arm64-v8a", "path": "system-images/android-32/google_apis_playstore/arm64-v8a", @@ -8543,7 +10455,9 @@ }, "type-details": { "abi:3": "arm64-v8a", + "abi:4": "arm64-v8a", "api-level:0": "32", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -8551,27 +10465,38 @@ "display:1": "Google Play", "id:0": "google_apis_playstore" }, + "tag:2": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "windows", "sha1": "33fd570f0c5f14fe82b6507eab87017715368df7", "size": 1503885352, "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-32_r04-windows.zip" }, { + "arch": "all", "os": "macosx", "sha1": "33fd570f0c5f14fe82b6507eab87017715368df7", "size": 1503885352, "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-32_r04-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "33fd570f0c5f14fe82b6507eab87017715368df7", "size": 1503885352, @@ -8601,7 +10526,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "system-image-32-google_apis_playstore-x86_64", "path": "system-images/android-32/google_apis_playstore/x86_64", @@ -8611,7 +10536,9 @@ }, "type-details": { "abi:3": "x86_64", + "abi:4": "x86_64", "api-level:0": "32", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -8619,9 +10546,17 @@ "display:1": "Google Play", "id:0": "google_apis_playstore" }, + "tag:2": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -8632,6 +10567,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "ca95328e871a6ec613fffc410b2e81ca7c7c2c95", "size": 1314179288, @@ -8651,7 +10587,7 @@ } }, "displayName": "Android Automotive with Google APIs arm64-v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-33-android-automotive-arm64-v8a", "path": "system-images/android-33/android-automotive/arm64-v8a", @@ -8660,16 +10596,22 @@ "major:0": "4" }, "type-details": { - "abi:3": "arm64-v8a", + "abi:6": "arm64-v8a", "api-level:0": "33", + "base-extension:2": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, - "tag:1": { + "extension-level:1": "3", + "tag:3": { "display:1": "Automotive", "id:0": "android-automotive" }, - "vendor:2": { + "tag:4": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:5": { "display:1": "Google Inc.", "id:0": "google" } @@ -8678,6 +10620,7 @@ "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "f23487d919389c9c5bf1882c030830de31ed0a21", "size": 1336031457, @@ -8697,7 +10640,7 @@ } }, "displayName": "Android Automotive with Google APIs x86_64 System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-33-android-automotive-x86_64", "path": "system-images/android-33/android-automotive/x86_64", @@ -8706,16 +10649,22 @@ "major:0": "4" }, "type-details": { - "abi:3": "x86_64", + "abi:6": "x86_64", "api-level:0": "33", + "base-extension:2": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, - "tag:1": { + "extension-level:1": "3", + "tag:3": { "display:1": "Automotive", "id:0": "android-automotive" }, - "vendor:2": { + "tag:4": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:5": { "display:1": "Google Inc.", "id:0": "google" } @@ -8726,6 +10675,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "41b75155961eb506b492e60e8fba590ad7baa02c", "size": 828027584, @@ -8755,7 +10705,7 @@ } }, "displayName": "Android TV ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-33-android-tv-arm64-v8a", "path": "system-images/android-33/android-tv/arm64-v8a", @@ -8765,19 +10715,26 @@ }, "type-details": { "abi:2": "arm64-v8a", + "abi:3": "arm64-v8a", "api-level:0": "33", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Android TV", "id:0": "android-tv" + }, + "tag:2": { + "display:1": "Android TV", + "id:0": "android-tv" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "ec3fe6a450ed6aa5fec2703fca68648e7813094f", "size": 817908695, @@ -8807,7 +10764,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-33-android-tv-x86", "path": "system-images/android-33/android-tv/x86", @@ -8817,13 +10774,19 @@ }, "type-details": { "abi:2": "x86", + "abi:3": "x86", "api-level:0": "33", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Android TV", "id:0": "android-tv" + }, + "tag:2": { + "display:1": "Android TV", + "id:0": "android-tv" } } } @@ -8832,6 +10795,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "9ef3b7a4fd76e7633e4b0616e535d9c5806140ce", "size": 1063145250, @@ -8846,7 +10810,7 @@ } }, "displayName": "Wear OS 4 ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-33-android-wear-arm64-v8a", "path": "system-images/android-33/android-wear/arm64-v8a", @@ -8856,19 +10820,26 @@ }, "type-details": { "abi:2": "arm64-v8a", + "abi:3": "arm64-v8a", "api-level:0": "33", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Wear OS 4", "id:0": "android-wear" + }, + "tag:2": { + "display:1": "Wear OS 4", + "id:0": "android-wear" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "250b8682cc0a4430c8963f2927a097296856fe22", "size": 1100277497, @@ -8883,7 +10854,7 @@ } }, "displayName": "Wear OS 4 Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-33-android-wear-x86_64", "path": "system-images/android-33/android-wear/x86_64", @@ -8893,13 +10864,19 @@ }, "type-details": { "abi:2": "x86_64", + "abi:3": "x86_64", "api-level:0": "33", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Wear OS 4", "id:0": "android-wear" + }, + "tag:2": { + "display:1": "Wear OS 4", + "id:0": "android-wear" } } } @@ -8908,6 +10885,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "69883e92b77f8705af135ee86e1d87589f8f113e", "size": 672331372, @@ -8927,7 +10905,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-33-default-arm64-v8a", "path": "system-images/android-33/default/arm64-v8a", @@ -8937,19 +10915,26 @@ }, "type-details": { "abi:2": "arm64-v8a", + "abi:3": "arm64-v8a", "api-level:0": "33", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Default Android System Image", "id:0": "default" + }, + "tag:2": { + "display:1": "Default Android System Image", + "id:0": "default" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "d4698590184a21fe1e8754284130ad3006b5fc79", "size": 694005732, @@ -8969,7 +10954,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-33-default-x86_64", "path": "system-images/android-33/default/x86_64", @@ -8979,13 +10964,19 @@ }, "type-details": { "abi:2": "x86_64", + "abi:3": "x86_64", "api-level:0": "33", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Default Android System Image", "id:0": "default" + }, + "tag:2": { + "display:1": "Default Android System Image", + "id:0": "default" } } } @@ -8994,6 +10985,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "47516ccb88230c42965940a929f51053562ee351", "size": 1761582980, @@ -9023,7 +11015,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-arm-dbt-license", "name": "system-image-33-google_apis-arm64-v8a", "path": "system-images/android-33/google_apis/arm64-v8a", @@ -9033,7 +11025,9 @@ }, "type-details": { "abi:3": "arm64-v8a", + "abi:4": "arm64-v8a", "api-level:0": "33", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -9041,15 +11035,24 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "2b96f5bd5c79bfe1cc645e70b3e630b5755d9711", "size": 1707857511, @@ -9079,7 +11082,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-33-google_apis-x86_64", "path": "system-images/android-33/google_apis/x86_64", @@ -9089,7 +11092,9 @@ }, "type-details": { "abi:3": "x86_64", + "abi:4": "x86_64", "api-level:0": "33", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -9097,9 +11102,17 @@ "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:2": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -9108,22 +11121,11 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", - "sha1": "e6adbdead6a9282fdb2bd471691bb13c9208dfdd", - "size": 1712020800, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-33-ext5_r02.zip" - }, - { - "os": "macosx", - "sha1": "26e68d896f560d9abfa293dd7499bc020d3b38ba", - "size": 1474557980, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-33_r01-darwin.zip" - }, - { - "os": "linux", - "sha1": "26e68d896f560d9abfa293dd7499bc020d3b38ba", - "size": 1474557980, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-33_r01-linux.zip" + "sha1": "97b81c9eb787667e53d5ae9de428284e4f230259", + "size": 1713468508, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-33_r09.zip" } ], "dependencies": { @@ -9149,7 +11151,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-arm-dbt-license", "name": "system-image-33-google_apis_playstore-arm64-v8a", "path": "system-images/android-33/google_apis_playstore/arm64-v8a", @@ -9159,7 +11161,9 @@ }, "type-details": { "abi:3": "arm64-v8a", + "abi:4": "arm64-v8a", "api-level:0": "33", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -9167,19 +11171,28 @@ "display:1": "Google Play", "id:0": "google_apis_playstore" }, + "tag:2": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", - "sha1": "b74ad29a35dab4ac19e9b2a5cf3ccd0d1952b97d", - "size": 1668794037, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-33-ext5_r02.zip" + "sha1": "2ce85ed6dcabd321442059c1267cc5376e22e046", + "size": 1670173438, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-33_r09.zip" } ], "dependencies": { @@ -9205,7 +11218,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-33-google_apis_playstore-x86_64", "path": "system-images/android-33/google_apis_playstore/x86_64", @@ -9215,7 +11228,9 @@ }, "type-details": { "abi:3": "x86_64", + "abi:4": "x86_64", "api-level:0": "33", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, @@ -9223,23 +11238,46 @@ "display:1": "Google Play", "id:0": "google_apis_playstore" }, + "tag:2": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" } } } } }, - "34": { - "android-automotive": { + "33x": { + "google_apis_playstore": { "arm64-v8a": { "archives": [ { + "arch": "all", + "os": "macosx", + "sha1": "26e68d896f560d9abfa293dd7499bc020d3b38ba", + "size": 1474557980, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-33_r01-darwin.zip" + }, + { + "arch": "all", + "os": "linux", + "sha1": "26e68d896f560d9abfa293dd7499bc020d3b38ba", + "size": 1474557980, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-33_r01-linux.zip" + }, + { + "arch": "all", "os": "all", - "sha1": "5a7158edbf14b259892e36495f748a2cd5bfee17", - "size": 1392202709, - "url": "https://dl.google.com/android/repository/sys-img/android-automotive/arm64-v8a-34-ext9_playstore_r02.zip" + "sha1": "e6adbdead6a9282fdb2bd471691bb13c9208dfdd", + "size": 1712020800, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-33-ext5_r02.zip" } ], "dependencies": { @@ -9248,32 +11286,34 @@ "path": "emulator" }, "min-revision:0": { - "major:0": "35", - "micro:2": "9", - "minor:1": "1" + "major:0": "30", + "micro:2": "3", + "minor:1": "7" } } }, - "displayName": "Android Automotive with Google APIs arm64-v8a System Image", - "last-available-day": 20112, - "license": "android-sdk-license", - "name": "system-image-34-android-automotive-arm64-v8a", - "path": "system-images/android-34-ext9/android-automotive/arm64-v8a", - "revision": "34-android-automotive-arm64-v8a", + "displayName": "Google Play ARM 64 v8a System Image", + "last-available-day": 20131, + "license": "android-sdk-arm-dbt-license", + "name": "system-image-33x-google_apis_playstore-arm64-v8a", + "path": "system-images/android-33-ext4/google_apis_playstore/arm64-v8a", + "revision": "33x-google_apis_playstore-arm64-v8a", "revision-details": { - "major:0": "3" + "major:0": "1" }, "type-details": { - "abi:3": "arm64-v8a", - "api-level:0": "34", + "abi:5": "arm64-v8a", + "api-level:0": "33x", + "base-extension:2": "false", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, - "tag:1": { - "display:1": "Automotive", - "id:0": "android-automotive" + "extension-level:1": "4", + "tag:3": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" }, - "vendor:2": { + "vendor:4": { "display:1": "Google Inc.", "id:0": "google" } @@ -9282,10 +11322,11 @@ "x86_64": { "archives": [ { + "arch": "all", "os": "all", - "sha1": "49ff6a8de43f069bad440d615ab3c25e24822416", - "size": 1393873908, - "url": "https://dl.google.com/android/repository/sys-img/android-automotive/x86_64-34-ext9_playstore_r02.zip" + "sha1": "b74ad29a35dab4ac19e9b2a5cf3ccd0d1952b97d", + "size": 1668794037, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-33-ext5_r02.zip" } ], "dependencies": { @@ -9294,42 +11335,47 @@ "path": "emulator" }, "min-revision:0": { - "major:0": "35", - "micro:2": "9", - "minor:1": "1" + "major:0": "30", + "micro:2": "3", + "minor:1": "7" } } }, - "displayName": "Android Automotive with Google APIs x86_64 System Image", - "last-available-day": 20112, - "license": "android-sdk-license", - "name": "system-image-34-android-automotive-x86_64", - "path": "system-images/android-34-ext9/android-automotive/x86_64", - "revision": "34-android-automotive-x86_64", + "displayName": "Google Play Intel x86_64 Atom System Image", + "last-available-day": 20131, + "license": "android-sdk-preview-license", + "name": "system-image-33x-google_apis_playstore-x86_64", + "path": "system-images/android-33-ext4/google_apis_playstore/x86_64", + "revision": "33x-google_apis_playstore-x86_64", "revision-details": { - "major:0": "3" + "major:0": "1" }, "type-details": { - "abi:3": "x86_64", - "api-level:0": "34", + "abi:5": "x86_64", + "api-level:0": "33x", + "base-extension:2": "false", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, - "tag:1": { - "display:1": "Automotive", - "id:0": "android-automotive" + "extension-level:1": "4", + "tag:3": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" }, - "vendor:2": { + "vendor:4": { "display:1": "Google Inc.", "id:0": "google" } } } - }, + } + }, + "34": { "android-tv": { "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "a31d0d8326f2c82787f95dd387614274082a96a0", "size": 815200224, @@ -9359,7 +11405,7 @@ } }, "displayName": "Android TV ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-34-android-tv-arm64-v8a", "path": "system-images/android-34/android-tv/arm64-v8a", @@ -9369,19 +11415,27 @@ }, "type-details": { "abi:2": "arm64-v8a", + "abi:4": "arm64-v8a", "api-level:0": "34", + "base-extension:2": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, + "extension-level:1": "7", "tag:1": { "display:1": "Android TV", "id:0": "android-tv" + }, + "tag:3": { + "display:1": "Android TV", + "id:0": "android-tv" } } }, "x86": { "archives": [ { + "arch": "all", "os": "all", "sha1": "8de1dcb502b0b4080e6f363828db64e609b3aa2a", "size": 809947873, @@ -9411,7 +11465,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-34-android-tv-x86", "path": "system-images/android-34/android-tv/x86", @@ -9421,13 +11475,20 @@ }, "type-details": { "abi:2": "x86", + "abi:4": "x86", "api-level:0": "34", + "base-extension:2": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, + "extension-level:1": "7", "tag:1": { "display:1": "Android TV", "id:0": "android-tv" + }, + "tag:3": { + "display:1": "Android TV", + "id:0": "android-tv" } } } @@ -9436,6 +11497,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "0352eee45f1e738b10a64b547a1f51d6d3baee42", "size": 1215167643, @@ -9443,7 +11505,7 @@ } ], "displayName": "Wear OS 5 ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-34-android-wear-arm64-v8a", "path": "system-images/android-34/android-wear/arm64-v8a", @@ -9453,19 +11515,26 @@ }, "type-details": { "abi:2": "arm64-v8a", + "abi:3": "arm64-v8a", "api-level:0": "34", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Wear OS 5", "id:0": "android-wear" + }, + "tag:2": { + "display:1": "Wear OS 5", + "id:0": "android-wear" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "9062ebd4ea15d324c2ae14d0e938d7a768f3e190", "size": 1209508768, @@ -9473,7 +11542,7 @@ } ], "displayName": "Wear OS 5 Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-34-android-wear-x86_64", "path": "system-images/android-34/android-wear/x86_64", @@ -9483,13 +11552,19 @@ }, "type-details": { "abi:2": "x86_64", + "abi:3": "x86_64", "api-level:0": "34", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Wear OS 5", "id:0": "android-wear" + }, + "tag:2": { + "display:1": "Wear OS 5", + "id:0": "android-wear" } } } @@ -9498,6 +11573,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "d9f2011131919abe952814e041f16f317242c3fa", "size": 705115396, @@ -9517,7 +11593,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-34-default-arm64-v8a", "path": "system-images/android-34/default/arm64-v8a", @@ -9527,19 +11603,26 @@ }, "type-details": { "abi:2": "arm64-v8a", + "abi:3": "arm64-v8a", "api-level:0": "34", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Default Android System Image", "id:0": "default" + }, + "tag:2": { + "display:1": "Default Android System Image", + "id:0": "default" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "5f6a249f9bc3b1b4c459b13ce2eb646c9680bed1", "size": 720747116, @@ -9559,7 +11642,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-34-default-x86_64", "path": "system-images/android-34/default/x86_64", @@ -9569,13 +11652,19 @@ }, "type-details": { "abi:2": "x86_64", + "abi:3": "x86_64", "api-level:0": "34", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, "tag:1": { "display:1": "Default Android System Image", "id:0": "default" + }, + "tag:2": { + "display:1": "Default Android System Image", + "id:0": "default" } } } @@ -9584,6 +11673,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "2fe8b46d419a3400e30f31b0152b241b50c8b99f", "size": 1610393229, @@ -9613,7 +11703,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-arm-dbt-license", "name": "system-image-34-google_apis-arm64-v8a", "path": "system-images/android-34/google_apis/arm64-v8a", @@ -9623,23 +11713,35 @@ }, "type-details": { "abi:3": "arm64-v8a", + "abi:5": "arm64-v8a", "api-level:0": "34", + "base-extension:2": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, + "extension-level:1": "7", "tag:1": { "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:4": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "e0f6c9a0691aa27bd597d0deb1bcfdc943ac8ca7", "size": 1563721130, @@ -9669,7 +11771,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-34-google_apis-x86_64", "path": "system-images/android-34/google_apis/x86_64", @@ -9679,17 +11781,28 @@ }, "type-details": { "abi:3": "x86_64", + "abi:5": "x86_64", "api-level:0": "34", + "base-extension:2": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, + "extension-level:1": "7", "tag:1": { "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:4": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -9698,18 +11811,271 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "c307c3301dc52635ebc78b943c39b3c377856ebc", "size": 1548905381, "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-34_r14.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "34", + "micro:2": "16", + "minor:1": "2" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "32", + "micro:2": "8", + "minor:1": "1" + } + } + }, + "displayName": "Google Play ARM 64 v8a System Image", + "last-available-day": 20131, + "license": "android-sdk-arm-dbt-license", + "name": "system-image-34-google_apis_playstore-arm64-v8a", + "path": "system-images/android-34/google_apis_playstore/arm64-v8a", + "revision": "34-google_apis_playstore-arm64-v8a", + "revision-details": { + "major:0": "14" + }, + "type-details": { + "abi:2": "arm64-v8a", + "abi:3": "arm64-v8a", + "abi:5": "arm64-v8a", + "api-level:0": "34", + "base-extension:2": "true", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "extension-level:1": "7", + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "tag:3": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + }, + "vendor:4": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86_64": { + "archives": [ + { + "arch": "all", + "os": "all", + "sha1": "01d32617fd1937e540faf8731d70cf50e35af854", + "size": 1510752654, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-34_r14.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "34", + "micro:2": "16", + "minor:1": "2" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "32", + "micro:2": "8", + "minor:1": "1" + } + } + }, + "displayName": "Google Play Intel x86_64 Atom System Image", + "last-available-day": 20131, + "license": "android-sdk-license", + "name": "system-image-34-google_apis_playstore-x86_64", + "path": "system-images/android-34/google_apis_playstore/x86_64", + "revision": "34-google_apis_playstore-x86_64", + "revision-details": { + "major:0": "14" + }, + "type-details": { + "abi:2": "x86_64", + "abi:3": "x86_64", + "abi:5": "x86_64", + "api-level:0": "34", + "base-extension:2": "true", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "extension-level:1": "7", + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "tag:3": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + }, + "vendor:4": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + } + } + }, + "34x": { + "android-automotive": { + "arm64-v8a": { + "archives": [ + { + "arch": "all", + "os": "all", + "sha1": "2c0b4d0ed7aa50d498fb0e31ac500343deb90b7c", + "size": 1397481780, + "url": "https://dl.google.com/android/repository/sys-img/android-automotive/arm64-v8a-34-ext9_playstore_r03.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "35", + "micro:2": "9", + "minor:1": "1" + } + } + }, + "displayName": "Android Automotive with Google APIs arm64-v8a System Image", + "last-available-day": 20131, + "license": "android-sdk-license", + "name": "system-image-34x-android-automotive-arm64-v8a", + "path": "system-images/android-34-ext9/android-automotive/arm64-v8a", + "revision": "34x-android-automotive-arm64-v8a", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:6": "arm64-v8a", + "api-level:0": "34x", + "base-extension:2": "false", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "extension-level:1": "9", + "tag:3": { + "display:1": "Automotive", + "id:0": "android-automotive" + }, + "tag:4": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:5": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86_64": { + "archives": [ + { + "arch": "all", + "os": "all", + "sha1": "ccbfbf77c5b83a6bfb66032e25c1634104c66354", + "size": 1436319949, + "url": "https://dl.google.com/android/repository/sys-img/android-automotive/x86_64-34-ext9_playstore_r03.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "35", + "micro:2": "9", + "minor:1": "1" + } + } + }, + "displayName": "Android Automotive with Google APIs x86_64 System Image", + "last-available-day": 20131, + "license": "android-sdk-license", + "name": "system-image-34x-android-automotive-x86_64", + "path": "system-images/android-34-ext9/android-automotive/x86_64", + "revision": "34x-android-automotive-x86_64", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:6": "x86_64", + "api-level:0": "34x", + "base-extension:2": "false", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "extension-level:1": "9", + "tag:3": { + "display:1": "Automotive", + "id:0": "android-automotive" + }, + "tag:4": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:5": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + } + }, + "google_apis_playstore": { + "arm64-v8a": { + "archives": [ + { + "arch": "all", + "os": "all", + "sha1": "a4fec7b9035d6f182fad788a4c1e5fef0fa94cb1", + "size": 1549222105, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-34-ext8_r02.zip" }, { + "arch": "all", "os": "macosx", "sha1": "32424be6344de382eb00ebe339ed41648fe93aa2", "size": 1563453679, "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-34-ext10_r01-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "32424be6344de382eb00ebe339ed41648fe93aa2", "size": 1563453679, @@ -9726,39 +12092,30 @@ "micro:2": "8", "minor:1": "1" } - }, - "dependency:1": { - "element-attributes": { - "path": "emulator" - }, - "min-revision:0": { - "major:0": "32", - "micro:2": "8", - "minor:1": "1" - } } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-arm-dbt-license", - "name": "system-image-34-google_apis_playstore-arm64-v8a", + "name": "system-image-34x-google_apis_playstore-arm64-v8a", "path": "system-images/android-34-ext12/google_apis_playstore/arm64-v8a", - "revision": "34-google_apis_playstore-arm64-v8a", + "revision": "34x-google_apis_playstore-arm64-v8a", "revision-details": { "major:0": "1" }, "type-details": { - "abi:2": "arm64-v8a", - "abi:3": "arm64-v8a", - "api-level:0": "34", + "abi:5": "arm64-v8a", + "api-level:0": "34x", + "base-extension:2": "false", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, - "tag:1": { + "extension-level:1": "12", + "tag:3": { "display:1": "Google Play", "id:0": "google_apis_playstore" }, - "vendor:2": { + "vendor:4": { "display:1": "Google Inc.", "id:0": "google" } @@ -9767,6 +12124,7 @@ "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "50f22ddfccd1e6652e75601c08f4ffd8ef0fd41b", "size": 1502676954, @@ -9783,39 +12141,30 @@ "micro:2": "8", "minor:1": "1" } - }, - "dependency:1": { - "element-attributes": { - "path": "emulator" - }, - "min-revision:0": { - "major:0": "32", - "micro:2": "8", - "minor:1": "1" - } } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", - "name": "system-image-34-google_apis_playstore-x86_64", + "name": "system-image-34x-google_apis_playstore-x86_64", "path": "system-images/android-34-ext12/google_apis_playstore/x86_64", - "revision": "34-google_apis_playstore-x86_64", + "revision": "34x-google_apis_playstore-x86_64", "revision-details": { "major:0": "1" }, "type-details": { - "abi:2": "x86_64", - "abi:3": "x86_64", - "api-level:0": "34", + "abi:5": "x86_64", + "api-level:0": "34x", + "base-extension:2": "false", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, - "tag:1": { + "extension-level:1": "12", + "tag:3": { "display:1": "Google Play", "id:0": "google_apis_playstore" }, - "vendor:2": { + "vendor:4": { "display:1": "Google Inc.", "id:0": "google" } @@ -9828,6 +12177,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "46c7b39766b2704d16cc527c67996cd80a07e5ab", "size": 1235396821, @@ -9835,7 +12185,7 @@ } ], "displayName": "Wear OS 5.1 - Preview ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "system-image-35-android-wear-arm64-v8a", "path": "system-images/android-35/android-wear/arm64-v8a", @@ -9844,12 +12194,13 @@ "major:0": "1" }, "type-details": { - "abi:2": "arm64-v8a", + "abi:3": "arm64-v8a", "api-level:0": "35", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, - "tag:1": { + "tag:2": { "display:1": "Wear OS 5.1 - Preview", "id:0": "android-wear" } @@ -9858,6 +12209,7 @@ "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "bac5234ebf934cbf25357cda5c0311720a48616f", "size": 1230585975, @@ -9865,7 +12217,7 @@ } ], "displayName": "Wear OS 5.1 - Preview Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "system-image-35-android-wear-x86_64", "path": "system-images/android-35/android-wear/x86_64", @@ -9874,12 +12226,13 @@ "major:0": "1" }, "type-details": { - "abi:2": "x86_64", + "abi:3": "x86_64", "api-level:0": "35", + "base-extension:1": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, - "tag:1": { + "tag:2": { "display:1": "Wear OS 5.1 - Preview", "id:0": "android-wear" } @@ -9890,6 +12243,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "2026a06409db630b56711afdbffb457c1dbaed49", "size": 769099654, @@ -9909,7 +12263,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-35-default-arm64-v8a", "path": "system-images/android-35/default/arm64-v8a", @@ -9918,12 +12272,14 @@ "major:0": "2" }, "type-details": { - "abi:2": "arm64-v8a", + "abi:4": "arm64-v8a", "api-level:0": "35", + "base-extension:2": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, - "tag:1": { + "extension-level:1": "13", + "tag:3": { "display:1": "Default Android System Image", "id:0": "default" } @@ -9932,6 +12288,7 @@ "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "2d857d170c0d1b827149565da34b3383e5306f7f", "size": 782404023, @@ -9951,7 +12308,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-35-default-x86_64", "path": "system-images/android-35/default/x86_64", @@ -9960,12 +12317,14 @@ "major:0": "2" }, "type-details": { - "abi:2": "x86_64", + "abi:4": "x86_64", "api-level:0": "35", + "base-extension:2": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, - "tag:1": { + "extension-level:1": "13", + "tag:3": { "display:1": "Default Android System Image", "id:0": "default" } @@ -9976,10 +12335,11 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", - "sha1": "50b337d09eff0540022d24e5097f6df29407e7c1", - "size": 1776920399, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-35_r08.zip" + "sha1": "16f5bceca236b2737008977c4aaf826e46a8de7d", + "size": 1778933980, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-35_r09.zip" } ], "dependencies": { @@ -9995,37 +12355,49 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-arm-dbt-license", "name": "system-image-35-google_apis-arm64-v8a", "path": "system-images/android-35/google_apis/arm64-v8a", "revision": "35-google_apis-arm64-v8a", "revision-details": { - "major:0": "8" + "major:0": "9" }, "type-details": { "abi:3": "arm64-v8a", + "abi:5": "arm64-v8a", "api-level:0": "35", + "base-extension:2": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, + "extension-level:1": "13", "tag:1": { "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:4": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", - "sha1": "d79169884cabc6680cb29d32c2112ad46c858c1b", - "size": 1736662833, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-35_r08.zip" + "sha1": "0103e6dab21290c4b9d16550a3ce99476f884eef", + "size": 1738815903, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-35_r09.zip" } ], "dependencies": { @@ -10041,27 +12413,38 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-35-google_apis-x86_64", "path": "system-images/android-35/google_apis/x86_64", "revision": "35-google_apis-x86_64", "revision-details": { - "major:0": "8" + "major:0": "9" }, "type-details": { "abi:3": "x86_64", + "abi:5": "x86_64", "api-level:0": "35", + "base-extension:2": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, + "extension-level:1": "13", "tag:1": { "display:1": "Google APIs", "id:0": "google_apis" }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:4": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -10070,6 +12453,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "b01416bc0bca12a85295dad179f9b8a1cae3d1e6", "size": 1789211399, @@ -10089,33 +12473,45 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-arm-dbt-license", "name": "system-image-35-google_apis_playstore-arm64-v8a", - "path": "system-images/android-35-ext14/google_apis_playstore/arm64-v8a", + "path": "system-images/android-35/google_apis_playstore/arm64-v8a", "revision": "35-google_apis_playstore-arm64-v8a", "revision-details": { - "major:0": "1" + "major:0": "9" }, "type-details": { "abi:3": "arm64-v8a", + "abi:5": "arm64-v8a", "api-level:0": "35", + "base-extension:2": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, + "extension-level:1": "13", "tag:1": { + "display:1": "Google APIs PlayStore", + "id:0": "google_apis_playstore" + }, + "tag:3": { "display:1": "Google Play", "id:0": "google_apis_playstore" }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:4": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "2f0054868e6aab3c098acd3decba17a82aed4176", "size": 1762061559, @@ -10135,27 +12531,38 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-35-google_apis_playstore-x86_64", - "path": "system-images/android-35-ext14/google_apis_playstore/x86_64", + "path": "system-images/android-35/google_apis_playstore/x86_64", "revision": "35-google_apis_playstore-x86_64", "revision-details": { - "major:0": "1" + "major:0": "9" }, "type-details": { "abi:3": "x86_64", + "abi:5": "x86_64", "api-level:0": "35", + "base-extension:2": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, + "extension-level:1": "13", "tag:1": { + "display:1": "Google APIs PlayStore", + "id:0": "google_apis_playstore" + }, + "tag:3": { "display:1": "Google Play", "id:0": "google_apis_playstore" }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:4": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -10164,6 +12571,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "106d90f480a5e9619062944271b94eaf5b22ffb6", "size": 1590150760, @@ -10183,7 +12591,7 @@ } }, "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-arm-dbt-license", "name": "system-image-35-page_size_16kb-arm64-v8a", "path": "system-images/android-35/google_apis_playstore_ps16k/arm64-v8a", @@ -10193,23 +12601,39 @@ }, "type-details": { "abi:3": "arm64-v8a", + "abi:6": "arm64-v8a", "api-level:0": "35", + "base-extension:2": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, + "extension-level:1": "13", "tag:1": { "display:1": "16 KB Page Size", "id:0": "page_size_16kb" }, + "tag:3": { + "display:1": "16 KB Page Size", + "id:0": "page_size_16kb" + }, + "tag:4": { + "display:1": "Google APIs PlayStore", + "id:0": "google_apis_playstore" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:5": { + "display:1": "Google Inc.", + "id:0": "google" } } }, "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "921af95f9566e79cd2e2c9d08fd253c58d18595e", "size": 1510397655, @@ -10229,7 +12653,7 @@ } }, "displayName": "Pre-Release 16 KB Page Size Google Play ARM Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-35-page_size_16kb-x86_64", "path": "system-images/android-35/google_apis_playstore_ps16k/x86_64", @@ -10239,17 +12663,134 @@ }, "type-details": { "abi:3": "x86_64", + "abi:6": "x86_64", "api-level:0": "35", + "base-extension:2": "true", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, + "extension-level:1": "13", "tag:1": { "display:1": "16 KB Page Size", "id:0": "page_size_16kb" }, + "tag:3": { + "display:1": "16 KB Page Size", + "id:0": "page_size_16kb" + }, + "tag:4": { + "display:1": "Google APIs PlayStore", + "id:0": "google_apis_playstore" + }, "vendor:2": { "display:1": "Google Inc.", "id:0": "google" + }, + "vendor:5": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + } + } + }, + "35x": { + "google_apis_playstore": { + "arm64-v8a": { + "archives": [ + { + "arch": "all", + "os": "all", + "sha1": "7bb14cbc01abf408d7fd43ff0257aa08e001f5c1", + "size": 1792701637, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-35-ext14_r01.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "33", + "micro:2": "24", + "minor:1": "1" + } + } + }, + "displayName": "Google Play ARM 64 v8a System Image", + "last-available-day": 20131, + "license": "android-sdk-arm-dbt-license", + "name": "system-image-35x-google_apis_playstore-arm64-v8a", + "path": "system-images/android-35-ext14/google_apis_playstore/arm64-v8a", + "revision": "35x-google_apis_playstore-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:5": "arm64-v8a", + "api-level:0": "35x", + "base-extension:2": "false", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "extension-level:1": "14", + "tag:3": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:4": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86_64": { + "archives": [ + { + "arch": "all", + "os": "all", + "sha1": "b9ef84a27cac20209aae77277ae34151a724d43f", + "size": 1765757430, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-35-ext14_r01.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "33", + "micro:2": "24", + "minor:1": "1" + } + } + }, + "displayName": "Google Play Intel x86_64 Atom System Image", + "last-available-day": 20131, + "license": "android-sdk-license", + "name": "system-image-35x-google_apis_playstore-x86_64", + "path": "system-images/android-35-ext14/google_apis_playstore/x86_64", + "revision": "35x-google_apis_playstore-x86_64", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:5": "x86_64", + "api-level:0": "35x", + "base-extension:2": "false", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "extension-level:1": "14", + "tag:3": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:4": { + "display:1": "Google Inc.", + "id:0": "google" } } } @@ -10260,6 +12801,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "9252bbb0cced0cfb7373a3236a7295ebf0f2945c", "size": 1807500394, @@ -10279,7 +12821,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-arm-dbt-license", "name": "system-image-Baklava-google_apis-arm64-v8a", "path": "system-images/android-Baklava/google_apis/arm64-v8a", @@ -10288,17 +12830,19 @@ "major:0": "3" }, "type-details": { - "abi:4": "arm64-v8a", + "abi:6": "arm64-v8a", "api-level:0": "35", + "base-extension:3": "true", "codename:1": "Baklava", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, - "tag:2": { + "extension-level:2": "16", + "tag:4": { "display:1": "Google APIs", "id:0": "google_apis" }, - "vendor:3": { + "vendor:5": { "display:1": "Google Inc.", "id:0": "google" } @@ -10307,6 +12851,7 @@ "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "1548664b809576557fb4823e0f03e7c550fec443", "size": 1814866164, @@ -10326,7 +12871,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-Baklava-google_apis-x86_64", "path": "system-images/android-Baklava/google_apis/x86_64", @@ -10335,17 +12880,19 @@ "major:0": "3" }, "type-details": { - "abi:4": "x86_64", + "abi:6": "x86_64", "api-level:0": "35", + "base-extension:3": "true", "codename:1": "Baklava", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, - "tag:2": { + "extension-level:2": "16", + "tag:4": { "display:1": "Google APIs", "id:0": "google_apis" }, - "vendor:3": { + "vendor:5": { "display:1": "Google Inc.", "id:0": "google" } @@ -10356,6 +12903,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "029e0b3732aba5a4cb97621b84f5edea9b71775b", "size": 1825799645, @@ -10375,7 +12923,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-arm-dbt-license", "name": "system-image-Baklava-google_apis_playstore-arm64-v8a", "path": "system-images/android-Baklava/google_apis_playstore/arm64-v8a", @@ -10384,17 +12932,19 @@ "major:0": "3" }, "type-details": { - "abi:4": "arm64-v8a", + "abi:6": "arm64-v8a", "api-level:0": "35", + "base-extension:3": "true", "codename:1": "Baklava", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, - "tag:2": { + "extension-level:2": "16", + "tag:4": { "display:1": "Google Play", "id:0": "google_apis_playstore" }, - "vendor:3": { + "vendor:5": { "display:1": "Google Inc.", "id:0": "google" } @@ -10403,6 +12953,7 @@ "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "4fd21b8fa1b92c8f9a9f7838ffab55a1c344aa0a", "size": 1848004792, @@ -10422,7 +12973,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-Baklava-google_apis_playstore-x86_64", "path": "system-images/android-Baklava/google_apis_playstore/x86_64", @@ -10431,17 +12982,19 @@ "major:0": "3" }, "type-details": { - "abi:4": "x86_64", + "abi:6": "x86_64", "api-level:0": "35", + "base-extension:3": "true", "codename:1": "Baklava", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, - "tag:2": { + "extension-level:2": "16", + "tag:4": { "display:1": "Google Play", "id:0": "google_apis_playstore" }, - "vendor:3": { + "vendor:5": { "display:1": "Google Inc.", "id:0": "google" } @@ -10452,6 +13005,7 @@ "arm64-v8a": { "archives": [ { + "arch": "all", "os": "all", "sha1": "9ed66f7ad190fedf5b20989a3914501234fbeff2", "size": 1623140308, @@ -10471,7 +13025,7 @@ } }, "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-arm-dbt-license", "name": "system-image-Baklava-page_size_16kb-arm64-v8a", "path": "system-images/android-Baklava/google_apis_playstore_ps16k/arm64-v8a", @@ -10480,17 +13034,23 @@ "major:0": "3" }, "type-details": { - "abi:4": "arm64-v8a", + "abi:7": "arm64-v8a", "api-level:0": "35", + "base-extension:3": "true", "codename:1": "Baklava", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, - "tag:2": { + "extension-level:2": "16", + "tag:4": { "display:1": "16 KB Page Size", "id:0": "page_size_16kb" }, - "vendor:3": { + "tag:5": { + "display:1": "Google APIs PlayStore", + "id:0": "google_apis_playstore" + }, + "vendor:6": { "display:1": "Google Inc.", "id:0": "google" } @@ -10499,6 +13059,7 @@ "x86_64": { "archives": [ { + "arch": "all", "os": "all", "sha1": "8242bdada27c1db6209d8b2fa68bd86d7b3ee3b9", "size": 1588410201, @@ -10518,7 +13079,7 @@ } }, "displayName": "Pre-Release 16 KB Page Size Google Play ARM Intel x86_64 Atom System Image", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "system-image-Baklava-page_size_16kb-x86_64", "path": "system-images/android-Baklava/google_apis_playstore_ps16k/x86_64", @@ -10527,17 +13088,23 @@ "major:0": "3" }, "type-details": { - "abi:4": "x86_64", + "abi:7": "x86_64", "api-level:0": "35", + "base-extension:3": "true", "codename:1": "Baklava", "element-attributes": { "xsi:type": "ns12:sysImgDetailsType" }, - "tag:2": { + "extension-level:2": "16", + "tag:4": { "display:1": "16 KB Page Size", "id:0": "page_size_16kb" }, - "vendor:3": { + "tag:5": { + "display:1": "Google APIs PlayStore", + "id:0": "google_apis_playstore" + }, + "vendor:6": { "display:1": "Google Inc.", "id:0": "google" } @@ -11366,18 +13933,21 @@ "17.0.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "2c2872bc3806aabf16a12e3959c2183ddc866e6d", "size": 11696007, "url": "https://dl.google.com/android/repository/build-tools_r17-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "602ee709be9dbb8f179b1e4075148a57f9419930", "size": 12208114, "url": "https://dl.google.com/android/repository/build-tools_r17-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "899897d327b0bad492d3a40d3db4d96119c15bc0", "size": 11004914, @@ -11392,7 +13962,7 @@ } }, "displayName": "Android SDK Build-Tools 17", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -11412,18 +13982,21 @@ "18.0.1": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "f11618492b0d2270c332325d45d752d3656a9640", "size": 16627330, "url": "https://dl.google.com/android/repository/build-tools_r18.0.1-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "d84f5692fb44d60fc53e5b2507cebf9f24626902", "size": 16633121, "url": "https://dl.google.com/android/repository/build-tools_r18.0.1-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "a6c2afd0b6289d589351956d2f5212b37014ca7d", "size": 15413527, @@ -11438,7 +14011,7 @@ } }, "displayName": "Android SDK Build-Tools 18.0.1", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -11458,18 +14031,21 @@ "18.1.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "f314a0599e51397f0886fe888b50dd98f2f050d8", "size": 20229298, "url": "https://dl.google.com/android/repository/build-tools_r18.1-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "16ddb299b8b43063e5bb3387ec17147c5053dfd8", "size": 20451524, "url": "https://dl.google.com/android/repository/build-tools_r18.1-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "3a9810fc8559ab03c09378f07531e8cae2f1db30", "size": 19659547, @@ -11484,7 +14060,7 @@ } }, "displayName": "Android SDK Build-Tools 18.1", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -11504,18 +14080,21 @@ "18.1.1": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "68c9acbfc0cec2d51b19efaed39831a17055d998", "size": 20229760, "url": "https://dl.google.com/android/repository/build-tools_r18.1.1-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "a9d9d37f6ddf859e57abc78802a77aaa166e48d4", "size": 20452157, "url": "https://dl.google.com/android/repository/build-tools_r18.1.1-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "c4605066e2f851387ea70bc1442b1968bd7b4a15", "size": 19660000, @@ -11530,7 +14109,7 @@ } }, "displayName": "Android SDK Build-Tools 18.1.1", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -11550,18 +14129,21 @@ "19.0.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "55c1a6cf632e7d346f0002b275ec41fd3137fd83", "size": 21339943, "url": "https://dl.google.com/android/repository/build-tools_r19-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "86ec1c12db1bc446b7bcaefc5cc14eb361044e90", "size": 21441270, "url": "https://dl.google.com/android/repository/build-tools_r19-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "6edf505c20f5ece9c48fa0aff9a90488f9654d52", "size": 20611447, @@ -11576,7 +14158,7 @@ } }, "displayName": "Android SDK Build-Tools 19", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -11596,18 +14178,21 @@ "19.0.1": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "18d2312dc4368858914213087f4e61445aca4517", "size": 21229048, "url": "https://dl.google.com/android/repository/build-tools_r19.0.1-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "efaf50fb19a3edb8d03efbff76f89a249ad2920b", "size": 21450597, "url": "https://dl.google.com/android/repository/build-tools_r19.0.1-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "5ef422bac5b28f4ced108319ed4a6bc7050a6234", "size": 20500648, @@ -11622,7 +14207,7 @@ } }, "displayName": "Android SDK Build-Tools 19.0.1", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -11642,18 +14227,21 @@ "19.0.2": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "a03a6bdea0091aea32e1b35b90a7294c9f04e3dd", "size": 21352552, "url": "https://dl.google.com/android/repository/build-tools_r19.0.2-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "145bc43065d45f756d99d87329d899052b9a9288", "size": 21453726, "url": "https://dl.google.com/android/repository/build-tools_r19.0.2-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "af664672d0d709c9ae30937b1062317d3ade7f95", "size": 20621117, @@ -11668,7 +14256,7 @@ } }, "displayName": "Android SDK Build-Tools 19.0.2", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -11688,18 +14276,21 @@ "19.0.3": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "c2d6055478e9d2d4fba476ee85f99181ddd1160c", "size": 21462150, "url": "https://dl.google.com/android/repository/build-tools_r19.0.3-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "651cf8754373b2d52e7f6aab2c52eabffe4e9ea4", "size": 21563992, "url": "https://dl.google.com/android/repository/build-tools_r19.0.3-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "cb46b433b67a0a6910ff00db84be8b527ea3102f", "size": 20730715, @@ -11714,7 +14305,7 @@ } }, "displayName": "Android SDK Build-Tools 19.0.3", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -11734,18 +14325,21 @@ "19.1.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "1ff20ac15fa47a75d00346ec12f180d531b3ca89", "size": 21490972, "url": "https://dl.google.com/android/repository/build-tools_r19.1-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "0d11aae3417de1efb4b9a0e0a7855904a61bcec1", "size": 21590160, "url": "https://dl.google.com/android/repository/build-tools_r19.1-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "13b367fbdbff8132cb4356f716e8dc8a8df745c5", "size": 20812533, @@ -11760,7 +14354,7 @@ } }, "displayName": "Android SDK Build-Tools 19.1", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/19.1.0", @@ -11779,18 +14373,21 @@ "20.0.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "b688905526a5584d1327a662d871a635ff502758", "size": 21445463, "url": "https://dl.google.com/android/repository/build-tools_r20-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "1240f629411c108a714c4ddd756937c7fab93f83", "size": 21650508, "url": "https://dl.google.com/android/repository/build-tools_r20-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "cf20720e452b642d5eb59dabe05c0c729b36ec75", "size": 20828006, @@ -11805,7 +14402,7 @@ } }, "displayName": "Android SDK Build-Tools 20", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/20.0.0", @@ -11824,18 +14421,21 @@ "21.0.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "4933328fdeecbd554a29528f254f4993468e1cf4", "size": 22153145, "url": "https://dl.google.com/android/repository/build-tools_r21-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "9bef7989b51436bd4e5114d8a0330359f077cbfa", "size": 22668456, "url": "https://dl.google.com/android/repository/build-tools_r21-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "5bc8fd399bc0135a9bc91eec78ddc5af4f54bf32", "size": 22306371, @@ -11850,7 +14450,7 @@ } }, "displayName": "Android SDK Build-Tools 21", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -11870,18 +14470,21 @@ "21.0.1": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "e573069eea3e5255e7a65bedeb767f4fd0a5f49a", "size": 22153013, "url": "https://dl.google.com/android/repository/build-tools_r21.0.1-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "b60c8f9b810c980abafa04896706f3911be1ade7", "size": 22668616, "url": "https://dl.google.com/android/repository/build-tools_r21.0.1-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "d68e7e6fd7a48c8759aa41d713c9d4f0e4c1c1df", "size": 22306243, @@ -11896,7 +14499,7 @@ } }, "displayName": "Android SDK Build-Tools 21.0.1", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -11916,18 +14519,21 @@ "21.0.2": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "e1236ab8897b62b57414adcf04c132567b2612a5", "size": 22153122, "url": "https://dl.google.com/android/repository/build-tools_r21.0.2-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "f17471c154058f3734729ef3cc363399b1cd3de1", "size": 22668597, "url": "https://dl.google.com/android/repository/build-tools_r21.0.2-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "37496141b23cbe633167927b7abe6e22d9f1a1c1", "size": 22306371, @@ -11942,7 +14548,7 @@ } }, "displayName": "Android SDK Build-Tools 21.0.2", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -11962,18 +14568,21 @@ "21.1.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "b7455e543784d52a8925f960bc880493ed1478cb", "size": 32642820, "url": "https://dl.google.com/android/repository/build-tools_r21.1-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "df619356c2359aa5eacdd48699d15b335d9bd246", "size": 33158159, "url": "https://dl.google.com/android/repository/build-tools_r21.1-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "c79d63ac6b713a1e326ad4dae43f2ee76708a2f4", "size": 32797810, @@ -11988,7 +14597,7 @@ } }, "displayName": "Android SDK Build-Tools 21.1", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -12008,18 +14617,21 @@ "21.1.1": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "1c712ee3a1ba5a8b0548f9c32f17d4a0ddfd727d", "size": 32642454, "url": "https://dl.google.com/android/repository/build-tools_r21.1.1-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "836a146eab0504aa9387a5132e986fe7c7381571", "size": 33157676, "url": "https://dl.google.com/android/repository/build-tools_r21.1.1-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "53fc4201237f899d5cd92f0b76ad41fb89da188b", "size": 32797356, @@ -12034,7 +14646,7 @@ } }, "displayName": "Android SDK Build-Tools 21.1.1", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -12054,18 +14666,21 @@ "21.1.2": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "5e35259843bf2926113a38368b08458735479658", "size": 32637678, "url": "https://dl.google.com/android/repository/build-tools_r21.1.2-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "e7c906b4ba0eea93b32ba36c610dbd6b204bff48", "size": 33152878, "url": "https://dl.google.com/android/repository/build-tools_r21.1.2-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "1d944759c47f60e634d2b8a1f3a4259be2f8d652", "size": 32792587, @@ -12080,7 +14695,7 @@ } }, "displayName": "Android SDK Build-Tools 21.1.2", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/21.1.2", @@ -12099,18 +14714,21 @@ "22.0.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "a8a1619dd090e44fac957bce6842e62abf87965b", "size": 33104280, "url": "https://dl.google.com/android/repository/build-tools_r22-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "af95429b24088d704bc5db9bd606e34ac1b82c0d", "size": 33646090, "url": "https://dl.google.com/android/repository/build-tools_r22-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "08fcca41e81b172bd9f570963b90d3a84929e043", "size": 33254114, @@ -12125,7 +14743,7 @@ } }, "displayName": "Android SDK Build-Tools 22", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -12145,18 +14763,21 @@ "22.0.1": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "da8b9c5c3ede39298e6cf0283c000c2ee9029646", "size": 33104577, "url": "https://dl.google.com/android/repository/build-tools_r22.0.1-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "53dad7f608e01d53b17176ba11165acbfccc5bbf", "size": 33646102, "url": "https://dl.google.com/android/repository/build-tools_r22.0.1-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "61d8cbe069d9e0a57872a83e5e5abe164b7d52cf", "size": 33254137, @@ -12171,7 +14792,7 @@ } }, "displayName": "Android SDK Build-Tools 22.0.1", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/22.0.1", @@ -12190,18 +14811,21 @@ "23.0.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "c1d6209212b01469f80fa804e0c1d39a06bc9060", "size": 39080519, "url": "https://dl.google.com/android/repository/build-tools_r23-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "90ba6e716f7703a236cd44b2e71c5ff430855a03", "size": 38070540, "url": "https://dl.google.com/android/repository/build-tools_r23-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "3874948f35f2f8946597679cc6e9151449f23b5d", "size": 38570715, @@ -12216,7 +14840,7 @@ } }, "displayName": "Android SDK Build-Tools 23", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -12236,18 +14860,21 @@ "23.0.1": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "b6ba7c399d5fa487d95289d8832e4ad943aed556", "size": 39069295, "url": "https://dl.google.com/android/repository/build-tools_r23.0.1-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "d96ec1522721e9a179ae2c591c99f75d31d39718", "size": 38059328, "url": "https://dl.google.com/android/repository/build-tools_r23.0.1-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "cc1d37231d228f7a6f130e1f8d8c940052f0f8ab", "size": 38558889, @@ -12262,7 +14889,7 @@ } }, "displayName": "Android SDK Build-Tools 23.0.1", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.1", @@ -12281,18 +14908,21 @@ "23.0.2": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "8a9f2b37f6fcf7a9fa784dc21aeaeb41bbb9f2c3", "size": 39071201, "url": "https://dl.google.com/android/repository/build-tools_r23.0.2-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "482c4cbceef8ff58aefd92d8155a38610158fdaf", "size": 38060914, "url": "https://dl.google.com/android/repository/build-tools_r23.0.2-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "fc3a92c744d3ba0a16ccb5d2b41eea5974ce0a96", "size": 38217626, @@ -12307,7 +14937,7 @@ } }, "displayName": "Android SDK Build-Tools 23.0.2", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.2", @@ -12326,18 +14956,21 @@ "23.0.3": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "368f2600feac7e9b511b82f53d1f2240ae4a91a3", "size": 40733174, "url": "https://dl.google.com/android/repository/build-tools_r23.0.3-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "fbc98cd303fd15a31d472de6c03bd707829f00b0", "size": 39679533, "url": "https://dl.google.com/android/repository/build-tools_r23.0.3-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "c6d8266c6a3243c8f1e41b786c0e3cee4c781263", "size": 39869945, @@ -12352,7 +14985,7 @@ } }, "displayName": "Android SDK Build-Tools 23.0.3", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.3", @@ -12371,18 +15004,21 @@ "24.0.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "c6271c4d78a5612ea6c7150688bcd5b7313de8d1", "size": 48960919, "url": "https://dl.google.com/android/repository/build-tools_r24-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "97fc4ed442f23989cc488d02c1d1de9bdde241de", "size": 48747930, "url": "https://dl.google.com/android/repository/build-tools_r24-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "dc61b9e5b451a0c3ec42ae2b1ce27c4d3c8da9f7", "size": 49535326, @@ -12397,7 +15033,7 @@ } }, "displayName": "Android SDK Build-Tools 24", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.0", @@ -12416,18 +15052,21 @@ "24.0.1": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "84f18c392919a074fcbb9b1d967984e6b2fef8b4", "size": 48936286, "url": "https://dl.google.com/android/repository/build-tools_r24.0.1-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "5c6457fcdfa07724fb086d8ff4e8316fc0742848", "size": 48726085, "url": "https://dl.google.com/android/repository/build-tools_r24.0.1-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "ac4a7cea42c3ef74d7fbf1b992fad311c550034e", "size": 49511883, @@ -12442,7 +15081,7 @@ } }, "displayName": "Android SDK Build-Tools 24.0.1", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.1", @@ -12461,18 +15100,21 @@ "24.0.2": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "f199a7a788c3fefbed102eea34d6007737b803cf", "size": 48936295, "url": "https://dl.google.com/android/repository/build-tools_r24.0.2-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "8bb8fc575477491d5957de743089df412de55cda", "size": 48726190, "url": "https://dl.google.com/android/repository/build-tools_r24.0.2-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "09586a1f1c39bcfa7db5205c9a07837247deb67e", "size": 49512513, @@ -12487,7 +15129,7 @@ } }, "displayName": "Android SDK Build-Tools 24.0.2", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.2", @@ -12506,18 +15148,21 @@ "24.0.3": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "9e8cc49d66e03fa1a8ecc1ac3e58f1324f5da304", "size": 49779151, "url": "https://dl.google.com/android/repository/build-tools_r24.0.3-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "a01c15f1b105c34595681075e1895d58b3fff48c", "size": 49568967, "url": "https://dl.google.com/android/repository/build-tools_r24.0.3-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "8b960d693fd4163caeb8dc5f5f5f80b10987089c", "size": 50354788, @@ -12532,7 +15177,7 @@ } }, "displayName": "Android SDK Build-Tools 24.0.3", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.3", @@ -12551,18 +15196,21 @@ "25.0.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "f2bbda60403e75cabd0f238598c3b4dfca56ea44", "size": 49872921, "url": "https://dl.google.com/android/repository/build-tools_r25-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "273c5c29a65cbed00e44f3aa470bbd7dce556606", "size": 49659466, "url": "https://dl.google.com/android/repository/build-tools_r25-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "f9258f2308ff8b62cfc4513d40cb961612d07b6a", "size": 50451378, @@ -12577,7 +15225,7 @@ } }, "displayName": "Android SDK Build-Tools 25", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.0", @@ -12596,18 +15244,21 @@ "25.0.1": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "ff063d252ab750d339f5947d06ff782836f22bac", "size": 49880178, "url": "https://dl.google.com/android/repository/build-tools_r25.0.1-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "7bf7f22d7d48ef20b6ab0e3d7a2912e5c088340f", "size": 49667353, "url": "https://dl.google.com/android/repository/build-tools_r25.0.1-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "c6c61393565ccf46349e7f44511e5db7c1c6169d", "size": 50458759, @@ -12622,7 +15273,7 @@ } }, "displayName": "Android SDK Build-Tools 25.0.1", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.1", @@ -12641,18 +15292,21 @@ "25.0.2": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "ff953c0177e317618fda40516f3e9d95fd43c7ae", "size": 49880329, "url": "https://dl.google.com/android/repository/build-tools_r25.0.2-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "12a5204bb3b6e39437535469fde7ddf42da46b16", "size": 49667185, "url": "https://dl.google.com/android/repository/build-tools_r25.0.2-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "2fee3c0704d6ecc480570450d8b8069b2c4a2dd4", "size": 50458908, @@ -12667,7 +15321,7 @@ } }, "displayName": "Android SDK Build-Tools 25.0.2", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.2", @@ -12686,18 +15340,21 @@ "25.0.3": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "db95f3a0ae376534d4d69f4cdb6fad20649f3509", "size": 50757258, "url": "https://dl.google.com/android/repository/build-tools_r25.0.3-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "160d2fefb5ce68e443427fc30a793a703b63e26e", "size": 50545085, "url": "https://dl.google.com/android/repository/build-tools_r25.0.3-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "1edcb109ae5133aebfed573cf0bc84e0c353c28d", "size": 51337442, @@ -12712,7 +15369,7 @@ } }, "displayName": "Android SDK Build-Tools 25.0.3", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.3", @@ -12731,18 +15388,21 @@ "26.0.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "1cbe72929876f8a872ab1f1b1040a9f720261f59", "size": 53854197, "url": "https://dl.google.com/android/repository/build-tools_r26-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "d01a1aeca03747245f1f5936b3cb01759c66d086", "size": 53010814, "url": "https://dl.google.com/android/repository/build-tools_r26-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "896ebd31117c09db220f7a3116cc0e5121c78b9d", "size": 54681641, @@ -12757,7 +15417,7 @@ } }, "displayName": "Android SDK Build-Tools 26", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.0", @@ -12776,18 +15436,21 @@ "26.0.1": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "5378c2c78091b414d0eac40a6bd37f2faa31a365", "size": 54113329, "url": "https://dl.google.com/android/repository/build-tools_r26.0.1-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "cbde59de198916b390777dd0227921bfa2120832", "size": 53266653, "url": "https://dl.google.com/android/repository/build-tools_r26.0.1-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "02494c80ffbe65bfff0aaa7463c9692693327b7d", "size": 54936185, @@ -12802,7 +15465,7 @@ } }, "displayName": "Android SDK Build-Tools 26.0.1", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.1", @@ -12821,18 +15484,21 @@ "26.0.2": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "5b2b7b66c7bf2151f2af183b5b50a17808850592", "size": 54440678, "url": "https://dl.google.com/android/repository/build-tools_r26.0.2-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "d9ed7c7f149ce38be5dc08979aea8acec1459ca0", "size": 53830573, "url": "https://dl.google.com/android/repository/build-tools_r26.0.2-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "39ca02d3faa49859cd9d1bc0adc2f331017b699b", "size": 55161474, @@ -12847,7 +15513,7 @@ } }, "displayName": "Android SDK Build-Tools 26.0.2", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.2", @@ -12866,18 +15532,21 @@ "26.0.3": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "8a2e6c1bcd845844523a68aa17e5442f0dce328c", "size": 54449983, "url": "https://dl.google.com/android/repository/build-tools_r26.0.3-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "5bb90ed935d99e5bc90686f43b852e68c5ad40df", "size": 53839758, "url": "https://dl.google.com/android/repository/build-tools_r26.0.3-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "460e511a9616b4661cc8dba0102d9d990ae60160", "size": 55170919, @@ -12892,7 +15561,7 @@ } }, "displayName": "Android SDK Build-Tools 26.0.3", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.3", @@ -12911,18 +15580,21 @@ "27.0.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "28542332ba97cf4a08c3eddfcf5edd70e3cf1260", "size": 54441725, "url": "https://dl.google.com/android/repository/build-tools_r27-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "fb4e8d7e6b8d29a77090e34024077a80458d5ae1", "size": 53831513, "url": "https://dl.google.com/android/repository/build-tools_r27-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "4f1df22a6d99261d2160d624b81445da0a027dbe", "size": 55163097, @@ -12937,7 +15609,7 @@ } }, "displayName": "Android SDK Build-Tools 27", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.0", @@ -12956,18 +15628,21 @@ "27.0.1": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "7f4eedb1077ef948b848040dcd15de9e8a759f4a", "size": 54450260, "url": "https://dl.google.com/android/repository/build-tools_r27.0.1-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "1edd07bfdbadd95652d093040e16d858f7489594", "size": 53838762, "url": "https://dl.google.com/android/repository/build-tools_r27.0.1-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "18109db020c6d088d0157d1df201d31bc6970875", "size": 55171114, @@ -12982,7 +15657,7 @@ } }, "displayName": "Android SDK Build-Tools 27.0.1", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.1", @@ -13001,18 +15676,21 @@ "27.0.2": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "b687ddf6be84f11607871138aad32cf857d0b837", "size": 54458153, "url": "https://dl.google.com/android/repository/build-tools_r27.0.2-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "6d5d9cf2a47877f273f4b742b19e712a051a31be", "size": 53846615, "url": "https://dl.google.com/android/repository/build-tools_r27.0.2-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "b80466c13b75e3ebf3c546964f40775db5898b2a", "size": 55173070, @@ -13027,7 +15705,7 @@ } }, "displayName": "Android SDK Build-Tools 27.0.2", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.2", @@ -13046,18 +15724,21 @@ "27.0.3": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "d85e7a6320eddffe7eeace3437605079dac938ca", "size": 54478554, "url": "https://dl.google.com/android/repository/build-tools_r27.0.3-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "61d9fb18790c68d66ff73bf1e7ad56bc1f1eef2d", "size": 53867966, "url": "https://dl.google.com/android/repository/build-tools_r27.0.3-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "0df61e11713a2838d2cc9a911219dddf5e6a2749", "size": 55194255, @@ -13072,7 +15753,7 @@ } }, "displayName": "Android SDK Build-Tools 27.0.3", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.3", @@ -13091,18 +15772,21 @@ "28.0.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "d9f8a754d833ccd334f56fcc6089c5925cd82abb", "size": 37157769, "url": "https://dl.google.com/android/repository/build-tools_r28-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "72088d32d1d82cc3c2cf7cf6618b6130c0c84ade", "size": 36458977, "url": "https://dl.google.com/android/repository/build-tools_r28-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "d4b0638a877ed570e07876264e69fdbd86409610", "size": 37718995, @@ -13117,7 +15801,7 @@ } }, "displayName": "Android SDK Build-Tools 28", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.0", @@ -13136,18 +15820,21 @@ "28.0.0-rc1": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "1601977fae25fd478bcfaa0481ca5ea3c609d840", "size": 38703535, "url": "https://dl.google.com/android/repository/build-tools_r28-rc1-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "2c77821967a2330b7b227072d0b1c02ef19fe2fc", "size": 38004795, "url": "https://dl.google.com/android/repository/build-tools_r28-rc1-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "fbf46c33d1268f6532911707b2a05033fd5c5b41", "size": 39273232, @@ -13162,7 +15849,7 @@ } }, "displayName": "Android SDK Build-Tools 28-rc1", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -13183,18 +15870,21 @@ "28.0.0-rc2": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "efe9c0dde0646a07544c864276390ca6e96b24dc", "size": 37151124, "url": "https://dl.google.com/android/repository/build-tools_r28-rc2-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "0d0314b353589feb10e528b44c5a685b6658d797", "size": 36449480, "url": "https://dl.google.com/android/repository/build-tools_r28-rc2-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "a94bfb52b4ec74b95c116236c3e382e923cad6c4", "size": 37716459, @@ -13209,7 +15899,7 @@ } }, "displayName": "Android SDK Build-Tools 28-rc2", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -13230,18 +15920,21 @@ "28.0.1": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "ee70dfa1fccb58b37cebc9544830511f36a137a0", "size": 57610954, "url": "https://dl.google.com/android/repository/build-tools_r28.0.1-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "aeef42ad953f1630dd6f5d71eefdc0b825211462", "size": 56913869, "url": "https://dl.google.com/android/repository/build-tools_r28.0.1-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "29c6342835734be25b9e458ab3fad5750ad6a355", "size": 58173989, @@ -13256,7 +15949,7 @@ } }, "displayName": "Android SDK Build-Tools 28.0.1", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.1", @@ -13275,18 +15968,21 @@ "28.0.2": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "b4492209810a3fd48deaa982f9852fef12433d55", "size": 57754663, "url": "https://dl.google.com/android/repository/build-tools_r28.0.2-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "c10dd5a7825578622fb362a8a34f76eb3ba0c0a9", "size": 57057554, "url": "https://dl.google.com/android/repository/build-tools_r28.0.2-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "e9c570c568a0c2a32e88ee3204279019ebefd949", "size": 58317692, @@ -13301,7 +15997,7 @@ } }, "displayName": "Android SDK Build-Tools 28.0.2", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.2", @@ -13320,18 +16016,21 @@ "28.0.3": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "ea6f2f7103cd9da9ff0bdf6e37fbbba548fa4165", "size": 57830695, "url": "https://dl.google.com/android/repository/build-tools_r28.0.3-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "f8c333a2991b1ab05a671bc6248b78e00edcd83a", "size": 57133581, "url": "https://dl.google.com/android/repository/build-tools_r28.0.3-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "05bd35bb48d11c848da2b393c6f864eb609aacba", "size": 58393729, @@ -13346,7 +16045,7 @@ } }, "displayName": "Android SDK Build-Tools 28.0.3", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.3", @@ -13365,18 +16064,21 @@ "29.0.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "ad314caf1802209c4b00a5f3517af5ceb0d48eae", "size": 58650449, "url": "https://dl.google.com/android/repository/build-tools_r29-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "35dc6bc7a53bd9d206847e72f02cab21cfdaa869", "size": 57820193, "url": "https://dl.google.com/android/repository/build-tools_r29-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "1799f7f975416098e5a5bf280eb97c8f77cf7f79", "size": 57098799, @@ -13391,7 +16093,7 @@ } }, "displayName": "Android SDK Build-Tools 29", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.0", @@ -13410,18 +16112,21 @@ "29.0.0-rc1": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "1c897f5885ac5468613e40e1ea598c21c05d345d", "size": 58516671, "url": "https://dl.google.com/android/repository/build-tools_r29-rc1-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "f066c0d9ea2f0d8a0a9cc7b2ca0a467a570ab034", "size": 57704927, "url": "https://dl.google.com/android/repository/build-tools_r29-rc1-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "8887ee791a143f92694a0908130354142a903b17", "size": 56933956, @@ -13436,7 +16141,7 @@ } }, "displayName": "Android SDK Build-Tools 29-rc1", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -13457,18 +16162,21 @@ "29.0.0-rc2": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "b4b41d429c35b42db07b6c65d4aa998ba8c4093c", "size": 58602830, "url": "https://dl.google.com/android/repository/build-tools_r29-rc2-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "7a960367999169ccac5dbc60817e5f1725c4c738", "size": 57785717, "url": "https://dl.google.com/android/repository/build-tools_r29-rc2-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "2de2a3e290cae4ce35e82c8a5abed49b1cdd24e3", "size": 57000706, @@ -13483,7 +16191,7 @@ } }, "displayName": "Android SDK Build-Tools 29-rc2", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -13504,18 +16212,21 @@ "29.0.0-rc3": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "8b7177f198e8b92da8f9537aaf859f6edf222b01", "size": 58639871, "url": "https://dl.google.com/android/repository/build-tools_r29-rc3-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "643e8d76625f6e2cfcd5494e50bae5e14725ec0c", "size": 57810162, "url": "https://dl.google.com/android/repository/build-tools_r29-rc3-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "6abce2ebfecf3580afd3129520999f95691a03df", "size": 57092256, @@ -13530,7 +16241,7 @@ } }, "displayName": "Android SDK Build-Tools 29-rc3", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -13551,18 +16262,21 @@ "29.0.1": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "fc209e5d91ab2daeac24345a5cb17261940547e4", "size": 41682816, "url": "https://dl.google.com/android/repository/build-tools_r29.0.1-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "46ae9b1d1e2a67241d7da9c2cd8eae42f24cc6cd", "size": 40852521, "url": "https://dl.google.com/android/repository/build-tools_r29.0.1-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "1c44e10d5f74e58c3e05bfc6f1631a59616059bc", "size": 40163897, @@ -13577,7 +16291,7 @@ } }, "displayName": "Android SDK Build-Tools 29.0.1", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.1", @@ -13596,18 +16310,21 @@ "29.0.2": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "c0fc7e5c37ac96bfd0c611802e8ab36d0e71b398", "size": 41678888, "url": "https://dl.google.com/android/repository/build-tools_r29.0.2-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "f781d9e03d5c2debcf51fed3792ee7a9d066723f", "size": 40848529, "url": "https://dl.google.com/android/repository/build-tools_r29.0.2-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "595dc1730c844d892516d5f0e7894e992d19f63d", "size": 40159970, @@ -13622,7 +16339,7 @@ } }, "displayName": "Android SDK Build-Tools 29.0.2", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.2", @@ -13641,18 +16358,21 @@ "29.0.3": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "64efff52165cda5e31848acafa46a05e3f3b4651", "size": 53797376, "url": "https://dl.google.com/android/repository/build-tools_r29.0.3-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "76520eb7712fb0bb4c023b55c6f65588ee268289", "size": 52432183, "url": "https://dl.google.com/android/repository/build-tools_r29.0.3-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "813f8c35f016cef83e5b2b742229a3634d4658d3", "size": 55201638, @@ -13667,7 +16387,7 @@ } }, "displayName": "Android SDK Build-Tools 29.0.3", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.3", @@ -13686,18 +16406,21 @@ "30.0.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "5bdda303b7aba4073dd2aeb8003b6b0b57098021", "size": 68819159, "url": "https://dl.google.com/android/repository/build-tools_r30-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "80b06ce5fa4af2ed14db343a8131af658dda79a8", "size": 67373109, "url": "https://dl.google.com/android/repository/build-tools_r30-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "5276f337e4eb4d8e5fb82f846045610f8b8e3650", "size": 70027538, @@ -13712,7 +16435,7 @@ } }, "displayName": "Android SDK Build-Tools 30", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.0", @@ -13731,18 +16454,21 @@ "30.0.1": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "dae27b63a53f3c71a23a2e9517d435f79ce7975b", "size": 52664463, "url": "https://dl.google.com/android/repository/build-tools_r30.0.1-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "b62ccd6d6468a374b7c8e641c3751bc929a89397", "size": 51227882, "url": "https://dl.google.com/android/repository/build-tools_r30.0.1-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "76197fec228ca9b69086d6dd8a16e4589982bdc6", "size": 53783332, @@ -13757,7 +16483,7 @@ } }, "displayName": "Android SDK Build-Tools 30.0.1", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.1", @@ -13776,18 +16502,21 @@ "30.0.2": { "archives": [ { + "arch": "all", "os": "macosx", "sha1": "6b0166d1f4b0b3d496c0dde660145dfa7898095f", "size": 51227855, "url": "https://dl.google.com/android/repository/5a6ceea22103d8dec989aefcef309949c0c42f1d.build-tools_r30.0.2-macosx.zip" }, { + "arch": "all", "os": "linux", "sha1": "363632ff8f7a198bf9fa94e3b9e0db6927bf373d", "size": 52664453, "url": "https://dl.google.com/android/repository/build-tools_r30.0.2-linux.zip" }, { + "arch": "all", "os": "windows", "sha1": "b42b77e02b82f242432cd7ffff5cbb92f6888ca7", "size": 53783318, @@ -13802,7 +16531,7 @@ } }, "displayName": "Android SDK Build-Tools 30.0.2", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.2", @@ -13821,18 +16550,21 @@ "30.0.3": { "archives": [ { + "arch": "all", "os": "windows", "sha1": "fc165c721b8d2da55e6fede467526c81f562be7b", "size": 54254759, "url": "https://dl.google.com/android/repository/91936d4ee3ccc839f0addd53c9ebf087b1e39251.build-tools_r30.0.3-windows.zip" }, { + "arch": "all", "os": "linux", "sha1": "2076ea81b5a2fc298ef7bf85d666f496b928c7f1", "size": 53134793, "url": "https://dl.google.com/android/repository/build-tools_r30.0.3-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "0807cd3f0dbc33c8be7f3d6faa263f6b14b502b7", "size": 51698282, @@ -13847,7 +16579,7 @@ } }, "displayName": "Android SDK Build-Tools 30.0.3", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.3", @@ -13866,18 +16598,21 @@ "31.0.0": { "archives": [ { + "arch": "all", "os": "windows", "sha1": "032da328482814e6ef7fe918665c07e8f8f806ca", "size": 56688233, "url": "https://dl.google.com/android/repository/09489e417c0a266f2862ddd82b4ac29a1b7af55e.build-tools_r31-windows.zip" }, { + "arch": "all", "os": "linux", "sha1": "9dbebfdb9ff4c0dbc4ef00677986bf571ddcf99c", "size": 54931191, "url": "https://dl.google.com/android/repository/build-tools_r31-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "c9b4215affd183974b1b2d1c5745911203f56de5", "size": 52867497, @@ -13885,7 +16620,7 @@ } ], "displayName": "Android SDK Build-Tools 31", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/31.0.0", @@ -13904,18 +16639,21 @@ "32.0.0": { "archives": [ { + "arch": "all", "os": "windows", "sha1": "2134fdd4a00b3501b87597d100182e169eaa8c6a", "size": 56720035, "url": "https://dl.google.com/android/repository/210b77e4bc623bd4cdda4dae790048f227972bd2.build-tools_r32-windows.zip" }, { + "arch": "all", "os": "macosx", "sha1": "27b56ee9a313f0f34f009dea343f3887d3f72b17", "size": 52875135, "url": "https://dl.google.com/android/repository/5219cc671e844de73762e969ace287c29d2e14cd.build-tools_r32-macosx.zip" }, { + "arch": "all", "os": "linux", "sha1": "c7f2c700aafd9f7a2da187d80901481b80156719", "size": 54940436, @@ -13923,7 +16661,7 @@ } ], "displayName": "Android SDK Build-Tools 32", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/32.0.0", @@ -13942,18 +16680,21 @@ "32.1.0-rc1": { "archives": [ { + "arch": "all", "os": "windows", "sha1": "af2abccfe48f9109ca0bddbec023234a4a68446b", "size": 54636210, "url": "https://dl.google.com/android/repository/21014bc1a76d38d0dcb79b3b3f49f40ea5a53c10.build-tools_r32.1-rc1-windows.zip" }, { + "arch": "all", "os": "linux", "sha1": "4af23395f3a7cb4a5c01623347622f881a4772fd", "size": 57403070, "url": "https://dl.google.com/android/repository/build-tools_r32.1-rc1-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "38c166a60de3cb799ff1ad5b855234579d05e7b6", "size": 59462877, @@ -13961,7 +16702,7 @@ } ], "displayName": "Android SDK Build-Tools 32.1-rc1", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/32.1.0-rc1", @@ -13981,18 +16722,21 @@ "33.0.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "c561971600d4ce682b128b0bd5d4ab71c5f2ad35", "size": 56000182, "url": "https://dl.google.com/android/repository/build-tools_r33-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "3693851532ba9640710d2dd360d85aa5b04c5151", "size": 60023096, "url": "https://dl.google.com/android/repository/build-tools_r33-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "f4ef853e5e755ea5ffc50de73a9e420fc76c662e", "size": 55610532, @@ -14000,7 +16744,7 @@ } ], "displayName": "Android SDK Build-Tools 33", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.0", @@ -14019,18 +16763,21 @@ "33.0.1": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "fefb393b82814feb94f88147827cbc918cf992b0", "size": 56003178, "url": "https://dl.google.com/android/repository/build-tools_r33.0.1-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "d091bee94295480891ca679e7b2004fe6198d05f", "size": 60027237, "url": "https://dl.google.com/android/repository/build-tools_r33.0.1-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "710918f38f8fa7595320f4d29db5910770993f63", "size": 55631116, @@ -14038,7 +16785,7 @@ } ], "displayName": "Android SDK Build-Tools 33.0.1", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.1", @@ -14057,18 +16804,21 @@ "33.0.2": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "9def17c815f46ac09024ebb674466d39d039255c", "size": 56003588, "url": "https://dl.google.com/android/repository/build-tools_r33.0.2-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "482fd9244332cb3e7435f229a22552459b68b3ff", "size": 60013768, "url": "https://dl.google.com/android/repository/build-tools_r33.0.2-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "1f33813c884a039f242b386e9127d3a96915066f", "size": 55630250, @@ -14076,7 +16826,7 @@ } ], "displayName": "Android SDK Build-Tools 33.0.2", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.2", @@ -14095,18 +16845,21 @@ "33.0.3": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "83d08ea1cdad9733cae08e33c84758835987a508", "size": 56003317, "url": "https://dl.google.com/android/repository/build-tools_r33.0.3-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "daaeee4fb70ae54fe03bb64e414ea88a16e66ba8", "size": 60015916, "url": "https://dl.google.com/android/repository/build-tools_r33.0.3-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "9d93a3b5ff0497fca16739160327ec7ef44b3eff", "size": 55630525, @@ -14114,7 +16867,7 @@ } ], "displayName": "Android SDK Build-Tools 33.0.3", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.3", @@ -14133,18 +16886,21 @@ "34.0.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "d6d58e0c6925a9e4d9a541e84cd1f405c2f9d2a9", "size": 61224257, "url": "https://dl.google.com/android/repository/build-tools_r34-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "00e1301387028f33753e38274401694e1a27c62f", "size": 76559180, "url": "https://dl.google.com/android/repository/build-tools_r34-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "62cfde1b6fcc3ad12a4d2ba1b537e752768bfd47", "size": 58253258, @@ -14152,7 +16908,7 @@ } ], "displayName": "Android SDK Build-Tools 34", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/34.0.0", @@ -14171,18 +16927,21 @@ "34.0.0-rc1": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "fec0a16d0c2fab6576fd58f6aa2e69a561ab1128", "size": 60468599, "url": "https://dl.google.com/android/repository/build-tools_r34-rc1-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "1e3847d449ce6124ffbf528db601f3dfab25e77e", "size": 62640488, "url": "https://dl.google.com/android/repository/build-tools_r34-rc1-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "73dca92f84827749882bd0ac501c4befdf3ab878", "size": 57791540, @@ -14190,7 +16949,7 @@ } ], "displayName": "Android SDK Build-Tools 34-rc1", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/34.0.0-rc1", @@ -14210,18 +16969,21 @@ "34.0.0-rc2": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "bce35f1524d2ea5f6326809dc7accff0ee2fe370", "size": 60835777, "url": "https://dl.google.com/android/repository/build-tools_r34-rc2-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "c47d9c9d040567b1b62eefc1a6306b5acebe3a76", "size": 63005203, "url": "https://dl.google.com/android/repository/build-tools_r34-rc2-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "60c51d073ac760fdec647b9fecf086d1a35f7841", "size": 58246192, @@ -14229,7 +16991,7 @@ } ], "displayName": "Android SDK Build-Tools 34-rc2", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/34.0.0-rc2", @@ -14249,18 +17011,21 @@ "34.0.0-rc3": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "0bcb893e8b009f1da3d538be47c6ae5907884bf6", "size": 61165322, "url": "https://dl.google.com/android/repository/build-tools_r34-rc3-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "97db9e5009971021ca18bb62043764b68f756ede", "size": 76497941, "url": "https://dl.google.com/android/repository/build-tools_r34-rc3-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "78fa4ca752017c3217786af16c513f44a5042433", "size": 58326432, @@ -14268,7 +17033,7 @@ } ], "displayName": "Android SDK Build-Tools 34-rc3", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/34.0.0-rc3", @@ -14327,18 +17092,21 @@ "35.0.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "2cfaa0bbb2336e9ec18ed3ecea84fa2e2af607bc", "size": 61958799, "url": "https://dl.google.com/android/repository/build-tools_r35_linux.zip" }, { + "arch": "all", "os": "windows", "sha1": "af059bb67cf7786f45ee0db85e2d24985df1b4b6", "size": 59878107, "url": "https://dl.google.com/android/repository/build-tools_r35_windows.zip" }, { + "arch": "all", "os": "macosx", "sha1": "93ab8ce91230e067b5add4bfa79919c52b27f072", "size": 76857898, @@ -14346,7 +17114,7 @@ } ], "displayName": "Android SDK Build-Tools 35", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/35.0.0", @@ -14365,18 +17133,21 @@ "35.0.0-rc1": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "340cf69a732e880a8544f8b32dac8d9c88730b4e", "size": 62860992, "url": "https://dl.google.com/android/repository/build-tools_r35-rc1-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "dcd4b6d358eccc05ef7dfdead1e029581bb5e60f", "size": 78408675, "url": "https://dl.google.com/android/repository/build-tools_r35-rc1-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "432068f39066d3c529be98e331e81c1f1d7c218c", "size": 59996484, @@ -14384,7 +17155,7 @@ } ], "displayName": "Android SDK Build-Tools 35-rc1", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/35.0.0-rc1", @@ -14404,18 +17175,21 @@ "35.0.0-rc2": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "c36ffb3f3238590f23c263cdd8e8c18d9ef10dc0", "size": 60633658, "url": "https://dl.google.com/android/repository/build-tools_r35-rc2_linux.zip" }, { + "arch": "all", "os": "windows", "sha1": "9b13029b6160e32cd6ca4f9c2e3c49fa4e86996b", "size": 59875696, "url": "https://dl.google.com/android/repository/build-tools_r35-rc2_windows.zip" }, { + "arch": "all", "os": "macosx", "sha1": "01630418469f2b7d4772777db2b4b40d836add34", "size": 78321548, @@ -14423,7 +17197,7 @@ } ], "displayName": "Android SDK Build-Tools 35-rc2", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/35.0.0-rc2", @@ -14443,18 +17217,21 @@ "35.0.0-rc3": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "25a13fd75a525385d77864f5470db9c1c48b5a40", "size": 62746687, "url": "https://dl.google.com/android/repository/build-tools_r35-rc3_linux.zip" }, { + "arch": "all", "os": "windows", "sha1": "f04f402d7d92edc14502e7b94034d1a1695ac12e", "size": 59812048, "url": "https://dl.google.com/android/repository/build-tools_r35-rc3_windows.zip" }, { + "arch": "all", "os": "macosx", "sha1": "f0d2a565d3634d2fd7a22838eafad792e8538c0a", "size": 78263822, @@ -14462,7 +17239,7 @@ } ], "displayName": "Android SDK Build-Tools 35-rc3", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/35.0.0-rc3", @@ -14482,18 +17259,21 @@ "35.0.0-rc4": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "08049ed693a2ba9bf6b9fa0edec897abac9f85ed", "size": 61882448, "url": "https://dl.google.com/android/repository/build-tools_r35-rc4_linux.zip" }, { + "arch": "all", "os": "windows", "sha1": "e08195bf5ce51105aca15f9eba758fceeb7b4b5d", "size": 59901374, "url": "https://dl.google.com/android/repository/build-tools_r35-rc4_windows.zip" }, { + "arch": "all", "os": "macosx", "sha1": "d9ce6ae1b0d720d7c2abd6510843c881f9d65188", "size": 76832786, @@ -14501,7 +17281,7 @@ } ], "displayName": "Android SDK Build-Tools 35-rc4", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/35.0.0-rc4", @@ -14521,18 +17301,21 @@ "35.0.1": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "e009a9b188cfeb1d2b4c318ab5cb4f1ddc368861", "size": 61959297, "url": "https://dl.google.com/android/repository/build-tools_r35.0.1_linux.zip" }, { + "arch": "all", "os": "windows", "sha1": "1cbfa5564b62504a1111352edda35914cf723a20", "size": 59876477, "url": "https://dl.google.com/android/repository/build-tools_r35.0.1_windows.zip" }, { + "arch": "all", "os": "macosx", "sha1": "f4dda6855ddf1ea1a51ee3ab6587104bd0c1d727", "size": 76857925, @@ -14540,7 +17323,7 @@ } ], "displayName": "Android SDK Build-Tools 35.0.1", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/35.0.1", @@ -14559,18 +17342,21 @@ "36.0.0-rc1": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "b0a48cef38ee02e2170e6eeb769956c46b8a294b", "size": 62558889, "url": "https://dl.google.com/android/repository/build-tools_r36-rc1_linux.zip" }, { + "arch": "all", "os": "windows", "sha1": "dfa48ceb8bd185891a11cd8babcc3782abca35e3", "size": 57851822, "url": "https://dl.google.com/android/repository/build-tools_r36-rc1_windows.zip" }, { + "arch": "all", "os": "macosx", "sha1": "7a1149c9a0603a831396b7f522505b4357d80744", "size": 78312030, @@ -14578,7 +17364,7 @@ } ], "displayName": "Android SDK Build-Tools 36-rc1", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/36.0.0-rc1", @@ -14598,18 +17384,21 @@ "36.0.0-rc3": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "af37c3b9c58d62b885c80c5f3968106a22c37495", "size": 62577193, "url": "https://dl.google.com/android/repository/build-tools_r36-rc3_linux.zip" }, { + "arch": "all", "os": "windows", "sha1": "acac220c05062b6ea56ab4c9561a544d15223150", "size": 57872335, "url": "https://dl.google.com/android/repository/build-tools_r36-rc3_windows.zip" }, { + "arch": "all", "os": "macosx", "sha1": "ae832d578f78dceca3c536479a58ca69c109dbaf", "size": 78345346, @@ -14617,7 +17406,7 @@ } ], "displayName": "Android SDK Build-Tools 36-rc3", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/36.0.0-rc3", @@ -14637,18 +17426,21 @@ "36.0.0-rc4": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "2ebea22941d2c8d661b9bf3c20193677ffd50334", "size": 62785278, "url": "https://dl.google.com/android/repository/build-tools_r36-rc4_linux.zip" }, { + "arch": "all", "os": "windows", "sha1": "66abc0f7c3efcd82b5e418d9613e97efd16ff370", "size": 58085095, "url": "https://dl.google.com/android/repository/build-tools_r36-rc4_windows.zip" }, { + "arch": "all", "os": "macosx", "sha1": "e5917875bb11fe08e69e6539bae079ddbe840586", "size": 78583529, @@ -14656,7 +17448,7 @@ } ], "displayName": "Android SDK Build-Tools 36-rc4", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/36.0.0-rc4", @@ -14678,18 +17470,28 @@ "3.10.2": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "f227a85cb53dcb927ac52a5a717f647c4a29bf3b", + "size": 13447295, + "url": "https://dl.google.com/android/repository/cmake-3.10.2-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "f227a85cb53dcb927ac52a5a717f647c4a29bf3b", "size": 13447295, "url": "https://dl.google.com/android/repository/cmake-3.10.2-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "439e8799bf59f724f104bf62784b2985f1bfe561", "size": 14275684, "url": "https://dl.google.com/android/repository/cmake-3.10.2-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "0a75b9c5bf558dc31caad7241a44515064656486", "size": 11899659, @@ -14697,7 +17499,7 @@ } ], "displayName": "CMake 3.10.2.4988404", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.10.2.4988404", @@ -14716,18 +17518,21 @@ "3.18.1": { "archives": [ { + "arch": "all", "os": "windows", "sha1": "63723e9657a3ce1fc3ae078229c6199af80b76bd", "size": 14676950, "url": "https://dl.google.com/android/repository/7c386a739f915f5bd60051f2572c24782388e807.cmake-3.18.1-windows.zip" }, { + "arch": "all", "os": "macosx", "sha1": "809fdc8e14c745c6df4e506cc2157910f50b9cd9", "size": 18505220, "url": "https://dl.google.com/android/repository/ba34c321f92f6e6fd696c8354c262c122f56abf8.cmake-3.18.1-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "9435bbe2120763871c75c37a365451b48c007fed", "size": 21005945, @@ -14735,7 +17540,7 @@ } ], "displayName": "CMake 3.18.1", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.18.1", @@ -14754,18 +17559,21 @@ "3.22.1": { "archives": [ { + "arch": "all", "os": "macosx", "sha1": "8604eeef9adadb626dbb70a7ff58a87e6a7b967a", "size": 38223266, "url": "https://dl.google.com/android/repository/cmake-3.22.1-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "fd0a48b4a758310df8c7aa51f59840ed48fe7ed8", "size": 22308647, "url": "https://dl.google.com/android/repository/cmake-3.22.1-linux.zip" }, { + "arch": "all", "os": "windows", "sha1": "292778f32a7d5183e1c49c7897b870653f2d2c1b", "size": 16116742, @@ -14773,7 +17581,7 @@ } ], "displayName": "CMake 3.22.1", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.22.1", @@ -14792,18 +17600,21 @@ "3.30.3": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "dc0d803d79b66eb7aa4b12b3056db5734ec1841f", "size": 29565700, "url": "https://dl.google.com/android/repository/cmake-3.30.3-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "99ee0e31ad78ca5d50fa68fa203543adbe49f412", "size": 41486046, "url": "https://dl.google.com/android/repository/cmake-3.30.3-darwin.zip" }, { + "arch": "all", "os": "windows", "sha1": "e25190d483d169ca8522ca4e15412188183b1d02", "size": 19897608, @@ -14811,7 +17622,7 @@ } ], "displayName": "CMake 3.30.3", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.30.3", @@ -14830,18 +17641,21 @@ "3.30.4": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "b7d4287a46737718d88611655608d567fcc07c1e", "size": 29566348, "url": "https://dl.google.com/android/repository/cmake-3.30.4-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "73e4d81d4ee1917e9b56ea6f35764c1861a52c45", "size": 41484902, "url": "https://dl.google.com/android/repository/cmake-3.30.4-darwin.zip" }, { + "arch": "all", "os": "windows", "sha1": "c4ed0e13447b94ddf548f67c6faac7e5ac878fb8", "size": 19898645, @@ -14849,7 +17663,7 @@ } ], "displayName": "CMake 3.30.4", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.30.4", @@ -14868,18 +17682,21 @@ "3.30.5": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "c999a37fa18cb3e24dc003386cffe1d86add91b5", "size": 29566687, "url": "https://dl.google.com/android/repository/cmake-3.30.5-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "3a7d78b52bdb455d9f041b1e521fc3e0dcbaef29", "size": 41485176, "url": "https://dl.google.com/android/repository/cmake-3.30.5-darwin.zip" }, { + "arch": "all", "os": "windows", "sha1": "308c94365edb2760f38eef8f745e313e36908a18", "size": 19898983, @@ -14887,7 +17704,7 @@ } ], "displayName": "CMake 3.30.5", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.30.5", @@ -14906,18 +17723,21 @@ "3.31.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "13b9505857aa3bbfc1d80ec6b587e3ba2d2929f3", "size": 30452943, "url": "https://dl.google.com/android/repository/cmake-3.31.0-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "d20697c5eb256dff2d29d52440e9cfe0f973538f", "size": 42747441, "url": "https://dl.google.com/android/repository/cmake-3.31.0-darwin.zip" }, { + "arch": "all", "os": "windows", "sha1": "39fa0e1898861bdef2da13f7b19ad0d0be5dac83", "size": 20441934, @@ -14925,7 +17745,7 @@ } ], "displayName": "CMake 3.31.0", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.31.0", @@ -14944,18 +17764,21 @@ "3.31.1": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "477e6cd2d8094d2653464a60869aa15e0d79a24f", "size": 30474570, "url": "https://dl.google.com/android/repository/cmake-3.31.1-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "11b79b8908377bdd038aac0625e7d8aa32aed503", "size": 42781652, "url": "https://dl.google.com/android/repository/cmake-3.31.1-darwin.zip" }, { + "arch": "all", "os": "windows", "sha1": "3a8f1f1b33e0ed2a639b6e709ab15806648979c9", "size": 20462685, @@ -14963,7 +17786,7 @@ } ], "displayName": "CMake 3.31.1", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.31.1", @@ -14982,18 +17805,21 @@ "3.31.4": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "329d5d23600fc7cff8ebff8136a0fd0e7994c069", "size": 30482338, "url": "https://dl.google.com/android/repository/cmake-3.31.4-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "4094e82ed72c994bf9c0244d71db555a7c97e693", "size": 42791670, "url": "https://dl.google.com/android/repository/cmake-3.31.4-darwin.zip" }, { + "arch": "all", "os": "windows", "sha1": "7012f994ba691ca888b0733e95ab62c3f300d7dc", "size": 20465800, @@ -15001,7 +17827,7 @@ } ], "displayName": "CMake 3.31.4", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.31.4", @@ -15017,21 +17843,72 @@ } } }, + "3.31.5": { + "archives": [ + { + "arch": "all", + "os": "linux", + "sha1": "823156dfed8f1e4bf1a82bbc9c41a5415546b8ac", + "size": 30482790, + "url": "https://dl.google.com/android/repository/cmake-3.31.5-linux.zip" + }, + { + "arch": "all", + "os": "macosx", + "sha1": "4c28c635f08638494ce563ffa7d26d1c43a50190", + "size": 42792306, + "url": "https://dl.google.com/android/repository/cmake-3.31.5-darwin.zip" + }, + { + "arch": "all", + "os": "windows", + "sha1": "6a51cf2d1f300edecbf04603087a31b07a0fcdec", + "size": 20465729, + "url": "https://dl.google.com/android/repository/cmake-3.31.5-windows.zip" + } + ], + "displayName": "CMake 3.31.5", + "last-available-day": 20131, + "license": "android-sdk-license", + "name": "cmake", + "path": "cmake/3.31.5", + "revision": "3.31.5", + "revision-details": { + "major:0": "3", + "micro:2": "5", + "minor:1": "31" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, "3.6.4111459": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "c9b02d630079783c6d67cb91488b622cfcd9765c", + "size": 12295830, + "url": "https://dl.google.com/android/repository/cmake-3.6.4111459-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "c9b02d630079783c6d67cb91488b622cfcd9765c", "size": 12295830, "url": "https://dl.google.com/android/repository/cmake-3.6.4111459-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "71c539b9c33f0943e9ad6251fea0b161c0b70782", "size": 13980243, "url": "https://dl.google.com/android/repository/cmake-3.6.4111459-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "4c4730dc3f399b2fa9ab701112d2c439368a59a5", "size": 10428915, @@ -15039,7 +17916,7 @@ } ], "displayName": "CMake 3.6.4111459", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.6.4111459", @@ -15060,18 +17937,21 @@ "1.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "6ffc5bd72db2c755f9b374ed829202262a6d8aaf", "size": 81680508, "url": "https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip" }, { + "arch": "all", "os": "macosx", "sha1": "23f803c07e392bb769507c88b23c2c7868cc7a6f", "size": 81680498, "url": "https://dl.google.com/android/repository/commandlinetools-mac-6200805_latest.zip" }, { + "arch": "all", "os": "windows", "sha1": "a863da8763de2febeb7429e7894fb65a092609db", "size": 81665410, @@ -15079,7 +17959,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/1.0", @@ -15097,18 +17977,21 @@ "10.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "a787f0c35d3970f2ad634f7d91a2e7bc49e2c7f5", "size": 138733165, "url": "https://dl.google.com/android/repository/commandlinetools-linux-9862592_latest.zip" }, { + "arch": "all", "os": "macosx", "sha1": "2a0c97c8d9b11f9a64be0a7058bcdbf1aaab9910", "size": 138733149, "url": "https://dl.google.com/android/repository/commandlinetools-mac-9862592_latest.zip" }, { + "arch": "all", "os": "windows", "sha1": "5a03c5ce16f4c99ffe7bded82798b01b07a79bc0", "size": 138709020, @@ -15116,7 +17999,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/10.0", @@ -15172,18 +18055,21 @@ "11.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "87b485c7283cba69e41c10f05bf832d2fd691552", "size": 148832188, "url": "https://dl.google.com/android/repository/commandlinetools-linux-10406996_latest.zip" }, { + "arch": "all", "os": "macosx", "sha1": "4b831e6a978ce9170fc49a8010e2ece4be790c73", "size": 148832172, "url": "https://dl.google.com/android/repository/commandlinetools-mac-10406996_latest.zip" }, { + "arch": "all", "os": "windows", "sha1": "9b0082db87cf1738866f80160f497b8a53e149a3", "size": 148808043, @@ -15191,7 +18077,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/11.0", @@ -15285,18 +18171,21 @@ "12.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "d313adb7aedccf6cf0cfca51ec180f0059f5f8f8", "size": 153607504, "url": "https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip" }, { + "arch": "all", "os": "macosx", "sha1": "37fb7dd41005b3b4ca6ea48ac27074b6fc4e3236", "size": 153607488, "url": "https://dl.google.com/android/repository/commandlinetools-mac-11076708_latest.zip" }, { + "arch": "all", "os": "windows", "sha1": "3d2917302740f476999a091bc5558837c7a863c5", "size": 153583359, @@ -15304,7 +18193,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/12.0", @@ -15360,18 +18249,21 @@ "13.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "2e1a11866ce7146dee1456152ff64d6c8158b2c0", "size": 157033049, "url": "https://dl.google.com/android/repository/commandlinetools-linux-11479570_latest.zip" }, { + "arch": "all", "os": "macosx", "sha1": "4fe82efec2b7c33f373988f86d353d733698a0a3", "size": 136810605, "url": "https://dl.google.com/android/repository/commandlinetools-mac-11479570_latest.zip" }, { + "arch": "all", "os": "windows", "sha1": "938b82035c25633e822bd4e048033a6b7816d3a8", "size": 136324801, @@ -15379,7 +18271,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/13.0", @@ -15397,18 +18289,21 @@ "13.0-rc01": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "8d8f5c9ccc8746afed262b39c419be3d4e856124", "size": 157028144, "url": "https://dl.google.com/android/repository/commandlinetools-linux-11379558_latest.zip" }, { + "arch": "all", "os": "macosx", "sha1": "c7f71dd662115aa2d370508f190e2df6e83884cc", "size": 157028128, "url": "https://dl.google.com/android/repository/commandlinetools-mac-11379558_latest.zip" }, { + "arch": "all", "os": "windows", "sha1": "87247876f2c9a7dcf8885e6feb1e5481adccd0e5", "size": 157003999, @@ -15416,7 +18311,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "cmdline-tools", "path": "cmdline-tools/13.0-rc01", @@ -15435,18 +18330,21 @@ "14.0-rc01": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "46a5d7efd0db68c737c9f7f3a79aa915363f8ced", "size": 160503024, "url": "https://dl.google.com/android/repository/commandlinetools-linux-11391160_latest.zip" }, { + "arch": "all", "os": "macosx", "sha1": "2b9006f2755f97f27473a079f973252f012a8301", "size": 160503004, "url": "https://dl.google.com/android/repository/commandlinetools-mac-11391160_latest.zip" }, { + "arch": "all", "os": "windows", "sha1": "1e7c4acead6a4aabd9b753ffd98e116d59f7547e", "size": 160472813, @@ -15454,7 +18352,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "cmdline-tools", "path": "cmdline-tools/14.0-alpha01", @@ -15473,18 +18371,21 @@ "16.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "47e61d3bb57b5e907a74f225a767a767a8b4d7a5", "size": 165618711, "url": "https://dl.google.com/android/repository/commandlinetools-linux-12266719_latest.zip" }, { + "arch": "all", "os": "macosx", "sha1": "b2fb3e403104bf342be7abf0631c23e30559d222", "size": 143967391, "url": "https://dl.google.com/android/repository/commandlinetools-mac-12266719_latest.zip" }, { + "arch": "all", "os": "windows", "sha1": "32787c10f55911fd109848906b1275723e79f659", "size": 143481958, @@ -15492,7 +18393,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/16.0", @@ -15510,18 +18411,21 @@ "16.0-rc01": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "818d632f1d727edaecd4ff94aa5f86b5a8a129a6", "size": 165618743, "url": "https://dl.google.com/android/repository/commandlinetools-linux-12172612_latest.zip" }, { + "arch": "all", "os": "macosx", "sha1": "8c7e4cc8fa9b2594ab8b56343bf56618ebdf04b9", "size": 143967294, "url": "https://dl.google.com/android/repository/commandlinetools-mac-12172612_latest.zip" }, { + "arch": "all", "os": "windows", "sha1": "b2ae4d96dca0f10358a041adc9b79eedf399779b", "size": 143481957, @@ -15529,7 +18433,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "cmdline-tools", "path": "cmdline-tools/16.0-alpha01", @@ -15548,18 +18452,21 @@ "17.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "da3424ea38b72d85258174a76aa286b7d4e0b700", "size": 163426701, "url": "https://dl.google.com/android/repository/commandlinetools-linux-12700392_latest.zip" }, { + "arch": "all", "os": "macosx", "sha1": "625e146cf61d6b4fbdfdd9ad34105af23b0486c2", "size": 142285185, "url": "https://dl.google.com/android/repository/commandlinetools-mac-12700392_latest.zip" }, { + "arch": "all", "os": "windows", "sha1": "4a0902fb473afb7ce90a0ff6181d997138a15d9c", "size": 141848100, @@ -15567,7 +18474,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/17.0", @@ -15582,21 +18489,65 @@ } } }, + "19.0-rc01": { + "archives": [ + { + "arch": "all", + "os": "linux", + "sha1": "f25edbe00eccf74e940abb8d9872b7120c3942a3", + "size": 164759933, + "url": "https://dl.google.com/android/repository/commandlinetools-linux-12996373_latest.zip" + }, + { + "arch": "all", + "os": "macosx", + "sha1": "de2df8ad8705f3be6de366c953e4cb3e3a0b9f6c", + "size": 143250486, + "url": "https://dl.google.com/android/repository/commandlinetools-mac-12996373_latest.zip" + }, + { + "arch": "all", + "os": "windows", + "sha1": "26805d62669b20af583074f67926e31600e43185", + "size": 143039915, + "url": "https://dl.google.com/android/repository/commandlinetools-win-12996373_latest.zip" + } + ], + "displayName": "Android SDK Command-line Tools", + "last-available-day": 20131, + "license": "android-sdk-preview-license", + "name": "cmdline-tools", + "path": "cmdline-tools/19.0-alpha01", + "revision": "19.0-rc01", + "revision-details": { + "major:0": "19", + "minor:1": "0", + "preview:2": "01" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, "2.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "14b2114c6eae9e10686a18138d2bb468c46f8e0c", "size": 86521858, "url": "https://dl.google.com/android/repository/commandlinetools-linux-6514223_latest.zip" }, { + "arch": "all", "os": "macosx", "sha1": "d45816955198c4dfd652584f4c0f1b0e86efb1b7", "size": 86521848, "url": "https://dl.google.com/android/repository/commandlinetools-mac-6514223_latest.zip" }, { + "arch": "all", "os": "windows", "sha1": "e11b418c1d2d28589e9194915be2561f1e1e7a95", "size": 86506760, @@ -15604,7 +18555,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "cmdline-tools", "obsolete": "true", @@ -15623,18 +18574,21 @@ "2.1": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "9172381ff070ee2a416723c1989770cf4b0d1076", "size": 86532348, "url": "https://dl.google.com/android/repository/commandlinetools-linux-6609375_latest.zip" }, { + "arch": "all", "os": "macosx", "sha1": "c0c6bb9f1970bfadeaac623dfabf22c3e56baaec", "size": 86532338, "url": "https://dl.google.com/android/repository/commandlinetools-mac-6609375_latest.zip" }, { + "arch": "all", "os": "windows", "sha1": "e2e19c2ff584efa87ef0cfdd1987f92881323208", "size": 86517250, @@ -15642,7 +18596,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/2.1", @@ -15660,18 +18614,21 @@ "3.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "4f4417d53923c34891f1c05f302be2ed197d6844", "size": 87259900, "url": "https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip" }, { + "arch": "all", "os": "macosx", "sha1": "4846d2aede9db06361a5f0885d03997a6199229a", "size": 87259890, "url": "https://dl.google.com/android/repository/commandlinetools-mac-6858069_latest.zip" }, { + "arch": "all", "os": "windows", "sha1": "f0bf21e0a13dfcc48e7b0166f44dcff49912d2ee", "size": 87244802, @@ -15679,7 +18636,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/3.0", @@ -15697,18 +18654,21 @@ "4.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "87e7cd8879ed469117f20090dc4d454a24e30170", "size": 103957858, "url": "https://dl.google.com/android/repository/commandlinetools-linux-7302050_latest.zip" }, { + "arch": "all", "os": "macosx", "sha1": "8fcf59d208cb5d48e1233979aa5187e7dfb98cf3", "size": 103957846, "url": "https://dl.google.com/android/repository/commandlinetools-mac-7302050_latest.zip" }, { + "arch": "all", "os": "windows", "sha1": "ede5b054c06a7fea51bfd27041a100bae5521803", "size": 103939737, @@ -15716,7 +18676,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/4.0", @@ -15734,18 +18694,21 @@ "5.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "0885385de11983c020ff0d47039987fe372160d2", "size": 109673042, "url": "https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip" }, { + "arch": "all", "os": "macosx", "sha1": "49538fa064c077b188bdb51f3aa57bb2882b0abd", "size": 109673028, "url": "https://dl.google.com/android/repository/commandlinetools-mac-7583922_latest.zip" }, { + "arch": "all", "os": "windows", "sha1": "a2f359fb8b075acebcb3e3e48b4170cfe4071882", "size": 109651902, @@ -15753,7 +18716,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/5.0", @@ -15771,18 +18734,21 @@ "6.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "8d47ab9a90caa60ce8a95d7e384ec64633bc13b4", "size": 119650630, "url": "https://dl.google.com/android/repository/commandlinetools-linux-8092744_latest.zip" }, { + "arch": "all", "os": "macosx", "sha1": "bbd306940256ccb698edae47a56fb8da36d63e0b", "size": 119650616, "url": "https://dl.google.com/android/repository/commandlinetools-mac-8092744_latest.zip" }, { + "arch": "all", "os": "windows", "sha1": "3098050fb2bdc7cc8a07bdef4dd13035f9f78d2a", "size": 119629490, @@ -15790,7 +18756,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/6.0", @@ -15808,18 +18774,21 @@ "7.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "5e7bf2dd563d34917d32f3c5920a85562a795c93", "size": 114168525, "url": "https://dl.google.com/android/repository/commandlinetools-linux-8512546_latest.zip" }, { + "arch": "all", "os": "macosx", "sha1": "9a663c49dbd3709fc2b7d49db2814b383d811b4a", "size": 114168511, "url": "https://dl.google.com/android/repository/commandlinetools-mac-8512546_latest.zip" }, { + "arch": "all", "os": "windows", "sha1": "1bdd32ac4b9fffea04f5bc341108e8b4fea6f32c", "size": 114147385, @@ -15827,7 +18796,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/7.0", @@ -15845,18 +18814,21 @@ "8.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "09b65ebc5aa9c5011fec9416d22711ce7ffc2260", "size": 120916547, "url": "https://dl.google.com/android/repository/commandlinetools-linux-9123335_latest.zip" }, { + "arch": "all", "os": "macosx", "sha1": "089eedfc62371040f9e027835d5114178fc0e658", "size": 120916533, "url": "https://dl.google.com/android/repository/commandlinetools-mac-9123335_latest.zip" }, { + "arch": "all", "os": "windows", "sha1": "d1511ce5b61e5988b3de4b83062f0a570671074f", "size": 120895407, @@ -15864,7 +18836,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/8.0", @@ -15882,18 +18854,21 @@ "9.0": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "7f92d6e0783a6d73ade5396fe4cfcb58544ef14b", "size": 133507477, "url": "https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip" }, { + "arch": "all", "os": "macosx", "sha1": "587441bc37d957857c1f654726eb7e04ee9ca3e0", "size": 133507463, "url": "https://dl.google.com/android/repository/commandlinetools-mac-9477386_latest.zip" }, { + "arch": "all", "os": "windows", "sha1": "f8cd24223fee3b4cff857c9435caa72be0d08b70", "size": 133486337, @@ -15901,7 +18876,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/9.0", @@ -16786,59 +19761,31 @@ } } }, - "35.3.10": { - "archives": [ - { - "os": "linux", - "sha1": "1ee50867296f9b594ba2fa1a4f84a624cdd69e35", - "size": 303581032, - "url": "https://dl.google.com/android/repository/emulator-linux_x64-12721668.zip" - }, - { - "os": "macosx", - "sha1": "d1170e33688db3cce7e79804e6ed66037321469d", - "size": 400795998, - "url": "https://dl.google.com/android/repository/emulator-darwin_x64-12721668.zip" - }, - { - "os": "windows", - "sha1": "2e751a972fab5a96b2d82a7c8bb27fcfc65da031", - "size": 426363761, - "url": "https://dl.google.com/android/repository/emulator-windows_x64-12721668.zip" - } - ], - "displayName": "Android Emulator", - "last-available-day": 20112, - "license": "android-sdk-license", - "name": "emulator", - "path": "emulator", - "revision": "35.3.10", - "revision-details": { - "major:0": "35", - "micro:2": "10", - "minor:1": "3" - }, - "type-details": { - "element-attributes": { - "xsi:type": "ns5:genericDetailsType" - } - } - }, "35.3.11": { "archives": [ { + "arch": "x64", "os": "linux", "sha1": "99d847b09428b9842a3e52430e3f0decfc79c080", "size": 297018762, "url": "https://dl.google.com/android/repository/emulator-linux_x64-12836668.zip" }, { + "arch": "x64", "os": "macosx", "sha1": "e6149d02d8c05b6184b9f8c8d1d86420335974ec", "size": 392168292, "url": "https://dl.google.com/android/repository/emulator-darwin_x64-12836668.zip" }, { + "arch": "aarch64", + "os": "macosx", + "sha1": "74f35bb080574d307d1e12b6baef1afbf9f581fa", + "size": 311185526, + "url": "https://dl.google.com/android/repository/emulator-darwin_aarch64-12836668.zip" + }, + { + "arch": "x64", "os": "windows", "sha1": "4facc1af6ee937aca3831248c25195204e827b01", "size": 419748179, @@ -16846,7 +19793,7 @@ } ], "displayName": "Android Emulator", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "emulator", "path": "emulator", @@ -16862,37 +19809,171 @@ } } }, - "35.4.6": { + "35.4.8": { "archives": [ { + "arch": "x64", "os": "linux", - "sha1": "fb077c566b882aeaed465d91b7313cd739cfc35d", - "size": 303702485, - "url": "https://dl.google.com/android/repository/emulator-linux_x64-12930357.zip" + "sha1": "9ed664edb9c2f59df8ba322e0703d3f5a87b8990", + "size": 298120058, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-12990073.zip" }, { + "arch": "x64", "os": "macosx", - "sha1": "7f337706bdb6d3da3dca20be433c3af2bc944bd1", - "size": 401067221, - "url": "https://dl.google.com/android/repository/emulator-darwin_x64-12930357.zip" + "sha1": "40bd8f2332068eb11492640cbeb3267293585606", + "size": 393815670, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-12990073.zip" }, { + "arch": "aarch64", + "os": "macosx", + "sha1": "ebc1adb3fafdea595be64c67e719500282120504", + "size": 311960415, + "url": "https://dl.google.com/android/repository/emulator-darwin_aarch64-12990073.zip" + }, + { + "arch": "x64", "os": "windows", - "sha1": "0230221cb125140c7ce346525ca1a46e861881f9", - "size": 427996108, - "url": "https://dl.google.com/android/repository/emulator-windows_x64-12930357.zip" + "sha1": "c8fc55380f321455a8cd515bfc6289b21fdfd5d5", + "size": 421986278, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-12990073.zip" } ], "displayName": "Android Emulator", - "last-available-day": 20112, + "last-available-day": 20131, + "license": "android-sdk-license", + "name": "emulator", + "path": "emulator", + "revision": "35.4.8", + "revision-details": { + "major:0": "35", + "micro:2": "8", + "minor:1": "4" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, + "35.5.2": { + "archives": [ + { + "arch": "x64", + "os": "linux", + "sha1": "8409e1da1cc7dfd52133ecabd566dd9d2362caa9", + "size": 303757245, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-13003482.zip" + }, + { + "arch": "x64", + "os": "macosx", + "sha1": "f300f67cd8f24699f0574504013fb2b0f6a92166", + "size": 401061491, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-13003482.zip" + }, + { + "arch": "aarch64", + "os": "macosx", + "sha1": "0a93985646dce849c5c356571133d45d67368780", + "size": 319100573, + "url": "https://dl.google.com/android/repository/emulator-darwin_aarch64-13003482.zip" + }, + { + "arch": "x64", + "os": "windows", + "sha1": "a3f654716e123489ee1858b7c3a9218d616518b6", + "size": 429135086, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-13003482.zip" + } + ], + "displayName": "Android Emulator", + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "emulator", "path": "emulator", - "revision": "35.4.6", + "revision": "35.5.2", "revision-details": { "major:0": "35", - "micro:2": "6", - "minor:1": "4" + "micro:2": "2", + "minor:1": "5" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + } + }, + "extras": { + "2.0": { + "archives": [ + { + "os": "macosx", + "sha1": "d4d12a2173fef608ad62b94fed3a112bfa146759", + "size": 8030009, + "url": "https://dl.google.com/android/repository/desktop-head-unit-darwin-x64_r02.0.zip" + }, + { + "os": "linux", + "sha1": "77e3f80c2834e1fad33f56539ceb0215da408fab", + "size": 6895443, + "url": "https://dl.google.com/android/repository/desktop-head-unit-linux-x64_r02.0.zip" + }, + { + "os": "windows", + "sha1": "680418d5aca256cce151eb7f9527294e95b6bb8a", + "size": 6801703, + "url": "https://dl.google.com/android/repository/desktop-head-unit-windows-x64_r02.0.zip" + } + ], + "displayName": "Android Auto Desktop Head Unit Emulator", + "last-available-day": 19954, + "license": "android-sdk-license", + "name": "extras", + "path": "extras/google/auto", + "revision": "2.0", + "revision-details": { + "major:0": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } + }, + "2.1": { + "archives": [ + { + "os": "macosx", + "sha1": "4f8a3d3e32b27de1fc190d149039842e76a55bdd", + "size": 7797329, + "url": "https://dl.google.com/android/repository/desktop-head-unit-darwin-x64_r02.1.zip" + }, + { + "os": "linux", + "sha1": "5d87eb87a1421e59d528eac1f5cdd406c0b39f51", + "size": 6927985, + "url": "https://dl.google.com/android/repository/desktop-head-unit-linux-x64_r02.1.zip" + }, + { + "os": "windows", + "sha1": "c27bf84e59dda7b79315b6ca2a314063feffd6ac", + "size": 7012059, + "url": "https://dl.google.com/android/repository/desktop-head-unit-windows-x64_r02.1.zip" + } + ], + "displayName": "Android Auto Desktop Head Unit Emulator", + "last-available-day": 19954, + "license": "android-sdk-license", + "name": "extras", + "path": "extras/google/auto", + "revision": "2.1", + "revision-details": { + "major:0": "2", + "minor:1": "1" }, "type-details": { "element-attributes": { @@ -16905,18 +19986,35 @@ "16.1.4479499": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "e51e615449b98c716cf912057e2682e75d55e2de", + "size": 839630771, + "url": "https://dl.google.com/android/repository/android-ndk-r16b-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "e51e615449b98c716cf912057e2682e75d55e2de", "size": 839630771, "url": "https://dl.google.com/android/repository/android-ndk-r16b-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "42aa43aae89a50d1c66c3f9fdecd676936da6128", "size": 852525873, "url": "https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip" }, { + "arch": "x86", + "os": "windows", + "sha1": "becaf3d445a4877ca1a9300a62f0934a4838c7fa", + "size": 656720029, + "url": "https://dl.google.com/android/repository/android-ndk-r16b-windows-x86.zip" + }, + { + "arch": "x64", "os": "windows", "sha1": "f3f1909ed1052e98dda2c79d11c22f3da28daf25", "size": 723301086, @@ -16931,7 +20029,7 @@ } }, "displayName": "NDK (Side by side) 16.1.4479499", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk", "path": "ndk/16.1.4479499", @@ -16950,18 +20048,35 @@ "17.2.4988734": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "f97e3d7711497e3b4faf9e7b3fa0f0da90bb649c", + "size": 675091485, + "url": "https://dl.google.com/android/repository/android-ndk-r17c-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "f97e3d7711497e3b4faf9e7b3fa0f0da90bb649c", "size": 675091485, "url": "https://dl.google.com/android/repository/android-ndk-r17c-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "12cacc70c3fd2f40574015631c00f41fb8a39048", "size": 709387703, "url": "https://dl.google.com/android/repository/android-ndk-r17c-linux-x86_64.zip" }, { + "arch": "x86", + "os": "windows", + "sha1": "5bb25bf13fa494ee6c3433474c7aa90009f9f6a9", + "size": 608358310, + "url": "https://dl.google.com/android/repository/android-ndk-r17c-windows-x86.zip" + }, + { + "arch": "x64", "os": "windows", "sha1": "3e3b8d1650f9d297d130be2b342db956003f5992", "size": 650626501, @@ -16976,7 +20091,7 @@ } }, "displayName": "NDK (Side by side) 17.2.4988734", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk", "path": "ndk/17.2.4988734", @@ -16995,18 +20110,35 @@ "18.1.5063045": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "98cb9909aa8c2dab32db188bbdc3ac6207e09440", + "size": 542911996, + "url": "https://dl.google.com/android/repository/android-ndk-r18b-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "98cb9909aa8c2dab32db188bbdc3ac6207e09440", "size": 542911996, "url": "https://dl.google.com/android/repository/android-ndk-r18b-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "500679655da3a86aecf67007e8ab230ea9b4dd7b", "size": 557038702, "url": "https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip" }, { + "arch": "x86", + "os": "windows", + "sha1": "4b8b6a4edc0fa967b429c1d6d25adf69acc28803", + "size": 504605336, + "url": "https://dl.google.com/android/repository/android-ndk-r18b-windows-x86.zip" + }, + { + "arch": "x64", "os": "windows", "sha1": "6b6d4138aaaad7166679fdfa4780e177f95cee6f", "size": 522489470, @@ -17021,7 +20153,7 @@ } }, "displayName": "NDK (Side by side) 18.1.5063045", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk", "path": "ndk/18.1.5063045", @@ -17040,18 +20172,35 @@ "19.0.5232133": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "86c1a962601b23b8a6d3d535c93b4b0bc4f29249", + "size": 807592927, + "url": "https://dl.google.com/android/repository/android-ndk-r19-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "86c1a962601b23b8a6d3d535c93b4b0bc4f29249", "size": 807592927, "url": "https://dl.google.com/android/repository/android-ndk-r19-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "f02ad84cb5b6e1ff3eea9e6168037c823408c8ac", "size": 823337344, "url": "https://dl.google.com/android/repository/android-ndk-r19-linux-x86_64.zip" }, { + "arch": "x86", + "os": "windows", + "sha1": "281175a42b312d630f864a02a31c5806ada5663b", + "size": 778544468, + "url": "https://dl.google.com/android/repository/android-ndk-r19-windows-x86.zip" + }, + { + "arch": "x64", "os": "windows", "sha1": "37906e8e79a9dddf6805325f706a072055e4136c", "size": 795986424, @@ -17066,7 +20215,7 @@ } }, "displayName": "NDK (Side by side) 19.0.5232133", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk", "obsolete": "true", @@ -17086,18 +20235,35 @@ "19.2.5345600": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "f46b8193109bba8a58e0461c1a48f4534051fb25", + "size": 807630656, + "url": "https://dl.google.com/android/repository/android-ndk-r19c-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "f46b8193109bba8a58e0461c1a48f4534051fb25", "size": 807630656, "url": "https://dl.google.com/android/repository/android-ndk-r19c-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "fd94d0be6017c6acbd193eb95e09cf4b6f61b834", "size": 823376982, "url": "https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip" }, { + "arch": "x86", + "os": "windows", + "sha1": "132cc0c9e31b9e58ad6505b0816ff9e524422ed2", + "size": 778598286, + "url": "https://dl.google.com/android/repository/android-ndk-r19c-windows-x86.zip" + }, + { + "arch": "x64", "os": "windows", "sha1": "c4cd8c0b6e7618ca0a871a5f24102e40c239f6a3", "size": 796051997, @@ -17112,7 +20278,7 @@ } }, "displayName": "NDK (Side by side) 19.2.5345600", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk", "path": "ndk/19.2.5345600", @@ -17131,18 +20297,35 @@ "20.0.5392854-rc2": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "cd94191ace6b31ec9af1cc370173e16934e1cb8b", + "size": 840834121, + "url": "https://dl.google.com/android/repository/android-ndk-r20-beta2-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "cd94191ace6b31ec9af1cc370173e16934e1cb8b", "size": 840834121, "url": "https://dl.google.com/android/repository/android-ndk-r20-beta2-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "8285ae2e24a7232fd0cbfb55e955c8586ef2ee02", "size": 857406412, "url": "https://dl.google.com/android/repository/android-ndk-r20-beta2-linux-x86_64.zip" }, { + "arch": "x86", + "os": "windows", + "sha1": "15a8085b8ce5ecf0705ded2335513055693bddaa", + "size": 812086484, + "url": "https://dl.google.com/android/repository/android-ndk-r20-beta2-windows-x86.zip" + }, + { + "arch": "x64", "os": "windows", "sha1": "c89022bd9a2c32b42a1b94e98bbd88ab4c4e350e", "size": 830099430, @@ -17157,7 +20340,7 @@ } }, "displayName": "NDK (Side by side) 20.0.5392854", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk", "obsolete": "true", @@ -17178,18 +20361,35 @@ "20.0.5471264-rc3": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "665a035cadb0dd03e6502ba25c18643f6e4ede24", + "size": 843617071, + "url": "https://dl.google.com/android/repository/android-ndk-r20-beta3-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "665a035cadb0dd03e6502ba25c18643f6e4ede24", "size": 843617071, "url": "https://dl.google.com/android/repository/android-ndk-r20-beta3-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "674d8fb0e0df8e8be1c31fa321eb176548a19ba3", "size": 860198768, "url": "https://dl.google.com/android/repository/android-ndk-r20-beta3-linux-x86_64.zip" }, { + "arch": "x86", + "os": "windows", + "sha1": "f9d1c5366ee5bf4927ac1c18f06143550b492e92", + "size": 814872365, + "url": "https://dl.google.com/android/repository/android-ndk-r20-beta3-windows-x86.zip" + }, + { + "arch": "x64", "os": "windows", "sha1": "9375dc82cf576f4a255bf908dfc628d8ddee0d89", "size": 832889871, @@ -17204,7 +20404,7 @@ } }, "displayName": "NDK (Side by side) 20.0.5471264", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk", "obsolete": "true", @@ -17225,18 +20425,35 @@ "20.0.5594570": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "96d5f1c50452596912d1982439c514194b5751e6", + "size": 843152912, + "url": "https://dl.google.com/android/repository/android-ndk-r20-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "96d5f1c50452596912d1982439c514194b5751e6", "size": 843152912, "url": "https://dl.google.com/android/repository/android-ndk-r20-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "8665fc84a1b1f0d6ab3b5fdd1e30200cc7b9adff", "size": 859737910, "url": "https://dl.google.com/android/repository/android-ndk-r20-linux-x86_64.zip" }, { + "arch": "x86", + "os": "windows", + "sha1": "b605f7e2e7585af2fc9d59fe9ddad86b64b2bf03", + "size": 814417431, + "url": "https://dl.google.com/android/repository/android-ndk-r20-windows-x86.zip" + }, + { + "arch": "x64", "os": "windows", "sha1": "36e1dc77fad08ad2498fb94b13ad8caf26bbd9df", "size": 832429986, @@ -17251,7 +20468,7 @@ } }, "displayName": "NDK (Side by side) 20.0.5594570", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk", "path": "ndk/20.0.5594570", @@ -17270,18 +20487,35 @@ "20.1.5948944": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "b51290ab69cb89de1f0ba108702277bc333b38be", + "size": 843201217, + "url": "https://dl.google.com/android/repository/android-ndk-r20b-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "b51290ab69cb89de1f0ba108702277bc333b38be", "size": 843201217, "url": "https://dl.google.com/android/repository/android-ndk-r20b-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "d903fdf077039ad9331fb6c3bee78aa46d45527b", "size": 859780564, "url": "https://dl.google.com/android/repository/android-ndk-r20b-linux-x86_64.zip" }, { + "arch": "x86", + "os": "windows", + "sha1": "71a1ba20475da1d83b0f1a1826813008f628d59b", + "size": 814464692, + "url": "https://dl.google.com/android/repository/android-ndk-r20b-windows-x86.zip" + }, + { + "arch": "x64", "os": "windows", "sha1": "ead0846608040b8344ad2bc9bc721b88cf13fb8d", "size": 832473103, @@ -17296,7 +20530,7 @@ } }, "displayName": "NDK (Side by side) 20.1.5948944", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk", "path": "ndk/20.1.5948944", @@ -17315,18 +20549,21 @@ "21.0.6011959-rc2": { "archives": [ { + "arch": "x64", "os": "macosx", "sha1": "34a46c3867c9d87a80895c0b8a098256052536d2", "size": 958791657, "url": "https://dl.google.com/android/repository/android-ndk-r21-beta2-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "335f30302bee700a9a5fdfe3ae533a4963499c44", "size": 1043467643, "url": "https://dl.google.com/android/repository/android-ndk-r21-beta2-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "e5902e4f6c5b6f0354a2572a85f42f19c1a7b9d8", "size": 1057424857, @@ -17341,7 +20578,7 @@ } }, "displayName": "NDK (Side by side) 21.0.6011959", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.0.6011959", @@ -17361,18 +20598,21 @@ "21.0.6113669": { "archives": [ { + "arch": "x64", "os": "macosx", "sha1": "0d50636cc0e34ed3ba540d6d5818ea0cf10f16aa", "size": 958656601, "url": "https://dl.google.com/android/repository/android-ndk-r21-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "afc9c0b9faad222898ac8168c78ad4ccac8a1b5c", "size": 1043332542, "url": "https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "c61631eacbd40c30273b716a4e589c6877b85419", "size": 1057294207, @@ -17387,7 +20627,7 @@ } }, "displayName": "NDK (Side by side) 21.0.6113669", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.0.6113669", @@ -17406,18 +20646,21 @@ "21.1.6210238-rc1": { "archives": [ { + "arch": "x64", "os": "macosx", "sha1": "971609f9a579ebbcb8d121a5d5aa0cba716b2d1f", "size": 987084422, "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta1-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "cf06ed408663c11c8f4824f9370c7a900ec074dd", "size": 1071756532, "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta1-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "a920ca1ab75733b510180cef23f3797ded40dbb7", "size": 1087478202, @@ -17432,7 +20675,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6210238", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6210238", @@ -17452,18 +20695,28 @@ "21.1.6273396-rc2": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "41110daad93e6a9a3662d7dd2fb233b21be3d27e", + "size": 987112894, + "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta2-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "41110daad93e6a9a3662d7dd2fb233b21be3d27e", "size": 987112894, "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta2-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "b9a6463ab72ad183c89e5316f0c5493f64b54966", "size": 1071784976, "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta2-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "dc6dc614cbd94b345b66f85d3f867638593fb199", "size": 1087508597, @@ -17478,7 +20731,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6273396", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6273396", @@ -17498,18 +20751,28 @@ "21.1.6352462": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "e1de2f749c5c32ae991c3ccaabfcdf7688ee221f", + "size": 1014473187, + "url": "https://dl.google.com/android/repository/android-ndk-r21b-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "e1de2f749c5c32ae991c3ccaabfcdf7688ee221f", "size": 1014473187, "url": "https://dl.google.com/android/repository/android-ndk-r21b-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "50250fcba479de477b45801e2699cca47f7e1267", "size": 1162377080, "url": "https://dl.google.com/android/repository/android-ndk-r21b-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "6809fac4a6e829f4bac64628fa9835d57bbd61a8", "size": 1079474640, @@ -17524,7 +20787,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6352462", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.1.6352462", @@ -17543,18 +20806,28 @@ "21.1.6363665-rc3": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "767f722c14dd27a22b17903e09b768407131129e", + "size": 1042902819, + "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta3-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "767f722c14dd27a22b17903e09b768407131129e", "size": 1042902819, "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta3-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "29139085aa402d6b27d4394c30e797f814876d1e", "size": 1190809917, "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta3-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "8ecb03c728b8dc814db30c8152c4436cb1536c8d", "size": 1109667800, @@ -17569,7 +20842,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6363665", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6363665", @@ -17589,18 +20862,28 @@ "21.2.6472646": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "c42a836f6697a4ef8b927813d5f7dd12e974cfba", + "size": 1014322452, + "url": "https://dl.google.com/android/repository/android-ndk-r21c-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "c42a836f6697a4ef8b927813d5f7dd12e974cfba", "size": 1014322452, "url": "https://dl.google.com/android/repository/android-ndk-r21c-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "c81a5bcb4672a18d3647bf6898cd4dbcb978d0e8", "size": 1162375023, "url": "https://dl.google.com/android/repository/android-ndk-r21c-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "93563a1297a60b5da49a48f62340dbf0c878a5f3", "size": 1079490351, @@ -17615,7 +20898,7 @@ } }, "displayName": "NDK (Side by side) 21.2.6472646", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.2.6472646", @@ -17634,18 +20917,28 @@ "21.3.6528147": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "ef06c9f9d7efd6f243eb3c05ac440562ae29ae12", + "size": 1042615469, + "url": "https://dl.google.com/android/repository/android-ndk-r21d-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "ef06c9f9d7efd6f243eb3c05ac440562ae29ae12", "size": 1042615469, "url": "https://dl.google.com/android/repository/android-ndk-r21d-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "bcf4023eb8cb6976a4c7cff0a8a8f145f162bf4d", "size": 1190667841, "url": "https://dl.google.com/android/repository/android-ndk-r21d-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "99175ce1210258f2280568cd340e0666c69955c7", "size": 1109536102, @@ -17660,7 +20953,7 @@ } }, "displayName": "NDK (Side by side) 21.3.6528147", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.3.6528147", @@ -17679,18 +20972,28 @@ "21.4.7075529": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "3f15c23a1c247ad17c7c271806848dbd40434738", + "size": 1042617180, + "url": "https://dl.google.com/android/repository/android-ndk-r21e-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "3f15c23a1c247ad17c7c271806848dbd40434738", "size": 1042617180, "url": "https://dl.google.com/android/repository/android-ndk-r21e-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "c3ebc83c96a4d7f539bd72c241b2be9dcd29bda9", "size": 1190670072, "url": "https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "fc44fea8bb3f5a6789821f40f41dce2d2cd5dc30", "size": 1109665123, @@ -17705,7 +21008,7 @@ } }, "displayName": "NDK (Side by side) 21.4.7075529", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.4.7075529", @@ -17724,18 +21027,28 @@ "22.0.6917172-rc1": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "0ff242f820663fe45773bca7a2df036004fc7c69", + "size": 1047697781, + "url": "https://dl.google.com/android/repository/android-ndk-r22-beta1-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "0ff242f820663fe45773bca7a2df036004fc7c69", "size": 1047697781, "url": "https://dl.google.com/android/repository/android-ndk-r22-beta1-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "687f696f43b23e2623e7f7073bbd575d254f66f6", "size": 1146575022, "url": "https://dl.google.com/android/repository/android-ndk-r22-beta1-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "ef38999c0e3c96124acffab6971ad2054a433b91", "size": 1080588810, @@ -17750,7 +21063,7 @@ } }, "displayName": "NDK (Side by side) 22.0.6917172", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/22.0.6917172", @@ -17770,18 +21083,28 @@ "22.0.7026061": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "9cf3816ed3e4308ff03bd5f69100b373bad12f13", + "size": 1047577432, + "url": "https://dl.google.com/android/repository/android-ndk-r22-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "9cf3816ed3e4308ff03bd5f69100b373bad12f13", "size": 1047577432, "url": "https://dl.google.com/android/repository/android-ndk-r22-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "82274313aba10da6177fd41868f56a0f9651dd81", "size": 1146450986, "url": "https://dl.google.com/android/repository/android-ndk-r22-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "c03f761caf1c6f5efbeb5ccfa573ea922cb955b3", "size": 1080471370, @@ -17796,7 +21119,7 @@ } }, "displayName": "NDK (Side by side) 22.0.7026061", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk", "path": "ndk/22.0.7026061", @@ -17815,18 +21138,28 @@ "22.1.7171670": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "dc80e8a2cfcb28db74c1931d42c652e9d17ff2c3", + "size": 1049337733, + "url": "https://dl.google.com/android/repository/android-ndk-r22b-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "dc80e8a2cfcb28db74c1931d42c652e9d17ff2c3", "size": 1049337733, "url": "https://dl.google.com/android/repository/android-ndk-r22b-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "9ece64c7f19763dd67320d512794969930fce9dc", "size": 1148198368, "url": "https://dl.google.com/android/repository/android-ndk-r22b-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "96ba1a049303cf6bf3ee84cfd64d6bcd43486a50", "size": 1082301775, @@ -17841,7 +21174,7 @@ } }, "displayName": "NDK (Side by side) 22.1.7171670", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk", "path": "ndk/22.1.7171670", @@ -17860,18 +21193,28 @@ "23.0.7123448-rc1": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "708ebbceb719c43a3165503ea82fb107d823ad54", + "size": 721278316, + "url": "https://dl.google.com/android/repository/android-ndk-r23-beta1-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "708ebbceb719c43a3165503ea82fb107d823ad54", "size": 721278316, "url": "https://dl.google.com/android/repository/android-ndk-r23-beta1-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "1340ed20f27fcb184ea814ae63e0f3cd75890342", "size": 804392699, "url": "https://dl.google.com/android/repository/android-ndk-r23-beta1-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "c056900896129d3dd4eb953a53a8961d9853aa20", "size": 749304589, @@ -17886,7 +21229,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7123448", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7123448", @@ -17906,18 +21249,28 @@ "23.0.7196353-rc2": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "454fd0c1e8385896ad465d7cfd653e28fbf3523f", + "size": 674507658, + "url": "https://dl.google.com/android/repository/android-ndk-r23-beta2-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "454fd0c1e8385896ad465d7cfd653e28fbf3523f", "size": 674507658, "url": "https://dl.google.com/android/repository/android-ndk-r23-beta2-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "290e8c39bb9732ac8784855e1f22342eb488228e", "size": 705747711, "url": "https://dl.google.com/android/repository/android-ndk-r23-beta2-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "00194ae44ce90f2052ab8e42f1a11a0db8d50c2a", "size": 747953762, @@ -17932,7 +21285,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7196353", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7196353", @@ -17952,18 +21305,28 @@ "23.0.7272597-rc3": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "3b977f0f8e0fa2d6777fae6b1d37aebfc075ab56", + "size": 695243724, + "url": "https://dl.google.com/android/repository/android-ndk-r23-beta3-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "3b977f0f8e0fa2d6777fae6b1d37aebfc075ab56", "size": 695243724, "url": "https://dl.google.com/android/repository/android-ndk-r23-beta3-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "2298465ef13dab0c527b9cf6ef892b1ec6461fb4", "size": 724828157, "url": "https://dl.google.com/android/repository/android-ndk-r23-beta3-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "8c10a51f50f4f12ccc839dcb4bd8107133024c2f", "size": 785932724, @@ -17978,7 +21341,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7272597", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7272597", @@ -17998,18 +21361,28 @@ "23.0.7344513-rc4": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "a8fedcf0dd3b3a340e68684a5a2308154a952039", + "size": 694920487, + "url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "a8fedcf0dd3b3a340e68684a5a2308154a952039", "size": 694920487, "url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "5f44bc1789042358a73c15e0ef732ea729cf47cc", "size": 724510864, "url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "4492af1296d07c0c65ce42f10ecac06c3c307b94", "size": 785615074, @@ -18024,7 +21397,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7344513", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7344513", @@ -18044,18 +21417,21 @@ "23.0.7421159-rc5": { "archives": [ { + "arch": "all", "os": "macosx", "sha1": "9ef60fcc7a4bb0477d4189c711853cbc12b24efe", "size": 694850942, "url": "https://dl.google.com/android/repository/android-ndk-r23-beta5-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "453ba0ca124e43337318f8a40d26cab114e7092c", "size": 724438684, "url": "https://dl.google.com/android/repository/android-ndk-r23-beta5-linux.zip" }, { + "arch": "all", "os": "windows", "sha1": "ace75623181ce86bc70df312155c04b9d8ff3e46", "size": 785543078, @@ -18070,7 +21446,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7421159", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7421159", @@ -18090,18 +21466,21 @@ "23.0.7530507-rc6": { "archives": [ { + "arch": "all", "os": "macosx", "sha1": "af299c3e4f6fd3e6f05b1699a0181d84a95068c4", "size": 695336572, "url": "https://dl.google.com/android/repository/android-ndk-r23-beta6-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "b3118a9daeff8ad1801c4dbaeda1e5e5fb33b8a5", "size": 725026229, "url": "https://dl.google.com/android/repository/android-ndk-r23-beta6-linux.zip" }, { + "arch": "all", "os": "windows", "sha1": "386f5c80217f6f33d6420f7de4f935eaff831868", "size": 786033634, @@ -18116,7 +21495,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7530507", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7530507", @@ -18136,18 +21515,21 @@ "23.0.7599858": { "archives": [ { + "arch": "all", "os": "macosx", "sha1": "c19f4a29e03689ea31bebe77f2d0a256d8e16925", "size": 691981924, "url": "https://dl.google.com/android/repository/android-ndk-r23-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "9bad35f442caeda747780ba1dd92f2d98609d9cd", "size": 721667870, "url": "https://dl.google.com/android/repository/android-ndk-r23-linux.zip" }, { + "arch": "all", "os": "windows", "sha1": "14af52e23af9f7a9e7576a17e1814701192745be", "size": 782684423, @@ -18162,7 +21544,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7599858", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.0.7599858", @@ -18181,18 +21563,21 @@ "23.1.7779620": { "archives": [ { + "arch": "all", "os": "macosx", "sha1": "4f54966e733f92964f097887bedfdd0faa0f7042", "size": 978956151, "url": "https://dl.google.com/android/repository/android-ndk-r23b-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "f47ec4c4badd11e9f593a8450180884a927c330d", "size": 725122099, "url": "https://dl.google.com/android/repository/android-ndk-r23b-linux.zip" }, { + "arch": "all", "os": "windows", "sha1": "6e3fb50022c611a2b13d02f5de5c21cc7206a298", "size": 788638042, @@ -18207,7 +21592,7 @@ } }, "displayName": "NDK (Side by side) 23.1.7779620", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.1.7779620", @@ -18226,18 +21611,21 @@ "23.2.8568313": { "archives": [ { + "arch": "all", "os": "macosx", "sha1": "1fc65d8f6083f3f5cd01e0cf97c6adc10f4f076f", "size": 982917530, "url": "https://dl.google.com/android/repository/android-ndk-r23c-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "e5053c126a47e84726d9f7173a04686a71f9a67a", "size": 724733960, "url": "https://dl.google.com/android/repository/android-ndk-r23c-linux.zip" }, { + "arch": "all", "os": "windows", "sha1": "f2c5def76a9de371f27d028864fe301ab4fe0cf8", "size": 788336993, @@ -18252,7 +21640,7 @@ } }, "displayName": "NDK (Side by side) 23.2.8568313", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.2.8568313", @@ -18271,18 +21659,21 @@ "24.0.7856742-rc1": { "archives": [ { + "arch": "all", "os": "macosx", "sha1": "de560fe3bc8b760d598a08bc329030cf36f6a490", "size": 950494966, "url": "https://dl.google.com/android/repository/android-ndk-r24-beta1-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "4e43e498699b00cab8b07d431b65a0c1aa022313", "size": 684615573, "url": "https://dl.google.com/android/repository/android-ndk-r24-beta1-linux.zip" }, { + "arch": "all", "os": "windows", "sha1": "ade5412e9ac0dd206824e9249a5fbc11c9c248bf", "size": 690364848, @@ -18297,7 +21688,7 @@ } }, "displayName": "NDK (Side by side) 24.0.7856742", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.7856742", @@ -18317,18 +21708,21 @@ "24.0.7956693-rc2": { "archives": [ { + "arch": "all", "os": "macosx", "sha1": "9f95216133c78e871a31b35278dce524956579bd", "size": 948103952, "url": "https://dl.google.com/android/repository/android-ndk-r24-beta2-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "78f3006243c0bc051c7c7bfb939689032e7c41ba", "size": 695411089, "url": "https://dl.google.com/android/repository/android-ndk-r24-beta2-linux.zip" }, { + "arch": "all", "os": "windows", "sha1": "d4eb40c03259094ae3ea05134ee17af717f48d6d", "size": 661623688, @@ -18343,7 +21737,7 @@ } }, "displayName": "NDK (Side by side) 24.0.7956693", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.7956693", @@ -18363,18 +21757,21 @@ "24.0.8079956-rc3": { "archives": [ { + "arch": "all", "os": "macosx", "sha1": "c7f3552e5bd6a76ea7fd460fe49afb4c7bdc5e39", "size": 901524232, "url": "https://dl.google.com/android/repository/android-ndk-r24-rc1-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "de2a02e65c1c720336fe991dc708875539df85bf", "size": 667835859, "url": "https://dl.google.com/android/repository/android-ndk-r24-rc1-linux.zip" }, { + "arch": "all", "os": "windows", "sha1": "dbc9f19cc758285192c26238b4b87be207464bf2", "size": 663173050, @@ -18389,7 +21786,7 @@ } }, "displayName": "NDK (Side by side) 24.0.8079956", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.8079956", @@ -18409,18 +21806,21 @@ "24.0.8215888": { "archives": [ { + "arch": "all", "os": "macosx", "sha1": "fc4d0d86e3c802e8c4a6865d99cff58b336e2d5a", "size": 901417197, "url": "https://dl.google.com/android/repository/android-ndk-r24-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "eceb18f147282eb93615eff1ad84a9d3962fbb31", "size": 667731974, "url": "https://dl.google.com/android/repository/android-ndk-r24-linux.zip" }, { + "arch": "all", "os": "windows", "sha1": "75f9c281c64762d18c84da465f486c60def47829", "size": 663076813, @@ -18435,7 +21835,7 @@ } }, "displayName": "NDK (Side by side) 24.0.8215888", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk", "path": "ndk/24.0.8215888", @@ -18454,18 +21854,21 @@ "25.0.8151533-rc1": { "archives": [ { + "arch": "all", "os": "macosx", "sha1": "32024b773d65dd445cf8cf52156a331c544ee7e0", "size": 918358459, "url": "https://dl.google.com/android/repository/android-ndk-r25-beta1-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "0acca5e8faa47a6c961c358d724a93e33f8d6caf", "size": 680831029, "url": "https://dl.google.com/android/repository/android-ndk-r25-beta1-linux.zip" }, { + "arch": "all", "os": "windows", "sha1": "a5486182f79696794eb1a216c11f5e29652e72d1", "size": 676453790, @@ -18480,7 +21883,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8151533", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8151533", @@ -18500,18 +21903,21 @@ "25.0.8221429-rc2": { "archives": [ { + "arch": "all", "os": "macosx", "sha1": "51961d41ffe63ac664edf26b51906ec07213e088", "size": 915502522, "url": "https://dl.google.com/android/repository/android-ndk-r25-beta2-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "3b7435a1a851a4b2dadeafa466f323db9235dd9a", "size": 677975159, "url": "https://dl.google.com/android/repository/android-ndk-r25-beta2-linux.zip" }, { + "arch": "all", "os": "windows", "sha1": "4fd188fdba7413c397bcaa342039d07266c954b6", "size": 673597865, @@ -18526,7 +21932,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8221429", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8221429", @@ -18546,18 +21952,21 @@ "25.0.8355429-rc3": { "archives": [ { + "arch": "all", "os": "macosx", "sha1": "224594abb41357c20cb4a9f4a732c484b2e743ba", "size": 748047157, "url": "https://dl.google.com/android/repository/android-ndk-r25-beta3-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "79c8db05e20edde0cbb02d2326e7b8405f7eb977", "size": 510520692, "url": "https://dl.google.com/android/repository/android-ndk-r25-beta3-linux.zip" }, { + "arch": "all", "os": "windows", "sha1": "7d2c398045f6bbad03f6fb2f2ba419a2a48ab1e7", "size": 506142216, @@ -18572,7 +21981,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8355429", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8355429", @@ -18592,18 +22001,21 @@ "25.0.8528842-rc4": { "archives": [ { + "arch": "all", "os": "macosx", "sha1": "d7f344ecc68518a8178d15b1b80e27bc5c69f00d", "size": 716633626, "url": "https://dl.google.com/android/repository/android-ndk-r25-beta4-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "d13f688fd286709f0d950c75119ec9fcad8a47ff", "size": 531018178, "url": "https://dl.google.com/android/repository/android-ndk-r25-beta4-linux.zip" }, { + "arch": "all", "os": "windows", "sha1": "668b063c7c535c4f8be52c84acebb5779935203b", "size": 464031742, @@ -18618,7 +22030,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8528842", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8528842", @@ -18638,18 +22050,21 @@ "25.0.8775105": { "archives": [ { + "arch": "all", "os": "macosx", "sha1": "8c54514c62f635dbbc161e30e21f16bcd22526df", "size": 716557039, "url": "https://dl.google.com/android/repository/android-ndk-r25-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "9fce956edb6abd5aca42acf6bbfb21a90a67f75b", "size": 530938532, "url": "https://dl.google.com/android/repository/android-ndk-r25-linux.zip" }, { + "arch": "all", "os": "windows", "sha1": "1da93e7da5803dd8ef47e9283ec2c7b98d34b8da", "size": 467387858, @@ -18664,7 +22079,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8775105", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk", "path": "ndk/25.0.8775105", @@ -18683,18 +22098,21 @@ "25.1.8937393": { "archives": [ { + "arch": "all", "os": "macosx", "sha1": "248f96de6713cbec8707ee2262d3cf08d14d9fde", "size": 716592117, "url": "https://dl.google.com/android/repository/android-ndk-r25b-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "e27dcb9c8bcaa77b78ff68c3f23abcf6867959eb", "size": 530975885, "url": "https://dl.google.com/android/repository/android-ndk-r25b-linux.zip" }, { + "arch": "all", "os": "windows", "sha1": "b2e9b5ab2e1434a65ffd85780891878cf5c6fd92", "size": 467422601, @@ -18709,7 +22127,7 @@ } }, "displayName": "NDK (Side by side) 25.1.8937393", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk", "path": "ndk/25.1.8937393", @@ -18728,18 +22146,21 @@ "25.2.9519653": { "archives": [ { + "arch": "all", "os": "macosx", "sha1": "75717f3473973c3630e772ec916de380157a593a", "size": 717255580, "url": "https://dl.google.com/android/repository/android-ndk-r25c-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "53af80a1cce9144025b81c78c8cd556bff42bd0e", "size": 531118193, "url": "https://dl.google.com/android/repository/android-ndk-r25c-linux.zip" }, { + "arch": "all", "os": "windows", "sha1": "18c4a3cd108916f553b1bedad2672f2c6cd85a10", "size": 467520926, @@ -18754,7 +22175,7 @@ } }, "displayName": "NDK (Side by side) 25.2.9519653", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk", "path": "ndk/25.2.9519653", @@ -18773,18 +22194,21 @@ "26.0.10404224-rc1": { "archives": [ { + "arch": "all", "os": "macosx", "sha1": "d6dbb122cf3fc52a64ae0d19d120a01ce0052f3b", "size": 983730774, "url": "https://dl.google.com/android/repository/android-ndk-r26-beta1-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "fb5e34313766764d9654b04603e69af813b18799", "size": 668699088, "url": "https://dl.google.com/android/repository/android-ndk-r26-beta1-linux.zip" }, { + "arch": "all", "os": "windows", "sha1": "bcdc60cf0149fc862cbb5514e7879d8c46c6e1e0", "size": 664889266, @@ -18799,7 +22223,7 @@ } }, "displayName": "NDK (Side by side) 26.0.10404224", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/26.0.10404224", @@ -18819,18 +22243,21 @@ "26.0.10636728-rc2": { "archives": [ { + "arch": "all", "os": "macosx", "sha1": "295be7e8514eff8dae7aa01dc7e9978fa85fa64e", "size": 983731026, "url": "https://dl.google.com/android/repository/android-ndk-r26-rc1-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "6ec8c08204409fea4853bf0317660caadabfc8b0", "size": 668698776, "url": "https://dl.google.com/android/repository/android-ndk-r26-rc1-linux.zip" }, { + "arch": "all", "os": "windows", "sha1": "d4f4aa8a863e6e7cc0c433f1ecd8a304da4848a7", "size": 664889050, @@ -18838,7 +22265,7 @@ } ], "displayName": "NDK (Side by side) 26.0.10636728", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/26.0.10636728", @@ -18858,18 +22285,21 @@ "26.0.10792818": { "archives": [ { + "arch": "all", "os": "macosx", "sha1": "5c74249e80549db0f2feddc58e1838d3d2cc6d42", "size": 983623748, "url": "https://dl.google.com/android/repository/android-ndk-r26-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "d3bef08e0e43acd9e7815538df31818692d548bb", "size": 668596633, "url": "https://dl.google.com/android/repository/android-ndk-r26-linux.zip" }, { + "arch": "all", "os": "windows", "sha1": "7fcf5789bc248c130af675720353819f72b02b94", "size": 664790510, @@ -18877,7 +22307,7 @@ } ], "displayName": "NDK (Side by side) 26.0.10792818", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk", "path": "ndk/26.0.10792818", @@ -18896,18 +22326,21 @@ "26.1.10909125": { "archives": [ { + "arch": "all", "os": "macosx", "sha1": "44df0485bbd565b89585b687bb748521a98f65a8", "size": 985051981, "url": "https://dl.google.com/android/repository/android-ndk-r26b-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "fdf33d9f6c1b3f16e5459d53a82c7d2201edbcc4", "size": 669320864, "url": "https://dl.google.com/android/repository/android-ndk-r26b-linux.zip" }, { + "arch": "all", "os": "windows", "sha1": "17453c61a59e848cffb8634f2c7b322417f1732e", "size": 661624075, @@ -18915,7 +22348,7 @@ } ], "displayName": "NDK (Side by side) 26.1.10909125", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk", "path": "ndk/26.1.10909125", @@ -18934,18 +22367,21 @@ "26.2.11394342": { "archives": [ { + "arch": "all", "os": "macosx", "sha1": "ceb609baf514614015279b5eee7dffc859426952", "size": 983592055, "url": "https://dl.google.com/android/repository/android-ndk-r26c-darwin.zip" }, { + "arch": "all", "os": "linux", "sha1": "7faebe2ebd3590518f326c82992603170f07c96e", "size": 668556021, "url": "https://dl.google.com/android/repository/android-ndk-r26c-linux.zip" }, { + "arch": "all", "os": "windows", "sha1": "f8c8aa6135241954461b2e3629cada4722e13ee7", "size": 660158794, @@ -18953,7 +22389,7 @@ } ], "displayName": "NDK (Side by side) 26.2.11394342", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk", "path": "ndk/26.2.11394342", @@ -18972,18 +22408,21 @@ "26.3.11579264": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "fcdad75a765a46a9cf6560353f480db251d14765", "size": 668556491, "url": "https://dl.google.com/android/repository/android-ndk-r26d-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "cebe7af9bdadc67b8f919d549e9ab269831fd2c9", "size": 990809031, "url": "https://dl.google.com/android/repository/android-ndk-r26d-darwin.zip" }, { + "arch": "all", "os": "windows", "sha1": "c7ea35ffe916082876611da1a6d5618d15430c29", "size": 665022840, @@ -18991,7 +22430,7 @@ } ], "displayName": "NDK (Side by side) 26.3.11579264", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk", "path": "ndk/26.3.11579264", @@ -19010,18 +22449,21 @@ "27.0.11718014-rc1": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "35a78f7544ccc72d8438d8ea2feb7f252a062abe", "size": 658958615, "url": "https://dl.google.com/android/repository/android-ndk-r27-beta1-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "0206d7e1c4255c40acc691fad8bf943f055e627e", "size": 841636299, "url": "https://dl.google.com/android/repository/android-ndk-r27-beta1-darwin.zip" }, { + "arch": "all", "os": "windows", "sha1": "147b5b333cc57875e34b88ccd29efbe58963264d", "size": 785017110, @@ -19029,7 +22471,7 @@ } ], "displayName": "NDK (Side by side) 27.0.11718014", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/27.0.11718014", @@ -19049,18 +22491,21 @@ "27.0.11902837-rc2": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "93103e182405b9d7757231a1d9dad58937a6374b", "size": 662398163, "url": "https://dl.google.com/android/repository/android-ndk-r27-beta2-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "48af6bb62dbfff2f68b39cf118494ebd5ba3b8ad", "size": 836162827, "url": "https://dl.google.com/android/repository/android-ndk-r27-beta2-darwin.zip" }, { + "arch": "all", "os": "windows", "sha1": "30f4103bc32fd28a5b93bb610db0130cfe9ff125", "size": 781461627, @@ -19068,7 +22513,7 @@ } ], "displayName": "NDK (Side by side) 27.0.11902837", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/27.0.11902837", @@ -19088,18 +22533,21 @@ "27.0.12077973": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "5e5cd517bdb98d7e0faf2c494a3041291e71bdcc", "size": 663957918, "url": "https://dl.google.com/android/repository/android-ndk-r27-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "1a4a8c39c018430ff170657fc1673d895f5e4570", "size": 836135405, "url": "https://dl.google.com/android/repository/android-ndk-r27-darwin.zip" }, { + "arch": "all", "os": "windows", "sha1": "0ea2756e6815356831bda3af358cce4cdb6a981e", "size": 781482169, @@ -19107,7 +22555,7 @@ } ], "displayName": "NDK (Side by side) 27.0.12077973", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk", "path": "ndk/27.0.12077973", @@ -19126,18 +22574,21 @@ "27.1.12297006": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "6fc476b2e57d7c01ac0c95817746b927035b9749", "size": 663976775, "url": "https://dl.google.com/android/repository/android-ndk-r27b-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "c70c9791b0d258858678f6df31c4319140e2926e", "size": 836151734, "url": "https://dl.google.com/android/repository/android-ndk-r27b-darwin.zip" }, { + "arch": "all", "os": "windows", "sha1": "3bb7efc850cd0af7707854b7e0d5c3b6a7153703", "size": 781495902, @@ -19145,7 +22596,7 @@ } ], "displayName": "NDK (Side by side) 27.1.12297006", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk", "path": "ndk/27.1.12297006", @@ -19164,18 +22615,21 @@ "27.2.12479018": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "090e8083a715fdb1a3e402d0763c388abb03fb4e", "size": 663987688, "url": "https://dl.google.com/android/repository/android-ndk-r27c-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "0217c10ffbec496bb9fbfbb3c6fc2477c6b77297", "size": 836128272, "url": "https://dl.google.com/android/repository/android-ndk-r27c-darwin.zip" }, { + "arch": "all", "os": "windows", "sha1": "ac5f7762764b1f15341094e148ad4f847d050c38", "size": 781511249, @@ -19183,7 +22637,7 @@ } ], "displayName": "NDK (Side by side) 27.2.12479018", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk", "path": "ndk/27.2.12479018", @@ -19202,18 +22656,21 @@ "28.0.12433566-rc1": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "92dd6d941340624c4fc702ebc7e7cbd6faeb703d", "size": 626833250, "url": "https://dl.google.com/android/repository/android-ndk-r28-beta1-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "768dde1389e3245ca5a8a8151161b6d1ee60c78d", "size": 810429167, "url": "https://dl.google.com/android/repository/android-ndk-r28-beta1-darwin.zip" }, { + "arch": "all", "os": "windows", "sha1": "97328457d44dceae79f1cf488684419e0fec851a", "size": 746848976, @@ -19221,7 +22678,7 @@ } ], "displayName": "NDK (Side by side) 28.0.12433566", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/28.0.12433566", @@ -19241,18 +22698,21 @@ "28.0.12674087-rc2": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "4b901eeb50a76ba521e4eb1e611cb43658b54440", "size": 721452166, "url": "https://dl.google.com/android/repository/android-ndk-r28-beta2-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "1b702451e4cae82eb1d5449bc03875b248a47dc6", "size": 946868930, "url": "https://dl.google.com/android/repository/android-ndk-r28-beta2-darwin.zip" }, { + "arch": "all", "os": "windows", "sha1": "410a9863a8c2559bd4bb1f29517ea525c41859ab", "size": 746919470, @@ -19260,7 +22720,7 @@ } ], "displayName": "NDK (Side by side) 28.0.12674087", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/28.0.12674087", @@ -19280,18 +22740,21 @@ "28.0.12916984-rc3": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "69348e24577122339b3996d2ef1ac4e6f7f5d627", "size": 723256962, "url": "https://dl.google.com/android/repository/android-ndk-r28-beta3-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "cd2f13196082923d2568c9e43f08bc1cbd2f1c76", "size": 950521645, "url": "https://dl.google.com/android/repository/android-ndk-r28-beta3-darwin.zip" }, { + "arch": "all", "os": "windows", "sha1": "72e641edd8ef24b7b3c4935ac0b0340d87251450", "size": 749041370, @@ -19299,7 +22762,7 @@ } ], "displayName": "NDK (Side by side) 28.0.12916984", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/28.0.12916984", @@ -19315,24 +22778,82 @@ "xsi:type": "ns5:genericDetailsType" } } + }, + "28.0.13004108": { + "archives": [ + { + "arch": "all", + "os": "linux", + "sha1": "894f469c5192a116d21f412de27966140a530ebc", + "size": 723148067, + "url": "https://dl.google.com/android/repository/android-ndk-r28-linux.zip" + }, + { + "arch": "all", + "os": "macosx", + "sha1": "da6bbb3d007095658ae61d9d85da8fcc5c0dfb66", + "size": 950413046, + "url": "https://dl.google.com/android/repository/android-ndk-r28-darwin.zip" + }, + { + "arch": "all", + "os": "windows", + "sha1": "f79a00c721dc5c15b2bf093d7bb2af96496a42b2", + "size": 748943210, + "url": "https://dl.google.com/android/repository/android-ndk-r28-windows.zip" + } + ], + "displayName": "NDK (Side by side) 28.0.13004108", + "last-available-day": 20131, + "license": "android-sdk-license", + "name": "ndk", + "path": "ndk/28.0.13004108", + "revision": "28.0.13004108", + "revision-details": { + "major:0": "28", + "micro:2": "13004108", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "ndk-bundle": { "16.1.4479499": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "e51e615449b98c716cf912057e2682e75d55e2de", + "size": 839630771, + "url": "https://dl.google.com/android/repository/android-ndk-r16b-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "e51e615449b98c716cf912057e2682e75d55e2de", "size": 839630771, "url": "https://dl.google.com/android/repository/android-ndk-r16b-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "42aa43aae89a50d1c66c3f9fdecd676936da6128", "size": 852525873, "url": "https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip" }, { + "arch": "x86", + "os": "windows", + "sha1": "becaf3d445a4877ca1a9300a62f0934a4838c7fa", + "size": 656720029, + "url": "https://dl.google.com/android/repository/android-ndk-r16b-windows-x86.zip" + }, + { + "arch": "x64", "os": "windows", "sha1": "f3f1909ed1052e98dda2c79d11c22f3da28daf25", "size": 723301086, @@ -19347,7 +22868,7 @@ } }, "displayName": "NDK", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -19366,18 +22887,35 @@ "17.2.4988734": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "f97e3d7711497e3b4faf9e7b3fa0f0da90bb649c", + "size": 675091485, + "url": "https://dl.google.com/android/repository/android-ndk-r17c-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "f97e3d7711497e3b4faf9e7b3fa0f0da90bb649c", "size": 675091485, "url": "https://dl.google.com/android/repository/android-ndk-r17c-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "12cacc70c3fd2f40574015631c00f41fb8a39048", "size": 709387703, "url": "https://dl.google.com/android/repository/android-ndk-r17c-linux-x86_64.zip" }, { + "arch": "x86", + "os": "windows", + "sha1": "5bb25bf13fa494ee6c3433474c7aa90009f9f6a9", + "size": 608358310, + "url": "https://dl.google.com/android/repository/android-ndk-r17c-windows-x86.zip" + }, + { + "arch": "x64", "os": "windows", "sha1": "3e3b8d1650f9d297d130be2b342db956003f5992", "size": 650626501, @@ -19392,7 +22930,7 @@ } }, "displayName": "NDK", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -19411,18 +22949,35 @@ "18.1.5063045": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "98cb9909aa8c2dab32db188bbdc3ac6207e09440", + "size": 542911996, + "url": "https://dl.google.com/android/repository/android-ndk-r18b-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "98cb9909aa8c2dab32db188bbdc3ac6207e09440", "size": 542911996, "url": "https://dl.google.com/android/repository/android-ndk-r18b-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "500679655da3a86aecf67007e8ab230ea9b4dd7b", "size": 557038702, "url": "https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip" }, { + "arch": "x86", + "os": "windows", + "sha1": "4b8b6a4edc0fa967b429c1d6d25adf69acc28803", + "size": 504605336, + "url": "https://dl.google.com/android/repository/android-ndk-r18b-windows-x86.zip" + }, + { + "arch": "x64", "os": "windows", "sha1": "6b6d4138aaaad7166679fdfa4780e177f95cee6f", "size": 522489470, @@ -19437,7 +22992,7 @@ } }, "displayName": "NDK", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -19456,18 +23011,35 @@ "19.0.5232133": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "86c1a962601b23b8a6d3d535c93b4b0bc4f29249", + "size": 807592927, + "url": "https://dl.google.com/android/repository/android-ndk-r19-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "86c1a962601b23b8a6d3d535c93b4b0bc4f29249", "size": 807592927, "url": "https://dl.google.com/android/repository/android-ndk-r19-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "f02ad84cb5b6e1ff3eea9e6168037c823408c8ac", "size": 823337344, "url": "https://dl.google.com/android/repository/android-ndk-r19-linux-x86_64.zip" }, { + "arch": "x86", + "os": "windows", + "sha1": "281175a42b312d630f864a02a31c5806ada5663b", + "size": 778544468, + "url": "https://dl.google.com/android/repository/android-ndk-r19-windows-x86.zip" + }, + { + "arch": "x64", "os": "windows", "sha1": "37906e8e79a9dddf6805325f706a072055e4136c", "size": 795986424, @@ -19482,7 +23054,7 @@ } }, "displayName": "NDK", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk-bundle", "obsolete": "true", @@ -19502,18 +23074,35 @@ "19.2.5345600": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "f46b8193109bba8a58e0461c1a48f4534051fb25", + "size": 807630656, + "url": "https://dl.google.com/android/repository/android-ndk-r19c-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "f46b8193109bba8a58e0461c1a48f4534051fb25", "size": 807630656, "url": "https://dl.google.com/android/repository/android-ndk-r19c-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "fd94d0be6017c6acbd193eb95e09cf4b6f61b834", "size": 823376982, "url": "https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip" }, { + "arch": "x86", + "os": "windows", + "sha1": "132cc0c9e31b9e58ad6505b0816ff9e524422ed2", + "size": 778598286, + "url": "https://dl.google.com/android/repository/android-ndk-r19c-windows-x86.zip" + }, + { + "arch": "x64", "os": "windows", "sha1": "c4cd8c0b6e7618ca0a871a5f24102e40c239f6a3", "size": 796051997, @@ -19528,7 +23117,7 @@ } }, "displayName": "NDK", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -19547,18 +23136,35 @@ "20.0.5392854-rc2": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "cd94191ace6b31ec9af1cc370173e16934e1cb8b", + "size": 840834121, + "url": "https://dl.google.com/android/repository/android-ndk-r20-beta2-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "cd94191ace6b31ec9af1cc370173e16934e1cb8b", "size": 840834121, "url": "https://dl.google.com/android/repository/android-ndk-r20-beta2-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "8285ae2e24a7232fd0cbfb55e955c8586ef2ee02", "size": 857406412, "url": "https://dl.google.com/android/repository/android-ndk-r20-beta2-linux-x86_64.zip" }, { + "arch": "x86", + "os": "windows", + "sha1": "15a8085b8ce5ecf0705ded2335513055693bddaa", + "size": 812086484, + "url": "https://dl.google.com/android/repository/android-ndk-r20-beta2-windows-x86.zip" + }, + { + "arch": "x64", "os": "windows", "sha1": "c89022bd9a2c32b42a1b94e98bbd88ab4c4e350e", "size": 830099430, @@ -19573,7 +23179,7 @@ } }, "displayName": "NDK", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk-bundle", "obsolete": "true", @@ -19594,18 +23200,35 @@ "20.0.5471264-rc3": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "665a035cadb0dd03e6502ba25c18643f6e4ede24", + "size": 843617071, + "url": "https://dl.google.com/android/repository/android-ndk-r20-beta3-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "665a035cadb0dd03e6502ba25c18643f6e4ede24", "size": 843617071, "url": "https://dl.google.com/android/repository/android-ndk-r20-beta3-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "674d8fb0e0df8e8be1c31fa321eb176548a19ba3", "size": 860198768, "url": "https://dl.google.com/android/repository/android-ndk-r20-beta3-linux-x86_64.zip" }, { + "arch": "x86", + "os": "windows", + "sha1": "f9d1c5366ee5bf4927ac1c18f06143550b492e92", + "size": 814872365, + "url": "https://dl.google.com/android/repository/android-ndk-r20-beta3-windows-x86.zip" + }, + { + "arch": "x64", "os": "windows", "sha1": "9375dc82cf576f4a255bf908dfc628d8ddee0d89", "size": 832889871, @@ -19620,7 +23243,7 @@ } }, "displayName": "NDK", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk-bundle", "obsolete": "true", @@ -19641,18 +23264,35 @@ "20.0.5594570": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "96d5f1c50452596912d1982439c514194b5751e6", + "size": 843152912, + "url": "https://dl.google.com/android/repository/android-ndk-r20-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "96d5f1c50452596912d1982439c514194b5751e6", "size": 843152912, "url": "https://dl.google.com/android/repository/android-ndk-r20-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "8665fc84a1b1f0d6ab3b5fdd1e30200cc7b9adff", "size": 859737910, "url": "https://dl.google.com/android/repository/android-ndk-r20-linux-x86_64.zip" }, { + "arch": "x86", + "os": "windows", + "sha1": "b605f7e2e7585af2fc9d59fe9ddad86b64b2bf03", + "size": 814417431, + "url": "https://dl.google.com/android/repository/android-ndk-r20-windows-x86.zip" + }, + { + "arch": "x64", "os": "windows", "sha1": "36e1dc77fad08ad2498fb94b13ad8caf26bbd9df", "size": 832429986, @@ -19667,7 +23307,7 @@ } }, "displayName": "NDK", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -19686,18 +23326,35 @@ "20.1.5948944": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "b51290ab69cb89de1f0ba108702277bc333b38be", + "size": 843201217, + "url": "https://dl.google.com/android/repository/android-ndk-r20b-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "b51290ab69cb89de1f0ba108702277bc333b38be", "size": 843201217, "url": "https://dl.google.com/android/repository/android-ndk-r20b-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "d903fdf077039ad9331fb6c3bee78aa46d45527b", "size": 859780564, "url": "https://dl.google.com/android/repository/android-ndk-r20b-linux-x86_64.zip" }, { + "arch": "x86", + "os": "windows", + "sha1": "71a1ba20475da1d83b0f1a1826813008f628d59b", + "size": 814464692, + "url": "https://dl.google.com/android/repository/android-ndk-r20b-windows-x86.zip" + }, + { + "arch": "x64", "os": "windows", "sha1": "ead0846608040b8344ad2bc9bc721b88cf13fb8d", "size": 832473103, @@ -19712,7 +23369,7 @@ } }, "displayName": "NDK", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -19731,18 +23388,21 @@ "21.0.6011959-rc2": { "archives": [ { + "arch": "x64", "os": "macosx", "sha1": "34a46c3867c9d87a80895c0b8a098256052536d2", "size": 958791657, "url": "https://dl.google.com/android/repository/android-ndk-r21-beta2-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "335f30302bee700a9a5fdfe3ae533a4963499c44", "size": 1043467643, "url": "https://dl.google.com/android/repository/android-ndk-r21-beta2-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "e5902e4f6c5b6f0354a2572a85f42f19c1a7b9d8", "size": 1057424857, @@ -19757,7 +23417,7 @@ } }, "displayName": "NDK", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -19777,18 +23437,21 @@ "21.0.6113669": { "archives": [ { + "arch": "x64", "os": "macosx", "sha1": "0d50636cc0e34ed3ba540d6d5818ea0cf10f16aa", "size": 958656601, "url": "https://dl.google.com/android/repository/android-ndk-r21-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "afc9c0b9faad222898ac8168c78ad4ccac8a1b5c", "size": 1043332542, "url": "https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "c61631eacbd40c30273b716a4e589c6877b85419", "size": 1057294207, @@ -19803,7 +23466,7 @@ } }, "displayName": "NDK", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -19822,18 +23485,21 @@ "21.1.6210238-rc1": { "archives": [ { + "arch": "x64", "os": "macosx", "sha1": "971609f9a579ebbcb8d121a5d5aa0cba716b2d1f", "size": 987084422, "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta1-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "cf06ed408663c11c8f4824f9370c7a900ec074dd", "size": 1071756532, "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta1-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "a920ca1ab75733b510180cef23f3797ded40dbb7", "size": 1087478202, @@ -19848,7 +23514,7 @@ } }, "displayName": "NDK", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -19868,18 +23534,28 @@ "21.1.6273396-rc2": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "41110daad93e6a9a3662d7dd2fb233b21be3d27e", + "size": 987112894, + "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta2-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "41110daad93e6a9a3662d7dd2fb233b21be3d27e", "size": 987112894, "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta2-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "b9a6463ab72ad183c89e5316f0c5493f64b54966", "size": 1071784976, "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta2-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "dc6dc614cbd94b345b66f85d3f867638593fb199", "size": 1087508597, @@ -19894,7 +23570,7 @@ } }, "displayName": "NDK", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -19914,18 +23590,28 @@ "21.1.6352462": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "e1de2f749c5c32ae991c3ccaabfcdf7688ee221f", + "size": 1014473187, + "url": "https://dl.google.com/android/repository/android-ndk-r21b-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "e1de2f749c5c32ae991c3ccaabfcdf7688ee221f", "size": 1014473187, "url": "https://dl.google.com/android/repository/android-ndk-r21b-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "50250fcba479de477b45801e2699cca47f7e1267", "size": 1162377080, "url": "https://dl.google.com/android/repository/android-ndk-r21b-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "6809fac4a6e829f4bac64628fa9835d57bbd61a8", "size": 1079474640, @@ -19940,7 +23626,7 @@ } }, "displayName": "NDK", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -19959,18 +23645,28 @@ "21.1.6363665-rc3": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "767f722c14dd27a22b17903e09b768407131129e", + "size": 1042902819, + "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta3-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "767f722c14dd27a22b17903e09b768407131129e", "size": 1042902819, "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta3-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "29139085aa402d6b27d4394c30e797f814876d1e", "size": 1190809917, "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta3-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "8ecb03c728b8dc814db30c8152c4436cb1536c8d", "size": 1109667800, @@ -19985,7 +23681,7 @@ } }, "displayName": "NDK", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -20005,18 +23701,28 @@ "21.2.6472646": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "c42a836f6697a4ef8b927813d5f7dd12e974cfba", + "size": 1014322452, + "url": "https://dl.google.com/android/repository/android-ndk-r21c-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "c42a836f6697a4ef8b927813d5f7dd12e974cfba", "size": 1014322452, "url": "https://dl.google.com/android/repository/android-ndk-r21c-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "c81a5bcb4672a18d3647bf6898cd4dbcb978d0e8", "size": 1162375023, "url": "https://dl.google.com/android/repository/android-ndk-r21c-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "93563a1297a60b5da49a48f62340dbf0c878a5f3", "size": 1079490351, @@ -20031,7 +23737,7 @@ } }, "displayName": "NDK", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -20050,18 +23756,28 @@ "21.3.6528147": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "ef06c9f9d7efd6f243eb3c05ac440562ae29ae12", + "size": 1042615469, + "url": "https://dl.google.com/android/repository/android-ndk-r21d-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "ef06c9f9d7efd6f243eb3c05ac440562ae29ae12", "size": 1042615469, "url": "https://dl.google.com/android/repository/android-ndk-r21d-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "bcf4023eb8cb6976a4c7cff0a8a8f145f162bf4d", "size": 1190667841, "url": "https://dl.google.com/android/repository/android-ndk-r21d-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "99175ce1210258f2280568cd340e0666c69955c7", "size": 1109536102, @@ -20076,7 +23792,7 @@ } }, "displayName": "NDK", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -20095,18 +23811,28 @@ "21.4.7075529": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "3f15c23a1c247ad17c7c271806848dbd40434738", + "size": 1042617180, + "url": "https://dl.google.com/android/repository/android-ndk-r21e-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "3f15c23a1c247ad17c7c271806848dbd40434738", "size": 1042617180, "url": "https://dl.google.com/android/repository/android-ndk-r21e-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "c3ebc83c96a4d7f539bd72c241b2be9dcd29bda9", "size": 1190670072, "url": "https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "fc44fea8bb3f5a6789821f40f41dce2d2cd5dc30", "size": 1109665123, @@ -20121,7 +23847,7 @@ } }, "displayName": "NDK", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -20140,18 +23866,28 @@ "22.0.6917172-rc1": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "0ff242f820663fe45773bca7a2df036004fc7c69", + "size": 1047697781, + "url": "https://dl.google.com/android/repository/android-ndk-r22-beta1-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "0ff242f820663fe45773bca7a2df036004fc7c69", "size": 1047697781, "url": "https://dl.google.com/android/repository/android-ndk-r22-beta1-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "687f696f43b23e2623e7f7073bbd575d254f66f6", "size": 1146575022, "url": "https://dl.google.com/android/repository/android-ndk-r22-beta1-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "ef38999c0e3c96124acffab6971ad2054a433b91", "size": 1080588810, @@ -20166,7 +23902,7 @@ } }, "displayName": "NDK", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -20186,18 +23922,28 @@ "22.0.7026061": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "9cf3816ed3e4308ff03bd5f69100b373bad12f13", + "size": 1047577432, + "url": "https://dl.google.com/android/repository/android-ndk-r22-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "9cf3816ed3e4308ff03bd5f69100b373bad12f13", "size": 1047577432, "url": "https://dl.google.com/android/repository/android-ndk-r22-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "82274313aba10da6177fd41868f56a0f9651dd81", "size": 1146450986, "url": "https://dl.google.com/android/repository/android-ndk-r22-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "c03f761caf1c6f5efbeb5ccfa573ea922cb955b3", "size": 1080471370, @@ -20212,7 +23958,7 @@ } }, "displayName": "NDK", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -20231,18 +23977,28 @@ "22.1.7171670": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "dc80e8a2cfcb28db74c1931d42c652e9d17ff2c3", + "size": 1049337733, + "url": "https://dl.google.com/android/repository/android-ndk-r22b-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "dc80e8a2cfcb28db74c1931d42c652e9d17ff2c3", "size": 1049337733, "url": "https://dl.google.com/android/repository/android-ndk-r22b-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "9ece64c7f19763dd67320d512794969930fce9dc", "size": 1148198368, "url": "https://dl.google.com/android/repository/android-ndk-r22b-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "96ba1a049303cf6bf3ee84cfd64d6bcd43486a50", "size": 1082301775, @@ -20257,7 +24013,7 @@ } }, "displayName": "NDK", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -20276,18 +24032,28 @@ "23.0.7123448-rc1": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "708ebbceb719c43a3165503ea82fb107d823ad54", + "size": 721278316, + "url": "https://dl.google.com/android/repository/android-ndk-r23-beta1-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "708ebbceb719c43a3165503ea82fb107d823ad54", "size": 721278316, "url": "https://dl.google.com/android/repository/android-ndk-r23-beta1-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "1340ed20f27fcb184ea814ae63e0f3cd75890342", "size": 804392699, "url": "https://dl.google.com/android/repository/android-ndk-r23-beta1-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "c056900896129d3dd4eb953a53a8961d9853aa20", "size": 749304589, @@ -20302,7 +24068,7 @@ } }, "displayName": "NDK", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -20322,18 +24088,28 @@ "23.0.7196353-rc2": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "454fd0c1e8385896ad465d7cfd653e28fbf3523f", + "size": 674507658, + "url": "https://dl.google.com/android/repository/android-ndk-r23-beta2-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "454fd0c1e8385896ad465d7cfd653e28fbf3523f", "size": 674507658, "url": "https://dl.google.com/android/repository/android-ndk-r23-beta2-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "290e8c39bb9732ac8784855e1f22342eb488228e", "size": 705747711, "url": "https://dl.google.com/android/repository/android-ndk-r23-beta2-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "00194ae44ce90f2052ab8e42f1a11a0db8d50c2a", "size": 747953762, @@ -20348,7 +24124,7 @@ } }, "displayName": "NDK", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -20368,18 +24144,28 @@ "23.0.7272597-rc3": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "3b977f0f8e0fa2d6777fae6b1d37aebfc075ab56", + "size": 695243724, + "url": "https://dl.google.com/android/repository/android-ndk-r23-beta3-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "3b977f0f8e0fa2d6777fae6b1d37aebfc075ab56", "size": 695243724, "url": "https://dl.google.com/android/repository/android-ndk-r23-beta3-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "2298465ef13dab0c527b9cf6ef892b1ec6461fb4", "size": 724828157, "url": "https://dl.google.com/android/repository/android-ndk-r23-beta3-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "8c10a51f50f4f12ccc839dcb4bd8107133024c2f", "size": 785932724, @@ -20394,7 +24180,7 @@ } }, "displayName": "NDK", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -20414,18 +24200,28 @@ "23.0.7344513-rc4": { "archives": [ { + "arch": "aarch64", + "os": "macosx", + "sha1": "a8fedcf0dd3b3a340e68684a5a2308154a952039", + "size": 694920487, + "url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "macosx", "sha1": "a8fedcf0dd3b3a340e68684a5a2308154a952039", "size": 694920487, "url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-darwin-x86_64.zip" }, { + "arch": "x64", "os": "linux", "sha1": "5f44bc1789042358a73c15e0ef732ea729cf47cc", "size": 724510864, "url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-linux-x86_64.zip" }, { + "arch": "x64", "os": "windows", "sha1": "4492af1296d07c0c65ce42f10ecac06c3c307b94", "size": 785615074, @@ -20440,7 +24236,7 @@ } }, "displayName": "NDK", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -20678,18 +24474,21 @@ "35.0.2": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "f6406982a79d67e40b1ca3cb9e5e2cc783c0f232", "size": 7472902, "url": "https://dl.google.com/android/repository/platform-tools_r35.0.2-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "f6b3158097ca0e9d6fe2024b790ac68af3f2faf2", "size": 13335867, "url": "https://dl.google.com/android/repository/platform-tools_r35.0.2-darwin.zip" }, { + "arch": "all", "os": "windows", "sha1": "6d204cdff21bce8a39c1d2367084e6174f854c2c", "size": 6700829, @@ -20697,7 +24496,7 @@ } ], "displayName": "Android SDK Platform-Tools", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platform-tools", "path": "platform-tools", @@ -20718,6 +24517,7 @@ "10": { "archives": [ { + "arch": "all", "os": "all", "sha1": "887e37783ec32f541ea33c2c649dda648e8e6fb3", "size": 85470907, @@ -20725,7 +24525,7 @@ } ], "displayName": "Android SDK Platform 10", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-10", @@ -20735,6 +24535,7 @@ }, "type-details": { "api-level:0": "10", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -20744,12 +24545,18 @@ "element-attributes": { "api": "4" } + }, + "layoutlib:3": { + "element-attributes": { + "api": "4" + } } } }, "11": { "archives": [ { + "arch": "all", "os": "all", "sha1": "2c7d4bd13f276e76f6bbd87315fe27aba351dd37", "size": 104513908, @@ -20757,7 +24564,7 @@ } ], "displayName": "Android SDK Platform 11", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-11", @@ -20767,6 +24574,7 @@ }, "type-details": { "api-level:0": "11", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -20776,12 +24584,18 @@ "element-attributes": { "api": "4" } + }, + "layoutlib:3": { + "element-attributes": { + "api": "4" + } } } }, "12": { "archives": [ { + "arch": "all", "os": "all", "sha1": "4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf", "size": 106472351, @@ -20789,7 +24603,7 @@ } ], "displayName": "Android SDK Platform 12", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-12", @@ -20799,6 +24613,7 @@ }, "type-details": { "api-level:0": "12", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -20808,12 +24623,18 @@ "element-attributes": { "api": "4" } + }, + "layoutlib:3": { + "element-attributes": { + "api": "4" + } } } }, "13": { "archives": [ { + "arch": "all", "os": "all", "sha1": "6189a500a8c44ae73a439604363de93591163cd9", "size": 108426536, @@ -20821,7 +24642,7 @@ } ], "displayName": "Android SDK Platform 13", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-13", @@ -20831,6 +24652,7 @@ }, "type-details": { "api-level:0": "13", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -20840,12 +24662,18 @@ "element-attributes": { "api": "4" } + }, + "layoutlib:3": { + "element-attributes": { + "api": "4" + } } } }, "14": { "archives": [ { + "arch": "all", "os": "all", "sha1": "d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c", "size": 46038082, @@ -20853,7 +24681,7 @@ } ], "displayName": "Android SDK Platform 14", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-14", @@ -20863,6 +24691,7 @@ }, "type-details": { "api-level:0": "14", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -20872,12 +24701,18 @@ "element-attributes": { "api": "12" } + }, + "layoutlib:3": { + "element-attributes": { + "api": "12" + } } } }, "15": { "archives": [ { + "arch": "all", "os": "all", "sha1": "69ab4c443b37184b2883af1fd38cc20cbeffd0f3", "size": 44533475, @@ -20885,7 +24720,7 @@ } ], "displayName": "Android SDK Platform 15", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-15", @@ -20895,6 +24730,7 @@ }, "type-details": { "api-level:0": "15", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -20904,12 +24740,18 @@ "element-attributes": { "api": "12" } + }, + "layoutlib:3": { + "element-attributes": { + "api": "12" + } } } }, "16": { "archives": [ { + "arch": "all", "os": "all", "sha1": "12a5ce6235a76bc30f62c26bda1b680e336abd07", "size": 48128695, @@ -20917,7 +24759,7 @@ } ], "displayName": "Android SDK Platform 16", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-16", @@ -20927,6 +24769,7 @@ }, "type-details": { "api-level:0": "16", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -20936,12 +24779,18 @@ "element-attributes": { "api": "12" } + }, + "layoutlib:3": { + "element-attributes": { + "api": "12" + } } } }, "17": { "archives": [ { + "arch": "all", "os": "all", "sha1": "dbe14101c06e6cdb34e300393e64e64f8c92168a", "size": 57030216, @@ -20949,7 +24798,7 @@ } ], "displayName": "Android SDK Platform 17", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-17", @@ -20959,6 +24808,7 @@ }, "type-details": { "api-level:0": "17", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -20968,12 +24818,18 @@ "element-attributes": { "api": "12" } + }, + "layoutlib:3": { + "element-attributes": { + "api": "12" + } } } }, "18": { "archives": [ { + "arch": "all", "os": "all", "sha1": "e6b09b3505754cbbeb4a5622008b907262ee91cb", "size": 57771739, @@ -20981,7 +24837,7 @@ } ], "displayName": "Android SDK Platform 18", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-18", @@ -20991,6 +24847,7 @@ }, "type-details": { "api-level:0": "18", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -21000,12 +24857,18 @@ "element-attributes": { "api": "12" } + }, + "layoutlib:3": { + "element-attributes": { + "api": "12" + } } } }, "19": { "archives": [ { + "arch": "all", "os": "all", "sha1": "2ff20d89e68f2f5390981342e009db5a2d456aaa", "size": 63871092, @@ -21013,7 +24876,7 @@ } ], "displayName": "Android SDK Platform 19", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-19", @@ -21023,6 +24886,7 @@ }, "type-details": { "api-level:0": "19", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -21032,24 +24896,32 @@ "element-attributes": { "api": "12" } + }, + "layoutlib:3": { + "element-attributes": { + "api": "12" + } } } }, "2": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "c054d25c9b4c6251fa49c2f9c54336998679d3fe", "size": 45476658, "url": "https://dl.google.com/android/repository/android-1.1_r1-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "e21dbcff45b7356657449ebb3c7e941be2bb5ebe", "size": 45584305, "url": "https://dl.google.com/android/repository/android-1.1_r1-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "a4060f29ed39fc929c302836d488998c53c3002e", "size": 46828615, @@ -21057,7 +24929,7 @@ } ], "displayName": "Android SDK Platform 2", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -21068,6 +24940,7 @@ }, "type-details": { "api-level:0": "2", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -21077,12 +24950,18 @@ "element-attributes": { "api": "4" } + }, + "layoutlib:3": { + "element-attributes": { + "api": "4" + } } } }, "20": { "archives": [ { + "arch": "all", "os": "all", "sha1": "a9251f8a3f313ab05834a07a963000927637e01d", "size": 63567784, @@ -21090,7 +24969,7 @@ } ], "displayName": "Android SDK Platform 20", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-20", @@ -21100,6 +24979,7 @@ }, "type-details": { "api-level:0": "20", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -21109,12 +24989,18 @@ "element-attributes": { "api": "12" } + }, + "layoutlib:3": { + "element-attributes": { + "api": "12" + } } } }, "21": { "archives": [ { + "arch": "all", "os": "all", "sha1": "53536556059bb29ae82f414fd2e14bc335a4eb4c", "size": 65897960, @@ -21122,7 +25008,7 @@ } ], "displayName": "Android SDK Platform 21", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-21", @@ -21132,6 +25018,7 @@ }, "type-details": { "api-level:0": "21", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -21141,12 +25028,18 @@ "element-attributes": { "api": "12" } + }, + "layoutlib:3": { + "element-attributes": { + "api": "12" + } } } }, "22": { "archives": [ { + "arch": "all", "os": "all", "sha1": "5d1bd10fea962b216a0dece1247070164760a9fc", "size": 66852371, @@ -21154,7 +25047,7 @@ } ], "displayName": "Android SDK Platform 22", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-22", @@ -21164,6 +25057,7 @@ }, "type-details": { "api-level:0": "22", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -21173,12 +25067,18 @@ "element-attributes": { "api": "14" } + }, + "layoutlib:3": { + "element-attributes": { + "api": "14" + } } } }, "23": { "archives": [ { + "arch": "all", "os": "all", "sha1": "027fede3de6aa1649115bbd0bffff30ccd51c9a0", "size": 70433421, @@ -21186,7 +25086,7 @@ } ], "displayName": "Android SDK Platform 23", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-23", @@ -21196,6 +25096,7 @@ }, "type-details": { "api-level:0": "23", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -21205,12 +25106,18 @@ "element-attributes": { "api": "16" } + }, + "layoutlib:3": { + "element-attributes": { + "api": "16" + } } } }, "24": { "archives": [ { + "arch": "all", "os": "all", "sha1": "8912da3d4bfe7a9f28f0e5ce92d3a8dc96342aee", "size": 82648154, @@ -21218,7 +25125,7 @@ } ], "displayName": "Android SDK Platform 24", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-24", @@ -21228,6 +25135,7 @@ }, "type-details": { "api-level:0": "24", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -21237,12 +25145,18 @@ "element-attributes": { "api": "16" } + }, + "layoutlib:3": { + "element-attributes": { + "api": "16" + } } } }, "25": { "archives": [ { + "arch": "all", "os": "all", "sha1": "00c2c5765e8988504be10a1eb66ed71fcdbd7fe8", "size": 85424763, @@ -21250,7 +25164,7 @@ } ], "displayName": "Android SDK Platform 25", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-25", @@ -21260,6 +25174,7 @@ }, "type-details": { "api-level:0": "25", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -21269,12 +25184,18 @@ "element-attributes": { "api": "16" } + }, + "layoutlib:3": { + "element-attributes": { + "api": "16" + } } } }, "26": { "archives": [ { + "arch": "all", "os": "all", "sha1": "e4ae5d7aa557a3c827135838ee400da8443ac4ef", "size": 63623734, @@ -21282,7 +25203,7 @@ } ], "displayName": "Android SDK Platform 26", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-26", @@ -21292,6 +25213,7 @@ }, "type-details": { "api-level:0": "26", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -21301,12 +25223,18 @@ "element-attributes": { "api": "15" } + }, + "layoutlib:3": { + "element-attributes": { + "api": "15" + } } } }, "27": { "archives": [ { + "arch": "all", "os": "all", "sha1": "35f747e7e70b2d16e0e4246876be28d15ea1c353", "size": 65635348, @@ -21314,7 +25242,7 @@ } ], "displayName": "Android SDK Platform 27", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-27", @@ -21324,6 +25252,7 @@ }, "type-details": { "api-level:0": "27", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -21333,12 +25262,18 @@ "element-attributes": { "api": "15" } + }, + "layoutlib:3": { + "element-attributes": { + "api": "15" + } } } }, "28": { "archives": [ { + "arch": "all", "os": "all", "sha1": "9a4e52b1d55bd2e24216b150aafae2503d3efba6", "size": 75565084, @@ -21346,7 +25281,7 @@ } ], "displayName": "Android SDK Platform 28", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-28", @@ -21356,6 +25291,7 @@ }, "type-details": { "api-level:0": "28", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -21365,12 +25301,18 @@ "element-attributes": { "api": "15" } + }, + "layoutlib:3": { + "element-attributes": { + "api": "15" + } } } }, "29": { "archives": [ { + "arch": "all", "os": "all", "sha1": "9d8a7e0ffa5168dbca6c60355b9129c6c7572aff", "size": 78293913, @@ -21378,7 +25320,7 @@ } ], "displayName": "Android SDK Platform 29", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-29", @@ -21388,6 +25330,7 @@ }, "type-details": { "api-level:0": "29", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -21397,24 +25340,32 @@ "element-attributes": { "api": "15" } + }, + "layoutlib:3": { + "element-attributes": { + "api": "15" + } } } }, "3": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "5c134b7df5f4b8bd5b61ba93bdaebada8fa3468c", "size": 53348669, "url": "https://dl.google.com/android/repository/android-1.5_r04-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "d3a67c2369afa48b6c3c7624de5031c262018d1e", "size": 52440607, "url": "https://dl.google.com/android/repository/android-1.5_r04-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "5bb106d2e40d481edd337b0833093843e15fe49a", "size": 54624370, @@ -21422,7 +25373,7 @@ } ], "displayName": "Android SDK Platform 3", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -21433,6 +25384,7 @@ }, "type-details": { "api-level:0": "3", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -21442,12 +25394,18 @@ "element-attributes": { "api": "4" } + }, + "layoutlib:3": { + "element-attributes": { + "api": "4" + } } } }, "30": { "archives": [ { + "arch": "all", "os": "all", "sha1": "e7c6280901dcfa511af098d67dd88c4dfcbc6ea2", "size": 52328361, @@ -21455,7 +25413,7 @@ } ], "displayName": "Android SDK Platform 30", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-30", @@ -21465,6 +25423,7 @@ }, "type-details": { "api-level:0": "30", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -21474,12 +25433,18 @@ "element-attributes": { "api": "15" } + }, + "layoutlib:3": { + "element-attributes": { + "api": "15" + } } } }, "31": { "archives": [ { + "arch": "all", "os": "all", "sha1": "ca5bcaa565cb37e9d287051d6dd0e49a5426ec29", "size": 56475526, @@ -21487,7 +25452,7 @@ } ], "displayName": "Android SDK Platform 31", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-31", @@ -21497,6 +25462,7 @@ }, "type-details": { "api-level:0": "31", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -21506,12 +25472,18 @@ "element-attributes": { "api": "15" } + }, + "layoutlib:3": { + "element-attributes": { + "api": "15" + } } } }, "32": { "archives": [ { + "arch": "all", "os": "all", "sha1": "afae86ed55d29733d50996ffed832f2d1bd75b9a", "size": 66108299, @@ -21519,7 +25491,7 @@ } ], "displayName": "Android SDK Platform 32", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-32", @@ -21529,6 +25501,7 @@ }, "type-details": { "api-level:0": "32", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -21538,67 +25511,118 @@ "element-attributes": { "api": "15" } + }, + "layoutlib:3": { + "element-attributes": { + "api": "15" + } } } }, "33": { "archives": [ { + "arch": "all", "os": "all", "sha1": "394bc86d8d3452aa4d419b67743025a6fb2cd9d0", "size": 67334237, "url": "https://dl.google.com/android/repository/platform-33-ext3_r03.zip" } ], - "displayName": "Android SDK Platform 33-ext5", - "last-available-day": 20112, + "displayName": "Android SDK Platform 33", + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-33", "revision": "33", "revision-details": { - "major:0": "1" + "major:0": "3" }, "type-details": { "api-level:0": "33", + "base-extension:3": "true", "codename:1": { }, "element-attributes": { "xsi:type": "ns11:platformDetailsType" }, + "extension-level:2": "3", "layoutlib:2": { "element-attributes": { "api": "15" } + }, + "layoutlib:4": { + "element-attributes": { + "api": "15" + } + } + } + }, + "33x": { + "archives": [ + { + "arch": "all", + "os": "all", + "sha1": "422f50033523c5f934f38df520699080b59bbc7e", + "size": 67564453, + "url": "https://dl.google.com/android/repository/platform-33-ext4_r01.zip" + } + ], + "displayName": "Android SDK Platform 33-ext5", + "last-available-day": 20131, + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-33-ext5", + "revision": "33x", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "33x", + "base-extension:3": "false", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "extension-level:2": "5", + "layoutlib:4": { + "element-attributes": { + "api": "15" + } } } }, "34": { "archives": [ { + "arch": "all", "os": "all", "sha1": "f09b07da8aea238a81b71d6fedb815e13aa13e58", "size": 63180079, "url": "https://dl.google.com/android/repository/platform-34-ext7_r02.zip" } ], - "displayName": "Android SDK Platform 34-ext12", - "last-available-day": 20112, + "displayName": "Android SDK Platform 34", + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", "path": "platforms/android-34", "revision": "34", "revision-details": { - "major:0": "1" + "major:0": "3" }, "type-details": { "api-level:0": "34", + "base-extension:3": "true", "codename:1": { }, "element-attributes": { "xsi:type": "ns11:platformDetailsType" }, + "extension-level:2": "7", "layoutlib:1": { "element-attributes": { "api": "15" @@ -21608,54 +25632,136 @@ "element-attributes": { "api": "15" } + }, + "layoutlib:4": { + "element-attributes": { + "api": "15" + } + } + } + }, + "34x": { + "archives": [ + { + "arch": "all", + "os": "all", + "sha1": "71877402d579127b19158f9f170f05bcd805f686", + "size": 63201407, + "url": "https://dl.google.com/android/repository/platform-34-ext8_r01.zip" + } + ], + "displayName": "Android SDK Platform 34-ext12", + "last-available-day": 20131, + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-34-ext12", + "revision": "34x", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "34x", + "base-extension:2": "false", + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "extension-level:1": "12", + "layoutlib:3": { + "element-attributes": { + "api": "15" + } } } }, "35": { "archives": [ { + "arch": "all", "os": "all", - "sha1": "2a0b06a1c89b52a3d70ce5d40554b094c1c1d0ac", - "size": 64281656, + "sha1": "0bb560a90a7a2cbd0dd8348224d518b638fe7949", + "size": 64273788, "url": "https://dl.google.com/android/repository/platform-35_r02.zip" } ], - "displayName": "Android SDK Platform 35-ext14", - "last-available-day": 20112, + "displayName": "Android SDK Platform 35", + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-35", "revision": "35", "revision-details": { - "major:0": "1" + "major:0": "2" }, "type-details": { "api-level:0": "35", + "base-extension:2": "true", "element-attributes": { "xsi:type": "ns11:platformDetailsType" }, + "extension-level:1": "13", "layoutlib:1": { "element-attributes": { "api": "15" } + }, + "layoutlib:3": { + "element-attributes": { + "api": "15" + } + } + } + }, + "35x": { + "archives": [ + { + "arch": "all", + "os": "all", + "sha1": "c0e5b5511562fc8b8a61b3b3f17f6ffa811e4971", + "size": 64330898, + "url": "https://dl.google.com/android/repository/platform-35-ext14_r01.zip" + } + ], + "displayName": "Android SDK Platform 35-ext14", + "last-available-day": 20131, + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-35-ext14", + "revision": "35x", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "35x", + "base-extension:2": "false", + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "extension-level:1": "14", + "layoutlib:3": { + "element-attributes": { + "api": "15" + } } } }, "4": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "483ed088e45bbdf3444baaf9250c8b02e5383cb0", "size": 63454485, "url": "https://dl.google.com/android/repository/android-1.6_r03-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "bdafad44f5df9f127979bdb21a1fdd87ee3cd625", "size": 62418496, "url": "https://dl.google.com/android/repository/android-1.6_r03-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "ce0b5e4ffaf12ca4fd07c2da71a8a1ab4a03dc22", "size": 64654625, @@ -21663,7 +25769,7 @@ } ], "displayName": "Android SDK Platform 4", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -21674,6 +25780,7 @@ }, "type-details": { "api-level:0": "4", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -21683,24 +25790,32 @@ "element-attributes": { "api": "4" } + }, + "layoutlib:3": { + "element-attributes": { + "api": "4" + } } } }, "5": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "be9be6a99ca32875c96ec7f91160ca9fce7e3c7d", "size": 75095268, "url": "https://dl.google.com/android/repository/android-2.0_r01-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "2a866d0870dbba18e0503cd41e5fae988a21b314", "size": 74956356, "url": "https://dl.google.com/android/repository/android-2.0_r01-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "aeb623217ff88b87216d6eb7dbc846ed53f68f57", "size": 76288040, @@ -21708,7 +25823,7 @@ } ], "displayName": "Android SDK Platform 5", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -21719,6 +25834,7 @@ }, "type-details": { "api-level:0": "5", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -21728,24 +25844,32 @@ "element-attributes": { "api": "4" } + }, + "layoutlib:3": { + "element-attributes": { + "api": "4" + } } } }, "6": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "ce2c971dce352aa28af06bda92a070116aa5ae1a", "size": 79192618, "url": "https://dl.google.com/android/repository/android-2.0.1_r01-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "c3096f80d75a6fc8cb38ef8a18aec920e53d42c0", "size": 79035527, "url": "https://dl.google.com/android/repository/android-2.0.1_r01-macosx.zip" }, { + "arch": "all", "os": "windows", "sha1": "255781ebe4509d9707d0e77edda2815e2bc216e6", "size": 80385601, @@ -21753,7 +25877,7 @@ } ], "displayName": "Android SDK Platform 6", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -21764,6 +25888,7 @@ }, "type-details": { "api-level:0": "6", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -21773,12 +25898,18 @@ "element-attributes": { "api": "4" } + }, + "layoutlib:3": { + "element-attributes": { + "api": "4" + } } } }, "7": { "archives": [ { + "arch": "all", "os": "all", "sha1": "5ce51b023ac19f8738500b1007a1da5de2349a1e", "size": 70142829, @@ -21786,7 +25917,7 @@ } ], "displayName": "Android SDK Platform 7", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-7", @@ -21796,6 +25927,7 @@ }, "type-details": { "api-level:0": "7", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -21805,12 +25937,18 @@ "element-attributes": { "api": "4" } + }, + "layoutlib:3": { + "element-attributes": { + "api": "4" + } } } }, "8": { "archives": [ { + "arch": "all", "os": "all", "sha1": "231262c63eefdff8fd0386e9ccfefeb27a8f9202", "size": 74652366, @@ -21818,7 +25956,7 @@ } ], "displayName": "Android SDK Platform 8", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-8", @@ -21828,6 +25966,7 @@ }, "type-details": { "api-level:0": "8", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -21837,12 +25976,18 @@ "element-attributes": { "api": "4" } + }, + "layoutlib:3": { + "element-attributes": { + "api": "4" + } } } }, "9": { "archives": [ { + "arch": "all", "os": "all", "sha1": "209f8a7a8b2cb093fce858b8b55fed3ba5206773", "size": 78732563, @@ -21850,7 +25995,7 @@ } ], "displayName": "Android SDK Platform 9", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-9", @@ -21860,6 +26005,7 @@ }, "type-details": { "api-level:0": "9", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -21869,12 +26015,18 @@ "element-attributes": { "api": "4" } + }, + "layoutlib:3": { + "element-attributes": { + "api": "4" + } } } }, "Baklava": { "archives": [ { + "arch": "all", "os": "all", "sha1": "69909269fe199e2d3817c10ecc13cd338da55d3b", "size": 65460575, @@ -21882,7 +26034,7 @@ } ], "displayName": "Android SDK Platform Baklava", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-Baklava", @@ -21892,11 +26044,13 @@ }, "type-details": { "api-level:0": "35", + "base-extension:3": "true", "codename:1": "Baklava", "element-attributes": { "xsi:type": "ns11:platformDetailsType" }, - "layoutlib:2": { + "extension-level:2": "16", + "layoutlib:4": { "element-attributes": { "api": "15" } @@ -21937,6 +26091,7 @@ "UpsideDownCake": { "archives": [ { + "arch": "all", "os": "all", "sha1": "a0fe6b17b8ea26c72f4a1feb0234aab6b20fd4be", "size": 63483782, @@ -21944,7 +26099,7 @@ } ], "displayName": "Android SDK Platform UpsideDownCake", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -21955,14 +26110,21 @@ }, "type-details": { "api-level:0": "33", + "base-extension:3": "true", "codename:1": "UpsideDownCake", "element-attributes": { "xsi:type": "ns11:platformDetailsType" }, + "extension-level:2": "6", "layoutlib:2": { "element-attributes": { "api": "15" } + }, + "layoutlib:4": { + "element-attributes": { + "api": "15" + } } } }, @@ -22069,18 +26231,21 @@ "3": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "36e2c30f7745f4c062129a0fd549d29ab991db41", "size": 6767192, "url": "https://dl.google.com/android/repository/skiaparser-7478287-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "04a834a8ab3efd4612300da7cef7f43a6b257468", "size": 7401688, "url": "https://dl.google.com/android/repository/skiaparser-7478287-mac.zip" }, { + "arch": "all", "os": "windows", "sha1": "567f24512f9d9487a3b948032a136261f5d59c92", "size": 6532776, @@ -22088,7 +26253,7 @@ } ], "displayName": "Layout Inspector image server for API S", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/2", @@ -22141,18 +26306,28 @@ "5": { "archives": [ { + "arch": "x64", "os": "linux", "sha1": "f1f9acd490c2a94402fa5fc0a548f529acab91b1", "size": 9059335, "url": "https://dl.google.com/android/repository/skiaparser-12616120-linux-x64.zip" }, { + "arch": "x64", "os": "macosx", "sha1": "d320af2c33979fce796d436e6e68351a9d1a02d2", "size": 2932763, "url": "https://dl.google.com/android/repository/skiaparser-12616120-darwin-x64.zip" }, { + "arch": "aarch64", + "os": "macosx", + "sha1": "b40c1615bacc6b8c27563c2f5dd8d1a856f20c50", + "size": 2598750, + "url": "https://dl.google.com/android/repository/skiaparser-12616120-darwin-aarch64.zip" + }, + { + "arch": "x64", "os": "windows", "sha1": "afd28844313af84f7245cef5d5be8d9a9de848e1", "size": 2952673, @@ -22160,7 +26335,7 @@ } ], "displayName": "Layout Inspector image server for API 31-36", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/3", @@ -22177,18 +26352,21 @@ "6": { "archives": [ { + "arch": "all", "os": "linux", "sha1": "78af2cd3e4168af80c16d7686536baa318e10cc4", "size": 6323164, "url": "https://dl.google.com/android/repository/skiaparser-7083912-linux.zip" }, { + "arch": "all", "os": "macosx", "sha1": "73aa4e3b52177cf7d4cf956a74311e0097987bb4", "size": 6561072, "url": "https://dl.google.com/android/repository/skiaparser-7083912-mac.zip" }, { + "arch": "all", "os": "windows", "sha1": "28dde025a70a0f4819cf195c1cb6e0e2b4bf4514", "size": 6059180, @@ -22196,7 +26374,7 @@ } ], "displayName": "Layout Inspector image server for API 29-30", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/1", @@ -22215,6 +26393,7 @@ "14": { "archives": [ { + "arch": "all", "os": "all", "sha1": "eaf4ed7dcac46e68516a1b4aa5b0d9e5a39a7555", "size": 16152383, @@ -22222,7 +26401,7 @@ } ], "displayName": "Sources for Android 14", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "sources", "obsolete": "true", @@ -22233,6 +26412,7 @@ }, "type-details": { "api-level:0": "14", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -22243,6 +26423,7 @@ "15": { "archives": [ { + "arch": "all", "os": "all", "sha1": "e5992a5747c9590783fbbdd700337bf0c9f6b1fa", "size": 16468746, @@ -22250,7 +26431,7 @@ } ], "displayName": "Sources for Android 15", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "sources", "path": "sources/android-15", @@ -22260,6 +26441,7 @@ }, "type-details": { "api-level:0": "15", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -22270,6 +26452,7 @@ "16": { "archives": [ { + "arch": "all", "os": "all", "sha1": "0f83c14ed333c45d962279ab5d6bc98a0269ef84", "size": 17876720, @@ -22277,7 +26460,7 @@ } ], "displayName": "Sources for Android 16", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "sources", "path": "sources/android-16", @@ -22287,6 +26470,7 @@ }, "type-details": { "api-level:0": "16", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -22297,6 +26481,7 @@ "17": { "archives": [ { + "arch": "all", "os": "all", "sha1": "6f1f18cd2d2b1852d7f6892df9cee3823349d43a", "size": 18976816, @@ -22304,7 +26489,7 @@ } ], "displayName": "Sources for Android 17", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "sources", "path": "sources/android-17", @@ -22314,6 +26499,7 @@ }, "type-details": { "api-level:0": "17", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -22324,6 +26510,7 @@ "18": { "archives": [ { + "arch": "all", "os": "all", "sha1": "8b49fdf7433f4881a2bfb559b5dd05d8ec65fb78", "size": 20226735, @@ -22331,7 +26518,7 @@ } ], "displayName": "Sources for Android 18", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "sources", "path": "sources/android-18", @@ -22341,6 +26528,7 @@ }, "type-details": { "api-level:0": "18", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -22351,6 +26539,7 @@ "19": { "archives": [ { + "arch": "all", "os": "all", "sha1": "433a1d043ef77561571250e94cb7a0ef24a202e7", "size": 21819439, @@ -22358,7 +26547,7 @@ } ], "displayName": "Sources for Android 19", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "sources", "path": "sources/android-19", @@ -22368,6 +26557,7 @@ }, "type-details": { "api-level:0": "19", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -22378,6 +26568,7 @@ "20": { "archives": [ { + "arch": "all", "os": "all", "sha1": "8da3e40f2625f9f7ef38b7e403f49f67226c0d76", "size": 23367603, @@ -22385,7 +26576,7 @@ } ], "displayName": "Sources for Android 20", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "sources", "path": "sources/android-20", @@ -22395,6 +26586,7 @@ }, "type-details": { "api-level:0": "20", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -22405,6 +26597,7 @@ "21": { "archives": [ { + "arch": "all", "os": "all", "sha1": "137a5044915d32bea297a8c1552684802bbc2e25", "size": 28274751, @@ -22412,7 +26605,7 @@ } ], "displayName": "Sources for Android 21", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "sources", "path": "sources/android-21", @@ -22422,6 +26615,7 @@ }, "type-details": { "api-level:0": "21", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -22432,6 +26626,7 @@ "22": { "archives": [ { + "arch": "all", "os": "all", "sha1": "98320e13976d11597a4a730a8d203ac9a03ed5a6", "size": 28861236, @@ -22439,7 +26634,7 @@ } ], "displayName": "Sources for Android 22", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "sources", "path": "sources/android-22", @@ -22449,6 +26644,7 @@ }, "type-details": { "api-level:0": "22", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -22459,6 +26655,7 @@ "23": { "archives": [ { + "arch": "all", "os": "all", "sha1": "b0f15da2762b42f543c5e364c2b15b198cc99cc2", "size": 31771965, @@ -22466,7 +26663,7 @@ } ], "displayName": "Sources for Android 23", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "sources", "path": "sources/android-23", @@ -22476,6 +26673,7 @@ }, "type-details": { "api-level:0": "23", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -22486,6 +26684,7 @@ "24": { "archives": [ { + "arch": "all", "os": "all", "sha1": "6b96115830a83d654479f32ce4b724ca9011148b", "size": 30270410, @@ -22493,7 +26692,7 @@ } ], "displayName": "Sources for Android 24", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "sources", "path": "sources/android-24", @@ -22503,6 +26702,7 @@ }, "type-details": { "api-level:0": "24", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -22513,6 +26713,7 @@ "25": { "archives": [ { + "arch": "all", "os": "all", "sha1": "bbc72efd1a9bad87cc507e308f0d29aad438c52c", "size": 30822685, @@ -22520,7 +26721,7 @@ } ], "displayName": "Sources for Android 25", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "sources", "path": "sources/android-25", @@ -22530,6 +26731,7 @@ }, "type-details": { "api-level:0": "25", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -22540,6 +26742,7 @@ "26": { "archives": [ { + "arch": "all", "os": "all", "sha1": "2af701ee3223d580409288540b1d06932fd8f9b9", "size": 35138547, @@ -22547,7 +26750,7 @@ } ], "displayName": "Sources for Android 26", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "sources", "path": "sources/android-26", @@ -22557,6 +26760,7 @@ }, "type-details": { "api-level:0": "26", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -22567,6 +26771,7 @@ "27": { "archives": [ { + "arch": "all", "os": "all", "sha1": "7b714670561d08f54751af42aca929867b806596", "size": 36997618, @@ -22574,7 +26779,7 @@ } ], "displayName": "Sources for Android 27", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "sources", "path": "sources/android-27", @@ -22584,6 +26789,7 @@ }, "type-details": { "api-level:0": "27", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -22594,6 +26800,7 @@ "28": { "archives": [ { + "arch": "all", "os": "all", "sha1": "5610e0c24235ee3fa343c899ddd551be30315255", "size": 42552241, @@ -22601,7 +26808,7 @@ } ], "displayName": "Sources for Android 28", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "sources", "path": "sources/android-28", @@ -22611,6 +26818,7 @@ }, "type-details": { "api-level:0": "28", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -22621,6 +26829,7 @@ "29": { "archives": [ { + "arch": "all", "os": "all", "sha1": "d0ad249e152b3a8fe3cb7c4a329453a048be29e4", "size": 39477018, @@ -22628,7 +26837,7 @@ } ], "displayName": "Sources for Android 29", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "sources", "path": "sources/android-29", @@ -22638,6 +26847,7 @@ }, "type-details": { "api-level:0": "29", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -22648,6 +26858,7 @@ "30": { "archives": [ { + "arch": "all", "os": "all", "sha1": "e4c000fb3afb32380609ddcad91f5d6495eeccb1", "size": 43263073, @@ -22655,7 +26866,7 @@ } ], "displayName": "Sources for Android 30", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "sources", "path": "sources/android-30", @@ -22665,6 +26876,7 @@ }, "type-details": { "api-level:0": "30", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -22675,6 +26887,7 @@ "31": { "archives": [ { + "arch": "all", "os": "all", "sha1": "2934d1b2975a8bf9fff112bd45a04f6d90db743e", "size": 46383726, @@ -22682,7 +26895,7 @@ } ], "displayName": "Sources for Android 31", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "sources", "path": "sources/android-31", @@ -22692,6 +26905,7 @@ }, "type-details": { "api-level:0": "31", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -22702,6 +26916,7 @@ "32": { "archives": [ { + "arch": "all", "os": "all", "sha1": "d7195c6de611b99d7ec3565eabe2fd21268b7f98", "size": 46933291, @@ -22709,7 +26924,7 @@ } ], "displayName": "Sources for Android 32", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "sources", "path": "sources/android-32", @@ -22719,6 +26934,7 @@ }, "type-details": { "api-level:0": "32", + "base-extension:2": "true", "codename:1": { }, "element-attributes": { @@ -22729,6 +26945,7 @@ "33": { "archives": [ { + "arch": "all", "os": "all", "sha1": "dd9819363bb213e378bb9d84b4c5fe8d8091c219", "size": 49205616, @@ -22736,7 +26953,7 @@ } ], "displayName": "Sources for Android 33", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "sources", "path": "sources/android-33", @@ -22746,16 +26963,19 @@ }, "type-details": { "api-level:0": "33", + "base-extension:3": "true", "codename:1": { }, "element-attributes": { "xsi:type": "ns11:sourceDetailsType" - } + }, + "extension-level:2": "3" } }, "34": { "archives": [ { + "arch": "all", "os": "all", "sha1": "0d2dcece3bbfc032f98986ce7f665b6b97d26bbf", "size": 45502712, @@ -22763,7 +26983,7 @@ } ], "displayName": "Sources for Android 34", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "sources", "path": "sources/android-34", @@ -22773,16 +26993,19 @@ }, "type-details": { "api-level:0": "34", + "base-extension:3": "true", "codename:1": { }, "element-attributes": { "xsi:type": "ns11:sourceDetailsType" - } + }, + "extension-level:2": "7" } }, "35": { "archives": [ { + "arch": "all", "os": "all", "sha1": "c2770115a5f5ad787c8b298b93687a27eebb85b9", "size": 48616636, @@ -22790,7 +27013,7 @@ } ], "displayName": "Sources for Android 35", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "sources", "path": "sources/android-35", @@ -22800,11 +27023,13 @@ }, "type-details": { "api-level:0": "35", + "base-extension:3": "true", "codename:1": { }, "element-attributes": { "xsi:type": "ns11:sourceDetailsType" - } + }, + "extension-level:2": "13" } } }, @@ -22812,18 +27037,21 @@ "26.1.1": { "archives": [ { + "arch": "all", "os": "macosx", "sha1": "ed85ea7b59bc3483ce0af4c198523ba044e083ad", "size": 103022432, "url": "https://dl.google.com/android/repository/sdk-tools-darwin-4333796.zip" }, { + "arch": "all", "os": "linux", "sha1": "8c7c28554a32318461802c1291d76fccfafde054", "size": 154582459, "url": "https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip" }, { + "arch": "all", "os": "windows", "sha1": "aa298b5346ee0d63940d13609fe6bec621384510", "size": 156136858, @@ -22854,7 +27082,7 @@ } }, "displayName": "Android SDK Tools", - "last-available-day": 20112, + "last-available-day": 20131, "license": "android-sdk-license", "name": "tools", "obsolete": "true", diff --git a/pkgs/development/mobile/androidenv/test-suite.nix b/pkgs/development/mobile/androidenv/test-suite.nix index 0b6984366191..20386f06b324 100644 --- a/pkgs/development/mobile/androidenv/test-suite.nix +++ b/pkgs/development/mobile/androidenv/test-suite.nix @@ -4,16 +4,20 @@ stdenv, }: let - examples-shell = callPackage ./examples/shell.nix { }; - examples-shell-with-emulator = callPackage ./examples/shell-with-emulator.nix { }; - examples-shell-without-emulator = callPackage ./examples/shell-without-emulator.nix { }; + examples-shell = callPackage ./examples/shell.nix { licenseAccepted = true; }; + examples-shell-with-emulator = callPackage ./examples/shell-with-emulator.nix { + licenseAccepted = true; + }; + examples-shell-without-emulator = callPackage ./examples/shell-without-emulator.nix { + licenseAccepted = true; + }; all-tests = examples-shell.passthru.tests // (examples-shell-with-emulator.passthru.tests // examples-shell-without-emulator.passthru.tests); in stdenv.mkDerivation { name = "androidenv-test-suite"; - buidInputs = lib.mapAttrsToList (name: value: value) all-tests; + buildInputs = lib.mapAttrsToList (name: value: value) all-tests; buildCommand = '' touch $out diff --git a/pkgs/development/mobile/androidenv/tools.nix b/pkgs/development/mobile/androidenv/tools.nix index 91ddbe4f9edc..6cd41305bebb 100644 --- a/pkgs/development/mobile/androidenv/tools.nix +++ b/pkgs/development/mobile/androidenv/tools.nix @@ -1,8 +1,8 @@ -{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgsi686Linux, postInstall}: +{deployAndroidPackage, lib, stdenv, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgsi686Linux, postInstall}: deployAndroidPackage { name = "androidsdk-tools"; - inherit os package; + inherit package; nativeBuildInputs = [ makeWrapper ] ++ lib.optionals (os == "linux") [ autoPatchelfHook ]; buildInputs = lib.optional (os == "linux") ( @@ -10,7 +10,7 @@ deployAndroidPackage { stdenv.cc.cc.libgcc or null # fix for https://github.com/NixOS/nixpkgs/issues/226357 ]) ++ (with pkgs.xorg; [ libX11 libXrender libXext ]) - ++ (with pkgsi686Linux; [ glibc xorg.libX11 xorg.libXrender xorg.libXext fontconfig.lib freetype zlib ]) + ++ lib.optionals (os == "linux" && stdenv.isx86_64) (with pkgsi686Linux; [ glibc xorg.libX11 xorg.libXrender xorg.libXext fontconfig.lib freetype zlib ]) ); patchInstructions = ''