From ca0bd35097d7b7346a773d3349134b94aeb9f5d5 Mon Sep 17 00:00:00 2001 From: Gavin John <> Date: Fri, 12 Jul 2024 14:42:37 -0400 Subject: [PATCH 01/71] checkMeta: Expose checkValidity and add to all-packages --- pkgs/stdenv/generic/check-meta.nix | 2 +- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 502343f01fb3..f5efd67782b5 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -517,4 +517,4 @@ let ); }; -in { inherit assertValidity commonMeta; } +in { inherit assertValidity commonMeta checkValidity; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 804ab2b4ac35..25d49407ef1d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -226,6 +226,8 @@ with pkgs; } ''); + checkMeta = callPackage ../stdenv/generic/check-meta.nix { }; + # addDriverRunpath is the preferred package name, as this enables # many more scenarios than just opengl now. addDriverRunpath = callPackage ../build-support/add-driver-runpath { }; From 4efb8f08d98f457ca6d1f4a0eefae0d6c6a05bb2 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Mon, 13 Jan 2025 18:22:03 -0300 Subject: [PATCH 02/71] OVMF: add `passthru.mergedFirmware` parameter This is the final firmware blob that's expected by hypervisors, like Xen. The `passthru.firmware` attribute refers to the OVMF_CODE.fd blob, which is not aligned properly and exceeds the BIOS boundaries set by Xen. See #373416 and https://www.mail-archive.com/xen-devel@lists.xen.org/msg118481.html Signed-off-by: Fernando Rodrigues --- pkgs/applications/virtualization/OVMF/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index f9ecceb226de..ff014dc0aa5a 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -253,6 +253,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: { prefix = "${finalAttrs.finalPackage.fd}/FV/${fwPrefix}"; in { + mergedFirmware = "${prefix}.fd"; firmware = "${prefix}_CODE.fd"; variables = "${prefix}_VARS.fd"; variablesMs = From a35e5e53753fb6722093a7c28a253221962fd6df Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Mon, 13 Jan 2025 18:32:06 -0300 Subject: [PATCH 03/71] xen: use the merged OVMF blob Fixes #373416 Signed-off-by: Fernando Rodrigues --- pkgs/build-support/xen/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/xen/default.nix b/pkgs/build-support/xen/default.nix index ebeb8b98d4ca..f5d127c15796 100644 --- a/pkgs/build-support/xen/default.nix +++ b/pkgs/build-support/xen/default.nix @@ -171,7 +171,7 @@ stdenv.mkDerivation (finalAttrs: { "--disable-qemu-traditional" "--with-system-qemu" (if withSeaBIOS then "--with-system-seabios=${systemSeaBIOS.firmware}" else "--disable-seabios") - (if withOVMF then "--with-system-ovmf=${OVMF.firmware}" else "--disable-ovmf") + (if withOVMF then "--with-system-ovmf=${OVMF.mergedFirmware}" else "--disable-ovmf") (if withIPXE then "--with-system-ipxe=${ipxe.firmware}" else "--disable-ipxe") (enableFeature withFlask "xsmpolicy") ]; From 2b492ee652bbff957a4dbf4459bc4369968ff323 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Jan 2025 12:38:28 +0000 Subject: [PATCH 04/71] mpop: 1.4.20 -> 1.4.21 --- pkgs/applications/networking/mpop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix index c0fab98d6102..7cd4d9349997 100644 --- a/pkgs/applications/networking/mpop/default.nix +++ b/pkgs/applications/networking/mpop/default.nix @@ -21,11 +21,11 @@ assert lib.assertOneOf "sslLibrary" sslLibrary [ stdenv.mkDerivation rec { pname = "mpop"; - version = "1.4.20"; + version = "1.4.21"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-Ncx94X492spHQ4Y0ZEiPjIKoOsGzdk/d1/QjiBQ1v0s="; + sha256 = "sha256-TKDR4NATZv4+DPSQ2I0VTfURJ4+1lWOHE748pnVmWFU="; }; nativeBuildInputs = [ From 4d4cbee23d29b0f12a1f5c9cf0792f166a86352d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Jan 2025 16:21:19 +0000 Subject: [PATCH 05/71] serfdom: 0.10.1 -> 0.10.2 --- pkgs/by-name/se/serfdom/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/serfdom/package.nix b/pkgs/by-name/se/serfdom/package.nix index 1abb60f71748..274e79664648 100644 --- a/pkgs/by-name/se/serfdom/package.nix +++ b/pkgs/by-name/se/serfdom/package.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "serf"; - version = "0.10.1"; + version = "0.10.2"; rev = "a2bba5676d6e37953715ea10e583843793a0c507"; src = fetchFromGitHub { owner = "hashicorp"; repo = "serf"; rev = "v${version}"; - sha256 = "sha256-8cWSWRfge5UjNzgA1Qp4AzbgIfGBum/ghHcB8H8MyCE="; + sha256 = "sha256-8kMQu3UYGihlYW7rdh1IkvRR/FgFK/N+iay0y6qOOWE="; }; - vendorHash = "sha256-6Kw0Co6vaBNkvVyK64wo9/39YF5UwuJg04EPoYwCP1c="; + vendorHash = "sha256-aNAbE8yFp8HUgdRtt/3eVz4VAaqSTPB4XKKLl1o7YRc="; subPackages = [ "cmd/serf" ]; From 057d0c76dcfe9110f40af33db83aabd0050fbd94 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 15 Jan 2025 22:45:08 +0100 Subject: [PATCH 06/71] lomiri.lomiri-telephony-service: 0.5.3 -> 0.6.0, rename from lomiri.telephony-service --- .../services/desktop-managers/lomiri.nix | 4 +- nixos/tests/ayatana-indicators.nix | 2 +- .../lomiri/applications/lomiri/default.nix | 8 +-- pkgs/desktops/lomiri/default.nix | 3 +- .../default.nix | 65 ++++--------------- 5 files changed, 21 insertions(+), 61 deletions(-) rename pkgs/desktops/lomiri/services/{telephony-service => lomiri-telephony-service}/default.nix (67%) diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix index 6ef9c1a4e01a..8f04e33291ac 100644 --- a/nixos/modules/services/desktop-managers/lomiri.nix +++ b/nixos/modules/services/desktop-managers/lomiri.nix @@ -100,13 +100,13 @@ in lomiri-session # wrappers to properly launch the session lomiri-sounds lomiri-system-settings + lomiri-telephony-service lomiri-terminal-app lomiri-thumbnailer lomiri-url-dispatcher mediascanner2 # TODO possibly needs to be kicked off by graphical-session.target morph-browser qtmir # not having its desktop file for Xwayland available causes any X11 application to crash the session - telephony-service teleports ]); }; @@ -152,7 +152,7 @@ in ) ++ ( with pkgs.lomiri; - [ telephony-service ] + [ lomiri-telephony-service ] ++ lib.optionals config.networking.networkmanager.enable [ lomiri-indicator-network ] ); }; diff --git a/nixos/tests/ayatana-indicators.nix b/nixos/tests/ayatana-indicators.nix index 12223e52a0c5..3c11740ae036 100644 --- a/nixos/tests/ayatana-indicators.nix +++ b/nixos/tests/ayatana-indicators.nix @@ -43,7 +43,7 @@ in ] ++ (with pkgs.lomiri; [ lomiri-indicator-network - telephony-service + lomiri-telephony-service ]); }; diff --git a/pkgs/desktops/lomiri/applications/lomiri/default.nix b/pkgs/desktops/lomiri/applications/lomiri/default.nix index f4d14750e6c7..2b953f428940 100644 --- a/pkgs/desktops/lomiri/applications/lomiri/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri/default.nix @@ -35,12 +35,13 @@ lomiri-app-launch, lomiri-download-manager, lomiri-indicator-network, - lomiri-ui-toolkit, + lomiri-notifications, lomiri-settings-components, lomiri-system-settings-unwrapped, lomiri-schemas, - lomiri-notifications, + lomiri-telephony-service, lomiri-thumbnailer, + lomiri-ui-toolkit, maliit-keyboard, mir_2_15, nixos-icons, @@ -55,7 +56,6 @@ qtmir, qtmultimedia, qtsvg, - telephony-service, wrapGAppsHook3, wrapQtAppsHook, xwayland, @@ -211,9 +211,9 @@ stdenv.mkDerivation (finalAttrs: { hfd-service lomiri-notifications lomiri-settings-components + lomiri-telephony-service lomiri-thumbnailer qtmultimedia - telephony-service ]; nativeCheckInputs = [ (python3.withPackages (ps: with ps; [ python-dbusmock ])) ]; diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix index 0f60cdb9cac9..bd26af310969 100644 --- a/pkgs/desktops/lomiri/default.nix +++ b/pkgs/desktops/lomiri/default.nix @@ -63,10 +63,10 @@ let lomiri-history-service = callPackage ./services/lomiri-history-service { }; lomiri-indicator-network = callPackage ./services/lomiri-indicator-network { }; lomiri-polkit-agent = callPackage ./services/lomiri-polkit-agent { }; + lomiri-telephony-service = callPackage ./services/lomiri-telephony-service { }; lomiri-thumbnailer = callPackage ./services/lomiri-thumbnailer { }; lomiri-url-dispatcher = callPackage ./services/lomiri-url-dispatcher { }; mediascanner2 = callPackage ./services/mediascanner2 { }; - telephony-service = callPackage ./services/telephony-service { }; }; in lib.makeScope libsForQt5.newScope packages @@ -74,4 +74,5 @@ lib.makeScope libsForQt5.newScope packages content-hub = lib.warnOnInstantiate "`content-hub` was renamed to `lomiri-content-hub`." pkgs.lomiri.lomiri-content-hub; # Added on 2024-09-11 history-service = lib.warnOnInstantiate "`history-service` was renamed to `lomiri-history-service`." pkgs.lomiri.lomiri-history-service; # Added on 2024-11-11 lomiri-system-settings-security-privacy = lib.warnOnInstantiate "`lomiri-system-settings-security-privacy` upstream was merged into `lomiri-system-settings`. Please use `pkgs.lomiri.lomiri-system-settings-unwrapped` if you need to directly access the plugins that belonged to this project." pkgs.lomiri.lomiri-system-settings-unwrapped; # Added on 2024-08-08 + telephony-service = lib.warnOnInstantiate "`telephony-service` was renamed to `lomiri-telephony-service`." pkgs.lomiri.lomiri-telephony-service; # Adder on 2025-01-15 } diff --git a/pkgs/desktops/lomiri/services/telephony-service/default.nix b/pkgs/desktops/lomiri/services/lomiri-telephony-service/default.nix similarity index 67% rename from pkgs/desktops/lomiri/services/telephony-service/default.nix rename to pkgs/desktops/lomiri/services/lomiri-telephony-service/default.nix index 1c43a37dd4d0..d89e51c193bc 100644 --- a/pkgs/desktops/lomiri/services/telephony-service/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-telephony-service/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitLab, - fetchpatch, gitUpdater, nixosTests, runCommand, @@ -43,56 +42,16 @@ let "--replace-fail \"\\\${DBUS_SERVICES_DIR}/${name}\" \"${pkg}/share/dbus-1/services/${name}\""; in stdenv.mkDerivation (finalAttrs: { - pname = "telephony-service"; - version = "0.5.3"; + pname = "lomiri-telephony-service"; + version = "0.6.0"; src = fetchFromGitLab { owner = "ubports"; - repo = "development/core/telephony-service"; - rev = finalAttrs.version; - hash = "sha256-eLGwAJmBDDvSODQUNr/zcPA/0DdXtVBiS7vg+iIYPDo="; + repo = "development/core/lomiri-telephony-service"; + tag = finalAttrs.version; + hash = "sha256-vEMTnflHszgANSZHcVGx1goMWVe7/6eZLYCIxq8aMt4="; }; - patches = [ - # Remove when https://gitlab.com/ubports/development/core/telephony-service/-/merge_requests/90 merged & in release - (fetchpatch { - name = "0001-lomiri-telephony-service-CMakeLists-Make-tests-optional.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/9a8297bcf9b34d77ffdae3dfe4ad2636022976fb.patch"; - hash = "sha256-Za4ZGKnw9iz2RP1LzLhKrEJ1vLUufWk8J07LmWDW40E="; - }) - - # Remove when version > 0.5.3 - (fetchpatch { - name = "0002-lomiri-telephony-service-Fix-gettext-funcs-in-wrong-namespace.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/18e0ba8e025b097eef1217d97d98ef4a4940fe84.patch"; - hash = "sha256-vOIy+B/OQeccsVn4pXsnr8LYyEapqbebW1I6dBg5u2c="; - }) - - # Remove when version > 0.5.3 - (fetchpatch { - name = "0003-lomiri-telephony-service-Handle-renamed-history-service.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/3a387670ed13041db069068292b1f41229e79583.patch"; - hash = "sha256-b7gxzr6Mmtogclq3hR7a/zl+816H2wmJqv3oHjUJggw="; - }) - - # Remove when version > 0.5.3 - # Patched to be compatible with pre-rename code - (runCommand "0004-lomiri-telephony-service-Fix-NotificationInterface-regeneration-backported.patch" - { - src = fetchpatch { - name = "0004-lomiri-telephony-service-Fix-NotificationInterface-regeneration.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/9533ce1a9495e5c11e9b78fc0166e903e19519b4.patch"; - hash = "sha256-3rsZ08bz2CxKpcwYWCCd6f7gJ22v9jl7Lg7JPnWz50A="; - }; - } - '' - cp $src $out - substituteInPlace $out \ - --replace-fail 'lomiritelephony' 'telephony' - '' - ) - ]; - postPatch = '' # Queries qmake for the QML installation path, which returns a reference to Qt5's build directory @@ -226,8 +185,8 @@ stdenv.mkDerivation (finalAttrs: { } # These SystemD services are referenced by the installed D-Bus services, but not part of the installation. Why? - for service in telephony-service-{approver,indicator}; do - install -Dm644 ../debian/telephony-service."$service".user.service $out/lib/systemd/user/"$service".service + for service in lomiri-telephony-service-approver lomiri-indicator-telephony-service; do + install -Dm644 ../debian/lomiri-telephony-service."$service".user.service $out/lib/systemd/user/"$service".service # ofono-setup.service would be provided by ubuntu-touch-session, we don't plan to package it # Doesn't make sense to provide on non-Lomiri @@ -235,17 +194,17 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail '/usr' "$out" \ --replace-warn 'Requires=ofono-setup.service' "" \ --replace-warn 'After=ofono-setup.service' "" \ - --replace-warn 'WantedBy=ayatana-indicators.target' 'WantedBy=lomiri-indicators.target' + --replace-warn 'ayatana-indicators.target' 'lomiri-indicators.target' done # Parses the call & SMS indicator desktop files & tries to find its own executable in PATH - wrapProgram $out/bin/telephony-service-indicator \ + wrapProgram $out/bin/lomiri-indicator-telephony-service \ --prefix PATH : "$out/bin" ''; passthru = { ayatana-indicators = { - telephony-service-indicator = [ "lomiri" ]; + lomiri-indicator-telephony-service = [ "lomiri" ]; }; tests.vm = nixosTests.ayatana-indicators; updateScript = gitUpdater { }; @@ -253,8 +212,8 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Backend dispatcher service for various mobile phone related operations"; - homepage = "https://gitlab.com/ubports/development/core/telephony-service"; - changelog = "https://gitlab.com/ubports/development/core/telephony-service/-/blob/${finalAttrs.version}/ChangeLog"; + homepage = "https://gitlab.com/ubports/development/core/lomiri-telephony-service"; + changelog = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/blob/${finalAttrs.version}/ChangeLog"; license = lib.licenses.gpl3Only; maintainers = lib.teams.lomiri.members; platforms = lib.platforms.linux; From dd97fe94e0556f9e19b851b162871a28102e1434 Mon Sep 17 00:00:00 2001 From: Wilson Bondanza Date: Thu, 16 Jan 2025 13:58:23 +0100 Subject: [PATCH 07/71] vue-typescript-plugin: init at 2.2.0 --- maintainers/maintainer-list.nix | 11 + .../vue-typescript-plugin/package-lock.json | 269 ++++++++++++++++++ .../vu/vue-typescript-plugin/package.nix | 27 ++ .../vu/vue-typescript-plugin/update.sh | 30 ++ pkgs/development/node-packages/aliases.nix | 1 + 5 files changed, 338 insertions(+) create mode 100644 pkgs/by-name/vu/vue-typescript-plugin/package-lock.json create mode 100644 pkgs/by-name/vu/vue-typescript-plugin/package.nix create mode 100755 pkgs/by-name/vu/vue-typescript-plugin/update.sh diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e7a296f22e21..d1eb04943682 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -24443,6 +24443,17 @@ github = "waynr"; githubId = 1441126; }; + wbondanza_devoteam = { + name = "Wilson Bondanza"; + email = "wilson.bondanza@devoteam.com"; + github = "wbondanza-devoteam"; + githubId = 195292349; + keys = [ + { + fingerprint = "61F3 9F46 606D 655F 4E8D 6C82 B623 05E6 1563 8A9E"; + } + ]; + }; wchresta = { email = "wchresta.nix@chrummibei.ch"; github = "wchresta"; diff --git a/pkgs/by-name/vu/vue-typescript-plugin/package-lock.json b/pkgs/by-name/vu/vue-typescript-plugin/package-lock.json new file mode 100644 index 000000000000..c7c33b1b191b --- /dev/null +++ b/pkgs/by-name/vu/vue-typescript-plugin/package-lock.json @@ -0,0 +1,269 @@ +{ + "name": "@vue/typescript-plugin", + "version": "2.2.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "@vue/typescript-plugin", + "version": "2.2.0", + "license": "MIT", + "dependencies": { + "@volar/typescript": "~2.4.11", + "@vue/language-core": "2.2.0", + "@vue/shared": "^3.5.0" + }, + "devDependencies": { + "@types/node": "latest" + } + }, + "node_modules/@babel/helper-string-parser": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", + "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", + "license": "MIT", + "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/@babel/parser": { + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.5.tgz", + "integrity": "sha512-SRJ4jYmXRqV1/Xc+TIVG84WjHBXKlxO9sHQnA2Pf12QQEAp1LOh6kDzNHXcUnbH1QI0FDoPPVOt+vyUDucxpaw==", + "license": "MIT", + "dependencies": { + "@babel/types": "^7.26.5" + }, + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/types": { + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.5.tgz", + "integrity": "sha512-L6mZmwFDK6Cjh1nRCLXpa6no13ZIioJDz7mdkzHv399pThrTa/k0nUlNaenOeh2kWu/iaOQYElEpKPUswUa9Vg==", + "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@types/node": { + "version": "22.10.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.6.tgz", + "integrity": "sha512-qNiuwC4ZDAUNcY47xgaSuS92cjf8JbSUoaKS77bmLG1rU7MlATVSiw/IlrjtIyyskXBZ8KkNfjK/P5na7rgXbQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "node_modules/@volar/language-core": { + "version": "2.4.11", + "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.11.tgz", + "integrity": "sha512-lN2C1+ByfW9/JRPpqScuZt/4OrUUse57GLI6TbLgTIqBVemdl1wNcZ1qYGEo2+Gw8coYLgCy7SuKqn6IrQcQgg==", + "license": "MIT", + "dependencies": { + "@volar/source-map": "2.4.11" + } + }, + "node_modules/@volar/source-map": { + "version": "2.4.11", + "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.11.tgz", + "integrity": "sha512-ZQpmafIGvaZMn/8iuvCFGrW3smeqkq/IIh9F1SdSx9aUl0J4Iurzd6/FhmjNO5g2ejF3rT45dKskgXWiofqlZQ==", + "license": "MIT" + }, + "node_modules/@volar/typescript": { + "version": "2.4.11", + "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.11.tgz", + "integrity": "sha512-2DT+Tdh88Spp5PyPbqhyoYavYCPDsqbHLFwcUI9K1NlY1YgUJvujGdrqUp0zWxnW7KWNTr3xSpMuv2WnaTKDAw==", + "license": "MIT", + "dependencies": { + "@volar/language-core": "2.4.11", + "path-browserify": "^1.0.1", + "vscode-uri": "^3.0.8" + } + }, + "node_modules/@vue/compiler-core": { + "version": "3.5.13", + "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.13.tgz", + "integrity": "sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==", + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.25.3", + "@vue/shared": "3.5.13", + "entities": "^4.5.0", + "estree-walker": "^2.0.2", + "source-map-js": "^1.2.0" + } + }, + "node_modules/@vue/compiler-dom": { + "version": "3.5.13", + "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.13.tgz", + "integrity": "sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==", + "license": "MIT", + "dependencies": { + "@vue/compiler-core": "3.5.13", + "@vue/shared": "3.5.13" + } + }, + "node_modules/@vue/compiler-vue2": { + "version": "2.7.16", + "resolved": "https://registry.npmjs.org/@vue/compiler-vue2/-/compiler-vue2-2.7.16.tgz", + "integrity": "sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==", + "license": "MIT", + "dependencies": { + "de-indent": "^1.0.2", + "he": "^1.2.0" + } + }, + "node_modules/@vue/language-core": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.2.0.tgz", + "integrity": "sha512-O1ZZFaaBGkKbsRfnVH1ifOK1/1BUkyK+3SQsfnh6PmMmD4qJcTU8godCeA96jjDRTL6zgnK7YzCHfaUlH2r0Mw==", + "license": "MIT", + "dependencies": { + "@volar/language-core": "~2.4.11", + "@vue/compiler-dom": "^3.5.0", + "@vue/compiler-vue2": "^2.7.16", + "@vue/shared": "^3.5.0", + "alien-signals": "^0.4.9", + "minimatch": "^9.0.3", + "muggle-string": "^0.4.1", + "path-browserify": "^1.0.1" + }, + "peerDependencies": { + "typescript": "*" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@vue/shared": { + "version": "3.5.13", + "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.13.tgz", + "integrity": "sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==", + "license": "MIT" + }, + "node_modules/alien-signals": { + "version": "0.4.14", + "resolved": "https://registry.npmjs.org/alien-signals/-/alien-signals-0.4.14.tgz", + "integrity": "sha512-itUAVzhczTmP2U5yX67xVpsbbOiquusbWVyA9N+sy6+r6YVbFkahXvNCeEPWEOMhwDYwbVbGHFkVL03N9I5g+Q==", + "license": "MIT" + }, + "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/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/de-indent": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz", + "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==", + "license": "MIT" + }, + "node_modules/entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/estree-walker": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", + "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", + "license": "MIT" + }, + "node_modules/he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "license": "MIT", + "bin": { + "he": "bin/he" + } + }, + "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/muggle-string": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/muggle-string/-/muggle-string-0.4.1.tgz", + "integrity": "sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==", + "license": "MIT" + }, + "node_modules/path-browserify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", + "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==", + "license": "MIT" + }, + "node_modules/source-map-js": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, + "node_modules/vscode-uri": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz", + "integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==", + "license": "MIT" + } + } +} diff --git a/pkgs/by-name/vu/vue-typescript-plugin/package.nix b/pkgs/by-name/vu/vue-typescript-plugin/package.nix new file mode 100644 index 000000000000..845be9488afc --- /dev/null +++ b/pkgs/by-name/vu/vue-typescript-plugin/package.nix @@ -0,0 +1,27 @@ +{ + lib, + buildNpmPackage, + fetchurl, +}: +buildNpmPackage rec { + pname = "vue-typescript-plugin"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/typescript-plugin/-/typescript-plugin-${version}.tgz"; + hash = "sha256-WzbJ3ERFZ4T22RNSYXAVTWb+6Q3WEPYimFzkugNao+4="; + }; + npmDepsHash = "sha256-yzoeV5ZRvRu1ADdGJ9DdolWOQvGF+FIdn5J5G/KItk4="; + postPatch = '' + ln -s ${./package-lock.json} package-lock.json + ''; + dontNpmBuild = true; + passthru.updateScript = ./update.sh; + meta = { + description = "Official Vue.js typescript plugin"; + homepage = "https://github.com/vuejs/language-tools#readme"; + changelog = "https://github.com/vuejs/language-tools/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ wbondanza_devoteam ]; + mainProgram = "vue-typescript-plugin"; + }; +} diff --git a/pkgs/by-name/vu/vue-typescript-plugin/update.sh b/pkgs/by-name/vu/vue-typescript-plugin/update.sh new file mode 100755 index 000000000000..58544a7e1d07 --- /dev/null +++ b/pkgs/by-name/vu/vue-typescript-plugin/update.sh @@ -0,0 +1,30 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p gnused nix nodejs prefetch-npm-deps wget + +set -euo pipefail +pushd "$(dirname "${BASH_SOURCE[0]}")" + +version=$(npm view @vue/language-server version) +tarball="typescript-plugin-$version.tgz" +url="https://registry.npmjs.org/@vue/typescript-plugin/-/$tarball" + +if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then + echo "Already up to date!" + exit 0 +fi + +sed -i 's#version = "[^"]*"#version = "'"$version"'"#' package.nix + +sha256=$(nix-prefetch-url "$url") +src_hash=$(nix-hash --to-sri --type sha256 "$sha256") +sed -i 's#hash = "[^"]*"#hash = "'"$src_hash"'"#' package.nix + +rm -f package-lock.json package.json *.tgz +wget "$url" +tar xf "$tarball" --strip-components=1 package/package.json +npm i --package-lock-only --ignore-scripts +npm_hash=$(prefetch-npm-deps package-lock.json) +sed -i 's#npmDepsHash = "[^"]*"#npmDepsHash = "'"$npm_hash"'"#' package.nix +rm -f package.json *.tgz + +popd diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index d187b9ee4378..a08d86f73f76 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -50,6 +50,7 @@ mapAliases { "@nestjs/cli" = pkgs.nest-cli; # Added 2023-05-06 "@tailwindcss/language-server" = pkgs.tailwindcss-language-server; # added 2024-01-22 "@volar/vue-language-server" = pkgs.vue-language-server; # added 2024-06-15 + "@volar/vue-typescript-plugin" = pkgs.vue-typescript-plugin; # added 2025-01-16 "@vue/language-server" = pkgs.vue-language-server; # added 2024-06-15 "@withgraphite/graphite-cli" = pkgs.graphite-cli; # added 2024-01-25 "@zwave-js/server" = pkgs.zwave-js-server; # Added 2023-09-09 From a19575aa07d8142555e273969ec00ec7e3319806 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Jan 2025 14:35:36 +0000 Subject: [PATCH 08/71] openvas-scanner: 23.14.0 -> 23.15.0 --- pkgs/by-name/op/openvas-scanner/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openvas-scanner/package.nix b/pkgs/by-name/op/openvas-scanner/package.nix index 9769b3c7fa35..86e54ac70aaf 100644 --- a/pkgs/by-name/op/openvas-scanner/package.nix +++ b/pkgs/by-name/op/openvas-scanner/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "openvas-scanner"; - version = "23.14.0"; + version = "23.15.0"; src = fetchFromGitHub { owner = "greenbone"; repo = "openvas-scanner"; tag = "v${version}"; - hash = "sha256-1IesoAK5Aq/JlM83WT0dodwmUvWv6RDqTyUg6LURle4="; + hash = "sha256-LjZZYIA0Qkuheb8ZAPBuiy5GgjOgCfJ0D/YM03zTcW0="; }; nativeBuildInputs = [ From 7c469273d4b74b590257213738d2c1f1799d01e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Jan 2025 15:11:22 +0000 Subject: [PATCH 09/71] tidb: 8.5.0 -> 8.5.1 --- pkgs/by-name/ti/tidb/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ti/tidb/package.nix b/pkgs/by-name/ti/tidb/package.nix index 6a1bf3cde948..caa55285b65a 100644 --- a/pkgs/by-name/ti/tidb/package.nix +++ b/pkgs/by-name/ti/tidb/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "tidb"; - version = "8.5.0"; + version = "8.5.1"; src = fetchFromGitHub { owner = "pingcap"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mrR4Rk+p1JaimvBVyEHc+syQwkvRDjQfGCuL5H0GqG8="; + sha256 = "sha256-lJrW61FARZO1ll7Ln9mgCTZxGhcMlBaL6AeAVGgExIA="; }; - vendorHash = "sha256-yV97PyVkHWQSj+nFuxCvKkAbdwfszM1gslOvi8iihaE="; + vendorHash = "sha256-N8wTUPUPOR2Bc5CcPgNktcZpaxGL2WncJc4w0RwqVDk="; ldflags = [ "-X github.com/pingcap/tidb/pkg/parser/mysql.TiDBReleaseVersion=${version}" From 80d9c0daf35233d48620783817aef0d224e64910 Mon Sep 17 00:00:00 2001 From: Rishik Yalamanchili <73787402+Rishik-Y@users.noreply.github.com> Date: Sun, 19 Jan 2025 15:48:04 +0530 Subject: [PATCH 10/71] netbird: 0.35.2 -> 0.36.3 --- pkgs/tools/networking/netbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index 16504673e8e5..5ff99136d655 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -31,13 +31,13 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.35.2"; + version = "0.36.3"; src = fetchFromGitHub { owner = "netbirdio"; repo = "netbird"; rev = "v${version}"; - hash = "sha256-CvKJiv3CyCRp0wyH+OZejOChcumnMOrA7o9wL4ElJio="; + hash = "sha256-ZAKVjBjffinOyHhzln/ny7tooZwtKHfMEDb/Uy0k6Gw="; }; vendorHash = "sha256-CgfZZOiFDLf6vCbzovpwzt7FlO9BnzNSdR8e5U+xCDQ="; From 8f860dcd1725794be7949019f1f7522c0f5c2f0b Mon Sep 17 00:00:00 2001 From: Rishik Yalamanchili <73787402+Rishik-Y@users.noreply.github.com> Date: Sun, 19 Jan 2025 15:53:11 +0530 Subject: [PATCH 11/71] netbird: fix formatting --- pkgs/tools/networking/netbird/default.nix | 134 ++++++++++++---------- 1 file changed, 74 insertions(+), 60 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index 5ff99136d655..37d867e827d4 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -1,33 +1,37 @@ -{ stdenv -, lib -, nixosTests -, nix-update-script -, buildGoModule -, fetchFromGitHub -, installShellFiles -, pkg-config -, gtk3 -, libayatana-appindicator -, libX11 -, libXcursor -, libXxf86vm -, Cocoa -, IOKit -, Kernel -, UserNotifications -, WebKit -, ui ? false -, netbird-ui +{ + stdenv, + lib, + nixosTests, + nix-update-script, + buildGoModule, + fetchFromGitHub, + installShellFiles, + pkg-config, + gtk3, + libayatana-appindicator, + libX11, + libXcursor, + libXxf86vm, + Cocoa, + IOKit, + Kernel, + UserNotifications, + WebKit, + ui ? false, + netbird-ui, }: let modules = - if ui then { - "client/ui" = "netbird-ui"; - } else { - client = "netbird"; - management = "netbird-mgmt"; - signal = "netbird-signal"; - }; + if ui then + { + "client/ui" = "netbird-ui"; + } + else + { + client = "netbird"; + management = "netbird-mgmt"; + signal = "netbird-signal"; + }; in buildGoModule rec { pname = "netbird"; @@ -40,23 +44,25 @@ buildGoModule rec { hash = "sha256-ZAKVjBjffinOyHhzln/ny7tooZwtKHfMEDb/Uy0k6Gw="; }; - vendorHash = "sha256-CgfZZOiFDLf6vCbzovpwzt7FlO9BnzNSdR8e5U+xCDQ="; + vendorHash = "sha256-xZz2JkD3yD7tuXVFlMm2g1hRBItkGmO9OvnLdUfqai0="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; - buildInputs = lib.optionals (stdenv.hostPlatform.isLinux && ui) [ - gtk3 - libayatana-appindicator - libX11 - libXcursor - libXxf86vm - ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && ui) [ - Cocoa - IOKit - Kernel - UserNotifications - WebKit - ]; + buildInputs = + lib.optionals (stdenv.hostPlatform.isLinux && ui) [ + gtk3 + libayatana-appindicator + libX11 + libXcursor + libXxf86vm + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && ui) [ + Cocoa + IOKit + Kernel + UserNotifications + WebKit + ]; subPackages = lib.attrNames modules; @@ -78,26 +84,31 @@ buildGoModule rec { --replace-fail 'unix:///var/run/netbird.sock' 'unix:///var/run/netbird/sock' ''; - postInstall = lib.concatStringsSep "\n" - (lib.mapAttrsToList - (module: binary: '' - mv $out/bin/${lib.last (lib.splitString "/" module)} $out/bin/${binary} - '' + lib.optionalString (!ui) '' - installShellCompletion --cmd ${binary} \ - --bash <($out/bin/${binary} completion bash) \ - --fish <($out/bin/${binary} completion fish) \ - --zsh <($out/bin/${binary} completion zsh) - '') - modules) + lib.optionalString (stdenv.hostPlatform.isLinux && ui) '' - mkdir -p $out/share/pixmaps - cp $src/client/ui/netbird-systemtray-connected.png $out/share/pixmaps/netbird.png + postInstall = + lib.concatStringsSep "\n" ( + lib.mapAttrsToList ( + module: binary: + '' + mv $out/bin/${lib.last (lib.splitString "/" module)} $out/bin/${binary} + '' + + lib.optionalString (!ui) '' + installShellCompletion --cmd ${binary} \ + --bash <($out/bin/${binary} completion bash) \ + --fish <($out/bin/${binary} completion fish) \ + --zsh <($out/bin/${binary} completion zsh) + '' + ) modules + ) + + lib.optionalString (stdenv.hostPlatform.isLinux && ui) '' + mkdir -p $out/share/pixmaps + cp $src/client/ui/netbird-systemtray-connected.png $out/share/pixmaps/netbird.png - mkdir -p $out/share/applications - cp $src/client/ui/netbird.desktop $out/share/applications/netbird.desktop + mkdir -p $out/share/applications + cp $src/client/ui/netbird.desktop $out/share/applications/netbird.desktop - substituteInPlace $out/share/applications/netbird.desktop \ - --replace-fail "Exec=/usr/bin/netbird-ui" "Exec=$out/bin/netbird-ui" - ''; + substituteInPlace $out/share/applications/netbird.desktop \ + --replace-fail "Exec=/usr/bin/netbird-ui" "Exec=$out/bin/netbird-ui" + ''; passthru = { tests.netbird = nixosTests.netbird; @@ -110,7 +121,10 @@ buildGoModule rec { changelog = "https://github.com/netbirdio/netbird/releases/tag/v${version}"; description = "Connect your devices into a single secure private WireGuard®-based mesh network with SSO/MFA and simple access controls"; license = licenses.bsd3; - maintainers = with maintainers; [ vrifox saturn745 ]; + maintainers = with maintainers; [ + vrifox + saturn745 + ]; mainProgram = "netbird"; }; } From 4bcf8859f21b2a85a978abafdae1a3c29ad30562 Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 8 Jan 2025 15:46:19 +0100 Subject: [PATCH 12/71] linux_rpi: ignoreConfigErrors Since 37789d9eaa566f5d0bdeaaecd9cb3b0991dab6e9 the ignoreConfigErrors is no longer enabled on aarch64, which fails the rpi kernel build Change-Id: I1f9e21badf53fbfdcd3da561f7c398a353c4e9a9 --- pkgs/os-specific/linux/kernel/linux-rpi.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index 247da436949c..fb229afe8314 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -54,6 +54,7 @@ lib.overrideDerivation platforms = with lib.platforms; arm ++ aarch64; hydraPlatforms = [ "aarch64-linux" ]; }; + ignoreConfigErrors = true; } // (args.argsOverride or { }) )) From 58855abbc56fccad9f9bcc88ca9182be9f2dd1e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Jan 2025 23:17:36 +0000 Subject: [PATCH 13/71] cnquery: 11.36.0 -> 11.37.1 --- pkgs/by-name/cn/cnquery/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cn/cnquery/package.nix b/pkgs/by-name/cn/cnquery/package.nix index 869ce53a5255..36158765e733 100644 --- a/pkgs/by-name/cn/cnquery/package.nix +++ b/pkgs/by-name/cn/cnquery/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnquery"; - version = "11.36.0"; + version = "11.37.1"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; tag = "v${version}"; - hash = "sha256-LISy9xMAv9Wal+iRF9qoCLrQnq0r4HOqCir/w0uTrAA="; + hash = "sha256-H8qilsIlXA9NdPrdJYmkX+Ccc5fJHcEZThzPUo6Vi4M="; }; subPackages = [ "apps/cnquery" ]; - vendorHash = "sha256-JweIdmjnybaOyL5GOxCmP8TpyMYTG9qD5aFbabAJ4h8="; + vendorHash = "sha256-rqWGaENzFoC4+VhH1FRX9veLOXxXEAxdhcvrd2OoZY8="; ldflags = [ "-w" From 86d4957f5de8f00709e971eb6ffcd828e8609782 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 20 Jan 2025 08:39:35 +0100 Subject: [PATCH 14/71] python312Packages.jax: remove unneeded IOKit from buildInputs --- .../python-modules/jaxlib/default.nix | 51 +++++++++---------- pkgs/top-level/python-packages.nix | 3 +- 2 files changed, 25 insertions(+), 29 deletions(-) diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index de7fea0a26e8..137d9b39e510 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -15,7 +15,7 @@ cython, fetchFromGitHub, git, - IOKit, + darwin, jsoncpp, nsync, openssl, @@ -242,25 +242,22 @@ let which ] ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [ cctools ]; - buildInputs = - [ - curl - double-conversion - giflib - jsoncpp - libjpeg_turbo - numpy - openssl - pkgs.flatbuffers - pkgs.protobuf - pybind11 - scipy - six - snappy - zlib - ] - ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [ IOKit ] - ++ lib.optionals (!effectiveStdenv.hostPlatform.isDarwin) [ nsync ]; + buildInputs = [ + curl + double-conversion + giflib + jsoncpp + libjpeg_turbo + numpy + openssl + pkgs.flatbuffers + pkgs.protobuf + pybind11 + scipy + six + snappy + zlib + ] ++ lib.optionals (!effectiveStdenv.hostPlatform.isDarwin) [ nsync ]; # We don't want to be quite so picky regarding bazel version postPatch = '' @@ -393,12 +390,12 @@ let } ).${effectiveStdenv.system} or (throw "jaxlib: unsupported system: ${effectiveStdenv.system}"); - # Non-reproducible fetch https://github.com/NixOS/nixpkgs/issues/321920#issuecomment-2184940546 - preInstall = '' - cat << \EOF > "$bazelOut/external/go_sdk/versions.json" - [] - EOF - ''; + # Non-reproducible fetch https://github.com/NixOS/nixpkgs/issues/321920#issuecomment-2184940546 + preInstall = '' + cat << \EOF > "$bazelOut/external/go_sdk/versions.json" + [] + EOF + ''; }; buildAttrs = { @@ -415,7 +412,7 @@ let # are not available yet. Framework search paths aren't added by bintools # hook. See https://github.com/NixOS/nixpkgs/pull/41914. preBuild = lib.optionalString effectiveStdenv.hostPlatform.isDarwin '' - export NIX_LDFLAGS+=" -F${IOKit}/Library/Frameworks" + export NIX_LDFLAGS+=" -F${darwin.apple_sdk.frameworks.IOKit}/Library/Frameworks" substituteInPlace ../output/external/rules_cc/cc/private/toolchain/osx_cc_wrapper.sh.tpl \ --replace "/usr/bin/install_name_tool" "${cctools}/bin/install_name_tool" substituteInPlace ../output/external/rules_cc/cc/private/toolchain/unix_cc_configure.bzl \ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5a8874b6eeb7..954b98820193 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6596,10 +6596,9 @@ self: super: with self; { jaxlib-bin = callPackage ../development/python-modules/jaxlib/bin.nix { }; - jaxlib-build = callPackage ../development/python-modules/jaxlib rec { + jaxlib-build = callPackage ../development/python-modules/jaxlib { # Some platforms don't have `cudaSupport` defined, hence the need for 'or false'. inherit (pkgs.config) cudaSupport; - IOKit = pkgs.darwin.apple_sdk_11_0.IOKit; }; jaxlib = jaxlib-bin; From a0c6398ba0c71dc26b393a71abda5772c12b96db Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 20 Jan 2025 08:40:44 +0100 Subject: [PATCH 15/71] python312Packages.jax: remove unneeded cudaSupport in python-packages.nix --- pkgs/top-level/python-packages.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 954b98820193..8b5d19a60cb0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6596,10 +6596,7 @@ self: super: with self; { jaxlib-bin = callPackage ../development/python-modules/jaxlib/bin.nix { }; - jaxlib-build = callPackage ../development/python-modules/jaxlib { - # Some platforms don't have `cudaSupport` defined, hence the need for 'or false'. - inherit (pkgs.config) cudaSupport; - }; + jaxlib-build = callPackage ../development/python-modules/jaxlib { }; jaxlib = jaxlib-bin; From 8ed61e2dabd69c1e6fd6ae6ba4136627db68cf80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 19 Nov 2024 15:39:58 +0000 Subject: [PATCH 16/71] python3Packages.airportsdata: init at 20241001 --- .../python-modules/airportsdata/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/airportsdata/default.nix diff --git a/pkgs/development/python-modules/airportsdata/default.nix b/pkgs/development/python-modules/airportsdata/default.nix new file mode 100644 index 000000000000..1e9901887bb7 --- /dev/null +++ b/pkgs/development/python-modules/airportsdata/default.nix @@ -0,0 +1,32 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "airportsdata"; + version = "20241001"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-+gvRQ7T0vjVXy4kvoGEu8hD9kakr1yC02CId5Xak+gA="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "airportsdata" ]; + + meta = { + description = "Extensive database of location and timezone data for nearly every operational airport"; + homepage = "https://github.com/mborsetti/airportsdata/"; + changelog = "https://github.com/mborsetti/airportsdata/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c7b19bb4e7c2..2373925f9405 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -27,6 +27,8 @@ self: super: with self; { aafigure = callPackage ../development/python-modules/aafigure { }; + airportsdata = callPackage ../development/python-modules/airportsdata { }; + aardwolf = callPackage ../development/python-modules/aardwolf { }; abjad = callPackage ../development/python-modules/abjad { }; From 8f96962c9d2b83560d9c94bcf7d75597a5ef0040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 19 Nov 2024 15:44:09 +0000 Subject: [PATCH 17/71] python3Packages.outlines-core: init at 0.1.26 --- .../python-modules/outlines-core/Cargo.lock | 1793 +++++++++++++++++ .../python-modules/outlines-core/default.nix | 95 + pkgs/top-level/python-packages.nix | 2 + 3 files changed, 1890 insertions(+) create mode 100644 pkgs/development/python-modules/outlines-core/Cargo.lock create mode 100644 pkgs/development/python-modules/outlines-core/default.nix diff --git a/pkgs/development/python-modules/outlines-core/Cargo.lock b/pkgs/development/python-modules/outlines-core/Cargo.lock new file mode 100644 index 000000000000..abad149b1273 --- /dev/null +++ b/pkgs/development/python-modules/outlines-core/Cargo.lock @@ -0,0 +1,1793 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "bincode" +version = "2.0.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f11ea1a0346b94ef188834a65c068a03aec181c94896d481d7a0a40d85b0ce95" +dependencies = [ + "bincode_derive", + "serde", +] + +[[package]] +name = "bincode_derive" +version = "2.0.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e30759b3b99a1b802a7a3aa21c85c3ded5c28e1c83170d82d70f08bbf7f3e4c" +dependencies = [ + "virtue", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "cc" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" +dependencies = [ + "shlex", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "console" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width 0.1.14", + "windows-sys 0.52.0", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[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", +] + +[[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", +] + +[[package]] +name = "derive_builder" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "derive_builder_macro" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" +dependencies = [ + "derive_builder_core", + "syn", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "esaxx-rs" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" +dependencies = [ + "cc", +] + +[[package]] +name = "fastrand" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" + +[[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 = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "hashbrown" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hf-hub" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b780635574b3d92f036890d8373433d6f9fc7abb320ee42a5c25897fc8ed732" +dependencies = [ + "dirs", + "indicatif", + "log", + "native-tls", + "rand", + "serde", + "serde_json", + "thiserror 1.0.69", + "ureq", +] + +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", +] + +[[package]] +name = "indexmap" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "indicatif" +version = "0.17.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf675b85ed934d3c67b5c5469701eec7db22689d0a2139d856e0925fa28b281" +dependencies = [ + "console", + "number_prefix", + "portable-atomic", + "unicode-width 0.2.0", + "web-time", +] + +[[package]] +name = "indoc" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" + +[[package]] +name = "js-sys" +version = "0.3.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libc" +version = "0.2.164" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "litemap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "macro_rules_attribute" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13" +dependencies = [ + "macro_rules_attribute-proc_macro", + "paste", +] + +[[package]] +name = "macro_rules_attribute-proc_macro" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] +name = "monostate" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d208407d7552cd041d8cdb69a1bc3303e029c598738177a3d87082004dc0e1e" +dependencies = [ + "monostate-impl", + "serde", +] + +[[package]] +name = "monostate-impl" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7ce64b975ed4f123575d11afd9491f2e37bbd5813fbfbc0f09ae1fbddea74e0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "native-tls" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "once_cell" +version = "1.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" + +[[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 = "openssl" +version = "0.10.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "outlines-core" +version = "0.0.0" +dependencies = [ + "bincode", + "hf-hub", + "once_cell", + "pyo3", + "regex", + "rustc-hash", + "serde", + "serde-pyobject", + "serde_json", + "thiserror 2.0.3", + "tokenizers", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pkg-config" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" + +[[package]] +name = "portable-atomic" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" + +[[package]] +name = "ppv-lite86" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "proc-macro2" +version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "pyo3" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f402062616ab18202ae8319da13fa4279883a2b8a9d9f83f20dbade813ce1884" +dependencies = [ + "cfg-if", + "indoc", + "libc", + "memoffset", + "once_cell", + "portable-atomic", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b14b5775b5ff446dd1056212d778012cbe8a0fbffd368029fd9e25b514479c38" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ab5bcf04a2cdcbb50c7d6105de943f543f9ed92af55818fd17b660390fc8636" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-macros" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fd24d897903a9e6d80b968368a34e1525aeb719d568dba8b3d4bfa5dc67d453" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36c011a03ba1e50152b4b394b479826cad97e7a21eb52df179cd91ac411cbfbe" +dependencies = [ + "heck", + "proc-macro2", + "pyo3-build-config", + "quote", + "syn", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-cond" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "059f538b55efd2309c9794130bc149c6a553db90e9d99c2030785c82f0bd7df9" +dependencies = [ + "either", + "itertools 0.11.0", + "rayon", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_users" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +dependencies = [ + "getrandom", + "libredox", + "thiserror 1.0.69", +] + +[[package]] +name = "regex" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustc-hash" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" + +[[package]] +name = "rustix" +version = "0.38.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.23.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f1a745511c54ba6d4465e8d5dfbd81b45791756de28d4981af70d6dca128f1e" +dependencies = [ + "log", + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-pki-types" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" + +[[package]] +name = "rustls-webpki" +version = "0.102.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "schannel" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "serde" +version = "1.0.215" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde-pyobject" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca4b0aad8b225845739a0030a0d5cc2ae949c56a86a7daf9226c7df7c2016d16" +dependencies = [ + "pyo3", + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.215" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.133" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" +dependencies = [ + "indexmap", + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "spm_precompiled" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5851699c4033c63636f7ea4cf7b7c1f1bf06d0cc03cfb42e711de5a5c46cf326" +dependencies = [ + "base64 0.13.1", + "nom", + "serde", + "unicode-segmentation", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "syn" +version = "2.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "tempfile" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" +dependencies = [ + "cfg-if", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "thiserror" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa" +dependencies = [ + "thiserror-impl 2.0.3", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[package]] +name = "tokenizers" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b67c92f6d705e2a1d106fb0b28c696f9074901a9c656ee5d9f5de204c39bf7" +dependencies = [ + "aho-corasick", + "derive_builder", + "esaxx-rs", + "getrandom", + "hf-hub", + "indicatif", + "itertools 0.12.1", + "lazy_static", + "log", + "macro_rules_attribute", + "monostate", + "onig", + "paste", + "rand", + "rayon", + "rayon-cond", + "regex", + "regex-syntax", + "serde", + "serde_json", + "spm_precompiled", + "thiserror 1.0.69", + "unicode-normalization-alignments", + "unicode-segmentation", + "unicode_categories", +] + +[[package]] +name = "unicode-ident" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" + +[[package]] +name = "unicode-normalization-alignments" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f613e4fa046e69818dd287fdc4bc78175ff20331479dab6e1b0f98d57062de" +dependencies = [ + "smallvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + +[[package]] +name = "unicode-width" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + +[[package]] +name = "unicode-width" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" + +[[package]] +name = "unicode_categories" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" + +[[package]] +name = "unindent" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "ureq" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" +dependencies = [ + "base64 0.22.1", + "flate2", + "log", + "native-tls", + "once_cell", + "rustls", + "rustls-pki-types", + "serde", + "serde_json", + "url", + "webpki-roots", +] + +[[package]] +name = "url" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "virtue" +version = "0.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dcc60c0624df774c82a0ef104151231d37da4962957d691c011c852b2473314" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" + +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.26.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + +[[package]] +name = "yoke" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zerofrom" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/pkgs/development/python-modules/outlines-core/default.nix b/pkgs/development/python-modules/outlines-core/default.nix new file mode 100644 index 000000000000..2e39baea6579 --- /dev/null +++ b/pkgs/development/python-modules/outlines-core/default.nix @@ -0,0 +1,95 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + cargo, + pkg-config, + rustPlatform, + rustc, + openssl, + setuptools-rust, + setuptools-scm, + interegular, + jsonschema, + datasets, + numpy, + pytestCheckHook, + pydantic, + scipy, + torch, + transformers, +}: + +buildPythonPackage rec { + pname = "outlines-core"; + version = "0.1.26"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit version; + pname = "outlines_core"; + hash = "sha256-SBxDATQed8yPGDLWFnhK201GG0/sZYeOfA0sunFjoYk="; + }; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + }; + + postPatch = '' + cp --no-preserve=mode ${./Cargo.lock} Cargo.lock + ''; + + nativeBuildInputs = [ + cargo + pkg-config + rustPlatform.cargoSetupHook + rustc + ]; + + buildInputs = [ + openssl.dev + ]; + + build-system = [ + setuptools-rust + setuptools-scm + ]; + + dependencies = [ + interegular + jsonschema + ]; + + optional-dependencies = { + tests = [ + datasets + numpy + pydantic + scipy + torch + transformers + ]; + }; + + nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); + + disabledTests = [ + # Tests that need to download from Hugging Face Hub. + "test_complex_serialization" + "test_create_fsm_index_tokenizer" + "test_reduced_vocabulary_with_rare_tokens" + ]; + + pythonImportsCheck = [ "outlines_core" ]; + + meta = { + description = "Structured text generation (core)"; + homepage = "https://github.com/outlines-dev/outlines-core"; + changelog = "https://github.com/dottxt-ai/outlines-core/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2373925f9405..498ed27317af 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10319,6 +10319,8 @@ self: super: with self; { outlines = callPackage ../development/python-modules/outlines { }; + outlines-core = callPackage ../development/python-modules/outlines-core { }; + overly = callPackage ../development/python-modules/overly { }; overpy = callPackage ../development/python-modules/overpy { }; From 80a7b41060989f30015863490b6fc4d6ec44d1aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20van=20Br=C3=BCgge?= Date: Wed, 8 Jan 2025 18:30:48 +0000 Subject: [PATCH 18/71] polyml,polyml{56,57}: fix build --- pkgs/development/compilers/polyml/5.6.nix | 16 ++++++-- pkgs/development/compilers/polyml/5.7.nix | 16 ++++++-- pkgs/development/compilers/polyml/default.nix | 39 +++++++++++++------ 3 files changed, 51 insertions(+), 20 deletions(-) diff --git a/pkgs/development/compilers/polyml/5.6.nix b/pkgs/development/compilers/polyml/5.6.nix index 1601669673eb..d739f7666935 100644 --- a/pkgs/development/compilers/polyml/5.6.nix +++ b/pkgs/development/compilers/polyml/5.6.nix @@ -14,9 +14,17 @@ stdenv.mkDerivation { pname = "polyml"; inherit version; - prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace configure.ac --replace stdc++ c++ - ''; + postPatch = + '' + substituteInPlace configure.ac \ + --replace-fail 'AC_FUNC_ALLOCA' "AC_FUNC_ALLOCA + AH_TEMPLATE([_Static_assert]) + AC_DEFINE([_Static_assert], [static_assert]) + " + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace configure.ac --replace-fail stdc++ c++ + ''; patches = [ # glibc 2.34 compat @@ -26,7 +34,7 @@ stdenv.mkDerivation { }) ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin autoreconfHook; + nativeBuildInputs = [ autoreconfHook ]; src = fetchurl { url = "mirror://sourceforge/polyml/polyml.${version}.tar.gz"; diff --git a/pkgs/development/compilers/polyml/5.7.nix b/pkgs/development/compilers/polyml/5.7.nix index 197a787594ea..c35a325ba01a 100644 --- a/pkgs/development/compilers/polyml/5.7.nix +++ b/pkgs/development/compilers/polyml/5.7.nix @@ -12,9 +12,17 @@ stdenv.mkDerivation rec { pname = "polyml"; version = "5.7.1"; - prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace configure.ac --replace stdc++ c++ - ''; + postPatch = + '' + substituteInPlace configure.ac \ + --replace-fail 'AC_FUNC_ALLOCA' "AC_FUNC_ALLOCA + AH_TEMPLATE([_Static_assert]) + AC_DEFINE([_Static_assert], [static_assert]) + " + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace configure.ac --replace-fail stdc++ c++ + ''; patches = [ ./5.7-new-libffi-FFI_SYSV.patch @@ -31,7 +39,7 @@ stdenv.mkDerivation rec { gmp ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin autoreconfHook; + nativeBuildInputs = [ autoreconfHook ]; configureFlags = [ "--enable-shared" diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix index 067bdd018f27..99b6889eb4d6 100644 --- a/pkgs/development/compilers/polyml/default.nix +++ b/pkgs/development/compilers/polyml/default.nix @@ -1,9 +1,10 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, gmp -, libffi +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + gmp, + libffi, }: stdenv.mkDerivation rec { @@ -17,13 +18,24 @@ stdenv.mkDerivation rec { sha256 = "sha256-72wm8dt+Id59A5058mVE5P9TkXW5/LZRthZoxUustVA="; }; - prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace configure.ac --replace stdc++ c++ - ''; + postPatch = + '' + substituteInPlace configure.ac \ + --replace-fail 'AC_FUNC_ALLOCA' "AC_FUNC_ALLOCA + AH_TEMPLATE([_Static_assert]) + AC_DEFINE([_Static_assert], [static_assert]) + " + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace configure.ac --replace-fail stdc++ c++ + ''; - buildInputs = [ libffi gmp ]; + buildInputs = [ + libffi + gmp + ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin autoreconfHook; + nativeBuildInputs = [ autoreconfHook ]; configureFlags = [ "--enable-shared" @@ -47,6 +59,9 @@ stdenv.mkDerivation rec { homepage = "https://www.polyml.org/"; license = licenses.lgpl21; platforms = with platforms; (linux ++ darwin); - maintainers = with maintainers; [ maggesi kovirobi ]; + maintainers = with maintainers; [ + maggesi + kovirobi + ]; }; } From 4d4e3c3d289754fe66bc19ab80f677205d2d8055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 21 Jan 2025 14:57:06 -0800 Subject: [PATCH 19/71] getmail6: 6.19.05 -> 6.19.06 Diff: https://github.com/getmail6/getmail6/compare/refs/tags/v6.19.05...v6.19.06 Changelog: https://github.com/getmail6/getmail6/blob/refs/tags/v6.19.06/docs/CHANGELOG --- pkgs/by-name/ge/getmail6/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ge/getmail6/package.nix b/pkgs/by-name/ge/getmail6/package.nix index 1ebcacfc5869..6a0650b9b069 100644 --- a/pkgs/by-name/ge/getmail6/package.nix +++ b/pkgs/by-name/ge/getmail6/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "getmail6"; - version = "6.19.05"; + version = "6.19.06"; pyproject = true; src = fetchFromGitHub { owner = "getmail6"; repo = "getmail6"; tag = "v${version}"; - hash = "sha256-GjB53bl2gh3SA+kqC9rrQ9I4rP0z69G/bamInmq8W+I="; + hash = "sha256-F4FS6d8XDPlJ7ysShFRb45hZainKljKRg+q4yA18HaI="; }; build-system = with python3.pkgs; [ From 45cc8ee56265cb721a5e64e3bc794e33361eb390 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 21 Jan 2025 16:24:43 -0800 Subject: [PATCH 20/71] python313Packages.bpython: 0.24 -> 0.25 Changelog: https://github.com/bpython/bpython/blob/0.25/CHANGELOG.rst --- .../python-modules/bpython/default.nix | 52 +++++++++++-------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix index 15f562185e1b..51656522a36b 100644 --- a/pkgs/development/python-modules/bpython/default.nix +++ b/pkgs/development/python-modules/bpython/default.nix @@ -1,63 +1,69 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, curtsies, cwcwidth, greenlet, jedi, pygments, pytestCheckHook, - pythonOlder, pyperclip, pyxdg, requests, - typing-extensions, + setuptools, urwid, watchdog, }: buildPythonPackage rec { pname = "bpython"; - version = "0.24"; - format = "setuptools"; + version = "0.25"; + pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-mHNv/XqMSP0r+1PYmKR19CQb3gtnISVwavBNnQj9Pb0="; + src = fetchFromGitHub { + owner = "bpython"; + repo = "bpython"; + tag = version; + hash = "sha256-p5+IQiHNRRazqr+WRdx3Yw+ImG25tdZGLXvMf7woD9w="; }; - propagatedBuildInputs = [ + postPatch = '' + substituteInPlace setup.py \ + --replace-fail 'version = "unknown"' 'version = "${version}"' + ''; + + build-system = [ setuptools ]; + + dependencies = [ curtsies cwcwidth greenlet - jedi pygments - pyperclip pyxdg requests - typing-extensions - urwid - watchdog ]; + optional-dependencies = { + clipboard = [ pyperclip ]; + jedi = [ jedi ]; + urwid = [ urwid ]; + watch = [ watchdog ]; + }; + postInstall = '' substituteInPlace "$out/share/applications/org.bpython-interpreter.bpython.desktop" \ - --replace "Exec=/usr/bin/bpython" "Exec=$out/bin/bpython" + --replace "Exec=/usr/bin/bpython" "Exec=bpython" ''; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "bpython" ]; - disabledTests = [ - # Check for syntax error ends with an AssertionError - "test_syntaxerror" - ]; - meta = with lib; { + changelog = "https://github.com/bpython/bpython/blob/${src.tag}/CHANGELOG.rst"; description = "Fancy curses interface to the Python interactive interpreter"; homepage = "https://bpython-interpreter.org/"; license = licenses.mit; From 371f452296f78437afef7012ea188c53e954071e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 21 Jan 2025 17:32:13 -0800 Subject: [PATCH 21/71] flare-signal: 0.15.6 -> 0.15.7 Diff: https://gitlab.com/schmiddi-on-mobile/flare/-/compare/0.15.6...0.15.7 Changelog: https://gitlab.com/schmiddi-on-mobile/flare/-/blob/0.15.7/CHANGELOG.md --- pkgs/by-name/fl/flare-signal/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/flare-signal/package.nix b/pkgs/by-name/fl/flare-signal/package.nix index f501c4891ac4..2c147db9a429 100644 --- a/pkgs/by-name/fl/flare-signal/package.nix +++ b/pkgs/by-name/fl/flare-signal/package.nix @@ -22,19 +22,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "flare"; - version = "0.15.6"; + version = "0.15.7"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "schmiddi-on-mobile"; repo = "flare"; rev = finalAttrs.version; - hash = "sha256-xpjxOaCN5UVBBIB6WMLCMspRWkzz4DQEcjiSL8uM2RQ="; + hash = "sha256-KFxBdWNN7LYQ5jiDZhAs4pqX2cRLvEGaAhYabaQh1n0="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-iuK68GLU/4wsOLQz+7pGVDZwCuc6cwcUKn6teFuYJco="; + hash = "sha256-bZL9/0MYGxXefrj9whG+N7iMaBpaZSeBVAWR0AKKEvo="; }; nativeBuildInputs = [ From 1ebeb28e7e98a994b0f4837ea5b152dd2b083601 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Jan 2025 04:51:21 +0000 Subject: [PATCH 22/71] prowler: 5.1.0 -> 5.1.5 --- pkgs/by-name/pr/prowler/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/prowler/package.nix b/pkgs/by-name/pr/prowler/package.nix index b44d0f08e49f..3dec004d870d 100644 --- a/pkgs/by-name/pr/prowler/package.nix +++ b/pkgs/by-name/pr/prowler/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "prowler"; - version = "5.1.0"; + version = "5.1.5"; pyproject = true; src = fetchFromGitHub { owner = "prowler-cloud"; repo = "prowler"; tag = version; - hash = "sha256-+wMoHzys4iceiQvRvwsl2aSvTYZxeZlKHy7D4xx33aU="; + hash = "sha256-yVoVfJGO+96ck8T63O0ubeTtdhpfziZFHYVXGFNENds="; }; pythonRelaxDeps = true; From 43c98d69cbab852642e9a9e5afd872122821192b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Jan 2025 07:56:17 +0000 Subject: [PATCH 23/71] puncia: 0.26 -> 0.27 --- pkgs/by-name/pu/puncia/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pu/puncia/package.nix b/pkgs/by-name/pu/puncia/package.nix index 4cfebc59bc5a..4be48fa50448 100644 --- a/pkgs/by-name/pu/puncia/package.nix +++ b/pkgs/by-name/pu/puncia/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "puncia"; - version = "0.26"; + version = "0.27"; pyproject = true; src = fetchFromGitHub { owner = "ARPSyndicate"; repo = "puncia"; tag = "v${version}"; - hash = "sha256-ZvB3X94gjIunerLhtd6a2Eou6AxHxONRJGS2jCiMjbk="; + hash = "sha256-P3F3e53H37Wr2qCRiEaQQ6SQBrSNILk+wT3Q9DIh0FU="; }; build-system = with python3.pkgs; [ setuptools ]; From 4c7619bc57e96bf83fd195c57cca0f281330f88e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Jan 2025 12:34:05 +0000 Subject: [PATCH 24/71] atlauncher: 3.4.38.1 -> 3.4.38.2 --- pkgs/by-name/at/atlauncher/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/at/atlauncher/package.nix b/pkgs/by-name/at/atlauncher/package.nix index 07fb922f1ed5..c894d159138b 100644 --- a/pkgs/by-name/at/atlauncher/package.nix +++ b/pkgs/by-name/at/atlauncher/package.nix @@ -24,13 +24,13 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "atlauncher"; - version = "3.4.38.1"; + version = "3.4.38.2"; src = fetchFromGitHub { owner = "ATLauncher"; repo = "ATLauncher"; rev = "v${finalAttrs.version}"; - hash = "sha256-u9t+0MgmEyDJkdjv+89wJkK74NKBlxNEy2F+3zz7kLI="; + hash = "sha256-x8ch8BdUckweuwEvsOxYG2M5UmbW4fRjF/jJ6feIjIA="; }; postPatch = '' From 90db434a2b340a095409a1f856ff0ec4c230ba36 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Wed, 22 Jan 2025 14:28:55 +0100 Subject: [PATCH 25/71] azure-cli-extensions.confcom: 1.0.0 -> 1.2.1 Signed-off-by: Paul Meyer --- 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 c207ffc32335..254ad69d2c23 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -63,9 +63,9 @@ confcom = mkAzExtension rec { pname = "confcom"; - version = "1.0.0"; + version = "1.2.1"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/confcom-${version}-py3-none-any.whl"; - hash = "sha256-c4I+EJWKEUtKyoTDMLTevMZQxGNedMVoZ5tsMsNWQR0="; + hash = "sha256-D78WwrOKbc8RNAa9Q3wgZRjVOUy/012+KIlTtk5NeTM="; description = "Microsoft Azure Command-Line Tools Confidential Container Security Policy Generator Extension"; nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ openssl_1_1 ]; From 5671da528ce770e2bf17f881d239625025495712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 19 Nov 2024 15:51:10 +0000 Subject: [PATCH 26/71] python3Packages.outlines: 0.0.46 -> 0.1.13 --- .../python-modules/outlines/default.nix | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/outlines/default.nix b/pkgs/development/python-modules/outlines/default.nix index 82128f2383cb..f29fdac01667 100644 --- a/pkgs/development/python-modules/outlines/default.nix +++ b/pkgs/development/python-modules/outlines/default.nix @@ -4,56 +4,60 @@ fetchFromGitHub, setuptools, setuptools-scm, + airportsdata, interegular, cloudpickle, datasets, diskcache, - joblib, + jinja2, jsonschema, - pyairports, + numpy, + outlines-core, pycountry, pydantic, lark, nest-asyncio, - numba, - scipy, + referencing, + requests, torch, transformers, }: buildPythonPackage rec { pname = "outlines"; - version = "0.0.46"; + version = "0.1.13"; pyproject = true; src = fetchFromGitHub { owner = "outlines-dev"; - repo = pname; + repo = "outlines"; tag = version; - hash = "sha256-6VH9BcMRVRf2xvLcK3GNA1pGgAOs95UOlFQ6KxHXwKo="; + hash = "sha256-HuJqLbBHyoyY5ChQQi+9ftvPjLuh63Guk2w6KSZxq6s="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ + airportsdata interegular cloudpickle datasets diskcache - joblib + jinja2 jsonschema + outlines-core pydantic lark nest-asyncio - numba - scipy + numpy + referencing + requests torch transformers pycountry - pyairports ]; checkPhase = '' From 7e9b6c6ab8c6efbe55bcfcaa2cb6593960eddace Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Jan 2025 13:47:38 +0000 Subject: [PATCH 27/71] nuclei-templates: 10.1.1 -> 10.1.2 --- pkgs/by-name/nu/nuclei-templates/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix index a6dbec42c0ea..e33bbe94a8be 100644 --- a/pkgs/by-name/nu/nuclei-templates/package.nix +++ b/pkgs/by-name/nu/nuclei-templates/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nuclei-templates"; - version = "10.1.1"; + version = "10.1.2"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei-templates"; tag = "v${version}"; - hash = "sha256-WqGeNT3OLs5oY/b81fJh3R9b84vXYzn2u5hY9yI2kGM="; + hash = "sha256-Avg7IKL85skqV2DHgyYa6lt0eE4gZBZkPcVOyoaAJhg="; }; installPhase = '' From e171f540ea5e851abd0559abedc9bf5c063ef179 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Wed, 22 Jan 2025 11:15:46 +0100 Subject: [PATCH 28/71] nitrokey: 0.2.3 -> 0.2.4 This fixes the build failure on master, see https://github.com/Nitrokey/nitrokey-sdk-py/issues/60 --- pkgs/development/python-modules/nitrokey/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nitrokey/default.nix b/pkgs/development/python-modules/nitrokey/default.nix index b6426fe8b1ec..6e1f0ac7d7d6 100644 --- a/pkgs/development/python-modules/nitrokey/default.nix +++ b/pkgs/development/python-modules/nitrokey/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "nitrokey"; - version = "0.2.3"; + version = "0.2.4"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-8Ig2LI7waU/IbUwApyFI2TwtarT5bYolgeq14SgmbEo="; + hash = "sha256-XDlcOfOTGgYsg5DLsy1wJd3AzuvWSvqyFSEYrDOp0Ic="; }; disabled = pythonOlder "3.9"; From 6b81f53036517e152fc014cc3221504cbb1befce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Jan 2025 17:07:37 +0000 Subject: [PATCH 29/71] gcli: 2.6.0 -> 2.6.1 --- pkgs/by-name/gc/gcli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gc/gcli/package.nix b/pkgs/by-name/gc/gcli/package.nix index fc9b54a84b27..f69ccbe8c76b 100644 --- a/pkgs/by-name/gc/gcli/package.nix +++ b/pkgs/by-name/gc/gcli/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "gcli"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "herrhotzenplotz"; repo = "gcli"; rev = "v${version}"; - hash = "sha256-60B1XRoeSjSEo5nxrCJL9lizq7ELGe8+hdmC4lkMhis="; + hash = "sha256-pAnDxcQLRF97OzO7/P7eRXv/BUJwbuEveEVUBQuNJBE="; }; nativeBuildInputs = [ From e012ca17097886d3dd3a2c3ab5a200564821f95e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 Jan 2025 18:43:37 +0100 Subject: [PATCH 30/71] python313Packages.yalexs: 8.10.0 -> 8.11.0 Diff: https://github.com/bdraco/yalexs/compare/refs/tags/v8.10.0...v8.11.0 Changelog: https://github.com/bdraco/yalexs/blob/refs/tags/v8.11.0/CHANGELOG.md --- pkgs/development/python-modules/yalexs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index 560e7211228e..aab259612d16 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "yalexs"; - version = "8.10.0"; + version = "8.11.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "yalexs"; tag = "v${version}"; - hash = "sha256-0fC12QsCOgFc6GJk5T7kCjVHe9W4Fhwmtv3dwJVh9mM="; + hash = "sha256-ajKe0pIUV2xwFi49MR4NK19G1DZ84e6oSJQIGlXq+Vo="; }; build-system = [ poetry-core ]; From 95854100383e468a876f824bf9f4943dda831f61 Mon Sep 17 00:00:00 2001 From: Konstantin Alekseev Date: Wed, 23 Oct 2024 14:49:54 +0300 Subject: [PATCH 31/71] playwright: download browsers for Mac OS --- .../python-modules/playwright/update.sh | 44 ++++-- pkgs/development/web/playwright/chromium.nix | 57 +++++-- pkgs/development/web/playwright/driver.nix | 37 +---- pkgs/development/web/playwright/ffmpeg.nix | 2 + pkgs/development/web/playwright/firefox.nix | 61 +++++--- pkgs/development/web/playwright/webkit.nix | 147 ++++++++++-------- 6 files changed, 206 insertions(+), 142 deletions(-) diff --git a/pkgs/development/python-modules/playwright/update.sh b/pkgs/development/python-modules/playwright/update.sh index 2b283d3b607a..a8dfacdafac2 100755 --- a/pkgs/development/python-modules/playwright/update.sh +++ b/pkgs/development/python-modules/playwright/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused common-updater-scripts jq prefetch-npm-deps unzip +#!nix-shell -i bash -p curl gnused common-updater-scripts jq prefetch-npm-deps unzip nix-prefetch set -euo pipefail root="$(dirname "$(readlink -f "$0")")" @@ -30,18 +30,38 @@ replace_sha() { } prefetch_browser() { - nix store prefetch-file --json --hash-type sha256 --unpack "$1" | jq -r .hash + # nix-prefetch is used to obtain sha with `stripRoot = false` + # doesn't work on macOS https://github.com/msteen/nix-prefetch/issues/53 + nix-prefetch -q "{ stdenv, fetchzip }: stdenv.mkDerivation rec { name=\"browser\"; src = fetchzip { url = \"$1\"; stripRoot = $2; }; }" } update_browser() { name="$1" - suffix="$2" - arm64_suffix="${3:-$2-arm64}" + platform="$2" + stripRoot="false" + if [ "$platform" = "darwin" ]; then + if [ "$name" = "webkit" ]; then + suffix="mac-14" + else + suffix="mac" + fi + else + if [ "$name" = "ffmpeg" ]; then + suffix="linux" + elif [ "$name" = "firefox" ]; then + stripRoot="true" + suffix="ubuntu-22.04" + else + suffix="ubuntu-22.04" + fi + fi + aarch64_suffix="$suffix-arm64" + revision="$(jq -r ".browsers.$name.revision" "$playwright_dir/browsers.json")" - replace_sha "$playwright_dir/$name.nix" "x86_64-linux" \ - "$(prefetch_browser "https://playwright.azureedge.net/builds/$name/$revision/$name-$suffix.zip")" - replace_sha "$playwright_dir/$name.nix" "aarch64-linux" \ - "$(prefetch_browser "https://playwright.azureedge.net/builds/$name/$revision/$name-$arm64_suffix.zip")" + replace_sha "$playwright_dir/$name.nix" "x86_64-$platform" \ + "$(prefetch_browser "https://playwright.azureedge.net/builds/$name/$revision/$name-$suffix.zip" $stripRoot)" + replace_sha "$playwright_dir/$name.nix" "aarch64-$platform" \ + "$(prefetch_browser "https://playwright.azureedge.net/builds/$name/$revision/$name-$aarch64_suffix.zip" $stripRoot)" } curl -fsSl \ @@ -58,10 +78,14 @@ curl -fsSl \ # We currently use Chromium from nixpkgs, so we don't need to download it here # Likewise, darwin can be ignored here atm as we are using an impure install anyway. -update_browser "firefox" "ubuntu-22.04" -update_browser "webkit" "ubuntu-22.04" +update_browser "firefox" "linux" +update_browser "webkit" "linux" update_browser "ffmpeg" "linux" +update_browser "chromium" "darwin" +update_browser "firefox" "darwin" +update_browser "webkit" "darwin" +update_browser "ffmpeg" "darwin" # Update package-lock.json files for all npm deps that are built in playwright diff --git a/pkgs/development/web/playwright/chromium.nix b/pkgs/development/web/playwright/chromium.nix index 709cef5c5ca4..458f82b33926 100644 --- a/pkgs/development/web/playwright/chromium.nix +++ b/pkgs/development/web/playwright/chromium.nix @@ -3,22 +3,47 @@ makeWrapper, fontconfig_file, chromium, + fetchzip, + revision, + suffix, + system, + throwSystem, ... }: -runCommand "playwright-chromium" - { - nativeBuildInputs = [ - makeWrapper - ]; - } - '' - mkdir -p $out/chrome-linux +let + chromium-linux = + runCommand "playwright-chromium" + { + nativeBuildInputs = [ + makeWrapper + ]; + } + '' + mkdir -p $out/chrome-linux - # See here for the Chrome options: - # https://github.com/NixOS/nixpkgs/issues/136207#issuecomment-908637738 - # We add --disable-gpu to be able to run in gpu-less environments such - # as headless nixos test vms. - makeWrapper ${chromium}/bin/chromium $out/chrome-linux/chrome \ - --set-default SSL_CERT_FILE /etc/ssl/certs/ca-bundle.crt \ - --set-default FONTCONFIG_FILE ${fontconfig_file} - '' + # See here for the Chrome options: + # https://github.com/NixOS/nixpkgs/issues/136207#issuecomment-908637738 + # We add --disable-gpu to be able to run in gpu-less environments such + # as headless nixos test vms. + makeWrapper ${chromium}/bin/chromium $out/chrome-linux/chrome \ + --set-default SSL_CERT_FILE /etc/ssl/certs/ca-bundle.crt \ + --set-default FONTCONFIG_FILE ${fontconfig_file} + ''; + chromium-darwin = fetchzip { + url = "https://playwright.azureedge.net/builds/chromium/${revision}/chromium-${suffix}.zip"; + stripRoot = false; + hash = + { + x86_64-darwin = "sha256-G9DPo/pXFuaZICT47TSE+bvncS//ydylJVpnfQYp68U="; + aarch64-darwin = "sha256-2JedruJ/y7Zidn6oRfUxi0MleaH5Cp6XQ+F7ImSCTjA="; + } + .${system} or throwSystem; + }; +in +{ + x86_64-linux = chromium-linux; + aarch64-linux = chromium-linux; + x86_64-darwin = chromium-darwin; + aarch64-darwin = chromium-darwin; +} +.${system} or throwSystem diff --git a/pkgs/development/web/playwright/driver.nix b/pkgs/development/web/playwright/driver.nix index 1058a61d48fb..05fae59266a5 100644 --- a/pkgs/development/web/playwright/driver.nix +++ b/pkgs/development/web/playwright/driver.nix @@ -159,15 +159,11 @@ let passthru = { browsersJSON = (lib.importJSON ./browsers.json).browsers; - browsers = - { - x86_64-linux = browsers-linux { }; - aarch64-linux = browsers-linux { }; - x86_64-darwin = browsers-mac; - aarch64-darwin = browsers-mac; - } - .${system} or throwSystem; - browsers-chromium = browsers-linux { }; + browsers = browsers { }; + browsers-chromium = browsers { + withFirefox = false; + withWebkit = false; + }; }; }); @@ -196,28 +192,7 @@ let }; }); - browsers-mac = stdenv.mkDerivation { - pname = "playwright-browsers"; - inherit (playwright) version; - - dontUnpack = true; - - nativeBuildInputs = [ cacert ]; - - installPhase = '' - runHook preInstall - - export PLAYWRIGHT_BROWSERS_PATH=$out - ${playwright-core}/cli.js install - rm -r $out/.links - - runHook postInstall - ''; - - meta.platforms = lib.platforms.darwin; - }; - - browsers-linux = lib.makeOverridable ( + browsers = lib.makeOverridable ( { withChromium ? true, withFirefox ? true, diff --git a/pkgs/development/web/playwright/ffmpeg.nix b/pkgs/development/web/playwright/ffmpeg.nix index f541031019ed..108b19a29214 100644 --- a/pkgs/development/web/playwright/ffmpeg.nix +++ b/pkgs/development/web/playwright/ffmpeg.nix @@ -12,6 +12,8 @@ fetchzip { { x86_64-linux = "sha256-FEm62UvMv0h6Sav93WmbPLw3CW1L1xg4nD26ca5ol38="; aarch64-linux = "sha256-jtQ+NS++VHRiKoIV++PIxEnyVnYtVwUyNlSILKSH4A4="; + x86_64-darwin = "sha256-ED6noxSDeEUt2DkIQ4gNe/kL+zHVeb2AD5klBk93F88="; + aarch64-darwin = "sha256-3Adnvb7zvMXKFOhb8uuj5kx0wEIFicmckYx9WLlNNf0="; } .${system} or throwSystem; } diff --git a/pkgs/development/web/playwright/firefox.nix b/pkgs/development/web/playwright/firefox.nix index 0f404bee2899..553dadf4420d 100644 --- a/pkgs/development/web/playwright/firefox.nix +++ b/pkgs/development/web/playwright/firefox.nix @@ -9,31 +9,48 @@ throwSystem, }: let - suffix' = - if lib.hasPrefix "linux" suffix then "ubuntu-22.04" + (lib.removePrefix "linux" suffix) else suffix; -in -stdenv.mkDerivation { - name = "playwright-firefox"; - src = fetchzip { - url = "https://playwright.azureedge.net/builds/firefox/${revision}/firefox-${suffix'}.zip"; + firefox-linux = stdenv.mkDerivation { + name = "playwright-firefox"; + src = fetchzip { + url = "https://playwright.azureedge.net/builds/firefox/${revision}/firefox-${ + "ubuntu-22.04" + (lib.removePrefix "linux" suffix) + }.zip"; + hash = + { + x86_64-linux = "sha256-Hd9LlSRLW51gDoFyszqvg46Q/sMizLRsVKAN9atbwsw="; + aarch64-linux = "sha256-SEXH3gLOfNjOcnNWQjQ5gaaow47veVs0BoTYSgXw+24="; + } + .${system} or throwSystem; + }; + + inherit (firefox-bin.unwrapped) + nativeBuildInputs + buildInputs + runtimeDependencies + appendRunpaths + patchelfFlags + ; + + buildPhase = '' + mkdir -p $out/firefox + cp -R . $out/firefox + ''; + }; + firefox-darwin = fetchzip { + url = "https://playwright.azureedge.net/builds/firefox/${revision}/firefox-${suffix}.zip"; + stripRoot = false; hash = { - x86_64-linux = "sha256-Hd9LlSRLW51gDoFyszqvg46Q/sMizLRsVKAN9atbwsw="; - aarch64-linux = "sha256-SEXH3gLOfNjOcnNWQjQ5gaaow47veVs0BoTYSgXw+24="; + x86_64-darwin = "sha256-tclyoXGK0oc40ppqFVHJEGOtiFpc/D8wB37tBHhYhjg="; + aarch64-darwin = "sha256-EEY3cxZaZwNbWwkWy8m9hSDgEV3hotcDPD1ehiQWFig="; } .${system} or throwSystem; }; - - inherit (firefox-bin.unwrapped) - nativeBuildInputs - buildInputs - runtimeDependencies - appendRunpaths - patchelfFlags - ; - - buildPhase = '' - mkdir -p $out/firefox - cp -R . $out/firefox - ''; +in +{ + x86_64-linux = firefox-linux; + aarch64-linux = firefox-linux; + x86_64-darwin = firefox-darwin; + aarch64-darwin = firefox-darwin; } +.${system} or throwSystem diff --git a/pkgs/development/web/playwright/webkit.nix b/pkgs/development/web/playwright/webkit.nix index 8c89a34918f0..86e250591d1b 100644 --- a/pkgs/development/web/playwright/webkit.nix +++ b/pkgs/development/web/playwright/webkit.nix @@ -50,7 +50,12 @@ }: let suffix' = - if lib.hasPrefix "linux" suffix then "ubuntu-22.04" + (lib.removePrefix "linux" suffix) else suffix; + if lib.hasPrefix "linux" suffix then + "ubuntu-22.04" + (lib.removePrefix "linux" suffix) + else if lib.hasPrefix "mac" suffix then + "mac-14" + (lib.removePrefix "mac" suffix) + else + suffix; libvpx' = libvpx.overrideAttrs ( finalAttrs: previousAttrs: { version = "1.12.0"; @@ -62,74 +67,90 @@ let }; } ); + webkit-linux = stdenv.mkDerivation { + name = "playwright-webkit"; + src = fetchzip { + url = "https://playwright.azureedge.net/builds/webkit/${revision}/webkit-${suffix'}.zip"; + stripRoot = false; + hash = + { + x86_64-linux = "sha256-pHYGQYwu47jdOAD+/mLrP6Dd+2aDMHENddVwAu0uEfI="; + aarch64-linux = "sha256-0UeYWjeFnQ8yVa3juWg7Z7VF1GDbP4pJ9OUJRbv1OJw="; + } + .${system} or throwSystem; + }; -in -stdenv.mkDerivation { - name = "playwright-webkit"; - src = fetchzip { + nativeBuildInputs = [ + autoPatchelfHook + patchelfUnstable + makeWrapper + ]; + buildInputs = [ + at-spi2-atk + cairo + flite + fontconfig.lib + freetype + glib + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-base + gst_all_1.gstreamer + harfbuzz + harfbuzzFull + icu70 + lcms + libdrm + libepoxy + libevent + libgcc.lib + libgcrypt + libgpg-error + libjpeg8 + libopus + libpng + libsoup_3 + libtasn1 + libwebp + libwpe + libwpe-fdo + libvpx' + libxml2 + libxslt + libgbm + sqlite + systemdLibs + wayland-scanner + woff2.lib + libxkbcommon + zlib + ]; + + patchelfFlags = [ "--no-clobber-old-sections" ]; + buildPhase = '' + cp -R . $out + + # remove unused gtk browser + rm -rf $out/minibrowser-gtk + + wrapProgram $out/minibrowser-wpe/bin/MiniBrowser \ + --prefix GIO_EXTRA_MODULES ":" "${glib-networking}/lib/gio/modules/" + ''; + }; + webkit-darwin = fetchzip { url = "https://playwright.azureedge.net/builds/webkit/${revision}/webkit-${suffix'}.zip"; stripRoot = false; hash = { - x86_64-linux = "sha256-pHYGQYwu47jdOAD+/mLrP6Dd+2aDMHENddVwAu0uEfI="; - aarch64-linux = "sha256-0UeYWjeFnQ8yVa3juWg7Z7VF1GDbP4pJ9OUJRbv1OJw="; + x86_64-darwin = "sha256-sP7MxAMDkrBTN7HR44xrxKPdCF2HzsL5GiaCMHQcqeU="; + aarch64-darwin = "sha256-Sw2+w6HT/e0rdLp7jXj5g3C1Uh05JnP9MznIgg7Glyc="; } .${system} or throwSystem; }; - - nativeBuildInputs = [ - autoPatchelfHook - patchelfUnstable - makeWrapper - ]; - buildInputs = [ - at-spi2-atk - cairo - flite - fontconfig.lib - freetype - glib - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-base - gst_all_1.gstreamer - harfbuzz - harfbuzzFull - icu70 - lcms - libdrm - libepoxy - libevent - libgcc.lib - libgcrypt - libgpg-error - libjpeg8 - libopus - libpng - libsoup_3 - libtasn1 - libwebp - libwpe - libwpe-fdo - libvpx' - libxml2 - libxslt - libgbm - sqlite - systemdLibs - wayland-scanner - woff2.lib - libxkbcommon - zlib - ]; - - patchelfFlags = [ "--no-clobber-old-sections" ]; - buildPhase = '' - cp -R . $out - - # remove unused gtk browser - rm -rf $out/minibrowser-gtk - - wrapProgram $out/minibrowser-wpe/bin/MiniBrowser \ - --prefix GIO_EXTRA_MODULES ":" "${glib-networking}/lib/gio/modules/" - ''; +in +{ + x86_64-linux = webkit-linux; + aarch64-linux = webkit-linux; + x86_64-darwin = webkit-darwin; + aarch64-darwin = webkit-darwin; } +.${system} or throwSystem From aeba1dd05ab1f729eeac31677abfd39092fd1ee0 Mon Sep 17 00:00:00 2001 From: Konstantin Alekseev Date: Wed, 23 Oct 2024 14:50:42 +0300 Subject: [PATCH 32/71] playwright: 1.47.0 -> 1.48.1 --- .../python-modules/playwright/default.nix | 4 ++-- pkgs/development/web/playwright/browsers.json | 16 ++++++++++------ pkgs/development/web/playwright/chromium.nix | 4 ++-- pkgs/development/web/playwright/driver.nix | 10 +++++----- pkgs/development/web/playwright/firefox.nix | 8 ++++---- pkgs/development/web/playwright/webkit.nix | 8 ++++---- 6 files changed, 27 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index d230e237cec6..e49b797df6fb 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -22,7 +22,7 @@ in buildPythonPackage rec { pname = "playwright"; # run ./pkgs/development/python-modules/playwright/update.sh to update - version = "1.47.0"; + version = "1.48.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "playwright-python"; tag = "v${version}"; - hash = "sha256-C/spH54hhLI0Egs2jjTjQ5BH1pIw1syrfSyUvVQRoKM="; + hash = "sha256-ZWVySGehR5r6s0y6qCZuFI8SobYbjWP+A6Rgfug2JEE="; }; patches = [ diff --git a/pkgs/development/web/playwright/browsers.json b/pkgs/development/web/playwright/browsers.json index e7fb77faf27e..28c44ae7bfa1 100644 --- a/pkgs/development/web/playwright/browsers.json +++ b/pkgs/development/web/playwright/browsers.json @@ -2,15 +2,15 @@ "comment": "This file is kept up to date via update.sh", "browsers": { "chromium": { - "revision": "1134", - "browserVersion": "129.0.6668.29" + "revision": "1140", + "browserVersion": "130.0.6723.31" }, "firefox": { - "revision": "1463", - "browserVersion": "130.0" + "revision": "1465", + "browserVersion": "131.0" }, "webkit": { - "revision": "2070", + "revision": "2083", "revisionOverrides": { "mac10.14": "1446", "mac10.15": "1616", @@ -22,7 +22,11 @@ "browserVersion": "18.0" }, "ffmpeg": { - "revision": "1010" + "revision": "1010", + "revisionOverrides": { + "mac12": "1010", + "mac12-arm64": "1010" + } } } } diff --git a/pkgs/development/web/playwright/chromium.nix b/pkgs/development/web/playwright/chromium.nix index 458f82b33926..da0235272cca 100644 --- a/pkgs/development/web/playwright/chromium.nix +++ b/pkgs/development/web/playwright/chromium.nix @@ -34,8 +34,8 @@ let stripRoot = false; hash = { - x86_64-darwin = "sha256-G9DPo/pXFuaZICT47TSE+bvncS//ydylJVpnfQYp68U="; - aarch64-darwin = "sha256-2JedruJ/y7Zidn6oRfUxi0MleaH5Cp6XQ+F7ImSCTjA="; + x86_64-darwin = "sha256-N/uh3Q2ivqeraAqRt80deVz1XEPyLTYI8L3DBfNQGWg="; + aarch64-darwin = "sha256-tR9PwGanPcsDQwi1BijeYJd9LhNIWgEoXs5u3gZpghU="; } .${system} or throwSystem; }; diff --git a/pkgs/development/web/playwright/driver.nix b/pkgs/development/web/playwright/driver.nix index 05fae59266a5..e63f9fcf349b 100644 --- a/pkgs/development/web/playwright/driver.nix +++ b/pkgs/development/web/playwright/driver.nix @@ -27,20 +27,20 @@ let } .${system} or throwSystem; - version = "1.47.0"; + version = "1.48.1"; src = fetchFromGitHub { owner = "Microsoft"; repo = "playwright"; rev = "v${version}"; - hash = "sha256-cKjVDy1wFo8NlF8v+8YBuQUF2OUYjCmv27uhEoVUrno="; + hash = "sha256-VMp/Tjd5w2v+IHD+CMaR/XdMJHkS/u7wFe0hNxa1TbE="; }; babel-bundle = buildNpmPackage { pname = "babel-bundle"; inherit version src; sourceRoot = "${src.name}/packages/playwright/bundles/babel"; - npmDepsHash = "sha256-HrDTkP2lHl2XKD8aGpmnf6YtSe/w9UePH5W9QfbaoMg="; + npmDepsHash = "sha256-kHuNFgxmyIoxTmvT+cyzDRfKNy18zzeUH3T+gJopWeA="; dontNpmBuild = true; installPhase = '' cp -r . "$out" @@ -50,7 +50,7 @@ let pname = "expect-bundle"; inherit version src; sourceRoot = "${src.name}/packages/playwright/bundles/expect"; - npmDepsHash = "sha256-qnFx/AQZtmxNFrrabfOpsWy6I64DFJf3sWrJzL1wfU4="; + npmDepsHash = "sha256-KwxNqPefvPPHG4vbco2O4G8WlA7l33toJdfNWHMTDOQ="; dontNpmBuild = true; installPhase = '' cp -r . "$out" @@ -92,7 +92,7 @@ let inherit version src; sourceRoot = "${src.name}"; # update.sh depends on sourceRoot presence - npmDepsHash = "sha256-FaDTJmIiaaOCvq6tARfiWX5IBTTNOJ/iVkRsO4D8aqc="; + npmDepsHash = "sha256-cmUmYuUL7zfB7WEBKft43r69f7vaZDEjku8uwR3RZ1A="; nativeBuildInputs = [ cacert ]; diff --git a/pkgs/development/web/playwright/firefox.nix b/pkgs/development/web/playwright/firefox.nix index 553dadf4420d..cb23a5a48262 100644 --- a/pkgs/development/web/playwright/firefox.nix +++ b/pkgs/development/web/playwright/firefox.nix @@ -17,8 +17,8 @@ let }.zip"; hash = { - x86_64-linux = "sha256-Hd9LlSRLW51gDoFyszqvg46Q/sMizLRsVKAN9atbwsw="; - aarch64-linux = "sha256-SEXH3gLOfNjOcnNWQjQ5gaaow47veVs0BoTYSgXw+24="; + x86_64-linux = "sha256-L/CJVtj9bVXKuKSLWw0wAdNICiRTg5ek+fw4togBoSI="; + aarch64-linux = "sha256-DgCuX+6KSnoHNFoFUli6S20GGHOExARasiJY9fy3CCE="; } .${system} or throwSystem; }; @@ -41,8 +41,8 @@ let stripRoot = false; hash = { - x86_64-darwin = "sha256-tclyoXGK0oc40ppqFVHJEGOtiFpc/D8wB37tBHhYhjg="; - aarch64-darwin = "sha256-EEY3cxZaZwNbWwkWy8m9hSDgEV3hotcDPD1ehiQWFig="; + x86_64-darwin = "sha256-HJ0jBmTW/Zz2fkmSo1gEv5P58PGyhXKnJVxJ12Q4IiM="; + aarch64-darwin = "sha256-YnnG8BX06vQlJmzZGaCKq1wKGp3yRaUQ4RF+tEWoK6U="; } .${system} or throwSystem; }; diff --git a/pkgs/development/web/playwright/webkit.nix b/pkgs/development/web/playwright/webkit.nix index 86e250591d1b..5433a4baf821 100644 --- a/pkgs/development/web/playwright/webkit.nix +++ b/pkgs/development/web/playwright/webkit.nix @@ -74,8 +74,8 @@ let stripRoot = false; hash = { - x86_64-linux = "sha256-pHYGQYwu47jdOAD+/mLrP6Dd+2aDMHENddVwAu0uEfI="; - aarch64-linux = "sha256-0UeYWjeFnQ8yVa3juWg7Z7VF1GDbP4pJ9OUJRbv1OJw="; + x86_64-linux = "sha256-vz/c2Bzr1NWRZZL5hIRwnor2Wte61gS++8rRfmy9T+0="; + aarch64-linux = "sha256-dS4Hsy/lGZWgznviwkslSk5oBYdUIBxeQPfaEyLNXyc="; } .${system} or throwSystem; }; @@ -141,8 +141,8 @@ let stripRoot = false; hash = { - x86_64-darwin = "sha256-sP7MxAMDkrBTN7HR44xrxKPdCF2HzsL5GiaCMHQcqeU="; - aarch64-darwin = "sha256-Sw2+w6HT/e0rdLp7jXj5g3C1Uh05JnP9MznIgg7Glyc="; + x86_64-darwin = "sha256-lOAHJaDXtt80RhqFNaO1JhaJH5WAu6+rpoR+IsfzGeM="; + aarch64-darwin = "sha256-GrjTnMGTPBdRI3xE5t9HbXLrvgOjCdqbJGElTKhUoA4="; } .${system} or throwSystem; }; From 56ff5b1a8268656fc503a4704803c538196f651a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 22 Jan 2025 13:38:03 -0800 Subject: [PATCH 33/71] python313Packages.hahomematic: 2025.1.10 -> 2025.1.11 Diff: https://github.com/SukramJ/hahomematic/compare/refs/tags/2025.1.10...2025.1.11 Changelog: https://github.com/SukramJ/hahomematic/blob/2025.1.11/changelog.md --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index a1a6ea29c00b..c7123783cf2e 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2025.1.10"; + version = "2025.1.11"; pyproject = true; disabled = pythonOlder "3.12"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "SukramJ"; repo = "hahomematic"; tag = version; - hash = "sha256-4aHrQ8EgaQNNT4M8FBEHXxgU+ES3ylegYwFyz3Hf+jQ="; + hash = "sha256-XHXQ1A6s5ew5hsivlC83oufYiImpKCRJ7v7NsAn6PJs="; }; __darwinAllowLocalNetworking = true; From 173ff869ac4a39e9c2ad6007306f70752d2fe9de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 22 Jan 2025 13:38:11 -0800 Subject: [PATCH 34/71] home-assistant-custom-components.homematicip_local: 1.79.0 -> 1.79.1 Diff: https://github.com/SukramJ/custom_homematic/compare/refs/tags/1.79.0...1.79.1 Changelog: https://github.com/SukramJ/custom_homematic/blob/1.79.1/changelog.md --- .../custom-components/homematicip_local/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix index da56ac16eea4..6b9e34c13e0d 100644 --- a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix +++ b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix @@ -9,13 +9,13 @@ buildHomeAssistantComponent rec { owner = "SukramJ"; domain = "homematicip_local"; - version = "1.79.0"; + version = "1.79.1"; src = fetchFromGitHub { owner = "SukramJ"; repo = "custom_homematic"; tag = version; - hash = "sha256-kVYyc1froOwqu1s/RWstJr82Ffp+wj5hx7brq8u4zdg="; + hash = "sha256-kkUN7orPs9Xdq23VPwVp+AxqkWXMLiDcYRFNWeVlVpM="; }; postPatch = '' From c0deb503a2a13da646ebac0f276fe16500064892 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jan 2025 01:58:18 +0000 Subject: [PATCH 35/71] beam26Packages.elixir: 1.18.1 -> 1.18.2 --- pkgs/development/interpreters/elixir/1.18.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/elixir/1.18.nix b/pkgs/development/interpreters/elixir/1.18.nix index 640181a6a2af..059d7fe05d85 100644 --- a/pkgs/development/interpreters/elixir/1.18.nix +++ b/pkgs/development/interpreters/elixir/1.18.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation { - version = "1.18.1"; - sha256 = "sha256-zJNAoyqSj/KdJ1Cqau90QCJihjwHA+HO7nnD1Ugd768="; + version = "1.18.2"; + sha256 = "sha256-8FhUKAaEjBBcF0etVPdkxMfrnR5niU40U8cxDRJdEok="; # https://hexdocs.pm/elixir/1.18.0/compatibility-and-deprecations.html#between-elixir-and-erlang-otp minimumOTPVersion = "25"; escriptPath = "lib/elixir/scripts/generate_app.escript"; From 696e97920c24d1a420fde789011a4f4eac3a05f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jan 2025 02:45:01 +0000 Subject: [PATCH 36/71] cue: 0.11.1 -> 0.11.2 --- pkgs/by-name/cu/cue/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cu/cue/package.nix b/pkgs/by-name/cu/cue/package.nix index b7f8911e1a27..202ce48cb5c5 100644 --- a/pkgs/by-name/cu/cue/package.nix +++ b/pkgs/by-name/cu/cue/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "cue"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "cue-lang"; repo = "cue"; rev = "v${version}"; - hash = "sha256-CLWPRVrfFQUwoLbZttetuq1T/Gb7vVEcrD7dxMzfgjA="; + hash = "sha256-OSsDgwjtjQw5YRuXi1K/HQtHyLh1aHtYDlQDAtdYeZM="; }; vendorHash = "sha256-jl8TR1kxame30l7DkfOEioWA9wK/ACTNofiTi++vjuI="; From 4066883fc004c719ce61ba4f2f3d5d0df212c5c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jan 2025 02:46:27 +0000 Subject: [PATCH 37/71] syft: 1.18.1 -> 1.19.0 --- pkgs/by-name/sy/syft/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix index 18bc905d6f74..b67304a80724 100644 --- a/pkgs/by-name/sy/syft/package.nix +++ b/pkgs/by-name/sy/syft/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "syft"; - version = "1.18.1"; + version = "1.19.0"; src = fetchFromGitHub { owner = "anchore"; repo = "syft"; tag = "v${version}"; - hash = "sha256-ot4qdCxF9Kg657IFzUIxGsmRCDag1a4Ipq1qj2RPW0E="; + hash = "sha256-mO4mRMLoYA5WjDsA4FbMd/RLbQOekXKikl1zlZNKYtk="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -28,7 +28,7 @@ buildGoModule rec { # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-3GvOWu+h1d5qUxUd7yxE/YReeuXteVV/4ZrnMgGRZi0="; + vendorHash = "sha256-KmMES19mGgtSeGw31DqZQm9wp0y+nu3P2LTZh9ofCPM="; nativeBuildInputs = [ installShellFiles ]; From 14950722184316ecf76667559b76976417c886cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jan 2025 03:11:59 +0000 Subject: [PATCH 38/71] grype: 0.86.1 -> 0.87.0 --- pkgs/by-name/gr/grype/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix index 0fabcd3d83c8..2df384d4b2a9 100644 --- a/pkgs/by-name/gr/grype/package.nix +++ b/pkgs/by-name/gr/grype/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "grype"; - version = "0.86.1"; + version = "0.87.0"; src = fetchFromGitHub { owner = "anchore"; repo = "grype"; tag = "v${version}"; - hash = "sha256-k4Faw7DqN5H2bGxKEqeUA4+sMZOdbW1139GcqbU56Hk="; + hash = "sha256-El7cegeHMb6fhO1Vr6FK0E3Mlk/dbU0Dv4lUYNu0Gcc="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -30,7 +30,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-qrMgc5/ukuri8Oabgq84SCqy26vVWgzlE2UkTd67ss8="; + vendorHash = "sha256-SbKvDAzWq58O0e/+1r5oI3rxfdsnPenMPwqNRTOe7AI="; nativeBuildInputs = [ installShellFiles ]; From e0c5257c8a1bd3b475cf1953640205d8665d88e1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jan 2025 09:23:00 +0100 Subject: [PATCH 39/71] python313Packages.rns: 0.9.0 -> 0.9.1 Diff: https://github.com/markqvist/Reticulum/compare/refs/tags/0.9.0...0.9.1 Changelog: https://github.com/markqvist/Reticulum/releases/tag/0.9.1 --- 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 6cd96914765b..82e72af1446c 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.9.0"; + version = "0.9.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; tag = version; - hash = "sha256-rIIXTrP340lWMjQcT+/JKULwvaWC2gjrWSzu+3tqnK0="; + hash = "sha256-AR7JMvx5qWPFtMhotO2MlqKH5d/CcGOrvpaB031vTX8="; }; patches = [ From fe9da7d1311b51f9864bbf8b1185c2e468cfaf3d Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Thu, 23 Jan 2025 09:30:33 +0100 Subject: [PATCH 40/71] azure-cli.extensions-tool: add ability to update manual extensions Signed-off-by: Paul Meyer --- pkgs/by-name/az/azure-cli/extensions-tool.py | 150 ++++++++++++++++++- pkgs/by-name/az/azure-cli/package.nix | 1 - 2 files changed, 145 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-tool.py b/pkgs/by-name/az/azure-cli/extensions-tool.py index 74e58723a099..d3a23fb2cc78 100644 --- a/pkgs/by-name/az/azure-cli/extensions-tool.py +++ b/pkgs/by-name/az/azure-cli/extensions-tool.py @@ -6,7 +6,9 @@ import datetime import json import logging import os +import subprocess import sys +from collections.abc import Callable from dataclasses import asdict, dataclass, replace from pathlib import Path from typing import Any, Dict, Iterable, List, Optional, Set, Tuple @@ -42,20 +44,20 @@ def _read_cached_index(path: Path) -> Tuple[datetime.datetime, Any]: return cache_date, data -def _write_index_to_cache(data: Any, path: Path): +def _write_index_to_cache(data: Any, path: Path) -> None: j = json.loads(data) j["cache_date"] = datetime.datetime.now().isoformat() with open(path, "w") as f: json.dump(j, f, indent=2) -def _fetch_remote_index(): +def _fetch_remote_index() -> Any: r = Request(INDEX_URL) with urlopen(r) as resp: return resp.read() -def get_extension_index(cache_dir: Path) -> Set[Ext]: +def get_extension_index(cache_dir: Path) -> Any: index_file = cache_dir / "index.json" os.makedirs(cache_dir, exist_ok=True) @@ -154,7 +156,7 @@ def _filter_invalid(o: Dict[str, Any]) -> bool: def _filter_compatible(o: Dict[str, Any], cli_version: Version) -> bool: minCliVersion = parse(o["metadata"]["azext.minCliCoreVersion"]) - return cli_version >= minCliVersion + return bool(cli_version >= minCliVersion) def _transform_dict_to_obj(o: Dict[str, Any]) -> Ext: @@ -211,6 +213,93 @@ def _filter_updated(e: Tuple[Ext, Ext]) -> bool: return prev != new +@dataclass(frozen=True) +class AttrPos: + file: str + line: int + column: int + + +def nix_get_value(attr_path: str) -> Optional[str]: + try: + output = ( + subprocess.run( + [ + "nix-instantiate", + "--eval", + "--strict", + "--json", + "-E", + f"with import ./. {{ }}; {attr_path}", + ], + stdout=subprocess.PIPE, + text=True, + check=True, + ) + .stdout.rstrip() + .strip('"') + ) + except subprocess.CalledProcessError as e: + logger.error("failed to nix-instantiate: %s", e) + return None + return output + + +def nix_unsafe_get_attr_pos(attr: str, attr_path: str) -> Optional[AttrPos]: + try: + output = subprocess.run( + [ + "nix-instantiate", + "--eval", + "--strict", + "--json", + "-E", + f'with import ./. {{ }}; (builtins.unsafeGetAttrPos "{attr}" {attr_path})', + ], + stdout=subprocess.PIPE, + text=True, + check=True, + ).stdout.rstrip() + except subprocess.CalledProcessError as e: + logger.error("failed to unsafeGetAttrPos: %s", e) + return None + if output == "null": + logger.error("failed to unsafeGetAttrPos: nix-instantiate returned 'null'") + return None + pos = json.loads(output) + return AttrPos(pos["file"], pos["line"] - 1, pos["column"]) + + +def edit_file(file: str, rewrite: Callable[[str], str]) -> None: + with open(file, "r") as f: + lines = f.readlines() + lines = [rewrite(line) for line in lines] + with open(file, "w") as f: + f.writelines(lines) + + +def edit_file_at_pos(pos: AttrPos, rewrite: Callable[[str], str]) -> None: + with open(pos.file, "r") as f: + lines = f.readlines() + lines[pos.line] = rewrite(lines[pos.line]) + with open(pos.file, "w") as f: + f.writelines(lines) + + +def read_value_at_pos(pos: AttrPos) -> str: + with open(pos.file, "r") as f: + lines = f.readlines() + return value_from_nix_line(lines[pos.line]) + + +def value_from_nix_line(line: str) -> str: + return line.split("=")[1].strip().strip(";").strip('"') + + +def replace_value_in_nix_line(new: str) -> Callable[[str], str]: + return lambda line: line.replace(value_from_nix_line(line), new) + + def main() -> None: sh = logging.StreamHandler(sys.stderr) sh.setFormatter( @@ -247,6 +336,7 @@ def main() -> None: help="whether to commit changes to git", ) args = parser.parse_args() + cli_version = parse(args.cli_version) repo = git.Repo(Path(".").resolve(), search_parent_directories=True) # Workaround for https://github.com/gitpython-developers/GitPython/issues/1923 @@ -258,7 +348,57 @@ def main() -> None: assert index["formatVersion"] == "1" # only support formatVersion 1 extensions_remote = index["extensions"] - cli_version = parse(args.cli_version) + if args.extension: + logger.info(f"updating extension: {args.extension}") + + ext = Optional[Ext] + for _ext_name, extension in extensions_remote.items(): + extension = processExtension( + extension, cli_version, args.extension, requirements=True + ) + if extension: + ext = extension + break + if not ext: + logger.error(f"Extension {args.extension} not found in index") + exit(1) + + version_pos = nix_unsafe_get_attr_pos( + "version", f"azure-cli-extensions.{ext.pname}" + ) + if not version_pos: + logger.error( + f"no position for attribute 'version' found on attribute path {ext.pname}" + ) + exit(1) + version = read_value_at_pos(version_pos) + current_version = parse(version) + + if ext.version == current_version: + logger.info( + f"no update needed for {ext.pname}, latest version is {ext.version}" + ) + return + logger.info("updated extensions:") + logger.info(f" {ext.pname} {current_version} -> {ext.version}") + edit_file_at_pos(version_pos, replace_value_in_nix_line(str(ext.version))) + + current_hash = nix_get_value(f"azure-cli-extensions.{ext.pname}.src.outputHash") + if not current_hash: + logger.error( + f"no attribute 'src.outputHash' found on attribute path {ext.pname}" + ) + exit(1) + edit_file(version_pos.file, lambda line: line.replace(current_hash, ext.hash)) + + if args.commit: + commit_msg = ( + f"azure-cli-extensions.{ext.pname}: {current_version} -> {ext.version}" + ) + _commit(repo, commit_msg, [Path(version_pos.file)], actor) + return + + logger.info("updating generated extension set") extensions_remote_filtered = set() for _ext_name, extension in extensions_remote.items(): diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix index 0ed7f51f6ebc..abe75e106e10 100644 --- a/pkgs/by-name/az/azure-cli/package.nix +++ b/pkgs/by-name/az/azure-cli/package.nix @@ -408,7 +408,6 @@ py.pkgs.toPythonApplication ( } '' black --check --diff $src - # mypy --strict $src isort --profile=black --check --diff $src install -Dm755 $src $out/bin/extensions-tool From 96454144c9b8a683ce68fd3cf6e80970bacafdc0 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Thu, 23 Jan 2025 09:31:14 +0100 Subject: [PATCH 41/71] azure-cli: add update script to mkAzExtension Signed-off-by: Paul Meyer --- pkgs/by-name/az/azure-cli/package.nix | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix index abe75e106e10..b4d6294758e3 100644 --- a/pkgs/by-name/az/azure-cli/package.nix +++ b/pkgs/by-name/az/azure-cli/package.nix @@ -54,6 +54,9 @@ let { format = "wheel"; src = fetchurl { inherit url hash; }; + passthru = { + updateScript = extensionUpdateScript { inherit pname; }; + } // args.passthru or { }; meta = { inherit description; inherit (azure-cli.meta) platforms maintainers; @@ -67,13 +70,24 @@ let "url" "hash" "description" + "passthru" "meta" ]) ); + # Update script for azure cli extensions. Currently only works for manual extensions. + extensionUpdateScript = + { pname }: + [ + "${lib.getExe azure-cli.extensions-tool}" + "--cli-version" + "${azure-cli.version}" + "--extension" + "${pname}" + ]; - extensions-generated = lib.mapAttrs (name: ext: mkAzExtension ext) ( - builtins.fromJSON (builtins.readFile ./extensions-generated.json) - ); + extensions-generated = lib.mapAttrs ( + name: ext: mkAzExtension (ext // { passthru.updateScript = [ ]; }) + ) (builtins.fromJSON (builtins.readFile ./extensions-generated.json)); extensions-manual = callPackages ./extensions-manual.nix { inherit mkAzExtension; python3Packages = python3.pkgs; From 298f8004053f9cf08562660396d747ec0d1b9c44 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jan 2025 08:50:05 +0000 Subject: [PATCH 42/71] php84: 8.4.2 -> 8.4.3 --- 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 f51c712eecfe..84dadc68968e 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.2"; - hash = "sha256-70/pkhuIXOOwR3kqtgJg6vZX4igSvlEdGdDkXt+YR4M="; + version = "8.4.3"; + hash = "sha256-1rEjedHx3yFtGTKECjGxT+0eD8fo2x6dF5X3Wh516tk="; } ); in From e07a2af44bf7e6214c2d864ee4d503e8e53aaafb Mon Sep 17 00:00:00 2001 From: misilelab Date: Thu, 23 Jan 2025 18:44:08 +0900 Subject: [PATCH 43/71] uv: 0.5.22 -> 0.5.23 Signed-off-by: misilelab --- 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 17af958c3a0e..e87d91e0cc3d 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage rec { pname = "uv"; - version = "0.5.22"; + version = "0.5.23"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = version; - hash = "sha256-zAGPlzMkoJpvfT8CljCTz/qnWRROf5re4Js9zPgstt4="; + hash = "sha256-0uYAokw9hjgI+eU/1GrWdCDtFl1qWqkhvh+1qjeGSCQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-hMh0evlR8r01woSFVYWmheG3Di6m/QYHHWsoK95Ia3Q="; + cargoHash = "sha256-yv5asWS6XLI22Z1kkGB6xJ6XFFMfOvFYcvvFvjRu8D4="; nativeBuildInputs = [ cmake From 219f9c0190e999db4439500b899a5fbb27a1a788 Mon Sep 17 00:00:00 2001 From: Sander Date: Thu, 23 Jan 2025 14:20:45 +0400 Subject: [PATCH 44/71] cachix: 1.7.5 -> 1.7.6 --- .../haskell-modules/configuration-common.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1f4fb42885cd..6953d87acff6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -513,22 +513,22 @@ self: super: { # Manually maintained cachix-api = overrideCabal (drv: { - version = "1.7.5"; + version = "1.7.6"; src = pkgs.fetchFromGitHub { owner = "cachix"; repo = "cachix"; - rev = "v1.7.5"; - sha256 = "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs="; + rev = "v1.7.6"; + hash = "sha256-8HFvG7fvIFbgtaYAY2628Tb89fA55nPm2jSiNs0/Cws="; }; postUnpack = "sourceRoot=$sourceRoot/cachix-api"; }) super.cachix-api; cachix = (overrideCabal (drv: { - version = "1.7.5"; + version = "1.7.6"; src = pkgs.fetchFromGitHub { owner = "cachix"; repo = "cachix"; - rev = "v1.7.5"; - sha256 = "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs="; + rev = "v1.7.6"; + hash = "sha256-8HFvG7fvIFbgtaYAY2628Tb89fA55nPm2jSiNs0/Cws="; }; postUnpack = "sourceRoot=$sourceRoot/cachix"; }) (lib.pipe From c805021f3a95da44a1811f1235b997f57d893dc3 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 23 Jan 2025 13:55:25 +0300 Subject: [PATCH 45/71] linuxManualConfig: expose moduleMakeFlags for out-of-tree module builds --- .../linux/kernel/manual-config.nix | 37 +++++++++++++------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index d5722bbbd6f4..0b5e64dd6d4d 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -421,18 +421,9 @@ let timeout = 14400; # 4 hours } // extraMeta; }; -in - -stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPatches configfile) // { - inherit pname version; - - enableParallelBuilding = true; - - hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ]; # Absolute paths for compilers avoid any PATH-clobbering issues. - makeFlags = [ - "O=$(buildRoot)" + commonMakeFlags = [ "ARCH=${stdenv.hostPlatform.linuxArch}" "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ] ++ lib.optionals (stdenv.isx86_64 && stdenv.cc.bintools.isLLVM) [ @@ -444,5 +435,27 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat ] ++ (stdenv.hostPlatform.linux-kernel.makeFlags or []) ++ extraMakeFlags; - karch = stdenv.hostPlatform.linuxArch; -} // (optionalAttrs (pos != null) { inherit pos; }))) + finalKernel = stdenv.mkDerivation ( + builtins.foldl' lib.recursiveUpdate {} [ + (drvAttrs config stdenv.hostPlatform.linux-kernel kernelPatches configfile) + { + inherit pname version; + + enableParallelBuilding = true; + + hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ]; + + makeFlags = [ + "O=$(buildRoot)" + ] ++ commonMakeFlags; + + passthru.moduleMakeFlags = [ + "KBUILD_OUTPUT=${finalKernel.dev}/lib/modules/${finalKernel.modDirVersion}/build" + ] ++ commonMakeFlags; + + karch = stdenv.hostPlatform.linuxArch; + } + (optionalAttrs (pos != null) { inherit pos; }) + ] + ); +in finalKernel) From 13eb9ce5b5c051be0fa1d0ff073ea8db6dc14d54 Mon Sep 17 00:00:00 2001 From: liberodark Date: Wed, 22 Jan 2025 12:48:10 +0100 Subject: [PATCH 46/71] orca-slicer v2.2.0-unstable-2025-01-06 -> v2.2.0-unstable-2025-01-23 --- pkgs/by-name/or/orca-slicer/package.nix | 15 +++-- .../or/orca-slicer/patches/fix-boost.patch | 60 ------------------- 2 files changed, 7 insertions(+), 68 deletions(-) delete mode 100644 pkgs/by-name/or/orca-slicer/patches/fix-boost.patch diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix index 73ed55bb1a79..faa025a797f0 100644 --- a/pkgs/by-name/or/orca-slicer/package.nix +++ b/pkgs/by-name/or/orca-slicer/package.nix @@ -6,7 +6,7 @@ cmake, pkg-config, wrapGAppsHook3, - boost, + boost186, cereal, cgal, curl, @@ -56,13 +56,13 @@ let in stdenv.mkDerivation rec { pname = "orca-slicer"; - version = "v2.2.0-unstable-2025-01-06"; + version = "v2.2.0-unstable-2025-01-23"; src = fetchFromGitHub { owner = "SoftFever"; repo = "OrcaSlicer"; - rev = "99a0facfb3a5c9b4e661e536825c08393053cb53"; - hash = "sha256-XWM04Vx65q+Vc+s3YLucS63IhGVw8ODhL2m+47nZKs8="; + rev = "1b1288c4353afca44edee323061bdd5c87fcafb9"; + hash = "sha256-IPdKusP2cB5jgr6JjQVu8ZjJ2kiG6mfmfZtDVSlAFNg="; }; nativeBuildInputs = [ @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { buildInputs = [ binutils - (boost.override { + (boost186.override { enableShared = true; enableStatic = false; extraFeatures = [ @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { "filesystem" ]; }) - boost.dev + boost186.dev cereal cgal curl @@ -127,7 +127,6 @@ stdenv.mkDerivation rec { # Fix for webkitgtk linking ./patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch ./patches/dont-link-opencv-world-orca.patch - ./patches/fix-boost.patch ]; doCheck = true; @@ -163,7 +162,7 @@ stdenv.mkDerivation rec { (lib.optionalString withSystemd "-ludev") "-L${mesa.osmesa}/lib" "-L${mesa.drivers}/lib" - "-L${boost}/lib" + "-L${boost186}/lib" "-lboost_log" "-lboost_log_setup" ]; diff --git a/pkgs/by-name/or/orca-slicer/patches/fix-boost.patch b/pkgs/by-name/or/orca-slicer/patches/fix-boost.patch deleted file mode 100644 index aaced2fe79e5..000000000000 --- a/pkgs/by-name/or/orca-slicer/patches/fix-boost.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/src/libslic3r/PrintBase.cpp b/src/libslic3r/PrintBase.cpp -index 25b282c7b..81ee858c2 100644 ---- a/src/libslic3r/PrintBase.cpp -+++ b/src/libslic3r/PrintBase.cpp -@@ -79,7 +79,7 @@ std::string PrintBase::output_filename(const std::string &format, const std::str - cfg.opt_string("input_filename_base") + default_ext : - this->placeholder_parser().process(format, 0, &cfg); - if (filename.extension().empty()) -- filename = boost::filesystem::change_extension(filename, default_ext); -+ filename.replace_extension(default_ext); - return filename.string(); - } catch (std::runtime_error &err) { - throw Slic3r::PlaceholderParserError(L("Failed processing of the filename_format template.") + "\n" + err.what()); -diff --git a/src/slic3r/GUI/AuxiliaryDataViewModel.cpp b/src/slic3r/GUI/AuxiliaryDataViewModel.cpp -index 50368b854..cad5cf545 100644 ---- a/src/slic3r/GUI/AuxiliaryDataViewModel.cpp -+++ b/src/slic3r/GUI/AuxiliaryDataViewModel.cpp -@@ -337,7 +337,7 @@ wxDataViewItemArray AuxiliaryModel::ImportFile(AuxiliaryModelNode* sel, wxArrayS - dir_path += "\\" + src_bfs_path.filename().generic_wstring(); - - boost::system::error_code ec; -- if (!fs::copy_file(src_bfs_path, fs::path(dir_path.ToStdWstring()), fs::copy_option::overwrite_if_exists, ec)) -+ if (!fs::copy_file(src_bfs_path, fs::path(dir_path.ToStdWstring()), fs::copy_options::overwrite_existing, ec)) - continue; - - // Update model data -diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp -index f3782be14..e12f0c321 100644 ---- a/src/slic3r/GUI/Plater.cpp -+++ b/src/slic3r/GUI/Plater.cpp -@@ -10265,7 +10265,7 @@ bool Plater::preview_zip_archive(const boost::filesystem::path& archive_path) - std::replace(name.begin(), name.end(), '\\', '/'); - // rename if file exists - std::string filename = path.filename().string(); -- std::string extension = boost::filesystem::extension(path); -+ std::string extension = path.extension().string(); - std::string just_filename = filename.substr(0, filename.size() - extension.size()); - std::string final_filename = just_filename; - -diff --git a/src/slic3r/GUI/RemovableDriveManager.cpp b/src/slic3r/GUI/RemovableDriveManager.cpp -index a26e13448..83ec4695c 100644 ---- a/src/slic3r/GUI/RemovableDriveManager.cpp -+++ b/src/slic3r/GUI/RemovableDriveManager.cpp -@@ -22,7 +22,6 @@ - #include - #include - #include --#include - #include - #endif - -@@ -202,7 +201,7 @@ namespace search_for_drives_internal - stat(path.c_str(), &buf); - uid_t uid = buf.st_uid; - if (getuid() == uid) -- out.emplace_back(DriveData{ boost::filesystem::basename(boost::filesystem::path(path)), path }); -+ out.emplace_back(DriveData{ boost::filesystem::path(path).stem().string(), path }); - } - } - } From aa3e94fe7c5f708f21608efb8b5821db67a27ddc Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 23 Jan 2025 13:55:58 +0300 Subject: [PATCH 47/71] treewide: kernel.makeFlags -> kernel.moduleMakeFlags --- pkgs/applications/emulators/cdemu/vhba.nix | 2 +- pkgs/os-specific/linux/acpi-call/default.nix | 2 +- pkgs/os-specific/linux/akvcam/default.nix | 2 +- pkgs/os-specific/linux/amneziawg/default.nix | 2 +- pkgs/os-specific/linux/apfs/default.nix | 2 +- pkgs/os-specific/linux/batman-adv/default.nix | 2 +- pkgs/os-specific/linux/bbswitch/default.nix | 2 +- pkgs/os-specific/linux/can-isotp/default.nix | 2 +- pkgs/os-specific/linux/cryptodev/default.nix | 2 +- pkgs/os-specific/linux/ddcci/default.nix | 2 +- pkgs/os-specific/linux/digimend/default.nix | 2 +- pkgs/os-specific/linux/dpdk-kmods/default.nix | 2 +- pkgs/os-specific/linux/drbd/driver.nix | 2 +- pkgs/os-specific/linux/ena/default.nix | 2 +- pkgs/os-specific/linux/evdi/default.nix | 2 +- pkgs/os-specific/linux/fanout/default.nix | 2 +- .../linux/framework-laptop-kmod/default.nix | 2 +- pkgs/os-specific/linux/fwts/module.nix | 2 +- pkgs/os-specific/linux/gasket/default.nix | 2 +- .../os-specific/linux/gcadapter-oc-kmod/default.nix | 2 +- pkgs/os-specific/linux/hid-ite8291r3/default.nix | 2 +- pkgs/os-specific/linux/hid-t150/default.nix | 2 +- pkgs/os-specific/linux/hid-tmff2/default.nix | 2 +- pkgs/os-specific/linux/ipu6-drivers/default.nix | 2 +- pkgs/os-specific/linux/ithc/default.nix | 2 +- pkgs/os-specific/linux/ivsc-driver/default.nix | 2 +- pkgs/os-specific/linux/jool/default.nix | 2 +- pkgs/os-specific/linux/kernel/perf/default.nix | 2 +- pkgs/os-specific/linux/lenovo-legion/default.nix | 2 +- pkgs/os-specific/linux/lkrg/default.nix | 2 +- pkgs/os-specific/linux/lttng-modules/default.nix | 2 +- pkgs/os-specific/linux/mba6x_bl/default.nix | 2 +- .../mbp-modules/mbp2018-bridge-drv/default.nix | 2 +- pkgs/os-specific/linux/msi-ec/default.nix | 2 +- pkgs/os-specific/linux/mstflint_access/default.nix | 2 +- pkgs/os-specific/linux/nct6687d/default.nix | 2 +- pkgs/os-specific/linux/netatop/default.nix | 2 +- pkgs/os-specific/linux/nullfs/default.nix | 2 +- pkgs/os-specific/linux/nvidia-x11/generic.nix | 2 +- pkgs/os-specific/linux/nvidia-x11/open.nix | 2 +- pkgs/os-specific/linux/openrazer/driver.nix | 2 +- pkgs/os-specific/linux/qc71_laptop/default.nix | 2 +- pkgs/os-specific/linux/r8168/default.nix | 2 +- pkgs/os-specific/linux/rtl8189es/default.nix | 2 +- pkgs/os-specific/linux/rtl8192eu/default.nix | 4 +++- pkgs/os-specific/linux/rtl8814au/default.nix | 2 +- pkgs/os-specific/linux/rtl8821ce/default.nix | 2 +- pkgs/os-specific/linux/rtl8821cu/default.nix | 2 +- pkgs/os-specific/linux/rtl88x2bu/default.nix | 2 +- pkgs/os-specific/linux/rtw88/default.nix | 4 +++- pkgs/os-specific/linux/rtw89/default.nix | 4 +++- .../linux/rust-out-of-tree-module/default.nix | 4 +++- pkgs/os-specific/linux/shufflecake/default.nix | 2 +- pkgs/os-specific/linux/tmon/default.nix | 2 +- pkgs/os-specific/linux/trelay/default.nix | 2 +- pkgs/os-specific/linux/tsme-test/default.nix | 2 +- pkgs/os-specific/linux/tuxedo-drivers/default.nix | 13 +++++-------- pkgs/os-specific/linux/v4l2loopback/default.nix | 2 +- .../linux/veikk-linux-driver/default.nix | 2 +- pkgs/os-specific/linux/virtio_vmmci/default.nix | 2 +- pkgs/os-specific/linux/vmm_clock/default.nix | 2 +- pkgs/os-specific/linux/xpadneo/default.nix | 2 +- pkgs/os-specific/linux/zenergy/default.nix | 2 +- pkgs/os-specific/linux/zfs/generic.nix | 4 ++-- 64 files changed, 77 insertions(+), 72 deletions(-) diff --git a/pkgs/applications/emulators/cdemu/vhba.nix b/pkgs/applications/emulators/cdemu/vhba.nix index 4ab79810dc2a..b5487fa68c45 100644 --- a/pkgs/applications/emulators/cdemu/vhba.nix +++ b/pkgs/applications/emulators/cdemu/vhba.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { hash = "sha256-zjTLriw2zvjX0Jxfa9QtaHG5tTC7cLTKEA+WSCP+Dpg="; }; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix index 0b4101246930..2bce3881edca 100644 --- a/pkgs/os-specific/linux/acpi-call/default.nix +++ b/pkgs/os-specific/linux/acpi-call/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/akvcam/default.nix b/pkgs/os-specific/linux/akvcam/default.nix index f7c4a9edbc1a..cd2022097d51 100644 --- a/pkgs/os-specific/linux/akvcam/default.nix +++ b/pkgs/os-specific/linux/akvcam/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sourceRoot = "${src.name}/src"; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/amneziawg/default.nix b/pkgs/os-specific/linux/amneziawg/default.nix index f0e76f7f58b0..9e21f4176b55 100644 --- a/pkgs/os-specific/linux/amneziawg/default.nix +++ b/pkgs/os-specific/linux/amneziawg/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { ]; makeFlags = - kernel.makeFlags + kernel.moduleMakeFlags ++ [ "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ] ++ lib.optional (lib.versionAtLeast kernel.version "5.6") "KERNEL_SOURCE_DIR=${srcOnly kernel}"; diff --git a/pkgs/os-specific/linux/apfs/default.nix b/pkgs/os-specific/linux/apfs/default.nix index d8bf15f0a845..1e46fbb9121a 100644 --- a/pkgs/os-specific/linux/apfs/default.nix +++ b/pkgs/os-specific/linux/apfs/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KERNELRELEASE=${kernel.modDirVersion}" "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index d9a7890ae98a..14ee2a8db539 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KERNELPATH=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index 67c4bcbbcb0f..bdf71c470725 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { --replace "/lib/modules" "${kernel.dev}/lib/modules" ''; - makeFlags = kernel.makeFlags; + makeFlags = kernel.moduleMakeFlags; installPhase = '' mkdir -p $out/lib/modules/${kernel.modDirVersion}/misc diff --git a/pkgs/os-specific/linux/can-isotp/default.nix b/pkgs/os-specific/linux/can-isotp/default.nix index 1a6f78d82824..9e348e78e315 100644 --- a/pkgs/os-specific/linux/can-isotp/default.nix +++ b/pkgs/os-specific/linux/can-isotp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { sha256 = "1laax93czalclg7cy9iq1r7hfh9jigh7igj06y9lski75ap2vhfq"; }; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=${placeholder "out"}" ]; diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index ff1a4f88f0cc..eee504a0633d 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" "prefix=$(out)" diff --git a/pkgs/os-specific/linux/ddcci/default.nix b/pkgs/os-specific/linux/ddcci/default.nix index d674daabbeca..cfe8b16da956 100644 --- a/pkgs/os-specific/linux/ddcci/default.nix +++ b/pkgs/os-specific/linux/ddcci/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { --replace depmod \# ''; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "KVER=${kernel.modDirVersion}" "KERNEL_MODLIB=$(out)/lib/modules/${kernel.modDirVersion}" diff --git a/pkgs/os-specific/linux/digimend/default.nix b/pkgs/os-specific/linux/digimend/default.nix index 31d68acc5316..3262b1d0c1c1 100644 --- a/pkgs/os-specific/linux/digimend/default.nix +++ b/pkgs/os-specific/linux/digimend/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { rm -r $out/lib/udev ''; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KVERSION=${kernel.modDirVersion}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "DESTDIR=${placeholder "out"}" diff --git a/pkgs/os-specific/linux/dpdk-kmods/default.nix b/pkgs/os-specific/linux/dpdk-kmods/default.nix index 6b19320dd9e3..6db752a885b6 100644 --- a/pkgs/os-specific/linux/dpdk-kmods/default.nix +++ b/pkgs/os-specific/linux/dpdk-kmods/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" ]; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "INSTALL_MOD_PATH=${placeholder "out"}" ]; KSRC = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/pkgs/os-specific/linux/drbd/driver.nix b/pkgs/os-specific/linux/drbd/driver.nix index ce944bce3e0a..a76758fbdb8e 100644 --- a/pkgs/os-specific/linux/drbd/driver.nix +++ b/pkgs/os-specific/linux/drbd/driver.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "KVER=${kernel.version}" "INSTALL_MOD_PATH=${placeholder "out"}" diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index 963b683a8593..40e22d2008fc 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags; + makeFlags = kernel.moduleMakeFlags; env.KERNEL_BUILD_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index 25634b4f78d0..8703fb9010ac 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { python3WithLibs ]; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KVER=${kernel.modDirVersion}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/fanout/default.nix b/pkgs/os-specific/linux/fanout/default.nix index 2798f9da6233..99ee011fcf8e 100644 --- a/pkgs/os-specific/linux/fanout/default.nix +++ b/pkgs/os-specific/linux/fanout/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/framework-laptop-kmod/default.nix b/pkgs/os-specific/linux/framework-laptop-kmod/default.nix index 1b5b70af88e0..4bb8f4f0e79e 100644 --- a/pkgs/os-specific/linux/framework-laptop-kmod/default.nix +++ b/pkgs/os-specific/linux/framework-laptop-kmod/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/fwts/module.nix b/pkgs/os-specific/linux/fwts/module.nix index dd005e6dc4e6..7caafe491ab2 100644 --- a/pkgs/os-specific/linux/fwts/module.nix +++ b/pkgs/os-specific/linux/fwts/module.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" ]; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "INSTALL_MOD_PATH=${placeholder "out"}" ]; diff --git a/pkgs/os-specific/linux/gasket/default.nix b/pkgs/os-specific/linux/gasket/default.nix index 76e0bfd770c7..43bcd899742c 100644 --- a/pkgs/os-specific/linux/gasket/default.nix +++ b/pkgs/os-specific/linux/gasket/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { cd src ''; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "-C" "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "M=$(PWD)" diff --git a/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix b/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix index c56914fcee7a..adac60eb2489 100644 --- a/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix +++ b/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KERNEL_SOURCE_DIR=${kernel.dev}/${kerneldir}/build" "INSTALL_MOD_PATH=$(out)" ]; diff --git a/pkgs/os-specific/linux/hid-ite8291r3/default.nix b/pkgs/os-specific/linux/hid-ite8291r3/default.nix index e7d7ccb27a9f..5f24fda01d9e 100644 --- a/pkgs/os-specific/linux/hid-ite8291r3/default.nix +++ b/pkgs/os-specific/linux/hid-ite8291r3/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "VERSION=${version}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/hid-t150/default.nix b/pkgs/os-specific/linux/hid-t150/default.nix index 7cb40d01aaff..74a254b6e22f 100644 --- a/pkgs/os-specific/linux/hid-t150/default.nix +++ b/pkgs/os-specific/linux/hid-t150/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { sourceRoot = "${src.name}/hid-t150"; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=${placeholder "out"}" ]; diff --git a/pkgs/os-specific/linux/hid-tmff2/default.nix b/pkgs/os-specific/linux/hid-tmff2/default.nix index 7957bf90400a..3784746ca9d3 100644 --- a/pkgs/os-specific/linux/hid-tmff2/default.nix +++ b/pkgs/os-specific/linux/hid-tmff2/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/ipu6-drivers/default.nix b/pkgs/os-specific/linux/ipu6-drivers/default.nix index d3e37f5a5bd4..0be218282d2c 100644 --- a/pkgs/os-specific/linux/ipu6-drivers/default.nix +++ b/pkgs/os-specific/linux/ipu6-drivers/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KERNELRELEASE=${kernel.modDirVersion}" "KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/ithc/default.nix b/pkgs/os-specific/linux/ithc/default.nix index ff888ec16599..0ede651706bc 100644 --- a/pkgs/os-specific/linux/ithc/default.nix +++ b/pkgs/os-specific/linux/ithc/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "VERSION=${version}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/ivsc-driver/default.nix b/pkgs/os-specific/linux/ivsc-driver/default.nix index e4c6c9d5adcd..93ce524672a2 100644 --- a/pkgs/os-specific/linux/ivsc-driver/default.nix +++ b/pkgs/os-specific/linux/ivsc-driver/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KERNELRELEASE=${kernel.modDirVersion}" "KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix index edbc3359386f..e1d892d33fd0 100644 --- a/pkgs/os-specific/linux/jool/default.nix +++ b/pkgs/os-specific/linux/jool/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { sed -e 's@/lib/modules/\$(.*)@${kernel.dev}/lib/modules/${kernel.modDirVersion}@' -i src/mod/*/Makefile ''; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "-C src/mod" "INSTALL_MOD_PATH=${placeholder "out"}" ]; diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index c74aa7f4285a..c5228f4aca2b 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation { "WERROR=0" "ASCIIDOC8=1" ] - ++ kernel.makeFlags + ++ kernel.moduleMakeFlags ++ lib.optional (!withGtk) "NO_GTK2=1" ++ lib.optional (!withZstd) "NO_LIBZSTD=1" ++ lib.optional (!withLibcap) "NO_LIBCAP=1"; diff --git a/pkgs/os-specific/linux/lenovo-legion/default.nix b/pkgs/os-specific/linux/lenovo-legion/default.nix index 75d8a10b8d06..ef1acb055077 100644 --- a/pkgs/os-specific/linux/lenovo-legion/default.nix +++ b/pkgs/os-specific/linux/lenovo-legion/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { sed -i -e '/depmod/d' ./Makefile ''; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "SHELL=bash" "KERNELVERSION=${kernel.modDirVersion}" "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" diff --git a/pkgs/os-specific/linux/lkrg/default.nix b/pkgs/os-specific/linux/lkrg/default.nix index 9b5676037776..760e08d4cbbf 100644 --- a/pkgs/os-specific/linux/lkrg/default.nix +++ b/pkgs/os-specific/linux/lkrg/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KERNEL=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index f37c15979f57..75421fed139e 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=${placeholder "out"}" ]; diff --git a/pkgs/os-specific/linux/mba6x_bl/default.nix b/pkgs/os-specific/linux/mba6x_bl/default.nix index 2f5358e6ea15..2b4acd172bbb 100644 --- a/pkgs/os-specific/linux/mba6x_bl/default.nix +++ b/pkgs/os-specific/linux/mba6x_bl/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; diff --git a/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix b/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix index 6907ffeec752..388777c1f6f7 100644 --- a/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix +++ b/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags; + makeFlags = kernel.moduleMakeFlags; buildPhase = '' make -C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build \ diff --git a/pkgs/os-specific/linux/msi-ec/default.nix b/pkgs/os-specific/linux/msi-ec/default.nix index 2720eb652eb9..d73eae69a05b 100644 --- a/pkgs/os-specific/linux/msi-ec/default.nix +++ b/pkgs/os-specific/linux/msi-ec/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; diff --git a/pkgs/os-specific/linux/mstflint_access/default.nix b/pkgs/os-specific/linux/mstflint_access/default.nix index ee84b2508e66..0ce131315b71 100644 --- a/pkgs/os-specific/linux/mstflint_access/default.nix +++ b/pkgs/os-specific/linux/mstflint_access/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KVER=${kernel.modDirVersion}" "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/nct6687d/default.nix b/pkgs/os-specific/linux/nct6687d/default.nix index 19d52276ecef..218f7f0eb8d0 100644 --- a/pkgs/os-specific/linux/nct6687d/default.nix +++ b/pkgs/os-specific/linux/nct6687d/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "-C" "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "M=$(sourceRoot)" diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix index 4b8cf9019efa..e116f0925712 100644 --- a/pkgs/os-specific/linux/netatop/default.nix +++ b/pkgs/os-specific/linux/netatop/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { kmod=${kmod} substituteAllInPlace netatop.service ''; - makeFlags = kernel.makeFlags; + makeFlags = kernel.moduleMakeFlags; preInstall = '' mkdir -p $out/lib/systemd/system $out/bin $out/sbin $out/share/man/man{4,8} diff --git a/pkgs/os-specific/linux/nullfs/default.nix b/pkgs/os-specific/linux/nullfs/default.nix index 62a71829b2e1..5b6a5517d6de 100644 --- a/pkgs/os-specific/linux/nullfs/default.nix +++ b/pkgs/os-specific/linux/nullfs/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 3e45be1123fc..1c11334d002c 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -215,7 +215,7 @@ let kernelVersion = if libsOnly then null else kernel.modDirVersion; makeFlags = lib.optionals (!libsOnly) ( - kernel.makeFlags + kernel.moduleMakeFlags ++ [ "IGNORE_PREEMPT_RT_PRESENCE=1" "NV_BUILD_SUPPORTS_HMM=1" diff --git a/pkgs/os-specific/linux/nvidia-x11/open.nix b/pkgs/os-specific/linux/nvidia-x11/open.nix index 7f60918f3872..e0e1c0b33ab8 100644 --- a/pkgs/os-specific/linux/nvidia-x11/open.nix +++ b/pkgs/os-specific/linux/nvidia-x11/open.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation ( nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "SYSSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" "SYSOUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "MODLIB=$(out)/lib/modules/${kernel.modDirVersion}" diff --git a/pkgs/os-specific/linux/openrazer/driver.nix b/pkgs/os-specific/linux/openrazer/driver.nix index 38b4312cc31f..1d80b27c84fd 100644 --- a/pkgs/os-specific/linux/openrazer/driver.nix +++ b/pkgs/os-specific/linux/openrazer/driver.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation ( nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/qc71_laptop/default.nix b/pkgs/os-specific/linux/qc71_laptop/default.nix index 952337ef282b..72a0c7db798e 100644 --- a/pkgs/os-specific/linux/qc71_laptop/default.nix +++ b/pkgs/os-specific/linux/qc71_laptop/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "VERSION=${version}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/r8168/default.nix b/pkgs/os-specific/linux/r8168/default.nix index 9806ddebb8d3..7403f6d2ef86 100644 --- a/pkgs/os-specific/linux/r8168/default.nix +++ b/pkgs/os-specific/linux/r8168/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { # avoid using the Makefile directly -- it doesn't understand # any kernel but the current. # based on the ArchLinux pkgbuild: https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/r8168 - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "-C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "M=$(PWD)/src" "modules" diff --git a/pkgs/os-specific/linux/rtl8189es/default.nix b/pkgs/os-specific/linux/rtl8189es/default.nix index a0588c5ce20c..33fbd30fd2bb 100644 --- a/pkgs/os-specific/linux/rtl8189es/default.nix +++ b/pkgs/os-specific/linux/rtl8189es/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { substituteInPlace ./Makefile --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ( "CONFIG_PLATFORM_I386_PC=" diff --git a/pkgs/os-specific/linux/rtl8192eu/default.nix b/pkgs/os-specific/linux/rtl8192eu/default.nix index 0737d1fae87c..4a98cd915276 100644 --- a/pkgs/os-specific/linux/rtl8192eu/default.nix +++ b/pkgs/os-specific/linux/rtl8192eu/default.nix @@ -25,7 +25,9 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies ++ [ bc ]; - makeFlags = kernel.makeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; + makeFlags = kernel.moduleMakeFlags ++ [ + "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/rtl8814au/default.nix b/pkgs/os-specific/linux/rtl8814au/default.nix index c808fa95dd24..a29075695896 100644 --- a/pkgs/os-specific/linux/rtl8814au/default.nix +++ b/pkgs/os-specific/linux/rtl8814au/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags; + makeFlags = kernel.moduleMakeFlags; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index 67046b28c9ab..8715a71652a5 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { hardeningDisable = [ "pic" ]; nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags; + makeFlags = kernel.moduleMakeFlags; prePatch = '' substituteInPlace ./Makefile \ diff --git a/pkgs/os-specific/linux/rtl8821cu/default.nix b/pkgs/os-specific/linux/rtl8821cu/default.nix index 270d6832f412..70f2b9f572c2 100644 --- a/pkgs/os-specific/linux/rtl8821cu/default.nix +++ b/pkgs/os-specific/linux/rtl8821cu/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags; + makeFlags = kernel.moduleMakeFlags; prePatch = '' substituteInPlace ./Makefile \ diff --git a/pkgs/os-specific/linux/rtl88x2bu/default.nix b/pkgs/os-specific/linux/rtl88x2bu/default.nix index 91ed7cf9b490..119795f2c3aa 100644 --- a/pkgs/os-specific/linux/rtl88x2bu/default.nix +++ b/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags; + makeFlags = kernel.moduleMakeFlags; prePatch = '' substituteInPlace ./Makefile \ diff --git a/pkgs/os-specific/linux/rtw88/default.nix b/pkgs/os-specific/linux/rtw88/default.nix index 095f4135c82d..0c830c34cd29 100644 --- a/pkgs/os-specific/linux/rtw88/default.nix +++ b/pkgs/os-specific/linux/rtw88/default.nix @@ -20,7 +20,9 @@ stdenv.mkDerivation { }; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; + makeFlags = kernel.moduleMakeFlags ++ [ + "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/rtw89/default.nix b/pkgs/os-specific/linux/rtw89/default.nix index a704f75ec174..8e90bcf9f08d 100644 --- a/pkgs/os-specific/linux/rtw89/default.nix +++ b/pkgs/os-specific/linux/rtw89/default.nix @@ -20,7 +20,9 @@ stdenv.mkDerivation { }; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; + makeFlags = kernel.moduleMakeFlags ++ [ + "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/rust-out-of-tree-module/default.nix b/pkgs/os-specific/linux/rust-out-of-tree-module/default.nix index c2a4a52c20e5..61c807be3911 100644 --- a/pkgs/os-specific/linux/rust-out-of-tree-module/default.nix +++ b/pkgs/os-specific/linux/rust-out-of-tree-module/default.nix @@ -17,7 +17,9 @@ kernel.stdenv.mkDerivation { }; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; + makeFlags = kernel.moduleMakeFlags ++ [ + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ]; installTargets = [ "modules_install" ]; diff --git a/pkgs/os-specific/linux/shufflecake/default.nix b/pkgs/os-specific/linux/shufflecake/default.nix index 372c237e651b..aed568556714 100644 --- a/pkgs/os-specific/linux/shufflecake/default.nix +++ b/pkgs/os-specific/linux/shufflecake/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { libgcrypt lvm2 ]; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/tmon/default.nix b/pkgs/os-specific/linux/tmon/default.nix index 764891a4bbc1..fe721e2912fd 100644 --- a/pkgs/os-specific/linux/tmon/default.nix +++ b/pkgs/os-specific/linux/tmon/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { cd tools/thermal/tmon ''; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "INSTALL_ROOT=\"$(out)\"" "BINDIR=bin" ]; diff --git a/pkgs/os-specific/linux/trelay/default.nix b/pkgs/os-specific/linux/trelay/default.nix index 291d8a2111bb..4b9684bcbbc5 100644 --- a/pkgs/os-specific/linux/trelay/default.nix +++ b/pkgs/os-specific/linux/trelay/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { cp '${./Makefile}' Makefile ''; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KERNELRELEASE=${kernel.modDirVersion}" "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" diff --git a/pkgs/os-specific/linux/tsme-test/default.nix b/pkgs/os-specific/linux/tsme-test/default.nix index fc35b49106cc..8f47dbe9f652 100644 --- a/pkgs/os-specific/linux/tsme-test/default.nix +++ b/pkgs/os-specific/linux/tsme-test/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/tuxedo-drivers/default.nix b/pkgs/os-specific/linux/tuxedo-drivers/default.nix index 93d84c1f8978..1fd18d36f56f 100644 --- a/pkgs/os-specific/linux/tuxedo-drivers/default.nix +++ b/pkgs/os-specific/linux/tuxedo-drivers/default.nix @@ -22,14 +22,11 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ pahole ]; nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; - # kernel makeFlags contain O=$$(buildRoot), that upstream passes through to make and causes build failure, so we filter it out here - makeFlags = - (lib.filter (flag: lib.head (lib.strings.splitString "=" flag) != "O") kernel.makeFlags) - ++ [ - "KERNELRELEASE=${kernel.modDirVersion}" - "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - "INSTALL_MOD_PATH=${placeholder "out"}" - ]; + makeFlags = kernel.moduleMakeFlags ++ [ + "KERNELRELEASE=${kernel.modDirVersion}" + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "INSTALL_MOD_PATH=${placeholder "out"}" + ]; meta = { broken = stdenv.hostPlatform.isAarch64 || (lib.versionOlder kernel.version "5.5"); diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix index 86457e253770..104c0c687f1b 100644 --- a/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation { outputs = [ "out" "bin" ]; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "KERNELRELEASE=${kernel.modDirVersion}" "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/veikk-linux-driver/default.nix b/pkgs/os-specific/linux/veikk-linux-driver/default.nix index 7fc01712951f..55b1cf931d70 100644 --- a/pkgs/os-specific/linux/veikk-linux-driver/default.nix +++ b/pkgs/os-specific/linux/veikk-linux-driver/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ kernel ]; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "BUILD_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/virtio_vmmci/default.nix b/pkgs/os-specific/linux/virtio_vmmci/default.nix index 7b0853f4dca0..5c5fda8b8d13 100644 --- a/pkgs/os-specific/linux/virtio_vmmci/default.nix +++ b/pkgs/os-specific/linux/virtio_vmmci/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { CONFIG_RTC_HCTOSYS yes ''; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "DEPMOD=echo" "INSTALL_MOD_PATH=$(out)" "KERNELRELEASE=${kernel.modDirVersion}" diff --git a/pkgs/os-specific/linux/vmm_clock/default.nix b/pkgs/os-specific/linux/vmm_clock/default.nix index e4dbbf89b105..5d5bac541f47 100644 --- a/pkgs/os-specific/linux/vmm_clock/default.nix +++ b/pkgs/os-specific/linux/vmm_clock/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { CONFIG_RTC_HCTOSYS yes ''; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "DEPMOD=echo" "INSTALL_MOD_PATH=$(out)" "KERNELRELEASE=${kernel.modDirVersion}" diff --git a/pkgs/os-specific/linux/xpadneo/default.nix b/pkgs/os-specific/linux/xpadneo/default.nix index 39ce3e1c71a3..eefe8b139b0a 100644 --- a/pkgs/os-specific/linux/xpadneo/default.nix +++ b/pkgs/os-specific/linux/xpadneo/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = kernel.moduleBuildDependencies; buildInputs = [ bluez ]; - makeFlags = kernel.makeFlags ++ [ + makeFlags = kernel.moduleMakeFlags ++ [ "-C" "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "M=$(sourceRoot)" diff --git a/pkgs/os-specific/linux/zenergy/default.nix b/pkgs/os-specific/linux/zenergy/default.nix index cfdb63d2a135..2a737fb34f57 100644 --- a/pkgs/os-specific/linux/zenergy/default.nix +++ b/pkgs/os-specific/linux/zenergy/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { "pic" ]; - makeFlags = kernel.makeFlags ++ [ "KDIR=${kernelDirectory}" ]; + makeFlags = kernel.moduleMakeFlags ++ [ "KDIR=${kernelDirectory}" ]; installTargets = [ "modules_install" ]; diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index e00db1d6229e..690baaa5c510 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -191,10 +191,10 @@ let "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ] - ++ kernel.makeFlags + ++ kernel.moduleMakeFlags ); - makeFlags = optionals buildKernel kernel.makeFlags; + makeFlags = optionals buildKernel kernel.moduleMakeFlags; enableParallelBuilding = true; From 13e95c933d7b2d6514cce0f6d02b3df063b0b516 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 23 Jan 2025 11:52:48 +0100 Subject: [PATCH 48/71] ares-rs: update hashes and fix build The source hash was not updated during the most recent update. Fixes: cd6f445a719c ("ares-rs: 0.9.0 -> 0.10.0") --- pkgs/by-name/ar/ares-rs/package.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/ares-rs/package.nix b/pkgs/by-name/ar/ares-rs/package.nix index a40dfacb5abc..29c9b9d26fc2 100644 --- a/pkgs/by-name/ar/ares-rs/package.nix +++ b/pkgs/by-name/ar/ares-rs/package.nix @@ -2,6 +2,8 @@ lib, rustPlatform, fetchFromGitHub, + pkg-config, + openssl, }: rustPlatform.buildRustPackage rec { @@ -12,10 +14,17 @@ rustPlatform.buildRustPackage rec { owner = "bee-san"; repo = "ares"; tag = "v${version}"; - hash = "sha256-F+uBGRL1G8kiNZUCsiPbISBfId5BPwShenusqkcsHug="; + hash = "sha256-J+q7KeBthF9Wd08MNv0aHyLHgLUKg3mzQ8ic6+ashto="; }; - cargoHash = "sha256-c50HCwWwW4Fyg6hC1JqBfKtwq6kgReSOIBYXvwm04yA="; + cargoHash = "sha256-iJ04WPViqtafINkjn3PD8cE55LVdJZQXodAl3KlxweA="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + env = { + OPENSSL_NO_VENDOR = true; + }; meta = with lib; { description = "Automated decoding of encrypted text without knowing the key or ciphers used"; From 4734b223e1c9781586ecec5cf4786020b55a4b78 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jan 2025 13:11:28 +0100 Subject: [PATCH 49/71] python313Packages.led-ble: 1.1.1 -> 1.1.4 Diff: https://github.com/Bluetooth-Devices/led-ble/compare/refs/tags/v1.1.1...v1.1.4 Changelog: https://github.com/Bluetooth-Devices/led-ble/blob/v1.1.4/CHANGELOG.md --- pkgs/development/python-modules/led-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/led-ble/default.nix b/pkgs/development/python-modules/led-ble/default.nix index 9b4c088b2b16..5579ea4610a1 100644 --- a/pkgs/development/python-modules/led-ble/default.nix +++ b/pkgs/development/python-modules/led-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "led-ble"; - version = "1.1.1"; + version = "1.1.4"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "led-ble"; tag = "v${version}"; - hash = "sha256-FPF/jPsXVk16UDpfglmVy01sOpv/XAwx+dCYCbJnFZQ="; + hash = "sha256-+4qzAeFzU1Bdt9kvegBtaENh/dlRA0jbAUFr3WuSFsg="; }; build-system = [ poetry-core ]; From 135004811df5daf2c939983e73e2e80fbdf0fd78 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jan 2025 13:23:56 +0100 Subject: [PATCH 50/71] python313Packages.typst: 0.12.2 -> 0.12.3 Diff: https://github.com/messense/typst-py/compare/refs/tags/v0.12.2...v0.12.3 Changelog: https://github.com/messense/typst-py/releases/tag/v0.12.3 --- pkgs/development/python-modules/typst/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/typst/default.nix b/pkgs/development/python-modules/typst/default.nix index 02d3cb375582..3c0d3422883b 100644 --- a/pkgs/development/python-modules/typst/default.nix +++ b/pkgs/development/python-modules/typst/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "typst"; - version = "0.12.2"; + version = "0.12.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,13 +22,13 @@ buildPythonPackage rec { owner = "messense"; repo = "typst-py"; tag = "v${version}"; - hash = "sha256-vK55LoEc5BaS2tQwuLhXDnv8xiSOgk/ngU/gtbhZR2k="; + hash = "sha256-VgQbMeyvXjzE8jSaGLygIy8EhR23MpqjlU68FsBZq6E="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-01kSin3da58rPTHRmjyj62nf6HshmD6ARbhUd3eBfV0="; + hash = "sha256-H7lKoSDSx0cGH+VsIX90KaiWJw1h/BokNdKzxmvm6XQ="; }; build-system = [ From 0f119a50660b6fff0a18f2c17cebedac15b2791e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jan 2025 13:26:15 +0100 Subject: [PATCH 51/71] python313Packages.lxmf: 0.5.8 -> 0.6.1 Diff: https://github.com/markqvist/lxmf/compare/refs/tags/0.5.8...0.6.1 Changelog: https://github.com/markqvist/LXMF/releases/tag/0.6.1 --- pkgs/development/python-modules/lxmf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix index 03c1316f4d6f..44a0723b13f8 100644 --- a/pkgs/development/python-modules/lxmf/default.nix +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.5.8"; + version = "0.6.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; tag = version; - hash = "sha256-68c4KrXudjs6YGi282pa31XwbvjsXgKVQ2e+zPBYHf4="; + hash = "sha256-9eq/VoIgHGYLERLqFHGLPmIyv28rD78eZnd6zVfWod8="; }; build-system = [ setuptools ]; From 37d59c9a195fb50b031b59f573f88a6e5ef89038 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jan 2025 13:26:26 +0100 Subject: [PATCH 52/71] python313Packages.nomadnet: 0.5.6 -> 0.6.0 Diff: https://github.com/markqvist/NomadNet/compare/refs/tags/0.5.6...0.6.0 Changelog: https://github.com/markqvist/NomadNet/releases/tag/0.6.0 --- 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 650780b58555..15862aa0f3a1 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.5.6"; + version = "0.6.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; tag = version; - hash = "sha256-dwymJIsMDeVsG7eF45CgUPlZf3sEdwnxZ8OxT+gEQCs="; + hash = "sha256-3n+CoB8SLSjpmif2qBd9+gyF55JpwtJQuxcJEyXaWtk="; }; build-system = [ setuptools ]; From 04133be9c7acee0d0caa169bfdd93bc5ce533503 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Thu, 23 Jan 2025 11:32:03 +0100 Subject: [PATCH 53/71] coqPackages.mathcomp: adapt to https://github.com/math-comp/math-comp/pull/1329 --- pkgs/development/coq-modules/mathcomp/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 2cafe8ca8ac7..48d36b2dbb8c 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -67,7 +67,7 @@ let mathcomp_ = package: let mathcomp-deps = lib.optionals (package != "single") (map mathcomp_ (lib.head (lib.splitList (lib.pred.equal package) packages))); - pkgpath = if package == "single" then "mathcomp" else "mathcomp/${package}"; + pkgpath = if package == "single" then "." else package; pname = if package == "single" then "mathcomp" else "mathcomp-${package}"; pkgallMake = '' echo "all.v" > Make @@ -92,6 +92,8 @@ let then patchShebangs etc/buildlibgraph fi '' + '' + # handle mathcomp < 2.4.0 which had an extra base mathcomp directory + test -d mathcomp && cd mathcomp cd ${pkgpath} '' + lib.optionalString (package == "all") pkgallMake; From 2bf91d4224bf8e176b71cf10318b77ecdfac17ec Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 23 Jan 2025 13:50:52 +0100 Subject: [PATCH 54/71] wyoming-satellite: 1.2.0 -> 1.3.0 https://github.com/rhasspy/wyoming-satellite/blob/refs/tags/v1.3.0/CHANGELOG.md --- pkgs/by-name/wy/wyoming-satellite/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wy/wyoming-satellite/package.nix b/pkgs/by-name/wy/wyoming-satellite/package.nix index 3a56ff6cf6d3..4e74aee9c0c3 100644 --- a/pkgs/by-name/wy/wyoming-satellite/package.nix +++ b/pkgs/by-name/wy/wyoming-satellite/package.nix @@ -21,14 +21,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "wyoming-satellite"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "wyoming-satellite"; tag = "v${version}"; - hash = "sha256-KIWhWE9Qaxs72fJ1LRTkvk6QtpBJOFlmZv2od69O15g="; + hash = "sha256-9UgfD0Hs/IgOszd/QBbe6DYY6kBWh7q/e57gghQ1/Bk="; }; build-system = with python.pkgs; [ From 0ad31f27d5453f5e2e47ad6188d7828a7b23a42e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 23 Jan 2025 14:15:16 +0100 Subject: [PATCH 55/71] Revert "check-meta: Expose checkValidity and add to all-packages" (#376123) This broke eval, because checkMeta expects hostPlatform to be passed. --- pkgs/stdenv/generic/check-meta.nix | 2 +- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index f5efd67782b5..502343f01fb3 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -517,4 +517,4 @@ let ); }; -in { inherit assertValidity commonMeta checkValidity; } +in { inherit assertValidity commonMeta; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c93bf489ad31..c740e1a8bfa3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -213,8 +213,6 @@ with pkgs; } ''); - checkMeta = callPackage ../stdenv/generic/check-meta.nix { }; - # addDriverRunpath is the preferred package name, as this enables # many more scenarios than just opengl now. anime-downloader = callPackage ../applications/video/anime-downloader { }; From 60e660a08456b22009ec5f33b8490e092ed1a92a Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Wed, 22 Jan 2025 20:33:53 -0500 Subject: [PATCH 56/71] frigate.web: fix build on Node 22.12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Node 22.12 introduced [a semi-breaking change][1] (even though it’s not documented as such, it’s clearly breaking this). Pass a flag to Node to disable it. See also [related issue][2]. [1]: https://nodejs.org/en/blog/release/v22.12.0#requireesm-is-now-enabled-by-default [2]: https://github.com/nodejs/node/issues/56155#issuecomment-2525032281 --- pkgs/by-name/fr/frigate/web.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/fr/frigate/web.nix b/pkgs/by-name/fr/frigate/web.nix index 959157df6703..ed6faf2d4c0f 100644 --- a/pkgs/by-name/fr/frigate/web.nix +++ b/pkgs/by-name/fr/frigate/web.nix @@ -28,6 +28,8 @@ buildNpmPackage { npmDepsHash = "sha256-PLs3oCWQjK38eHgdQt2Qkj7YqkfanC8JnLMpzMjNfxU="; + env.NODE_OPTIONS = "--no-experimental-require-module"; + installPhase = '' cp -rv dist/ $out ''; From 75188e928f1b9a2102aed0a8482c94d8dcf3d815 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Thu, 23 Jan 2025 08:21:50 -0500 Subject: [PATCH 57/71] frigate.web: add missing meta Seems reasonable to just use that from the parent package. --- pkgs/by-name/fr/frigate/web.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/fr/frigate/web.nix b/pkgs/by-name/fr/frigate/web.nix index ed6faf2d4c0f..fb194d89ffce 100644 --- a/pkgs/by-name/fr/frigate/web.nix +++ b/pkgs/by-name/fr/frigate/web.nix @@ -1,5 +1,6 @@ { buildNpmPackage, + frigate, src, version, }: @@ -33,4 +34,6 @@ buildNpmPackage { installPhase = '' cp -rv dist/ $out ''; + + inherit (frigate) meta; } From 6a60230163826362d94d3b5dd839d2092ced2cc4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 23 Jan 2025 23:33:43 +1000 Subject: [PATCH 58/71] androidStudioPackages.canary: 2024.3.1.8 -> 2024.3.2.1 (#376017) --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 41e0b78d6088..fe735cb34356 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -17,8 +17,8 @@ let sha256Hash = "sha256-zfiTjyD2bMIJ+GVQyg7qUT7306roqYsdRkPECZ/Rdnc="; }; latestVersion = { - version = "2024.3.1.8"; # "Android Studio Meerkat | 2024.3.1 Canary 8" - sha256Hash = "sha256-ujxVxTO7rbCPEjzO2cPwdxipAgPW+urYNFHDGJOfRQg="; + version = "2024.3.2.1"; # "Android Studio Meerkat Feature Drop | 2024.3.2 Canary 1" + sha256Hash = "sha256-qJKkuB8v4wOqEQwnDyMegLbRLzxVwCq/hS1TQ3lhBKk="; }; in { # Attributes are named by their corresponding release channels From f163aecafcdc9b3522af9eca2df868cd746e8a5d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 23 Jan 2025 23:34:03 +1000 Subject: [PATCH 59/71] androidStudioPackages.beta: 2024.2.2.12 -> 2024.3.1.10 (#376018) --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index fe735cb34356..9a10067fe1e7 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,8 +13,8 @@ let sha256Hash = "sha256-t/4e1KeVm9rKeo/VdGHbv5ogXrI8whjtgo7YjouZjLU="; }; betaVersion = { - version = "2024.2.2.12"; # "Android Studio Ladybug Feature Drop | 2024.2.2 RC 2" - sha256Hash = "sha256-zfiTjyD2bMIJ+GVQyg7qUT7306roqYsdRkPECZ/Rdnc="; + version = "2024.3.1.10"; # "Android Studio Meerkat | 2024.3.1 Beta 1" + sha256Hash = "sha256-UxxofUCJGhQTLMwHGaSdNDqWnjkpRVwm2oqLLp3jR8E="; }; latestVersion = { version = "2024.3.2.1"; # "Android Studio Meerkat Feature Drop | 2024.3.2 Canary 1" From d00127cb7ec7ffe9127a3f2b1d83f117214408a0 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Thu, 23 Jan 2025 13:37:08 +0100 Subject: [PATCH 60/71] postprocessd: pull in missing `libtiff` dependency The build was failing since a03cc600ddeb621653979429637053a8a537776c. --- pkgs/by-name/po/postprocessd/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/po/postprocessd/package.nix b/pkgs/by-name/po/postprocessd/package.nix index ef74fd7ad53b..5545534a02cc 100644 --- a/pkgs/by-name/po/postprocessd/package.nix +++ b/pkgs/by-name/po/postprocessd/package.nix @@ -3,6 +3,7 @@ fetchFromSourcehut, libexif, libraw, + libtiff, meson, ninja, opencv4, @@ -36,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libexif libraw + libtiff opencv4 ]; From 4ce51133f30c5c57cbc7379662083b47d5343966 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Tue, 14 Jan 2025 13:06:27 +0530 Subject: [PATCH 61/71] butt: explicitly add fdk-aac to rpath Fix #373411 --- pkgs/by-name/bu/butt/package.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/bu/butt/package.nix b/pkgs/by-name/bu/butt/package.nix index 15044904ddea..dcbc83ed0c3f 100644 --- a/pkgs/by-name/bu/butt/package.nix +++ b/pkgs/by-name/bu/butt/package.nix @@ -16,6 +16,7 @@ openssl, curl, portmidi, + autoPatchelfHook, }: stdenv.mkDerivation (finalAttrs: { @@ -36,7 +37,10 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'live365_logo, 124, 61, 4,' 'nullptr, 0, 0, 0,' ''; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + autoPatchelfHook + pkg-config + ]; buildInputs = [ fltk13 @@ -54,6 +58,10 @@ stdenv.mkDerivation (finalAttrs: { portmidi ]; + runtimeDependencies = [ + fdk_aac + ]; + postInstall = '' cp -r usr/share $out/ ''; From a448f5c5dafb635d345506a27576a08264344d34 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Jan 2025 04:06:30 +0000 Subject: [PATCH 62/71] minio-client: 2024-11-21T17-21-54Z -> 2025-01-17T23-25-50Z --- pkgs/by-name/mi/minio-client/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/minio-client/package.nix b/pkgs/by-name/mi/minio-client/package.nix index 4da88715a140..2ab8857dc0e2 100644 --- a/pkgs/by-name/mi/minio-client/package.nix +++ b/pkgs/by-name/mi/minio-client/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2024-11-21T17-21-54Z"; + version = "2025-01-17T23-25-50Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-z6ixa5nrKcrvaBC1V6/iXCeHFO4xOkFf/yJ8HLQQcaY="; + sha256 = "sha256-ezc5SMJfebvaSrpUeA6dIPS5l9rfkvSMVyGLTDPiWxE="; }; - vendorHash = "sha256-teG+GrzmUgJ6QhcxDSbWXP32hRuCgoCvH2BoNL8ddUc="; + vendorHash = "sha256-Z0dpb6E+wTCmTLBIZzvjRM5RPUsIjAhTj+V+Q3CHwv0="; subPackages = [ "." ]; From e1ef8af3e51909ed4b35493e797811d5ff664f32 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:29:32 +0000 Subject: [PATCH 63/71] google-chrome: 132.0.6834.83 -> 132.0.6834.110 --- pkgs/by-name/go/google-chrome/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index e5284e697730..5ce066824f60 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -171,11 +171,11 @@ let linux = stdenv.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "132.0.6834.83"; + version = "132.0.6834.110"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-qufv7m7iQ8yX6WeNajTbPELCmRhr4GGBa8Wzy+iMFhg="; + hash = "sha256-4mtVCiKXKnjmHlyYgnDneX9hOmYgafwZ230iFfH48Tc="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -274,11 +274,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "132.0.6834.84"; + version = "132.0.6834.111"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/acpvuq6jnnfhesngduj6lnfmy3zq_132.0.6834.84/GoogleChrome-132.0.6834.84.dmg"; - hash = "sha256-SX8IUdTnIJHwfF9ZwIHZwGZUncJ/NLQpuEL/X8p1KJo="; + url = "http://dl.google.com/release2/chrome/acuc7atz5smv6q4nvkuutofbz6uq_132.0.6834.111/GoogleChrome-132.0.6834.111.dmg"; + hash = "sha256-kC4MA57eeapnzCgyBuLNq9NBTFdcECMtoNwMzWd0KEg="; }; dontPatch = true; From 933f4a1b7714e3991912df413061315a1f144ca0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 Jan 2025 00:32:01 +1000 Subject: [PATCH 64/71] nwg-dock-hyprland: 0.4.2 -> 0.4.3 (#376130) --- pkgs/by-name/nw/nwg-dock-hyprland/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nw/nwg-dock-hyprland/package.nix b/pkgs/by-name/nw/nwg-dock-hyprland/package.nix index 7473acb9ac14..2cc7265359e6 100644 --- a/pkgs/by-name/nw/nwg-dock-hyprland/package.nix +++ b/pkgs/by-name/nw/nwg-dock-hyprland/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nwg-dock-hyprland"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-dock-hyprland"; tag = "v${version}"; - hash = "sha256-MujQMrqyxKl32cIzy7JHDeUIDEqDzFp6mr7pM3y9xng="; + hash = "sha256-l2JB+CmdQg/bDXneJ+rjv4z6xjB+BERh0rLZFETCMtE="; }; - vendorHash = "sha256-cAfKmcBf2hu3eP6a4ELEeNyPOYXi3chLkbHKFks14I0="; + vendorHash = "sha256-3ubDvtl/FvVyoRMRNBhwCoIJkJNFvlrWue+cNNGe5eI="; ldflags = [ "-s" From 864f89f98b0b4e1bbcb762b025fd83da8bc1bae0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 Jan 2025 00:32:28 +1000 Subject: [PATCH 65/71] vscode-extensions.ms-dotnettools.csharp: 2.55.29 -> 2.61.28 (#376090) --- .../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 631e2520f818..0807d5d30d5d 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.55.29", + "version": "2.61.28", "linux-x64": { - "hash": "sha256-3RQk5VNrI2sSUBCBfRTEsxjLqZkpoTELt/v+CIp94QU=", + "hash": "sha256-lyP/NCvpaVW8dbZp/8OS9qrBa7yuO4rTo8Wwo/7wD7g=", "binaries": [ ".debugger/createdump", ".debugger/vsdbg", @@ -11,7 +11,7 @@ ] }, "linux-arm64": { - "hash": "sha256-p8VbpeLtGDO3TKpjY9EuqDVyCDvZaQe9+KeAMTMulDc=", + "hash": "sha256-bZ5ABDh3MnO33MQEXhLlF4UVGTCrcj5pCYgQDS6AP58=", "binaries": [ ".debugger/createdump", ".debugger/vsdbg", @@ -21,7 +21,7 @@ ] }, "darwin-x64": { - "hash": "sha256-r85BNsxIXuQD20kjgqBvCLzTof4ExYDfbKG0zHaR86o=", + "hash": "sha256-5yDTJp3GDb7HYAG9q8wvr4QKwjGJ214ifUjwxZMwIts=", "binaries": [ ".debugger/x86_64/createdump", ".debugger/x86_64/vsdbg", @@ -31,7 +31,7 @@ ] }, "darwin-arm64": { - "hash": "sha256-p56EkUDxsukTx0FCCE2OrUBk3t2zj/kU6cdUVqdpfb8=", + "hash": "sha256-58fz7IFzYgvC9Eruz1JgF4/ftHQV4FGdcfOODlCmGBA=", "binaries": [ ".debugger/arm64/createdump", ".debugger/arm64/vsdbg", From 113dbd79de4d1825a6cae69088c4f8db13744dbe Mon Sep 17 00:00:00 2001 From: r-vdp Date: Thu, 23 Jan 2025 01:42:42 +0100 Subject: [PATCH 66/71] nixos/activation: improve preSwitchChecks A couple of improvements: 1. Avoid the generally discouraged apply argument to options, as it has quite weird semantics 2. Avoid issues when a user calls a preSwitchCheck `script`, which would've been silently overridden by the existing implementation. Reliance on a special attribute name like that is bound to lead to a very-hard-to-debug problem for someone at some point 3. Use writeShellApplication so that the preSwitchChecks are checked by shellcheck and and so that they run with basic bash guardrails 4. Fix shellcheck issue (testing the value of $?) 5. Add a positive preSwitchCheck to the nixos test, to make sure that that works as intended --- .../system/activation/pre-switch-check.nix | 51 +++++++++++-------- .../system/activation/switchable-system.nix | 4 +- nixos/modules/system/activation/top-level.nix | 2 +- nixos/tests/switch-test.nix | 4 ++ 4 files changed, 36 insertions(+), 25 deletions(-) diff --git a/nixos/modules/system/activation/pre-switch-check.nix b/nixos/modules/system/activation/pre-switch-check.nix index 2cbd539a74c8..60ccd448d155 100644 --- a/nixos/modules/system/activation/pre-switch-check.nix +++ b/nixos/modules/system/activation/pre-switch-check.nix @@ -1,21 +1,35 @@ -{ lib, pkgs, ... }: +{ + lib, + config, + pkgs, + ... +}: let - preSwitchCheckScript = - set: - lib.concatLines ( - lib.mapAttrsToList (name: text: '' - # pre-switch check ${name} - ( - ${text} - ) - if [[ $? != 0 ]]; then - echo "Pre-switch check '${name}' failed" - exit 1 - fi - '') set - ); + preSwitchCheckScript = lib.concatLines ( + lib.mapAttrsToList (name: text: '' + # pre-switch check ${name} + if ! ( + ${text} + ); then + echo "Pre-switch check '${name}' failed" + exit 1 + fi + '') config.system.preSwitchChecks + ); in { + options.system.preSwitchChecksScript = lib.mkOption { + type = lib.types.pathInStore; + internal = true; + readOnly = true; + default = lib.getExe ( + pkgs.writeShellApplication { + name = "pre-switch-checks"; + text = preSwitchCheckScript; + } + ); + }; + options.system.preSwitchChecks = lib.mkOption { default = { }; example = lib.literalExpression '' @@ -33,12 +47,5 @@ in ''; type = lib.types.attrsOf lib.types.str; - - apply = - set: - set - // { - script = pkgs.writeShellScript "pre-switch-checks" (preSwitchCheckScript set); - }; }; } diff --git a/nixos/modules/system/activation/switchable-system.nix b/nixos/modules/system/activation/switchable-system.nix index b4f153f7755e..4783a0704740 100644 --- a/nixos/modules/system/activation/switchable-system.nix +++ b/nixos/modules/system/activation/switchable-system.nix @@ -61,7 +61,7 @@ in --subst-var-by coreutils "${pkgs.coreutils}" \ --subst-var-by distroId ${lib.escapeShellArg config.system.nixos.distroId} \ --subst-var-by installBootLoader ${lib.escapeShellArg config.system.build.installBootLoader} \ - --subst-var-by preSwitchCheck ${lib.escapeShellArg config.system.preSwitchChecks.script} \ + --subst-var-by preSwitchCheck ${lib.escapeShellArg config.system.preSwitchChecksScript} \ --subst-var-by localeArchive "${config.i18n.glibcLocales}/lib/locale/locale-archive" \ --subst-var-by perl "${perlWrapped}" \ --subst-var-by shell "${pkgs.bash}/bin/sh" \ @@ -94,7 +94,7 @@ in --set TOPLEVEL ''${!toplevelVar} \ --set DISTRO_ID ${lib.escapeShellArg config.system.nixos.distroId} \ --set INSTALL_BOOTLOADER ${lib.escapeShellArg config.system.build.installBootLoader} \ - --set PRE_SWITCH_CHECK ${lib.escapeShellArg config.system.preSwitchChecks.script} \ + --set PRE_SWITCH_CHECK ${lib.escapeShellArg config.system.preSwitchChecksScript} \ --set LOCALE_ARCHIVE ${config.i18n.glibcLocales}/lib/locale/locale-archive \ --set SYSTEMD ${config.systemd.package} ) diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 3c42e6c04a48..6e12b63054ef 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -343,7 +343,7 @@ in perl = pkgs.perl.withPackages (p: with p; [ ConfigIniFiles FileSlurp ]); # End if legacy environment variables - preSwitchCheck = config.system.preSwitchChecks.script; + preSwitchCheck = config.system.preSwitchChecksScript; # Not actually used in the builder. `passedChecks` is just here to create # the build dependencies. Checks are similar to build dependencies in the diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index 1f5574cfd704..37a808c3c471 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -611,6 +611,10 @@ in { other = { system.switch.enable = true; users.mutableUsers = true; + system.preSwitchChecks.succeeds = '' + echo this will succeed + true + ''; specialisation.failingCheck.configuration.system.preSwitchChecks.failEveryTime = '' echo this will fail false From 73f3fe4839a09cb95c0b27ecaa12030e37b96a07 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Thu, 23 Jan 2025 15:50:31 +0100 Subject: [PATCH 67/71] nixos/activation: log output from pre-switch checks on stderr --- nixos/modules/system/activation/pre-switch-check.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/activation/pre-switch-check.nix b/nixos/modules/system/activation/pre-switch-check.nix index 60ccd448d155..e8640a0db3f2 100644 --- a/nixos/modules/system/activation/pre-switch-check.nix +++ b/nixos/modules/system/activation/pre-switch-check.nix @@ -10,8 +10,8 @@ let # pre-switch check ${name} if ! ( ${text} - ); then - echo "Pre-switch check '${name}' failed" + ) >&2 ; then + echo "Pre-switch check '${name}' failed" >&2 exit 1 fi '') config.system.preSwitchChecks From ee86d16ee2b8e4b5de40ff3b7845306cd6428eb2 Mon Sep 17 00:00:00 2001 From: genga Date: Sat, 18 Jan 2025 12:27:07 +0300 Subject: [PATCH 68/71] pq-cli: init at 1.0.2-unstable-2024-07-15 pq-cli: update pq-cli: add unstableGitUpdater --- pkgs/by-name/pq/pq-cli/package.nix | 46 ++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 pkgs/by-name/pq/pq-cli/package.nix diff --git a/pkgs/by-name/pq/pq-cli/package.nix b/pkgs/by-name/pq/pq-cli/package.nix new file mode 100644 index 000000000000..d9e3ee1bc276 --- /dev/null +++ b/pkgs/by-name/pq/pq-cli/package.nix @@ -0,0 +1,46 @@ +{ + lib, + fetchFromGitHub, + python3Packages, + unstableGitUpdater, +}: + +python3Packages.buildPythonApplication rec { + pname = "pq-cli"; + version = "1.0.2-unstable-2024-07-15"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rr-"; + repo = "pq-cli"; + rev = "4122e936c87436552f35ff7972d6e543ba6c837b"; + hash = "sha256-PvHkTjPjOubhl9gfPTF7yNaFgg2GLk8y+PtF09fpaII="; + }; + + build-system = with python3Packages; [ + setuptools + poetry-core + ]; + + dependencies = with python3Packages; [ + xdg + xdg-base-dirs + urwid + urwid-readline + ]; + + pythonRelaxDeps = [ + "urwid-readline" + ]; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Progress Quest: the CLI edition"; + homepage = "https://github.com/rr-/pq-cli"; + changelog = "https://github.com/rr-/pq-cli/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ genga898 ]; + mainProgram = "pqcli"; + }; +} From 241226d05500821a40b594c7f9e8c68717844eea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jan 2025 15:06:24 +0000 Subject: [PATCH 69/71] python312Packages.strawberry-graphql: 0.257.0 -> 0.258.0 --- .../development/python-modules/strawberry-graphql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index a71e757bea79..af83517ed02d 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.257.0"; + version = "0.258.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "strawberry-graphql"; repo = "strawberry"; tag = version; - hash = "sha256-HU3d3ss9axGMqWGxlCQjbRsia9XiMQvHaVs9YMX01v8="; + hash = "sha256-gv/P7pz2wcIKXP5SChTlsM2j2GPuRK+iuLZil8/VvJk="; }; postPatch = '' From 785d00ca274c22cca9b904379de26c920426e6b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jan 2025 15:29:38 +0000 Subject: [PATCH 70/71] tideways-daemon: 1.9.30 -> 1.9.32 --- pkgs/by-name/ti/tideways-daemon/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ti/tideways-daemon/package.nix b/pkgs/by-name/ti/tideways-daemon/package.nix index 6c0c16dcf11e..7e066aa0c64a 100644 --- a/pkgs/by-name/ti/tideways-daemon/package.nix +++ b/pkgs/by-name/ti/tideways-daemon/package.nix @@ -10,7 +10,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "tideways-daemon"; - version = "1.9.30"; + version = "1.9.32"; src = finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system} @@ -28,15 +28,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { sources = { "x86_64-linux" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_amd64-${finalAttrs.version}.tar.gz"; - hash = "sha256-pXWGoDnNQPlDQMriUbjD8+Tiv7jGeBf+5NGPMOAfuIo="; + hash = "sha256-d7qC6q6ukr2bPEEbgFa8u2N+u/cn0CvWXlrO4CAthl8="; }; "aarch64-linux" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_aarch64-${finalAttrs.version}.tar.gz"; - hash = "sha256-x9QDaGz7nHEbe3o9awqyBu+0/ArM1QIr9jQ4kcSSnHA="; + hash = "sha256-3HXmX2mjM6buzMiVsmTSxReJ7ulphxzSL9hSR6Jwocg="; }; "aarch64-darwin" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_macos_arm64-${finalAttrs.version}.tar.gz"; - hash = "sha256-c5ntOhaJaRjipNd0B9ybzPD7EFkdQgEOSaS3JWGfBpA="; + hash = "sha256-3oWU1OjefWGOUmHsAgHIKlUqHiGWbty3WPex7wTfLIg="; }; }; updateScript = "${ From 7a5aab656936c05fb0dc78cd34611e2b356ad1e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jan 2025 15:51:43 +0000 Subject: [PATCH 71/71] vimPlugins.nvim-spectre: 0-unstable-2024-10-27 -> 0-unstable-2025-01-13 --- .../vim/plugins/non-generated/nvim-spectre/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix index 5499303b5e8b..a820e22d3570 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix @@ -7,12 +7,12 @@ vimUtils, }: let - version = "0-unstable-2024-10-27"; + version = "0-unstable-2025-01-13"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "08be31c104df3b4b049607694ebb2b6ced4f928b"; - sha256 = "04v1gypga9fhmkddis5yyppvmpq0b1b7zpvbfjlxfp2z498l5n2v"; + rev = "ddd7383e856a7c939cb4f5143278fe041bbb8cb9"; + sha256 = "sha256-pZ7AH1U95IWMmhk/uBO0Lsxx78H5H9ygPxk/HIqFFlY="; }; spectre_oxi = rustPlatform.buildRustPackage { @@ -20,7 +20,7 @@ let inherit version src; sourceRoot = "${src.name}/spectre_oxi"; - cargoHash = "sha256-jVNeK1BeCzQaS5G561iWB3xEupzjIgnbUpEo1IVr9nQ="; + cargoHash = "sha256-UieSVIITsk6iqd68JKFYYBTSDm4kPs+a9V+Y0gB9kFU="; preCheck = '' mkdir tests/tmp/