From 4d7a4fbd9f634d0c2f1e660d3981e965b3513466 Mon Sep 17 00:00:00 2001 From: lolbinarycat Date: Thu, 21 Nov 2024 20:53:21 -0600 Subject: [PATCH 001/287] improve error handling flags to curl current invocation is extremely fragile if tcp sockets are spuriously shutdown (this can happen when changing networks, or just due to a bad ISP) --retry-all-errors is the only way to make curl robust against this type of failure. --- pkgs/build-support/fetchurl/builder.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh index a82728ef1025..ff8ece36fea2 100644 --- a/pkgs/build-support/fetchurl/builder.sh +++ b/pkgs/build-support/fetchurl/builder.sh @@ -14,6 +14,8 @@ curl=( --location --max-redirs 20 --retry 3 + --retry-all-errors + --continue-at - --disable-epsv --cookie-jar cookies --user-agent "curl/$curlVersion Nixpkgs/$nixpkgsVersion" From 91cab001ddb32f19cef57c970bdee04bab564d7b Mon Sep 17 00:00:00 2001 From: Ricardo Band Date: Thu, 19 Dec 2024 01:43:28 +0100 Subject: [PATCH 002/287] ut1999: replace gog source with original ISO from archive.org --- pkgs/by-name/ut/ut1999/package.nix | 57 ++++++----- pkgs/by-name/ut/ut1999/ut1999.svg | 148 +++++++++++++++++++++++++++++ 2 files changed, 182 insertions(+), 23 deletions(-) create mode 100644 pkgs/by-name/ut/ut1999/ut1999.svg diff --git a/pkgs/by-name/ut/ut1999/package.nix b/pkgs/by-name/ut/ut1999/package.nix index fd9e1b5e97ee..5cbeefa674ed 100644 --- a/pkgs/by-name/ut/ut1999/package.nix +++ b/pkgs/by-name/ut/ut1999/package.nix @@ -7,11 +7,11 @@ fetchurl, makeDesktopItem, copyDesktopItems, + libarchive, imagemagick, runCommand, libgcc, wxGTK32, - innoextract, libGL, SDL2, openal, @@ -39,27 +39,19 @@ let hash = "sha256-TbhJbOH4E5WOb6XR9dmqLkXziK3/CzhNjd1ypBkkmvw="; }; }; - unpackGog = - runCommand "ut1999-gog" + unpackIso = + runCommand "ut1999-iso" { - src = requireFile rec { - name = "setup_ut_goty_2.0.0.5.exe"; - hash = "sha256-TMJX1U2XZZxQYvK/GG0KjGlZVh0R5C2Pzy6sB/GSaAM="; - message = '' - Unreal Tournament 1999 requires the official GOG package, version 2.0.0.5. - - Once you download the file, run the following command: - - nix-prefetch-url file://\$PWD/${name} - ''; + src = fetchurl { + url = "https://archive.org/download/ut-goty/UT_GOTY_CD1.iso"; + hash = "sha256-4YSYTKiPABxd3VIDXXbNZOJm4mx0l1Fhte1yNmx0cE8="; }; - - nativeBuildInputs = [ innoextract ]; + nativeBuildInputs = [ libarchive ]; } '' - innoextract --extract --exclude-temp "$src" + bsdtar -xvf "$src" mkdir $out - cp -r app/* $out + cp -r Music Sounds Textures Maps $out ''; systemDir = { @@ -92,7 +84,6 @@ stdenv.mkDerivation { lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems autoPatchelfHook - imagemagick ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ undmg @@ -111,24 +102,44 @@ stdenv.mkDerivation { chmod -R 755 $out cd ${outPrefix} + # NOTE: OldUnreal patch doesn't include these folders but could in the future rm -rf ./{Music,Sounds,Maps} - ln -s ${unpackGog}/{Music,Sounds,Maps} . + ln -s ${unpackIso}/{Music,Sounds,Maps} . - cp -n ${unpackGog}/Textures/* ./Textures || true - cp -n ${unpackGog}/System/*.{u,int} ./System || true + # TODO: unpack compressed maps with ucc + + cp -n ${unpackIso}/Textures/* ./Textures || true + cp -n ${unpackIso}/System/*.{u,int} ./System || true '' + lib.optionalString (stdenv.hostPlatform.isLinux) '' ln -s "$out/${systemDir}/ut-bin" "$out/bin/ut1999" ln -s "$out/${systemDir}/ucc-bin" "$out/bin/ut1999-ucc" - convert "${unpackGog}/gfw_high.ico" "ut1999.png" - install -D ut1999-5.png "$out/share/icons/hicolor/256x256/apps/ut1999.png" + install -D "${./ut1999.svg}" "$out/share/pixmaps/ut1999.svg" + ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize 16x16 ut1999_16x16.png + ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize 24x24 ut1999_24x24.png + ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize 32x32 ut1999_32x32.png + ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize 48x48 ut1999_48x48.png + ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize 64x64 ut1999_64x64.png + ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize 128x128 ut1999_128x128.png + ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize 192x192 ut1999_192x192.png + ${imagemagick}/bin/magick -background none ${./ut1999.svg} -resize 256x256 ut1999_256x256.png + install -D "ut1999_16x16.png" "$out/share/icons/hicolor/16x16/apps/ut1999.png" + install -D "ut1999_24x24.png" "$out/share/icons/hicolor/24x24/apps/ut1999.png" + install -D "ut1999_32x32.png" "$out/share/icons/hicolor/32x32/apps/ut1999.png" + install -D "ut1999_48x48.png" "$out/share/icons/hicolor/48x48/apps/ut1999.png" + install -D "ut1999_64x64.png" "$out/share/icons/hicolor/64x64/apps/ut1999.png" + install -D "ut1999_128x128.png" "$out/share/icons/hicolor/128x128/apps/ut1999.png" + install -D "ut1999_192x192.png" "$out/share/icons/hicolor/192x192/apps/ut1999.png" + install -D "ut1999_256x256.png" "$out/share/icons/hicolor/256x256/apps/ut1999.png" # Remove bundled libraries to use native versions instead rm $out/${systemDir}/libmpg123.so* \ $out/${systemDir}/libopenal.so* \ $out/${systemDir}/libSDL2* \ $out/${systemDir}/libxmp.so* + # NOTE: what about fmod? + #$out/${systemDir}/libfmod.so* '' + '' runHook postInstall diff --git a/pkgs/by-name/ut/ut1999/ut1999.svg b/pkgs/by-name/ut/ut1999/ut1999.svg new file mode 100644 index 000000000000..6678793b2080 --- /dev/null +++ b/pkgs/by-name/ut/ut1999/ut1999.svg @@ -0,0 +1,148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 24b50ecbc52d41be591d00ab082a2914d4227bde Mon Sep 17 00:00:00 2001 From: Ricardo Band Date: Mon, 30 Dec 2024 13:55:23 +0100 Subject: [PATCH 003/287] add note about Epic Games permission to distribute the ISO --- pkgs/by-name/ut/ut1999/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ut/ut1999/package.nix b/pkgs/by-name/ut/ut1999/package.nix index 5cbeefa674ed..3ca112a8cf4f 100644 --- a/pkgs/by-name/ut/ut1999/package.nix +++ b/pkgs/by-name/ut/ut1999/package.nix @@ -42,6 +42,8 @@ let unpackIso = runCommand "ut1999-iso" { + # This upload of the game is officially sanctioned by OldUnreal (who has received permission from Epic Games to link to archive.org) and the UT99.org community + # This is a copy of the original Unreal Tournament: Game of the Year Edition (also known as UT or UT99). src = fetchurl { url = "https://archive.org/download/ut-goty/UT_GOTY_CD1.iso"; hash = "sha256-4YSYTKiPABxd3VIDXXbNZOJm4mx0l1Fhte1yNmx0cE8="; From 7041483103e1e2ab0a4742a3639b03029ad9d34f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Jan 2025 06:44:06 +0000 Subject: [PATCH 004/287] qcad: 3.31.2.3 -> 3.31.2.7 --- pkgs/applications/misc/qcad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index 07874b377939..9134a9e5d00c 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { pname = "qcad"; - version = "3.31.2.3"; + version = "3.31.2.7"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - hash = "sha256-/zafL9FWPehhSn8sLkUSOpONGDEhjKBskTaqTWS6ChM="; + hash = "sha256-gNUmcpyDctmsqavOOaPzyghmfMp6QnZcToUtFoVgoxI="; }; patches = [ From e943fb22cc571fa29bca8db05542ef8097d4a951 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Jan 2025 13:03:28 +0000 Subject: [PATCH 005/287] elasticmq-server-bin: 1.6.10 -> 1.6.11 --- pkgs/servers/elasticmq-server-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/elasticmq-server-bin/default.nix b/pkgs/servers/elasticmq-server-bin/default.nix index d79087e0523b..dd241b7c3df2 100644 --- a/pkgs/servers/elasticmq-server-bin/default.nix +++ b/pkgs/servers/elasticmq-server-bin/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "elasticmq-server"; - version = "1.6.10"; + version = "1.6.11"; src = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/elasticmq-server-${finalAttrs.version}.jar"; - sha256 = "sha256-xOjw1lm2y7Z+bkfTxpaMGx/zkgXNeTmcLzsQrMmySgE="; + sha256 = "sha256-B0kEWTUZhk6pqrRXg9VgALJH+rqxm0G1euW/HcKNUmk="; }; # don't do anything? From 11d1b74488b0558a82d5d496ed387b83d33b2225 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Sun, 5 Jan 2025 16:08:59 +0100 Subject: [PATCH 006/287] python312Packages.altair: disable flaky tests --- pkgs/development/python-modules/altair/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index e8efade4fda9..7325abf6a0cb 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -60,6 +60,9 @@ buildPythonPackage rec { disabledTests = [ # ValueError: Saving charts in 'svg' format requires the vl-convert-python or altair_saver package: see http://github.com/altair-viz/altair_saver/ "test_renderer_with_none_embed_options" + # Sometimes conflict due to parallelism + "test_dataframe_to_csv[polars]" + "test_dataframe_to_csv[pandas]" ]; disabledTestPaths = [ From 40a2ea84338980d868f5ce2903bfc2c1b9353d05 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Jan 2025 22:14:24 +0000 Subject: [PATCH 007/287] dnsdist: 1.9.7 -> 1.9.8 --- pkgs/by-name/dn/dnsdist/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dn/dnsdist/package.nix b/pkgs/by-name/dn/dnsdist/package.nix index 335c02a4df17..48e9c8e01602 100644 --- a/pkgs/by-name/dn/dnsdist/package.nix +++ b/pkgs/by-name/dn/dnsdist/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "dnsdist"; - version = "1.9.7"; + version = "1.9.8"; src = fetchurl { url = "https://downloads.powerdns.com/releases/dnsdist-${version}.tar.bz2"; - hash = "sha256-KFERwrff9ryKJAcQalHDZcxb9eYof+RZops5bHRiAzI="; + hash = "sha256-9mT3Opao1zQ9MmlqzLcP2LHtQyjXPNsKYnpWHW4v2Z4="; }; patches = [ From c58526593f9881e45c48eee5f03536eff50d9d9c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jan 2025 00:55:13 +0000 Subject: [PATCH 008/287] sniffnet: 1.3.1 -> 1.3.2 --- pkgs/by-name/sn/sniffnet/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sn/sniffnet/package.nix b/pkgs/by-name/sn/sniffnet/package.nix index 0f04ca2b8823..3c22d0e8501f 100644 --- a/pkgs/by-name/sn/sniffnet/package.nix +++ b/pkgs/by-name/sn/sniffnet/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "sniffnet"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "gyulyvgc"; repo = "sniffnet"; tag = "v${version}"; - hash = "sha256-wepy56LOhliU6t0ZRPviEbZtsWNqrtUnpUXsEdkRDqI="; + hash = "sha256-MWYCXLIv0euEHkfqZCxbfs1wFHkGIFk06wn7F8CIXx0="; }; - cargoHash = "sha256-cV3WhidnH2CBlmHa3IVHTQfTuPdSHwwY0XhgNPyLDN4="; + cargoHash = "sha256-Jcre4pyRgt+JDX+GI5dvmmEhWwHwe3G4VCi/6FKU6w0="; nativeBuildInputs = [ pkg-config ]; From ce20e905bb8ec9bcbaddb5eefc8ea301264d4203 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jan 2025 03:03:56 +0000 Subject: [PATCH 009/287] proton-pass: 1.27.0 -> 1.27.2 --- pkgs/by-name/pr/proton-pass/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix index e79fb1340f55..a0b3f1bf1ee0 100644 --- a/pkgs/by-name/pr/proton-pass/package.nix +++ b/pkgs/by-name/pr/proton-pass/package.nix @@ -9,11 +9,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-pass"; - version = "1.27.0"; + version = "1.27.2"; src = fetchurl { url = "https://proton.me/download/pass/linux/x64/proton-pass_${finalAttrs.version}_amd64.deb"; - hash = "sha256-OLnBmKmx4necZHXbyUfB3Nl2UFSz1Ff/yBuHmNwTGjU="; + hash = "sha256-HVKQuqYonK5kPibpXe5LSzXTiP07tpTsyFJwD/xnARI="; }; dontConfigure = true; From c7c174caeff43ca3599d3d17f3ff5a253afacaa4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jan 2025 11:26:29 +0000 Subject: [PATCH 010/287] gnomeExtensions.pop-shell: 1.2.0-unstable-2024-10-09 -> 1.2.0-unstable-2024-12-31 --- pkgs/desktops/gnome/extensions/pop-shell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/pop-shell/default.nix b/pkgs/desktops/gnome/extensions/pop-shell/default.nix index 8419bf2a9f06..2e2230a1f87f 100644 --- a/pkgs/desktops/gnome/extensions/pop-shell/default.nix +++ b/pkgs/desktops/gnome/extensions/pop-shell/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-pop-shell"; - version = "1.2.0-unstable-2024-10-09"; + version = "1.2.0-unstable-2024-12-31"; src = fetchFromGitHub { owner = "pop-os"; repo = "shell"; - rev = "e25621e2595eb5235ecb1a41167d1324a2b2a297"; - hash = "sha256-PPJofRzzbH1zcnKtQ/3ulErvN4pAJMo/igzdq1zT06s="; + rev = "104269ede04d52caf98734b199d960a3b25b88df"; + hash = "sha256-rBu/Nn7e03Pvw0oZDL6t+Ms0nesCyOm4GiFY6aYM+HI="; }; nativeBuildInputs = [ From c080e6deb57326503347af5d7624245c959a9e8b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jan 2025 12:31:12 +0000 Subject: [PATCH 011/287] fw: 2.19.1 -> 2.20.0 --- pkgs/by-name/fw/fw/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fw/fw/package.nix b/pkgs/by-name/fw/fw/package.nix index ddc3b28bf655..0777fee87455 100644 --- a/pkgs/by-name/fw/fw/package.nix +++ b/pkgs/by-name/fw/fw/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "fw"; - version = "2.19.1"; + version = "2.20.0"; src = fetchFromGitHub { owner = "brocode"; repo = "fw"; rev = "v${version}"; - hash = "sha256-fG1N/3Er7BvXOJTMGooaIMa5I9iNwnH+1om2jcWkI68="; + hash = "sha256-bq8N49qArdF0EFIGiK4lCsC0CZxwmeo0R8OiehrifTg="; }; - cargoHash = "sha256-1d2uX/A1HZAmAI3d0iet1NkG0IFuJpVnhWxpY0jVVUI="; + cargoHash = "sha256-NnN1VT0odq+Qj2wIPIF3ZRObObyqlPknQais5e0SnKE="; nativeBuildInputs = [ pkg-config From 268410c742b53f24ca96df2d7af7f1a2a8942d14 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Jan 2025 07:36:05 +0000 Subject: [PATCH 012/287] ares-cli: 3.1.3 -> 3.2.0 --- pkgs/by-name/ar/ares-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ar/ares-cli/package.nix b/pkgs/by-name/ar/ares-cli/package.nix index 3a7711b18a07..180507184c6f 100644 --- a/pkgs/by-name/ar/ares-cli/package.nix +++ b/pkgs/by-name/ar/ares-cli/package.nix @@ -6,12 +6,12 @@ }: buildNpmPackage rec { pname = "ares-cli"; - version = "3.1.3"; + version = "3.2.0"; src = fetchFromGitHub { owner = "webos-tools"; repo = "cli"; rev = "v${version}"; - hash = "sha256-V/YMDmed2VlJibeWmtiY6ftSiZMZhBcppwGXXjtLc5M="; + hash = "sha256-tSnmIDDDEhhQBrjZ5bujmCaYpetTjpdCGUjKomue+Bc="; }; postPatch = '' @@ -19,7 +19,7 @@ buildNpmPackage rec { ''; dontNpmBuild = true; - npmDepsHash = "sha256-Vf38Hw0rXMfP3MWBrDo9oDzF1KyHMOjxrmL/VMpL3mU="; + npmDepsHash = "sha256-eTuAi+32pK8rGQ5UDWesDFvlkjWj/ERevD+aYXYYr0Q="; passthru.updateScript = nix-update-script { }; From cef42e44b6c9ecc7b1789ed099d2406830a506f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Jan 2025 00:23:11 +0000 Subject: [PATCH 013/287] openfpgaloader: 0.12.1 -> 0.13.1 --- pkgs/by-name/op/openfpgaloader/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openfpgaloader/package.nix b/pkgs/by-name/op/openfpgaloader/package.nix index d43a573ac268..fed0b254f290 100644 --- a/pkgs/by-name/op/openfpgaloader/package.nix +++ b/pkgs/by-name/op/openfpgaloader/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openfpgaloader"; - version = "0.12.1"; + version = "0.13.1"; src = fetchFromGitHub { owner = "trabucayre"; repo = "openFPGALoader"; rev = "v${finalAttrs.version}"; - hash = "sha256-iJSTiOcW15q3mWmMhe5wmO11cu2xfAI9zCsoB33ujWQ="; + hash = "sha256-OC5IeA1gkaclLs0TPbrkaxH/D61SeyDcufkIvEDeuNw="; }; nativeBuildInputs = [ From e188c1bdd6e0d605074773a7304d9777c9b55df7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Jan 2025 02:52:52 +0000 Subject: [PATCH 014/287] olvid: 2.2.0 -> 2.3.0 --- pkgs/by-name/ol/olvid/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ol/olvid/package.nix b/pkgs/by-name/ol/olvid/package.nix index 85798297b37c..6b6af9b94cb7 100644 --- a/pkgs/by-name/ol/olvid/package.nix +++ b/pkgs/by-name/ol/olvid/package.nix @@ -62,14 +62,14 @@ in stdenv.mkDerivation (finalAttrs: { pname = "olvid"; - version = "2.2.0"; + version = "2.3.0"; dontUnpack = true; dontWrapGApps = true; src = fetchurl { url = "https://static.olvid.io/linux/${repo}-${finalAttrs.version}.tar.gz"; - hash = "sha256-TK0aeKwZFItw3GaOwet48d8zPBRtTsdqEz5MUNWLwSU="; + hash = "sha256-MzWDqF8mfrtIRmz4Eoxeek3nwV0S3TobZNxIGz1SQM8="; }; nativeBuildInputs = [ From f321f74b733caee9231d403447141dcf5cefb979 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Jan 2025 08:40:06 +0000 Subject: [PATCH 015/287] youtrack: 2024.3.55417 -> 2024.3.56671 --- pkgs/by-name/yo/youtrack/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/yo/youtrack/package.nix b/pkgs/by-name/yo/youtrack/package.nix index 8cfc4c27347d..a653cabe5eba 100644 --- a/pkgs/by-name/yo/youtrack/package.nix +++ b/pkgs/by-name/yo/youtrack/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "youtrack"; - version = "2024.3.55417"; + version = "2024.3.56671"; src = fetchzip { url = "https://download.jetbrains.com/charisma/youtrack-${finalAttrs.version}.zip"; - hash = "sha256-5ktWQZxrgoduQR9GOYnPK9kNGExpUDebKgBbhc+ImM8="; + hash = "sha256-uzbeI9QyT+DPjhiSxCGxDKSnmLqL8DQF11ZldLKpNAI="; }; nativeBuildInputs = [ makeBinaryWrapper ]; From 2cea8d4ab24956f86fc71155e5c5d65445d87f8f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Jan 2025 08:44:09 +0000 Subject: [PATCH 016/287] python312Packages.llama-cpp-python: 0.3.5 -> 0.3.6 --- pkgs/development/python-modules/llama-cpp-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-cpp-python/default.nix b/pkgs/development/python-modules/llama-cpp-python/default.nix index f534b895a69b..f7137c0778ee 100644 --- a/pkgs/development/python-modules/llama-cpp-python/default.nix +++ b/pkgs/development/python-modules/llama-cpp-python/default.nix @@ -35,14 +35,14 @@ }: buildPythonPackage rec { pname = "llama-cpp-python"; - version = "0.3.5"; + version = "0.3.6"; pyproject = true; src = fetchFromGitHub { owner = "abetlen"; repo = "llama-cpp-python"; tag = "v${version}"; - hash = "sha256-+LBq+rCqOsvGnhTL1UoCcAwvDt8Zo9hlaa4KibFFDag="; + hash = "sha256-d5nMgpS7m6WEILs222ztwphoqkAezJ+qt6sVKSlpIYI="; fetchSubmodules = true; }; # src = /home/gaetan/llama-cpp-python; From 370ac8df3ec3bbd5321b27ad3e217ec7f203ab2b Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Wed, 15 Jan 2025 15:12:46 +0800 Subject: [PATCH 017/287] nixos/guix: set proxy env vars for guix-daemon --- nixos/modules/services/misc/guix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/guix/default.nix b/nixos/modules/services/misc/guix/default.nix index 049a6a5b4222..501760ab0533 100644 --- a/nixos/modules/services/misc/guix/default.nix +++ b/nixos/modules/services/misc/guix/default.nix @@ -283,7 +283,7 @@ in # It's similar to Nix daemon so there's no question whether or not this # should be sandboxed. systemd.services.guix-daemon = { - environment = serviceEnv; + environment = serviceEnv // config.networking.proxy.envVars; script = '' exec ${lib.getExe' package "guix-daemon"} \ --build-users-group=${cfg.group} \ From bcacbf28c4b68dc377d915ec6719475ec1b7c7da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Jan 2025 04:32:20 +0000 Subject: [PATCH 018/287] lunacy: 10.10 -> 10.11 --- pkgs/by-name/lu/lunacy/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/lunacy/package.nix b/pkgs/by-name/lu/lunacy/package.nix index ff23bf42bd90..de31ba69354c 100644 --- a/pkgs/by-name/lu/lunacy/package.nix +++ b/pkgs/by-name/lu/lunacy/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "lunacy"; - version = "10.10"; + version = "10.11"; src = fetchurl { url = "https://lcdn.icons8.com/setup/Lunacy_${finalAttrs.version}.deb"; - hash = "sha256-4aIsEECUl9AjVhPMEhmuAew6ZynaIl15i8jmo3NJ6TU="; + hash = "sha256-yRTp23UISWBbBkA9YavYcjqYMU0RijMyLOCoYk49Jxo="; }; buildInputs = [ From f941b5323c65781cfe2d0c0ed3b25d9071a9cd85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Jan 2025 19:38:51 +0000 Subject: [PATCH 019/287] mitama-cpp-result: 9.3.0 -> 10.0.4 --- pkgs/by-name/mi/mitama-cpp-result/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/mitama-cpp-result/package.nix b/pkgs/by-name/mi/mitama-cpp-result/package.nix index cda102a736ce..3e7770a0fbf5 100644 --- a/pkgs/by-name/mi/mitama-cpp-result/package.nix +++ b/pkgs/by-name/mi/mitama-cpp-result/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mitama-cpp-result"; - version = "9.3.0"; + version = "10.0.4"; src = fetchFromGitHub { owner = "LoliGothick"; repo = "mitama-cpp-result"; rev = "v${finalAttrs.version}"; - hash = "sha256-CWYVPpmPIZZTsqXKh+Ft3SlQ4C9yjUof1mJ8Acn5kmM="; + hash = "sha256-EpCLUeDx8RQQWAkv5To9905RI3/svbW6gzHLcFiNbtQ="; }; nativeBuildInputs = [ From b8706b05875b427294f36d83eafd1edaa4c07475 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Jan 2025 03:13:28 +0000 Subject: [PATCH 020/287] sea-orm-cli: 1.1.3 -> 1.1.4 --- pkgs/by-name/se/sea-orm-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/sea-orm-cli/package.nix b/pkgs/by-name/se/sea-orm-cli/package.nix index 0b27163049bd..a69ff2c21f3f 100644 --- a/pkgs/by-name/se/sea-orm-cli/package.nix +++ b/pkgs/by-name/se/sea-orm-cli/package.nix @@ -9,18 +9,18 @@ }: rustPlatform.buildRustPackage rec { pname = "sea-orm-cli"; - version = "1.1.3"; + version = "1.1.4"; src = fetchCrate { inherit pname version; - hash = "sha256-4j4jeZBe4HyPpa8Em4/zPcIjlJmGfymyEJP2PfDdELQ="; + hash = "sha256-6SFEzbXarfF8FXQqzc8n5S283xKfqqS/sfIBzpGxS04="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; - cargoHash = "sha256-ZdKDQUBpFEVBvvGCulRH+riTeLoXGMMBn2RGSL1uUy4="; + cargoHash = "sha256-ciskV8HdNnIOV7qApqaGPhUSTzeoK8MYDPo4XU4aFm8="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = [ "--version" ]; From 55400f8d3c63ad443fc434c578582bc15a5eaa89 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Fri, 17 Jan 2025 18:21:44 -0500 Subject: [PATCH 021/287] deepsearch-glm: init at 1.0.0 --- .../python-modules/deepsearch-glm/default.nix | 106 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 + 2 files changed, 110 insertions(+) create mode 100644 pkgs/development/python-modules/deepsearch-glm/default.nix diff --git a/pkgs/development/python-modules/deepsearch-glm/default.nix b/pkgs/development/python-modules/deepsearch-glm/default.nix new file mode 100644 index 000000000000..734e301f697b --- /dev/null +++ b/pkgs/development/python-modules/deepsearch-glm/default.nix @@ -0,0 +1,106 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + cmake, + cxxopts, + deepsearch-toolkit, + docling-core, + fasttext, + fmt, + loguru, + matplotlib, + nlohmann_json, + pandas, + pcre2, + pkg-config, + poetry-core, + pybind11, + python-dotenv, + requests, + rich, + sentencepiece, + tabulate, + tqdm, + utf8cpp, + zlib, +}: + +buildPythonPackage rec { + pname = "deepsearch-glm"; + version = "1.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "DS4SD"; + repo = "deepsearch-glm"; + tag = "v${version}"; + hash = "sha256-3sJNkrx0tTm6RMYAwV8Aha7x8dZjf4tGdds8OScRff8="; + }; + + dontUseCmakeConfigure = true; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + build-system = [ + poetry-core + pybind11 + ]; + + env = { + NIX_CFLAGS_COMPILE = "-I${lib.getDev utf8cpp}/include/utf8cpp"; + USE_SYSTEM_DEPS = true; + }; + + optional-dependencies = { + docling = [ + docling-core + pandas + ]; + pyplot = [ + matplotlib + ]; + toolkit = [ + deepsearch-toolkit + python-dotenv + ]; + utils = [ + pandas + python-dotenv + requests + rich + tabulate + tqdm + ]; + }; + + buildInputs = [ + cxxopts + fasttext + fmt + loguru + nlohmann_json + pcre2 + sentencepiece + utf8cpp + zlib + ]; + + # Test suite insists on downloading models, data etc. from s3 bucket + doCheck = false; + + pythonImportsCheck = [ + "deepsearch_glm" + ]; + + meta = { + changelog = "https://github.com/DS4SD/deepsearch-glm/releases/tag/v${version}"; + description = "Create fast graph language models from converted PDF documents for knowledge extraction and Q&A"; + homepage = "https://github.com/DS4SD/deepsearch-glm"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ booxter ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a6a004a1d6b3..d2047468747e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3121,6 +3121,10 @@ self: super: with self; { deepmerge = callPackage ../development/python-modules/deepmerge { }; + deepsearch-glm = callPackage ../development/python-modules/deepsearch-glm { + inherit (pkgs) loguru sentencepiece fasttext; + }; + deepsearch-toolkit = callPackage ../development/python-modules/deepsearch-toolkit { }; deeptoolsintervals = callPackage ../development/python-modules/deeptoolsintervals { }; From 5860af2f68b2d318ae3b12bf6a9f39a784e5aea0 Mon Sep 17 00:00:00 2001 From: arexon Date: Sun, 19 Jan 2025 07:24:08 +0200 Subject: [PATCH 022/287] maintainer: add arexon --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 91c563982d0a..fe1c76f87f87 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1824,6 +1824,12 @@ githubId = 53097078; name = "AJ Reifsnyder"; }; + arexon = { + email = "arexonreal@gmail.com"; + github = "arexon"; + githubId = 65680034; + name = "arexon"; + }; arezvov = { email = "alex@rezvov.ru"; github = "arezvov"; From e48e51ee81b3d359a61b9835a75eaa84f6332596 Mon Sep 17 00:00:00 2001 From: arexon Date: Sun, 19 Jan 2025 07:26:43 +0200 Subject: [PATCH 023/287] regolith: init at 1.5.1 regolith: use string literal in repo attribute regolith: add update script regolith: add comment explaining why tests are disabled regolith: add versionCheckHook, --version arg checking, and enable install check --- pkgs/by-name/re/regolith/package.nix | 43 ++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pkgs/by-name/re/regolith/package.nix diff --git a/pkgs/by-name/re/regolith/package.nix b/pkgs/by-name/re/regolith/package.nix new file mode 100644 index 000000000000..c1ee41899751 --- /dev/null +++ b/pkgs/by-name/re/regolith/package.nix @@ -0,0 +1,43 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + versionCheckHook, +}: +buildGoModule rec { + pname = "regolith"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "Bedrock-OSS"; + repo = "regolith"; + tag = version; + hash = "sha256-gTEQ2hu581tD1I/3iLHzE/2nekAG49/M6V6QeqPhYsA="; + }; + + # Requires network access. + doCheck = false; + + vendorHash = "sha256-+4J4Z7lhbAphi6WUEJN9pzNXf6ROUKqN4NdKI2sQSW0="; + + ldflags = [ + "-X main.buildSource=nix" + "-X main.version=${version}" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Add-on Compiler for the Bedrock Edition of Minecraft"; + homepage = "https://github.com/Bedrock-OSS/regolith"; + changelog = "https://github.com/Bedrock-OSS/regolith/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ arexon ]; + mainProgram = "regolith"; + }; +} From da5a0cfeba808bc82fb33ef07eccd350fca9956b Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 19 Jan 2025 23:01:11 +0100 Subject: [PATCH 024/287] vips: move to openexr_3 OpenEXR 2 is no maintained anymore. --- pkgs/by-name/vi/vips/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vi/vips/package.nix b/pkgs/by-name/vi/vips/package.nix index 61ac85da0971..11b1176e90b4 100644 --- a/pkgs/by-name/vi/vips/package.nix +++ b/pkgs/by-name/vi/vips/package.nix @@ -37,7 +37,7 @@ libtiff, libwebp, matio, - openexr, + openexr_3, openjpeg, openslide, pango, @@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: { libtiff libwebp matio - openexr + openexr_3 openjpeg openslide pango From eac29814d23d0df24588b1e328995959793e77c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Jan 2025 01:48:30 +0000 Subject: [PATCH 025/287] mlt: 7.28.0 -> 7.30.0 --- pkgs/development/libraries/mlt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index e4fe44e0ccea..75355eb4c4c9 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -42,13 +42,13 @@ stdenv.mkDerivation rec { pname = "mlt"; - version = "7.28.0"; + version = "7.30.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - hash = "sha256-rXxjHXXIFFggd2v9ZlNBs0XUDmvJxLvR2JfGkTxDYEA="; + hash = "sha256-z1bW+hcVeMeibC1PUS5XNpbkNB+75YLoOWZC2zuDol4="; # The submodule contains glaxnimate code, since MLT uses internally some functions defined in glaxnimate. # Since glaxnimate is not available as a library upstream, we cannot remove for now this dependency on # submodules until upstream exports glaxnimate as a library: https://gitlab.com/mattbas/glaxnimate/-/issues/545 From 8f91cddf511eb25370738bfbf6a7e2b48084f267 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 21 Jan 2025 16:18:42 +0100 Subject: [PATCH 026/287] xe: modernize --- pkgs/by-name/xe/xe/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/xe/xe/package.nix b/pkgs/by-name/xe/xe/package.nix index fc17f5411a7c..a7cc1837290f 100644 --- a/pkgs/by-name/xe/xe/package.nix +++ b/pkgs/by-name/xe/xe/package.nix @@ -9,19 +9,19 @@ stdenv.mkDerivation rec { version = "1.0"; src = fetchFromGitHub { - owner = "chneukirchen"; + owner = "leahneukirchen"; repo = "xe"; - rev = "v${version}"; + tag = "v${version}"; sha256 = "sha256-yek6flBhgjSeN3M695BglUfcbnUGp3skzWT2W/BxW8Y="; }; makeFlags = [ "PREFIX=$(out)" ]; - meta = with lib; { + meta = { description = "Simple xargs and apply replacement"; - homepage = "https://github.com/chneukirchen/xe"; - license = licenses.publicDomain; - platforms = platforms.all; + homepage = "https://github.com/leahneukirchen/xe"; + license = lib.licenses.publicDomain; + platforms = lib.platforms.all; maintainers = [ ]; mainProgram = "xe"; }; From edc39f12c5883c49bf44878c9e846676a5c478c9 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 21 Jan 2025 16:18:51 +0100 Subject: [PATCH 027/287] xe: add maintainer pbsds --- pkgs/by-name/xe/xe/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/xe/xe/package.nix b/pkgs/by-name/xe/xe/package.nix index a7cc1837290f..7e9ee62af433 100644 --- a/pkgs/by-name/xe/xe/package.nix +++ b/pkgs/by-name/xe/xe/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/leahneukirchen/xe"; license = lib.licenses.publicDomain; platforms = lib.platforms.all; - maintainers = [ ]; + maintainers = [ lib.maintainers.pbsds ]; mainProgram = "xe"; }; } From 19542fb4f7cb653963dd1977219cd2cad9dca58a Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Tue, 21 Jan 2025 23:27:04 +0100 Subject: [PATCH 028/287] gitlab: 17.7.1 -> 17.8.0 https://about.gitlab.com/releases/2025/01/16/gitlab-17-8-released/ --- .../version-management/gitlab/data.json | 14 +- .../gitlab/gitlab-workhorse/default.nix | 4 +- .../version-management/gitlab/rubyEnv/Gemfile | 438 +++++++++--------- .../gitlab/rubyEnv/Gemfile.lock | 195 ++++---- .../gitlab/rubyEnv/gemset.nix | 148 +++--- pkgs/by-name/gi/gitaly/package.nix | 6 +- .../gi/gitlab-container-registry/package.nix | 6 +- pkgs/by-name/gi/gitlab-pages/package.nix | 6 +- 8 files changed, 430 insertions(+), 387 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index e752a9b775e2..3a65fdff9388 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "17.7.1", - "repo_hash": "0c800lczpfbc62scxmf0ll0y619qrdszwxdzsmyl4w14appp96mm", - "yarn_hash": "10iz5148yr1xaij78fx7j4dras35rsm4zgxw8m8fx5adg6xc86sg", + "version": "17.8.0", + "repo_hash": "0a6a05hip2f505yvfi4v7849cmpb1kzghsf6ivy6lrhc06ksxs19", + "yarn_hash": "0d1nzgji3y90gcx92pl0bnqlj5h9ra3r7k1z673fvsj6lzppnx8v", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v17.7.1-ee", + "rev": "v17.8.0-ee", "passthru": { - "GITALY_SERVER_VERSION": "17.7.1", - "GITLAB_PAGES_VERSION": "17.7.1", + "GITALY_SERVER_VERSION": "17.8.0", + "GITLAB_PAGES_VERSION": "17.8.0", "GITLAB_SHELL_VERSION": "14.39.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.4.0", - "GITLAB_WORKHORSE_VERSION": "17.7.1" + "GITLAB_WORKHORSE_VERSION": "17.8.0" } } diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 8b3cdeedfe5a..a9c921a6c994 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "17.7.1"; + version = "17.8.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { @@ -17,7 +17,7 @@ buildGoModule rec { sourceRoot = "${src.name}/workhorse"; - vendorHash = "sha256-ir2Npjl39K2DzjT8fnbOOcMmfHiwFnVmvG04oh2GoOA="; + vendorHash = "sha256-bPabhQD19A3WrCC9D1r0TZOKM+CkoqBgOUj0pqLs3Bo="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index e7d9efcedf78..f7eb0fc5b057 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -21,7 +21,7 @@ end extend ignore_feature_category -gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', require: false # rubocop:todo Gemfile/MissingFeatureCategory +gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', require: false, feature_category: :shared # NOTE: When incrementing the major or minor version here, also increment activerecord_version # in vendor/gems/attr_encrypted/attr_encrypted.gemspec until we resolve @@ -30,27 +30,27 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', requir # See https://docs.gitlab.com/ee/development/gemfile.html#upgrade-rails for guidelines when upgrading Rails if next? - gem 'rails', '~> 7.1.4', feature_category: :shared + gem 'rails', '~> 7.1.5', feature_category: :shared else - gem 'rails', '~> 7.0.8.6', feature_category: :shared + gem 'rails', '~> 7.0.8.7', feature_category: :shared end -gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab', feature_category: :shared -gem 'bootsnap', '~> 1.18.3', require: false # rubocop:todo Gemfile/MissingFeatureCategory +gem 'bootsnap', '~> 1.18.3', require: false, feature_category: :shared # Avoid the precompiled native gems because Omnibus needs to build this to ensure # LD_LIBRARY_PATH is correct: https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7730 gem 'ffi', '~> 1.17', force_ruby_platform: true, feature_category: :shared -gem 'openssl', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'ipaddr', '~> 1.2.5' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'openssl', '~> 3.0', feature_category: :shared +gem 'ipaddr', '~> 1.2.5', feature_category: :shared -gem 'gitlab-safe_request_store', path: 'gems/gitlab-safe_request_store' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gitlab-safe_request_store', path: 'gems/gitlab-safe_request_store', feature_category: :shared # GitLab Monorepo Gems group :monorepo do - gem 'gitlab-utils', path: 'gems/gitlab-utils' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'gitlab-utils', path: 'gems/gitlab-utils', feature_category: :shared end gem 'gitlab-backup-cli', path: 'gems/gitlab-backup-cli', require: 'gitlab/backup/cli', feature_category: :backup_restore @@ -58,76 +58,80 @@ gem 'gitlab-backup-cli', path: 'gems/gitlab-backup-cli', require: 'gitlab/backup gem 'gitlab-secret_detection', path: 'gems/gitlab-secret_detection', feature_category: :secret_detection # Responders respond_to and respond_with -gem 'responders', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'responders', '~> 3.0', feature_category: :shared -gem 'sprockets', '~> 3.7.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'sprockets-rails', '~> 3.5.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'sprockets', '~> 3.7.0', feature_category: :shared +gem 'sprockets-rails', '~> 3.5.1', feature_category: :shared -gem 'view_component', '~> 3.20.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'view_component', '~> 3.21.0', feature_category: :shared # Supported DBs gem 'pg', '~> 1.5.6', feature_category: :database gem 'neighbor', '~> 0.3.2', feature_category: :duo_chat -gem 'rugged', '~> 1.6' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'rugged', '~> 1.6', feature_category: :gitaly gem 'faraday', '~> 2', feature_category: :shared gem 'faraday-retry', '~> 2', feature_category: :shared # Logger is a dependency of Faraday, but Logger 1.6.0 does not work with Chef. -gem 'logger', '~> 1.5.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'logger', '~> 1.5.3', feature_category: :shared -gem 'marginalia', '~> 1.11.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'marginalia', '~> 1.11.1', feature_category: :database # Authorization -gem 'declarative_policy', '~> 1.1.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'declarative_policy', '~> 1.1.0', feature_category: :shared # For source code paths mapping gem 'coverband', '6.1.4', require: false, feature_category: :shared # Authentication libraries gem 'devise', '~> 4.9.3', feature_category: :system_access -gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'bcrypt', '~> 3.1', '>= 3.1.14' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable', + feature_category: :system_access +gem 'bcrypt', '~> 3.1', '>= 3.1.14', feature_category: :system_access gem 'doorkeeper', '~> 5.8', '>= 5.8.1', feature_category: :system_access gem 'doorkeeper-openid_connect', '~> 1.8.10', feature_category: :system_access gem 'doorkeeper-device_authorization_grant', '~> 1.0.0', feature_category: :system_access -gem 'rexml', '~> 3.3.2' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'rexml', '~> 3.3.2', feature_category: :shared gem 'ruby-saml', '~> 1.17.0', feature_category: :system_access -gem 'omniauth', '~> 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'omniauth-auth0', '~> 3.1' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'omniauth-azure-activedirectory-v2', '~> 2.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'omniauth-alicloud', '~> 3.0.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'omniauth-github', '2.0.1' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md # rubocop:todo Gemfile/MissingFeatureCategory -gem 'omniauth-google-oauth2', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'omniauth-oauth2-generic', '~> 0.2.2' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'omniauth', '~> 2.1.0', feature_category: :system_access +gem 'omniauth-auth0', '~> 3.1', feature_category: :system_access +gem 'omniauth-azure-activedirectory-v2', '~> 2.0', feature_category: :system_access +gem 'omniauth-alicloud', '~> 3.0.0', feature_category: :system_access +gem 'omniauth-github', '2.0.1', feature_category: :system_access +# See vendor/gems/omniauth-gitlab/README.md +gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab', feature_category: :system_access +gem 'omniauth-google-oauth2', '~> 1.1', feature_category: :system_access +gem 'omniauth-oauth2-generic', '~> 0.2.2', feature_category: :system_access gem 'omniauth-saml', '~> 2.2.1', feature_category: :system_access -gem 'omniauth-shibboleth-redux', '~> 2.0', require: 'omniauth-shibboleth' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md # rubocop:todo Gemfile/MissingFeatureCategory -gem 'omniauth_openid_connect', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'omniauth-shibboleth-redux', '~> 2.0', require: 'omniauth-shibboleth', feature_category: :system_access +# See vendor/gems/omniauth_crowd/README.md +gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd', feature_category: :system_access +gem 'omniauth_openid_connect', '~> 0.8.0', feature_category: :system_access # Locked until Ruby 3.0 upgrade since upgrading will pull in an updated net-smtp gem. # See https://docs.gitlab.com/ee/development/emails.html#rationale. -gem 'openid_connect', '~> 2.3.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md # rubocop:todo Gemfile/MissingFeatureCategory -gem 'omniauth-atlassian-oauth2', '~> 0.2.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'rack-oauth2', '~> 2.2.1' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'jwt', '~> 2.9.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'openid_connect', '~> 2.3.0', feature_category: :system_access +# See gem README.md +gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce', feature_category: :system_access +gem 'omniauth-atlassian-oauth2', '~> 0.2.0', feature_category: :system_access +gem 'rack-oauth2', '~> 2.2.1', feature_category: :system_access +gem 'jwt', '~> 2.9.3', feature_category: :system_access # Kerberos authentication. EE-only -gem 'gssapi', '~> 1.3.1', group: :kerberos # rubocop:todo Gemfile/MissingFeatureCategory -gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gssapi', '~> 1.3.1', group: :kerberos, feature_category: :system_access +gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos, feature_category: :system_access # Spam and anti-bot protection -gem 'recaptcha', '~> 5.12', require: 'recaptcha/rails' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'akismet', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'invisible_captcha', '~> 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'recaptcha', '~> 5.12', require: 'recaptcha/rails', feature_category: :insider_threat +gem 'akismet', '~> 3.0', feature_category: :insider_threat +gem 'invisible_captcha', '~> 2.1.0', feature_category: :insider_threat # Two-factor authentication -gem 'devise-two-factor', '~> 4.1.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'devise-two-factor', '~> 4.1.1', feature_category: :system_access gem 'rqrcode', '~> 2.2', feature_category: :system_access -gem 'attr_encrypted', '~> 3.2.4', path: 'vendor/gems/attr_encrypted' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'attr_encrypted', '~> 3.2.4', path: 'vendor/gems/attr_encrypted', feature_category: :shared # GitLab Pages gem 'validates_hostname', '~> 1.0.13', feature_category: :pages @@ -136,10 +140,10 @@ gem 'rubyzip', '~> 2.3.2', require: 'zip', feature_category: :pages gem 'acme-client', '~> 2.0.19', feature_category: :pages # Browser detection -gem 'browser', '~> 5.3.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'browser', '~> 5.3.1', feature_category: :shared # OS detection for usage ping -gem 'ohai', '~> 18.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'ohai', '~> 18.1', feature_category: :product_analytics # GPG gem 'gpgme', '~> 2.0.24', feature_category: :source_code_management @@ -147,8 +151,8 @@ gem 'gpgme', '~> 2.0.24', feature_category: :source_code_management # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master -gem 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omniauth-ldap' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'net-ldap', '~> 0.17.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omniauth-ldap', feature_category: :system_access +gem 'net-ldap', '~> 0.17.1', feature_category: :system_access # API gem 'grape', '~> 2.0.0', feature_category: :api @@ -156,7 +160,7 @@ gem 'grape-entity', '~> 1.0.1', feature_category: :api gem 'grape-swagger', '~> 2.1.0', group: [:development, :test], feature_category: :api gem 'grape-swagger-entity', '~> 0.5.1', group: [:development, :test], feature_category: :api gem 'grape-path-helpers', '~> 2.0.1', feature_category: :api -gem 'rack-cors', '~> 2.0.1', require: 'rack/cors' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared # GraphQL API gem 'graphql', '~> 2.4.1', feature_category: :api @@ -175,73 +179,76 @@ gem 'gitlab-duo-workflow-service-client', '~> 0.1', feature_category: :duo_workflow # Generate Fake data -gem 'ffaker', '~> 2.23' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'ffaker', '~> 2.23', feature_category: :shared -gem 'hashie', '~> 5.0.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'hashie', '~> 5.0.0', feature_category: :shared # Pagination -gem 'kaminari', '~> 1.2.2' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'kaminari', '~> 1.2.2', feature_category: :shared # HAML -gem 'hamlit', '~> 2.15.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'hamlit', '~> 2.15.0', feature_category: :shared # Files attachments -gem 'carrierwave', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'mini_magick', '~> 4.12' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'carrierwave', '~> 1.3', feature_category: :shared +gem 'mini_magick', '~> 4.12', feature_category: :shared # for backups gem 'fog-aws', '~> 3.26', feature_category: :shared # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Also see config/initializers/fog_core_patch.rb. -gem 'fog-core', '= 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'fog-google', '~> 1.24.1', require: 'fog/google' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'fog-local', '~> 0.8' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'fog-core', '= 2.1.0', feature_category: :shared +gem 'fog-google', '~> 1.24.1', require: 'fog/google', feature_category: :shared +gem 'fog-local', '~> 0.8', feature_category: :shared # NOTE: # the fog-aliyun gem since v0.4 pulls in aliyun-sdk transitively, which monkey-patches # the rest-client gem to drop the Content-Length header field for chunked transfers, # which may have knock-on effects on other features using `RestClient`. # We may want to update this dependency if this is ever addressed upstream, e.g. via # https://github.com/aliyun/aliyun-oss-ruby-sdk/pull/93 -gem 'fog-aliyun', '~> 0.4' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'fog-aliyun', '~> 0.4', feature_category: :shared gem 'gitlab-fog-azure-rm', '~> 2.2.0', require: 'fog/azurerm', feature_category: :shared # for Google storage # Need this specific version of google-apis-storage_v1 so that fog-google will utilize the updated list_objects with # match_glob support in google-apis-core 0.11.1. Because of this we also have to bump google-cloud-storage to 1.45.0. -gem 'google-apis-storage_v1', '~> 0.29' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'google-cloud-storage', '~> 1.45.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'google-apis-storage_v1', '~> 0.29', feature_category: :shared +gem 'google-cloud-storage', '~> 1.45.0', feature_category: :shared # We need >= 0.11.1 because that's when match_glob support is added to list_objects -gem 'google-apis-core', '~> 0.11.0', '>= 0.11.1' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'google-apis-compute_v1', '~> 0.57.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'google-apis-container_v1', '~> 0.43.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'google-apis-container_v1beta1', '~> 0.43.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'google-apis-cloudbilling_v1', '~> 0.21.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'google-apis-cloudresourcemanager_v1', '~> 0.31.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'google-apis-iam_v1', '~> 0.36.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'google-apis-serviceusage_v1', '~> 0.28.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'google-apis-androidpublisher_v3', '~> 0.34.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'google-apis-core', '~> 0.11.0', '>= 0.11.1', feature_category: :shared +gem 'google-apis-compute_v1', '~> 0.57.0', feature_category: :shared +gem 'google-apis-container_v1', '~> 0.43.0', feature_category: :shared +gem 'google-apis-container_v1beta1', '~> 0.43.0', feature_category: :shared +gem 'google-apis-cloudbilling_v1', '~> 0.21.0', feature_category: :shared +gem 'google-apis-cloudresourcemanager_v1', '~> 0.31.0', feature_category: :shared +gem 'google-apis-iam_v1', '~> 0.36.0', feature_category: :shared +gem 'google-apis-serviceusage_v1', '~> 0.28.0', feature_category: :shared +gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0', feature_category: :shared +gem 'google-apis-androidpublisher_v3', '~> 0.34.0', feature_category: :shared gem 'googleauth', '~> 1.8.1', feature_category: :shared gem 'google-cloud-artifact_registry-v1', '~> 0.11.0', feature_category: :shared gem 'google-cloud-compute-v1', '~> 2.6.0', feature_category: :shared # Seed data -gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'seed-fu', '~> 2.3.7', feature_category: :shared # Search gem 'elasticsearch-model', '~> 7.2', feature_category: :global_search gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation', feature_category: :global_search gem 'elasticsearch-api', '7.17.11', feature_category: :global_search -gem 'aws-sdk-core', '~> 3.213.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'aws-sdk-s3', '~> 1.172.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-core', '~> 3.214.0', feature_category: :global_search +gem 'aws-sdk-cloudformation', '~> 1', feature_category: :global_search +gem 'aws-sdk-s3', '~> 1.176.0', feature_category: :global_search gem 'faraday-typhoeus', '~> 1.1', feature_category: :global_search gem 'faraday_middleware-aws-sigv4', '~> 1.0.1', feature_category: :global_search # Used with Elasticsearch to support http keep-alive connections gem 'typhoeus', '~> 1.4.0', feature_category: :global_search +gem 'gitlab-active-context', path: 'gems/gitlab-active-context', require: 'active_context', + feature_category: :global_search + # Markdown and HTML processing gem 'html-pipeline', '~> 2.14.3', feature_category: :markdown gem 'deckar01-task_list', '2.3.4', feature_category: :markdown @@ -264,24 +271,24 @@ gem 'tanuki_emoji', '~> 0.13', feature_category: :markdown gem 'unicode-emoji', '~> 4.0', feature_category: :markdown # Calendar rendering -gem 'icalendar', '~> 2.10.1', feature_category: :system_access +gem 'icalendar', '~> 2.10.1', feature_category: :team_planning # Diffs -gem 'diffy', '~> 3.4' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'diffy', '~> 3.4', feature_category: :shared gem 'diff_match_patch', '~> 0.1.0', path: 'vendor/gems/diff_match_patch', feature_category: :team_planning # Application server -gem 'rack', '~> 2.2.9' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'rack', '~> 2.2.9', feature_category: :shared # https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually -gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base', feature_category: :shared group :puma do gem 'puma', '= 6.5.0', require: false, feature_category: :shared - gem 'sd_notify', '~> 0.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory + gem 'sd_notify', '~> 0.1.0', require: false, feature_category: :shared end # State machine -gem 'state_machines-activerecord', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'state_machines-activerecord', '~> 0.8.0', feature_category: :shared # Background jobs gem 'sidekiq', path: 'vendor/gems/sidekiq-7.2.4', require: 'sidekiq', feature_category: :scalability @@ -295,34 +302,34 @@ gem 'gitlab-sidekiq-fetcher', gem 'fugit', '~> 1.11.1', feature_category: :continuous_integration # HTTP requests -gem 'httparty', '~> 0.21.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'httparty', '~> 0.21.0', feature_category: :shared # Colored output to console -gem 'rainbow', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'rainbow', '~> 3.0', feature_category: :shared # Progress bar -gem 'ruby-progressbar', '~> 1.10' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'ruby-progressbar', '~> 1.10', feature_category: :shared # Linear-time regex library for untrusted regular expressions -gem 're2', '2.7.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 're2', '2.7.0', feature_category: :shared # Misc gem 'semver_dialects', '~> 3.0', feature_category: :software_composition_analysis -gem 'version_sorter', '~> 2.3' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'csv_builder', path: 'gems/csv_builder' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'version_sorter', '~> 2.3', feature_category: :shared +gem 'csv_builder', path: 'gems/csv_builder', feature_category: :shared # Export Ruby Regex to Javascript -gem 'js_regex', '~> 3.8' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'js_regex', '~> 3.8', feature_category: :shared # User agent parsing -gem 'device_detector' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'device_detector', feature_category: :shared # Redis gem 'redis-namespace', '~> 1.11.0', feature_category: :redis gem 'redis', '~> 5.3.0', feature_category: :redis gem 'redis-clustering', '~> 5.3.0', feature_category: :redis -gem 'connection_pool', '~> 2.4' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'connection_pool', '~> 2.4', feature_category: :shared # Redis session store gem 'redis-actionpack', '~> 5.5.0', feature_category: :redis @@ -341,65 +348,65 @@ gem 'slack-messenger', '~> 2.3.5', feature_category: :integrations gem 'ruby-fogbugz', '~> 0.3.0', feature_category: :importers # Kubernetes integration -gem 'kubeclient', '~> 4.11.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'kubeclient', '~> 4.11.0', feature_category: :shared # AI -gem 'ruby-openai', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'circuitbox', '2.0.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'ruby-openai', '~> 3.7', feature_category: :ai_abstraction_layer +gem 'circuitbox', '2.0.0', feature_category: :ai_abstraction_layer # Sanitize user input -gem 'sanitize', '~> 6.0.2' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'babosa', '~> 2.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'sanitize', '~> 6.0.2', feature_category: :shared +gem 'babosa', '~> 2.0', feature_category: :shared # Sanitizes SVG input -gem 'loofah', '~> 2.22.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'loofah', '~> 2.22.0', feature_category: :shared # Used to provide license templates -gem 'licensee', '~> 9.16' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'licensee', '~> 9.16', feature_category: :shared # Detect and convert string character encoding gem 'charlock_holmes', '~> 0.7.9', feature_category: :shared # Detect mime content type from content -gem 'ruby-magic', '~> 0.6' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'ruby-magic', '~> 0.6', feature_category: :shared # Faster blank -gem 'fast_blank', '~> 1.0.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'fast_blank', '~> 1.0.1', feature_category: :shared # Parse time & duration -gem 'gitlab-chronic', '~> 0.10.5' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gitlab_chronic_duration', '~> 0.12' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gitlab-chronic', '~> 0.10.5', feature_category: :shared +gem 'gitlab_chronic_duration', '~> 0.12', feature_category: :shared -gem 'rack-proxy', '~> 0.7.7' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'rack-proxy', '~> 0.7.7', feature_category: :shared gem 'cssbundling-rails', '1.4.1', feature_category: :shared -gem 'terser', '1.0.2' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'terser', '1.0.2', feature_category: :shared -gem 'click_house-client', path: 'gems/click_house-client', require: 'click_house/client' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'addressable', '~> 2.8' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gon', '~> 6.4.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'request_store', '~> 1.5.1' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'base32', '~> 0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'click_house-client', path: 'gems/click_house-client', require: 'click_house/client', feature_category: :database +gem 'addressable', '~> 2.8', feature_category: :shared +gem 'gon', '~> 6.4.0', feature_category: :shared +gem 'request_store', '~> 1.5.1', feature_category: :shared +gem 'base32', '~> 0.3.0', feature_category: :shared gem 'gitlab-license', '~> 2.6', feature_category: :shared # Protect against bruteforcing -gem 'rack-attack', '~> 6.7.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'rack-attack', '~> 6.7.0', feature_category: :shared # Sentry integration -gem 'sentry-ruby', '~> 5.21.0', feature_category: :observability -gem 'sentry-rails', '~> 5.21.0', feature_category: :observability -gem 'sentry-sidekiq', '~> 5.21.0', feature_category: :observability +gem 'sentry-ruby', '~> 5.22.0', feature_category: :observability +gem 'sentry-rails', '~> 5.22.0', feature_category: :observability +gem 'sentry-sidekiq', '~> 5.22.0', feature_category: :observability # PostgreSQL query parsing # gem 'pg_query', '~> 6.0.0', feature_category: :database -gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gitlab-http', path: 'gems/gitlab-http' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation', feature_category: :shared +gem 'gitlab-http', path: 'gems/gitlab-http', feature_category: :shared gem 'premailer-rails', '~> 1.12.0', feature_category: :notifications gem 'gitlab-labkit', '~> 0.37.0', feature_category: :shared -gem 'thrift', '>= 0.16.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'thrift', '>= 0.16.0', feature_category: :shared # I18n gem 'rails-i18n', '~> 7.0', '>= 7.0.9', feature_category: :internationalization @@ -409,26 +416,27 @@ gem 'gettext', '~> 3.4', '>= 3.4.9', group: [:development, :test], feature_category: :internationalization -gem 'batch-loader', '~> 2.0.5' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'batch-loader', '~> 2.0.5', feature_category: :shared gem 'tty-prompt', '~> 0.23', require: false, feature_category: :shared # Perf bar -gem 'peek', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'peek', '~> 1.1', feature_category: :shared # Google Cloud Profiler support -gem 'cloud_profiler_agent', '~> 0.0.0', path: 'vendor/gems/cloud_profiler_agent', require: false # rubocop:todo Gemfile/MissingFeatureCategory +gem 'cloud_profiler_agent', '~> 0.0.0', path: 'vendor/gems/cloud_profiler_agent', require: false, + feature_category: :shared -# Snowplow events tracking -gem 'snowplow-tracker', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory +# Snowplow events trackin +gem 'snowplow-tracker', '~> 0.8.0', feature_category: :product_analytics # Metrics -gem 'webrick', '~> 1.8.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory -gem 'prometheus-client-mmap', '1.1.2', require: 'prometheus/client' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'webrick', '~> 1.8.1', require: false, feature_category: :shared +gem 'prometheus-client-mmap', '1.1.2', require: 'prometheus/client', feature_category: :shared # Event-driven reactor for Ruby # Required manually in config/initializers/require_async_gem -gem 'async', '~> 2.12.1', require: false # rubocop:disable Gemfile/MissingFeatureCategory -- This is general utility gem +gem 'async', '~> 2.12.1', require: false, feature_category: :shared # Security report schemas used to validate CI job artifacts of security jobs gem 'gitlab-security_report_schemas', '0.1.2.min15.0.0.max15.2.1', feature_category: :vulnerability_management @@ -463,60 +471,65 @@ group :opentelemetry do gem 'opentelemetry-instrumentation-sidekiq', feature_category: :observability end -gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'warning', '~> 1.3.0', feature_category: :shared group :development do gem 'lefthook', '~> 1.7.0', require: false, feature_category: :tooling gem 'rubocop', feature_category: :tooling - gem 'solargraph', '~> 0.47.2', require: false # rubocop:todo Gemfile/MissingFeatureCategory + gem 'solargraph', '~> 0.47.2', require: false, feature_category: :shared - gem 'letter_opener_web', '~> 3.0.0' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'lookbook', '~> 2.3' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'letter_opener_web', '~> 3.0.0', feature_category: :shared + gem 'lookbook', '~> 2.3', feature_category: :shared # Better errors handler - gem 'better_errors', '~> 2.10.1' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'better_errors', '~> 2.10.1', feature_category: :shared - gem 'sprite-factory', '~> 1.7' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'sprite-factory', '~> 1.7', feature_category: :shared - gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'listen', '~> 3.7', feature_category: :shared - gem 'ruby-lsp', "~> 0.21.0", require: false, feature_category: :tooling + gem 'ruby-lsp', "~> 0.22.0", require: false, feature_category: :tooling gem 'ruby-lsp-rails', "~> 0.3.6", feature_category: :tooling gem 'ruby-lsp-rspec', "~> 0.1.10", require: false, feature_category: :tooling gem 'gdk-toogle', '~> 0.9', '>= 0.9.5', require: 'toogle', feature_category: :tooling + + # Used by + # * `lib/tasks/gitlab/security/update_banned_ssh_keys.rake` + # * `lib/tasks/gitlab/db/migration_squash.rake` + gem 'git', '~> 1.8', feature_category: :shared end group :development, :test do - gem 'deprecation_toolkit', '~> 1.5.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'bullet', '~> 7.1.2' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'deprecation_toolkit', '~> 1.5.1', require: false, feature_category: :shared + gem 'bullet', '~> 7.1.2', feature_category: :shared gem 'parser', '= 3.3.6.0', feature_category: :shared - gem 'pry-byebug' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'pry-rails', '~> 0.3.9' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'pry-shell', '~> 0.6.4' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'pry-byebug', feature_category: :shared + gem 'pry-rails', '~> 0.3.9', feature_category: :shared + gem 'pry-shell', '~> 0.6.4', feature_category: :shared - gem 'awesome_print', require: false # rubocop:todo Gemfile/MissingFeatureCategory + gem 'awesome_print', require: false, feature_category: :shared gem 'database_cleaner-active_record', '~> 2.2.0', feature_category: :database gem 'rspec-rails', '~> 7.0.0', feature_category: :shared gem 'factory_bot_rails', '~> 6.4.3', feature_category: :tooling # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) - gem 'minitest', '~> 5.11.0' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'minitest', '~> 5.11.0', feature_category: :shared - gem 'spring', '~> 4.1.0' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'spring-commands-rspec', '~> 1.0.4' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'spring', '~> 4.1.0', feature_category: :shared + gem 'spring-commands-rspec', '~> 1.0.4', feature_category: :shared gem 'gitlab-styles', '~> 13.0.2', feature_category: :tooling gem 'haml_lint', '~> 0.58', feature_category: :tooling - gem 'bundler-audit', '~> 0.9.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory + gem 'bundler-audit', '~> 0.9.1', require: false, feature_category: :shared # Benchmarking & profiling - gem 'benchmark-ips', '~> 2.11.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'benchmark-memory', '~> 0.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory + gem 'benchmark-ips', '~> 2.11.0', require: false, feature_category: :shared + gem 'benchmark-memory', '~> 0.1', require: false, feature_category: :shared # Profiling data from CI/CD pipelines gem 'influxdb-client', '~> 3.1', require: false, feature_category: :tooling @@ -525,15 +538,15 @@ group :development, :test do gem 'crystalball', '~> 0.7.0', require: false, feature_category: :tooling gem 'test_file_finder', '~> 0.3.1', feature_category: :tooling - gem 'simple_po_parser', '~> 1.1.6', require: false # rubocop:todo Gemfile/MissingFeatureCategory + gem 'simple_po_parser', '~> 1.1.6', require: false, feature_category: :shared - gem 'png_quantizator', '~> 0.2.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory + gem 'png_quantizator', '~> 0.2.1', require: false, feature_category: :shared - gem 'parallel', '~> 1.19', require: false # rubocop:todo Gemfile/MissingFeatureCategory + gem 'parallel', '~> 1.19', require: false, feature_category: :shared - gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup', feature_category: :shared - gem 'pact', '~> 1.64' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'pact', '~> 1.64', feature_category: :shared # For now we only use vite in development / test, and not for production builds # See: https://gitlab.com/gitlab-org/frontend/rfcs/-/issues/106 @@ -556,17 +569,17 @@ end # Gems required in omnibus-gitlab pipeline group :development, :test, :omnibus do - gem 'license_finder', '~> 7.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory + gem 'license_finder', '~> 7.0', require: false, feature_category: :shared end # Gems required in various pipelines group :development, :test, :monorepo do - gem 'gitlab-rspec', path: 'gems/gitlab-rspec' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'gitlab-rspec', path: 'gems/gitlab-rspec', feature_category: :shared gem 'gitlab-rspec_flaky', path: 'gems/gitlab-rspec_flaky', feature_category: :tooling end group :test do - gem 'fuubar', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'fuubar', '~> 2.2.0', feature_category: :tooling gem 'rspec-retry', '~> 0.6.2', feature_category: :tooling gem 'rspec_profiling', '~> 0.0.9', feature_category: :tooling gem 'rspec-benchmark', '~> 0.6.0', feature_category: :tooling @@ -577,20 +590,20 @@ group :test do gem 'capybara-screenshot', '~> 1.0.26', feature_category: :test_platform gem 'selenium-webdriver', '~> 4.21', '>= 4.21.1', feature_category: :test_platform - gem 'graphlyte', '~> 1.0.0' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'graphlyte', '~> 1.0.0', feature_category: :shared - gem 'shoulda-matchers', '~> 5.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'email_spec', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'shoulda-matchers', '~> 5.1.0', require: false, feature_category: :shared + gem 'email_spec', '~> 2.2.0', feature_category: :shared gem 'webmock', '~> 3.24.0', feature_category: :shared - gem 'rails-controller-testing' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'concurrent-ruby', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'rails-controller-testing', feature_category: :shared + gem 'concurrent-ruby', '~> 1.1', feature_category: :shared gem 'test-prof', '~> 1.4.0', feature_category: :tooling - gem 'rspec_junit_formatter' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'guard-rspec' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'rspec_junit_formatter', feature_category: :shared + gem 'guard-rspec', feature_category: :shared gem 'axe-core-rspec', '~> 4.9.0', feature_category: :tooling # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 - gem 'derailed_benchmarks', require: false # rubocop:todo Gemfile/MissingFeatureCategory + gem 'derailed_benchmarks', require: false, feature_category: :shared gem 'gitlab_quality-test_tooling', '~> 2.4.0', require: false, feature_category: :tooling end @@ -601,38 +614,38 @@ gem 'faraday-multipart', '~> 1.0', feature_category: :importers gem 'gitlab-mail_room', '~> 0.0.24', require: 'mail_room', feature_category: :shared -gem 'email_reply_trimmer', '~> 0.1' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'html2text' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'email_reply_trimmer', '~> 0.1', feature_category: :shared +gem 'html2text', feature_category: :shared gem 'stackprof', '~> 0.2.26', require: false, feature_category: :shared -gem 'rbtrace', '~> 0.4', require: false # rubocop:todo Gemfile/MissingFeatureCategory -gem 'memory_profiler', '~> 1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory -gem 'activerecord-explain-analyze', '~> 0.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory +gem 'rbtrace', '~> 0.4', require: false, feature_category: :shared +gem 'memory_profiler', '~> 1.0', require: false, feature_category: :shared +gem 'activerecord-explain-analyze', '~> 0.1', require: false, feature_category: :shared # OAuth -gem 'oauth2', '~> 2.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'oauth2', '~> 2.0', feature_category: :system_access # Health check -gem 'health_check', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'health_check', '~> 3.0', feature_category: :shared # System information -gem 'vmstat', '~> 2.3.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'sys-filesystem', '~> 1.4.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'vmstat', '~> 2.3.0', feature_category: :shared +gem 'sys-filesystem', '~> 1.4.3', feature_category: :shared # NTP client -gem 'net-ntp' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'net-ntp', feature_category: :shared # SSH keys support -gem 'ssh_data', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'ssh_data', '~> 1.3', feature_category: :shared # Spamcheck GRPC protocol definitions -gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 17.5.0.pre.rc1', feature_category: :gitaly +gem 'gitaly', '~> 17.7.0', feature_category: :gitaly # KAS GRPC protocol definitions -gem 'gitlab-kas-grpc', '~> 17.6.1', feature_category: :deployment_management +gem 'gitlab-kas-grpc', '~> 17.7.0', feature_category: :deployment_management # Lock the version before issues below are resolved: # https://gitlab.com/gitlab-org/gitlab/-/issues/473169#note_2028352939 @@ -640,31 +653,31 @@ gem 'gitlab-kas-grpc', '~> 17.6.1', feature_category: :deployment_management # that it doesn't have the same issues. gem 'grpc', '= 1.63.0', feature_category: :shared -gem 'google-protobuf', '~> 3.25', '>= 3.25.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared -gem 'toml-rb', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'toml-rb', '~> 2.2.0', feature_category: :shared # Feature toggles -gem 'flipper', '~> 0.26.2' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'flipper-active_record', '~> 0.26.2' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'flipper-active_support_cache_store', '~> 0.26.2' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'unleash', '~> 3.2.2' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'flipper', '~> 0.26.2', feature_category: :shared +gem 'flipper-active_record', '~> 0.26.2', feature_category: :shared +gem 'flipper-active_support_cache_store', '~> 0.26.2', feature_category: :shared +gem 'unleash', '~> 3.2.2', feature_category: :shared gem 'gitlab-experiment', '~> 0.9.1', feature_category: :shared # Structured logging -gem 'lograge', '~> 0.5' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'lograge', '~> 0.5', feature_category: :shared gem 'grape_logging', '~> 1.8', '>= 1.8.4', feature_category: :api # DNS Lookup -gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gitlab-net-dns', '~> 0.9.2', feature_category: :shared # Countries list -gem 'countries', '~> 4.0.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'countries', '~> 4.0.0', feature_category: :shared -gem 'retriable', '~> 3.1.2' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'retriable', '~> 3.1.2', feature_category: :shared # LRU cache -gem 'lru_redux' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'lru_redux', feature_category: :shared # Locked as long as quoted-printable encoding issues are not resolved # Monkey-patched in `config/initializers/mail_encoding_patch.rb` @@ -673,72 +686,77 @@ gem 'lru_redux' # rubocop:todo Gemfile/MissingFeatureCategory # `config/initializers/mail_starttls_patch.rb` has also been patched to # fix STARTTLS handling until https://github.com/mikel/mail/pull/1536 is # released. -gem 'mail', '= 2.8.1' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'mail-smtp_pool', '~> 0.1.0', path: 'vendor/gems/mail-smtp_pool', require: false # rubocop:todo Gemfile/MissingFeatureCategory +gem 'mail', '= 2.8.1', feature_category: :shared +gem 'mail-smtp_pool', '~> 0.1.0', path: 'vendor/gems/mail-smtp_pool', require: false, feature_category: :shared -gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'vendor/gems/microsoft_graph_mailer' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'vendor/gems/microsoft_graph_mailer', feature_category: :shared # File encryption -gem 'lockbox', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'lockbox', '~> 1.3.0', feature_category: :shared # Email validation -gem 'valid_email', '~> 0.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'valid_email', '~> 0.1', feature_category: :shared # JSON -gem 'jsonb_accessor', '~> 1.4' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'jsonb_accessor', '~> 1.4', feature_category: :shared gem 'json', '~> 2.7.2', feature_category: :shared gem 'json_schemer', '~> 2.3.0', feature_category: :shared -gem 'oj', '~> 3.13.21' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'oj-introspect', '~> 0.7' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'multi_json', '~> 1.14.1' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'yajl-ruby', '~> 1.4.3', require: 'yajl' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'oj', '~> 3.13.21', feature_category: :shared +gem 'oj-introspect', '~> 0.7', feature_category: :shared +gem 'multi_json', '~> 1.14.1', feature_category: :shared +gem 'yajl-ruby', '~> 1.4.3', require: 'yajl', feature_category: :shared -gem 'webauthn', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'webauthn', '~> 3.0', feature_category: :shared # IPAddress utilities -gem 'ipaddress', '~> 0.8.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'ipaddress', '~> 0.8.3', feature_category: :shared -gem 'parslet', '~> 1.8' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'parslet', '~> 1.8', feature_category: :shared -gem 'ipynbdiff', path: 'gems/ipynbdiff', require: 'ipynb_diff' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'ipynbdiff', path: 'gems/ipynbdiff', require: 'ipynb_diff', feature_category: :shared -gem 'ed25519', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'ed25519', '~> 1.3.0', feature_category: :shared # Error Tracking OpenAPI client # See https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/development/rake_tasks.md#update-openapi-client-for-error-tracking-feature -gem 'error_tracking_open_api', path: 'gems/error_tracking_open_api' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'error_tracking_open_api', path: 'gems/error_tracking_open_api', feature_category: :shared # Vulnerability advisories -gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite', feature_category: :software_composition_analysis # Work with RPM packages -gem 'arr-pm', '~> 0.0.12' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'arr-pm', '~> 0.0.12', feature_category: :package_registry # Remote Development gem 'devfile', '~> 0.1.1', feature_category: :workspaces # Apple plist parsing -gem 'CFPropertyList', '~> 3.0.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'app_store_connect' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'CFPropertyList', '~> 3.0.0', feature_category: :mobile_devops +gem 'app_store_connect', feature_category: :mobile_devops # For phone verification -gem 'telesignenterprise', '~> 2.2' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'telesignenterprise', '~> 2.2', feature_category: :insider_threat # BufferedIO patch # Updating this version will require updating scripts/allowed_warnings.txt -gem 'net-protocol', '~> 0.1.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'net-protocol', '~> 0.1.3', feature_category: :shared -# This is locked to 0.4.1 because we patch Net::HTTP#connect in +# This is locked to 0.6.0 because we patch Net::HTTP#connect in # gems/gitlab-http/lib/net_http/connect_patch.rb. -gem 'net-http', '= 0.4.1', feature_category: :shared +# It can be upgraded but care must be taken to preserve the patch. +gem 'net-http', '= 0.6.0', feature_category: :shared +# This is locked to 0.13.0 because the default parser changes from RFC2396 to RFC3986, +# which can be removed after Rails 7.2 upgrade +# See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/173142#note_2277952450 +gem 'uri', '= 0.13.0', feature_category: :shared -gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'duo_api', '~> 1.3', feature_category: :system_access gem 'gitlab-sdk', '~> 0.3.0', feature_category: :application_instrumentation -gem 'openbao_client', path: 'gems/openbao_client' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'openbao_client', path: 'gems/openbao_client', feature_category: :artifact_security -gem 'paper_trail', '~> 15.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'paper_trail', '~> 15.0', feature_category: :shared gem "i18n_data", "~> 0.13.1", feature_category: :system_access diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index fb0f33ad1976..fa9b5b84acf2 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -23,10 +23,21 @@ PATH error_tracking_open_api (1.0.0) typhoeus (~> 1.0, >= 1.0.1) +PATH + remote: gems/gitlab-active-context + specs: + gitlab-active-context (0.0.1) + activesupport + connection_pool + elasticsearch + pg + zeitwerk + PATH remote: gems/gitlab-backup-cli specs: gitlab-backup-cli (0.0.1) + activerecord (>= 7) activesupport (>= 7) addressable (~> 2.8) concurrent-ruby (~> 1.1) @@ -40,6 +51,7 @@ PATH logger (~> 1.5.3) minitest (~> 5.11.0) parallel (~> 1.19) + pg (~> 1.5.6) rack (~> 2.2.9) rainbow (~> 3.0) rexml (~> 3.3.2) @@ -62,7 +74,7 @@ PATH concurrent-ruby (~> 1.2) httparty (~> 0.21.0) ipaddress (~> 0.8.3) - net-http (= 0.4.1) + net-http (= 0.6.0) railties (~> 7) PATH @@ -233,70 +245,70 @@ GEM base64 (~> 0.2.0) faraday (>= 1.0, < 3.0.0) faraday-retry (>= 1.0, < 3.0.0) - actioncable (7.0.8.6) - actionpack (= 7.0.8.6) - activesupport (= 7.0.8.6) + actioncable (7.0.8.7) + actionpack (= 7.0.8.7) + activesupport (= 7.0.8.7) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.8.6) - actionpack (= 7.0.8.6) - activejob (= 7.0.8.6) - activerecord (= 7.0.8.6) - activestorage (= 7.0.8.6) - activesupport (= 7.0.8.6) + actionmailbox (7.0.8.7) + actionpack (= 7.0.8.7) + activejob (= 7.0.8.7) + activerecord (= 7.0.8.7) + activestorage (= 7.0.8.7) + activesupport (= 7.0.8.7) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.8.6) - actionpack (= 7.0.8.6) - actionview (= 7.0.8.6) - activejob (= 7.0.8.6) - activesupport (= 7.0.8.6) + actionmailer (7.0.8.7) + actionpack (= 7.0.8.7) + actionview (= 7.0.8.7) + activejob (= 7.0.8.7) + activesupport (= 7.0.8.7) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.8.6) - actionview (= 7.0.8.6) - activesupport (= 7.0.8.6) + actionpack (7.0.8.7) + actionview (= 7.0.8.7) + activesupport (= 7.0.8.7) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.8.6) - actionpack (= 7.0.8.6) - activerecord (= 7.0.8.6) - activestorage (= 7.0.8.6) - activesupport (= 7.0.8.6) + actiontext (7.0.8.7) + actionpack (= 7.0.8.7) + activerecord (= 7.0.8.7) + activestorage (= 7.0.8.7) + activesupport (= 7.0.8.7) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.8.6) - activesupport (= 7.0.8.6) + actionview (7.0.8.7) + activesupport (= 7.0.8.7) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.8.6) - activesupport (= 7.0.8.6) + activejob (7.0.8.7) + activesupport (= 7.0.8.7) globalid (>= 0.3.6) - activemodel (7.0.8.6) - activesupport (= 7.0.8.6) - activerecord (7.0.8.6) - activemodel (= 7.0.8.6) - activesupport (= 7.0.8.6) + activemodel (7.0.8.7) + activesupport (= 7.0.8.7) + activerecord (7.0.8.7) + activemodel (= 7.0.8.7) + activesupport (= 7.0.8.7) activerecord-explain-analyze (0.1.0) activerecord (>= 4) pg - activestorage (7.0.8.6) - actionpack (= 7.0.8.6) - activejob (= 7.0.8.6) - activerecord (= 7.0.8.6) - activesupport (= 7.0.8.6) + activestorage (7.0.8.7) + actionpack (= 7.0.8.7) + activejob (= 7.0.8.7) + activerecord (= 7.0.8.7) + activesupport (= 7.0.8.7) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.8.6) + activesupport (7.0.8.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -342,7 +354,7 @@ GEM aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.213.0) + aws-sdk-core (3.214.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) @@ -350,7 +362,7 @@ GEM aws-sdk-kms (1.76.0) aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.172.0) + aws-sdk-s3 (1.176.1) aws-sdk-core (~> 3, >= 3.210.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) @@ -611,8 +623,8 @@ GEM faraday (>= 1, < 3) faraday-http-cache (2.5.0) faraday (>= 0.8) - faraday-multipart (1.0.4) - multipart-post (~> 2) + faraday-multipart (1.1.0) + multipart-post (~> 2.0) faraday-net_http (3.1.0) net-http faraday-net_http_persistent (2.1.0) @@ -629,7 +641,7 @@ GEM fast_blank (1.0.1) fast_gettext (2.3.0) ffaker (2.23.0) - ffi (1.17.0) + ffi (1.17.1) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake @@ -720,7 +732,7 @@ GEM git (1.18.0) addressable (~> 2.8) rchardet (~> 1.8) - gitaly (17.5.0.pre.rc42) + gitaly (17.7.0) grpc (~> 1.0) gitlab (4.19.0) httparty (~> 0.20) @@ -748,7 +760,7 @@ GEM nokogiri (~> 1, >= 1.10.8) gitlab-glfm-markdown (0.0.23) rb_sys (= 0.9.94) - gitlab-kas-grpc (17.6.2) + gitlab-kas-grpc (17.7.0) grpc (~> 1.0) gitlab-labkit (0.37.0) actionpack (>= 5.0.0, < 8.1.0) @@ -1020,7 +1032,7 @@ GEM invisible_captcha (2.1.0) rails (>= 5.2) io-event (1.6.5) - ipaddr (1.2.5) + ipaddr (1.2.7) ipaddress (0.8.3) jaeger-client (1.1.0) opentracing (~> 0.3) @@ -1176,7 +1188,7 @@ GEM neighbor (0.3.2) activerecord (>= 6.1) nenv (0.3.0) - net-http (0.4.1) + net-http (0.6.0) uri net-http-persistent (4.0.1) connection_pool (~> 2.2) @@ -1193,7 +1205,7 @@ GEM net-ssh (>= 2.6.5, < 8.0.0) net-smtp (0.3.3) net-protocol - net-ssh (7.2.0) + net-ssh (7.3.0) netrc (0.11.0) nio4r (2.7.0) no_proxy_fix (0.1.2) @@ -1215,7 +1227,7 @@ GEM octokit (9.2.0) faraday (>= 1, < 3) sawyer (~> 0.9) - ohai (18.1.3) + ohai (18.1.18) chef-config (>= 14.12, < 19) chef-utils (>= 16.0, < 19) ffi (~> 1.9) @@ -1489,20 +1501,20 @@ GEM rack-test (2.1.0) rack (>= 1.3) rack-timeout (0.7.0) - rails (7.0.8.6) - actioncable (= 7.0.8.6) - actionmailbox (= 7.0.8.6) - actionmailer (= 7.0.8.6) - actionpack (= 7.0.8.6) - actiontext (= 7.0.8.6) - actionview (= 7.0.8.6) - activejob (= 7.0.8.6) - activemodel (= 7.0.8.6) - activerecord (= 7.0.8.6) - activestorage (= 7.0.8.6) - activesupport (= 7.0.8.6) + rails (7.0.8.7) + actioncable (= 7.0.8.7) + actionmailbox (= 7.0.8.7) + actionmailer (= 7.0.8.7) + actionpack (= 7.0.8.7) + actiontext (= 7.0.8.7) + actionview (= 7.0.8.7) + activejob (= 7.0.8.7) + activemodel (= 7.0.8.7) + activerecord (= 7.0.8.7) + activestorage (= 7.0.8.7) + activesupport (= 7.0.8.7) bundler (>= 1.15.0) - railties (= 7.0.8.6) + railties (= 7.0.8.7) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -1516,9 +1528,9 @@ GEM rails-i18n (7.0.10) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (7.0.8.6) - actionpack (= 7.0.8.6) - activesupport (= 7.0.8.6) + railties (7.0.8.7) + actionpack (= 7.0.8.7) + activesupport (= 7.0.8.7) method_source rake (>= 12.2) thor (~> 1.0) @@ -1668,15 +1680,15 @@ GEM ruby-fogbugz (0.3.0) crack (~> 0.4) multipart-post (~> 2.0) - ruby-lsp (0.21.3) + ruby-lsp (0.22.1) language_server-protocol (~> 3.17.0) prism (>= 1.2, < 2.0) rbs (>= 3, < 4) sorbet-runtime (>= 0.5.10782) - ruby-lsp-rails (0.3.26) - ruby-lsp (>= 0.21.2, < 0.22.0) - ruby-lsp-rspec (0.1.18) - ruby-lsp (~> 0.21.0) + ruby-lsp-rails (0.3.27) + ruby-lsp (>= 0.22.0, < 0.23.0) + ruby-lsp-rspec (0.1.19) + ruby-lsp (~> 0.22.0) ruby-magic (0.6.0) mini_portile2 (~> 2.8) ruby-openai (3.7.0) @@ -1713,19 +1725,19 @@ GEM rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - semver_dialects (3.4.4) + semver_dialects (3.4.5) deb_version (~> 1.0.1) pastel (~> 0.8.0) thor (~> 1.3) tty-command (~> 0.10.1) - sentry-rails (5.21.0) + sentry-rails (5.22.1) railties (>= 5.0) - sentry-ruby (~> 5.21.0) - sentry-ruby (5.21.0) + sentry-ruby (~> 5.22.1) + sentry-ruby (5.22.1) bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) - sentry-sidekiq (5.21.0) - sentry-ruby (~> 5.21.0) + sentry-sidekiq (5.22.1) + sentry-ruby (~> 5.22.1) sidekiq (>= 3.0) shellany (0.0.1) shoulda-matchers (5.1.0) @@ -1827,7 +1839,7 @@ GEM unicode-display_width (>= 1.1.1, < 3) terser (1.0.2) execjs (>= 0.3.0, < 3) - test-prof (1.4.2) + test-prof (1.4.4) test_file_finder (0.3.1) faraday (>= 1.0, < 3.0, != 2.0.0) text (1.3.1) @@ -1910,7 +1922,7 @@ GEM activesupport (>= 3.0) version_gem (1.1.0) version_sorter (2.3.0) - view_component (3.20.0) + view_component (3.21.0) activesupport (>= 5.2.0, < 8.1) concurrent-ruby (~> 1.0) method_source (~> 1.0) @@ -1963,7 +1975,7 @@ GEM xpath (3.2.0) nokogiri (~> 1.8) yajl-ruby (1.4.3) - yard (0.9.26) + yard (0.9.37) zeitwerk (2.6.7) PLATFORMS @@ -1989,8 +2001,8 @@ DEPENDENCIES attr_encrypted (~> 3.2.4)! awesome_print aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3.213.0) - aws-sdk-s3 (~> 1.172.0) + aws-sdk-core (~> 3.214.0) + aws-sdk-s3 (~> 1.176.0) axe-core-rspec (~> 4.9.0) babosa (~> 2.0) base32 (~> 0.3.0) @@ -2067,7 +2079,9 @@ DEPENDENCIES gdk-toogle (~> 0.9, >= 0.9.5) gettext (~> 3.4, >= 3.4.9) gettext_i18n_rails (~> 1.13.0) - gitaly (~> 17.5.0.pre.rc1) + git (~> 1.8) + gitaly (~> 17.7.0) + gitlab-active-context! gitlab-backup-cli! gitlab-chronic (~> 0.10.5) gitlab-cloud-connector (~> 0.2.5) @@ -2078,7 +2092,7 @@ DEPENDENCIES gitlab-glfm-markdown (~> 0.0.21) gitlab-housekeeper! gitlab-http! - gitlab-kas-grpc (~> 17.6.1) + gitlab-kas-grpc (~> 17.7.0) gitlab-labkit (~> 0.37.0) gitlab-license (~> 2.6) gitlab-mail_room (~> 0.0.24) @@ -2173,7 +2187,7 @@ DEPENDENCIES minitest (~> 5.11.0) multi_json (~> 1.14.1) neighbor (~> 0.3.2) - net-http (= 0.4.1) + net-http (= 0.6.0) net-ldap (~> 0.17.1) net-ntp net-protocol (~> 0.1.3) @@ -2246,7 +2260,7 @@ DEPENDENCIES rack-oauth2 (~> 2.2.1) rack-proxy (~> 0.7.7) rack-timeout (~> 0.7.0) - rails (~> 7.0.8.6) + rails (~> 7.0.8.7) rails-controller-testing rails-i18n (~> 7.0, >= 7.0.9) rainbow (~> 3.0) @@ -2271,7 +2285,7 @@ DEPENDENCIES rspec_profiling (~> 0.0.9) rubocop ruby-fogbugz (~> 0.3.0) - ruby-lsp (~> 0.21.0) + ruby-lsp (~> 0.22.0) ruby-lsp-rails (~> 0.3.6) ruby-lsp-rspec (~> 0.1.10) ruby-magic (~> 0.6) @@ -2285,9 +2299,9 @@ DEPENDENCIES seed-fu (~> 2.3.7) selenium-webdriver (~> 4.21, >= 4.21.1) semver_dialects (~> 3.0) - sentry-rails (~> 5.21.0) - sentry-ruby (~> 5.21.0) - sentry-sidekiq (~> 5.21.0) + sentry-rails (~> 5.22.0) + sentry-ruby (~> 5.22.0) + sentry-sidekiq (~> 5.22.0) shoulda-matchers (~> 5.1.0) sidekiq! sidekiq-cron (~> 1.12.0) @@ -2323,10 +2337,11 @@ DEPENDENCIES undercover (~> 0.5.0) unicode-emoji (~> 4.0) unleash (~> 3.2.2) + uri (= 0.13.0) valid_email (~> 0.1) validates_hostname (~> 1.0.13) version_sorter (~> 2.3) - view_component (~> 3.20.0) + view_component (~> 3.21.0) vite_rails (~> 3.0.17) vite_ruby (~> 3.8.0) vmstat (~> 2.3.0) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 77f8691bf9b8..9c991edad185 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -17,10 +17,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ms0196bp8gzlghfj32q2qdzszb7hsgg96v3isrv5ysd87w0z2zl"; + sha256 = "0qpiw9n8sswisvji91ra290wiihgl30kg3zkpffx0byz84w52d20"; type = "gem"; }; - version = "7.0.8.6"; + version = "7.0.8.7"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; @@ -28,10 +28,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mw8casnlqgj3vwqv7qk3d4q3bjszlpmbs9ldpc9gz1qdvafx7cg"; + sha256 = "1hn1d8fshkfijsmwflnvn2ys9i8k3rbkk7h6qsgwspg8v2iyl3ll"; type = "gem"; }; - version = "7.0.8.6"; + version = "7.0.8.7"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; @@ -39,10 +39,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07gpm15k5c0y84q99zipnhcdgq93bwralyjpj252prvqwfjmiw73"; + sha256 = "054dv081ysp86im4hxcwwlmkl2zidnmy34mw4acghjkpz2igks4b"; type = "gem"; }; - version = "7.0.8.6"; + version = "7.0.8.7"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -50,10 +50,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19ywl4jp77b51c01hsyzwia093fnj73pw1ipgyj4pk3h2b9faj5n"; + sha256 = "0b2y7wy6gx59zb88v1fqiyxdkafrsfma67sx5394yjlhhzbb3rj0"; type = "gem"; }; - version = "7.0.8.6"; + version = "7.0.8.7"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; @@ -61,10 +61,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j8b29764nbiqz6d7ra42j2i6wf070lbms1fhpq3cl9azbgijb16"; + sha256 = "1818spc73y96n94jssh77z2w4dnz84sn83ywrk5cicnmjzdx4xfb"; type = "gem"; }; - version = "7.0.8.6"; + version = "7.0.8.7"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -72,10 +72,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0girx71db1aq5b70ln3qq03z9d7xjdyp297v1a8rdal7k89y859c"; + sha256 = "1vbziywvidi7gy69hqxsrcxh6n8i4x2w75qam1fzw0qrqv4mp5xy"; type = "gem"; }; - version = "7.0.8.6"; + version = "7.0.8.7"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -83,10 +83,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gbc0wx9xal5bj0pbz8ygkr75wj4cm5i69hpwknf023psgixaybw"; + sha256 = "081a32z17976kgf7a51blh7fsxsm3p8qj02p8wx8cd7fx8xdpx7g"; type = "gem"; }; - version = "7.0.8.6"; + version = "7.0.8.7"; }; activemodel = { dependencies = ["activesupport"]; @@ -94,10 +94,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f6szahjsb4pr2xvlvk4kghk9291xh9c14s8cqwy6wwpm1vcglim"; + sha256 = "10qaykhcs15wgyy9fd886mwdkf3iwsib0h6fcnwqa7jw0nxh8fzi"; type = "gem"; }; - version = "7.0.8.6"; + version = "7.0.8.7"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -105,10 +105,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14qs1jc9hwnsm4dzvnai8b36bcq1d7rcqgjxy0dc6wza670lqapf"; + sha256 = "0nm4y9fy19l65c18v3k8s3x2npp7kcn8ds2y5i38x8aq1r8whkzr"; type = "gem"; }; - version = "7.0.8.6"; + version = "7.0.8.7"; }; activerecord-explain-analyze = { dependencies = ["activerecord" "pg"]; @@ -137,10 +137,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nnvqnmc7mdhw2w55j4vnx4zmmdmmwmaf6ax2mbj9j5a48fw19vf"; + sha256 = "1xcy76cwskwfm39lr4cg7bmknc8j0vymp55h8hzrhl1sfdriwhfa"; type = "gem"; }; - version = "7.0.8.6"; + version = "7.0.8.7"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -148,10 +148,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gj20cysajda05z3r7pl1g9y84nzsqak5dvk9nrz13jpy6297dj1"; + sha256 = "1zq4f834my1z6yh05rfr1dzl3i8padh33j092zlal979blvh4iyz"; type = "gem"; }; - version = "7.0.8.6"; + version = "7.0.8.7"; }; addressable = { dependencies = ["public_suffix"]; @@ -400,10 +400,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06fvh863v0g7h14642yxy0plfnp4jg1g7pdazmv1gmkj3nz8b9kc"; + sha256 = "12s8v199kb3vixl2896axfj4ifkglr0q7zyn73pdkdf3kpra1wi4"; type = "gem"; }; - version = "3.213.0"; + version = "3.214.0"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -422,10 +422,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hwj46w4ilynw5rilpydbykk7hp2hfg2rmwlnr0b4wy5f3aq7b52"; + sha256 = "1smmyhzfkxcin52arlsxi4rcysirvjmshb4zqlb7bgbxainig034"; type = "gem"; }; - version = "1.172.0"; + version = "1.176.1"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -1755,14 +1755,14 @@ src: }; faraday-multipart = { dependencies = ["multipart-post"]; - groups = ["danger" "default" "development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh"; + sha256 = "0l87r9jg06nsh24gwwd1jdnxb1zq89ffybnxab0dd90nfcf0ysw5"; type = "gem"; }; - version = "1.0.4"; + version = "1.1.0"; }; faraday-net_http = { dependencies = ["net-http"]; @@ -1854,10 +1854,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi"; + sha256 = "0fgwn1grxf4zxmyqmb9i4z2hr111585n9jnk17y6y7hhs7dv1xi6"; type = "gem"; }; - version = "1.17.0"; + version = "1.17.1"; }; ffi-compiler = { dependencies = ["ffi" "rake"]; @@ -2166,10 +2166,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05z84knb5f520azqcq0mzwrp3s4c13hpl1bfkkq86paw4hq94ihm"; + sha256 = "0fpypp7l4bzwhbq8my1gscyh4hzamvjvaxlrlvzs88pbhllhdc3i"; type = "gem"; }; - version = "17.5.0.pre.rc42"; + version = "17.7.0"; }; gitlab = { dependencies = ["httparty" "terminal-table"]; @@ -2182,8 +2182,18 @@ src: }; version = "4.19.0"; }; + gitlab-active-context = { + dependencies = ["activesupport" "connection_pool" "elasticsearch" "pg" "zeitwerk"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/gems/gitlab-active-context"; + type = "path"; + }; + version = "0.0.1"; + }; gitlab-backup-cli = { - dependencies = ["activesupport" "addressable" "concurrent-ruby" "faraday" "google-cloud-storage_transfer" "google-protobuf" "googleauth" "grpc" "json" "jwt" "logger" "minitest" "parallel" "rack" "rainbow" "rexml" "thor"]; + dependencies = ["activerecord" "activesupport" "addressable" "concurrent-ruby" "faraday" "google-cloud-storage_transfer" "google-protobuf" "googleauth" "grpc" "json" "jwt" "logger" "minitest" "parallel" "pg" "rack" "rainbow" "rexml" "thor"]; groups = ["default"]; platforms = []; source = { @@ -2294,10 +2304,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11v8jy5dv5vknrgzpasbdncy6jxpxsnrbbz9kpaxpky2k9n7s1fg"; + sha256 = "000681ri2di4y452gk125siv0nfdb8jl0cakmppyf8iccwafaq1r"; type = "gem"; }; - version = "17.6.2"; + version = "17.7.0"; }; gitlab-labkit = { dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"]; @@ -3343,10 +3353,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ypic2hrmvvcgw7al72raphqv5cs1zvq4w284pwrkvfqsrqrqrsf"; + sha256 = "0wmgwqv6c1kq8cxbxddllnrlh5jjmjw73i1sqbnvq55zzn3l0zyb"; type = "gem"; }; - version = "1.2.5"; + version = "1.2.7"; }; ipaddress = { groups = ["default"]; @@ -4077,14 +4087,14 @@ src: }; net-http = { dependencies = ["uri"]; - groups = ["default"]; + groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10n2n9aq00ih8v881af88l1zyrqgs5cl3njdw8argjwbl5ggqvm9"; + sha256 = "1ysrwaabhf0sn24jrp0nnp51cdv0jf688mh5i6fsz63q2c6b48cn"; type = "gem"; }; - version = "0.4.1"; + version = "0.6.0"; }; net-http-persistent = { dependencies = ["connection_pool"]; @@ -4177,10 +4187,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jyj6j7w9zpj2zhp4dyhdjiwsn9rqwksj7s7fzpnn7rx2xvz2a1a"; + sha256 = "1w1ypxa3n6mskkwb00b489314km19l61p5h3bar6zr8cng27c80p"; type = "gem"; }; - version = "7.2.0"; + version = "7.3.0"; }; netrc = { groups = ["default"]; @@ -4282,10 +4292,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15fz0ws8q9635rl5y4jyiwxbibr9ilba4askazhrgy4pcmmgs34q"; + sha256 = "1w0zrk1n6n7jl493k4vv5xaiszbmxsmaffy9xvykbfawjjb83vj2"; type = "gem"; }; - version = "18.1.3"; + version = "18.1.18"; }; oj = { groups = ["default"]; @@ -5314,10 +5324,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s42lyl19h74xlqkb6ffl67h688q0slp1lhnd05g09a46z7wapri"; + sha256 = "1vfd2l3m1802vq7gdqpvd3mkcfhxacpsxixqpx4n6x0mv56ysrsy"; type = "gem"; }; - version = "7.0.8.6"; + version = "7.0.8.7"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -5369,10 +5379,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fcn0ix814074gqicc0k1178f7ahmysiv3pfq8g00phdwj0p3w0g"; + sha256 = "0pshckc6b9h2ikl3svk47iv0nq6v908h3q9ndlblpg021cl8bf8s"; type = "gem"; }; - version = "7.0.8.6"; + version = "7.0.8.7"; }; rainbow = { groups = ["coverage" "default" "development" "test"]; @@ -6001,10 +6011,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hayvpcmgjylxpgxs05jdzyahar4cxpgwhg2b6gg1qhcfhky7i2i"; + sha256 = "1sp2arrj0fz708k6y9airjs1paddm8d1b03hbr3lip0n63d9vsnj"; type = "gem"; }; - version = "0.21.3"; + version = "0.22.1"; }; ruby-lsp-rails = { dependencies = ["ruby-lsp"]; @@ -6012,10 +6022,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lb39frvjwm25iw0q7bzbv6hyh2p2p634fsnplkxz9vqgb0r53pm"; + sha256 = "1iq49y9vml6mzzfgn7z7rdkwzm4w8km7r78mhlpxblrdvk50b1vq"; type = "gem"; }; - version = "0.3.26"; + version = "0.3.27"; }; ruby-lsp-rspec = { dependencies = ["ruby-lsp"]; @@ -6023,10 +6033,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qf43lkvf6v0c5z173sqbxw9vk1vwjfwaq9ynj658kzba8pqjvjf"; + sha256 = "09wafk3nz0b3a3iqz0swi5q5rrwzrys5cydf0mn3iznm9z6wvygy"; type = "gem"; }; - version = "0.1.18"; + version = "0.1.19"; }; ruby-magic = { dependencies = ["mini_portile2"]; @@ -6223,10 +6233,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i2wxx2vdpdiwcr4npqxzdzmd7hwzlllsrpxpic13na654r3wxri"; + sha256 = "0gp63g8m9gpsbqmcs9dnfcgs9pnzhyns2is4ha66lyf43lswm0kk"; type = "gem"; }; - version = "3.4.4"; + version = "3.4.5"; }; sentry-rails = { dependencies = ["railties" "sentry-ruby"]; @@ -6234,10 +6244,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00nn1agy19s3zp7y06zxal6ds8h6w2rlxb6vjk5x7w5gk78l7adm"; + sha256 = "1drz5lm7s2m55pmxdbpbcxlpvgaj3rchm14nrzl2s80fvh47c8i3"; type = "gem"; }; - version = "5.21.0"; + version = "5.22.1"; }; sentry-ruby = { dependencies = ["bigdecimal" "concurrent-ruby"]; @@ -6245,10 +6255,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ac6yy9nfwak6pi8xp2qx31pap1l4h4qhkiala5y1rzwkbahski9"; + sha256 = "129jbd6zvfn59djs455hflk2nhf0sccnvp23vsiwd957dpbvsxzd"; type = "gem"; }; - version = "5.21.0"; + version = "5.22.1"; }; sentry-sidekiq = { dependencies = ["sentry-ruby" "sidekiq"]; @@ -6256,10 +6266,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qlh1r1h6lj57bbgzv9r78pp194jl79bqivn9ffrvxiqjb3lxxbd"; + sha256 = "129ahag27akxqha2dldvvzkbxi3zcrca9naifak3xqaqbs8kyymx"; type = "gem"; }; - version = "5.21.0"; + version = "5.22.1"; }; shellany = { groups = ["default" "test"]; @@ -6749,10 +6759,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mydvmcm4m5501322wyl3pwmc6i5ijvwh4kb242l085j88hiqp4n"; + sha256 = "1vsk2ca9kfrxhyd2xiiyr28hmxkh9vd8j2vwl5f1yfnkv4z52n8s"; type = "gem"; }; - version = "1.4.2"; + version = "1.4.4"; }; test_file_finder = { dependencies = ["faraday"]; @@ -7179,10 +7189,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12r27rq6xlzngc1qv9zhbis0zx2216b8brb0bqg54di91jw94cdc"; + sha256 = "0p6z21kqz05966l77rfj7hdmhb6drld7qaxdbx4qawwylay7fnkz"; type = "gem"; }; - version = "3.20.0"; + version = "3.21.0"; }; virtus = { dependencies = ["axiom-types" "coercible" "descendants_tracker"]; @@ -7400,10 +7410,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qzr5j1a1cafv81ib3i51qyl8jnmwdxlqi3kbiraldzpbjh4ln9h"; + sha256 = "14k9lb9a60r9z2zcqg08by9iljrrgjxdkbd91gw17rkqkqwi1sd6"; type = "gem"; }; - version = "0.9.26"; + version = "0.9.37"; }; zeitwerk = { groups = ["default" "development" "test"]; diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix index 86e6f381558f..08b29fe93903 100644 --- a/pkgs/by-name/gi/gitaly/package.nix +++ b/pkgs/by-name/gi/gitaly/package.nix @@ -7,7 +7,7 @@ }: let - version = "17.7.1"; + version = "17.8.0"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -21,10 +21,10 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-XklkFdp2tIZewIxi9XY1HQ1toL590tvY1DQ/VNF/QQo="; + hash = "sha256-Ofmhyz4sCcho+tVhAD/X+3BtsrUoysvxHpxwc52Abwc="; }; - vendorHash = "sha256-STZvZqqCbW/n3uZohYmz/2lJNkiUUcVjs0msL/lDDaE="; + vendorHash = "sha256-rR3dsKUoIVDj0NviN8p8g3mSAW8PTNChBacqd23yDf8="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" diff --git a/pkgs/by-name/gi/gitlab-container-registry/package.nix b/pkgs/by-name/gi/gitlab-container-registry/package.nix index fe3f825dbc70..59b2d5db0d55 100644 --- a/pkgs/by-name/gi/gitlab-container-registry/package.nix +++ b/pkgs/by-name/gi/gitlab-container-registry/package.nix @@ -6,7 +6,7 @@ buildGoModule rec { pname = "gitlab-container-registry"; - version = "4.14.0"; + version = "4.15.2"; rev = "v${version}-gitlab"; # nixpkgs-update: no auto update @@ -14,10 +14,10 @@ buildGoModule rec { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - hash = "sha256-FOytsMFiaVqHQrwdWpmDbzWGddD4R1rClXWVD2EpUk8="; + hash = "sha256-nsWOCKHoryRcVT79/nbWXa0wnIflEeDLro3l21D6bzc="; }; - vendorHash = "sha256-8TQMMRKyg5bQ3www79V1ejGJ81D0ZMwiXyIhx8+fdec="; + vendorHash = "sha256-aKE/yr2Sh+4yw4TmpaVF84rJOI6cjs0DKY326+aXO1o="; postPatch = '' # Disable flaky inmemory storage driver test diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix index ccda133734b6..7e83d179ecd3 100644 --- a/pkgs/by-name/gi/gitlab-pages/package.nix +++ b/pkgs/by-name/gi/gitlab-pages/package.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "17.7.1"; + version = "17.8.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-DbrasgqowycZNJ2VWwpMBw9SQCxfV47aDVMJrUOQ/Es="; + hash = "sha256-jQwHVSedAtBL5A0Y6OTtpRonSG1k69wdZO011S0D8/E="; }; - vendorHash = "sha256-pJj0BaplDwlNiD+Aqkh1dvu8NfxMhuunK1fnM7TQmuw="; + vendorHash = "sha256-2UtdooVoyoWr4yOPCRBAjkftn29DhJonpJSguHwfHNE="; subPackages = [ "." ]; meta = with lib; { From 8de6f7a8a9fad2d4ca40db678e8ca784c698c62b Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 22 Jan 2025 13:59:19 +0100 Subject: [PATCH 029/287] nixVersions.nix_2_24: 2.24.11 -> 2.24.12 --- pkgs/tools/package-management/nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 5abbfb440ca2..2eca906c41f9 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -173,8 +173,8 @@ in lib.makeExtensible (self: ({ }; nix_2_24 = common { - version = "2.24.11"; - hash = "sha256-ZizmbJM+DbhkaizxbjKg9fNfMrxh3PfAZ6jApQrazks="; + version = "2.24.12"; + hash = "sha256-lPiheE0D146tstoUInOUf1451stezrd8j6H6w7+RCv8="; self_attribute_name = "nix_2_24"; }; From 94efb4613c87f42337d96cad1771637d8edfb21a Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 22 Jan 2025 13:59:41 +0100 Subject: [PATCH 030/287] nixos/nix-fallback-paths: 2.24.11 -> 2.24.12 --- nixos/modules/installer/tools/nix-fallback-paths.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 6248f80d9f0a..dcf6689ec8ce 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,8 +1,8 @@ { - x86_64-linux = "/nix/store/wsa13yx6kl6zzjlhjb8vmcqb6msbxym3-nix-2.24.11"; - i686-linux = "/nix/store/rn1449hjxh77f723m5rc1skgv4paknic-nix-2.24.11"; - aarch64-linux = "/nix/store/psrkach0v2s66rw30nxzpz7hgsqrvg28-nix-2.24.11"; - riscv64-linux = "/nix/store/zc8clmxxi9zr7vx7y8v8kg1rsmhwsp42-nix-riscv64-unknown-linux-gnu-2.24.11"; - x86_64-darwin = "/nix/store/nc81g85wlkzqck5mxdfbnxscavg2xh09-nix-2.24.11"; - aarch64-darwin = "/nix/store/nqzxb4h7sbkk6876zx8yc88ahlgl5kkl-nix-2.24.11"; + x86_64-linux = "/nix/store/kwck2vdfdp2v4jr9c4daryyk9mlbx406-nix-2.24.12"; + i686-linux = "/nix/store/s9qqyxzcgjl7xrfhnnjiiy9v876pcphi-nix-2.24.12"; + aarch64-linux = "/nix/store/pmj4g05d4nlr3gcr8nyadgwir3svbkmx-nix-2.24.12"; + riscv64-linux = "/nix/store/nzr3m4x3mcnfpnmyap31f9pviwv29vyc-nix-riscv64-unknown-linux-gnu-2.24.12"; + x86_64-darwin = "/nix/store/pf6msb0yzccznd75yil32mzk284h90z4-nix-2.24.12"; + aarch64-darwin = "/nix/store/vaaakw66qnbw4g007rf2nggy0rmhf8fh-nix-2.24.12"; } From 50610df9b7bb9cf707972261520464f2a49a056f Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 22 Jan 2025 14:05:22 +0100 Subject: [PATCH 031/287] nixVersions.nix_2_25: 2.25.4 -> 2.25.5 --- pkgs/tools/package-management/nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 5abbfb440ca2..9f96fe2da5f0 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -179,8 +179,8 @@ in lib.makeExtensible (self: ({ }; nix_2_25 = common { - version = "2.25.4"; - hash = "sha256-cB/1vIYk8LWvL71hiKFu8froJHTUAfsYOOxBlBeNglI="; + version = "2.25.5"; + hash = "sha256-9xrQhrqHCSqWsQveykZvG/ZMu0se66fUQw3xVSg6BpQ="; self_attribute_name = "nix_2_25"; }; From a370b2c86fa5c808a57323e3b63a4e022b15670b Mon Sep 17 00:00:00 2001 From: misilelab Date: Thu, 23 Jan 2025 18:17:13 +0900 Subject: [PATCH 032/287] bun: 1.1.43 -> 1.2.0 Signed-off-by: misilelab --- pkgs/by-name/bu/bun/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/bu/bun/package.nix b/pkgs/by-name/bu/bun/package.nix index 5de7c2a9e838..6c3bb7112de0 100644 --- a/pkgs/by-name/bu/bun/package.nix +++ b/pkgs/by-name/bu/bun/package.nix @@ -14,7 +14,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.1.43"; + version = "1.2.0"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -73,19 +73,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-3sbiB84OHnxm7bSAL6eu+EKeOUQZvWqlqCGuXDCuoBE="; + hash = "sha256-+nIXPLIiDQDi0mUP79wLWze/2Lsz2NZxtQ77QJwvV0U="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-SjI5u1jhmsRMRDqpANuhqyz3YCCiWzz1XJxG5IZharM="; + hash = "sha256-aF6IlwQM+qNtxkoz6EGevUqQa9A2v5DIz8vj1oBE1c8="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64-baseline.zip"; - hash = "sha256-q2vBAlBJ7FRowGje7F50MUdgDrOmeyG0xHYC1nRpETY="; + hash = "sha256-6Yad3YhRz4IjK20uFdirUpazKAvNmtP55yMZgsMZXco="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-j5iqhwkVV2R9wjxlwyBrFO6QLI4n0CA9qhIAstH6PCE="; + hash = "sha256-B0fpcBILE6HaU0G3UaXwrxd4vYr9cLXEWPr/+VzppFM="; }; }; updateScript = writeShellScript "update-bun" '' From 48f7505b0705d8cfa18cc7faee1d8440b18f9103 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 23 Jan 2025 02:34:13 +0800 Subject: [PATCH 033/287] vigra: enableParallelBuilding = true --- pkgs/development/libraries/vigra/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index b988daafaa39..f68029b42855 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -51,6 +51,8 @@ stdenv.mkDerivation rec { "-DCMAKE_C_FLAGS=-fPIC" ]; + enableParallelBuilding = true; + meta = with lib; { description = "Novel computer vision C++ library with customizable algorithms and data structures"; mainProgram = "vigra-config"; From 2522475db0951082e3151263bc367175cab39b86 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 23 Jan 2025 20:08:53 +0800 Subject: [PATCH 034/287] vigra: use fixed-point arguments --- pkgs/development/libraries/vigra/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index f68029b42855..d500cc7579d7 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -17,14 +17,14 @@ let python = python3.withPackages (py: with py; [ numpy ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vigra"; version = "1.12.1"; src = fetchFromGitHub { owner = "ukoethe"; repo = "vigra"; - tag = "Version-${lib.replaceStrings [ "." ] [ "-" ] version}"; + tag = "Version-${lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version}"; hash = "sha256-ZmHj1BSyoMBCuxI5hrRiBEb5pDUsGzis+T5FSX27UN8="; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = platforms.unix; }; -} +}) From 4d356df875abb0be8cd7297773d48933bc26186d Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Wed, 22 Jan 2025 22:10:16 +0800 Subject: [PATCH 035/287] vigra: run upstream tests as tests.check --- pkgs/development/libraries/vigra/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index d500cc7579d7..b3b4ef750890 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -41,6 +41,11 @@ stdenv.mkDerivation (finalAttrs: { python ]; + postPatch = '' + chmod +x config/run_test.sh.in + patchShebangs --build config/run_test.sh.in + ''; + cmakeFlags = [ "-DWITH_OPENEXR=1" @@ -53,6 +58,14 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; + passthru = { + tests = { + check = finalAttrs.finalPackage.overrideAttrs (previousAttrs: { + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + }); + }; + }; + meta = with lib; { description = "Novel computer vision C++ library with customizable algorithms and data structures"; mainProgram = "vigra-config"; From fd78733bc5ee3371f4f239f2b232b48b62ae5f01 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 23 Jan 2025 20:17:52 +0800 Subject: [PATCH 036/287] vigra: add ShamrockLee as a maintainer --- pkgs/development/libraries/vigra/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index b3b4ef750890..18cb383651cf 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "vigra-config"; homepage = "https://hci.iwr.uni-heidelberg.de/vigra"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ ShamrockLee ]; platforms = platforms.unix; }; }) From 14d92af69e0aa8e0cedaa0bcf61899150c371f00 Mon Sep 17 00:00:00 2001 From: Friedrich Altheide <11352905+FriedrichAltheide@users.noreply.github.com> Date: Thu, 23 Jan 2025 13:52:42 +0100 Subject: [PATCH 037/287] virtualbox: 7.1.4 -> 7.1.6a --- .../virtualization/virtualbox/default.nix | 14 +++++++++----- .../virtualization/virtualbox/extpack.nix | 8 ++++---- .../virtualbox/guest-additions-iso/default.nix | 10 +++------- .../virtualbox/guest-additions/builder.nix | 12 ++++++++---- .../virtualbox/guest-additions/default.nix | 14 ++++++++++---- .../virtualization/virtualbox/update.sh | 18 +++++++++++------- 6 files changed, 45 insertions(+), 31 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 8ec8874f51e4..f4054613cdc6 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -74,8 +74,9 @@ let buildType = "release"; # Use maintainers/scripts/update.nix to update the version and all related hashes or # change the hashes in extpack.nix and guest-additions/default.nix as well manually. - virtualboxVersion = "7.1.4"; - virtualboxSha256 = "872e7a42b41f8558abbf887f1bdc7aac932bb88b2764d07cbce270cab57e3b5e"; + virtualboxVersion = "7.1.6"; + virtualboxSubVersion = "a"; + virtualboxSha256 = "5a7b13066ec71990af0cc00a5eea9c7ec3c71ca5ed99bb549c85494ce2ea395d"; kvmPatchVersion = "20241220"; kvmPatchHash = "sha256-SYyD79iN6Sp/Mxat+ml3fee9X1vFUFyrwHPnQNboc1c="; @@ -84,7 +85,9 @@ let # modsrc at all. withModsrc = !enableKvm; - virtualboxGuestAdditionsIso = callPackage guest-additions-iso/default.nix { }; + virtualboxGuestAdditionsIso = callPackage guest-additions-iso/default.nix { + inherit virtualboxVersion; + }; inherit (lib) optional @@ -104,11 +107,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "virtualbox"; - version = finalAttrs.virtualboxVersion; + version = "${finalAttrs.virtualboxVersion}${finalAttrs.virtualboxSubVersion}"; inherit buildType virtualboxVersion + virtualboxSubVersion virtualboxSha256 kvmPatchVersion kvmPatchHash @@ -116,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: { ; src = fetchurl { - url = "https://download.virtualbox.org/virtualbox/${finalAttrs.virtualboxVersion}/VirtualBox-${finalAttrs.virtualboxVersion}.tar.bz2"; + url = "https://download.virtualbox.org/virtualbox/${finalAttrs.virtualboxVersion}/VirtualBox-${finalAttrs.virtualboxVersion}${finalAttrs.virtualboxSubVersion}.tar.bz2"; sha256 = finalAttrs.virtualboxSha256; }; diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index 134ce6424ce5..7b9eb812064f 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -4,17 +4,17 @@ virtualbox, }: let - inherit (virtualbox) version; + virtualboxExtPackVersion = "7.1.6"; in fetchurl rec { - name = "Oracle_VirtualBox_Extension_Pack-${version}.vbox-extpack"; - url = "https://download.virtualbox.org/virtualbox/${version}/${name}"; + name = "Oracle_VirtualBox_Extension_Pack-${virtualboxExtPackVersion}.vbox-extpack"; + url = "https://download.virtualbox.org/virtualbox/${virtualboxExtPackVersion}/${name}"; sha256 = # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS let - value = "9dd60ef3c52c2a318fbbb6faace5862a299b61f678a579988869865dcf7390b6"; + value = "c13e47d3fb2c849019accb03353c7d04ffb9c264920075972ed2e2befe3cdd8b"; in assert (builtins.stringLength value) == 64; value; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix index 70e68879264d..61e577ebd95f 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix @@ -1,15 +1,11 @@ { fetchurl, lib, - virtualbox, + virtualboxVersion, }: - -let - inherit (virtualbox) version; -in fetchurl { - url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "80c91d35742f68217cf47b13e5b50d53f54c22c485bacce41ad7fdc321649e61"; + url = "http://download.virtualbox.org/virtualbox/${virtualboxVersion}/VBoxGuestAdditions_${virtualboxVersion}.iso"; + sha256 = "dbbda1645bc05c9260adfe9efc4949cb590ec5ec02680aff936375670cffcafc"; meta = { description = "Guest additions ISO for VirtualBox"; longDescription = '' diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix index 7219f0f8c58b..9cb17616805d 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix @@ -20,19 +20,23 @@ makeself, linuxHeaders, openssl, + virtualboxVersion, + virtualboxSubVersion, + virtualboxSha256, }: let buildType = "release"; - in stdenv.mkDerivation (finalAttrs: { pname = "VirtualBox-GuestAdditions-builder-${kernel.version}"; - version = "7.1.4"; + version = "${virtualboxVersion}${virtualboxSubVersion}"; + + inherit virtualboxVersion virtualboxSubVersion; src = fetchurl { - url = "https://download.virtualbox.org/virtualbox/${finalAttrs.version}/VirtualBox-${finalAttrs.version}.tar.bz2"; - sha256 = "872e7a42b41f8558abbf887f1bdc7aac932bb88b2764d07cbce270cab57e3b5e"; + url = "https://download.virtualbox.org/virtualbox/${finalAttrs.virtualboxVersion}/VirtualBox-${finalAttrs.virtualboxVersion}${finalAttrs.virtualboxSubVersion}.tar.bz2"; + sha256 = virtualboxSha256; }; env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 547b6ac55172..2d8365fa3006 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -12,7 +12,13 @@ libX11, }: let - virtualBoxNixGuestAdditionsBuilder = callPackage ./builder.nix { }; + virtualboxVersion = "7.1.6"; + virtualboxSubVersion = "a"; + virtualboxSha256 = "5a7b13066ec71990af0cc00a5eea9c7ec3c71ca5ed99bb549c85494ce2ea395d"; + + virtualBoxNixGuestAdditionsBuilder = callPackage ./builder.nix { + inherit virtualboxVersion virtualboxSubVersion virtualboxSha256; + }; # Specifies how to patch binaries to make sure that libraries loaded using # dlopen are found. We grep binaries for specific library names and patch @@ -46,7 +52,7 @@ let in stdenv.mkDerivation { pname = "VirtualBox-GuestAdditions"; - version = "${virtualBoxNixGuestAdditionsBuilder.version}-${kernel.version}"; + version = "${virtualboxVersion}${virtualboxSubVersion}-${kernel.version}"; src = "${virtualBoxNixGuestAdditionsBuilder}/VBoxGuestAdditions-${ if stdenv.hostPlatform.is32bit then "x86" else "amd64" @@ -70,7 +76,7 @@ stdenv.mkDerivation { runHook preBuild # Build kernel modules. - cd src/vboxguest-${virtualBoxNixGuestAdditionsBuilder.version}_NixOS + cd src/vboxguest-${virtualboxVersion}_NixOS # Run just make first. If we only did make install, we get symbol warnings during build. make cd ../.. @@ -102,7 +108,7 @@ stdenv.mkDerivation { mkdir -p $out/bin # Install kernel modules. - cd src/vboxguest-${virtualBoxNixGuestAdditionsBuilder.version}_NixOS + cd src/vboxguest-${virtualboxVersion}_NixOS make install INSTALL_MOD_PATH=$out KBUILD_EXTRA_SYMBOLS=$PWD/vboxsf/Module.symvers cd ../.. diff --git a/pkgs/applications/virtualization/virtualbox/update.sh b/pkgs/applications/virtualization/virtualbox/update.sh index 5c811bea4882..51600df4ce5b 100755 --- a/pkgs/applications/virtualization/virtualbox/update.sh +++ b/pkgs/applications/virtualization/virtualbox/update.sh @@ -29,19 +29,23 @@ if [ ! "$oldVersion" = "$latestVersion" ]; then virtualboxNixFile=$(nixFile ${attr}) extpackNixFile=$(nixFile ${attr}Extpack) guestAdditionsIsoNixFile="pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix" - virtualboxGuestAdditionsNixFile="pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix" + virtualboxGuestAdditionsNixFile="pkgs/applications/virtualization/virtualbox/guest-additions/default.nix" virtualBoxOldShaSum=$(oldHash ${attr}Extpack) extpackOldShaSum=$(oldHash ${attr}Extpack) - sed -e "s/virtualboxVersion =.*;/virtualboxVersion = \"$latestVersion\";/g" \ - -e "s/virtualboxSha256 =.*;/virtualboxSha256 = \"$virtualBoxShaSum\";/g" \ + sed -e "s/virtualboxVersion = \".*\";/virtualboxVersion = \"$latestVersion\";/g" \ + -e "s/virtualboxSubVersion = \".*\";/virtualboxSubVersion = \"\";/g" \ + -e "s/virtualboxSha256 = \".*\";/virtualboxSha256 = \"$virtualBoxShaSum\";/g" \ -i "$virtualboxNixFile" - sed -i -e 's|value = "'$extpackOldShaSum'"|value = "'$extpackShaSum'"|' $extpackNixFile - sed -e "s/sha256 =.*;/sha256 = \"$guestAdditionsIsoShaSum\";/g" \ + sed -e 's|value = "'$extpackOldShaSum'"|value = "'$extpackShaSum'"|' \ + -e "s/virtualboxExtPackVersion = \".*\";/virtualboxExtPackVersion = \"$latestVersion\";/g" \ + -i $extpackNixFile + sed -e "s/sha256 = \".*\";/sha256 = \"$guestAdditionsIsoShaSum\";/g" \ -i "$guestAdditionsIsoNixFile" - sed -e "s/version =.*;/version = \"$latestVersion\";/g" \ - -e "s/sha256 =.*;/sha256 = \"$virtualBoxShaSum\";/g" \ + sed -e "s/virtualboxVersion = \".*\";/virtualboxVersion = \"$latestVersion\";/g" \ + -e "s/virtualboxSubVersion = \".*\";/virtualboxSubVersion = \"\";/g" \ + -e "s/virtualboxSha256 = \".*\";/virtualboxSha256 = \"$virtualBoxShaSum\";/g" \ -i "$virtualboxGuestAdditionsNixFile" git add "$virtualboxNixFile" "$extpackNixFile" "$guestAdditionsIsoNixFile" "$virtualboxGuestAdditionsNixFile" From 1a7820b227be5a2595f67c6eb0485e65ea798651 Mon Sep 17 00:00:00 2001 From: t4ccer Date: Tue, 22 Oct 2024 19:43:00 -0600 Subject: [PATCH 038/287] pds: init at 0.4.74 --- pkgs/by-name/pd/pds/package.nix | 92 +++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 pkgs/by-name/pd/pds/package.nix diff --git a/pkgs/by-name/pd/pds/package.nix b/pkgs/by-name/pd/pds/package.nix new file mode 100644 index 000000000000..8f6fbdf29c73 --- /dev/null +++ b/pkgs/by-name/pd/pds/package.nix @@ -0,0 +1,92 @@ +{ + stdenv, + makeBinaryWrapper, + removeReferencesTo, + srcOnly, + python3, + pnpm_9, + fetchFromGitHub, + nodejs, + vips, + pkg-config, + lib, +}: + +let + nodeSources = srcOnly nodejs; + pythonEnv = python3.withPackages (p: [ p.setuptools ]); +in + +stdenv.mkDerivation (finalAttrs: { + pname = "pds"; + version = "0.4.74"; + + src = fetchFromGitHub { + owner = "bluesky-social"; + repo = "pds"; + rev = "v${finalAttrs.version}"; + hash = "sha256-kNHsQ6funmo8bnkFBNWHQ0Fmd5nf/uh+x9buaRJMZnM="; + }; + + sourceRoot = "${finalAttrs.src.name}/service"; + + nativeBuildInputs = [ + makeBinaryWrapper + nodejs + pythonEnv + pkg-config + pnpm_9.configHook + removeReferencesTo + ]; + + # Required for `sharp` NPM dependency + buildInputs = [ vips ]; + + pnpmDeps = pnpm_9.fetchDeps { + inherit (finalAttrs) + pname + version + src + sourceRoot + ; + hash = "sha256-oU4dwlBdsMmgAUv1ICaOqaqucmg/TjKOZxjnxpm0qL8="; + }; + + buildPhase = '' + runHook preBuild + + pushd ./node_modules/.pnpm/better-sqlite3@*/node_modules/better-sqlite3 + npm run build-release --offline --nodedir="${nodeSources}" + find build -type f -exec remove-references-to -t "${nodeSources}" {} \; + popd + + makeWrapper "${lib.getExe nodejs}" "$out/bin/pds" \ + --add-flags --enable-source-maps \ + --add-flags "$out/lib/pds/index.js" \ + --set-default NODE_ENV production + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,lib/pds} + mv node_modules $out/lib/pds + mv index.js $out/lib/pds + + runHook postInstall + ''; + + meta = { + description = "Bluesky Personal Data Server (PDS)"; + homepage = "https://github.com/bluesky-social/pds"; + license = with lib.licenses; [ + mit + asl20 + ]; + maintainers = with lib.maintainers; [ t4ccer ]; + platforms = lib.platforms.unix; + mainProgram = "pds"; + }; +}) From a0bc52cfa9adcbfb7f7cb75fd9048d757929a5e5 Mon Sep 17 00:00:00 2001 From: t4ccer Date: Thu, 7 Nov 2024 21:35:39 -0700 Subject: [PATCH 039/287] pdsadmin: init at 0.4.74 --- pkgs/by-name/pd/pdsadmin/package.nix | 58 +++++++++++++++++++ .../pd/pdsadmin/pdsadmin-offline.patch | 24 ++++++++ 2 files changed, 82 insertions(+) create mode 100644 pkgs/by-name/pd/pdsadmin/package.nix create mode 100644 pkgs/by-name/pd/pdsadmin/pdsadmin-offline.patch diff --git a/pkgs/by-name/pd/pdsadmin/package.nix b/pkgs/by-name/pd/pdsadmin/package.nix new file mode 100644 index 000000000000..60a045fdc5fe --- /dev/null +++ b/pkgs/by-name/pd/pdsadmin/package.nix @@ -0,0 +1,58 @@ +{ + stdenvNoCC, + fetchFromGitHub, + bash, + pds, + makeBinaryWrapper, + jq, + curl, + openssl, + lib, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "pdsadmin"; + inherit (pds) version src; + + patches = [ ./pdsadmin-offline.patch ]; + + nativeBuildInputs = [ makeBinaryWrapper ]; + + buildInputs = [ bash ]; + + strictDeps = true; + + buildPhase = '' + runHook preBuild + + substituteInPlace pdsadmin.sh \ + --replace-fail NIXPKGS_PDSADMIN_ROOT $out + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 pdsadmin.sh $out/lib/pds/pdsadmin.sh + install -Dm755 pdsadmin/*.sh $out/lib/pds + makeWrapper "$out/lib/pds/pdsadmin.sh" "$out/bin/pdsadmin" \ + --prefix PATH : "${ + lib.makeBinPath [ + jq + curl + openssl + ] + }" + + runHook postInstall + ''; + + meta = { + description = "Admin scripts for Bluesky Personal Data Server (PDS)"; + inherit (pds.meta) homepage license; + maintainers = with lib.maintainers; [ t4ccer ]; + platforms = lib.platforms.unix; + mainProgram = "pdsadmin"; + }; +}) diff --git a/pkgs/by-name/pd/pdsadmin/pdsadmin-offline.patch b/pkgs/by-name/pd/pdsadmin/pdsadmin-offline.patch new file mode 100644 index 000000000000..0b3fbee916c3 --- /dev/null +++ b/pkgs/by-name/pd/pdsadmin/pdsadmin-offline.patch @@ -0,0 +1,24 @@ +diff --git a/pdsadmin.sh b/pdsadmin.sh +index 913d2b4..b09c20c 100644 +--- a/pdsadmin.sh ++++ b/pdsadmin.sh +@@ -15,16 +15,11 @@ if [[ "${EUID}" -ne 0 ]]; then + exit 1 + fi + +-# Download the script, if it exists. +-SCRIPT_URL="${PDSADMIN_BASE_URL}/${COMMAND}.sh" +-SCRIPT_FILE="$(mktemp /tmp/pdsadmin.${COMMAND}.XXXXXX)" ++SCRIPT_FILE="NIXPKGS_PDSADMIN_ROOT/lib/pds/${COMMAND}.sh" + +-if ! curl --fail --silent --show-error --location --output "${SCRIPT_FILE}" "${SCRIPT_URL}"; then ++if ! [ -f "${SCRIPT_FILE}" ]; then + echo "ERROR: ${COMMAND} not found" + exit 2 + fi + +-chmod +x "${SCRIPT_FILE}" +-if "${SCRIPT_FILE}" "$@"; then +- rm --force "${SCRIPT_FILE}" +-fi ++"${SCRIPT_FILE}" "$@" From 6091da47e56b3fabed1e19488524adc356c427e1 Mon Sep 17 00:00:00 2001 From: t4ccer Date: Tue, 22 Oct 2024 20:11:48 -0600 Subject: [PATCH 040/287] nixos/pds: init module --- .../manual/release-notes/rl-2505.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/web-apps/pds.nix | 233 ++++++++++++++++++ 3 files changed, 236 insertions(+) create mode 100644 nixos/modules/services/web-apps/pds.nix diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 18277e877340..cd549fdda64a 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -117,6 +117,8 @@ - [Fider](https://fider.io/), an open platform to collect and prioritize feedback. Available as [services.fider](#opt-services.fider.enable). +- [PDS](https://github.com/bluesky-social/pds), Personal Data Server for [bsky](https://bsky.social/). Available as [services.pds](option.html#opt-services.pds). + - [mqtt-exporter](https://github.com/kpetremann/mqtt-exporter/), a Prometheus exporter for exposing messages from MQTT. Available as [services.prometheus.exporters.mqtt](#opt-services.prometheus.exporters.mqtt.enable). - [nvidia-gpu](https://github.com/utkuozdemir/nvidia_gpu_exporter), a Prometheus exporter that scrapes `nvidia-smi` for GPU metrics. Available as [services.prometheus.exporters.nvidia-gpu](#opt-services.prometheus.exporters.nvidia-gpu.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 63cfe03299e4..1bba51daba3a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1549,6 +1549,7 @@ ./services/web-apps/mobilizon.nix ./services/web-apps/openwebrx.nix ./services/web-apps/outline.nix + ./services/web-apps/pds.nix ./services/web-apps/peering-manager.nix ./services/web-apps/peertube.nix ./services/web-apps/pgpkeyserver-lite.nix diff --git a/nixos/modules/services/web-apps/pds.nix b/nixos/modules/services/web-apps/pds.nix new file mode 100644 index 000000000000..b17cd628c157 --- /dev/null +++ b/nixos/modules/services/web-apps/pds.nix @@ -0,0 +1,233 @@ +{ + lib, + pkgs, + config, + ... +}: +let + cfg = config.services.pds; + + inherit (lib) + getExe + mkEnableOption + mkIf + mkOption + mkPackageOption + escapeShellArgs + concatMapStringsSep + types + literalExpression + ; + + pdsadminWrapper = + let + cfgSystemd = config.systemd.services.pds.serviceConfig; + in + pkgs.writeShellScriptBin "pdsadmin" '' + DUMMY_PDS_ENV_FILE="$(mktemp)" + trap 'rm -f "$DUMMY_PDS_ENV_FILE"' EXIT + env "PDS_ENV_FILE=$DUMMY_PDS_ENV_FILE" \ + ${escapeShellArgs cfgSystemd.Environment} \ + ${concatMapStringsSep " " (envFile: "$(cat ${envFile})") cfgSystemd.EnvironmentFile} \ + ${getExe pkgs.pdsadmin} "$@" + ''; +in +# All defaults are from https://github.com/bluesky-social/pds/blob/8b9fc24cec5f30066b0d0b86d2b0ba3d66c2b532/installer.sh +{ + options.services.pds = { + enable = mkEnableOption "pds"; + + package = mkPackageOption pkgs "pds" { }; + + settings = mkOption { + type = types.submodule { + freeformType = types.attrsOf ( + types.oneOf [ + (types.nullOr types.str) + types.port + ] + ); + options = { + PDS_PORT = mkOption { + type = types.port; + default = 3000; + description = "Port to listen on"; + }; + + PDS_HOSTNAME = mkOption { + type = types.str; + example = "pds.example.com"; + description = "Instance hostname (base domain name)"; + }; + + PDS_BLOB_UPLOAD_LIMIT = mkOption { + type = types.str; + default = "52428800"; + description = "Size limit of uploaded blobs in bytes"; + }; + + PDS_DID_PLC_URL = mkOption { + type = types.str; + default = "https://plc.directory"; + description = "URL of DID PLC directory"; + }; + + PDS_BSKY_APP_VIEW_URL = mkOption { + type = types.str; + default = "https://api.bsky.app"; + description = "URL of bsky frontend"; + }; + + PDS_BSKY_APP_VIEW_DID = mkOption { + type = types.str; + default = "did:web:api.bsky.app"; + description = "DID of bsky frontend"; + }; + + PDS_REPORT_SERVICE_URL = mkOption { + type = types.str; + default = "https://mod.bsky.app"; + description = "URL of mod service"; + }; + + PDS_REPORT_SERVICE_DID = mkOption { + type = types.str; + default = "did:plc:ar7c4by46qjdydhdevvrndac"; + description = "DID of mod service"; + }; + + PDS_CRAWLERS = mkOption { + type = types.str; + default = "https://bsky.network"; + description = "URL of crawlers"; + }; + + PDS_DATA_DIRECTORY = mkOption { + type = types.str; + default = "/var/lib/pds"; + description = "Directory to store state"; + }; + + PDS_BLOBSTORE_DISK_LOCATION = mkOption { + type = types.nullOr types.str; + default = "/var/lib/pds/blocks"; + description = "Store blobs at this location, set to null to use e.g. S3"; + }; + + LOG_ENABLED = mkOption { + type = types.nullOr types.str; + default = "true"; + description = "Enable logging"; + }; + }; + }; + + description = '' + Environment variables to set for the service. Secrets should be + specified using {option}`environmentFile`. + + Refer to for available environment variables. + ''; + }; + + environmentFiles = mkOption { + type = types.listOf types.path; + default = [ ]; + description = '' + File to load environment variables from. Loaded variables override + values set in {option}`environment`. + + Use it to set values of `PDS_JWT_SECRET`, `PDS_ADMIN_PASSWORD`, + and `PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX` secrets. + `PDS_JWT_SECRET` and `PDS_ADMIN_PASSWORD` can be generated with + ``` + openssl rand --hex 16 + ``` + `PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX` can be generated with + ``` + openssl ecparam --name secp256k1 --genkey --noout --outform DER | tail --bytes=+8 | head --bytes=32 | xxd --plain --cols 32 + ``` + ''; + }; + + pdsadmin = { + enable = mkOption { + type = types.bool; + default = cfg.enable; + defaultText = literalExpression "config.services.pds.enable"; + description = "Add pdsadmin script to PATH"; + }; + }; + }; + + config = mkIf cfg.enable { + environment = mkIf cfg.pdsadmin.enable { + systemPackages = [ pdsadminWrapper ]; + }; + + systemd.services.pds = { + description = "pds"; + + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + ExecStart = getExe cfg.package; + Environment = lib.mapAttrsToList (k: v: "${k}=${if builtins.isInt v then toString v else v}") ( + lib.filterAttrs (_: v: v != null) cfg.settings + ); + + EnvironmentFile = cfg.environmentFiles; + User = "pds"; + Group = "pds"; + StateDirectory = "pds"; + StateDirectoryMode = "0755"; + Restart = "always"; + + # Hardening + RemoveIPC = true; + CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; + NoNewPrivileges = true; + PrivateDevices = true; + ProtectClock = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + ProtectKernelModules = true; + PrivateMounts = true; + SystemCallArchitectures = [ "native" ]; + MemoryDenyWriteExecute = false; # required by V8 JIT + RestrictNamespaces = true; + RestrictSUIDSGID = true; + ProtectHostname = true; + LockPersonality = true; + ProtectKernelTunables = true; + RestrictAddressFamilies = [ + "AF_UNIX" + "AF_INET" + "AF_INET6" + ]; + RestrictRealtime = true; + DeviceAllow = [ "" ]; + ProtectSystem = "strict"; + ProtectProc = "invisible"; + ProcSubset = "pid"; + ProtectHome = true; + PrivateUsers = true; + PrivateTmp = true; + UMask = "0077"; + }; + }; + + users = { + users.pds = { + group = "pds"; + isSystemUser = true; + }; + groups.pds = { }; + }; + + }; + + meta.maintainers = with lib.maintainers; [ t4ccer ]; +} From 6d0241ebb0d98e9562554b66be10c893fb269bfb Mon Sep 17 00:00:00 2001 From: t4ccer Date: Sat, 9 Nov 2024 20:46:47 -0700 Subject: [PATCH 041/287] pds: add NixOS test --- nixos/tests/all-tests.nix | 1 + nixos/tests/pds.nix | 29 +++++++++++++++++++++++++++++ pkgs/by-name/pd/pds/package.nix | 5 +++++ 3 files changed, 35 insertions(+) create mode 100644 nixos/tests/pds.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index dd117cca93b8..5b11b5e55903 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -806,6 +806,7 @@ in { parsedmarc = handleTest ./parsedmarc {}; password-option-override-ordering = handleTest ./password-option-override-ordering.nix {}; pdns-recursor = handleTest ./pdns-recursor.nix {}; + pds = handleTest ./pds.nix {}; peerflix = handleTest ./peerflix.nix {}; peering-manager = handleTest ./web-apps/peering-manager.nix {}; peertube = handleTestOn ["x86_64-linux"] ./web-apps/peertube.nix {}; diff --git a/nixos/tests/pds.nix b/nixos/tests/pds.nix new file mode 100644 index 000000000000..4c4ab2a64326 --- /dev/null +++ b/nixos/tests/pds.nix @@ -0,0 +1,29 @@ +import ./make-test-python.nix ( + { lib, ... }: + { + name = "PDS"; + + nodes.machine = { + services.pds = { + enable = true; + settings = { + PDS_PORT = 3000; + PDS_HOSTNAME = "example.com"; + + # Snake oil testing credentials + PDS_JWT_SECRET = "7b93fee53be046bf59c27a32a0fb2069"; + PDS_ADMIN_PASSWORD = "3a4077bc0d5f04eca945ef0509f7e809"; + PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX = "ae4f5028d04c833ba630f29debd5ff80b7700e43e9f4bf70f729a88cd6a6ce35"; + }; + }; + }; + + testScript = '' + machine.wait_for_unit("pds.service") + machine.wait_for_open_port(3000) + machine.succeed("curl --fail http://localhost:3000") + ''; + + meta.maintainers = with lib.maintainers; [ t4ccer ]; + } +) diff --git a/pkgs/by-name/pd/pds/package.nix b/pkgs/by-name/pd/pds/package.nix index 8f6fbdf29c73..4dbe0e355763 100644 --- a/pkgs/by-name/pd/pds/package.nix +++ b/pkgs/by-name/pd/pds/package.nix @@ -9,6 +9,7 @@ nodejs, vips, pkg-config, + nixosTests, lib, }: @@ -78,6 +79,10 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.tests = { + inherit (nixosTests) pds; + }; + meta = { description = "Bluesky Personal Data Server (PDS)"; homepage = "https://github.com/bluesky-social/pds"; From 87b736585afc6011683b31d6d5cd927761e3bf74 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 23 Jan 2025 18:32:41 +0100 Subject: [PATCH 042/287] harper: 0.16.0 -> 0.17.0 Diff: https://github.com/Automattic/harper/compare/v0.16.0...v0.17.0 Changelog: https://github.com/Automattic/harper/releases/tag/v0.17.0 --- pkgs/by-name/ha/harper/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index fb1a1f105cb7..b36e969e71fb 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "harper"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "Automattic"; repo = "harper"; rev = "v${version}"; - hash = "sha256-lpaE1yb9Yt1AVpZWBnvDOjTpVeKdTlXDnqNDrF0fCZ8="; + hash = "sha256-cUN7e82CncDzA9m+pcvtrAn10E6AYaMcAuu6hpt85tA="; }; - cargoHash = "sha256-2SFgtEA9dUM1KDgNpZXNVRLHzDCd/AZ4GqzkI8ULRf4="; + cargoHash = "sha256-lo3Ye7u26xLqlu/R4klYd2X9G73119XtWaJzVkl85+g="; meta = { description = "Grammar Checker for Developers"; From 13a1b39da68b9881bb24412f66968a151bf9f1b7 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 23 Jan 2025 19:10:00 +0100 Subject: [PATCH 043/287] netrw: Fix including {stdlib,stdio,string}.h With GCC 14 it is no longer possible to call a function that has not been declared and thus we get build errors like these: netread.c:69:5: error: implicit declaration of function 'fprintf' netread.c:89:5: error: implicit declaration of function 'exit' ../version.h:37:9: error: implicit declaration of function 'puts' Instead of ignoring this error, I looked around in the netrw code and found that there is a STDC_HEADERS preprocessor variable that makes sure that those includes are explicit. The configure script confusingly calls the check "ANSI C header files", so I made sure that the STDC_HEADERS variable really only adds "#include" directives. Signed-off-by: aszlig --- pkgs/by-name/ne/netrw/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ne/netrw/package.nix b/pkgs/by-name/ne/netrw/package.nix index 4d89650f29ef..0c2f072f190d 100644 --- a/pkgs/by-name/ne/netrw/package.nix +++ b/pkgs/by-name/ne/netrw/package.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { version = "1.3.2"; configureFlags = [ + # This is to add "#include" directives for stdlib.h, stdio.h and string.h. + "ac_cv_header_stdc=yes" + "--with-checksum=${checksumType}" ]; From 0fbb055729fe507aebd71716e9f30632e8a65fef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jan 2025 23:07:15 +0000 Subject: [PATCH 044/287] db-rest: 6.0.5 -> 6.0.6 --- pkgs/by-name/db/db-rest/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/db/db-rest/package.nix b/pkgs/by-name/db/db-rest/package.nix index c41f73db114e..f1a8f0e2dc03 100644 --- a/pkgs/by-name/db/db-rest/package.nix +++ b/pkgs/by-name/db/db-rest/package.nix @@ -8,7 +8,7 @@ }: buildNpmPackage rec { pname = "db-rest"; - version = "6.0.5"; + version = "6.0.6"; nodejs = nodejs_18; @@ -16,10 +16,10 @@ buildNpmPackage rec { owner = "derhuerst"; repo = pname; rev = version; - hash = "sha256-jMHqJ1whGPz2ti7gn8SPz6o7Fm4oMF6hYjB4wsjKAEU="; + hash = "sha256-Rwy36hi5p/EDLBbfi1M0DEKD+2/eiJsqo0r2Et/3Oa4="; }; - npmDepsHash = "sha256-rXBIpar5L6fGpDlphr1PqRNxARSccV7Gi+uTNlCqh7I="; + npmDepsHash = "sha256-Drwmnu23PvrT/cw42hl+mu/S/Dn5nzybWGCDCUF7+R8="; preConfigure = '' patchShebangs ./build/index.js From 7386ced30152caf6982562acf6d125c5984a0340 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Thu, 23 Jan 2025 15:34:34 -0500 Subject: [PATCH 045/287] winePackages.{stable,unstable,staging,wayland}: * -> 10.0 --- pkgs/applications/emulators/wine/sources.nix | 42 ++++---------------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/wine-packages.nix | 6 +-- 3 files changed, 10 insertions(+), 40 deletions(-) diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 959fdf6e5c4c..e460d7765f3b 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -24,9 +24,9 @@ let fetchurl = args@{url, hash, ...}: in rec { stable = fetchurl rec { - version = "9.0"; - url = "https://dl.winehq.org/wine/source/9.0/wine-${version}.tar.xz"; - hash = "sha256-fP0JClOV9bdtlbtd76yKMSyN5MBwwRY7i1jaODMMpu4="; + version = "10.0"; + url = "https://dl.winehq.org/wine/source/10.0/wine-${version}.tar.xz"; + hash = "sha256-xeCz9ffvr7MOnNTZxiS4XFgxcdM1SdkzzTQC80GsNgE="; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { @@ -69,9 +69,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "10.0-rc5"; + version = "10.0"; url = "https://dl.winehq.org/wine/source/10.0/wine-${version}.tar.xz"; - hash = "sha256-7IlPe1wH0tTCHVNNf0OUZnuO8ngH4w4hKJhpp02XbtI="; + hash = "sha256-xeCz9ffvr7MOnNTZxiS4XFgxcdM1SdkzzTQC80GsNgE="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -117,7 +117,7 @@ in rec { staging = fetchFromGitLab rec { # https://gitlab.winehq.org/wine/wine-staging inherit (unstable) version; - hash = "sha256-no+yYF/xhy0kRfBqPer0UbpJNEh9LtKCmyVvhQB58K4="; + hash = "sha256-0mzKoaNaJ6ZDYQtJFU383W5nNe/FKtpBjeWDpiqkmp4="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; @@ -126,35 +126,7 @@ in rec { disabledPatchsets = [ ]; }; - wayland = fetchFromGitLab { - # https://gitlab.collabora.com/alf/wine/-/tree/wayland - version = "8.2"; - hash = "sha256-Eb2SFBIeQQ3cVZkUQcwNT5mcYe0ShFxBdMc3BlqkwTo="; - domain = "gitlab.collabora.com"; - owner = "alf"; - repo = "wine"; - rev = "b2547ddf9e08cafce98cf7734d5c4ec926ef3536"; - - inherit (unstable) gecko32 gecko64; - - inherit (unstable) mono; - - updateScript = writeShellScript "update-wine-wayland" '' - ${updateScriptPreamble} - wayland_rev=$(get_source_attr wayland.rev) - - latest_wayland_rev=$(curl -s 'https://gitlab.collabora.com/api/v4/projects/2847/repository/branches/wayland' | jq -r .commit.id) - - if [[ "$wayland_rev" != "$latest_wayland_rev" ]]; then - latest_wayland=$(curl -s 'https://gitlab.collabora.com/alf/wine/-/raw/wayland/VERSION' | cut -f3 -d' ') - wayland_url=$(get_source_attr wayland.url) - set_version_and_hash wayland "$latest_wayland" "$(nix-prefetch-url --unpack "''${wayland_url/$wayland_rev/$latest_wayland_rev}")" - set_source_attr wayland rev "\"$latest_wayland_rev\"" - fi - - do_update - ''; - }; + wayland = pkgs.lib.warnOnInstantiate "building wine with `wineRelease = \"wayland\"` is deprecated. Wine now builds with the wayland driver by default." stable; # added 2025-01-23 winetricks = fetchFromGitHub rec { # https://github.com/Winetricks/winetricks/releases diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b37b0cce9a93..d613f3f12886 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18107,7 +18107,7 @@ with pkgs; }); wine-wayland = lowPrio (winePackages.full.override { - wineRelease = "wayland"; + x11Support = false; }); inherit (callPackage ../servers/web-apps/wordpress {}) diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix index 8d5191f26a25..064c190af214 100644 --- a/pkgs/top-level/wine-packages.nix +++ b/pkgs/top-level/wine-packages.nix @@ -58,11 +58,9 @@ rec { stagingFull = full.override { wineRelease = "staging"; }; wayland = base.override { - wineRelease = "wayland"; - waylandSupport = true; + x11Support = false; }; waylandFull = full.override { - wineRelease = "wayland"; - waylandSupport = true; + x11Support = false; }; } From 57e086f7c0afca8d2c6b1392174862ae8a3234c9 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 24 Jan 2025 02:14:38 +0100 Subject: [PATCH 046/287] aerospace: correct versionCheckHook use --- pkgs/by-name/ae/aerospace/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ae/aerospace/package.nix b/pkgs/by-name/ae/aerospace/package.nix index 29c2c7faa680..7b3ecdb894e0 100644 --- a/pkgs/by-name/ae/aerospace/package.nix +++ b/pkgs/by-name/ae/aerospace/package.nix @@ -39,7 +39,10 @@ stdenv.mkDerivation { installShellCompletion --zsh shell-completion/zsh/_aerospace ''; - passthru.tests.can-print-version = [ versionCheckHook ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; passthru.updateScript = gitUpdater { url = "https://github.com/nikitabobko/AeroSpace.git"; From efdd819a011889f0fb98093be631468617467a4b Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 24 Jan 2025 02:14:38 +0100 Subject: [PATCH 047/287] cloudpan189-go: correct versionCheckHook use --- pkgs/by-name/cl/cloudpan189-go/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/cl/cloudpan189-go/package.nix b/pkgs/by-name/cl/cloudpan189-go/package.nix index e3f61182d052..f3259db43663 100644 --- a/pkgs/by-name/cl/cloudpan189-go/package.nix +++ b/pkgs/by-name/cl/cloudpan189-go/package.nix @@ -22,6 +22,7 @@ buildGo122Module rec { ''; }; + doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; From e22406ebcadee03cf66974c03fe458265d4fdf1b Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 24 Jan 2025 02:14:39 +0100 Subject: [PATCH 048/287] deepsource: correct versionCheckHook use --- pkgs/by-name/de/deepsource/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/de/deepsource/package.nix b/pkgs/by-name/de/deepsource/package.nix index 10d48b0fc4ce..39f97281d73b 100644 --- a/pkgs/by-name/de/deepsource/package.nix +++ b/pkgs/by-name/de/deepsource/package.nix @@ -48,6 +48,8 @@ buildGoModule rec { --zsh <($out/bin/deepsource completion zsh) ''; + doInstallCheck = true; + versionCheckProgramArg = [ "version" ]; nativeInstallCheckInputs = [ versionCheckHook ]; From 0de44d11428f73b05897146bbe74828c9ed100b2 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 24 Jan 2025 02:14:39 +0100 Subject: [PATCH 049/287] envision-unwrapped: correct versionCheckHook use --- pkgs/by-name/en/envision-unwrapped/package.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/en/envision-unwrapped/package.nix b/pkgs/by-name/en/envision-unwrapped/package.nix index de64e6eb852e..7260bf80d51e 100644 --- a/pkgs/by-name/en/envision-unwrapped/package.nix +++ b/pkgs/by-name/en/envision-unwrapped/package.nix @@ -67,7 +67,6 @@ stdenv.mkDerivation (finalAttrs: { pkg-config rustPlatform.cargoSetupHook rustc - versionCheckHook wrapGAppsHook4 ]; @@ -87,6 +86,14 @@ stdenv.mkDerivation (finalAttrs: { zlib ]; + # FIXME: error when running `env -i envision`: + # "HOME env var not defined: NotPresent" + doInstallCheck = false; + versionCheckProgram = "${placeholder "out"}/bin/envision"; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + postInstall = '' wrapProgram $out/bin/envision \ --prefix PATH : "${lib.makeBinPath [ gdb ]}" From 2c9593b5a3b217ad9390c95ecf67318cdfcf2377 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 24 Jan 2025 02:14:39 +0100 Subject: [PATCH 050/287] gollama: correct versionCheckHook use --- pkgs/by-name/go/gollama/package.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/go/gollama/package.nix b/pkgs/by-name/go/gollama/package.nix index 30e4006a656d..75e97c841c7d 100644 --- a/pkgs/by-name/go/gollama/package.nix +++ b/pkgs/by-name/go/gollama/package.nix @@ -16,6 +16,11 @@ buildGoModule rec { hash = "sha256-7wCBflX34prZJl4HhZUU2a2qHxaBs1fMKHpwE0vX1GE="; }; + postPatch = '' + substituteInPlace main.go \ + --replace-fail 'Version = "1.28.0"' 'Version = "${version}"' + ''; + vendorHash = "sha256-Y5yg54em+vqoWXxS3JVQVPEM+fLXgoblmY+48WpxSCQ="; doCheck = false; @@ -25,7 +30,10 @@ buildGoModule rec { "-w" ]; - nativeInputChecks = [ + # FIXME: error when running `env -i gollama`: + # "Error initializing logging: $HOME is not defined" + doInstallCheck = false; + nativeInstallCheckInputs = [ versionCheckHook ]; From 793d897fe0204e6e840af3608268396a395c044f Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 24 Jan 2025 02:14:39 +0100 Subject: [PATCH 051/287] mergiraf: correct versionCheckHook use --- pkgs/by-name/me/mergiraf/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix index a322f863ab05..21c02e1dc022 100644 --- a/pkgs/by-name/me/mergiraf/package.nix +++ b/pkgs/by-name/me/mergiraf/package.nix @@ -26,6 +26,10 @@ rustPlatform.buildRustPackage rec { nativeCheckInputs = [ git + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; From 504e6ffdc4234cf1393e1182958fbbb355cae1b5 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 24 Jan 2025 02:14:40 +0100 Subject: [PATCH 052/287] nixpkgs-review: correct versionCheckHook use --- pkgs/by-name/ni/nixpkgs-review/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ni/nixpkgs-review/package.nix b/pkgs/by-name/ni/nixpkgs-review/package.nix index 5b20425a25e1..155251f82dc0 100644 --- a/pkgs/by-name/ni/nixpkgs-review/package.nix +++ b/pkgs/by-name/ni/nixpkgs-review/package.nix @@ -70,7 +70,8 @@ python3Packages.buildPythonApplication rec { done ''; - nativeCheckInputs = [ + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = [ "--version" ]; From 520728f3e0b51de572ccf382eb101fcf87bb2bca Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 24 Jan 2025 02:14:40 +0100 Subject: [PATCH 053/287] nvitop: correct versionCheckHook use --- pkgs/by-name/nv/nvitop/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/nv/nvitop/package.nix b/pkgs/by-name/nv/nvitop/package.nix index cce03aca75c7..e7b5a861defb 100644 --- a/pkgs/by-name/nv/nvitop/package.nix +++ b/pkgs/by-name/nv/nvitop/package.nix @@ -25,7 +25,8 @@ python3Packages.buildPythonApplication rec { nvidia-ml-py ]; - nativeCheckInputs = [ + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = [ "--version" ]; From 5ea5a69947c133f0245b09a2c3478cc06cb55d6b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 24 Jan 2025 03:18:19 +0100 Subject: [PATCH 054/287] python312Packages.drafthorse: 2.4.0 -> 2025.1.0 https://github.com/pretix/python-drafthorse/compare/2.4.0...2025.1.0 --- pkgs/development/python-modules/drafthorse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/drafthorse/default.nix b/pkgs/development/python-modules/drafthorse/default.nix index 4efde1b74bb8..81874cc6017a 100644 --- a/pkgs/development/python-modules/drafthorse/default.nix +++ b/pkgs/development/python-modules/drafthorse/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "drafthorse"; - version = "2.4.0"; + version = "2025.1.0"; pyproject = true; src = fetchFromGitHub { owner = "pretix"; repo = "python-drafthorse"; rev = version; - hash = "sha256-3W5rQ0YhyhIoZ+KsaOjlEJOrcoejPoTIJaylK7DOwKc="; + hash = "sha256-v4yN2VHSA6pOXCSHscHIECeQchZkzH+/Hal4JwGXh74="; }; build-system = [ setuptools ]; From cfd91265a6ee9c94a90e03fc30de4c8a091453e9 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Fri, 24 Jan 2025 08:33:56 +0100 Subject: [PATCH 055/287] tre: fix cross build --- pkgs/by-name/tr/tre/package.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/tr/tre/package.nix b/pkgs/by-name/tr/tre/package.nix index 969b17817d71..ccfb9d4937c9 100644 --- a/pkgs/by-name/tr/tre/package.nix +++ b/pkgs/by-name/tr/tre/package.nix @@ -29,16 +29,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoconf automake + gettext # autopoint libtool ]; - buildInputs = - [ - gettext - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; preConfigure = '' ./utils/autogen.sh From ebdff4610caeaeac7e1aa408c438f2d288aac3a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jan 2025 16:13:08 +0000 Subject: [PATCH 056/287] python312Packages.pythonqwt: 0.14.2 -> 0.14.4 --- pkgs/development/python-modules/pythonqwt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pythonqwt/default.nix b/pkgs/development/python-modules/pythonqwt/default.nix index 818afbe3932e..76f7a5031223 100644 --- a/pkgs/development/python-modules/pythonqwt/default.nix +++ b/pkgs/development/python-modules/pythonqwt/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "pythonqwt"; - version = "0.14.2"; + version = "0.14.4"; pyproject = true; src = fetchFromGitHub { owner = "PlotPyStack"; repo = "PythonQwt"; tag = "v${version}"; - hash = "sha256-8bhcfm4sPA32IpEcS4Z12nfNgfmWJUDxDjX1TULWwCU="; + hash = "sha256-ZlrnCsC/is4PPUbzaMfwWSHQSQ06ksb2b/dkU8VhtSU="; }; build-system = [ From 31c192438e32a38d9d9937cf93a0e4a9cee72cd5 Mon Sep 17 00:00:00 2001 From: euxane Date: Wed, 22 Jan 2025 19:57:02 +0100 Subject: [PATCH 057/287] dovecot-fts-flatcurve: init at 1.0.5 Note: this plugin will be integrated into Dovecot/core in 2.4. In the meantime, it has to be used as a separate plugin for 2.3. --- .../do/dovecot-fts-flatcurve/package.nix | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pkgs/by-name/do/dovecot-fts-flatcurve/package.nix diff --git a/pkgs/by-name/do/dovecot-fts-flatcurve/package.nix b/pkgs/by-name/do/dovecot-fts-flatcurve/package.nix new file mode 100644 index 000000000000..65dac4a74402 --- /dev/null +++ b/pkgs/by-name/do/dovecot-fts-flatcurve/package.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + pkg-config, + dovecot, + xapian, +}: + +stdenv.mkDerivation rec { + pname = "dovecot-fts-flatcurve"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "slusarz"; + repo = "dovecot-fts-flatcurve"; + rev = "refs/tags/v${version}"; + hash = "sha256-96sR/pl0G0sSjh/YrXdgVgASJPhrL32xHCbBGrDxzoU="; + }; + + buildInputs = [ + xapian + ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + configureFlags = [ + "--with-dovecot=${dovecot}/lib/dovecot" + "--with-moduledir=$(out)/lib/dovecot" + ]; + + meta = with lib; { + homepage = "https://slusarz.github.io/dovecot-fts-flatcurve/"; + description = "Dovecot FTS Flatcurve plugin (Xapian)"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ euxane ]; + platforms = platforms.unix; + }; +} From 788d769a642ba5e8bf856cf569f4d4ea9dba4725 Mon Sep 17 00:00:00 2001 From: euxane Date: Wed, 22 Jan 2025 19:56:54 +0100 Subject: [PATCH 058/287] dovecot: build with textcat This allows the integrated Full-Text Search plugin to detect languages when indexing. --- pkgs/servers/mail/dovecot/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index ebfb9be622c6..1eab18bc5fac 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -15,6 +15,7 @@ coreutils, clucene_core_2, icu, + libexttextcat, openldap, libsodium, libstemmer, @@ -48,6 +49,7 @@ stdenv.mkDerivation rec { lz4 clucene_core_2 icu + libexttextcat openldap libsodium libstemmer @@ -131,6 +133,7 @@ stdenv.mkDerivation rec { "--with-ldap" "--with-lucene" "--with-icu" + "--with-textcat" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "i_cv_epoll_works=${if stdenv.hostPlatform.isLinux then "yes" else "no"}" From aed9c00b67e81cdb19222639454bf81af0ca54fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jan 2025 17:14:46 +0000 Subject: [PATCH 059/287] python312Packages.cyclopts: 3.3.0 -> 3.3.1 --- pkgs/development/python-modules/cyclopts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index 7a859d9bab5a..094193c51319 100644 --- a/pkgs/development/python-modules/cyclopts/default.nix +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cyclopts"; - version = "3.3.0"; + version = "3.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "BrianPugh"; repo = "cyclopts"; tag = "v${version}"; - hash = "sha256-sXTKBDfQSqMWBX+wrhP6fCugGSuXM8mOkEroFWPalVs="; + hash = "sha256-PrhaUUzFQJ7tqUdu7nwi9k+NxQUPQWYDUc9vsvnmfeY="; }; build-system = [ From c80e3b8fa40104bcd63b4ac1627e41ae497506e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 24 Jan 2025 16:12:51 -0800 Subject: [PATCH 060/287] python313Packages.rocketchat-api: 1.34.0 -> 1.35.0 Diff: https://github.com/jadolg/rocketchat_API/compare/refs/tags/1.34.0...1.35.0 Changelog: https://github.com/jadolg/rocketchat_API/releases/tag/1.35.0 --- pkgs/development/python-modules/rocketchat-api/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rocketchat-api/default.nix b/pkgs/development/python-modules/rocketchat-api/default.nix index d10f94d72f31..0175c3b2cd8f 100644 --- a/pkgs/development/python-modules/rocketchat-api/default.nix +++ b/pkgs/development/python-modules/rocketchat-api/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "rocketchat-api"; - version = "1.34.0"; + version = "1.35.0"; pyproject = true; src = fetchFromGitHub { owner = "jadolg"; repo = "rocketchat_API"; tag = version; - hash = "sha256-ny/VybQDZFB4ZxHEnDP2IeYsHjgO9pAk4r0vpX+hWVE="; + hash = "sha256-lbYOsh+QiQdbASOyi2E/VAziI2LU7x9zSe1qHJdiQa4="; }; build-system = [ setuptools ]; @@ -36,6 +36,7 @@ buildPythonPackage rec { doCheck = false; meta = { + changelog = "https://github.com/jadolg/rocketchat_API/releases/tag/${src.tag}"; description = "Python API wrapper for Rocket.Chat"; homepage = "https://github.com/jadolg/rocketchat_API"; license = lib.licenses.mit; From 3adc86b87d1cde8e1d7e0a927019456283769aa0 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 22 Jan 2025 20:32:00 +0100 Subject: [PATCH 061/287] lomiri.morph-browser: 1.1.1 -> 1.1.2 --- ...ace-wait-and-compare-with-tryCompare.patch | 196 ------------------ .../applications/morph-browser/default.nix | 19 +- 2 files changed, 3 insertions(+), 212 deletions(-) delete mode 100644 pkgs/desktops/lomiri/applications/morph-browser/1001-morph-browser-tst_AddressBar-Replace-wait-and-compare-with-tryCompare.patch diff --git a/pkgs/desktops/lomiri/applications/morph-browser/1001-morph-browser-tst_AddressBar-Replace-wait-and-compare-with-tryCompare.patch b/pkgs/desktops/lomiri/applications/morph-browser/1001-morph-browser-tst_AddressBar-Replace-wait-and-compare-with-tryCompare.patch deleted file mode 100644 index 72c27c3e0e29..000000000000 --- a/pkgs/desktops/lomiri/applications/morph-browser/1001-morph-browser-tst_AddressBar-Replace-wait-and-compare-with-tryCompare.patch +++ /dev/null @@ -1,196 +0,0 @@ -From 9c4cd4fa938244cc2e319555d372e4e32029964a Mon Sep 17 00:00:00 2001 -From: OPNA2608 -Date: Tue, 14 Jan 2025 23:06:20 +0100 -Subject: [PATCH] tests/unittests/qml/tst_AddressBar.qml: Replace wait + - compare with tryCompare - ---- - tests/unittests/qml/tst_AddressBar.qml | 75 +++++++++++--------------- - 1 file changed, 30 insertions(+), 45 deletions(-) - -diff --git a/tests/unittests/qml/tst_AddressBar.qml b/tests/unittests/qml/tst_AddressBar.qml -index 5c27acff..dc0ec4c6 100644 ---- a/tests/unittests/qml/tst_AddressBar.qml -+++ b/tests/unittests/qml/tst_AddressBar.qml -@@ -73,6 +73,15 @@ Item { - name: "AddressBar" - when: windowShown - -+ function verifyAddressBarText(text) { -+ tryCompare(addressBar, "text", text) -+ } -+ -+ function typeStringAndVerify(text) { -+ typeString(text) -+ verifyAddressBarText(text) -+ } -+ - function init() { - addressBar.actualUrl = "" - validatedSpy.clear() -@@ -101,9 +110,7 @@ Item { - } - - function test_validUrlShouldNotBeRewritten(data) { -- typeString(data.url) -- wait(500) -- compare(addressBar.text, data.url) -+ typeStringAndVerify(data.url) - keyClick(Qt.Key_Return) - validatedSpy.wait() - compare(addressBar.requestedUrl, data.url) -@@ -120,9 +127,7 @@ Item { - } - - function test_urlWithoutSchemeShouldBeRewritten(data) { -- typeString(data.text) -- wait(500) -- compare(addressBar.text, data.text) -+ typeStringAndVerify(data.text) - keyClick(Qt.Key_Return) - validatedSpy.wait() - compare(addressBar.requestedUrl, data.requestedUrl) -@@ -137,9 +142,7 @@ Item { - } - - function test_leadingAndTrailingWhitespacesShouldBeTrimmed(data) { -- typeString(data.text) -- wait(500) -- compare(addressBar.text, data.text) -+ typeStringAndVerify(data.text) - keyClick(Qt.Key_Return) - validatedSpy.wait() - compare(addressBar.requestedUrl, data.requestedUrl) -@@ -153,9 +156,7 @@ Item { - } - - function test_searchQueryShouldBeRewritten(data) { -- typeString(data.text) -- wait(500) -- compare(addressBar.text, data.text) -+ typeStringAndVerify(data.text) - keyClick(Qt.Key_Return) - validatedSpy.wait() - compare(addressBar.requestedUrl.toString().indexOf(data.start), 0) -@@ -174,9 +175,7 @@ Item { - } - - function test_htmlEntitiesShouldBeEscapedInSearchQueries(data) { -- typeString(data.text) -- wait(500) -- compare(addressBar.text, data.text) -+ typeStringAndVerify(data.text) - keyClick(Qt.Key_Return) - validatedSpy.wait() - verify(addressBar.requestedUrl.toString().indexOf("q=" + data.escaped) > 0) -@@ -191,9 +190,7 @@ Item { - } - - function test_uppercaseDomainsShouldBeRewritten(data) { -- typeString(data.text) -- wait(500) -- compare(addressBar.text, data.text) -+ typeStringAndVerify(data.text) - keyClick(Qt.Key_Return) - validatedSpy.wait() - compare(addressBar.requestedUrl, data.requestedUrl) -@@ -213,9 +210,7 @@ Item { - } - - function test_uppercaseSchemeShouldBeRewritten(data) { -- typeString(data.text) -- wait(500) -- compare(addressBar.text, data.text) -+ typeStringAndVerify(data.text) - keyClick(Qt.Key_Return) - validatedSpy.wait() - compare(addressBar.requestedUrl, data.requestedUrl) -@@ -266,9 +261,7 @@ Item { - } - - function test_urlShouldBeSimplifiedWhenUnfocused(data) { -- typeString(data.input) -- wait(500) -- compare(addressBar.text, data.input) -+ typeStringAndVerify(data.input) - keyClick(Qt.Key_Return) - validatedSpy.wait() - addressBar.actualUrl = addressBar.requestedUrl -@@ -289,9 +282,7 @@ Item { - - function test_clickingWhenUnfocusedShouldSelectAll() { - var url = "http://example.org/" -- typeString(url) -- wait(500) -- compare(addressBar.text, url) -+ typeStringAndVerify(url) - addressBar.actualUrl = url - clickItem(textInput) - verify(!addressBar.activeFocus) -@@ -301,9 +292,7 @@ Item { - - function test_clickingWhenFocusedShouldDeselectText() { - var url = "http://example.org/" -- typeString(url) -- wait(500) -- compare(addressBar.text, url) -+ typeStringAndVerify(url) - addressBar.actualUrl = url - clickItem(textInput) - verify(!addressBar.activeFocus) -@@ -316,9 +305,7 @@ Item { - - function test_clickingActionButtonWhenUnfocusedShouldNotSelectAll() { - var url = "http://example.org/" -- typeString(url) -- wait(500) -- compare(addressBar.text, url) -+ typeStringAndVerify(url) - clickItem(textInput) - verify(!addressBar.activeFocus) - clickItem(addressBar.__actionButton) -@@ -355,31 +342,29 @@ Item { - } - - function test_unfocusingWhileEditingShouldResetUrl() { -- var url = "http://example.org/" -- typeString(url) -- wait(500) -- compare(addressBar.text, url) -+ var host = "example.org" -+ var url = "http://" + host + "/" -+ typeStringAndVerify(url) - addressBar.actualUrl = url - var clearButton = findChild(addressBar, "clear_button") - verify(clearButton != null) - clickItem(clearButton) -- compare(addressBar.text, "") -+ verifyAddressBarText("") - clickItem(textInput) -- compare(addressBar.text, "example.org") -+ verifyAddressBarText(host) - clickItem(addressBar) -- compare(addressBar.text, url) -+ verifyAddressBarText(url) - } - - function test_exitingFindInPageRestoresUrl() { -- addressBar.actualUrl = "http://example.org/" -+ var host = "example.org" -+ addressBar.actualUrl = "http://" + host + "/" - addressBar.findInPageMode = true - verify(addressBar.activeFocus) - compare(addressBar.text, "") -- typeString("hello") -- wait(500) -+ typeStringAndVerify("hello") - addressBar.findInPageMode = false -- wait(500) -- compare(addressBar.text, "example.org") -+ verifyAddressBarText(host) - } - } - } --- -2.47.0 - diff --git a/pkgs/desktops/lomiri/applications/morph-browser/default.nix b/pkgs/desktops/lomiri/applications/morph-browser/default.nix index b1502dff2f84..9e273d032ce1 100644 --- a/pkgs/desktops/lomiri/applications/morph-browser/default.nix +++ b/pkgs/desktops/lomiri/applications/morph-browser/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitLab, - fetchpatch, gitUpdater, nixosTests, cmake, @@ -30,13 +29,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "morph-browser"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/morph-browser"; - rev = finalAttrs.version; - hash = "sha256-VxSADFTlaxQUDc81TzGkx54mjAUgY2L+suQC9zYGKo0="; + tag = finalAttrs.version; + hash = "sha256-CW+8HEGxeDDfqbBtNHDKTvsZkbu0tCmD6OEDW07KG2k="; }; outputs = [ @@ -44,18 +43,6 @@ stdenv.mkDerivation (finalAttrs: { "doc" ]; - patches = [ - # Remove when version > 1.1.1 - (fetchpatch { - name = "0002-morph-browser-Call-i18n-bindtextdomain-with-buildtime-determined-locale-path.patch"; - url = "https://gitlab.com/ubports/development/core/morph-browser/-/commit/3d9777fdc7d5b302a9f17679e4ea125e94468772.patch"; - hash = "sha256-zx/pP72uNqAi8TZR4bKeONuqcJyK/vGtPglTA+5R5no="; - }) - - # Remove when https://gitlab.com/ubports/development/core/morph-browser/-/merge_requests/589 merged & in release - ./1001-morph-browser-tst_AddressBar-Replace-wait-and-compare-with-tryCompare.patch - ]; - postPatch = '' substituteInPlace src/{Morph,Ubuntu}/CMakeLists.txt \ From 7d27803a689d6e664f7e350d21cbf2ae705baf46 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 25 Jan 2025 08:11:03 +0100 Subject: [PATCH 062/287] lomiri.lomiri-ui-toolkit: Mark tst_slotslayout.13.qml borked --- .../2001-Mark-problematic-tests.patch | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch index 20b0d5c5a636..97268a0d9ad0 100644 --- a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch +++ b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch @@ -1,16 +1,19 @@ -From c1a69117793acec6841898f219935852cadc78d3 Mon Sep 17 00:00:00 2001 +From 6f7fa32c524b2ae7e86c13dd55760506b4cd547d Mon Sep 17 00:00:00 2001 From: OPNA2608 -Date: Wed, 15 Jan 2025 18:45:02 +0100 +Date: Sat, 25 Jan 2025 08:08:42 +0100 Subject: [PATCH] Mark problematic tests +- test_defaultLabelsQmlContext in tst_slotslayout.13.qml seems not properly written, + fails consistently on aarch64-linux Hydra: + https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/issues/45 - tst_textinput_touch.SEGFAULT.11.qml is flaky: https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/issues/43 --- - tests/checkresults.sh | 28 ++++++++++++++++++++++------ - 1 file changed, 22 insertions(+), 6 deletions(-) + tests/checkresults.sh | 29 +++++++++++++++++++++++------ + 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/tests/checkresults.sh b/tests/checkresults.sh -index fc498985e..ade361236 100755 +index fc498985e..86619937d 100755 --- a/tests/checkresults.sh +++ b/tests/checkresults.sh @@ -22,6 +22,7 @@ ERRORS_PATTERN=' Date: Sat, 25 Jan 2025 00:39:17 -0800 Subject: [PATCH 063/287] 1password-gui: 8.10.54 -> 8.10.58, 1password-gui-beta: 8.10.56-1.BETA -> 8.10.60-4.BETA --- .../misc/1password-gui/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 66428a4902d0..0650b52a708c 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -10,43 +10,43 @@ let pname = "1password"; - version = if channel == "stable" then "8.10.54" else "8.10.56-1.BETA"; + version = if channel == "stable" then "8.10.58" else "8.10.60-4.BETA"; sources = { stable = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-kpFO59DPBCgD3EdYxq1tom/5/misBsafbsJS+Wj2l3I="; + hash = "sha256-JznF2xG66z8FKwC7Xg3Pe/LLwxw5PqbHBessmxzpyRA="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-ZZKuPxshI9yLSUMccpXaQDbu8gTvFCaS68tqMstZHJE="; + hash = "sha256-q3qb1S30svgrMeOv5okAqH//RUnDuD0RUTdjxDoQFJo="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-Xha7aOuBvG+R1K48gdPj/v4URuIEYv2le+TCxwDnCwk="; + hash = "sha256-ER+NLSVyYJpxNx4mHgJJE8OWSXSx5WppN2YqMaWuJ7E="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-ukfx7V8totRIyHpmjWDR2O9IDkAY3uq/0jtGPXiZ5Bw="; + hash = "sha256-7SczaIcY/bQtTy6ODQh464/14q+VvgnJr7EdhEzevCs="; }; }; beta = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-25vBmc3AJv4NTI2oOrnTR5pMBMK+wx1s/eg5g8jjtb8="; + hash = "sha256-c9r/t7VpClf2RQfLLyKdpU90RYlPEPA4N2PjrL2QXAo="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-MLnXEqJM9E+2GAXlqX2dGUzFVk0xv5pmUzLdncakWf8="; + hash = "sha256-Tf19dRmf7wufUJQf9m/M2Nwrs4yGW/idzs8FsgkM96o="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-W7VA7DFpIY2D+0ZqNaLfOzTTqryqpA1iy0+yACNrPlg="; + hash = "sha256-lOQjuXLCCBF1lmEwkLrfX8Pjlwwx5wAa5WBDdf60VnQ="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-ZH7xuL0SrkncxI/ngDIYHf4bLwUyTQC4Ki3HgUVza+I="; + hash = "sha256-2wYmLIxvUDlqKrCsSmI/yCoNOrMEgPdfrHJHMwFYkyo="; }; }; }; From 0825d5fba1064a252d97edd6f30a7802ade3c543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 24 Jan 2025 20:19:49 +0100 Subject: [PATCH 064/287] pnpm_10.fetchDeps: fix reproducibility --- pkgs/development/tools/pnpm/fetch-deps/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/pnpm/fetch-deps/default.nix b/pkgs/development/tools/pnpm/fetch-deps/default.nix index 971f1656ba92..eb4d7ceabbc6 100644 --- a/pkgs/development/tools/pnpm/fetch-deps/default.nix +++ b/pkgs/development/tools/pnpm/fetch-deps/default.nix @@ -92,7 +92,7 @@ runHook preFixup # Remove timestamp and sort the json files - rm -rf $out/v3/tmp + rm -rf $out/{v3,v10}/tmp for f in $(find $out -name "*.json"); do jq --sort-keys "del(.. | .checkedAt?)" $f | sponge $f done From cbf92309a90dc0b7cdff8810277853f66bb46a69 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 25 Jan 2025 12:03:21 +0100 Subject: [PATCH 065/287] pax-rs: remove Author's GitHub profile is now private. According to the Wayback Machine upstream repo has been gone since at least September 2020. --- pkgs/by-name/pa/pax-rs/package.nix | 46 ------------------------------ pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 pkgs/by-name/pa/pax-rs/package.nix diff --git a/pkgs/by-name/pa/pax-rs/package.nix b/pkgs/by-name/pa/pax-rs/package.nix deleted file mode 100644 index 8278405f3f39..000000000000 --- a/pkgs/by-name/pa/pax-rs/package.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - fetchFromGitHub, - fetchurl, - rustPlatform, - runCommand, -}: - -rustPlatform.buildRustPackage rec { - pname = "pax-rs"; - version = "0.4.0"; - - meta = with lib; { - description = "Fastest JavaScript bundler in the galaxy"; - longDescription = '' - The fastest JavaScript bundler in the galaxy. Fully supports ECMAScript module syntax (import/export) in addition to CommonJS require(). - ''; - homepage = "https://github.com/nathan/pax"; - license = licenses.mit; - maintainers = [ maintainers.klntsky ]; - platforms = platforms.linux; - mainProgram = "px"; - }; - - src = - let - source = fetchFromGitHub { - owner = "nathan"; - repo = "pax"; - rev = "pax-v${version}"; - sha256 = "1l2xpgsms0bfc0i3l0hyw4dbp6d4qdxa9vxyp704p27vvn4ndhv2"; - }; - - cargo-lock = fetchurl { - url = "https://gist.github.com/klntsky/c7863424d7df0c379782015f6bb3b399/raw/1cf7481e33984fd1510dc77ed677606d08fa8eb6/Cargo.lock"; - sha256 = "0ff1b64b99cbca1cc2ceabcd2e4f7bc3411e3a2a9fbb9db2204d9240fe38ddeb"; - }; - in - runCommand "pax-rs-src" { } '' - cp -R ${source} $out - chmod +w $out - cp ${cargo-lock} $out/Cargo.lock - ''; - - cargoHash = "sha256-2gXd1rwj82Ywin4QW3g9cB9R0PkXhE73F9xSJ6EozzQ="; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index af905e1b5a9c..a8295e79672d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1044,6 +1044,7 @@ mapAliases { ### P ### + pax-rs = throw "'pax-rs' has been removed because upstream has disappeared"; # Added 2025-01-25 PageEdit = pageedit; # Added 2024-01-21 p2pvc = throw "p2pvc has been removed as it is unmaintained upstream and depends on OpenCV 2"; # Added 2024-08-20 packet-cli = throw "'packet-cli' has been renamed to/replaced by 'metal-cli'"; # Converted to throw 2024-10-17 From c6b2a26f28fa61b429a6e498eba9aa92765eec02 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 25 Jan 2025 11:32:02 +0100 Subject: [PATCH 066/287] fwts: reformat with nixfmt --- pkgs/os-specific/linux/fwts/default.nix | 40 ++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index c4a4d3ece8c1..c52dd1844fec 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -1,5 +1,21 @@ -{ lib, stdenv, fetchzip, autoreconfHook, pkg-config, gnumake42, glib, pcre -, json_c, flex, bison, dtc, pciutils, dmidecode, acpica-tools, libbsd }: +{ + lib, + stdenv, + fetchzip, + autoreconfHook, + pkg-config, + gnumake42, + glib, + pcre, + json_c, + flex, + bison, + dtc, + pciutils, + dmidecode, + acpica-tools, + libbsd, +}: stdenv.mkDerivation rec { pname = "fwts"; @@ -12,8 +28,24 @@ stdenv.mkDerivation rec { }; # fails with make 4.4 - nativeBuildInputs = [ autoreconfHook pkg-config gnumake42 ]; - buildInputs = [ glib pcre json_c flex bison dtc pciutils dmidecode acpica-tools libbsd ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + gnumake42 + ]; + + buildInputs = [ + glib + pcre + json_c + flex + bison + dtc + pciutils + dmidecode + acpica-tools + libbsd + ]; postPatch = '' substituteInPlace src/lib/include/fwts_binpaths.h \ From f3785b42e8ee7dc6e9a9bcced86d13188c4fbfc4 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 25 Jan 2025 11:33:14 +0100 Subject: [PATCH 067/287] fwts: refactor --- pkgs/os-specific/linux/fwts/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index c52dd1844fec..515669921d70 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { version = "24.09.00"; src = fetchzip { - url = "https://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz"; - sha256 = "sha256-ZJSlx8O38e7bJYTgZacayslr28TLHHJsISXq9Uzsnyc="; + url = "https://fwts.ubuntu.com/release/fwts-V${version}.tar.gz"; + hash = "sha256-ZJSlx8O38e7bJYTgZacayslr28TLHHJsISXq9Uzsnyc="; stripRoot = false; }; @@ -49,22 +49,22 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/lib/include/fwts_binpaths.h \ - --replace "/usr/bin/lspci" "${pciutils}/bin/lspci" \ - --replace "/usr/sbin/dmidecode" "${dmidecode}/bin/dmidecode" \ - --replace "/usr/bin/iasl" "${acpica-tools}/bin/iasl" + --replace-fail "/usr/bin/lspci" "${pciutils}/bin/lspci" \ + --replace-fail "/usr/sbin/dmidecode" "${dmidecode}/bin/dmidecode" \ + --replace-fail "/usr/bin/iasl" "${acpica-tools}/bin/iasl" substituteInPlace src/lib/src/fwts_devicetree.c \ src/devicetree/dt_base/dt_base.c \ - --replace "dtc -I" "${dtc}/bin/dtc -I" + --replace-fail "dtc -I" "${dtc}/bin/dtc -I" ''; enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "https://wiki.ubuntu.com/FirmwareTestSuite"; description = "Firmware Test Suite"; - platforms = platforms.linux; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ tadfisher ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ tadfisher ]; }; } From 687320fd382e5cbe3a14320485d74ff79f2755ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 12:05:04 +0000 Subject: [PATCH 068/287] inori: 0.2.2 -> 0.2.3 --- pkgs/by-name/in/inori/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/in/inori/package.nix b/pkgs/by-name/in/inori/package.nix index b7d7d87bf482..e31f13ef239f 100644 --- a/pkgs/by-name/in/inori/package.nix +++ b/pkgs/by-name/in/inori/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "inori"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "eshrh"; repo = "inori"; tag = "v${version}"; - hash = "sha256-yd1kIlPepVbeTEFzjxTDWEh8o4m6dh/ya9GitqYHHT8="; + hash = "sha256-g+OH8sjfByrVsI1KogkluvAqNyYz7Fba2aeJkFhCgPU="; }; - cargoHash = "sha256-mmzJXIl0wfcyEaYc2wZfA22ZEbTQXG5LVqxEQ4+x76M="; + cargoHash = "sha256-BSTl/eeK2DwkJ+qhcVJlnCMfxLuPdQdFEx5OPPMnSMs="; passthru.updateScript = nix-update-script { }; From e2a5fad6673e76c26b4a1946bad066df8350860c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 12:24:52 +0000 Subject: [PATCH 069/287] yabasic: 2.90.5 -> 2.91.0 --- pkgs/by-name/ya/yabasic/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ya/yabasic/package.nix b/pkgs/by-name/ya/yabasic/package.nix index 677ac5be4b74..c720fa3a1802 100644 --- a/pkgs/by-name/ya/yabasic/package.nix +++ b/pkgs/by-name/ya/yabasic/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "yabasic"; - version = "2.90.5"; + version = "2.91.0"; src = fetchurl { url = "http://www.yabasic.de/download/yabasic-${finalAttrs.version}.tar.gz"; - hash = "sha256-w2a831Sm6sTWe7lfD6kirDzSvQX1Qpnw1aG+3ql8ww4="; + hash = "sha256-oPyuGzLT+fVUCBHE7d+j2GIC7SQW/w219WoJpg75X9c="; }; buildInputs = [ From 6835eb27d5ba1c36a01179ee11ae36969656c88b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 13:35:10 +0000 Subject: [PATCH 070/287] naabu: 2.3.3 -> 2.3.4 --- pkgs/by-name/na/naabu/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/na/naabu/package.nix b/pkgs/by-name/na/naabu/package.nix index 5120f7e1eebf..c632a5dfc5c1 100644 --- a/pkgs/by-name/na/naabu/package.nix +++ b/pkgs/by-name/na/naabu/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "naabu"; - version = "2.3.3"; + version = "2.3.4"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "naabu"; tag = "v${version}"; - hash = "sha256-ffE/PlLUH2qO4QJpSGHmEh7/ghputTCnTYplzP+Umw0="; + hash = "sha256-Xri3kdpK1oPb2doL/x7PkZQBtFugesbNX3GGc/w3GY8="; }; - vendorHash = "sha256-YSE6WQkq47A+D9ff3UHbc0Kdik9b4KjRpwYWkXDD5zA="; + vendorHash = "sha256-HpkFUHD3B09nxGK75zELTsjr4wXivY2o/DCjYSDepRI="; buildInputs = [ libpcap ]; From e99b9eb8b31bd6b8ade67609c2eb7ec8ea71eb29 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 13:35:31 +0000 Subject: [PATCH 071/287] grafana-kiosk: 1.0.8 -> 1.0.9 --- pkgs/by-name/gr/grafana-kiosk/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gr/grafana-kiosk/package.nix b/pkgs/by-name/gr/grafana-kiosk/package.nix index 57913244e940..7ae16243d7f9 100644 --- a/pkgs/by-name/gr/grafana-kiosk/package.nix +++ b/pkgs/by-name/gr/grafana-kiosk/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "grafana-kiosk"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-kiosk"; rev = "v${version}"; - hash = "sha256-M0Gz0+MQNTIOYBxVRaxk5kYZwoJy1nPckGcYF29EzHA="; + hash = "sha256-kh62qGMVHNTssQMEBwLaEW0tRtP3iWMrxXeQU+fe+44="; }; - vendorHash = "sha256-dnA5Z6VX7+RLpV7+PPuckH+v407dK8nbe0OVJtfG1YE="; + vendorHash = "sha256-LZLmXGPYvNR4meqen0h0UHj62392hfPs9BLNK+X6sKA="; nativeBuildInputs = [ makeWrapper ]; postFixup = '' From 4b76da72ff10ea86a1ee44dcc4db98b4a26e2f8c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 25 Jan 2025 14:38:09 +0100 Subject: [PATCH 072/287] photoqt: 4.7 -> 4.8 --- pkgs/by-name/ph/photoqt/package.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ph/photoqt/package.nix b/pkgs/by-name/ph/photoqt/package.nix index 2fa08c051740..6c335cf07344 100644 --- a/pkgs/by-name/ph/photoqt/package.nix +++ b/pkgs/by-name/ph/photoqt/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "photoqt"; - version = "4.7"; + version = "4.8"; src = fetchurl { url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz"; - hash = "sha256-uZCeJJsQoIDZ6nf+JbFhbXE4ZHL8pCY0pJOG5w6v4vs="; + hash = "sha256-ccSbG5MTIyVJFqNHstaW53BfsGmN/I4ObCZfY0h22QE="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e624e8e2080..7d14b5b5207f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14784,10 +14784,6 @@ with pkgs; nodejs = nodejs_18; }; - photoqt = callPackage ../by-name/ph/photoqt/package.nix { - stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; - }; - photoflare = libsForQt5.callPackage ../applications/graphics/photoflare { }; phototonic = libsForQt5.callPackage ../applications/graphics/phototonic { }; From d0488230df51980b5617db6e10e5b6f84c9afbc1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 14:10:22 +0000 Subject: [PATCH 073/287] stella: 7.0b -> 7.0c --- pkgs/by-name/st/stella/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stella/package.nix b/pkgs/by-name/st/stella/package.nix index 1c96b1292518..ae06a5984f63 100644 --- a/pkgs/by-name/st/stella/package.nix +++ b/pkgs/by-name/st/stella/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "stella"; - version = "7.0b"; + version = "7.0c"; src = fetchFromGitHub { owner = "stella-emu"; repo = "stella"; rev = finalAttrs.version; - hash = "sha256-310rGYfCVRoTi9kq9XqmvTCVLLDY/PG2qgBG1kNT/DY="; + hash = "sha256-AbZBBg4P0qnB+mZpiG8/kHixBfkKQptyLrF4lwgRr/Y="; }; nativeBuildInputs = [ From 96c99d0145b22456bc117eb0914f96df741346d3 Mon Sep 17 00:00:00 2001 From: sanana Date: Tue, 14 Jan 2025 21:11:36 +0300 Subject: [PATCH 074/287] freesweep: 1.0.2 -> 1.0.2-unstable-2024-04-19 freesweep has a new version in development and it seems to be usable, let's update to it. I included a few patches to allow it to build with and without mlibc (which I'm working on in #371092). --- .../fr/freesweep/0001-include-strings.h.patch | 15 ++++++++ .../freesweep/0002-fix-Wformat-security.patch | 13 +++++++ .../0003-remove-ac_func_malloc.patch | 12 +++++++ pkgs/by-name/fr/freesweep/package.nix | 35 ++++++++++++++----- 4 files changed, 67 insertions(+), 8 deletions(-) create mode 100644 pkgs/by-name/fr/freesweep/0001-include-strings.h.patch create mode 100644 pkgs/by-name/fr/freesweep/0002-fix-Wformat-security.patch create mode 100644 pkgs/by-name/fr/freesweep/0003-remove-ac_func_malloc.patch diff --git a/pkgs/by-name/fr/freesweep/0001-include-strings.h.patch b/pkgs/by-name/fr/freesweep/0001-include-strings.h.patch new file mode 100644 index 000000000000..e94e3b94f786 --- /dev/null +++ b/pkgs/by-name/fr/freesweep/0001-include-strings.h.patch @@ -0,0 +1,15 @@ +diff --git a/sweep.h b/sweep.h +index 198349d..549f39f 100644 +--- a/sweep.h ++++ b/sweep.h +@@ -32,6 +32,10 @@ + #include + #endif /* HAVE_STRING_H */ + ++#ifdef HAVE_STRINGS_H ++#include ++#endif /* HAVE_STRINGS_H */ ++ + #ifdef HAVE_GETOPT_H + #include + #endif /* HAVE_GETOPT_H */ diff --git a/pkgs/by-name/fr/freesweep/0002-fix-Wformat-security.patch b/pkgs/by-name/fr/freesweep/0002-fix-Wformat-security.patch new file mode 100644 index 000000000000..b37f0e7420ce --- /dev/null +++ b/pkgs/by-name/fr/freesweep/0002-fix-Wformat-security.patch @@ -0,0 +1,13 @@ +diff --git a/logs.c b/logs.c +index 5e87f52..29ad433 100644 +--- a/logs.c ++++ b/logs.c +@@ -128,7 +128,7 @@ static void log_display(const char *mesg) { + // Display the message on the screen. + if (log_win) { + wclear(log_win); +- mvwprintw(log_win, 0, 0, mesg); ++ mvwprintw(log_win, 0, 0, "%s", mesg); + wnoutrefresh(log_win); + wrefresh(log_win); + } diff --git a/pkgs/by-name/fr/freesweep/0003-remove-ac_func_malloc.patch b/pkgs/by-name/fr/freesweep/0003-remove-ac_func_malloc.patch new file mode 100644 index 000000000000..99579a8952d1 --- /dev/null +++ b/pkgs/by-name/fr/freesweep/0003-remove-ac_func_malloc.patch @@ -0,0 +1,12 @@ +diff --git a/configure.ac b/configure.ac +index ae08308..5262e56 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -32,7 +32,6 @@ AC_TYPE_SIZE_T + AC_TYPE_UID_T + + # Checks for library functions. +-AC_FUNC_MALLOC + AC_CHECK_FUNCS([alarm getcwd memset mkdir setlocale strdup strncasecmp + fileno flock lockf getopt getopt_long]) + diff --git a/pkgs/by-name/fr/freesweep/package.nix b/pkgs/by-name/fr/freesweep/package.nix index 7ade52101f7c..9fff2fa59719 100644 --- a/pkgs/by-name/fr/freesweep/package.nix +++ b/pkgs/by-name/fr/freesweep/package.nix @@ -3,31 +3,50 @@ ncurses, lib, stdenv, - updateAutotoolsGnuConfigScriptsHook, + autoconf, + automake, + pkg-config, installShellFiles, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "freesweep"; - version = "1.0.2"; + version = "1.0.2-unstable-2024-04-19"; src = fetchFromGitHub { owner = "rwestlund"; repo = "freesweep"; - rev = "v${version}"; - hash = "sha256-iuu81yHbNrjdPsimBrPK58PJ0d8i3ySM7rFUG/d8NJM"; + rev = "68c0ee5b29d1087d216d95875a7036713cd25fc0"; + hash = "sha256-ZnAH7mIuBMFLdrtJOY8PzNbxv+GDEFAgyEtWCpTH2Us="; }; + # These patches are sent upstream in github:rwestlund/freesweep#18 + patches = [ + # strncasecmp and friends are declared in strings.h and not string.h on + # systems with HAVE_STRINGS_H + ./0001-include-strings.h.patch + # Fixes a potential format string vulnerability and makes it compile with + # -Wformat-security + ./0002-fix-Wformat-security.patch + # autoconf believes systems that handle malloc(0) differently from glibc + # have a bad malloc implementation and will replace calls to malloc with + # rpl_malloc. freesweep does not define rpl_malloc so this macro prevents + # building for such systems, the easiest solution is to remove this macro + ./0003-remove-ac_func_malloc.patch + ]; + nativeBuildInputs = [ - updateAutotoolsGnuConfigScriptsHook + autoconf + automake + pkg-config installShellFiles ]; buildInputs = [ ncurses ]; - configureFlags = [ "--with-prefsdir=$out/share" ]; - enableParallelBuilding = true; + preConfigure = "./autogen.sh"; + installPhase = '' runHook preInstall install -D -m 0555 freesweep $out/bin/freesweep From d43db7865db390dcb7f840d00d4442d11d98b91f Mon Sep 17 00:00:00 2001 From: sanana Date: Fri, 24 Jan 2025 22:15:50 +0300 Subject: [PATCH 075/287] freesweep: add sanana as maintainer --- pkgs/by-name/fr/freesweep/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fr/freesweep/package.nix b/pkgs/by-name/fr/freesweep/package.nix index 9fff2fa59719..712bede171b2 100644 --- a/pkgs/by-name/fr/freesweep/package.nix +++ b/pkgs/by-name/fr/freesweep/package.nix @@ -55,12 +55,12 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with lib; { + meta = { description = "Console minesweeper-style game written in C for Unix-like systems"; mainProgram = "freesweep"; homepage = "https://github.com/rwestlund/freesweep"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ ]; - platforms = platforms.unix; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ sanana ]; + platforms = lib.platforms.unix; }; } From 2fa8d3ccf9efb131deda5d6531d5917050c9a763 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 25 Jan 2025 18:17:19 +0200 Subject: [PATCH 076/287] python312Packages.plotpy: 2.6.3 -> 2.7.1 Diff: https://github.com/PlotPyStack/PlotPy/compare/refs/tags/v2.6.3...v2.7.1 Changelog: https://github.com/PlotPyStack/PlotPy/blob/refs/tags/v2.7.1/CHANGELOG.md --- pkgs/development/python-modules/plotpy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/plotpy/default.nix b/pkgs/development/python-modules/plotpy/default.nix index 1b81c999a374..3cc4db7c59cf 100644 --- a/pkgs/development/python-modules/plotpy/default.nix +++ b/pkgs/development/python-modules/plotpy/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, # build-system - cython_0, + cython, setuptools, # dependencies @@ -31,18 +31,18 @@ buildPythonPackage rec { pname = "plotpy"; - version = "2.6.3"; + version = "2.7.1"; pyproject = true; src = fetchFromGitHub { owner = "PlotPyStack"; repo = "PlotPy"; tag = "v${version}"; - hash = "sha256-kMVq8X6XP18B5x35BTuC7Q5uFFwds1JxCaxlDuD/UfE="; + hash = "sha256-Ava3rtF/W6MdL/iaK8zbwYBCD5WFAhpzcQnHwfuXOzc="; }; build-system = [ - cython_0 + cython setuptools ]; # Both numpy versions are supported, see: From 0baa7efcbc8d10c2b61188f470ed8e4a0b82fb97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 16:21:11 +0000 Subject: [PATCH 077/287] xlights: 2024.20 -> 2025.01 --- pkgs/by-name/xl/xlights/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xl/xlights/package.nix b/pkgs/by-name/xl/xlights/package.nix index aed9abf6e218..f461b65b4168 100644 --- a/pkgs/by-name/xl/xlights/package.nix +++ b/pkgs/by-name/xl/xlights/package.nix @@ -6,11 +6,11 @@ appimageTools.wrapType2 rec { pname = "xlights"; - version = "2024.20"; + version = "2025.01"; src = fetchurl { url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage"; - hash = "sha256-2AGmCXmTMf5DYxO+qC7qPpPqmGrnoeREw7a1kuboDc4="; + hash = "sha256-Xw1sfsvaH+IuuX+4frlFb7GEaF1s8UwWj7uRydj10O4="; }; meta = { From fca5b2ef00a80877e832e81284f10ceedb7f3fa3 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 25 Jan 2025 17:37:01 +0100 Subject: [PATCH 078/287] electron_32-bin: 32.2.8 -> 32.3.0 - Changelog: https://github.com/electron/electron/releases/tag/v32.3.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v32.2.8...v32.3.0 - Fixes CVE-2024-12693 - Fixes CVE-2024-12694 - Fixes CVE-2024-12695 - Fixes CVE-2025-0434 - Fixes CVE-2025-0436 - Fixes CVE-2025-0437 --- pkgs/development/tools/electron/binary/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index b380af0f99f6..98632385c8d9 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -67,14 +67,14 @@ }, "32": { "hashes": { - "aarch64-darwin": "39d5298563ec488b3b329c9ad6e4f40e941a7326e82683a588d2f103a6f7dd78", - "aarch64-linux": "67782c4208cb64347552c003ded53ae993af8de16fadd19fd43105d1b592971f", - "armv7l-linux": "e1ace6669dc5aa9696b6f37af0d1210125e96ebda4dbb82496896047191a1810", - "headers": "0qw1nfi0c53d346lchmya6dr0l3c94ssdbazbr547qih2njc7jbz", - "x86_64-darwin": "91cb09191798606e4666952f8bb01d4851eab68973874ba5e26d6c7d1287b3be", - "x86_64-linux": "b01f9f5fcef719f0d76dc2f61c3f5a5b411970e425639de65aa823804918ce22" + "aarch64-darwin": "7b0071f5162fe81cc020e76b3e71aa18e5e888edacca6a0c92f389199097534c", + "aarch64-linux": "292740690b445bf8e3b13c37c74ff2c9820e8d30f6d0ac8e03a62421746f189c", + "armv7l-linux": "efc6bfdbd92e76cde23bfa0967809593ae32e74ed1897765f1105e3761db9478", + "headers": "0pmgcns26pvvp7ihqkl9llpdr8l871p7m6r72scia93siwnyvrvv", + "x86_64-darwin": "a7070ea98e5a4c5d53b2184229428d29109682165be62b17faf0bcdd9547174f", + "x86_64-linux": "8fb72c1d19a51552438eb42fdaae915643c2e310fa3090d8d5293ad6fc94b8c5" }, - "version": "32.2.8" + "version": "32.3.0" }, "33": { "hashes": { From 517c9d05bb049f6ba2d97fba262442e6ca3b4bc7 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 25 Jan 2025 17:37:04 +0100 Subject: [PATCH 079/287] electron_33-bin: 33.3.1 -> 33.3.2 - Changelog: https://github.com/electron/electron/releases/tag/v33.3.2 - Diff: https://github.com/electron/electron/compare/refs/tags/v33.3.1...v33.3.2 - Fixes CVE-2025-0434 - Fixes CVE-2025-0436 - Fixes CVE-2025-0437 --- pkgs/development/tools/electron/binary/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index 98632385c8d9..4d1fde322382 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -78,13 +78,13 @@ }, "33": { "hashes": { - "aarch64-darwin": "f5886daefc3ea8851a087eafd23826337f97e0e921256a70f887c8acc8128bca", - "aarch64-linux": "b428ecca13d4ffc05c28e28759a310f317e4e89b05e9a30ba07e0d58fbaedef5", - "armv7l-linux": "e9e74509304e87a889bc59fe86eb2efc901d3c43b02d18acd5a9ba07800334a5", - "headers": "054d8hkm8kvknwamcblpyvgzmfqwb954x6gxgi0ma9xym8dl2qks", - "x86_64-darwin": "2d6015ff12c8b712b7e928dd163c1fd0e4c988665ce626c441ceb97753d48e1d", - "x86_64-linux": "cdca6f9ec2f98708dcbcb8baba3d0521e15ed4e5aab68b2d1c6668f99faafc38" + "aarch64-darwin": "4c7ffa4927aec31912ae2047d8d6c33e801501e4b576c724947866da9346110c", + "aarch64-linux": "c55b6b66fe8018e0e05953cd794735782f05b7e3b2a117a86413eafcedfda7ef", + "armv7l-linux": "2e7f915c71b11e6cc1ec46aee8f87c28fdd029a0a90a9196117a8f0c7aa81aa8", + "headers": "07m9p2nz0rzl3asq466kqzdq1bdmlvxb5slrr24dj9awijlyrrb6", + "x86_64-darwin": "fa451db2991506cacebd2a836e84ca7eff73770ed987d5b958f9854637c12d3d", + "x86_64-linux": "13b99da4a78dae9bf0960309cd1e9476faf5f7260bbf930bd302189d490ff77c" }, - "version": "33.3.1" + "version": "33.3.2" } } From 0033f59e91d190df80270c7232da3fed8523189f Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 25 Jan 2025 17:37:05 +0100 Subject: [PATCH 080/287] electron-source.electron_32: 32.2.8 -> 32.3.0 - Changelog: https://github.com/electron/electron/releases/tag/v32.3.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v32.2.8...v32.3.0 - Fixes CVE-2024-12693 - Fixes CVE-2024-12694 - Fixes CVE-2024-12695 - Fixes CVE-2025-0434 - Fixes CVE-2025-0436 - Fixes CVE-2025-0437 --- pkgs/development/tools/electron/info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 133b3ecb7f2f..0e27158c92cb 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -47,10 +47,10 @@ }, "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-TLTgZMpIqmdCPh+b45YDmWVGWrl4LmB0xqRfv0bc3o4=", + "hash": "sha256-pOWNw6MLjy7ucMGtF/sVPNmlmje0ozqRhEwOPkfW1oM=", "owner": "electron", "repo": "electron", - "rev": "v32.2.8" + "rev": "v32.3.0" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", @@ -938,7 +938,7 @@ "electron_yarn_hash": "122y1vnizwg0rwz8qf37mvpa0i78141y98wn4h11l6b9gyshrs65", "modules": "128", "node": "20.18.1", - "version": "32.2.8" + "version": "32.3.0" }, "33": { "chrome": "130.0.6723.170", From 87788c7cd9ab486589fecdb9b6fb07ce315d5144 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 25 Jan 2025 17:37:07 +0100 Subject: [PATCH 081/287] electron-source.electron_33: 33.3.1 -> 33.3.2 - Changelog: https://github.com/electron/electron/releases/tag/v33.3.2 - Diff: https://github.com/electron/electron/compare/refs/tags/v33.3.1...v33.3.2 - Fixes CVE-2025-0434 - Fixes CVE-2025-0436 - Fixes CVE-2025-0437 --- pkgs/development/tools/electron/info.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 0e27158c92cb..dae5e44a5ef8 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -941,7 +941,7 @@ "version": "32.3.0" }, "33": { - "chrome": "130.0.6723.170", + "chrome": "130.0.6723.191", "chromium": { "deps": { "gn": { @@ -951,15 +951,15 @@ "version": "2024-09-09" } }, - "version": "130.0.6723.170" + "version": "130.0.6723.191" }, "chromium_npm_hash": "sha256-4w5m/bTMygidlb4TZHMx1Obp784DLxMwrfe1Uvyyfp8=", "deps": { "src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-zhEHb3Jjr6CAgIAqMV4uwzVE80lAkVnlxi4FYnpkzdw=", + "hash": "sha256-hJZWDT7D2YP75CQJwYNqnMTvLyMIF3wS2yJaRuUiOhY=", "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", - "rev": "130.0.6723.170", + "rev": "130.0.6723.191", "url": "https://chromium.googlesource.com/chromium/src.git" }, "src/chrome/test/data/perf/canvas_bench": { @@ -988,10 +988,10 @@ }, "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-PaWXPOPPvxpZNDXF+bdouxZCJRYxVVbwDsVNsnf5oXo=", + "hash": "sha256-20ggSgks8zVYsFeMRHzqpnQFE9UazwOY2BVQYhVo/Vk=", "owner": "electron", "repo": "electron", - "rev": "v33.3.1" + "rev": "v33.3.2" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", @@ -1883,14 +1883,14 @@ }, "src/v8": { "fetcher": "fetchFromGitiles", - "hash": "sha256-4DcSWkMhPwMh6ZvURj2piKaIPNe2Rur+nA3vAirgvcM=", - "rev": "932a8d7bb284242fd92234cf734921b8383ae4f6", + "hash": "sha256-9TZ8a0ufsG/gWM2nYAWDymWeDlDg23Dgy/G6ic67QBI=", + "rev": "3551594a5f6604c7e5070f408cc81d60d08ddbbf", "url": "https://chromium.googlesource.com/v8/v8.git" } }, "electron_yarn_hash": "0bzsswcg62b39xinq5vikk7qz7d15276s2vc15v1gcb5wvh05ff8", "modules": "130", "node": "20.18.1", - "version": "33.3.1" + "version": "33.3.2" } } From 06795a2e9d86df44ed30362694a505131c033ce5 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 25 Jan 2025 17:37:08 +0100 Subject: [PATCH 082/287] electron-chromedriver_32: 32.2.8 -> 32.3.0 - Changelog: https://github.com/electron/electron/releases/tag/v32.3.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v32.2.8...v32.3.0 - Fixes CVE-2024-12693 - Fixes CVE-2024-12694 - Fixes CVE-2024-12695 - Fixes CVE-2025-0434 - Fixes CVE-2025-0436 - Fixes CVE-2025-0437 --- .../tools/electron/chromedriver/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index 9477fed389b3..0af526115340 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -34,14 +34,14 @@ }, "32": { "hashes": { - "aarch64-darwin": "f7aef40a833edda014b50e5c3db52a8f966045f3e16b113bd410afc0fea24da0", - "aarch64-linux": "b81a9f916d49f1867d6326f34a1e2e5f4069c4ac445123a90dc2034a0a1bfd34", - "armv7l-linux": "e3573aa5940158aa953c8b58a6c709288466347675cca032adb71f6f7042fb06", - "headers": "0qw1nfi0c53d346lchmya6dr0l3c94ssdbazbr547qih2njc7jbz", - "x86_64-darwin": "7428bb4dc438596875138a8f06c67b18266850797988f7c862cb39ca86eb5269", - "x86_64-linux": "57fe434c5437e45c866789622dac20f7b33204d51a7b923ad1e8b7259789d498" + "aarch64-darwin": "679a286100f2121a3566f7d0988894611628e93920843c873de36d3e37f1b0e9", + "aarch64-linux": "6a297a8db6f64ac3c95ddc17d2a9f95bff3d2fddef2aae565ebf91bcca960f3a", + "armv7l-linux": "c76c9ec01fff88a9cda3aedfd8251880a835d326c349b108f09e02a419dd9a52", + "headers": "0pmgcns26pvvp7ihqkl9llpdr8l871p7m6r72scia93siwnyvrvv", + "x86_64-darwin": "495b3f0e0459badba8f6e3406edd4bcf7e688eb9d11d4b544426fb25d1e22f43", + "x86_64-linux": "af9e3a6aac492827e1ace64fc50744f82523f09842b2414ad00d9a97f06d7a85" }, - "version": "32.2.8" + "version": "32.3.0" }, "33": { "hashes": { From 1edb48ce37a9946e51a2e2323d45d9c1b7aa013b Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 25 Jan 2025 17:37:09 +0100 Subject: [PATCH 083/287] electron-chromedriver_33: 33.3.1 -> 33.3.2 - Changelog: https://github.com/electron/electron/releases/tag/v33.3.2 - Diff: https://github.com/electron/electron/compare/refs/tags/v33.3.1...v33.3.2 - Fixes CVE-2025-0434 - Fixes CVE-2025-0436 - Fixes CVE-2025-0437 --- .../tools/electron/chromedriver/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index 0af526115340..6b459fc65606 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -45,13 +45,13 @@ }, "33": { "hashes": { - "aarch64-darwin": "c2b4a3bb8a609e5272db39321d567f900eed1c2284eda89d7a4c41557e5b9ba3", - "aarch64-linux": "4b08bd54413a72d1a991f427cc8d27c313def385431f7e045e5b3efbbc880e39", - "armv7l-linux": "f84e71d37358d574fee6519c8dc1335c52bb783d92c2fa92c2fb4a48f9661413", - "headers": "054d8hkm8kvknwamcblpyvgzmfqwb954x6gxgi0ma9xym8dl2qks", - "x86_64-darwin": "c3c0cb8eec909cad52eb9f6b2d9ff2bffc9d2246f37280eb44ffc45fdb6b4861", - "x86_64-linux": "6e288cf2be3ceba26bec0cb1f86504574326bacd933a5da208dabef111abde6d" + "aarch64-darwin": "96648a7aa64bff1b6fdce75da395451cca23aafdd06437c31544125962e25323", + "aarch64-linux": "a5bce192adbc7dfcb6134296c15409b8299a64b3ecc9c61d7d150a644a8187e6", + "armv7l-linux": "a921c696a7371712b14ed64e408a57ad874340fd8d61a447cbc83fcf79e599a3", + "headers": "07m9p2nz0rzl3asq466kqzdq1bdmlvxb5slrr24dj9awijlyrrb6", + "x86_64-darwin": "06ae393d176e8fdd67b1fb6a2b3f0771e3971de112e338d7d30d2ea1ffd0fe8c", + "x86_64-linux": "85e3d980a43f4792d1b6246a50dad745653c0e13b95dbc37adadc78078cfcc99" }, - "version": "33.3.1" + "version": "33.3.2" } } From 01c4268ee218db48014707f828ce1277638aeca8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 17:48:47 +0000 Subject: [PATCH 084/287] jruby: 9.4.9.0 -> 9.4.10.0 --- pkgs/development/interpreters/jruby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index 4a3a28bbb356..e8090e25ce2b 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "jruby"; - version = "9.4.9.0"; + version = "9.4.10.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${finalAttrs.version}/jruby-bin-${finalAttrs.version}.tar.gz"; - hash = "sha256-jWRzbmajwOHh6oE7YxchnF1Ddp5dBqRBcxHiuqi0Dvc="; + hash = "sha256-CzJbtuZIlt/PI1u8ZQbKm1r3jxyP7H8Ei8QYixeTteA="; }; nativeBuildInputs = [ makeBinaryWrapper ]; From 3045853cb07f039c9ad9bfa0c7461f18426fd3c1 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 25 Jan 2025 11:33:29 +0100 Subject: [PATCH 085/287] fwts: unpin gnumake42 --- pkgs/os-specific/linux/fwts/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index 515669921d70..6fd7dc8e99d1 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -4,7 +4,6 @@ fetchzip, autoreconfHook, pkg-config, - gnumake42, glib, pcre, json_c, @@ -27,11 +26,9 @@ stdenv.mkDerivation rec { stripRoot = false; }; - # fails with make 4.4 nativeBuildInputs = [ autoreconfHook pkg-config - gnumake42 ]; buildInputs = [ From aa36805e314ee5566e999ae7463a99221b57a968 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 25 Jan 2025 19:25:04 +0100 Subject: [PATCH 086/287] ogre: 14.3.2 -> 14.3.3 --- pkgs/development/libraries/ogre/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 9a74cf86576c..5ad09c0931fe 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -128,9 +128,9 @@ let in { ogre_14 = common { - version = "14.3.2"; - hash = "sha256-MOTEI0OyGVCH1CVK/pH51r9QkrGspLC3sBIROYHklyk="; - # https://github.com/OGRECave/ogre/blob/v14.3.2/Components/Overlay/CMakeLists.txt + version = "14.3.3"; + hash = "sha256-+ZWrYwgQFmL+9QA+pDQHqacJoONUDVTT+PQLmpLTChg="; + # https://github.com/OGRECave/ogre/blob/v14.3.3/Components/Overlay/CMakeLists.txt imguiVersion = "1.91.2"; imguiHash = "sha256-B7XXQNuEPcT1ID5nMYbAV+aNCG9gIrC9J7BLnYB8yjI="; }; From ed91d70e7bd5de901a3fd487179222675f786ee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 25 Jan 2025 20:01:50 +0100 Subject: [PATCH 087/287] plasma5Packages.kdev-python: use current python3 --- pkgs/applications/kde/kdevelop/kdev-python.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/kde/kdevelop/kdev-python.nix b/pkgs/applications/kde/kdevelop/kdev-python.nix index 9c033837b0a8..284732de3037 100644 --- a/pkgs/applications/kde/kdevelop/kdev-python.nix +++ b/pkgs/applications/kde/kdevelop/kdev-python.nix @@ -6,18 +6,14 @@ threadweaver, ktexteditor, kdevelop-unwrapped, - python39, + python3, }: -let - # FIXME: stick with python 3.9 until MR supporting 3.10 is ready: - # https://invent.kde.org/kdevelop/kdev-python/-/merge_requests/16 - python = python39; -in -mkDerivation rec { + +mkDerivation { pname = "kdev-python"; cmakeFlags = [ - "-DPYTHON_EXECUTABLE=${python}/bin/python" + "-DPYTHON_EXECUTABLE=${lib.getExe python3}" ]; nativeBuildInputs = [ From 9f8f053137668e607a15930d0db1a3d827ec93d5 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 2 Dec 2024 14:18:18 -0500 Subject: [PATCH 088/287] julia_110-bin: 1.10.4 -> 1.10.7 --- pkgs/development/compilers/julia/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 68bd8497aad6..920aef243997 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -29,12 +29,12 @@ in { }); julia_110-bin = wrapJulia (callPackage (import ./generic-bin.nix { - version = "1.10.4"; + version = "1.10.7"; sha256 = { - x86_64-linux = "079f61757c3b5b40d2ade052b3cc4816f50f7ef6df668825772562b3746adff1"; - aarch64-linux = "ae4ae6ade84a103cdf30ce91c8d4035a0ef51c3e2e66f90a0c13abeb4e100fc4"; - x86_64-darwin = "259c18a5294dd41cc60117ecb9fc5a8b2f659807284903a65439fb9d3818c763"; - aarch64-darwin = "97b88d7f9b5724118769f3a3bd259f8f7ada48cdecf3d584cf68162dd873dd10"; + x86_64-linux = "21b2c69806aacf191d7c81806c7d9918bddab30c7b5b8d4251389c3abe274334"; + aarch64-linux = "93bf1b113f297c817310f77d1edce4ab9dcbf49432489cb8df09afbf93d1e5a0"; + x86_64-darwin = "4643d1052ed478b646be06f545b50698fbc572b216dcca3bca69f429ce0e1321"; + aarch64-darwin = "8beb61a29a6c32e26f55070dba8ded37f8572ad07aebd461a06ff5b10d48dc36"; }; }) { }); From d9fa300f8be0455d4fa4d5afaf0577593561a062 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 2 Dec 2024 14:20:21 -0500 Subject: [PATCH 089/287] julia_110: 1.10.4 -> 1.10.7 --- pkgs/development/compilers/julia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 920aef243997..61c95d3e36b8 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -60,8 +60,8 @@ in { }); julia_110 = wrapJulia (callPackage (import ./generic.nix { - version = "1.10.4"; - hash = "sha256-8y5Sd/XYKmOCSILN6/rBWBmbuEgUw8AZo/7MNgFYYZE="; + version = "1.10.7"; + hash = "sha256-BLo4KQstKnowOcMlHXClRRxP5ZXmTpl4rl7D+q+Fajw="; patches = [ ./patches/1.10/0002-skip-failing-and-flaky-tests.patch ]; From 79f1080f280cfd4ace4ff698652173fcb54916a5 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 22 Jan 2025 17:07:04 -0500 Subject: [PATCH 090/287] julia_110-bin: 1.10.7 -> 1.10.8 --- pkgs/development/compilers/julia/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 61c95d3e36b8..ad859626c4c9 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -29,12 +29,12 @@ in { }); julia_110-bin = wrapJulia (callPackage (import ./generic-bin.nix { - version = "1.10.7"; + version = "1.10.8"; sha256 = { - x86_64-linux = "21b2c69806aacf191d7c81806c7d9918bddab30c7b5b8d4251389c3abe274334"; - aarch64-linux = "93bf1b113f297c817310f77d1edce4ab9dcbf49432489cb8df09afbf93d1e5a0"; - x86_64-darwin = "4643d1052ed478b646be06f545b50698fbc572b216dcca3bca69f429ce0e1321"; - aarch64-darwin = "8beb61a29a6c32e26f55070dba8ded37f8572ad07aebd461a06ff5b10d48dc36"; + x86_64-linux = "0410175aeec3df63173c15187f2083f179d40596d36fd3a57819cc5f522ae735"; + aarch64-linux = "8d63dd12595a08edc736be8d6c4fea1840f137b81c62079d970dbd1be448b8cd"; + x86_64-darwin = "8dae60def14db9e9b0f70891f15483d05785ae27a2c14f8f4b1ce27010e4015f"; + aarch64-darwin = "cdd5891a7b143bde835a79155471b82c5482d4dc5576f719351810548242e64b"; }; }) { }); From c806233552497c41cd4010f4820a31eccfc1ac40 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 22 Jan 2025 17:08:36 -0500 Subject: [PATCH 091/287] julia_110: 1.10.7 -> 1.10.8 --- pkgs/development/compilers/julia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index ad859626c4c9..50fbaacc0a1e 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -60,8 +60,8 @@ in { }); julia_110 = wrapJulia (callPackage (import ./generic.nix { - version = "1.10.7"; - hash = "sha256-BLo4KQstKnowOcMlHXClRRxP5ZXmTpl4rl7D+q+Fajw="; + version = "1.10.8"; + hash = "sha256-NPojubjOgy32CWlD/TDzI764Ca7cMsFj9r7vUdUW9Oc="; patches = [ ./patches/1.10/0002-skip-failing-and-flaky-tests.patch ]; From 237c868837e6a57e378b9f07630385194fb93c79 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 25 Jan 2025 14:04:47 -0500 Subject: [PATCH 092/287] julia_110: revert upstream commit breaking build --- pkgs/development/compilers/julia/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 50fbaacc0a1e..390745fe5290 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -1,4 +1,4 @@ -{ callPackage }: +{ callPackage, fetchpatch2 }: let juliaWithPackages = callPackage ../../julia-modules { }; @@ -64,6 +64,14 @@ in hash = "sha256-NPojubjOgy32CWlD/TDzI764Ca7cMsFj9r7vUdUW9Oc="; patches = [ ./patches/1.10/0002-skip-failing-and-flaky-tests.patch + # Revert https://github.com/JuliaLang/julia/pull/55354 + # [build] Some improvements to the LLVM build system + # Related: https://github.com/JuliaLang/julia/issues/55617 + (fetchpatch2 { + url = "https://github.com/JuliaLang/julia/commit/0be37db8c5b5a440bd9a11960ae9c998027b7337.patch"; + revert = true; + hash = "sha256-gXC3LE3AuHMlSdA4dW+rbAhJpSB6ZMaz9X1qrHDPX7Y="; + }) ]; }) { }); From 5ddb146554ec5f0f2abec9efe6ec9a787bdb26bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Jan 2025 19:59:19 +0000 Subject: [PATCH 093/287] apt: 2.9.18 -> 2.9.21 --- pkgs/by-name/ap/apt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ap/apt/package.nix b/pkgs/by-name/ap/apt/package.nix index e28dde96197e..57a678a751f3 100644 --- a/pkgs/by-name/ap/apt/package.nix +++ b/pkgs/by-name/ap/apt/package.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "apt"; - version = "2.9.18"; + version = "2.9.21"; src = fetchurl { url = "mirror://debian/pool/main/a/apt/apt_${finalAttrs.version}.tar.xz"; - hash = "sha256-mQO7u8ibtqRoeggKG/kLuLo2gC7BlrNUmkwf0FAtGjo="; + hash = "sha256-ysdOSPZuAPjF9bxnxDnD1VGgeSGibc1II0rTmLrNbhE="; }; # cycle detection; lib can't be split From a4c008fc9ec46324a36a6897dbfb2aad26606e2e Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 25 Jan 2025 23:36:04 +0100 Subject: [PATCH 094/287] apt: 2.9.21 -> 2.9.25 --- pkgs/by-name/ap/apt/package.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ap/apt/package.nix b/pkgs/by-name/ap/apt/package.nix index 57a678a751f3..6a932fd86f45 100644 --- a/pkgs/by-name/ap/apt/package.nix +++ b/pkgs/by-name/ap/apt/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchurl, + fetchFromGitLab, bzip2, cmake, curl, @@ -34,11 +34,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "apt"; - version = "2.9.21"; + version = "2.9.25"; - src = fetchurl { - url = "mirror://debian/pool/main/a/apt/apt_${finalAttrs.version}.tar.xz"; - hash = "sha256-ysdOSPZuAPjF9bxnxDnD1VGgeSGibc1II0rTmLrNbhE="; + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "apt-team"; + repo = "apt"; + rev = finalAttrs.version; + hash = "sha256-YVMqqWF4heSF11b0uKD/EUUBPPzkTtGP3QxnLVY6/l8="; }; # cycle detection; lib can't be split From c961b3c26cd299eab762b3b13a4bb3f6ec6b1c01 Mon Sep 17 00:00:00 2001 From: Nathan Henrie Date: Wed, 22 Jan 2025 07:06:22 -0700 Subject: [PATCH 095/287] golden-cheetah: update to qt6, add darwin QT "5 or higher" recommended on Linux, QT6 specifically noted in the install instructions for mac so should be fine for both. --- .../0001-Fix-building-with-bison-3.7.patch | 0 .../go/golden-cheetah/package.nix} | 98 ++++++++++--------- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 54 insertions(+), 46 deletions(-) rename pkgs/{applications/misc => by-name/go}/golden-cheetah/0001-Fix-building-with-bison-3.7.patch (100%) rename pkgs/{applications/misc/golden-cheetah/default.nix => by-name/go/golden-cheetah/package.nix} (59%) diff --git a/pkgs/applications/misc/golden-cheetah/0001-Fix-building-with-bison-3.7.patch b/pkgs/by-name/go/golden-cheetah/0001-Fix-building-with-bison-3.7.patch similarity index 100% rename from pkgs/applications/misc/golden-cheetah/0001-Fix-building-with-bison-3.7.patch rename to pkgs/by-name/go/golden-cheetah/0001-Fix-building-with-bison-3.7.patch diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/by-name/go/golden-cheetah/package.nix similarity index 59% rename from pkgs/applications/misc/golden-cheetah/default.nix rename to pkgs/by-name/go/golden-cheetah/package.nix index 7888db1a27d6..4d65093d2762 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/by-name/go/golden-cheetah/package.nix @@ -1,25 +1,16 @@ { lib, + stdenv, fetchFromGitHub, nix-update-script, - mkDerivation, - qtbase, - qtsvg, - qtserialport, - qtwebengine, - qtmultimedia, - qttools, - qtconnectivity, - qtcharts, + qt6, libusb-compat-0_1, gsl, blas, bison, flex, zlib, - qmake, makeDesktopItem, - wrapQtAppsHook, }: let @@ -33,37 +24,45 @@ let categories = [ "Utility" ]; }; in -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "golden-cheetah"; version = "3.7-DEV2408"; src = fetchFromGitHub { owner = "GoldenCheetah"; repo = "GoldenCheetah"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-6JAdnYaKULJsc/zdcTMbCkbOCbiVtnJivEazDKL721c="; }; - buildInputs = [ - qtbase - qtsvg - qtserialport - qtwebengine - qtmultimedia - qttools - zlib - qtconnectivity - qtcharts - libusb-compat-0_1 - gsl - blas - ]; - nativeBuildInputs = [ - flex - wrapQtAppsHook - qmake - bison - ]; + buildInputs = + with qt6; + [ + qt5compat + qtbase + qtcharts + qtconnectivity + qtmultimedia + qtserialport + qtsvg + qttools + qtwebengine + ] + ++ [ + blas + gsl + libusb-compat-0_1 + zlib + ]; + nativeBuildInputs = + [ + bison + flex + ] + ++ (with qt6; [ + qmake + wrapQtAppsHook + ]); patches = [ # allow building with bison 3.7 @@ -84,30 +83,41 @@ mkDerivation rec { preConfigure = '' cp src/gcconfig.pri.in src/gcconfig.pri cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri - sed -i 's,^#QMAKE_LRELEASE.*,QMAKE_LRELEASE = ${qttools.dev}/bin/lrelease,' src/gcconfig.pri + sed -i 's,^#QMAKE_LRELEASE.*,QMAKE_LRELEASE = ${qt6.qttools.dev}/bin/lrelease,' src/gcconfig.pri sed -i 's,^#LIBUSB_INSTALL.*,LIBUSB_INSTALL = ${libusb-compat-0_1},' src/gcconfig.pri sed -i 's,^#LIBUSB_INCLUDE.*,LIBUSB_INCLUDE = ${libusb-compat-0_1.dev}/include,' src/gcconfig.pri sed -i 's,^#LIBUSB_LIBS.*,LIBUSB_LIBS = -L${libusb-compat-0_1}/lib -lusb,' src/gcconfig.pri ''; - installPhase = '' - runHook preInstall + installPhase = + if stdenv.isLinux then + '' + runHook preInstall - mkdir -p $out/bin - cp src/GoldenCheetah $out/bin - install -Dm644 "${desktopItem}/share/applications/"* -t $out/share/applications/ - install -Dm644 src/Resources/images/gc.png $out/share/pixmaps/goldencheetah.png + mkdir -p $out/bin + cp src/GoldenCheetah $out/bin + install -Dm644 "${desktopItem}/share/applications/"* -t $out/share/applications/ + install -Dm644 src/Resources/images/gc.png $out/share/pixmaps/goldencheetah.png - runHook postInstall - ''; + runHook postInstall + '' + else if stdenv.isDarwin then + '' + runHook preInstall + mkdir -p $out/Applications + cp -r src/GoldenCheetah.app $out/Applications + runHook postInstall + '' + else + abort "unsupported platform"; passthru.updateScript = nix-update-script { }; meta = { description = "Performance software for cyclists, runners and triathletes. Built from source and without API tokens"; mainProgram = "GoldenCheetah"; - platforms = lib.platforms.linux; + platforms = with lib.platforms; darwin ++ linux; maintainers = with lib.maintainers; [ adamcstephens ]; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b37b0cce9a93..feb514f9060f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18209,8 +18209,6 @@ with pkgs; discordo = callPackage ../applications/networking/discordo/default.nix { }; - golden-cheetah = libsForQt5.callPackage ../applications/misc/golden-cheetah { }; - tomb = callPackage ../by-name/to/tomb/package.nix { pinentry = pinentry-curses; }; From 0819c6f293470e0297de870da1fda81e38a4c3d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 00:25:10 +0000 Subject: [PATCH 096/287] unityhub: 3.10.0 -> 3.11.0 --- pkgs/development/tools/unityhub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index 98beee9b2b77..a191115d2d35 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "unityhub"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/unityhub-amd64-${version}.deb"; - sha256 = "sha256-9dm6tVQ5nsDC8X2clrT4cAl8jg4wLwcihE4bnFgdU+A="; + sha256 = "sha256-2A+EB+EGE/1qu4CtSeXIRw5JPYnBU/EKbpQThC7oCug="; }; nativeBuildInputs = [ From fb5d5c81ea09871c2dd6fddc4052bf0748880068 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sat, 25 Jan 2025 08:00:01 -0800 Subject: [PATCH 097/287] libtirpc: fix undefined reference in version script with llvm bintools --- pkgs/by-name/li/libtirpc/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/li/libtirpc/package.nix b/pkgs/by-name/li/libtirpc/package.nix index 32476de5d6e7..95819e42330e 100644 --- a/pkgs/by-name/li/libtirpc/package.nix +++ b/pkgs/by-name/li/libtirpc/package.nix @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { sed -es"|/etc/netconfig|$out/etc/netconfig|g" -i doc/Makefile.in tirpc/netconfig.h ''; + configureFlags = lib.optional ( + stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17" + ) "LDFLAGS=-Wl,--undefined-version"; + enableParallelBuilding = true; preInstall = '' From 485d02f8168b14907dcbd64d76870bd3c01e99ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 02:14:55 +0000 Subject: [PATCH 098/287] papermc: 1.21.4-15 -> 1.21.4-126 --- pkgs/games/papermc/versions.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/papermc/versions.json b/pkgs/games/papermc/versions.json index 060f5d3a18b9..d8c868209dac 100644 --- a/pkgs/games/papermc/versions.json +++ b/pkgs/games/papermc/versions.json @@ -64,11 +64,11 @@ "version": "1.21.1-132" }, "1.21.3": { - "hash": "sha256-/nrczvDAygftMAFP+vAVygnpy6muucsiXjIY3CMswFU=", - "version": "1.21.3-81" + "hash": "sha256-H4Lzm/x82NCqbS9FN6a8DVOT9t1boIZMof0u/1H2+B8=", + "version": "1.21.3-82" }, "1.21.4": { - "hash": "sha256-FDVaeckg1PoHfiwuwxBRLD2uZkwtAMshEJeSQY9NM8E=", - "version": "1.21.4-15" + "hash": "sha256-SudaG+hAEEVveMNOUngATLmLqloYipSQVHdstddrIBQ=", + "version": "1.21.4-126" } } From 41198d5f4a53bd18f574805710ec053fb3c5e70b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 04:45:42 +0000 Subject: [PATCH 099/287] tootik: 0.15.0 -> 0.15.1 --- pkgs/by-name/to/tootik/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/to/tootik/package.nix b/pkgs/by-name/to/tootik/package.nix index 5fd9b50eaff0..2defbff04443 100644 --- a/pkgs/by-name/to/tootik/package.nix +++ b/pkgs/by-name/to/tootik/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "tootik"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "dimkr"; repo = "tootik"; tag = version; - hash = "sha256-Onl64ps8rfLVnZYQ2KPzS+mslgeNz2wpJuabwsqhXlM="; + hash = "sha256-uq0mDlJ5NPXw1fsNcoyTbqqpZsYDkX8OSdZ5ToO0rYQ="; }; - vendorHash = "sha256-GSi+sQz7kgp1YHEzH/Y7rOOEEhhvzd75cVhSow3URaU="; + vendorHash = "sha256-p/pgoGzrukd4mzzoyLI9g6vL4k+lTnMZOha1KrYjHJ0="; nativeBuildInputs = [ openssl ]; From f5944a9fc7db15113747f4ee92cac51b0c05c859 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 06:35:36 +0000 Subject: [PATCH 100/287] git-credential-manager: 2.6.0 -> 2.6.1 --- .../version-management/git-credential-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-credential-manager/default.nix b/pkgs/applications/version-management/git-credential-manager/default.nix index ee75429fa6f0..708301a04105 100644 --- a/pkgs/applications/version-management/git-credential-manager/default.nix +++ b/pkgs/applications/version-management/git-credential-manager/default.nix @@ -14,13 +14,13 @@ buildDotnetModule rec { pname = "git-credential-manager"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "git-ecosystem"; repo = "git-credential-manager"; rev = "v${version}"; - hash = "sha256-8hjMtfPY/7cNH8WdHyG4kT2W+wGWteHbin1HgTBGiNQ="; + hash = "sha256-fzcGAcKOAEnBiAEYYyxKJ71xnixb5cz7FzR28/cKIFg="; }; projectFile = "src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj"; From 987ccd5387f61ffcf3cf9ad19b4545d03b21a966 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Sun, 5 Jan 2025 16:08:59 +0100 Subject: [PATCH 101/287] python312Packages.altair: 5.4.1 -> 5.5.0 --- pkgs/development/python-modules/altair/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index 7325abf6a0cb..ae2750caf8cd 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -22,16 +22,16 @@ buildPythonPackage rec { pname = "altair"; - version = "5.4.1"; + version = "5.5.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "altair-viz"; repo = "altair"; tag = "v${version}"; - hash = "sha256-7C51ACaBuNtOSXqLpuCI5bnLyE9U64vNXlD4/msPq2k="; + hash = "sha256-lrKC4FYRQEax5E0lQNhO9FLk5UOJ0TnYzqZjndlRpGI="; }; build-system = [ hatchling ]; @@ -63,6 +63,8 @@ buildPythonPackage rec { # Sometimes conflict due to parallelism "test_dataframe_to_csv[polars]" "test_dataframe_to_csv[pandas]" + # Network access + "test_theme_remote_lambda" ]; disabledTestPaths = [ From ed0cd3b127452046075a7b5262a7c91bf58e00b7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 26 Jan 2025 11:53:30 +0100 Subject: [PATCH 102/287] checkov: 3.2.355 -> 3.2.357 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.355...3.2.357 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.357 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index f83e95786870..096f077ae7b2 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.355"; + version = "3.2.357"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = version; - hash = "sha256-yBm4v7YczngDFf7jSSVrlMbwIWYFMt6xdJe5qG6i4+I="; + hash = "sha256-hWCYkzFKL60r1k2u9TUwuSRA2R+hHr4ooKGtctko41o="; }; patches = [ ./flake8-compat-5.x.patch ]; From e934052fa417b5742e9309691d36cd6213c8929e Mon Sep 17 00:00:00 2001 From: a-kenji Date: Sun, 26 Jan 2025 13:02:46 +0100 Subject: [PATCH 103/287] flake-edit: 0.1.0 -> 0.0.2 --- pkgs/by-name/fl/flake-edit/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/flake-edit/package.nix b/pkgs/by-name/fl/flake-edit/package.nix index cfe799a143e9..c4517864c37d 100644 --- a/pkgs/by-name/fl/flake-edit/package.nix +++ b/pkgs/by-name/fl/flake-edit/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "flake-edit"; - version = "0.1.0"; + version = "0.0.2"; src = fetchFromGitHub { owner = "a-kenji"; repo = "flake-edit"; rev = "v${version}"; - hash = "sha256-dNTvAYBVZLeDlC1bsaonwojE7+1CD16/sCxtQVvT9WE="; + hash = "sha256-7n8WANm9AijZYI5nlnevLI+aZtV55teroeQIEld7tkE="; }; - cargoHash = "sha256-ipLjbfnNqrUUD40awRnE8URX5pHhG4SwUM9JedoBM8Y="; + cargoHash = "sha256-LyASAwyiBiPZkrA1R0zgQbNbSeOmMDEydLk2YiGq2fM="; nativeBuildInputs = [ installShellFiles From 9d26ad1e6520485d09f5667169edc2560a35669f Mon Sep 17 00:00:00 2001 From: a-kenji Date: Sun, 26 Jan 2025 13:04:33 +0100 Subject: [PATCH 104/287] flak-edit: Add nix-update-script --- pkgs/by-name/fl/flake-edit/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/flake-edit/package.nix b/pkgs/by-name/fl/flake-edit/package.nix index c4517864c37d..62d015dc2166 100644 --- a/pkgs/by-name/fl/flake-edit/package.nix +++ b/pkgs/by-name/fl/flake-edit/package.nix @@ -6,6 +6,7 @@ openssl, stdenv, installShellFiles, + nix-update-script, darwin, }: @@ -28,9 +29,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = - [ - openssl - ] + [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration @@ -46,6 +45,8 @@ rustPlatform.buildRustPackage rec { installShellCompletion --zsh --name _flake-edit target/assets/_flake-edit ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Edit your flake inputs with ease"; homepage = "https://github.com/a-kenji/flake-edit"; From 0b65cf03f096a55f11dfba8fa99fcbc72ed91139 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 26 Jan 2025 14:47:59 +0200 Subject: [PATCH 105/287] nixos/network-interfaces-systemd: remove unused arg in genericDhcpNetworks The first argument is not used (anymore). --- .../tasks/network-interfaces-systemd.nix | 42 +++++++++---------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 60aa66347e3a..ed903bf9994a 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -53,28 +53,26 @@ let ) ); - genericDhcpNetworks = - initrd: - mkIf cfg.useDHCP { - networks."99-ethernet-default-dhcp" = { - matchConfig = { - Type = "ether"; - Kind = "!*"; # physical interfaces have no kind - }; - DHCP = "yes"; - networkConfig.IPv6PrivacyExtensions = "kernel"; - }; - networks."99-wireless-client-dhcp" = { - matchConfig.WLANInterfaceType = "station"; - DHCP = "yes"; - networkConfig.IPv6PrivacyExtensions = "kernel"; - # We also set the route metric to one more than the default - # of 1024, so that Ethernet is preferred if both are - # available. - dhcpV4Config.RouteMetric = 1025; - ipv6AcceptRAConfig.RouteMetric = 1025; + genericDhcpNetworks = mkIf cfg.useDHCP { + networks."99-ethernet-default-dhcp" = { + matchConfig = { + Type = "ether"; + Kind = "!*"; # physical interfaces have no kind }; + DHCP = "yes"; + networkConfig.IPv6PrivacyExtensions = "kernel"; }; + networks."99-wireless-client-dhcp" = { + matchConfig.WLANInterfaceType = "station"; + DHCP = "yes"; + networkConfig.IPv6PrivacyExtensions = "kernel"; + # We also set the route metric to one more than the default + # of 1024, so that Ethernet is preferred if both are + # available. + dhcpV4Config.RouteMetric = 1025; + ipv6AcceptRAConfig.RouteMetric = 1025; + }; + }; interfaceNetworks = mkMerge ( forEach interfaces (i: { @@ -220,7 +218,7 @@ in # former, the user retains full control over the configuration. boot.initrd.systemd.network = mkMerge [ defaultGateways - (genericDhcpNetworks true) + genericDhcpNetworks interfaceNetworks bridgeNetworks vlanNetworks @@ -271,7 +269,7 @@ in enable = true; } defaultGateways - (genericDhcpNetworks false) + genericDhcpNetworks interfaceNetworks bridgeNetworks (mkMerge ( From 982d4b545cb26449a9b5330226690a923bb3ee5b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 13:01:22 +0000 Subject: [PATCH 106/287] davinci-resolve-studio: 19.1.2 -> 19.1.3 --- pkgs/by-name/da/davinci-resolve/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/da/davinci-resolve/package.nix b/pkgs/by-name/da/davinci-resolve/package.nix index 35ee4312ed45..ecbb57067082 100644 --- a/pkgs/by-name/da/davinci-resolve/package.nix +++ b/pkgs/by-name/da/davinci-resolve/package.nix @@ -35,7 +35,7 @@ let davinci = ( stdenv.mkDerivation rec { pname = "davinci-resolve${lib.optionalString studioVariant "-studio"}"; - version = "19.1.2"; + version = "19.1.3"; nativeBuildInputs = [ (appimage-run.override { buildFHSEnv = buildFHSEnvChroot; }) @@ -57,9 +57,9 @@ let outputHashAlgo = "sha256"; outputHash = if studioVariant then - "sha256-yLlvl/zm/epNs1e4sSDrfHNApcpPQV2fMF3Y09ml7is=" + "sha256-aAKE+AY/a2XjVzdU0VXT3ekFrTp3rO6zUd7pRTTDc9E=" else - "sha256-ssX1ffB7ZSJObETQa2r5R4oHddAccC4GB14jaLs8bGg="; + "sha256-CCr4/h0W1fhzUT4o6WyX2hBodzy9iqVLZwzdplzq9SI="; impureEnvVars = lib.fetchers.proxyImpureEnvVars; From 72236ea284168ef5d3f79ded41a2d187b3aeef10 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sun, 26 Jan 2025 04:43:15 +0100 Subject: [PATCH 107/287] aerc: refactor --- pkgs/by-name/ae/aerc/package.nix | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ae/aerc/package.nix b/pkgs/by-name/ae/aerc/package.nix index 469f2d6369c5..dd8416badbb7 100644 --- a/pkgs/by-name/ae/aerc/package.nix +++ b/pkgs/by-name/ae/aerc/package.nix @@ -2,7 +2,6 @@ lib, buildGoModule, fetchFromSourcehut, - fetchpatch, ncurses, notmuch, scdoc, @@ -10,6 +9,8 @@ w3m, dante, gawk, + versionCheckHook, + nix-update-script, }: buildGoModule rec { @@ -31,9 +32,7 @@ buildGoModule rec { python3Packages.wrapPython ]; - patches = [ - ./runtime-libexec.patch - ]; + patches = [ ./runtime-libexec.patch ]; postPatch = '' substituteAllInPlace config/aerc.conf @@ -47,9 +46,7 @@ buildGoModule rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; - pythonPath = [ - python3Packages.vobject - ]; + pythonPath = [ python3Packages.vobject ]; buildInputs = [ python3Packages.python @@ -85,12 +82,19 @@ buildGoModule rec { patchShebangs $out/libexec/aerc/filters ''; - meta = with lib; { + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { description = "Email client for your terminal"; homepage = "https://aerc-mail.org/"; + changelog = "https://git.sr.ht/~rjarry/aerc/tree/${version}/item/CHANGELOG.md"; maintainers = [ ]; mainProgram = "aerc"; - license = licenses.mit; - platforms = platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; } From 18493e297be88b6c3f8888c7a9dedc75cd69414b Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 26 Jan 2025 15:04:52 +0100 Subject: [PATCH 108/287] slurm-spank-x11: fix build with gcc-14 --- pkgs/by-name/sl/slurm-spank-x11/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/sl/slurm-spank-x11/package.nix b/pkgs/by-name/sl/slurm-spank-x11/package.nix index 072328288f4a..bd3ff6f9ae82 100644 --- a/pkgs/by-name/sl/slurm-spank-x11/package.nix +++ b/pkgs/by-name/sl/slurm-spank-x11/package.nix @@ -17,6 +17,9 @@ stdenv.mkDerivation rec { patches = [ ./hostlist.patch ]; + # Required for build with gcc-14 + env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + buildPhase = '' gcc -DX11_LIBEXEC_PROG="\"$out/bin/slurm-spank-x11\"" \ -g -o slurm-spank-x11 slurm-spank-x11.c From 2d9867ac833ca8a6171a15c3b2aa65c66369a688 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Sun, 26 Jan 2025 08:30:16 -0600 Subject: [PATCH 109/287] jellyfin: 10.10.3 -> 10.10.5 --- pkgs/by-name/je/jellyfin/nuget-deps.json | 16 ++++++++-------- pkgs/by-name/je/jellyfin/package.nix | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/je/jellyfin/nuget-deps.json b/pkgs/by-name/je/jellyfin/nuget-deps.json index 9ad076d73687..c3532ce18f53 100644 --- a/pkgs/by-name/je/jellyfin/nuget-deps.json +++ b/pkgs/by-name/je/jellyfin/nuget-deps.json @@ -11,13 +11,13 @@ }, { "pname": "BlurHashSharp", - "version": "1.3.3", - "hash": "sha256-Zrea7/O9ARyM65xokZU9M0Lx/WsriJ1gclWB17oOQKU=" + "version": "1.3.4", + "hash": "sha256-xBTjBMTrN8M4gsPJSW3YIuu6Zi44xBkDHJF4FudOIts=" }, { "pname": "BlurHashSharp.SkiaSharp", - "version": "1.3.3", - "hash": "sha256-yarsi8uxOGFOx79iUts3443a79pd8NYcKy8Va2g+baw=" + "version": "1.3.4", + "hash": "sha256-P0ObHZ6/lSwLjG7+uTgzmTcwCfDGisz8GFzlnDjctgY=" }, { "pname": "CommandLineParser", @@ -546,8 +546,8 @@ }, { "pname": "NEbml", - "version": "0.11.0", - "hash": "sha256-rYZ2COiYjYSFpPipoBf1MrNMSEVrL1+/E8MhOwF/M0s=" + "version": "0.12.0", + "hash": "sha256-Ij6p0bfCagTCxcKBppCQAqZMmxARJMCGsktyPSDGoFc=" }, { "pname": "Newtonsoft.Json", @@ -1246,8 +1246,8 @@ }, { "pname": "z440.atl.core", - "version": "6.8.0", - "hash": "sha256-eeiNzwXqDvw1xWOzubeKDth89MiU4q8qPesXWkvlPhc=" + "version": "6.11.0", + "hash": "sha256-V1r1ftZ/Ud0pw/qwnqpJodRaGi9FyG3uIy3ykJUvxjg=" }, { "pname": "zlib.net-mutliplatform", diff --git a/pkgs/by-name/je/jellyfin/package.nix b/pkgs/by-name/je/jellyfin/package.nix index a83ce8174b47..90e509d30bcd 100644 --- a/pkgs/by-name/je/jellyfin/package.nix +++ b/pkgs/by-name/je/jellyfin/package.nix @@ -13,13 +13,13 @@ buildDotnetModule rec { pname = "jellyfin"; - version = "10.10.3"; # ensure that jellyfin-web has matching version + version = "10.10.5"; # ensure that jellyfin-web has matching version src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin"; rev = "v${version}"; - hash = "sha256-kobe2hlcDzYHMMTaRtfC8L9f2W1eS2SNcYolWr+wsJQ="; + hash = "sha256-fXjQ8h//C0Ox5pyyFazpcuVLZibKAbnXcY6OHLI2bDQ="; }; propagatedBuildInputs = [ sqlite ]; From f13bfcaeef13bd3f277e89a2c5a9e2ece8ef70e2 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 26 Jan 2025 09:26:11 -0500 Subject: [PATCH 110/287] ansible-later: 3.3.1 -> 4.0.8 Diff: https://github.com/thegeeklab/ansible-later/compare/refs/tags/v3.3.1...v4.0.8 Changelog: https://github.com/thegeeklab/ansible-later/releases/tag/v4.0.8 --- pkgs/tools/admin/ansible/later.nix | 62 +++++++++--------------------- 1 file changed, 19 insertions(+), 43 deletions(-) diff --git a/pkgs/tools/admin/ansible/later.nix b/pkgs/tools/admin/ansible/later.nix index aec0c0b80204..14fa7e514ab2 100644 --- a/pkgs/tools/admin/ansible/later.nix +++ b/pkgs/tools/admin/ansible/later.nix @@ -1,86 +1,62 @@ { lib, fetchFromGitHub, - fetchpatch, - python3, + python3Packages, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "ansible-later"; - version = "3.3.1"; - format = "pyproject"; + version = "4.0.8"; + pyproject = true; src = fetchFromGitHub { owner = "thegeeklab"; repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-7k81eEcM+BXNrln6+Lu0+1LjsZdYkUidrRQCdlBbQB8="; + tag = "v${version}"; + hash = "sha256-4ZHCnLeG5gr0UtKQLU+6xnTxUbxnLcmDd51Psnaa42I="; }; - patches = [ - # https://github.com/thegeeklab/ansible-later/pull/658 - (fetchpatch { - name = "poetry-dynamic-versioning-pep517.patch"; - url = "https://github.com/thegeeklab/ansible-later/commit/a2c278fb45769648df1439df5bb25883dddfc58a.patch"; - hash = "sha256-++CiwwHZoaPC8XHaYbNQeU3zqEi2a4eIYbuSQkO0jTI="; - }) - ]; - - pythonRelaxDeps = [ - "anyconfig" - "flake8" - "jsonschema" - "pathspec" - "python-json-logger" - "PyYAML" - "toolz" - "unidiff" - "yamllint" - ]; - - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3Packages; [ poetry-core poetry-dynamic-versioning ]; - propagatedBuildInputs = with python3.pkgs; [ - ansible + dependencies = with python3Packages; [ + pyyaml ansible-core + ansible anyconfig appdirs colorama - flake8 jsonschema nested-lookup pathspec python-json-logger - pyyaml toolz unidiff yamllint - distutils ]; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = with python3Packages; [ pytest-cov-stub pytest-mock pytestCheckHook ]; - postInstall = '' - rm $out/lib/python*/site-packages/LICENSE - ''; - pythonImportsCheck = [ "ansiblelater" ]; - meta = with lib; { + preCheck = '' + export HOME="$TMPDIR" + ''; + + meta = { description = "Best practice scanner for Ansible roles and playbooks"; mainProgram = "ansible-later"; homepage = "https://github.com/thegeeklab/ansible-later"; - changelog = "https://github.com/thegeeklab/ansible-later/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ tboerger ]; + changelog = "https://github.com/thegeeklab/ansible-later/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tboerger ]; }; } From d85b17634b8e8a80b53044ab9bdd1e159ea1470a Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Sun, 26 Jan 2025 08:36:14 -0600 Subject: [PATCH 111/287] jellyfin-web: 10.10.3 -> 10.10.5 --- pkgs/by-name/je/jellyfin-web/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/je/jellyfin-web/package.nix b/pkgs/by-name/je/jellyfin-web/package.nix index 6d57a0be8634..c85fc945989b 100644 --- a/pkgs/by-name/je/jellyfin-web/package.nix +++ b/pkgs/by-name/je/jellyfin-web/package.nix @@ -13,7 +13,7 @@ }: buildNpmPackage rec { pname = "jellyfin-web"; - version = "10.10.3"; + version = "10.10.5"; src = assert version == jellyfin.version; @@ -21,7 +21,7 @@ buildNpmPackage rec { owner = "jellyfin"; repo = "jellyfin-web"; rev = "v${version}"; - hash = "sha256-xmy2cr6MJSen6Pok3Wde4mBcu5pM4qtGEBfqMpGdAxY="; + hash = "sha256-bmLEFnP5HalQ7w42pTJt4iV7uISLnMrOsrXKjPAezog"; }; nodejs = nodejs_20; # does not build with 22 @@ -31,7 +31,7 @@ buildNpmPackage rec { --replace-fail "git describe --always --dirty" "echo ${src.rev}" \ ''; - npmDepsHash = "sha256-qzjniTbJRNeZ2WFu8RBjcdZR96nvGRHMERdEiELLufg="; + npmDepsHash = "sha256-MoXE7hzavOS86UjLzpJtSQxded98YjL4h7L1IC5KLas"; preBuild = '' # using sass-embedded fails at executing node_modules/sass-embedded-linux-x64/dart-sass/src/dart From 9bb655a235e9d374f442c7a1a3551054df37ca39 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 15:44:37 +0100 Subject: [PATCH 112/287] python3Packages.datafusion: fetchCargoTarball -> fetchCargoVendor Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- pkgs/development/python-modules/datafusion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datafusion/default.nix b/pkgs/development/python-modules/datafusion/default.nix index c80baeef6e53..46d27a50e93e 100644 --- a/pkgs/development/python-modules/datafusion/default.nix +++ b/pkgs/development/python-modules/datafusion/default.nix @@ -47,10 +47,10 @@ buildPythonPackage rec { hash = "sha256-5WOSlx4XW9zO6oTY16lWQElShLv0ubflVPfSSEGrFgg="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { name = "datafusion-cargo-deps"; inherit src; - hash = "sha256-hN03tbnH77VsMDxSMddMHIH00t7lUs5h8rTHbiMIExw="; + hash = "sha256-xUpchV4UFEX1HkCpClOwxnEfGLVlOIX4UmzYKiUth9U="; }; nativeBuildInputs = with rustPlatform; [ From aa3c1afabf9dd445d3f1884e3525c55040b5e476 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 15:48:05 +0100 Subject: [PATCH 113/287] python3Packages.typst: fetchCargoTarball -> fetchCargoVendor Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- pkgs/development/python-modules/typst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/typst/default.nix b/pkgs/development/python-modules/typst/default.nix index 3c0d3422883b..39cf7728077c 100644 --- a/pkgs/development/python-modules/typst/default.nix +++ b/pkgs/development/python-modules/typst/default.nix @@ -25,10 +25,10 @@ buildPythonPackage rec { hash = "sha256-VgQbMeyvXjzE8jSaGLygIy8EhR23MpqjlU68FsBZq6E="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-H7lKoSDSx0cGH+VsIX90KaiWJw1h/BokNdKzxmvm6XQ="; + hash = "sha256-OHJQlGwgaQ2ELWvjaA8qsuXOQGSdgirK/yTff7POOmE="; }; build-system = [ From f3e2270660940b07aa378d1a6c56adf70957b288 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 16:33:19 +0100 Subject: [PATCH 114/287] clickhouse: fetchCargoTarball -> fetchCargoVendor Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- pkgs/servers/clickhouse/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index a7837947852e..b65285ef7133 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -120,21 +120,21 @@ mkDerivation rec { null; corrosionDeps = if rustSupport then - rustPlatform.fetchCargoTarball { + rustPlatform.fetchCargoVendor { src = corrosionSrc; name = "corrosion-deps"; preBuild = "cd generator"; - hash = "sha256-dhUgpwSjE9NZ2mCkhGiydI51LIOClA5wwk1O3mnnbM8="; + hash = "sha256-ok1QLobiGBccmbEEWQxHz3ivvuT6FrOgG6wLK4gIbgU="; } else null; rustDeps = if rustSupport then - rustPlatform.fetchCargoTarball { + rustPlatform.fetchCargoVendor { inherit src; name = "rust-deps"; preBuild = "cd rust"; - hash = "sha256-rbEfCRB2QAZ2WBgSLYYUqeYtI4Y5d9oQ2G8/mPirIp4="; + hash = "sha256-nX5wBM8rVMbaf/IrPsqkdT2KQklQbBIGomeWSTjclR4="; } else null; From 8965df8599001dcbbb737443a793d1a859706dee Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 16:33:48 +0100 Subject: [PATCH 115/287] librespot: useFetchCargoVendor Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- pkgs/applications/audio/librespot/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix index 8493793969f0..6a29a96e470b 100644 --- a/pkgs/applications/audio/librespot/default.nix +++ b/pkgs/applications/audio/librespot/default.nix @@ -29,7 +29,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-dGQDRb7fgIkXelZKa+PdodIs9DxbgEMlVGJjK/hU3Mo="; }; - cargoHash = "sha256-GScAUqALoocqvsHz4XgPytI8cl0hiuWjqaO/ItNo4v4="; + useFetchCargoVendor = true; + cargoHash = "sha256-SqvJSHkyd1IicT6c4pE96dBJNNodULhpyG14HRGVWCk="; nativeBuildInputs = [ From c93dd741e1f6ad9a216d4e780dedb09a8fcb21db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 15:34:31 +0000 Subject: [PATCH 116/287] mieru: 3.11.0 -> 3.11.1 --- pkgs/by-name/mi/mieru/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/mieru/package.nix b/pkgs/by-name/mi/mieru/package.nix index 794d7e727c18..d1f001068a3a 100644 --- a/pkgs/by-name/mi/mieru/package.nix +++ b/pkgs/by-name/mi/mieru/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "mieru"; - version = "3.11.0"; + version = "3.11.1"; src = fetchFromGitHub { owner = "enfein"; repo = "mieru"; rev = "v${version}"; - hash = "sha256-xwi9T7M4FEl79kyGj+F1HX8000PFLrBfTmnEaLwnEFg="; + hash = "sha256-FFV1zF/sKgIVSSTcDcuB3QWfcFKbI3RJFG9RveSVe+w="; }; vendorHash = "sha256-AOtq6bGijQqpNMNZA3XeMjzKAo7tWTpdrKB6KxQsdMM="; From 787497b8433b36c2feacef9dbcc324d970c93af8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 15:34:52 +0000 Subject: [PATCH 117/287] flarectl: 0.113.0 -> 0.114.0 --- pkgs/by-name/fl/flarectl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/flarectl/package.nix b/pkgs/by-name/fl/flarectl/package.nix index aed675be9578..d6a1df3fc836 100644 --- a/pkgs/by-name/fl/flarectl/package.nix +++ b/pkgs/by-name/fl/flarectl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "flarectl"; - version = "0.113.0"; + version = "0.114.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflare-go"; rev = "v${version}"; - hash = "sha256-3luHcmMa2iCsgtg1wNkBcScH/iO1+DUHXpwpaIR6IFI="; + hash = "sha256-K0SnwLZUmu/qPTAMXPiQtomKyfLK+gJIIMo4sY6qjYc="; }; - vendorHash = "sha256-SnkIVGrB7McwdfFfI4yMDviQ+mpl4udu2COS3AEMS3o="; + vendorHash = "sha256-vTByYXYj3r8pOi6oXYu9f7zO4MdXg0fWqWzhsNLCjjw="; subPackages = [ "cmd/flarectl" ]; From 47a37942ad8d27b2440e489595458aca3ff45378 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 16:39:33 +0100 Subject: [PATCH 118/287] kakounePlugins.hop-kak: useFetchCargoVendor Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- pkgs/applications/editors/kakoune/plugins/overrides.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/kakoune/plugins/overrides.nix b/pkgs/applications/editors/kakoune/plugins/overrides.nix index 1f5aaeb09279..f31be450e435 100644 --- a/pkgs/applications/editors/kakoune/plugins/overrides.nix +++ b/pkgs/applications/editors/kakoune/plugins/overrides.nix @@ -172,7 +172,8 @@ self: super: { git ]; - cargoHash = "sha256-EjSj/+BysGwJBxK6Ccg2+pXHdB2Lg3dxIURRsSVTHVY="; + useFetchCargoVendor = true; + cargoHash = "sha256-cgUBa0rgfJFnosCgD20G1rlOl/nyXJ9bA9SSf4BuqAs="; postInstall = '' mkdir -p $out/share/kak/bin From 97b43465f71f904348e18e784e797c5cc907758f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 15:57:06 +0000 Subject: [PATCH 119/287] rip2: 0.9.2 -> 0.9.3 --- pkgs/by-name/ri/rip2/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ri/rip2/package.nix b/pkgs/by-name/ri/rip2/package.nix index ab354bbc64c5..e6e9ef0d79dd 100644 --- a/pkgs/by-name/ri/rip2/package.nix +++ b/pkgs/by-name/ri/rip2/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "rip2"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "MilesCranmer"; repo = "rip2"; rev = "v${version}"; - hash = "sha256-OZsiAh0sQygLdVdA1QxCf7FTvP5CrlDNeOQLv2G2X3U="; + hash = "sha256-bwIvjpZgX95Vg14sU6JmYuWNHP38ZBM98ii/Rze+lqA="; }; - cargoHash = "sha256-9wbHXgjOWyQS8JOMQQTVetMacdjWD9C4NBWxUpcjbdg="; + cargoHash = "sha256-rzY0gMipvC5vYmKUJTVU8OSbmMQxtLIuizIIbrH6v4s="; nativeBuildInputs = [ installShellFiles ]; From 6e3c63efb08cc2e6413cb9e12c04ed55df72103f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 16:59:49 +0100 Subject: [PATCH 120/287] async: remove 6 years since the last upstream commit. Lockfile is too old for fetchCargoVendor. --- pkgs/by-name/as/async/package.nix | 33 ------------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 pkgs/by-name/as/async/package.nix diff --git a/pkgs/by-name/as/async/package.nix b/pkgs/by-name/as/async/package.nix deleted file mode 100644 index 8cd52c38cb5b..000000000000 --- a/pkgs/by-name/as/async/package.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, -}: - -rustPlatform.buildRustPackage rec { - pname = "async"; - version = "0.1.1"; - - src = fetchFromGitHub { - owner = "ctbur"; - repo = pname; - rev = "v${version}"; - sha256 = "19ypflbayi5l0mb8yw7w0a4bq9a3w8nl9jsxapp9m3xggzmsvrxx"; - }; - - cargoHash = "sha256-jIL7ZFzRMQuGLmMatGegkYRYctlsl3RRUfChgaIhWHg="; - - meta = with lib; { - description = "Tool to parallelize shell commands"; - mainProgram = "async"; - longDescription = '' - `async` is a tool to run shell commands in parallel and is designed to be - able to quickly parallelize shell scripts with minimal changes. It was - inspired by GNU Parallel, with the main difference being that async - retains state between commands by running a server in the background. - ''; - homepage = "https://github.com/ctbur/async"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ minijackson ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 44efc2218587..753f59f8a54c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -122,6 +122,7 @@ mapAliases { aria = aria2; # Added 2024-03-26 armcord = throw "ArmCord was renamed to legcord by the upstream developers. Action is required to migrate configurations between the two applications. Please see this PR for more details: https://github.com/NixOS/nixpkgs/pull/347971"; # Added 2024-10-11 aseprite-unfree = aseprite; # Added 2023-08-26 + async = throw "'async' has been removed due to lack of upstream maintenance"; # Added 2025-01-26 atlassian-bamboo = throw "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements"; # Added 2024-11-02 atlassian-confluence = throw "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements"; # Added 2024-11-02 atlassian-crowd = throw "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements"; # Added 2024-11-02 From edb5006db95e7dcac2491a753e5e061053a9f4d5 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 17:01:11 +0100 Subject: [PATCH 121/287] jetbrains: useFetchCargoVendor Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- pkgs/applications/editors/jetbrains/source/build.nix | 1 + pkgs/applications/editors/jetbrains/source/ides.json | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/source/build.nix b/pkgs/applications/editors/jetbrains/source/build.nix index ad44e4ab435f..a366b12a4a26 100644 --- a/pkgs/applications/editors/jetbrains/source/build.nix +++ b/pkgs/applications/editors/jetbrains/source/build.nix @@ -126,6 +126,7 @@ let version = buildNumber; inherit src; sourceRoot = "${src.name}/native/restarter"; + useFetchCargoVendor = true; cargoHash = restarterHash; # Allow static linking diff --git a/pkgs/applications/editors/jetbrains/source/ides.json b/pkgs/applications/editors/jetbrains/source/ides.json index 7968c4806a9f..076f701dd4a2 100644 --- a/pkgs/applications/editors/jetbrains/source/ides.json +++ b/pkgs/applications/editors/jetbrains/source/ides.json @@ -6,7 +6,7 @@ "ideaHash": "sha256-QKFUg6C+ZVgPrgd6jwWSkBVMHAF30ja0Uqezy9syo5k=", "androidHash": "sha256-2ZLTh3mwrIWOqn1UHqAVibG5JvfvxinqDna/EGxd0Ds=", "jpsHash": "sha256-p3AEHULhVECIicyhCYNkxeQoMAorrbvoIj7jcqxYD2s=", - "restarterHash": "sha256-rkx8DOaIxG0H2jz4sFsPzhcNyzN51HTI3hPEsp8yUY4=", + "restarterHash": "sha256-acCmC58URd6p9uKZrm0qWgdZkqu9yqCs23v8qgxV2Ag=", "mvnDeps": "idea_maven_artefacts.json" }, "pycharm-community": { @@ -16,7 +16,7 @@ "ideaHash": "sha256-QKFUg6C+ZVgPrgd6jwWSkBVMHAF30ja0Uqezy9syo5k=", "androidHash": "sha256-2ZLTh3mwrIWOqn1UHqAVibG5JvfvxinqDna/EGxd0Ds=", "jpsHash": "sha256-p3AEHULhVECIicyhCYNkxeQoMAorrbvoIj7jcqxYD2s=", - "restarterHash": "sha256-B0eReRKfA9W7uwVHuY+3zZEAD5d+cOQpcbBLxn8AVYw=", + "restarterHash": "sha256-acCmC58URd6p9uKZrm0qWgdZkqu9yqCs23v8qgxV2Ag=", "mvnDeps": "pycharm_maven_artefacts.json" } } From 1217130d9958eecbd46c542d3ab33ad4140611cb Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 24 Jan 2025 02:14:40 +0100 Subject: [PATCH 122/287] upbound: correct versionCheckHook use --- pkgs/by-name/up/upbound/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/up/upbound/package.nix b/pkgs/by-name/up/upbound/package.nix index 0315f9600493..51046a403ff2 100644 --- a/pkgs/by-name/up/upbound/package.nix +++ b/pkgs/by-name/up/upbound/package.nix @@ -50,6 +50,10 @@ stdenvNoCC.mkDerivation { installShellCompletion --bash --name up <(echo complete -C up up) ''; + # FIXME: error when running `env -i up`: + # "up: error: $HOME is not defined" + doInstallCheck = false; + versionCheckProgram = "${placeholder "out"}/bin/up"; versionCheckProgramArg = "version"; nativeInstallCheckInputs = [ @@ -63,10 +67,6 @@ stdenvNoCC.mkDerivation { "${version-channel}" ]; - passthru.tests = { - versionCheck = versionCheckHook; - }; - meta = { description = "CLI for interacting with Upbound Cloud, Upbound Enterprise, and Universal Crossplane (UXP)"; homepage = "https://upbound.io"; From d71e753dbb58e8bdf99d7e4a4b8e4367dd82da91 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 24 Jan 2025 02:15:10 +0100 Subject: [PATCH 123/287] astroterm: correct versionCheckHook use --- pkgs/by-name/as/astroterm/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/as/astroterm/package.nix b/pkgs/by-name/as/astroterm/package.nix index 9ed753ef05eb..3cdde4b2e995 100644 --- a/pkgs/by-name/as/astroterm/package.nix +++ b/pkgs/by-name/as/astroterm/package.nix @@ -31,13 +31,17 @@ stdenv.mkDerivation (finalAttrs: { meson ninja xxd - versionCheckHook ]; buildInputs = [ argtable ncurses ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + postPatch = '' mkdir -p data ln -s ${finalAttrs.bsc5File} data/bsc5 From 4762d9ba6e8c623932dbecad224351bf8d092ea7 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 25 Sep 2024 00:25:46 +0200 Subject: [PATCH 124/287] doc: emphasize trade-off between versionCheckHook and testers.testVersion --- doc/build-helpers/testers.chapter.md | 2 +- doc/hooks/versionCheckHook.section.md | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/build-helpers/testers.chapter.md b/doc/build-helpers/testers.chapter.md index 5c1b704655cf..ad1aa0fc8294 100644 --- a/doc/build-helpers/testers.chapter.md +++ b/doc/build-helpers/testers.chapter.md @@ -169,7 +169,7 @@ The build will fail if `shellcheck` finds any issues. Checks that the output from running a command contains the specified version string in it as a whole word. -NOTE: In most cases, [`versionCheckHook`](#versioncheckhook) should be preferred, but this function is provided and documented here anyway. The motivation for adding either tests would be: +NOTE: This is a check you add to `passthru.tests` which is mainly run by OfBorg, but not in Hydra. If you want a version check failure to block the build altogether, then [`versionCheckHook`](#versioncheckhook) is the tool you're looking for (and recommended for quick builds). The motivation for adding either of these checks would be: - Catch dynamic linking errors and such and missing environment variables that should be added by wrapping. - Probable protection against accidentally building the wrong version, for example when using an "old" hash in a fixed-output derivation. diff --git a/doc/hooks/versionCheckHook.section.md b/doc/hooks/versionCheckHook.section.md index 55b9fa916c40..6bb29fadcdae 100644 --- a/doc/hooks/versionCheckHook.section.md +++ b/doc/hooks/versionCheckHook.section.md @@ -1,6 +1,8 @@ # versionCheckHook {#versioncheckhook} -This hook adds a `versionCheckPhase` to the [`preInstallCheckHooks`](#ssec-installCheck-phase) that runs the main program of the derivation with a `--help` or `--version` argument, and checks that the `${version}` string is found in that output. You use it like this: +This hook adds a `versionCheckPhase` to the [`preInstallCheckHooks`](#ssec-installCheck-phase) that runs the main program of the derivation with a `--help` or `--version` argument, and checks that the `${version}` string is found in that output. If this check fails then the whole build will fail. _(A softer option is [`testers.testVersion`](#tester-testVersion).)_ + +You use it like this: ```nix { @@ -33,3 +35,5 @@ The variables that this phase control are: - `versionCheckProgramArg`: The argument that needs to be passed to `versionCheckProgram`. If undefined the hook tries first `--help` and then `--version`. Examples: `version`, `-V`, `-v`. - `preVersionCheck`: A hook to run before the check is done. - `postVersionCheck`: A hook to run after the check is done. + +This check assumes the executable is _hermetic_. If environment variables such as `PATH` or `HOME` are required for the program to function, then [`testers.testVersion`](#tester-testVersion) is currently the better alternative. From fe24b14a04bb2872408de3a1ca572e962c6a891b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 16:26:56 +0000 Subject: [PATCH 125/287] tuifimanager: 5.0.9 -> 5.1.5 --- pkgs/by-name/tu/tuifimanager/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tu/tuifimanager/package.nix b/pkgs/by-name/tu/tuifimanager/package.nix index 3f48912d6056..b87133ca8d83 100644 --- a/pkgs/by-name/tu/tuifimanager/package.nix +++ b/pkgs/by-name/tu/tuifimanager/package.nix @@ -21,7 +21,7 @@ lib.throwIf (enableDragAndDrop && !hasDndSupport) python3.pkgs.buildPythonApplication rec { pname = "tuifimanager"; - version = "5.0.9"; + version = "5.1.5"; pyproject = true; @@ -29,7 +29,7 @@ lib.throwIf (enableDragAndDrop && !hasDndSupport) owner = "GiorgosXou"; repo = "TUIFIManager"; tag = "v.${version}"; - hash = "sha256-15PXua3kLf3Mpgft2msFBn+fS2bzfTAIC9bmOkNKqlU="; + hash = "sha256-5ShrmjEFKGdmaGBFjMnIfcM6p8AZd13uIEFwDVAkU/8="; }; build-system = with python3.pkgs; [ From cf8c83b562dc1b903fe4b92c8f889ad59706f974 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 16:32:28 +0000 Subject: [PATCH 126/287] tigerbeetle: 0.16.21 -> 0.16.23 --- pkgs/by-name/ti/tigerbeetle/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ti/tigerbeetle/package.nix b/pkgs/by-name/ti/tigerbeetle/package.nix index cddf3b416719..c1539bf84d3b 100644 --- a/pkgs/by-name/ti/tigerbeetle/package.nix +++ b/pkgs/by-name/ti/tigerbeetle/package.nix @@ -10,14 +10,14 @@ let platform = if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system; hash = builtins.getAttr platform { - "universal-macos" = "sha256-blzpEQf9+vTg5gAelssD7Sje+8Rt2Ugvgxdxt+ehAKw="; - "x86_64-linux" = "sha256-329wngZhFgR775/uuAmU5RMNkEXHwsG5f8QNm5UFZ9c="; - "aarch64-linux" = "sha256-9Q1f1GRQMdoTfLsQA0D6k4VCFl8AfYy9UJjokwJimk8="; + "universal-macos" = "sha256-YQyC1AYL1pXvH6PwWUWpyRCC3yr4kYemhXFy1ag1zHE="; + "x86_64-linux" = "sha256-61ZexEleFyrtgGOtBA1lFsPBtRZO3vpnLTMdJIU/BAk="; + "aarch64-linux" = "sha256-x/xWe1ePttTGmbikNpGOysbEumEO3T+2+35yRb/mKR8="; }; in stdenvNoCC.mkDerivation (finalAttrs: { pname = "tigerbeetle"; - version = "0.16.21"; + version = "0.16.23"; src = fetchzip { url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip"; From 8d2a943951d004c5f460a576ed679963151a434e Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 26 Jan 2025 17:40:24 +0100 Subject: [PATCH 127/287] daggerfall-unity: Link shortcut executable to main program Makes it less likely to break if ever the program name changes. --- pkgs/by-name/da/daggerfall-unity/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/da/daggerfall-unity/package.nix b/pkgs/by-name/da/daggerfall-unity/package.nix index 62a47919a000..941564f63728 100644 --- a/pkgs/by-name/da/daggerfall-unity/package.nix +++ b/pkgs/by-name/da/daggerfall-unity/package.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { desktopName = "Daggerfall Unity"; comment = finalAttrs.meta.description; icon = "UnityPlayer"; - exec = "DaggerfallUnity.x86_64"; + exec = finalAttrs.meta.mainProgram; categories = [ "Game" ]; }) ]; From 0c3dc743efd9b4f3a5cb06dd6eddf794ae9b2621 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 26 Jan 2025 17:42:25 +0100 Subject: [PATCH 128/287] daggerfall-unity: Create symlink to executable in bin directory Resolves #376877. --- pkgs/by-name/da/daggerfall-unity/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/da/daggerfall-unity/package.nix b/pkgs/by-name/da/daggerfall-unity/package.nix index 941564f63728..10364fcce94c 100644 --- a/pkgs/by-name/da/daggerfall-unity/package.nix +++ b/pkgs/by-name/da/daggerfall-unity/package.nix @@ -73,8 +73,9 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir --parents "$out/share/doc/" + mkdir --parents "$out/bin" "$out/share/doc" cp --recursive * "$out" + ln --symbolic "../${finalAttrs.meta.mainProgram}" "$out/bin/" ${lib.strings.concatMapStringsSep "\n" (file: '' cp "${file}" "$out/share/doc/${file.name}" From 3c4a42f4e76899fb35b8e0af7e4e02c741d8f11f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 17:01:10 +0000 Subject: [PATCH 129/287] rbspy: 0.28.0 -> 0.29.0 --- pkgs/development/tools/rbspy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rbspy/default.nix b/pkgs/development/tools/rbspy/default.nix index 4a61021a00ca..b27c65b2fd17 100644 --- a/pkgs/development/tools/rbspy/default.nix +++ b/pkgs/development/tools/rbspy/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "rbspy"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "rbspy"; repo = "rbspy"; tag = "v${version}"; - hash = "sha256-6tCTrplzoiimKvXEIXd2gUOXzcZ/eQ22npBqbVv0Nv0="; + hash = "sha256-KEF98h51F4sZ/eX08hggabnBji/8e/yJTP1VNzuLOlw="; }; - cargoHash = "sha256-J+3v7O38+MhCoq1UKf0Sqaomw/SSu+JK3sWWv9rB6FI="; + cargoHash = "sha256-qC/D3Nt+dEH6gDEHaOCc5Gt8Qe2nWG5fGq81y188bYY="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' From 82ffb11a67fbf00176cbba1ff4e76cec0d9369c0 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Thu, 16 Jan 2025 23:38:22 -0500 Subject: [PATCH 130/287] python3Packages.pypdfium2: init at 4.30.1 --- .../python-modules/pypdfium2/default.nix | 123 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 125 insertions(+) create mode 100644 pkgs/development/python-modules/pypdfium2/default.nix diff --git a/pkgs/development/python-modules/pypdfium2/default.nix b/pkgs/development/python-modules/pypdfium2/default.nix new file mode 100644 index 000000000000..1d1e9a0769b4 --- /dev/null +++ b/pkgs/development/python-modules/pypdfium2/default.nix @@ -0,0 +1,123 @@ +{ + lib, + pkgs, + buildPythonPackage, + fetchFromGitHub, + fetchurl, + setuptools-scm, + pdfium-binaries, + numpy, + pillow, + pytestCheckHook, + python, +}: + +let + pdfiumVersion = "${pdfium-binaries.version}"; + + headers = fetchurl { + url = "https://pdfium.googlesource.com/pdfium/+archive/refs/heads/chromium/${pdfiumVersion}/public.tar.gz"; + hash = "sha256-vKfs4Jd8LEtA3aTI+DcJMS0VOErq1IR1eThnMlxiER0="; + }; + + # They demand their own fork of ctypesgen + ctypesgen = buildPythonPackage rec { + pname = "ctypesgen"; + version = "1.1.1+g${src.rev}"; # the most recent tag + git version + pyproject = true; + + src = fetchFromGitHub { + owner = "pypdfium2-team"; + repo = "ctypesgen"; + rev = "848e9fbb1374f7f58a7ebf5e5da5c33292480b30"; + hash = "sha256-3JA7cW/xaEj/DxMHEypROwrKGo7EwUEcipRqALTvydw="; + }; + + build-system = [ + setuptools-scm + ]; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = "${version}"; + }; + +in +buildPythonPackage rec { + pname = "pypdfium2"; + version = "4.30.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pypdfium2-team"; + repo = "pypdfium2"; + tag = version; + hash = "sha256-v8f/XruGJYK3H9z4Q1rLg4fEnPHa8tTOlNTBMVxPEgA="; + }; + + build-system = [ + ctypesgen + setuptools-scm + ]; + + propagatedBuildInputs = [ + pdfium-binaries + ]; + + # Build system insists on fetching from the internet unless "cached" files + # are prepared. Even then, some code patching needs to happen to make it not + # talk to the internet. + + # The project doesn't seem very open to allow for offline building either, + # see: https://github.com/pypdfium2-team/pypdfium2/discussions/274 + preBuild = + let + pdfiumLib = lib.makeLibraryPath [ pdfium-binaries ]; + inputVersionFile = (pkgs.formats.json { }).generate "version.json" { + version = lib.strings.toInt pdfiumVersion; + source = "generated"; + flags = [ ]; + run_lds = [ pdfiumLib ]; + guard_symbols = false; + }; + bindingsDir = "data/bindings"; + headersDir = "${bindingsDir}/headers"; + versionFile = "${bindingsDir}/version.json"; + in + '' + # Preseed the headers and version file + mkdir -p ${headersDir} + tar -xf ${headers} -C ${headersDir} + install -m 644 ${inputVersionFile} ${versionFile} + + # Make generated bindings consider pdfium derivation path when loading dynamic libraries + substituteInPlace setupsrc/pypdfium2_setup/emplace.py \ + --replace-fail 'build_pdfium_bindings(pdfium_ver, flags=flags, guard_symbols=True, run_lds=[])' \ + 'build_pdfium_bindings(pdfium_ver, flags=flags, guard_symbols=True, run_lds=["${pdfiumLib}"])' + + # Short circuit the version pull from the internet + substituteInPlace setupsrc/pypdfium2_setup/packaging_base.py \ + --replace-fail 'PdfiumVer.to_full(build)._asdict()' \ + '{"major": 133, "minor": 0, "build": ${pdfiumVersion}, "patch": 1}' + ''; + env.PDFIUM_PLATFORM = "system:${pdfiumVersion}"; + + nativeCheckInputs = [ + numpy + pillow + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pypdfium2" + ]; + + meta = { + changelog = "https://github.com/pypdfium2-team/pypdfium2/releases/tag/${version}"; + description = "Python bindings to PDFium"; + homepage = "https://pypdfium2.readthedocs.io/"; + license = with lib.licenses; [ + asl20 # or + mit + ]; + maintainers = with lib.maintainers; [ booxter ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ff3cd8bb7b51..9d9eb529a77c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12363,6 +12363,8 @@ self: super: with self; { pypdf3 = callPackage ../development/python-modules/pypdf3 { }; + pypdfium2 = callPackage ../development/python-modules/pypdfium2 { }; + pypeg2 = callPackage ../development/python-modules/pypeg2 { }; pyperclip = callPackage ../development/python-modules/pyperclip { }; From ac0247e7199c1a35083bf256261d595256c6459d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 26 Jan 2025 17:37:52 +0100 Subject: [PATCH 131/287] bacon: 3.8.0 -> 3.9.0 Diff: https://github.com/Canop/bacon/compare/refs/tags/v3.8.0...v3.9.0 Changelog: https://github.com/Canop/bacon/blob/v3.9.0/CHANGELOG.md --- pkgs/by-name/ba/bacon/package.nix | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ba/bacon/package.nix b/pkgs/by-name/ba/bacon/package.nix index 1498df4f09bd..0e4b02fb8e06 100644 --- a/pkgs/by-name/ba/bacon/package.nix +++ b/pkgs/by-name/ba/bacon/package.nix @@ -1,23 +1,39 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, + pkg-config, + alsa-lib, versionCheckHook, nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "bacon"; - version = "3.8.0"; + version = "3.9.0"; src = fetchFromGitHub { owner = "Canop"; repo = "bacon"; tag = "v${version}"; - hash = "sha256-IWjG1esLwiEnESmnDE5kpuMu+LFaNrIomgrZoktkA2Q="; + hash = "sha256-LnJlE4ostOl+pr+d7ZsAfKvG4C45qt4pedWpeiTchPU="; }; - cargoHash = "sha256-IQ8vTr5Z17ylcOCQ+iqKP6+tawZXd+pMiYoSH5h7Zjg="; + cargoHash = "sha256-KS1SXrRqjvRom2zZOaaZZOMK2CRUwVmtXC2ilDfaEG0="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = + lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # bindgenHook is only included on darwin as it is needed to build `coreaudio-sys`, a darwin-specific crate + rustPlatform.bindgenHook + ]; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = [ "--version" ]; From ca228f3532a62bdff22dcb921f771bfda90883d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Dec 2024 00:08:55 +0000 Subject: [PATCH 132/287] pico-sdk: 2.0.0 -> 2.1.0 --- pkgs/by-name/pi/pico-sdk/package.nix | 31 +++++++++++++++++++--------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/pi/pico-sdk/package.nix b/pkgs/by-name/pi/pico-sdk/package.nix index 28a1f2ba6d43..109f11ea04bf 100644 --- a/pkgs/by-name/pi/pico-sdk/package.nix +++ b/pkgs/by-name/pi/pico-sdk/package.nix @@ -3,6 +3,9 @@ stdenv, fetchFromGitHub, cmake, + versionCheckHook, + nix-update-script, + pico-sdk, # Options @@ -14,18 +17,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "pico-sdk"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "pico-sdk"; - rev = finalAttrs.version; + tag = finalAttrs.version; fetchSubmodules = withSubmodules; hash = - if (withSubmodules) then - "sha256-fVSpBVmjeP5pwkSPhhSCfBaEr/FEtA82mQOe/cHFh0A=" + if withSubmodules then + "sha256-nLn6H/P79Jbk3/TIowH2WqmHFCXKEy7lgs7ZqhqJwDM=" else - "sha256-d6mEjuG8S5jvJS4g8e90gFII3sEqUVlT2fgd9M9LUkA="; + "sha256-QKc16Wnx2AvpM0/bklY8CnbsShVR1r5ejtRlvE8f8mM="; }; nativeBuildInputs = [ cmake ]; @@ -42,11 +45,19 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { - homepage = "https://github.com/raspberrypi/pico-sdk"; + passthru = { + updateScript = nix-update-script { }; + tests = { + withSubmodules = pico-sdk.override { withSubmodules = true; }; + }; + }; + + meta = { description = "SDK provides the headers, libraries and build system necessary to write programs for the RP2040-based devices"; - license = licenses.bsd3; - maintainers = with maintainers; [ muscaln ]; - platforms = platforms.unix; + homepage = "https://github.com/raspberrypi/pico-sdk"; + changelog = "https://github.com/raspberrypi/pico-sdk/releases/tag/${finalAttrs.version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ muscaln ]; + platforms = lib.platforms.unix; }; }) From 8b1b464a82465ea7a2f1c2c8e2c50249d6606ce9 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 5 Jan 2025 01:44:18 +0100 Subject: [PATCH 133/287] picotool: 2.0.0 -> 2.1.0 --- pkgs/by-name/pi/picotool/package.nix | 39 ++++++++++++++++++---------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/pi/picotool/package.nix b/pkgs/by-name/pi/picotool/package.nix index 54a8b4f8e6d9..76460c9d24e5 100644 --- a/pkgs/by-name/pi/picotool/package.nix +++ b/pkgs/by-name/pi/picotool/package.nix @@ -7,17 +7,19 @@ libusb1, pico-sdk, mbedtls_2, + versionCheckHook, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "picotool"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "raspberrypi"; - repo = pname; - rev = version; - sha256 = "sha256-z7EFk3qxg1PoKZQpUQqjhttZ2RkhhhiMdYc9TkXzkwk="; + repo = "picotool"; + tag = finalAttrs.version; + hash = "sha256-aGhh19/dl6o/3hbmKJGVh22qSHeCqxST2PoWzxmc7KQ="; }; postPatch = '' @@ -42,12 +44,23 @@ stdenv.mkDerivation rec { install -Dm444 ../udev/99-picotool.rules -t $out/etc/udev/rules.d ''; - meta = with lib; { - homepage = "https://github.com/raspberrypi/picotool"; - description = "Tool for interacting with RP2040/RP2350 device(s) in BOOTSEL mode, or with an RP2040/RP2350 binary"; - mainProgram = "picotool"; - license = licenses.bsd3; - maintainers = with maintainers; [ muscaln ]; - platforms = platforms.unix; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "version" ]; + doInstallCheck = true; + + passthru = { + updateScript = gitUpdater { }; }; -} + + meta = { + description = "Tool for interacting with RP2040/RP2350 device(s) in BOOTSEL mode, or with an RP2040/RP2350 binary"; + homepage = "https://github.com/raspberrypi/picotool"; + changelog = "https://github.com/raspberrypi/picotool/releases/tag/${finalAttrs.version}"; + mainProgram = "picotool"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ muscaln ]; + platforms = lib.platforms.unix; + }; +}) From 61f069fd825eb9c2e45da2477cbcc9e2eb52c67a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 26 Jan 2025 18:47:20 +0100 Subject: [PATCH 134/287] nvitop: 1.4.1 -> 1.4.2 Diff: https://github.com/XuehaiPan/nvitop/compare/refs/tags/v1.4.1...v1.4.2 Changelog: https://github.com/XuehaiPan/nvitop/releases/tag/v1.4.2 --- pkgs/by-name/nv/nvitop/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/nv/nvitop/package.nix b/pkgs/by-name/nv/nvitop/package.nix index cce03aca75c7..899f84b019a3 100644 --- a/pkgs/by-name/nv/nvitop/package.nix +++ b/pkgs/by-name/nv/nvitop/package.nix @@ -7,21 +7,19 @@ python3Packages.buildPythonApplication rec { pname = "nvitop"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "XuehaiPan"; repo = "nvitop"; tag = "v${version}"; - hash = "sha256-H5WfSGQpShmJGffGMIejs0A9ksht43I1d3BvXbvP6vI="; + hash = "sha256-2l/VfqgV2UmMVad3UYASjYFu/Mzp2K2XNQFUDq1XM9k="; }; pythonRelaxDeps = [ "nvidia-ml-py" ]; dependencies = with python3Packages; [ - cachetools psutil - termcolor nvidia-ml-py ]; From 8114a813dc6ecf46a2ff3a4308e99d82cb34fcd4 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sat, 25 Jan 2025 21:56:35 -0500 Subject: [PATCH 135/287] python311Packages.jax: fix build on Darwin Another test case fails with the same generic error: nanobind::detail::nb_func_error_except(): exception could not be translated! --- pkgs/development/python-modules/jax/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index 7c83e9be3a12..c649bf57f04f 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -95,6 +95,8 @@ buildPythonPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # SystemError: nanobind::detail::nb_func_error_except(): exception could not be translated! + # reported at: https://github.com/jax-ml/jax/issues/26106 + "--deselect tests/pjit_test.py::PJitErrorTest::testAxisResourcesMismatch" "--deselect tests/shape_poly_test.py::ShapePolyTest" "--deselect tests/tree_util_test.py::TreeTest" ]; @@ -150,6 +152,7 @@ buildPythonPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # SystemError: nanobind::detail::nb_func_error_except(): exception could not be translated! + # reported at: https://github.com/jax-ml/jax/issues/26106 "testInAxesPyTreePrefixMismatchError" "testInAxesPyTreePrefixMismatchErrorKwargs" "testOutAxesPyTreePrefixMismatchError" From 51ec829b3f9cb0fea062ab9fa036a0da0587d1d6 Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Sun, 26 Jan 2025 23:20:31 +0530 Subject: [PATCH 136/287] maintainers: add abhisheksingh0x558 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 984e63fd1115..fcc8363179a2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -450,6 +450,12 @@ githubId = 12799326; name = "Abhinav Sharma"; }; + abhisheksingh0x558 = { + github = "abhisheksingh0x558"; + name = "Abhishek Singh"; + email = "abhisheksingh0x558@proton.me"; + githubId = 92366747; + }; abigailbuccaneer = { email = "abigailbuccaneer@gmail.com"; github = "AbigailBuccaneer"; From 51d8894fbc3dffe5f3e271f72a25a9c64a32c922 Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Sun, 26 Jan 2025 21:32:02 +0530 Subject: [PATCH 137/287] emacsPackages.elpaca: init at 0-unstable-2025-01-25 --- .../emacs/elisp-packages/manual-packages.nix | 2 ++ .../manual-packages/elpaca/default.nix | 30 +++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/editors/emacs/elisp-packages/manual-packages/elpaca/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index ecb597cfc973..c50981930182 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -15,6 +15,8 @@ lib.packagesFromDirectoryRecursive { inherit (pkgs) codeium; }; + elpaca = callPackage ./manual-packages/elpaca { inherit (pkgs) git; }; + lsp-bridge = callPackage ./manual-packages/lsp-bridge { inherit (pkgs) basedpyright diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elpaca/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elpaca/default.nix new file mode 100644 index 000000000000..caf2d4a2c8bc --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elpaca/default.nix @@ -0,0 +1,30 @@ +{ + melpaBuild, + fetchFromGitHub, + git, + unstableGitUpdater, + lib, +}: + +melpaBuild { + pname = "elpaca"; + version = "0-unstable-2025-01-25"; + + src = fetchFromGitHub { + owner = "progfolio"; + repo = "elpaca"; + rev = "db2fd7258ff69fe2d100888cb8d92cf3bf94d465"; + hash = "sha256-SseY0iU3D3cloKZy6xPp8QT0H1Cu2uGiiVG6rXq/UHg="; + }; + + nativeBuildInputs = [ git ]; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + homepage = "https://github.com/progfolio/elpaca"; + description = "Elisp package manager"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ abhisheksingh0x558 ]; + }; +} From 823795db2aaa3e81c83c1284dedf701c5ce9cb39 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 18:35:16 +0000 Subject: [PATCH 138/287] python312Packages.aiosomecomfort: 0.0.28 -> 0.0.30 --- pkgs/development/python-modules/aiosomecomfort/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiosomecomfort/default.nix b/pkgs/development/python-modules/aiosomecomfort/default.nix index 2067bcc937ff..32bb612d8c8b 100644 --- a/pkgs/development/python-modules/aiosomecomfort/default.nix +++ b/pkgs/development/python-modules/aiosomecomfort/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "aiosomecomfort"; - version = "0.0.28"; + version = "0.0.30"; pyproject = true; src = fetchFromGitHub { owner = "mkmer"; repo = "AIOSomecomfort"; tag = version; - hash = "sha256-AsYq5ElfHtUoEEI5TMIs0wf5yMK1ZKCteWYfTon+Wik="; + hash = "sha256-1hKJG1F0tLHVvgaI3m82/11KUmm99zwn26z9G279Cig="; }; build-system = [ From a47cb26bbe26d63321cbb96de6d1981d790d9748 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 15:22:37 +0100 Subject: [PATCH 139/287] matrix-hookshot: useFetchCargoVendor Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- pkgs/by-name/ma/matrix-hookshot/package.nix | 2 +- pkgs/by-name/ma/matrix-hookshot/pin.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/matrix-hookshot/package.nix b/pkgs/by-name/ma/matrix-hookshot/package.nix index 2c6dc3de7736..ccb7b7fa6117 100644 --- a/pkgs/by-name/ma/matrix-hookshot/package.nix +++ b/pkgs/by-name/ma/matrix-hookshot/package.nix @@ -37,7 +37,7 @@ mkYarnPackage rec { sha256 = data.yarnHash; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; hash = data.cargoHash; diff --git a/pkgs/by-name/ma/matrix-hookshot/pin.json b/pkgs/by-name/ma/matrix-hookshot/pin.json index e0aed65ff3d4..f8b9080620b4 100644 --- a/pkgs/by-name/ma/matrix-hookshot/pin.json +++ b/pkgs/by-name/ma/matrix-hookshot/pin.json @@ -2,5 +2,5 @@ "version": "6.0.2", "srcHash": "sha256-uqbKpmqiy0rU8ByMRUqyjGmEdZgAhYiMrh0VEwwcbK8=", "yarnHash": "0sjc333cl115pm3w69aknf20n85r8nisrdjx1231101zrz01nhhh", - "cargoHash": "sha256-UlPT/ko9d4bUvv3kutNPEISXEbKtegWo2OVKEmUlKrg=" + "cargoHash": "sha256-4Ix5eqv3BMoTzfadayJqXICW+zZzSp2e6XJQrWraW60==" } From 919ece9608bbeea5aedf552eaed3264750a8038c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 17:40:30 +0100 Subject: [PATCH 140/287] rustfilt: remove 2 years since the last upstream commit. Current lockfile is too old for fetchCargoVendor, although the latest upstream commit would be. --- pkgs/by-name/ru/rustfilt/package.nix | 27 --------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 pkgs/by-name/ru/rustfilt/package.nix diff --git a/pkgs/by-name/ru/rustfilt/package.nix b/pkgs/by-name/ru/rustfilt/package.nix deleted file mode 100644 index 351cfa9af57d..000000000000 --- a/pkgs/by-name/ru/rustfilt/package.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, -}: - -rustPlatform.buildRustPackage rec { - pname = "rustfilt"; - version = "0.2.1"; - - src = fetchFromGitHub { - owner = "luser"; - repo = pname; - rev = version; - hash = "sha256-zb1tkeWmeMq7aM8hWssS/UpvGzGbfsaVYCOKBnAKwiQ="; - }; - - cargoHash = "sha256-rs2EWcvTxLVeJ0t+jLM75s+K72t+hqKzwy3oAdCZ8BE="; - - meta = with lib; { - description = "Demangle Rust symbol names using rustc-demangle"; - homepage = "https://github.com/luser/rustfilt"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ wykurz ]; - mainProgram = "rustfilt"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2cedda3561d1..ff1f8a46b059 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1214,6 +1214,7 @@ mapAliases { runCommandNoCC = runCommand; runCommandNoCCLocal = runCommandLocal; rustc-wasm32 = rustc; # Added 2023-12-01 + rustfilt = throw "'rustfilt' has been removed due to lack of upstream maintenance"; # Added 2025-01-26 rustic-rs = rustic; # Added 2024-08-02 rxvt_unicode = throw "'rxvt_unicode' has been renamed to/replaced by 'rxvt-unicode-unwrapped'"; # Converted to throw 2024-10-17 rxvt_unicode-with-plugins = throw "'rxvt_unicode-with-plugins' has been renamed to/replaced by 'rxvt-unicode'"; # Converted to throw 2024-10-17 From de2554ad4302450dc5d1544b067dcea828e2c8a2 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 26 Jan 2025 19:56:06 +0100 Subject: [PATCH 141/287] phpPackages.psalm: 5.26.1 -> 6.0.0 --- .../php-packages/psalm/composer.lock | 517 +++++++++++++++--- .../php-packages/psalm/default.nix | 6 +- 2 files changed, 430 insertions(+), 93 deletions(-) diff --git a/pkgs/development/php-packages/psalm/composer.lock b/pkgs/development/php-packages/psalm/composer.lock index b9b0f6890ab2..3c82c2d07ce3 100644 --- a/pkgs/development/php-packages/psalm/composer.lock +++ b/pkgs/development/php-packages/psalm/composer.lock @@ -4,47 +4,40 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "dffbc805a242803aefef6b513be4e6ec", + "content-hash": "c2d510ce4d220ccd4ce9b74416072cf2", "packages": [ { "name": "amphp/amp", - "version": "v2.6.4", + "version": "v3.1.0", "source": { "type": "git", "url": "https://github.com/amphp/amp.git", - "reference": "ded3d9be08f526089eb7ee8d9f16a9768f9dec2d" + "reference": "7cf7fef3d667bfe4b2560bc87e67d5387a7bcde9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/amp/zipball/ded3d9be08f526089eb7ee8d9f16a9768f9dec2d", - "reference": "ded3d9be08f526089eb7ee8d9f16a9768f9dec2d", + "url": "https://api.github.com/repos/amphp/amp/zipball/7cf7fef3d667bfe4b2560bc87e67d5387a7bcde9", + "reference": "7cf7fef3d667bfe4b2560bc87e67d5387a7bcde9", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=8.1", + "revolt/event-loop": "^1 || ^0.2" }, "require-dev": { - "amphp/php-cs-fixer-config": "dev-master", - "amphp/phpunit-util": "^1", - "ext-json": "*", - "jetbrains/phpstorm-stubs": "^2019.3", - "phpunit/phpunit": "^7 | ^8 | ^9", - "react/promise": "^2", - "vimeo/psalm": "^3.12" + "amphp/php-cs-fixer-config": "^2", + "phpunit/phpunit": "^9", + "psalm/phar": "5.23.1" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.x-dev" - } - }, "autoload": { "files": [ - "lib/functions.php", - "lib/Internal/functions.php" + "src/functions.php", + "src/Future/functions.php", + "src/Internal/functions.php" ], "psr-4": { - "Amp\\": "lib" + "Amp\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -52,10 +45,6 @@ "MIT" ], "authors": [ - { - "name": "Daniel Lowrey", - "email": "rdlowrey@php.net" - }, { "name": "Aaron Piotrowski", "email": "aaron@trowski.com" @@ -67,6 +56,10 @@ { "name": "Niklas Keller", "email": "me@kelunik.com" + }, + { + "name": "Daniel Lowrey", + "email": "rdlowrey@php.net" } ], "description": "A non-blocking concurrency framework for PHP applications.", @@ -83,9 +76,8 @@ "promise" ], "support": { - "irc": "irc://irc.freenode.org/amphp", "issues": "https://github.com/amphp/amp/issues", - "source": "https://github.com/amphp/amp/tree/v2.6.4" + "source": "https://github.com/amphp/amp/tree/v3.1.0" }, "funding": [ { @@ -93,41 +85,45 @@ "type": "github" } ], - "time": "2024-03-21T18:52:26+00:00" + "time": "2025-01-26T16:07:39+00:00" }, { "name": "amphp/byte-stream", - "version": "v1.8.2", + "version": "v2.1.1", "source": { "type": "git", "url": "https://github.com/amphp/byte-stream.git", - "reference": "4f0e968ba3798a423730f567b1b50d3441c16ddc" + "reference": "daa00f2efdbd71565bf64ffefa89e37542addf93" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/byte-stream/zipball/4f0e968ba3798a423730f567b1b50d3441c16ddc", - "reference": "4f0e968ba3798a423730f567b1b50d3441c16ddc", + "url": "https://api.github.com/repos/amphp/byte-stream/zipball/daa00f2efdbd71565bf64ffefa89e37542addf93", + "reference": "daa00f2efdbd71565bf64ffefa89e37542addf93", "shasum": "" }, "require": { - "amphp/amp": "^2", - "php": ">=7.1" + "amphp/amp": "^3", + "amphp/parser": "^1.1", + "amphp/pipeline": "^1", + "amphp/serialization": "^1", + "amphp/sync": "^2", + "php": ">=8.1", + "revolt/event-loop": "^1 || ^0.2.3" }, "require-dev": { - "amphp/php-cs-fixer-config": "dev-master", - "amphp/phpunit-util": "^1.4", - "friendsofphp/php-cs-fixer": "^2.3", - "jetbrains/phpstorm-stubs": "^2019.3", - "phpunit/phpunit": "^6 || ^7 || ^8", - "psalm/phar": "^3.11.4" + "amphp/php-cs-fixer-config": "^2", + "amphp/phpunit-util": "^3", + "phpunit/phpunit": "^9", + "psalm/phar": "5.22.1" }, "type": "library", "autoload": { "files": [ - "lib/functions.php" + "src/functions.php", + "src/Internal/functions.php" ], "psr-4": { - "Amp\\ByteStream\\": "lib" + "Amp\\ByteStream\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -156,7 +152,7 @@ ], "support": { "issues": "https://github.com/amphp/byte-stream/issues", - "source": "https://github.com/amphp/byte-stream/tree/v1.8.2" + "source": "https://github.com/amphp/byte-stream/tree/v2.1.1" }, "funding": [ { @@ -164,7 +160,269 @@ "type": "github" } ], - "time": "2024-04-13T18:00:56+00:00" + "time": "2024-02-17T04:49:38+00:00" + }, + { + "name": "amphp/parser", + "version": "v1.1.1", + "source": { + "type": "git", + "url": "https://github.com/amphp/parser.git", + "reference": "3cf1f8b32a0171d4b1bed93d25617637a77cded7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/amphp/parser/zipball/3cf1f8b32a0171d4b1bed93d25617637a77cded7", + "reference": "3cf1f8b32a0171d4b1bed93d25617637a77cded7", + "shasum": "" + }, + "require": { + "php": ">=7.4" + }, + "require-dev": { + "amphp/php-cs-fixer-config": "^2", + "phpunit/phpunit": "^9", + "psalm/phar": "^5.4" + }, + "type": "library", + "autoload": { + "psr-4": { + "Amp\\Parser\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Aaron Piotrowski", + "email": "aaron@trowski.com" + }, + { + "name": "Niklas Keller", + "email": "me@kelunik.com" + } + ], + "description": "A generator parser to make streaming parsers simple.", + "homepage": "https://github.com/amphp/parser", + "keywords": [ + "async", + "non-blocking", + "parser", + "stream" + ], + "support": { + "issues": "https://github.com/amphp/parser/issues", + "source": "https://github.com/amphp/parser/tree/v1.1.1" + }, + "funding": [ + { + "url": "https://github.com/amphp", + "type": "github" + } + ], + "time": "2024-03-21T19:16:53+00:00" + }, + { + "name": "amphp/pipeline", + "version": "v1.2.2", + "source": { + "type": "git", + "url": "https://github.com/amphp/pipeline.git", + "reference": "97cbf289f4d8877acfe58dd90ed5a4370a43caa4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/amphp/pipeline/zipball/97cbf289f4d8877acfe58dd90ed5a4370a43caa4", + "reference": "97cbf289f4d8877acfe58dd90ed5a4370a43caa4", + "shasum": "" + }, + "require": { + "amphp/amp": "^3", + "php": ">=8.1", + "revolt/event-loop": "^1" + }, + "require-dev": { + "amphp/php-cs-fixer-config": "^2", + "amphp/phpunit-util": "^3", + "phpunit/phpunit": "^9", + "psalm/phar": "^5.18" + }, + "type": "library", + "autoload": { + "psr-4": { + "Amp\\Pipeline\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Aaron Piotrowski", + "email": "aaron@trowski.com" + }, + { + "name": "Niklas Keller", + "email": "me@kelunik.com" + } + ], + "description": "Asynchronous iterators and operators.", + "homepage": "https://amphp.org/pipeline", + "keywords": [ + "amp", + "amphp", + "async", + "io", + "iterator", + "non-blocking" + ], + "support": { + "issues": "https://github.com/amphp/pipeline/issues", + "source": "https://github.com/amphp/pipeline/tree/v1.2.2" + }, + "funding": [ + { + "url": "https://github.com/amphp", + "type": "github" + } + ], + "time": "2025-01-19T15:42:46+00:00" + }, + { + "name": "amphp/serialization", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/amphp/serialization.git", + "reference": "693e77b2fb0b266c3c7d622317f881de44ae94a1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/amphp/serialization/zipball/693e77b2fb0b266c3c7d622317f881de44ae94a1", + "reference": "693e77b2fb0b266c3c7d622317f881de44ae94a1", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "require-dev": { + "amphp/php-cs-fixer-config": "dev-master", + "phpunit/phpunit": "^9 || ^8 || ^7" + }, + "type": "library", + "autoload": { + "files": [ + "src/functions.php" + ], + "psr-4": { + "Amp\\Serialization\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Aaron Piotrowski", + "email": "aaron@trowski.com" + }, + { + "name": "Niklas Keller", + "email": "me@kelunik.com" + } + ], + "description": "Serialization tools for IPC and data storage in PHP.", + "homepage": "https://github.com/amphp/serialization", + "keywords": [ + "async", + "asynchronous", + "serialization", + "serialize" + ], + "support": { + "issues": "https://github.com/amphp/serialization/issues", + "source": "https://github.com/amphp/serialization/tree/master" + }, + "time": "2020-03-25T21:39:07+00:00" + }, + { + "name": "amphp/sync", + "version": "v2.3.0", + "source": { + "type": "git", + "url": "https://github.com/amphp/sync.git", + "reference": "217097b785130d77cfcc58ff583cf26cd1770bf1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/amphp/sync/zipball/217097b785130d77cfcc58ff583cf26cd1770bf1", + "reference": "217097b785130d77cfcc58ff583cf26cd1770bf1", + "shasum": "" + }, + "require": { + "amphp/amp": "^3", + "amphp/pipeline": "^1", + "amphp/serialization": "^1", + "php": ">=8.1", + "revolt/event-loop": "^1 || ^0.2" + }, + "require-dev": { + "amphp/php-cs-fixer-config": "^2", + "amphp/phpunit-util": "^3", + "phpunit/phpunit": "^9", + "psalm/phar": "5.23" + }, + "type": "library", + "autoload": { + "files": [ + "src/functions.php" + ], + "psr-4": { + "Amp\\Sync\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Aaron Piotrowski", + "email": "aaron@trowski.com" + }, + { + "name": "Niklas Keller", + "email": "me@kelunik.com" + }, + { + "name": "Stephen Coakley", + "email": "me@stephencoakley.com" + } + ], + "description": "Non-blocking synchronization primitives for PHP based on Amp and Revolt.", + "homepage": "https://github.com/amphp/sync", + "keywords": [ + "async", + "asynchronous", + "mutex", + "semaphore", + "synchronization" + ], + "support": { + "issues": "https://github.com/amphp/sync/issues", + "source": "https://github.com/amphp/sync/tree/v2.3.0" + }, + "funding": [ + { + "url": "https://github.com/amphp", + "type": "github" + } + ], + "time": "2024-08-03T19:31:26+00:00" }, { "name": "composer/pcre", @@ -689,25 +947,27 @@ }, { "name": "nikic/php-parser", - "version": "v4.19.4", + "version": "v5.4.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "715f4d25e225bc47b293a8b997fe6ce99bf987d2" + "reference": "447a020a1f875a434d62f2a401f53b82a396e494" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/715f4d25e225bc47b293a8b997fe6ce99bf987d2", - "reference": "715f4d25e225bc47b293a8b997fe6ce99bf987d2", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494", + "reference": "447a020a1f875a434d62f2a401f53b82a396e494", "shasum": "" }, "require": { + "ext-ctype": "*", + "ext-json": "*", "ext-tokenizer": "*", - "php": ">=7.1" + "php": ">=7.4" }, "require-dev": { "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" + "phpunit/phpunit": "^9.0" }, "bin": [ "bin/php-parse" @@ -715,7 +975,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.9-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -739,9 +999,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.4" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0" }, - "time": "2024-09-29T15:01:53+00:00" + "time": "2024-12-30T11:07:19+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -1068,6 +1328,78 @@ }, "time": "2024-09-11T13:17:53+00:00" }, + { + "name": "revolt/event-loop", + "version": "v1.0.6", + "source": { + "type": "git", + "url": "https://github.com/revoltphp/event-loop.git", + "reference": "25de49af7223ba039f64da4ae9a28ec2d10d0254" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/revoltphp/event-loop/zipball/25de49af7223ba039f64da4ae9a28ec2d10d0254", + "reference": "25de49af7223ba039f64da4ae9a28ec2d10d0254", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "ext-json": "*", + "jetbrains/phpstorm-stubs": "^2019.3", + "phpunit/phpunit": "^9", + "psalm/phar": "^5.15" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Revolt\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Aaron Piotrowski", + "email": "aaron@trowski.com" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "ceesjank@gmail.com" + }, + { + "name": "Christian Lück", + "email": "christian@clue.engineering" + }, + { + "name": "Niklas Keller", + "email": "me@kelunik.com" + } + ], + "description": "Rock-solid event loop for concurrent PHP applications.", + "keywords": [ + "async", + "asynchronous", + "concurrency", + "event", + "event-loop", + "non-blocking", + "scheduler" + ], + "support": { + "issues": "https://github.com/revoltphp/event-loop/issues", + "source": "https://github.com/revoltphp/event-loop/tree/v1.0.6" + }, + "time": "2023-11-30T05:34:44+00:00" + }, { "name": "sebastian/diff", "version": "4.0.6", @@ -1978,24 +2310,25 @@ "packages-dev": [ { "name": "amphp/phpunit-util", - "version": "v2.0.1", + "version": "v3.0.0", "source": { "type": "git", "url": "https://github.com/amphp/phpunit-util.git", - "reference": "041128535bf0a269e75bbdf05e67041a247dd2ae" + "reference": "14d1c36ec0c72fe76b301a17af1d52330cc61d0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/phpunit-util/zipball/041128535bf0a269e75bbdf05e67041a247dd2ae", - "reference": "041128535bf0a269e75bbdf05e67041a247dd2ae", + "url": "https://api.github.com/repos/amphp/phpunit-util/zipball/14d1c36ec0c72fe76b301a17af1d52330cc61d0c", + "reference": "14d1c36ec0c72fe76b301a17af1d52330cc61d0c", "shasum": "" }, "require": { - "php": ">=7.1", - "phpunit/phpunit": "^6 | ^7 | ^8 | ^9" + "amphp/amp": "^3", + "php": ">=8.1", + "phpunit/phpunit": "^9", + "revolt/event-loop": "^1 || ^0.2" }, "require-dev": { - "amphp/amp": "^2", "amphp/php-cs-fixer-config": "^2" }, "type": "library", @@ -2022,7 +2355,7 @@ "homepage": "https://amphp.org/phpunit-util", "support": { "issues": "https://github.com/amphp/phpunit-util/issues", - "source": "https://github.com/amphp/phpunit-util/tree/v2.0.1" + "source": "https://github.com/amphp/phpunit-util/tree/v3.0.0" }, "funding": [ { @@ -2030,7 +2363,7 @@ "type": "github" } ], - "time": "2024-09-19T05:52:58+00:00" + "time": "2022-12-18T17:47:31+00:00" }, { "name": "bamarni/composer-bin-plugin", @@ -2334,16 +2667,16 @@ }, { "name": "dg/bypass-finals", - "version": "v1.8.0", + "version": "v1.9.0", "source": { "type": "git", "url": "https://github.com/dg/bypass-finals.git", - "reference": "86b00f0d900c7e15d3341e687e0df89e8c2d4632" + "reference": "920a7da2f3c1422fd83f9ec4df007af53dc4018b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dg/bypass-finals/zipball/86b00f0d900c7e15d3341e687e0df89e8c2d4632", - "reference": "86b00f0d900c7e15d3341e687e0df89e8c2d4632", + "url": "https://api.github.com/repos/dg/bypass-finals/zipball/920a7da2f3c1422fd83f9ec4df007af53dc4018b", + "reference": "920a7da2f3c1422fd83f9ec4df007af53dc4018b", "shasum": "" }, "require": { @@ -2381,9 +2714,9 @@ ], "support": { "issues": "https://github.com/dg/bypass-finals/issues", - "source": "https://github.com/dg/bypass-finals/tree/v1.8.0" + "source": "https://github.com/dg/bypass-finals/tree/v1.9.0" }, - "time": "2024-07-02T22:24:43+00:00" + "time": "2025-01-16T00:46:05+00:00" }, { "name": "doctrine/instantiator", @@ -3384,24 +3717,24 @@ }, { "name": "psalm/plugin-mockery", - "version": "1.1.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/psalm/psalm-plugin-mockery.git", - "reference": "876247d15f91df08240d00dac69c5135b6689283" + "reference": "4967cf80e32ba78d1e5a8f7f5363dfa62b16dfff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/psalm/psalm-plugin-mockery/zipball/876247d15f91df08240d00dac69c5135b6689283", - "reference": "876247d15f91df08240d00dac69c5135b6689283", + "url": "https://api.github.com/repos/psalm/psalm-plugin-mockery/zipball/4967cf80e32ba78d1e5a8f7f5363dfa62b16dfff", + "reference": "4967cf80e32ba78d1e5a8f7f5363dfa62b16dfff", "shasum": "" }, "require": { "composer/package-versions-deprecated": "^1.10", "composer/semver": "^1.4 || ^2.0 || ^3.0", "mockery/mockery": "^1.0", - "php": "~7.4 || ~8.0 || ~8.1 || ~8.2", - "vimeo/psalm": "dev-master || ^5.0@rc || ^5.0" + "php": ">=8.1", + "vimeo/psalm": "dev-master || ^5.0 || ^6" }, "require-dev": { "codeception/codeception": "^4.1.9", @@ -3435,30 +3768,30 @@ "description": "Psalm plugin for Mockery", "support": { "issues": "https://github.com/psalm/psalm-plugin-mockery/issues", - "source": "https://github.com/psalm/psalm-plugin-mockery/tree/1.1.0" + "source": "https://github.com/psalm/psalm-plugin-mockery/tree/1.2.0" }, - "time": "2022-11-25T07:16:18+00:00" + "time": "2025-01-26T11:02:29+00:00" }, { "name": "psalm/plugin-phpunit", - "version": "0.18.4", + "version": "0.19.2", "source": { "type": "git", "url": "https://github.com/psalm/psalm-plugin-phpunit.git", - "reference": "e4ab3096653d9eb6f6d0ea5f4461898d59ae4dbc" + "reference": "7b7a5cde988f83ccdbdf3ebaecd88192e01c5eb1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/psalm/psalm-plugin-phpunit/zipball/e4ab3096653d9eb6f6d0ea5f4461898d59ae4dbc", - "reference": "e4ab3096653d9eb6f6d0ea5f4461898d59ae4dbc", + "url": "https://api.github.com/repos/psalm/psalm-plugin-phpunit/zipball/7b7a5cde988f83ccdbdf3ebaecd88192e01c5eb1", + "reference": "7b7a5cde988f83ccdbdf3ebaecd88192e01c5eb1", "shasum": "" }, "require": { "composer/package-versions-deprecated": "^1.10", "composer/semver": "^1.4 || ^2.0 || ^3.0", "ext-simplexml": "*", - "php": "^7.1 || ^8.0", - "vimeo/psalm": "dev-master || dev-4.x || ^4.7.1 || ^5@beta || ^5.0" + "php": ">=8.1", + "vimeo/psalm": "dev-master || ^6" }, "conflict": { "phpunit/phpunit": "<7.5" @@ -3495,9 +3828,9 @@ "description": "Psalm plugin for PHPUnit", "support": { "issues": "https://github.com/psalm/psalm-plugin-phpunit/issues", - "source": "https://github.com/psalm/psalm-plugin-phpunit/tree/0.18.4" + "source": "https://github.com/psalm/psalm-plugin-phpunit/tree/0.19.2" }, - "time": "2022-12-03T07:47:07+00:00" + "time": "2025-01-26T11:39:17+00:00" }, { "name": "sebastian/cli-parser", @@ -4463,16 +4796,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.11.2", + "version": "3.11.3", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "1368f4a58c3c52114b86b1abe8f4098869cb0079" + "reference": "ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/1368f4a58c3c52114b86b1abe8f4098869cb0079", - "reference": "1368f4a58c3c52114b86b1abe8f4098869cb0079", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10", + "reference": "ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10", "shasum": "" }, "require": { @@ -4537,9 +4870,13 @@ { "url": "https://opencollective.com/php_codesniffer", "type": "open_collective" + }, + { + "url": "https://thanks.dev/phpcsstandards", + "type": "thanks_dev" } ], - "time": "2024-12-11T16:04:26+00:00" + "time": "2025-01-23T17:04:15+00:00" }, { "name": "symfony/process", @@ -4659,7 +4996,7 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", + "php": "~8.1.17 || ~8.2.4 || ~8.3.0 || ~8.4.0", "ext-simplexml": "*", "ext-ctype": "*", "ext-dom": "*", diff --git a/pkgs/development/php-packages/psalm/default.nix b/pkgs/development/php-packages/psalm/default.nix index 5b51af2d0e5c..fe9669bd44d9 100644 --- a/pkgs/development/php-packages/psalm/default.nix +++ b/pkgs/development/php-packages/psalm/default.nix @@ -6,19 +6,19 @@ php.buildComposerProject2 (finalAttrs: { pname = "psalm"; - version = "5.26.1"; + version = "6.0.0"; src = fetchFromGitHub { owner = "vimeo"; repo = "psalm"; tag = finalAttrs.version; - hash = "sha256-TZm7HByPoCB4C0tdU5rzTfjMQEnhRhWPEiNR0bQDkTs="; + hash = "sha256-RH4uPln90WrTdDF1S4i6e2OikPmIjTW3aM4gpM2qxgg="; }; # Missing `composer.lock` from the repository. # Issue open at https://github.com/vimeo/psalm/issues/10446 composerLock = ./composer.lock; - vendorHash = "sha256-po43yrMlvX7Y91Z3D5IYSpY7FOS6+tL/+a3AozopZ9Q="; + vendorHash = "sha256-WdWlG4tX/wLB2nj4iiqkIhEe2coYfG3q+0JoXescWbM="; meta = { changelog = "https://github.com/vimeo/psalm/releases/tag/${finalAttrs.version}"; From de305aefe21b108d3a43923c63824a275477469b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 16:04:57 +0100 Subject: [PATCH 142/287] defaultGemConfig.prometheus-client-mmap: fetchCargoTarball -> fetchCargoVendor Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- pkgs/development/ruby-modules/gem-config/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 618fbfdd19d5..ea9ebea2c0eb 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -308,7 +308,7 @@ in ''; } // lib.optionalAttrs (lib.versionAtLeast attrs.version "1.0") { cargoRoot = "ext/fast_mmaped_file_rs"; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = stdenv.mkDerivation { inherit (buildRubyGem { inherit (attrs) gemName version source; }) name @@ -322,11 +322,11 @@ in ''; }; hash = if lib.versionAtLeast attrs.version "1.1.2" - then "sha256-pNzW2fQZDcuqu8apv3GU7lUC/H1cX5WRifBBQlbE8+s=" + then "sha256-8EpYU6MSzMG3RzneDx0GwZ2N46Po8FdA/7Khy/7KHWo=" else if lib.versionAtLeast attrs.version "1.1.1" - then "sha256-RsN5XWX7Mj2ORccM0eczY+44WXsbXNTnJVcCMvnOATk=" - else "sha256-XuQZPbFWqPHlrJvllkvLl1FjKeoAUbi8oKDrS2rY1KM="; + then "sha256-V4NlFgVJy+V9fdbZWObn52H91IFSIU1seErMcxh1x5w=" + else "sha256-GFRIjvBPhqT4h6gE+GF32WW1wgZTaaHXRF7tIXnRM1Q="; }; nativeBuildInputs = [ cargo From 27b777df7515d8cb77cdc3551de489ee37402261 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sat, 25 Jan 2025 15:28:43 -0500 Subject: [PATCH 143/287] python312Packages.pycm: 4.0 -> 4.2 --- .../python-modules/pycm/default.nix | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/pycm/default.nix b/pkgs/development/python-modules/pycm/default.nix index b560b9705cca..7d6a114c3451 100644 --- a/pkgs/development/python-modules/pycm/default.nix +++ b/pkgs/development/python-modules/pycm/default.nix @@ -5,54 +5,55 @@ matplotlib, numpy, pytestCheckHook, - pythonOlder, + pytest-cov-stub, seaborn, + setuptools, }: buildPythonPackage rec { pname = "pycm"; - version = "4.0"; - format = "setuptools"; - - disabled = pythonOlder "3.5"; + version = "4.2"; + pyproject = true; src = fetchFromGitHub { owner = "sepandhaghighi"; repo = pname; tag = "v${version}"; - hash = "sha256-GyH06G7bArFBTzV/Sx/KmoJvcoed0sswW7qGqsSULHo="; + hash = "sha256-oceLARBP9D6NlMQiDvzIpJNNcod5D1O4xo3YzrUstso="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ matplotlib numpy seaborn ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + matplotlib + ]; disabledTests = [ - # Minor tolerance issues with Python 3.12; should be fixed in next release - # (see https://github.com/sepandhaghighi/pycm/pull/528) - "verified_test" - "function_test" + "plot_error_test" # broken doctest (expects matplotlib import exception) ]; postPatch = '' # Remove a trivial dependency on the author's `art` Python ASCII art library rm pycm/__main__.py - # Also depends on python3Packages.notebook - rm Otherfiles/notebook_check.py substituteInPlace setup.py \ --replace-fail '=get_requires()' '=[]' ''; pythonImportsCheck = [ "pycm" ]; - meta = with lib; { + meta = { description = "Multiclass confusion matrix library"; homepage = "https://pycm.io"; - license = licenses.mit; - maintainers = with maintainers; [ bcdarwin ]; + changelog = "https://github.com/sepandhaghighi/pycm/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcdarwin ]; }; } From 0b73be72826763cf13160c250e83568363b031c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 26 Jan 2025 11:28:02 -0800 Subject: [PATCH 144/287] immich: 1.125.2 -> 1.125.3 Diff: https://github.com/immich-app/immich/compare/refs/tags/v1.125.2...v1.125.3 Changelog: https://github.com/immich-app/immich/releases/tag/v1.125.3 --- pkgs/by-name/im/immich/sources.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json index 6935c5e9fa5c..199e2283252f 100644 --- a/pkgs/by-name/im/immich/sources.json +++ b/pkgs/by-name/im/immich/sources.json @@ -1,26 +1,26 @@ { - "version": "1.125.2", - "hash": "sha256-vtEUMERvCibOKYlHtu8eTQX6LLAMF5riBs2feX8HCAU=", + "version": "1.125.3", + "hash": "sha256-lDk2Pj+wspzeRVccWOJ1Xp4E72jlkJBU3G5djFNNHYw=", "components": { "cli": { - "npmDepsHash": "sha256-wHxNmmZVWuOYueEgkSGokwVZ20DklrjTyLYyamLzPvk=", - "version": "2.2.43" + "npmDepsHash": "sha256-l4h6aTgGGZf84LpmaN9XLiw99pgo4JN8zfBXvyE438Y=", + "version": "2.2.44" }, "server": { - "npmDepsHash": "sha256-0zcEiQM2KDrpLVv/uybcis9ohtyB5LcbZhvlXSMVRg0=", - "version": "1.125.2" + "npmDepsHash": "sha256-v21BjA7+zOPQtZNH06q4+x/EvcNVi/4T1Zi4LMgYZUU=", + "version": "1.125.3" }, "web": { - "npmDepsHash": "sha256-dTkRTxFhIeXhIkc87pERTCXtEoipiDA6C5RdlQ6Dvo8=", - "version": "1.125.2" + "npmDepsHash": "sha256-H32WmL7C+I03i3LSfs87Wyj/TMubqF1Nz7/VEj25aeI=", + "version": "1.125.3" }, "open-api/typescript-sdk": { - "npmDepsHash": "sha256-uBzPhxITGzEnKrcATzTQeIwjKpAE8Y0xoJdC5dm6cZo=", - "version": "1.125.2" + "npmDepsHash": "sha256-HpLw4I7KEap45HnRcA4u1PA8qM2HvSeF5hLkar20bns=", + "version": "1.125.3" }, "geonames": { - "timestamp": "20250124195258", - "hash": "sha256-2m+0M6200SixTFVZ1V7ZFw8D4E9VYhbmOto0RqWQPsQ=" + "timestamp": "20250126191509", + "hash": "sha256-uzKJJTN9TZCAgEtePI2RGZWTNGKdhmup4RHNVMGfQ48=" } } } From 9d5e0238abcebe9438eee0dadc05daa7d9043069 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 20:33:22 +0100 Subject: [PATCH 145/287] python3Packages.wandb: useFetchCargoVendor Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- pkgs/development/python-modules/wandb/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index 1a66aab57537..3f806069806b 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -90,7 +90,8 @@ let sourceRoot = "${src.name}/gpu_stats"; - cargoHash = "sha256-4udGG4I2Hr8r84c4WX6QGG/+bcHK4csXqwddvIiKmkw="; + useFetchCargoVendor = true; + cargoHash = "sha256-eeL486wQappwWG1De+RUIWe8JuBDx0clyU79eyZmf8M="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit From feb6df150f04fd097ebe698729bdeaed216ca990 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 20:35:52 +0100 Subject: [PATCH 146/287] cargo-pgrx: useFetchCargoVendor Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- pkgs/development/tools/rust/cargo-pgrx/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-pgrx/default.nix b/pkgs/development/tools/rust/cargo-pgrx/default.nix index 5da7f839e9b2..fdcdfee56a9a 100644 --- a/pkgs/development/tools/rust/cargo-pgrx/default.nix +++ b/pkgs/development/tools/rust/cargo-pgrx/default.nix @@ -24,6 +24,7 @@ let inherit version pname hash; }; + useFetchCargoVendor = true; inherit cargoHash; nativeBuildInputs = [ @@ -60,19 +61,19 @@ in cargo-pgrx_0_12_0_alpha_1 = generic { version = "0.12.0-alpha.1"; hash = "sha256-0m9oaqjU42RYyttkTihADDrRMjr2WoK/8sInZALeHws="; - cargoHash = "sha256-9XTIcpoCnROP63ZTDgMMMmj0kPggiTazKlKQfCgXKzk="; + cargoHash = "sha256-zYjqE7LZLnTaVxWAPWC1ncEjCMlrhy4THtgecB7wBYY="; }; cargo-pgrx_0_12_5 = generic { version = "0.12.5"; hash = "sha256-U2kF+qjQwMTaocv5f4p5y3qmPUsTzdvAp8mz9cn/COw="; - cargoHash = "sha256-nEgIOBGNG3TupA55/TgoXDPeJzjBjOGGfK+WjrH06VY="; + cargoHash = "sha256-CycwWvxYrHj7lmTiiNC1WdbFgrdlGr/M3qTN/N+7xQA="; }; cargo-pgrx_0_12_6 = generic { version = "0.12.6"; hash = "sha256-7aQkrApALZe6EoQGVShGBj0UIATnfOy2DytFj9IWdEA="; - cargoHash = "sha256-Di4UldQwAt3xVyvgQT1gUhdvYUVp7n/a72pnX45kP0w="; + cargoHash = "sha256-pnMxWWfvr1/AEp8DvG4awig8zjdHizJHoZ5RJA8CL08="; }; } From a8e2671675fa695029c32927d430ef3bbdfcf085 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sun, 26 Jan 2025 14:34:15 -0500 Subject: [PATCH 147/287] texlab: 5.21.0 -> 5.22.0 --- pkgs/development/tools/misc/texlab/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index acf7043b5d65..0e1b70d28b40 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -16,16 +16,16 @@ let in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "5.21.0"; + version = "5.22.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; tag = "v${version}"; - hash = "sha256-Lx7vENYuBXaMvGDOZxAPqivGZVaCXYrihaTnBn9eTm4="; + hash = "sha256-3yMfacncGTqm07OmbNdj2gmkHnagN3urQFb7lCSxegg="; }; - cargoHash = "sha256-6JDG9Ac43AW6HV2baZH08uxdb84hjrGXgdzZiFr2Ybk="; + cargoHash = "sha256-LLRZ0UdExttpOMFwiTQ7IHrpmXYE2mvXvE0LfQ8/4KA="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; From bde4e0bd6907377ab7aa72cec3a42ca286645ab1 Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Mon, 27 Jan 2025 00:07:18 +0530 Subject: [PATCH 148/287] emacsPackages.straight: init at 0-unstable-2024-10-06 --- .../emacs/elisp-packages/manual-packages.nix | 2 ++ .../manual-packages/straight/default.nix | 30 +++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/editors/emacs/elisp-packages/manual-packages/straight/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index c50981930182..dd3820116c42 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -27,6 +27,8 @@ lib.packagesFromDirectoryRecursive { ; }; + straight = callPackage ./manual-packages/straight { inherit (pkgs) git; }; + structured-haskell-mode = self.shm; texpresso = callPackage ./manual-packages/texpresso { inherit (pkgs) texpresso; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/straight/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/straight/default.nix new file mode 100644 index 000000000000..983117569476 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/straight/default.nix @@ -0,0 +1,30 @@ +{ + melpaBuild, + fetchFromGitHub, + git, + unstableGitUpdater, + lib, +}: + +melpaBuild { + pname = "straight"; + version = "0-unstable-2024-10-06"; + + src = fetchFromGitHub { + owner = "radian-software"; + repo = "straight.el"; + rev = "33fb4695066781c634ff1c3c81ba96e880deccf7"; + hash = "sha256-3NPVLTn0ka0RvSLXW9gDKam3xajp62/mLupc8uyatzo="; + }; + + nativeBuildInputs = [ git ]; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + homepage = "https://github.com/radian-software/straight.el"; + description = "Next-generation, purely functional package manager for the Emacs hacker"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ abhisheksingh0x558 ]; + }; +} From 78aa415507469aa388e0c008c7a00e6ba5eb2a7a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 20:40:23 +0100 Subject: [PATCH 149/287] influxdb: useFetchCargoVendor Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- pkgs/servers/nosql/influxdb/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index efd6a31d3baa..d60d167e4d9f 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -43,7 +43,8 @@ let --replace-fail "deny(warnings, missing_docs))]" "deny(warnings))]" ''; sourceRoot = "${src.name}/libflux"; - cargoHash = "sha256-O+t4f4P5291BuyARH6Xf3LejMFEQEBv+qKtyjHRhclA="; + useFetchCargoVendor = true; + cargoHash = "sha256-wJVvpjaBUae3FK3lQaQov4t0UEsH86tB8B8bsSFGGBU="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; pkgcfg = '' From 2b4cec3db053c532422a2bb398808908bb33bcb2 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 20:40:55 +0100 Subject: [PATCH 150/287] influxdb2: useFetchCargoVendor Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- pkgs/servers/nosql/influxdb2/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix index 61d4b8ec260b..7fcb072926f6 100644 --- a/pkgs/servers/nosql/influxdb2/default.nix +++ b/pkgs/servers/nosql/influxdb2/default.nix @@ -59,7 +59,8 @@ let --replace-fail "deny(warnings, missing_docs))]" "deny(warnings))]" ''; sourceRoot = "${src.name}/libflux"; - cargoHash = "sha256-O+t4f4P5291BuyARH6Xf3LejMFEQEBv+qKtyjHRhclA="; + useFetchCargoVendor = true; + cargoHash = "sha256-wJVvpjaBUae3FK3lQaQov4t0UEsH86tB8B8bsSFGGBU="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; pkgcfg = '' From 5edf29e205d112251f9c54dc1a0e7f9c9f344789 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 20:44:55 +0100 Subject: [PATCH 151/287] lemmy-server: useFetchCargoVendor Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- pkgs/servers/web-apps/lemmy/pin.json | 2 +- pkgs/servers/web-apps/lemmy/server.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/lemmy/pin.json b/pkgs/servers/web-apps/lemmy/pin.json index 177da0f53a59..0dc1a0f8e812 100644 --- a/pkgs/servers/web-apps/lemmy/pin.json +++ b/pkgs/servers/web-apps/lemmy/pin.json @@ -2,7 +2,7 @@ "serverVersion": "0.19.8", "uiVersion": "0.19.8", "serverHash": "sha256-fczEdH753e/86Bmc5CzpSukcmOkdFPp9jqStZh5F3XE=", - "serverCargoHash": "sha256-fY47KmKiCRZUayVC7aKV8VBgtincO7yB0RKr9KZkjQI=", + "serverCargoHash": "sha256-RIwNu7gdABk3HaS92/3aR3GgzAmwGeSncy2AFjbsVnw=", "uiHash": "sha256-TuBZUqJQwCxPHVqTFf3wpgCddBs7jSgICHM5MlL4cpQ=", "uiPNPMDepsHash": "sha256-sEN8NUlXWuvfmuAaoy/Vx3X+xG/TbeAdYG2LfctcOGc=" } diff --git a/pkgs/servers/web-apps/lemmy/server.nix b/pkgs/servers/web-apps/lemmy/server.nix index 6a8bd6f06daf..0f0f3c9209ed 100644 --- a/pkgs/servers/web-apps/lemmy/server.nix +++ b/pkgs/servers/web-apps/lemmy/server.nix @@ -32,6 +32,7 @@ rustPlatform.buildRustPackage rec { echo 'pub const VERSION: &str = "${version}";' > crates/utils/src/version.rs ''; + useFetchCargoVendor = true; cargoHash = pinData.serverCargoHash; buildInputs = From 42817d63560d159921870f39bbadb8d4b7ddf37e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 20:45:49 +0100 Subject: [PATCH 152/287] plausible: useFetchCargoVendor Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- pkgs/servers/web-apps/plausible/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/servers/web-apps/plausible/default.nix index 34ba117bf51e..bdf9b93b9a61 100644 --- a/pkgs/servers/web-apps/plausible/default.nix +++ b/pkgs/servers/web-apps/plausible/default.nix @@ -81,7 +81,8 @@ let pname = "mjml-native"; version = ""; src = "${mixFodDeps}/mjml/native/mjml_nif"; - cargoHash = "sha256-W4r8W+JGTE6j4gDogL5Yulr0mbaXjDbwDTwhzMbbDcQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-zDWOik65PWAMpIDDcG+DibprPVW/k+Q83+fjFI5vWaY="; doCheck = false; env = { From bfc84011e58b55db7d153924b12648f4cb73b61d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 19:53:31 +0000 Subject: [PATCH 153/287] vscode: 1.96.2 -> 1.96.4 --- pkgs/applications/editors/vscode/vscode.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 704039d7769b..4d6b66c0c224 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -36,22 +36,22 @@ let sha256 = { - x86_64-linux = "12606f4b6drp9gnb2y6q8b9zd1q7pjqg4ikjsfz47wgsi4009096"; - x86_64-darwin = "18hj3n81ja0kj4l4l1v2s3ahgagl9p7bv0zzmj710vqpr3k3h2p8"; - aarch64-linux = "03k92827lvb7rnavpii1kx0z3rpxsmbv21rdi06w5agpk4l3xs9k"; - aarch64-darwin = "08x5gv338yf1by04djvykjwnlifffb1bfbqr6vnxshcy9r30n925"; - armv7l-linux = "05cchap0r3vxfa32i3di838kj6wyrsm2qcga0gcl2aa27c86cn3c"; + x86_64-linux = "0grp4295kdamdc7w7bf06dzp4fcx41ry2jif9yx983dd0wgcgbrn"; + x86_64-darwin = "0yjjf5zqrgpj27kivn03i77by8f0535xxa6l5767d274jx35dj4s"; + aarch64-linux = "1a8b53bd687sfdvfqzdgrf2ij4969zv9f15qy9wihkc4vzrjlgf9"; + aarch64-darwin = "12zxvwqhavs6srvx5alhxcfwicayqs5caxmf2wcjb2qjxrlij6ik"; + armv7l-linux = "08bpcylq6izac4dp5xalgrxzm06jpcm245qdrp95qf0c5gb6rlp2"; } .${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.96.2"; + version = "1.96.4"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "fabdb6a30b49f79a7aba0f2ad9df9b399473380f"; + rev = "cd4ee3b1c348a13bafd8f9ad8060705f6d4b9cba"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -75,7 +75,7 @@ callPackage ./generic.nix rec { src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "1gbjxmmi800mdslr7yys04fw160crjg0v8bjhcshk6w6fdz39wp1"; + sha256 = "115dhhcbn0lnk09m4w6cqc0wa1f8wrriwxf5vfjqffxbm8pj6d3g"; }; stdenv = stdenvNoCC; }; From 145fe791fed482c508fe95adc9fdc9a2dc7ebdec Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 20:54:25 +0100 Subject: [PATCH 154/287] nix-index: useFetchCargoVendor Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- pkgs/tools/package-management/nix-index/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index f9ab5c71204b..de1cf8319039 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-r3Vg9ox953HdUp5Csxd2DYUyBe9u61fmA94PpcAZRqo="; }; - cargoHash = "sha256-c1Ivsj9of/cjEKU0lo4I9BfIUQZ3pPf2QF9fAlZTQn0="; + useFetchCargoVendor = true; + cargoHash = "sha256-BKVxtd+gbCHzpnr5LZmKMUMEEZvsZMT0AdlfrLpMYpc="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ From 01c1c14c2381d9e568cef4cf0355b9a57e112cf0 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 26 Jan 2025 20:13:58 +0100 Subject: [PATCH 155/287] daggerfall-unity: Create symlink to icon where desktop item expects it --- pkgs/by-name/da/daggerfall-unity/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/da/daggerfall-unity/package.nix b/pkgs/by-name/da/daggerfall-unity/package.nix index 10364fcce94c..a0387df8cb35 100644 --- a/pkgs/by-name/da/daggerfall-unity/package.nix +++ b/pkgs/by-name/da/daggerfall-unity/package.nix @@ -73,9 +73,10 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir --parents "$out/bin" "$out/share/doc" + mkdir --parents "$out/bin" "$out/share/doc" "$out/share/pixmaps/" cp --recursive * "$out" ln --symbolic "../${finalAttrs.meta.mainProgram}" "$out/bin/" + ln --symbolic ../../DaggerfallUnity_Data/Resources/UnityPlayer.png "$out/share/pixmaps/" ${lib.strings.concatMapStringsSep "\n" (file: '' cp "${file}" "$out/share/doc/${file.name}" From d33a8e9ccc7f16a3b054bb33856693e35baaef5e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 20:59:34 +0100 Subject: [PATCH 156/287] wireguard-vanity-address: remove 5 years since the last upstream commit. Lockfile is too old for fetchCargoVendor. --- .../wireguard-vanity-address/default.nix | 31 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 --- 3 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 pkgs/tools/networking/wireguard-vanity-address/default.nix diff --git a/pkgs/tools/networking/wireguard-vanity-address/default.nix b/pkgs/tools/networking/wireguard-vanity-address/default.nix deleted file mode 100644 index e64a8a59f5c7..000000000000 --- a/pkgs/tools/networking/wireguard-vanity-address/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rustPlatform, - Security, -}: - -rustPlatform.buildRustPackage rec { - pname = "wireguard-vanity-address"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "warner"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-SjzcVIQ9HwhP6Y/uCwXGSdZgrYcUQ9kE/Bow8pyOKNo="; - }; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - - cargoHash = "sha256-0bkyopkssqH0vfaWkFC3dV2o7Q3EuDEOM8JvRB9ekLU="; - - meta = with lib; { - description = "Find Wireguard VPN keypairs with a specific readable string"; - homepage = "https://github.com/warner/wireguard-vanity-address"; - license = licenses.mit; - maintainers = with maintainers; [ bcc32 ]; - mainProgram = "wireguard-vanity-address"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a0db6ec6d3fb..c765ec9c42fd 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1483,6 +1483,7 @@ mapAliases { wg-bond = throw "'wg-bond' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 wineWayland = wine-wayland; win-virtio = virtio-win; # Added 2023-10-17 + wireguard-vanity-address = throw "'wireguard-vanity-address' has been removed due to lack of upstream maintenance"; # Added 2025-01-26 wkhtmltopdf-bin = wkhtmltopdf; # Added 2024-07-17 wlroots_0_16 = throw "'wlroots_0_16' has been removed in favor of newer versions"; # Added 2024-07-14 wlroots = wlroots_0_18; # wlroots is unstable, we must keep depending on 'wlroots_0_*', convert to package after a stable(1.x) release diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4c00c5bcb56..0da909304ef9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5374,10 +5374,6 @@ with pkgs; wireguard-tools = callPackage ../tools/networking/wireguard-tools { }; - wireguard-vanity-address = callPackage ../tools/networking/wireguard-vanity-address { - inherit (darwin.apple_sdk.frameworks) Security; - }; - wg-netmanager = callPackage ../tools/networking/wg-netmanager { inherit (darwin.apple_sdk.frameworks) Security; }; From e233cae76072a772008b9062f12f0d1f2d98a940 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 21:03:56 +0100 Subject: [PATCH 157/287] anevicon: remove According to the Wayback Machine upstream has been gone since at least November 2023. --- pkgs/tools/networking/anevicon/default.nix | 48 ---------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 -- 3 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 pkgs/tools/networking/anevicon/default.nix diff --git a/pkgs/tools/networking/anevicon/default.nix b/pkgs/tools/networking/anevicon/default.nix deleted file mode 100644 index 5aaec8d47fd6..000000000000 --- a/pkgs/tools/networking/anevicon/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - rustPlatform, - libiconv, - Security, -}: - -rustPlatform.buildRustPackage rec { - pname = "anevicon"; - version = "0.1.0"; - - src = fetchFromGitHub { - owner = "rozgo"; - repo = pname; - rev = "v${version}"; - sha256 = "1m3ci7g7nn28p6x5m85av3ljgszwlg55f1hmgjnarc6bas5bapl7"; - }; - - cargoHash = "sha256-Id/vjne73w+bDVA8wT7fV1DMXeGtYbSAdwl07UfYJbw="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - Security - ]; - - cargoPatches = [ - # Add Cargo.lock file, https://github.com/rozgo/anevicon/pull/1 - (fetchpatch { - name = "cargo-lock-file.patch"; - url = "https://github.com/rozgo/anevicon/commit/205440a0863aaea34394f30f4255fa0bb1704aed.patch"; - sha256 = "02syzm7irn4slr3s5dwwhvg1qx8fdplwlhza8gfkc6ajl7vdc7ri"; - }) - ]; - - # Tries to send large UDP packets that Darwin rejects. - doCheck = !stdenv.hostPlatform.isDarwin; - - meta = with lib; { - description = "UDP-based load generator"; - homepage = "https://github.com/rozgo/anevicon"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ fab ]; - mainProgram = "anevicon"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a0db6ec6d3fb..708d79b808c0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -111,6 +111,7 @@ mapAliases { ao = libfive; # Added 2024-10-11 apacheKafka_3_5 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-06-13 anbox = throw "'anbox' has been removed as the upstream project is unmaintained, see https://github.com/anbox/.github/blob/main/profile/README.md"; # Added 2025-01-04 + anevicon = throw "'anevicon' has been removed because the upstream repository no longer exists"; # Added 2025-01-26 antimicroX = throw "'antimicroX' has been renamed to/replaced by 'antimicrox'"; # Converted to throw 2024-10-17 apacheAnt = ant; # Added 2024-11-28 apple-sdk_10_12 = throw "apple-sdk_10_12 was removed as Nixpkgs no longer supports macOS 10.12; see the 25.05 release notes"; # Added 2024-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4c00c5bcb56..c7b891052ce7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1908,10 +1908,6 @@ with pkgs; novacomd = callPackage ../development/mobile/webos/novacomd.nix { }; }; - anevicon = callPackage ../tools/networking/anevicon { - inherit (darwin.apple_sdk.frameworks) Security; - }; - aoc-cli = callPackage ../tools/misc/aoc-cli { inherit (darwin.apple_sdk.frameworks) Security; }; From 0039ab36b84fdb4bbf25defc12bdc0347bbbe2ee Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 21:06:45 +0100 Subject: [PATCH 158/287] tremor-language-server: useFetchCargoVendor Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- pkgs/tools/misc/tremor-rs/ls.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/tremor-rs/ls.nix b/pkgs/tools/misc/tremor-rs/ls.nix index 990c6e38a814..88f0db427d56 100644 --- a/pkgs/tools/misc/tremor-rs/ls.nix +++ b/pkgs/tools/misc/tremor-rs/ls.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ rustPlatform.bindgenHook ]; - cargoHash = "sha256-/RKwmslhMm30QxviVV7HthDHSmTmaGZn1hdt6bNF3d4="; + useFetchCargoVendor = true; + cargoHash = "sha256-Hl0TY/xZaDybYjrGiRftZhFx8dns+ONuNcxzl8lBUMM="; meta = with lib; { description = "Tremor Language Server (Trill)"; From 6ecc829cf2afecd6776fbf91a0d4ceff971b7952 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 21:14:35 +0100 Subject: [PATCH 159/287] sheesy-cli: remove 4 years since the last upstream commit. Lockfile is too old for fetchCargoVendor. --- pkgs/tools/security/sheesy-cli/default.nix | 65 ---------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 -- 3 files changed, 1 insertion(+), 69 deletions(-) delete mode 100644 pkgs/tools/security/sheesy-cli/default.nix diff --git a/pkgs/tools/security/sheesy-cli/default.nix b/pkgs/tools/security/sheesy-cli/default.nix deleted file mode 100644 index 87701523ec51..000000000000 --- a/pkgs/tools/security/sheesy-cli/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - lib, - stdenv, - rustPlatform, - fetchCrate, - installShellFiles, - libgpg-error, - gpgme, - gettext, - openssl, - Security, -}: - -rustPlatform.buildRustPackage rec { - pname = "sheesy-cli"; - version = "4.0.11"; - - src = fetchCrate { - inherit version pname; - hash = "sha256-rJ/V9pJgmqERgjD0FQ/oqhZQlIeN4/3ECx15/FOUQdA="; - }; - - cargoHash = "sha256-o2XRvzw54x6xv81l97s1hwc2MC0Ioeyheoz3F+AtKpU="; - cargoDepsName = pname; - - nativeBuildInputs = [ - libgpg-error - gpgme - gettext - installShellFiles - ]; - - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - - buildFeatures = [ - "vault" - "extract" - "completions" - "substitute" - "process" - ]; - - checkFeatures = [ ]; - - cargoBuildFlags = [ - "--bin" - "sy" - ]; - - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd sy \ - --bash <($out/bin/sy completions bash) \ - --fish <($out/bin/sy completions fish) \ - --zsh <($out/bin/sy completions zsh) - ''; - - meta = with lib; { - description = "'share-secrets-safely' CLI to interact with GPG/pass-like vaults"; - homepage = "https://share-secrets-safely.github.io/cli/"; - changelog = "https://github.com/share-secrets-safely/cli/releases/tag/${version}"; - license = with licenses; [ lgpl21Only ]; - maintainers = with maintainers; [ devhell ]; - mainProgram = "sy"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a0db6ec6d3fb..fb36c1f7f84a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1253,6 +1253,7 @@ mapAliases { shipyard = jumppad; # Added 2023-06-06 siduck76-st = st-snazzy; # Added 2024-12-24 signal-desktop-beta = throw "signal-desktop-beta has been removed to make the signal-desktop package easier to maintain"; + sheesy-cli = throw "'sheesy-cli' has been removed due to lack of upstream maintenance"; # Added 2025-01-26 shout = nodePackages.shout; # Added unknown; moved 2024-10-19 sky = throw "'sky' has been removed because its upstream website disappeared"; # Added 2024-07-21 SkypeExport = skypeexport; # Added 2024-06-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4c00c5bcb56..169455de9103 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2578,10 +2578,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - sheesy-cli = callPackage ../tools/security/sheesy-cli { - inherit (darwin.apple_sdk.frameworks) Security; - }; - steampipePackages = recurseIntoAttrs ( callPackage ../tools/misc/steampipe-packages { } ); From 78c5938ece7ddaae24bbf8691003bd2ed032e89b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 21:15:06 +0100 Subject: [PATCH 160/287] genpass: useFetchCargoVendor Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- pkgs/tools/security/genpass/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/genpass/default.nix b/pkgs/tools/security/genpass/default.nix index 5fd2fd3b0b72..02ddd76f75f6 100644 --- a/pkgs/tools/security/genpass/default.nix +++ b/pkgs/tools/security/genpass/default.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { sha256 = "UyEgOlKtDyneRteN3jHA2BJlu5U1HFL8HA2MTQz5rns="; }; - cargoHash = "sha256-ls3tzZ+gtZQlObmbtwJDq6N/f5nY+Ps7RL5R/fR5Vgg="; + useFetchCargoVendor = true; + cargoHash = "sha256-tcE2TugvTJyUsgkxff31U/PIiO1IMr4rO6FKYP/oEiw="; buildInputs = [ zlib From 1e3febf55347a94b7e0b490353c9a061b13a19d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 20:23:12 +0000 Subject: [PATCH 161/287] readarr: 0.4.8.2726 -> 0.4.10.2734 --- pkgs/by-name/re/readarr/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/re/readarr/package.nix b/pkgs/by-name/re/readarr/package.nix index 5a6a9822fe2f..1719fdb04897 100644 --- a/pkgs/by-name/re/readarr/package.nix +++ b/pkgs/by-name/re/readarr/package.nix @@ -24,15 +24,15 @@ let ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-dYYvrsYR+xsS9N/btJPCaCg4mS2UVgZs5FaBbWU4ytM="; - arm64-linux_hash = "sha256-Vfdq6Mngr3Cbq844Upq84k6gH0SnbpdPK0dU7LBnJO8="; - x64-osx_hash = "sha256-7mtnnbEQ+70qY5iSfX7pDUYPqKQG2JdzGRFgm1CEhs4="; + x64-linux_hash = "sha256-a3GEZTD3wcg8hz3wNrNMU13939C10S3gfRoNPfMBuAE="; + arm64-linux_hash = "sha256-nqnNgds1VWf6MiryQS6hJzg8bi1Ckegf0CsC8dfqDTY="; + x64-osx_hash = "sha256-IiW8pwLfcpbDGSO0DQhp2+J+tG5EvXth0fi6Z5q/d4c="; } ."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "readarr"; - version = "0.4.8.2726"; + version = "0.4.10.2734"; src = fetchurl { url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz"; From e4fd5b5b9c5e6772649cc6dd9057c8636a79d1ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 20:28:08 +0000 Subject: [PATCH 162/287] v2ray: 5.24.0 -> 5.25.1 --- pkgs/by-name/v2/v2ray/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/v2/v2ray/package.nix b/pkgs/by-name/v2/v2ray/package.nix index ffcc687ddbcf..880c390e012b 100644 --- a/pkgs/by-name/v2/v2ray/package.nix +++ b/pkgs/by-name/v2/v2ray/package.nix @@ -16,18 +16,18 @@ buildGoModule rec { pname = "v2ray-core"; - version = "5.24.0"; + version = "5.25.1"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - hash = "sha256-3xbXqfac1Kv77uBxykoX1nDB5NqTJDYmmzRloZUL/dA="; + hash = "sha256-XJVWja2LGBIXGdzYL8oHMcZn15Bg01t/ro/SRI6Xi/A="; }; # `nix-update` doesn't support `vendorHash` yet. # https://github.com/Mic92/nix-update/pull/95 - vendorHash = "sha256-z0ScEkXQu6YSXESdaTAs3vkPPlHEDmJ5xAwJQERwhWo="; + vendorHash = "sha256-8SFQUe52zZLii1XnFg2GBMseBlDxKAE0V56VVXGDlck="; ldflags = [ "-s" From 89a8c6d4802f847fccd8754a21d9a240bc1d9af9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 21:34:44 +0100 Subject: [PATCH 163/287] tectonic-unwrapped.src: update hash fetchSubmodules = true was removed without updating the hash. Fixes: c98ef4642cb9 ("tectonic: build with nixpkgs harfbuzz") --- pkgs/tools/typesetting/tectonic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index cd95b8c05854..bf6d4ad84dc8 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { owner = "tectonic-typesetting"; repo = "tectonic"; rev = "tectonic@${version}"; - sha256 = "sha256-xZHYiaQ8ASUwu0ieHIXcjRaH06SQoB6OR1y7Ok+FjAs="; + sha256 = "sha256-dZnUu0g86WJIIvwMgdmwb6oYqItxoYrGQTFNX7I61Bs="; }; patches = [ From 8a07bcadfd00d0888663c642b7223a7b65c9f604 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 20:10:39 +0100 Subject: [PATCH 164/287] dart.rhttp: useFetchCargoVendor Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- .../dart/package-source-builders/rhttp/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/dart/package-source-builders/rhttp/default.nix b/pkgs/development/compilers/dart/package-source-builders/rhttp/default.nix index e6e1644f0228..15169165a146 100644 --- a/pkgs/development/compilers/dart/package-source-builders/rhttp/default.nix +++ b/pkgs/development/compilers/dart/package-source-builders/rhttp/default.nix @@ -14,11 +14,12 @@ let sourceRoot = "${src.name}/rust"; + useFetchCargoVendor = true; cargoHash = { - _0_9_1 = "sha256-Gl3ArdSuw3/yi/JX6oloKJqerSJjTfK8HXRNei/LO+4="; - _0_9_6 = "sha256-a11UxG8nbIng+6uOWq/BZxdtRmRINl/7UOc6ap2mgrk="; - _0_9_8 = "sha256-/1qj0N83wgkPSQnGb3CHTS/ox6OpJCKF5mVpuKTqUBQ="; + _0_9_1 = "sha256-ZVl1nesepZnmOWeJPOgE6IDCokQm5FedbA5MBvr5S8c="; + _0_9_6 = "sha256-vvzb+jNN5lmRrKJ3zqvORvdduqEHRmbp85L/9Zegh/E="; + _0_9_8 = "sha256-cwb1wYVXOE5YABlMxUDt+OMlDpIlipqeNI7ZFAGHCqo="; } .${"_" + (lib.replaceStrings [ "." ] [ "_" ] version)} or (throw '' Unsupported version of pub 'rhttp': '${version}' From e0bfcf387a1593a28da428bc586c3c959eab36a1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 20:24:10 +0100 Subject: [PATCH 165/287] cargo-inspect: remove 3 years since the last upstream commit. Current lockfile is too old for fetchCargoVendor, although the latest upstream commit would be. --- .../tools/rust/cargo-inspect/default.nix | 37 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 3 -- 3 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 pkgs/development/tools/rust/cargo-inspect/default.nix diff --git a/pkgs/development/tools/rust/cargo-inspect/default.nix b/pkgs/development/tools/rust/cargo-inspect/default.nix deleted file mode 100644 index 47f236d0b525..000000000000 --- a/pkgs/development/tools/rust/cargo-inspect/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - stdenv, - lib, - rustPlatform, - fetchFromGitHub, - Security, -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-inspect"; - version = "0.10.3"; - - src = fetchFromGitHub { - owner = "mre"; - repo = pname; - rev = version; - sha256 = "026vc8d0jkc1d7dlp3ldmwks7svpvqzl0k5niri8a12cl5w5b9hj"; - }; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - - cargoHash = "sha256-+cYbejdZOmvaX8jdf1llAvaTefPVtIOl1fqGm5tHMRk="; - - meta = with lib; { - description = "See what Rust is doing behind the curtains"; - mainProgram = "cargo-inspect"; - homepage = "https://github.com/mre/cargo-inspect"; - license = with licenses; [ - mit - asl20 - ]; - maintainers = with maintainers; [ - minijackson - matthiasbeyer - ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a0db6ec6d3fb..4e2c0ef6b892 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -201,6 +201,7 @@ mapAliases { cargo-deps = throw "cargo-deps has been removed as the repository is deleted"; # Added 2024-04-09 cargo-espflash = espflash; cargo-kcov = throw "'cargo-kcov' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 + cargo-inspect = throw "'cargo-inspect' has been removed due to lack of upstream maintenance. Upstream recommends cargo-expand."; # Added 2025-01-26 cawbird = throw "cawbird has been abandoned upstream and is broken anyways due to Twitter closing its API"; certmgr-selfsigned = certmgr; # Added 2023-11-30 cgal_4 = throw "cgal_4 has been removed as it is obsolete use cgal instead"; # Added 2024-12-30 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4c00c5bcb56..5d8fc67dd36a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6695,9 +6695,6 @@ with pkgs; cargo-hf2 = callPackage ../development/tools/rust/cargo-hf2 { inherit (darwin.apple_sdk.frameworks) AppKit; }; - cargo-inspect = callPackage ../development/tools/rust/cargo-inspect { - inherit (darwin.apple_sdk.frameworks) Security; - }; cargo-lambda = callPackage ../development/tools/rust/cargo-lambda { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; From b70743f5bb9f023c405dd54e9a67fb4dc89a6081 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 19:54:58 +0100 Subject: [PATCH 166/287] tbtools: useFetchCargoVendor Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- pkgs/by-name/tb/tbtools/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/tb/tbtools/package.nix b/pkgs/by-name/tb/tbtools/package.nix index eddbecc3313b..211d59c6f58e 100644 --- a/pkgs/by-name/tb/tbtools/package.nix +++ b/pkgs/by-name/tb/tbtools/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-zq8q3JaoqWAQUat2gIW0Wimi/tZiC6XDphUVjH0viU4="; }; - cargoHash = "sha256-8uzbWJl3Bpvo/rlZnd7DzCNhL088v5pksY7K6yncC1s="; + useFetchCargoVendor = true; + cargoHash = "sha256-SAHIDjELm4qr4whoQVdt3EuNA72qFqXEg3H0hYr7yLc="; nativeBuildInputs = [ pkg-config From 6c81b4ab557d00e345cbab5ab6f1b7779b0386c1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 20:14:35 +0100 Subject: [PATCH 167/287] elmPackages.elm-json: useFetchCargoVendor Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- pkgs/development/compilers/elm/packages/elm-json/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/elm/packages/elm-json/default.nix b/pkgs/development/compilers/elm/packages/elm-json/default.nix index a306669f0651..b3c529c7d5c7 100644 --- a/pkgs/development/compilers/elm/packages/elm-json/default.nix +++ b/pkgs/development/compilers/elm/packages/elm-json/default.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - cargoHash = "sha256-8SOpL8nfhYen9vza0LYpB/5fgVmBwG7vGMmFOaJskIc="; + useFetchCargoVendor = true; + cargoHash = "sha256-iDyGPE1BEh1uIf4K6ijtlqugWFtfM/2GGda0u/lCLJ0="; # Tests perform networking and therefore can't work in sandbox doCheck = false; From 00bff58da4b283e7671c1d20ac2039e64c2d611a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 26 Jan 2025 12:44:28 -0800 Subject: [PATCH 168/287] getmail6: 6.19.06 -> 6.19.07 Diff: https://github.com/getmail6/getmail6/compare/refs/tags/v6.19.06...v6.19.07 Changelog: https://github.com/getmail6/getmail6/blob/refs/tags/v6.19.07/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 6a0650b9b069..b4719fe6a962 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.06"; + version = "6.19.07"; pyproject = true; src = fetchFromGitHub { owner = "getmail6"; repo = "getmail6"; tag = "v${version}"; - hash = "sha256-F4FS6d8XDPlJ7ysShFRb45hZainKljKRg+q4yA18HaI="; + hash = "sha256-uu+soEYC12LWx0aLbPupoK7g/rnD47dp32w7jpRj/38="; }; build-system = with python3.pkgs; [ From c61cc61897be26226cfb43c794e72c76cf4f9106 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 26 Jan 2025 12:46:47 -0800 Subject: [PATCH 169/287] radicale: 3.4.0 -> 3.4.1 Diff: https://github.com/Kozea/Radicale/compare/refs/tags/v3.4.0...v3.4.1 Changelog: https://github.com/Kozea/Radicale/blob/refs/tags/v3.4.1/CHANGELOG.md --- pkgs/by-name/ra/radicale/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/radicale/package.nix b/pkgs/by-name/ra/radicale/package.nix index dbc4820558d4..eb088074a237 100644 --- a/pkgs/by-name/ra/radicale/package.nix +++ b/pkgs/by-name/ra/radicale/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "radicale"; - version = "3.4.0"; + version = "3.4.1"; pyproject = true; src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; tag = "v${version}"; - hash = "sha256-yAKNqNs1HAYOntHUwdS75rHV9jB2R/6L20uaOPzEooY="; + hash = "sha256-4GnSd1kkUbOMhUwIi8ac3dMNFAzhr7tj0RKNdZElMsw="; }; build-system = with python3.pkgs; [ From 65a7161c50b05d5fc623249467e1a1b1b631a79e Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Sun, 26 Jan 2025 21:54:53 +0100 Subject: [PATCH 170/287] php8{1-4}Extensions.pinba: fix compilation with gcc 14 --- pkgs/development/php-packages/pinba/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/php-packages/pinba/default.nix b/pkgs/development/php-packages/pinba/default.nix index 759d02b9c352..4d48a591755b 100644 --- a/pkgs/development/php-packages/pinba/default.nix +++ b/pkgs/development/php-packages/pinba/default.nix @@ -15,6 +15,10 @@ buildPecl rec { sha256 = "0wqcqq6sb51wiawa37hbd1h9dbvmyyndzdvz87xqji7lpr9vn8jy"; }; + # Fix GCC 14 build. + # from incompatible pointer type [-Wincompatible-pointer-types + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + meta = with lib; { description = "PHP extension for Pinba"; longDescription = '' From cf6d220869850b4df31a4ac5d87e6b9e9f56c09c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 20:55:10 +0000 Subject: [PATCH 171/287] jx: 3.11.4 -> 3.11.27 --- pkgs/by-name/jx/jx/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/jx/jx/package.nix b/pkgs/by-name/jx/jx/package.nix index befb1831504d..e2a61f5850f2 100644 --- a/pkgs/by-name/jx/jx/package.nix +++ b/pkgs/by-name/jx/jx/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "jx"; - version = "3.11.4"; + version = "3.11.27"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "sha256-6M5mY3VoKyoKRd3K6TstGdJ6sfYcIHkCESDUWhl3VCc="; + sha256 = "sha256-Qh7Mjo4fwB3FF83GARLgYbQfwLmzJcOvqTAWe9XN/0I="; }; - vendorHash = "sha256-GzkAIGy9CCBIbIWUkPOPM3GlKvlEVm6YXnQUUGjItXE="; + vendorHash = "sha256-MJ8gYB8MQADQbhfyWHdGoGzyKPTk7LrltI3Hd2xBN0k="; subPackages = [ "cmd" ]; From ec685ba06713f4a5de120f234a62ebb327462200 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 20:56:05 +0000 Subject: [PATCH 172/287] gancio: 1.21.0 -> 1.22.0 --- pkgs/by-name/ga/gancio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ga/gancio/package.nix b/pkgs/by-name/ga/gancio/package.nix index 7c3c207779c0..6c71be9b1756 100644 --- a/pkgs/by-name/ga/gancio/package.nix +++ b/pkgs/by-name/ga/gancio/package.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "gancio"; - version = "1.21.0"; + version = "1.22.0"; src = fetchFromGitLab { domain = "framagit.org"; owner = "les"; repo = "gancio"; rev = "v${finalAttrs.version}"; - hash = "sha256-hpOTiGU2DGOeKqggYQhdBZgFBp6S0CAQ2stpr9zzItg="; + hash = "sha256-aKZnMtxKEjnvNLoFPnXxxvhj4jmK109+7qF2vZdERpw="; }; offlineCache = fetchYarnDeps { From 21580426b4927574cdb1c95c12db11ed4cc4e0af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 26 Jan 2025 13:02:08 -0800 Subject: [PATCH 173/287] libdeltachat: 1.155.0 -> 1.155.1 Diff: https://github.com/deltachat/deltachat-core-rust/compare/refs/tags/v1.155.0...v1.155.1 Changelog: https://github.com/deltachat/deltachat-core-rust/blob/v1.155.1/CHANGELOG.md --- pkgs/by-name/li/libdeltachat/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index c16f5c6ce64a..f3e7bc07a864 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.155.0"; + version = "1.155.1"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; tag = "v${version}"; - hash = "sha256-gmlIhB0Vou0fYXORAs01o87m6BtyJokvJQWYqCWY11I="; + hash = "sha256-XZLKvOvdyvR5poRY/oo9MHi1f2XzBmSDR8VqjW3wq74="; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoVendor { pname = "deltachat-core-rust"; inherit version src; - hash = "sha256-R7LWMUIxSVYdxkA1GBmXyh5FS9I4i4YjOgR8CX6whpw="; + hash = "sha256-ZxKR1M9wqmzKVbSdBKzTsKF9tDVRGHnd+Ra9Jy5CQQY="; }; nativeBuildInputs = [ From 1a9f9d9b54a3a2a6d8cdd5ea8672b6507b51235b Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Sun, 26 Jan 2025 22:13:04 +0100 Subject: [PATCH 174/287] php8{1-4}Extensions.rrd: fix compilation with gcc 14 --- pkgs/development/php-packages/rrd/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/php-packages/rrd/default.nix b/pkgs/development/php-packages/rrd/default.nix index 4b5aa83a09ab..8bcaeadd5085 100644 --- a/pkgs/development/php-packages/rrd/default.nix +++ b/pkgs/development/php-packages/rrd/default.nix @@ -19,6 +19,10 @@ buildPecl { pkg-config ]; + # Fix GCC 14 build. + # from incompatible pointer type [-Wincompatible-pointer-types + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + meta = { description = "PHP bindings to RRD tool system"; license = lib.licenses.bsd0; From 8a2ba6ebb44622856bfef53dc4e670bb653a3910 Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Sun, 26 Jan 2025 22:20:58 +0100 Subject: [PATCH 175/287] php8{1-4}Extensions.mailparse: 3.1.6 -> 3.1.8 --- pkgs/development/php-packages/mailparse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/mailparse/default.nix b/pkgs/development/php-packages/mailparse/default.nix index e0dba768aa80..a6f914294e56 100644 --- a/pkgs/development/php-packages/mailparse/default.nix +++ b/pkgs/development/php-packages/mailparse/default.nix @@ -7,8 +7,8 @@ buildPecl { pname = "mailparse"; - version = "3.1.6"; - hash = "sha256-pp8WBVg+q9tZws1MFzNLMmc5ih1H4f1+25LYvvne4Ag="; + version = "3.1.8"; + hash = "sha256-Wb6rTvhRdwxJW6egcmq0DgmBNUaaEdnI5mWwiclu/C8="; internalDeps = [ php.extensions.mbstring ]; postConfigure = '' From bc8cf25835ef9371dccdbc997f9af40fd5d53801 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 21:21:25 +0000 Subject: [PATCH 176/287] cntr: 1.6.0 -> 1.6.1 --- pkgs/by-name/cn/cntr/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cn/cntr/package.nix b/pkgs/by-name/cn/cntr/package.nix index d4fab9658f54..d9d450fe3b70 100644 --- a/pkgs/by-name/cn/cntr/package.nix +++ b/pkgs/by-name/cn/cntr/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cntr"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "Mic92"; repo = "cntr"; rev = version; - sha256 = "sha256-A622DfygwZ8HVgSxmPINkuCsYFKQBAUdsnXQmB/LS8w="; + sha256 = "sha256-2tqPxbi8sKoEPq0/zQFsOrStEmQGlU8s81ohTfKeOmE="; }; - cargoHash = "sha256-LRX7NuNLyEnw+2kj1MG4JvSL2jzVFxH6tMAx4+cCeow="; + cargoHash = "sha256-CPF3WO8y9AL8VvsnUbnXiPgHu103lBugnPN2+fxRl2k="; passthru.tests = nixosTests.cntr; From 88234d3a4f58e7248af755a08049638860fea7a0 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 26 Jan 2025 20:00:50 +0100 Subject: [PATCH 177/287] nixos/freshrss: add caddy support --- nixos/modules/services/web-apps/freshrss.nix | 40 +++++++++++++++---- nixos/tests/freshrss/caddy-sqlite.nix | 30 ++++++++++++++ nixos/tests/freshrss/default.nix | 3 +- nixos/tests/freshrss/extensions.nix | 2 +- nixos/tests/freshrss/http-auth.nix | 2 +- .../freshrss/{sqlite.nix => nginx-sqlite.nix} | 4 +- nixos/tests/freshrss/none-auth.nix | 2 +- nixos/tests/freshrss/pgsql.nix | 2 +- 8 files changed, 71 insertions(+), 14 deletions(-) create mode 100644 nixos/tests/freshrss/caddy-sqlite.nix rename nixos/tests/freshrss/{sqlite.nix => nginx-sqlite.nix} (91%) diff --git a/nixos/modules/services/web-apps/freshrss.nix b/nixos/modules/services/web-apps/freshrss.nix index 9bd690d21167..a1aae7e31844 100644 --- a/nixos/modules/services/web-apps/freshrss.nix +++ b/nixos/modules/services/web-apps/freshrss.nix @@ -3,6 +3,7 @@ with lib; let cfg = config.services.freshrss; + webserver = config.services.${cfg.webserver}; extension-env = pkgs.buildEnv { name = "freshrss-extensions"; @@ -129,13 +130,25 @@ in example = "/mnt/freshrss"; }; + webserver = mkOption { + type = types.enum [ "nginx" "caddy" "none"]; + default = "nginx"; + description = '' + Whether to use nginx or caddy for virtual host management. + + Further nginx configuration can be done by adapting `services.nginx.virtualHosts.`. + See [](#opt-services.nginx.virtualHosts) for further information. + + Further caddy configuration can be done by adapting `services.caddy.virtualHosts.`. + See [](#opt-services.caddy.virtualHosts) for further information. + ''; + }; + virtualHost = mkOption { - type = types.nullOr types.str; + type = types.str; default = "freshrss"; description = '' - Name of the nginx virtualhost to use and setup. If null, do not setup any virtualhost. - You may need to configure the virtualhost further through services.nginx.virtualHosts., - for example to enable SSL. + Name of the caddy/nginx virtualhost to use and setup. ''; }; @@ -204,8 +217,21 @@ in ''; } ]; + + # Set up a Caddy virtual host. + services.caddy = mkIf (cfg.webserver == "caddy") { + enable = true; + virtualHosts.${cfg.virtualHost}.extraConfig = '' + root * ${config.services.freshrss.package}/p + php_fastcgi unix/${config.services.phpfpm.pools.freshrss.socket} { + env FRESHRSS_DATA_PATH ${config.services.freshrss.dataDir} + } + file_server + ''; + }; + # Set up a Nginx virtual host. - services.nginx = mkIf (cfg.virtualHost != null) { + services.nginx = mkIf (cfg.webserver == "nginx") { enable = true; virtualHosts.${cfg.virtualHost} = { root = "${cfg.package}/p"; @@ -237,8 +263,8 @@ in ${cfg.pool} = { user = "freshrss"; settings = { - "listen.owner" = "nginx"; - "listen.group" = "nginx"; + "listen.owner" = webserver.user; + "listen.group" = webserver.group; "listen.mode" = "0600"; "pm" = "dynamic"; "pm.max_children" = 32; diff --git a/nixos/tests/freshrss/caddy-sqlite.nix b/nixos/tests/freshrss/caddy-sqlite.nix new file mode 100644 index 000000000000..69b62ab3b899 --- /dev/null +++ b/nixos/tests/freshrss/caddy-sqlite.nix @@ -0,0 +1,30 @@ +import ../make-test-python.nix ( + { lib, pkgs, ... }: + { + name = "freshrss-caddy-sqlite"; + meta.maintainers = with lib.maintainers; [ + etu + stunkymonkey + ]; + + nodes.machine = + { pkgs, ... }: + { + services.freshrss = { + enable = true; + baseUrl = "http://localhost"; + passwordFile = pkgs.writeText "password" "secret"; + dataDir = "/srv/freshrss"; + webserver = "caddy"; + virtualHost = "freshrss:80"; + }; + }; + + testScript = '' + machine.wait_for_unit("multi-user.target") + machine.wait_for_open_port(80) + response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/") + assert 'Login · FreshRSS' in response, "Login page didn't load successfully" + ''; + } +) diff --git a/nixos/tests/freshrss/default.nix b/nixos/tests/freshrss/default.nix index 67892596ba23..9253ee7f7e4a 100644 --- a/nixos/tests/freshrss/default.nix +++ b/nixos/tests/freshrss/default.nix @@ -5,5 +5,6 @@ http-auth = import ./http-auth.nix { inherit system pkgs; }; none-auth = import ./none-auth.nix { inherit system pkgs; }; pgsql = import ./pgsql.nix { inherit system pkgs; }; - sqlite = import ./sqlite.nix { inherit system pkgs; }; + nginx-sqlite = import ./nginx-sqlite.nix { inherit system pkgs; }; + caddy-sqlite = import ./caddy-sqlite.nix { inherit system pkgs; }; } diff --git a/nixos/tests/freshrss/extensions.nix b/nixos/tests/freshrss/extensions.nix index 7aba55a3f5e1..d2758fd387b4 100644 --- a/nixos/tests/freshrss/extensions.nix +++ b/nixos/tests/freshrss/extensions.nix @@ -17,7 +17,7 @@ import ../make-test-python.nix ( testScript = '' machine.wait_for_unit("multi-user.target") machine.wait_for_open_port(80) - response = machine.succeed("curl -vvv -s http://127.0.0.1:80/i/?c=extension") + response = machine.succeed("curl -vvv -s http://localhost:80/i/?c=extension") assert 'YouTube Video Feed' in response, "Extension not present in extensions page." ''; } diff --git a/nixos/tests/freshrss/http-auth.nix b/nixos/tests/freshrss/http-auth.nix index 84c308a7e48d..f0fb28ee188f 100644 --- a/nixos/tests/freshrss/http-auth.nix +++ b/nixos/tests/freshrss/http-auth.nix @@ -18,7 +18,7 @@ import ../make-test-python.nix ( testScript = '' machine.wait_for_unit("multi-user.target") machine.wait_for_open_port(80) - response = machine.succeed("curl -vvv -s -H 'Host: freshrss' -H 'Remote-User: testuser' http://127.0.0.1:80/i/") + response = machine.succeed("curl -vvv -s -H 'Host: freshrss' -H 'Remote-User: testuser' http://localhost:80/i/") assert 'Account: testuser' in response, "http_auth method didn't work." ''; } diff --git a/nixos/tests/freshrss/sqlite.nix b/nixos/tests/freshrss/nginx-sqlite.nix similarity index 91% rename from nixos/tests/freshrss/sqlite.nix rename to nixos/tests/freshrss/nginx-sqlite.nix index 5edc081e5d7c..2425dc086549 100644 --- a/nixos/tests/freshrss/sqlite.nix +++ b/nixos/tests/freshrss/nginx-sqlite.nix @@ -1,7 +1,7 @@ import ../make-test-python.nix ( { lib, pkgs, ... }: { - name = "freshrss-sqlite"; + name = "freshrss-nginx-sqlite"; meta.maintainers = with lib.maintainers; [ etu stunkymonkey @@ -21,7 +21,7 @@ import ../make-test-python.nix ( testScript = '' machine.wait_for_unit("multi-user.target") machine.wait_for_open_port(80) - response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://127.0.0.1:80/i/") + response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/") assert 'Login · FreshRSS' in response, "Login page didn't load successfully" ''; } diff --git a/nixos/tests/freshrss/none-auth.nix b/nixos/tests/freshrss/none-auth.nix index 1a945ebb9b38..1e504a869534 100644 --- a/nixos/tests/freshrss/none-auth.nix +++ b/nixos/tests/freshrss/none-auth.nix @@ -17,7 +17,7 @@ import ../make-test-python.nix ( testScript = '' machine.wait_for_unit("multi-user.target") machine.wait_for_open_port(80) - response = machine.succeed("curl -vvv -s http://127.0.0.1:80/i/") + response = machine.succeed("curl -vvv -s http://localhost:80/i/") assert 'Main stream · FreshRSS' in response, "FreshRSS stream page didn't load successfully" ''; } diff --git a/nixos/tests/freshrss/pgsql.nix b/nixos/tests/freshrss/pgsql.nix index feb3b3bf1314..a3f3f938db98 100644 --- a/nixos/tests/freshrss/pgsql.nix +++ b/nixos/tests/freshrss/pgsql.nix @@ -47,7 +47,7 @@ import ../make-test-python.nix ( machine.wait_for_unit("multi-user.target") machine.wait_for_open_port(5432) machine.wait_for_open_port(80) - response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://127.0.0.1:80/i/") + response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/") assert 'Login · FreshRSS' in response, "Login page didn't load successfully" ''; } From b84717b23810018d0e1de481cb42346b22417965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 26 Jan 2025 13:32:47 -0800 Subject: [PATCH 178/287] diebahn: use fetchCargoVendor --- pkgs/by-name/di/diebahn/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/di/diebahn/package.nix b/pkgs/by-name/di/diebahn/package.nix index b658d952e376..317500b7fb0e 100644 --- a/pkgs/by-name/di/diebahn/package.nix +++ b/pkgs/by-name/di/diebahn/package.nix @@ -34,9 +34,9 @@ stdenv.mkDerivation rec { hash = "sha256-jk2Pn/kqjMx5reMkIL8nLMWMZylwdoVq4FmnzaohnjU="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-UE+N6cvcWVJTxE8m4hHmBLyd5RBecDQy1kR4zDzPyf0="; + hash = "sha256-WiFW+xz5kxFKe9y8vHaFD9xW7f9iHc9hyCBWW4uMquU="; }; nativeBuildInputs = [ From 9572cfe77e02eeb53d29b6b96cd349dfe6fac169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 26 Jan 2025 13:37:24 -0800 Subject: [PATCH 179/287] pika-backup: use fetchCargoVendor --- pkgs/by-name/pi/pika-backup/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pi/pika-backup/package.nix b/pkgs/by-name/pi/pika-backup/package.nix index 760fdc069c24..ef4b3357f4e8 100644 --- a/pkgs/by-name/pi/pika-backup/package.nix +++ b/pkgs/by-name/pi/pika-backup/package.nix @@ -33,10 +33,9 @@ stdenv.mkDerivation rec { hash = "sha256-DtLGD7+Ydj2fvEHU+bDQDMC/E/9VgrlVNMCG6OlPmfg="; }; - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-8nFkc77FiLxMA1hMm8k5VB84l+pQeL0JSzYDytXrNUE="; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit pname version src; + hash = "sha256-1JFXSVs9HPPzh+IjH4RGugrZEifPVcQho9B3hLSTL6s="; }; patches = [ From a8f1685cca731083615484183678fec6507feeb9 Mon Sep 17 00:00:00 2001 From: Kamil Zaripov Date: Sun, 26 Jan 2025 21:45:03 +0000 Subject: [PATCH 180/287] sysdig: enable aarch64-linux back --- pkgs/os-specific/linux/sysdig/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 0568f183b1ce..488771ac3229 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -191,7 +191,7 @@ stdenv.mkDerivation { mit ]; maintainers = with lib.maintainers; [ raskin ]; - platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; broken = kernel != null && ((lib.versionOlder kernel.version "4.14") || kernel.isHardened || kernel.isZen); homepage = "https://sysdig.com/opensource/"; From 016979574e373891d0bfe8954213b0d08ed93c8e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 21:46:41 +0000 Subject: [PATCH 181/287] renode-dts2repl: 0-unstable-2025-01-13 -> 0-unstable-2025-01-14 --- pkgs/by-name/re/renode-dts2repl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix index 3caff4d41017..01ebb6c336c7 100644 --- a/pkgs/by-name/re/renode-dts2repl/package.nix +++ b/pkgs/by-name/re/renode-dts2repl/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication { pname = "renode-dts2repl"; - version = "0-unstable-2025-01-13"; + version = "0-unstable-2025-01-14"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "d9b880c36988c0500f67d2206c4b2fdf42fd6e65"; - hash = "sha256-Apu5WEwlUhO8/j84jH/CzWae17H5U1cwV7h9J8Nx5J0="; + rev = "cba1604ee130e7fa831392b315b55a142c5adc46"; + hash = "sha256-8xFixNOPFL5af+6Lbp84Z6C/ZFWsCcKPf6G4KpBbj/A="; }; nativeBuildInputs = [ From e382d5008e05b2318deabd922eaa2da56b984bbf Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Sun, 26 Jan 2025 22:49:47 +0100 Subject: [PATCH 182/287] forgejo-runner: 6.0.1 -> 6.2.0 Release notes: https://code.forgejo.org/forgejo/runner/src/branch/main/RELEASE-NOTES.md#6-2-0 Signed-off-by: Christoph Heiss --- pkgs/by-name/fo/forgejo-runner/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index 46d9a2d653d3..b4dc9f0a713f 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -17,17 +17,17 @@ let in buildGoModule rec { pname = "forgejo-runner"; - version = "6.0.1"; + version = "6.2.0"; src = fetchFromGitea { domain = "code.forgejo.org"; owner = "forgejo"; repo = "runner"; rev = "v${version}"; - hash = "sha256-lwWXJQDtt/qsxWrXUpxhXZTaB+GHxNtY+kLcs/hk6cw="; + hash = "sha256-2+/PJZPqKbxeWbIVx2647/xK5CqVUUvsdd67YFwjhms="; }; - vendorHash = "sha256-nY/sxXnbOYcuPr/uFrnJF8fXROnQxr0SZ5nq87sLgH8="; + vendorHash = "sha256-wvvzD2lD1TPXEriNaI6nzNGR/Kg94zC58pAR42/DlMA="; ldflags = [ "-s" From 303859efd64e734df61666085e5e89757b4f652e Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Sun, 26 Jan 2025 22:51:14 +0100 Subject: [PATCH 183/287] forgejo-runner: drop `kranzes` from maintainer list Hasn't been active in a long time, see [0] for reference. [0] https://github.com/NixOS/nixpkgs/pull/360535#pullrequestreview-2474091209 Signed-off-by: Christoph Heiss --- pkgs/by-name/fo/forgejo-runner/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index b4dc9f0a713f..ee846eadd863 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -58,7 +58,6 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ adamcstephens - kranzes emilylange christoph-heiss ]; From 600fcbc729991d1047f1a29c82f0a933187af852 Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Sun, 26 Jan 2025 22:53:47 +0100 Subject: [PATCH 184/287] pdepend: switch to buildComposerProject2 --- pkgs/by-name/pd/pdepend/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pd/pdepend/package.nix b/pkgs/by-name/pd/pdepend/package.nix index d6f300746ca5..9054573ac308 100644 --- a/pkgs/by-name/pd/pdepend/package.nix +++ b/pkgs/by-name/pd/pdepend/package.nix @@ -4,7 +4,7 @@ lib, }: -php.buildComposerProject (finalAttrs: { +php.buildComposerProject2 (finalAttrs: { pname = "pdepend"; version = "2.16.2"; @@ -16,7 +16,7 @@ php.buildComposerProject (finalAttrs: { }; composerLock = ./composer.lock; - vendorHash = "sha256-Rvvy6MI0q+T2W7xzf2UqWIbsqgrWhgqVnzhphQ3iw9g="; + vendorHash = "sha256-szKVZhWcd8p4307irNqgSAK2+hl8AW+gCPyf0EEco8A="; meta = { changelog = "https://github.com/pdepend/pdepend/releases/tag/${finalAttrs.version}"; From bb32d6c49ee47def38a8eb8e0eb193cf1a5ad09c Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Sun, 26 Jan 2025 22:54:34 +0100 Subject: [PATCH 185/287] pdepend: switch to tag --- pkgs/by-name/pd/pdepend/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/pd/pdepend/package.nix b/pkgs/by-name/pd/pdepend/package.nix index 9054573ac308..8a79e15e66a2 100644 --- a/pkgs/by-name/pd/pdepend/package.nix +++ b/pkgs/by-name/pd/pdepend/package.nix @@ -11,7 +11,7 @@ php.buildComposerProject2 (finalAttrs: { src = fetchFromGitHub { owner = "pdepend"; repo = "pdepend"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-2Ruubcm9IWZYu2LGeGeKm1tmHca0P5xlKYkuBCCV9ag="; }; From 7cdbe945e4d0571e257a88ba7fc9b92c7f166c2b Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Sun, 26 Jan 2025 22:54:58 +0100 Subject: [PATCH 186/287] pdepend: versionCheckHook --- pkgs/by-name/pd/pdepend/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/pd/pdepend/package.nix b/pkgs/by-name/pd/pdepend/package.nix index 8a79e15e66a2..7d75b1bbf083 100644 --- a/pkgs/by-name/pd/pdepend/package.nix +++ b/pkgs/by-name/pd/pdepend/package.nix @@ -2,6 +2,7 @@ php, fetchFromGitHub, lib, + versionCheckHook, }: php.buildComposerProject2 (finalAttrs: { @@ -18,6 +19,10 @@ php.buildComposerProject2 (finalAttrs: { composerLock = ./composer.lock; vendorHash = "sha256-szKVZhWcd8p4307irNqgSAK2+hl8AW+gCPyf0EEco8A="; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + versionCheckProgramArg = "--version"; + meta = { changelog = "https://github.com/pdepend/pdepend/releases/tag/${finalAttrs.version}"; description = "Adaptation of JDepend for PHP"; From c466e6659ebb766c68d2e7a93822127cd515cb80 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 22:04:52 +0000 Subject: [PATCH 187/287] factoriolab: 3.9.2 -> 3.10.0 --- pkgs/by-name/fa/factoriolab/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/factoriolab/package.nix b/pkgs/by-name/fa/factoriolab/package.nix index 60a237b3d185..2c4ba6303308 100644 --- a/pkgs/by-name/fa/factoriolab/package.nix +++ b/pkgs/by-name/fa/factoriolab/package.nix @@ -10,13 +10,13 @@ }: buildNpmPackage rec { pname = "factoriolab"; - version = "3.9.2"; + version = "3.10.0"; src = fetchFromGitHub { owner = "factoriolab"; repo = "factoriolab"; tag = "v${version}"; - hash = "sha256-ogmez21QwFdRYVsMxeFmNnEerXbH4rQXmOwKuKbpuGs="; + hash = "sha256-MSiwtFd9u8IFrHDy++jO//P7Yn4Arip1DwBufR8KIRU="; }; buildInputs = [ vips ]; nativeBuildInputs = [ From 6d57cfc4d70b991c7d94c5d0ef0f9c54a6aede23 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 22:21:06 +0000 Subject: [PATCH 188/287] python312Packages.flask-limiter: 3.10.0 -> 3.10.1 --- pkgs/development/python-modules/flask-limiter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix index 4365cd89bd39..f59ee0cf9263 100644 --- a/pkgs/development/python-modules/flask-limiter/default.nix +++ b/pkgs/development/python-modules/flask-limiter/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "flask-limiter"; - version = "3.10.0"; + version = "3.10.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "alisaifee"; repo = "flask-limiter"; tag = version; - hash = "sha256-spE0gVrPlbz0JDXGznJ6RN2uNAsQn7tbHxWGU98221M="; + hash = "sha256-AfreBLyJDogXnxB5cIoT766VFiHIIoVKAoBIra6Q+xs="; }; postPatch = '' From 14fb968a10fd436c8ae3fd818f3dc844c42f1145 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 22:23:58 +0000 Subject: [PATCH 189/287] python312Packages.conda-libmamba-solver: 24.11.1 -> 25.1.1 --- .../python-modules/conda-libmamba-solver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/conda-libmamba-solver/default.nix b/pkgs/development/python-modules/conda-libmamba-solver/default.nix index fceb265592e5..dcbe419854bc 100644 --- a/pkgs/development/python-modules/conda-libmamba-solver/default.nix +++ b/pkgs/development/python-modules/conda-libmamba-solver/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { pname = "conda-libmamba-solver"; - version = "24.11.1"; + version = "25.1.1"; pyproject = true; src = fetchFromGitHub { @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "conda"; repo = "conda-libmamba-solver"; tag = version; - hash = "sha256-lIpMzm3wjkugMDwqmVFXDKVJyX/SdzFG5jelZRys8PQ="; + hash = "sha256-d6KLUhc7+KZ5H9vkI84S9TyximSwatu6lg7XIdMqtk0="; }; From 66708165f9ec311b039301eef5425c367f70d2a4 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Sun, 26 Jan 2025 23:24:24 +0100 Subject: [PATCH 190/287] mongodb-ce: only enable version install check on darwin --- pkgs/by-name/mo/mongodb-ce/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/mo/mongodb-ce/package.nix b/pkgs/by-name/mo/mongodb-ce/package.nix index 2fd6497c3ed0..1e9e4d04739d 100644 --- a/pkgs/by-name/mo/mongodb-ce/package.nix +++ b/pkgs/by-name/mo/mongodb-ce/package.nix @@ -66,7 +66,11 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/mongod"; versionCheckProgramArg = [ "--version" ]; - doInstallCheck = true; + # Only enable the version install check on darwin. + # On Linux, this would fail as mongod relies on tcmalloc, which + # requires access to `/sys/devices/system/cpu/possible`. + # See https://github.com/NixOS/nixpkgs/issues/377016 + doInstallCheck = stdenv.hostPlatform.isDarwin; passthru = { From 10b633fe824bbefeaa05f2ef60fefdd6765cf018 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 22:37:04 +0000 Subject: [PATCH 191/287] jetbrains-runner: 3.0.4 -> 3.0.5 --- pkgs/by-name/je/jetbrains-runner/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/je/jetbrains-runner/package.nix b/pkgs/by-name/je/jetbrains-runner/package.nix index 364223be2926..fcb91662e252 100644 --- a/pkgs/by-name/je/jetbrains-runner/package.nix +++ b/pkgs/by-name/je/jetbrains-runner/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation rec { pname = "jetbrains-runner"; - version = "3.0.4"; + version = "3.0.5"; src = fetchFromGitHub { owner = "alex1701c"; repo = "JetBrainsRunner"; rev = version; - hash = "sha256-uLUtxKGXa8MjpdrT7X0EpRCWQTBYm8mt0NcyOLoGd5Y="; + hash = "sha256-fzGwwvBgvUVU6Ra66KrIAqRjWWR6pWYbWVkOk2tDwkc="; fetchSubmodules = true; }; From 628d3c423cf3b5a3828f11aabddf80290809d899 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 22:42:21 +0000 Subject: [PATCH 192/287] heptabase: 1.50.1 -> 1.51.1 --- pkgs/by-name/he/heptabase/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/he/heptabase/package.nix b/pkgs/by-name/he/heptabase/package.nix index f01cd563b9c1..d75879d80d9f 100644 --- a/pkgs/by-name/he/heptabase/package.nix +++ b/pkgs/by-name/he/heptabase/package.nix @@ -5,10 +5,10 @@ }: let pname = "heptabase"; - version = "1.50.1"; + version = "1.51.1"; src = fetchurl { url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage"; - hash = "sha256-rxCpgetkm8Ma3d5PvTCM2SBcPffImw380UPuR+q0LaQ="; + hash = "sha256-ANVgH20I6pCy2WI3Umni8YCCWxgGrnyP154iHttlQTs="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; From 479d8786151352de75ea8198ec40624ee18f1f00 Mon Sep 17 00:00:00 2001 From: Palmer Cox Date: Sat, 25 Jan 2025 22:21:43 -0500 Subject: [PATCH 193/287] mbrola: Fix compilation on Darwin It looks like mbrola hasn't done a release in 6 years or so. In that time, they have a few fixes for compiling on Darwin. However, picking up those changes would require us to start packaging the latest git which is unreleased. I tried grabbing the relevant patches, but they don't seem to apply cleanly. So, instead, I just made some tweaks to the files to get things to compile using substituteInPlace. The first thing we patch is that the Makefile requests the "O6" optimization level - which does not exist in gcc or clang - but is an error in clang. The second thing is that the project attempts to re-define the "swab" function from unistd.h. Which maybe was necessary in the past, but now is an error. --- pkgs/applications/audio/mbrola/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/audio/mbrola/default.nix b/pkgs/applications/audio/mbrola/default.nix index ade11f764c70..f9faa67d4552 100644 --- a/pkgs/applications/audio/mbrola/default.nix +++ b/pkgs/applications/audio/mbrola/default.nix @@ -29,6 +29,15 @@ let sha256 = "1w86gv6zs2cbr0731n49z8v6xxw0g8b0hzyv2iqb9mqcfh38l8zy"; }; + postPatch = '' + substituteInPlace Makefile \ + --replace-fail 'O6' 'O3' + substituteInPlace Misc/common.h \ + --replace-fail '|| defined(TARGET_OS_MAC)' "" + substituteInPlace Misc/common.c \ + --replace-fail '|| defined(TARGET_OS_MAC)' "" + ''; + # required for cross compilation makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; From 1d81f9d0067f2b16bf87bf51f964f498cb286efe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 00:14:43 +0000 Subject: [PATCH 194/287] treesheets: 0-unstable-2025-01-13 -> 0-unstable-2025-01-16 --- pkgs/applications/office/treesheets/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 65996b7b2e4a..99c0ccfccabf 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "0-unstable-2025-01-13"; + version = "0-unstable-2025-01-16"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "89b40de858f598975098a0436637bca8357a4a86"; - hash = "sha256-kduZ+1EYxwuKAIVNBg9u32UD463gpBIjcxSj1FgvIIg="; + rev = "f8edf8abe4d7f18528cec6460831d34ee30881e3"; + hash = "sha256-6EwlpdbLEBu5oUQx6IawaFMkBbmfoRb+lZMZiVLAk8k="; }; nativeBuildInputs = [ From 8d732213c20e051943366aabef6b3ce3638bad95 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 00:28:28 +0000 Subject: [PATCH 195/287] asn: 0.78.0 -> 0.78.3 --- pkgs/by-name/as/asn/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/as/asn/package.nix b/pkgs/by-name/as/asn/package.nix index 88f05bb5d41a..e370f5f599f4 100644 --- a/pkgs/by-name/as/asn/package.nix +++ b/pkgs/by-name/as/asn/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "asn"; - version = "0.78.0"; + version = "0.78.3"; src = fetchFromGitHub { owner = "nitefood"; repo = "asn"; tag = "v${version}"; - hash = "sha256-pXPc6cAPqvbECvP3v3Z1Og8jhIhh5zvXomZrxNX6KVI="; + hash = "sha256-ydCpCmW6NK3LM05YLw6KtJWo7UtMcsxQt2RH/Xl+bFw="; }; nativeBuildInputs = [ From 82c3e3cdee326f41d4d925bba1c16671029fde5d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 00:32:31 +0000 Subject: [PATCH 196/287] nsxiv: 32 -> 33 --- pkgs/by-name/ns/nsxiv/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ns/nsxiv/package.nix b/pkgs/by-name/ns/nsxiv/package.nix index 692f9f625ef2..f19b9e12a9fc 100644 --- a/pkgs/by-name/ns/nsxiv/package.nix +++ b/pkgs/by-name/ns/nsxiv/package.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "nsxiv"; - version = "32"; + version = "33"; src = fetchFromGitea { domain = "codeberg.org"; owner = "nsxiv"; repo = "nsxiv"; rev = "v${finalAttrs.version}"; - hash = "sha256-UWaet7hVtgfuWTiNY4VcsMWTfS6L9r5w1fb/0dWz8SI="; + hash = "sha256-H1s+pLpHTmoDssdudtAq6Ru0jwZZ55/qamEVgtHTGfk="; }; outputs = [ From db13a24e446d66448e56c88588037412bc959e1b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 00:51:23 +0000 Subject: [PATCH 197/287] commandergenius: 3.5.1 -> 3.5.2 --- pkgs/by-name/co/commandergenius/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/commandergenius/package.nix b/pkgs/by-name/co/commandergenius/package.nix index 6008490dac17..a9b0afe5d19d 100644 --- a/pkgs/by-name/co/commandergenius/package.nix +++ b/pkgs/by-name/co/commandergenius/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "commandergenius"; - version = "3.5.1"; + version = "3.5.2"; src = fetchFromGitLab { owner = "Dringgstein"; repo = "Commander-Genius"; rev = "v${version}"; - hash = "sha256-sWnx2UdnuuLcTxhuXhfG2ssnFvuGi9kOBrpc4jiKgTs="; + hash = "sha256-4WfHdgn8frcDVa3Va6vo/jZihf09vIs+bNdAxScgovE="; }; buildInputs = [ From ed43c05a1e1a3f14685955cd4a84c0d1e411bb51 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 00:56:05 +0000 Subject: [PATCH 198/287] beancount-language-server: 1.3.6 -> 1.3.7 --- pkgs/by-name/be/beancount-language-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/be/beancount-language-server/package.nix b/pkgs/by-name/be/beancount-language-server/package.nix index 6645f183092a..b8ec5cd3281d 100644 --- a/pkgs/by-name/be/beancount-language-server/package.nix +++ b/pkgs/by-name/be/beancount-language-server/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "beancount-language-server"; - version = "1.3.6"; + version = "1.3.7"; src = fetchFromGitHub { owner = "polarmutex"; repo = "beancount-language-server"; rev = "v${version}"; - hash = "sha256-U23e32Xfa0j+U/CrCZzKjipaA0Yv5szbtTHJWWL52K4="; + hash = "sha256-aqWenvNAdDL7B7J1hvt+JXT73SJJKu9KFlpUReOp3s4="; }; - cargoHash = "sha256-OvhG+O+uHHf7e9p3vibrPt9fuGzEqG+l3GGfNwoqXBU="; + cargoHash = "sha256-4p/1sZldbbc/O2jo+PjrcComwExzzVCgDFIjWz9CfTY="; doInstallCheck = true; postInstallCheck = '' From 893b69c8499b1c7506764500d1e93048d09ea8d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 01:04:47 +0000 Subject: [PATCH 199/287] cloudflare-utils: 1.3.3 -> 1.3.4 --- pkgs/by-name/cl/cloudflare-utils/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/cloudflare-utils/package.nix b/pkgs/by-name/cl/cloudflare-utils/package.nix index ce3079bcc3d9..48f34dd0e08d 100644 --- a/pkgs/by-name/cl/cloudflare-utils/package.nix +++ b/pkgs/by-name/cl/cloudflare-utils/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "cloudflare-utils"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "Cyb3r-Jak3"; repo = "cloudflare-utils"; rev = "v${version}"; - hash = "sha256-Wa8YCwOY7kwKJmME5hWpEGrC8bxjgVnli1GUwKLyFJg="; + hash = "sha256-XYOYun7PmZEQQRVCi46tBYoNZdXedmhpdUygtVlU0bE="; }; - vendorHash = "sha256-hoU+GSJHBZtb29jJbeuaFQSn496b1xLzXJtBCbKEcYE="; + vendorHash = "sha256-fg2BJkXdCWAO83kMoxkHlEyZuVezu9rs0hEda17KObE="; meta = { description = "Helpful Cloudflare utility program"; From 0bbf2d4b3b5b7518d6aa003c67f9513b75172ee2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 01:07:27 +0000 Subject: [PATCH 200/287] checkstyle: 10.21.1 -> 10.21.2 --- pkgs/by-name/ch/checkstyle/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ch/checkstyle/package.nix b/pkgs/by-name/ch/checkstyle/package.nix index c872896c4105..1acc6d4c305d 100644 --- a/pkgs/by-name/ch/checkstyle/package.nix +++ b/pkgs/by-name/ch/checkstyle/package.nix @@ -1,12 +1,12 @@ { lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre }: stdenvNoCC.mkDerivation rec { - version = "10.21.1"; + version = "10.21.2"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-u8248qMMHRBxWk7VpFripdLQSbcAL3ApLtCQa6TyMJ4="; + sha256 = "sha256-r8uiXoaQFkQpcuxFE6jAbIEu32j1EciO9JfeAMM4ORc="; }; nativeBuildInputs = [ makeBinaryWrapper ]; From a34f51fe64709337bdd054724fadaef044800004 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 12:34:06 +0000 Subject: [PATCH 201/287] spiped: 1.6.2 -> 1.6.3 --- pkgs/by-name/sp/spiped/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/spiped/package.nix b/pkgs/by-name/sp/spiped/package.nix index 021549e4f10e..e45caedb7c07 100644 --- a/pkgs/by-name/sp/spiped/package.nix +++ b/pkgs/by-name/sp/spiped/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "spiped"; - version = "1.6.2"; + version = "1.6.3"; src = fetchurl { url = "https://www.tarsnap.com/spiped/spiped-${version}.tgz"; - hash = "sha256-BdRofRLRHX+YiNQ/PYDFQbdyHJhwONCF9xyRuwYgRWc="; + hash = "sha256-cMUwcNu7ENFEJ1Sur7AbCOyCkgPUECNkfb8aFDXuSmU="; }; buildInputs = [ openssl ]; From ed5abf2ed6af2de0cdc0c322cce1570a3668f1bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 06:03:18 +0000 Subject: [PATCH 202/287] spicedb-zed: 0.24.0 -> 0.25.0 --- pkgs/servers/spicedb/zed.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/spicedb/zed.nix b/pkgs/servers/spicedb/zed.nix index a2bc60293620..290bf13f1ccf 100644 --- a/pkgs/servers/spicedb/zed.nix +++ b/pkgs/servers/spicedb/zed.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "zed"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "authzed"; repo = "zed"; rev = "v${version}"; - hash = "sha256-gaTTHkJkKO3MY5tAVJNHEq6ZkcS1iSBSEh1eyPzsXQY="; + hash = "sha256-6VBiMCfkmLdPx0TW8RgZDwLXZvYRZcu6zJ+/ZINo6oQ="; }; - vendorHash = "sha256-7UwpkmFwYT8XP00pTlOK25WDweaalQfA4zX7yvlFWow="; + vendorHash = "sha256-7Lg2IV7xY0qGHqwEg6h9Su0rSt2oLZzjyGGpbKwgnmU="; ldflags = [ "-X 'github.com/jzelinskie/cobrautil/v2.Version=${src.rev}'" From 13f650083cf28dae5de21ae6633dceb0f6dc23ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 01:22:13 +0000 Subject: [PATCH 203/287] stgit: 2.5.0 -> 2.5.1 --- pkgs/by-name/st/stgit/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stgit/package.nix b/pkgs/by-name/st/stgit/package.nix index 6ef1afe79ce0..793bf45613f6 100644 --- a/pkgs/by-name/st/stgit/package.nix +++ b/pkgs/by-name/st/stgit/package.nix @@ -19,15 +19,15 @@ rustPlatform.buildRustPackage rec { pname = "stgit"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "stacked-git"; repo = "stgit"; rev = "v${version}"; - hash = "sha256-XyBVboNrvhOSZBPd5ZqdMuF261TpFzduC6XQtKJGntE="; + hash = "sha256-p6qEzkiRAuzvaPrUXtE+Ixdcu7W0aQFY2NQUyO+kESo="; }; - cargoHash = "sha256-xh8TW8TgwaCqqKVyP9ImHkKAIwW5c6AC1pZD5tu0XBs="; + cargoHash = "sha256-whFBUqKervY/mfogA1VffA8vhM01wySkqRdIpwMXV8M="; nativeBuildInputs = [ pkg-config From 4aa399dff0dc98b651f307de22b85d06dbc7d2ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 01:31:42 +0000 Subject: [PATCH 204/287] marmite: 0.2.3 -> 0.2.4 --- pkgs/by-name/ma/marmite/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/marmite/package.nix b/pkgs/by-name/ma/marmite/package.nix index 64d16f9e5224..563c98fe9102 100644 --- a/pkgs/by-name/ma/marmite/package.nix +++ b/pkgs/by-name/ma/marmite/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "marmite"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "rochacbruno"; repo = "marmite"; tag = version; - hash = "sha256-AblitYe7YDUc2Tg2P7j+wnOjMAhDtieDsbq6B6x+uMs="; + hash = "sha256-IfmwPN2PbBXJJXHgwseC5L3sDOjaVlRE//H8uHazSNA="; }; - cargoHash = "sha256-u8sJS9hvIao+af7IA4vE0eUSx0xmI1Kb5NXyZBrOCIw="; + cargoHash = "sha256-FpCoSX/V7AoRED3bFoGLqyNsS1mNK8i2z+YjWMvtUZo="; nativeBuildInputs = [ pkg-config From 88a55dffa4d44d294c74c298daf75824dc0aafb5 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Wed, 22 Jan 2025 10:51:00 +0530 Subject: [PATCH 205/287] syndicate_utils: 20240509 -> 20250110 --- pkgs/by-name/sy/syndicate_utils/lock.json | 142 ----- pkgs/by-name/sy/syndicate_utils/package.nix | 13 +- pkgs/by-name/sy/syndicate_utils/sbom.json | 657 ++++++++++++++++++++ 3 files changed, 663 insertions(+), 149 deletions(-) delete mode 100644 pkgs/by-name/sy/syndicate_utils/lock.json create mode 100644 pkgs/by-name/sy/syndicate_utils/sbom.json diff --git a/pkgs/by-name/sy/syndicate_utils/lock.json b/pkgs/by-name/sy/syndicate_utils/lock.json deleted file mode 100644 index 3ffb3c36c33d..000000000000 --- a/pkgs/by-name/sy/syndicate_utils/lock.json +++ /dev/null @@ -1,142 +0,0 @@ -{ - "depends": [ - { - "method": "fetchzip", - "packages": [ - "cps" - ], - "path": "/nix/store/8gbhwni0akqskdb3qhn5nfgv6gkdz0vz-source", - "rev": "c90530ac57f98a842b7be969115c6ef08bdcc564", - "sha256": "0h8ghs2fqg68j3jdcg7grnxssmllmgg99kym2w0a3vlwca1zvr62", - "srcDir": "", - "url": "https://github.com/ehmry/cps/archive/c90530ac57f98a842b7be969115c6ef08bdcc564.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "getdns" - ], - "path": "/nix/store/x9xmn7w4k6jg8nv5bnx148ibhnsfh362-source", - "rev": "c73cbe288d9f9480586b8fa87f6d794ffb6a6ce6", - "sha256": "1sbgx2x51szr22i72n7c8jglnfmr8m7y7ga0v85d58fwadiv7g6b", - "srcDir": "src", - "url": "https://git.sr.ht/~ehmry/getdns-nim/archive/c73cbe288d9f9480586b8fa87f6d794ffb6a6ce6.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "hashlib" - ], - "path": "/nix/store/fav82xdbicvlk34nmcbl89zx99lr3mbs-source", - "rev": "f9455d4be988e14e3dc7933eb7cc7d7c4820b7ac", - "sha256": "1sx6j952lj98629qfgr7ds5aipyw9d6lldcnnqs205wpj4pkcjb3", - "srcDir": "", - "url": "https://github.com/ehmry/hashlib/archive/f9455d4be988e14e3dc7933eb7cc7d7c4820b7ac.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "preserves" - ], - "path": "/nix/store/hzb7af7lbd4kgd5y4hbgxv1lswig36yj-source", - "rev": "fd498c6457cb9ad2f3179daa40da69eec00326dd", - "sha256": "182xvw04vjw83mlcrkwkip29b44h0v8dapg2014k9011h90mdsj4", - "srcDir": "src", - "url": "https://git.syndicate-lang.org/ehmry/preserves-nim/archive/fd498c6457cb9ad2f3179daa40da69eec00326dd.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "stew" - ], - "path": "/nix/store/mqg8qzsbcc8xqabq2yzvlhvcyqypk72c-source", - "rev": "3c91b8694e15137a81ec7db37c6c58194ec94a6a", - "sha256": "17lfhfxp5nxvld78xa83p258y80ks5jb4n53152cdr57xk86y07w", - "srcDir": "", - "url": "https://github.com/status-im/nim-stew/archive/3c91b8694e15137a81ec7db37c6c58194ec94a6a.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "syndicate" - ], - "path": "/nix/store/dw30cq9gxz3353zgaq4a36ajq6chvbwc-source", - "rev": "3a4dc1f13392830b587138199643d30fdbec8541", - "sha256": "1mbd17rjm1fsx7d0ckzyjih2nzdjqs52ck9wscqcg9nvf3ib5mvh", - "srcDir": "src", - "url": "https://git.syndicate-lang.org/ehmry/syndicate-nim/archive/3a4dc1f13392830b587138199643d30fdbec8541.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "sys" - ], - "path": "/nix/store/syhxsjlsdqfap0hk4qp3s6kayk8cqknd-source", - "rev": "4ef3b624db86e331ba334e705c1aa235d55b05e1", - "sha256": "1q4qgw4an4mmmcbx48l6xk1jig1vc8p9cq9dbx39kpnb0890j32q", - "srcDir": "src", - "url": "https://github.com/ehmry/nim-sys/archive/4ef3b624db86e331ba334e705c1aa235d55b05e1.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "taps" - ], - "path": "/nix/store/6y14ia52kr7jyaa0izx37mlablmq9s65-source", - "rev": "8c8572cd971d1283e6621006b310993c632da247", - "sha256": "1dp166bv9x773jmfqppg5i3v3rilgff013vb11yzwcid9l7s3iy8", - "srcDir": "src", - "url": "https://git.sr.ht/~ehmry/nim_taps/archive/8c8572cd971d1283e6621006b310993c632da247.tar.gz" - }, - { - "date": "2024-04-02T15:38:57+01:00", - "deepClone": false, - "fetchLFS": false, - "fetchSubmodules": true, - "hash": "sha256-iZb9aAgYr4FGkqfIg49QWiCqeizIi047kFhugHiP8o0=", - "leaveDotGit": false, - "method": "git", - "packages": [ - "solo5_dispatcher" - ], - "path": "/nix/store/sf5dgj2ljvahcm6my7d61ibda51vnrii-solo5_dispatcher", - "rev": "a7a894a96a2221284012800e6fd32923d83d20bd", - "sha256": "13gjixw80vjqj0xlx2y85ixal82sa27q7j57j9383bqq11lgv5l9", - "srcDir": "pkg", - "url": "https://git.sr.ht/~ehmry/solo5_dispatcher" - }, - { - "method": "fetchzip", - "packages": [ - "bigints" - ], - "path": "/nix/store/jvrm392g8adfsgf36prgwkbyd7vh5jsw-source", - "rev": "86ea14d31eea9275e1408ca34e6bfe9c99989a96", - "sha256": "15pcpmnk1bnw3k8769rjzcpg00nahyrypwbxs88jnwr4aczp99j4", - "srcDir": "src", - "url": "https://github.com/ehmry/nim-bigints/archive/86ea14d31eea9275e1408ca34e6bfe9c99989a96.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "nimcrypto" - ], - "path": "/nix/store/h7lgq3by9mx8in03vzh0y964lnnlkalp-source", - "rev": "ff6afc6a753bd645cad4568472c7733d1715e31e", - "sha256": "0h9vpayp66pg66114bl0nsvlv1nzp7f0x5b35gbsbd7svzlcz5zj", - "srcDir": "", - "url": "https://github.com/cheatfate/nimcrypto/archive/ff6afc6a753bd645cad4568472c7733d1715e31e.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "npeg" - ], - "path": "/nix/store/xpn694ibgipj8xak3j4bky6b3k0vp7hh-source", - "rev": "ec0cc6e64ea4c62d2aa382b176a4838474238f8d", - "sha256": "1fi9ls3xl20bmv1ikillxywl96i9al6zmmxrbffx448gbrxs86kg", - "srcDir": "src", - "url": "https://github.com/zevv/npeg/archive/ec0cc6e64ea4c62d2aa382b176a4838474238f8d.tar.gz" - } - ] -} diff --git a/pkgs/by-name/sy/syndicate_utils/package.nix b/pkgs/by-name/sy/syndicate_utils/package.nix index ee425f44d5d7..c6db93770c48 100644 --- a/pkgs/by-name/sy/syndicate_utils/package.nix +++ b/pkgs/by-name/sy/syndicate_utils/package.nix @@ -1,6 +1,6 @@ { lib, - buildNimPackage, + buildNimSbom, fetchFromGitea, libxml2, libxslt, @@ -9,27 +9,26 @@ sqlite, }: -buildNimPackage (finalAttrs: { +buildNimSbom (finalAttrs: { pname = "syndicate_utils"; - version = "20240509"; src = fetchFromGitea { domain = "git.syndicate-lang.org"; owner = "ehmry"; repo = "syndicate_utils"; rev = finalAttrs.version; - hash = "sha256-Sy6Ad0nNr/0y5W4z3SzlwfsA8hiXzlOPDOGdwbCYROs="; + hash = "sha256-X8sb/2mkhVp0jJpTk9uYSDhAVui4jHl355amRCnkNhA="; }; buildInputs = [ - postgresql.out + postgresql sqlite libxml2 libxslt openssl ]; - lockFile = ./lock.json; + nimFlags = [ "--define:nimPreviewHashRef" ]; meta = finalAttrs.src.meta // { description = "Utilities for the Syndicated Actor Model"; @@ -37,4 +36,4 @@ buildNimPackage (finalAttrs: { maintainers = [ lib.maintainers.ehmry ]; license = lib.licenses.unlicense; }; -}) +}) ./sbom.json diff --git a/pkgs/by-name/sy/syndicate_utils/sbom.json b/pkgs/by-name/sy/syndicate_utils/sbom.json new file mode 100644 index 000000000000..46a8e74877cf --- /dev/null +++ b/pkgs/by-name/sy/syndicate_utils/sbom.json @@ -0,0 +1,657 @@ +{ + "bomFormat": "CycloneDX", + "specVersion": "1.6", + "metadata": { + "component": { + "type": "application", + "bom-ref": "pkg:nim/syndicate_utils", + "name": "syndicate_utils", + "description": "Utilites for Syndicated Actors and Synit", + "version": "20250110", + "authors": [ + { + "name": "Emery Hemingway" + } + ], + "licenses": [ + { + "license": { + "id": "Unlicense" + } + } + ], + "properties": [ + { + "name": "nim:skipExt", + "value": "nim" + }, + { + "name": "nim:bin:dns-actor", + "value": "dns_actor" + }, + { + "name": "nim:bin:esc-printer-driver", + "value": "esc_printer_driver" + }, + { + "name": "nim:bin:mintsturdyref", + "value": "mintsturdyref" + }, + { + "name": "nim:bin:mount-actor", + "value": "mount_actor" + }, + { + "name": "nim:bin:msg", + "value": "msg" + }, + { + "name": "nim:bin:postgre-actor", + "value": "postgre_actor" + }, + { + "name": "nim:bin:preserve-process-environment", + "value": "preserve_process_environment" + }, + { + "name": "nim:bin:rofi-script-actor", + "value": "rofi_script_actor" + }, + { + "name": "nim:bin:sqlite-actor", + "value": "sqlite_actor" + }, + { + "name": "nim:bin:syndesizer", + "value": "syndesizer" + }, + { + "name": "nim:bin:syndump", + "value": "syndump" + }, + { + "name": "nim:bin:synqa", + "value": "synqa" + }, + { + "name": "nim:bin:xslt-actor", + "value": "xslt_actor" + }, + { + "name": "nim:srcDir", + "value": "src" + }, + { + "name": "nim:backend", + "value": "c" + } + ] + } + }, + "components": [ + { + "type": "library", + "bom-ref": "pkg:nim/syndicate", + "name": "syndicate", + "version": "trunk", + "externalReferences": [ + { + "url": "https://git.syndicate-lang.org/ehmry/syndicate-nim/archive/eb3c522f9f051ceeef4c8518820fcd90fe2a2c2d.tar.gz", + "type": "source-distribution" + }, + { + "url": "https://git.syndicate-lang.org/ehmry/syndicate-nim.git", + "type": "vcs" + } + ], + "properties": [ + { + "name": "nix:fod:method", + "value": "fetchzip" + }, + { + "name": "nix:fod:path", + "value": "/nix/store/sg7dxaz3g2qgb2sp0lzyyl2iwddbxljl-source" + }, + { + "name": "nix:fod:rev", + "value": "eb3c522f9f051ceeef4c8518820fcd90fe2a2c2d" + }, + { + "name": "nix:fod:sha256", + "value": "1gjjybfgw99dm8m5i6nm5zsgs7bavkqw6pgia8pc4n41h4ppshiw" + }, + { + "name": "nix:fod:url", + "value": "https://git.syndicate-lang.org/ehmry/syndicate-nim/archive/eb3c522f9f051ceeef4c8518820fcd90fe2a2c2d.tar.gz" + }, + { + "name": "nix:fod:ref", + "value": "trunk" + }, + { + "name": "nix:fod:srcDir", + "value": "src" + } + ] + }, + { + "type": "library", + "bom-ref": "pkg:nim/preserves", + "name": "preserves", + "version": "20241221", + "externalReferences": [ + { + "url": "https://git.syndicate-lang.org/ehmry/preserves-nim/archive/c9f5806b153b2fd3ed8f868f8cf36cdbc25cd3d5.tar.gz", + "type": "source-distribution" + }, + { + "url": "https://git.syndicate-lang.org/ehmry/preserves-nim.git", + "type": "vcs" + } + ], + "properties": [ + { + "name": "nix:fod:method", + "value": "fetchzip" + }, + { + "name": "nix:fod:path", + "value": "/nix/store/jr5la48ywfs0ghn5v5256rjqwyxzmd7a-source" + }, + { + "name": "nix:fod:rev", + "value": "c9f5806b153b2fd3ed8f868f8cf36cdbc25cd3d5" + }, + { + "name": "nix:fod:sha256", + "value": "1fh8r9mhr3f4mf45fc1shnqfxdrdlif1nsvqd016ni16vmcvclmc" + }, + { + "name": "nix:fod:url", + "value": "https://git.syndicate-lang.org/ehmry/preserves-nim/archive/c9f5806b153b2fd3ed8f868f8cf36cdbc25cd3d5.tar.gz" + }, + { + "name": "nix:fod:ref", + "value": "20241221" + }, + { + "name": "nix:fod:srcDir", + "value": "src" + }, + { + "name": "nix:fod:date", + "value": "2024-05-23T15:58:40+03:00" + }, + { + "name": "nix:fod:hash", + "value": "sha256-JvdvLdPajDgIPbLblO0LbOm0wEp530fs8LYmgH885sk=" + } + ] + }, + { + "type": "library", + "bom-ref": "pkg:nim/sys", + "name": "sys", + "version": "4ef3b624db86e331ba334e705c1aa235d55b05e1", + "externalReferences": [ + { + "url": "https://github.com/ehmry/nim-sys/archive/4ef3b624db86e331ba334e705c1aa235d55b05e1.tar.gz", + "type": "source-distribution" + }, + { + "url": "https://github.com/ehmry/nim-sys.git", + "type": "vcs" + } + ], + "properties": [ + { + "name": "nix:fod:method", + "value": "fetchzip" + }, + { + "name": "nix:fod:path", + "value": "/nix/store/syhxsjlsdqfap0hk4qp3s6kayk8cqknd-source" + }, + { + "name": "nix:fod:rev", + "value": "4ef3b624db86e331ba334e705c1aa235d55b05e1" + }, + { + "name": "nix:fod:sha256", + "value": "1q4qgw4an4mmmcbx48l6xk1jig1vc8p9cq9dbx39kpnb0890j32q" + }, + { + "name": "nix:fod:url", + "value": "https://github.com/ehmry/nim-sys/archive/4ef3b624db86e331ba334e705c1aa235d55b05e1.tar.gz" + }, + { + "name": "nix:fod:srcDir", + "value": "src" + } + ] + }, + { + "type": "library", + "bom-ref": "pkg:nim/taps", + "name": "taps", + "version": "20240405", + "externalReferences": [ + { + "url": "https://git.sr.ht/~ehmry/nim_taps/archive/8c8572cd971d1283e6621006b310993c632da247.tar.gz", + "type": "source-distribution" + }, + { + "url": "https://git.sr.ht/~ehmry/nim_taps", + "type": "vcs" + } + ], + "properties": [ + { + "name": "nix:fod:method", + "value": "fetchzip" + }, + { + "name": "nix:fod:path", + "value": "/nix/store/6y14ia52kr7jyaa0izx37mlablmq9s65-source" + }, + { + "name": "nix:fod:rev", + "value": "8c8572cd971d1283e6621006b310993c632da247" + }, + { + "name": "nix:fod:sha256", + "value": "1dp166bv9x773jmfqppg5i3v3rilgff013vb11yzwcid9l7s3iy8" + }, + { + "name": "nix:fod:url", + "value": "https://git.sr.ht/~ehmry/nim_taps/archive/8c8572cd971d1283e6621006b310993c632da247.tar.gz" + }, + { + "name": "nix:fod:ref", + "value": "20240405" + }, + { + "name": "nix:fod:srcDir", + "value": "src" + } + ] + }, + { + "type": "library", + "bom-ref": "pkg:nim/nimcrypto", + "name": "nimcrypto", + "version": "traditional-api", + "externalReferences": [ + { + "url": "https://github.com/cheatfate/nimcrypto/archive/602c5d20c69c76137201b5d41f788f72afb95aa8.tar.gz", + "type": "source-distribution" + }, + { + "url": "https://github.com/cheatfate/nimcrypto", + "type": "vcs" + } + ], + "properties": [ + { + "name": "nix:fod:method", + "value": "fetchzip" + }, + { + "name": "nix:fod:path", + "value": "/nix/store/zyr8zwh7vaiycn1s4r8cxwc71f2k5l0h-source" + }, + { + "name": "nix:fod:rev", + "value": "602c5d20c69c76137201b5d41f788f72afb95aa8" + }, + { + "name": "nix:fod:sha256", + "value": "1dmdmgb6b9m5f8dyxk781nnd61dsk3hdxqks7idk9ncnpj9fng65" + }, + { + "name": "nix:fod:url", + "value": "https://github.com/cheatfate/nimcrypto/archive/602c5d20c69c76137201b5d41f788f72afb95aa8.tar.gz" + }, + { + "name": "nix:fod:ref", + "value": "traditional-api" + } + ] + }, + { + "type": "library", + "bom-ref": "pkg:nim/npeg", + "name": "npeg", + "version": "1.2.2", + "externalReferences": [ + { + "url": "https://github.com/zevv/npeg/archive/ec0cc6e64ea4c62d2aa382b176a4838474238f8d.tar.gz", + "type": "source-distribution" + }, + { + "url": "https://github.com/zevv/npeg.git", + "type": "vcs" + } + ], + "properties": [ + { + "name": "nix:fod:method", + "value": "fetchzip" + }, + { + "name": "nix:fod:path", + "value": "/nix/store/xpn694ibgipj8xak3j4bky6b3k0vp7hh-source" + }, + { + "name": "nix:fod:rev", + "value": "ec0cc6e64ea4c62d2aa382b176a4838474238f8d" + }, + { + "name": "nix:fod:sha256", + "value": "1fi9ls3xl20bmv1ikillxywl96i9al6zmmxrbffx448gbrxs86kg" + }, + { + "name": "nix:fod:url", + "value": "https://github.com/zevv/npeg/archive/ec0cc6e64ea4c62d2aa382b176a4838474238f8d.tar.gz" + }, + { + "name": "nix:fod:ref", + "value": "1.2.2" + }, + { + "name": "nix:fod:srcDir", + "value": "src" + } + ] + }, + { + "type": "library", + "bom-ref": "pkg:nim/bigints", + "name": "bigints", + "version": "20231006", + "externalReferences": [ + { + "url": "https://github.com/ehmry/nim-bigints/archive/86ea14d31eea9275e1408ca34e6bfe9c99989a96.tar.gz", + "type": "source-distribution" + }, + { + "url": "https://github.com/ehmry/nim-bigints.git", + "type": "vcs" + } + ], + "properties": [ + { + "name": "nix:fod:method", + "value": "fetchzip" + }, + { + "name": "nix:fod:path", + "value": "/nix/store/jvrm392g8adfsgf36prgwkbyd7vh5jsw-source" + }, + { + "name": "nix:fod:rev", + "value": "86ea14d31eea9275e1408ca34e6bfe9c99989a96" + }, + { + "name": "nix:fod:sha256", + "value": "15pcpmnk1bnw3k8769rjzcpg00nahyrypwbxs88jnwr4aczp99j4" + }, + { + "name": "nix:fod:url", + "value": "https://github.com/ehmry/nim-bigints/archive/86ea14d31eea9275e1408ca34e6bfe9c99989a96.tar.gz" + }, + { + "name": "nix:fod:ref", + "value": "20231006" + }, + { + "name": "nix:fod:srcDir", + "value": "src" + } + ] + }, + { + "type": "library", + "bom-ref": "pkg:nim/cps", + "name": "cps", + "version": "0.10.4", + "externalReferences": [ + { + "url": "https://github.com/nim-works/cps/archive/2a4d771a715ba45cfba3a82fa625ae7ad6591c8b.tar.gz", + "type": "source-distribution" + }, + { + "url": "https://github.com/nim-works/cps", + "type": "vcs" + } + ], + "properties": [ + { + "name": "nix:fod:method", + "value": "fetchzip" + }, + { + "name": "nix:fod:path", + "value": "/nix/store/m9vpcf3dq6z2h1xpi1vlw0ycxp91s5p7-source" + }, + { + "name": "nix:fod:rev", + "value": "2a4d771a715ba45cfba3a82fa625ae7ad6591c8b" + }, + { + "name": "nix:fod:sha256", + "value": "0c62k5wpq9z9mn8cd4rm8jjc4z0xmnak4piyj5dsfbyj6sbdw2bf" + }, + { + "name": "nix:fod:url", + "value": "https://github.com/nim-works/cps/archive/2a4d771a715ba45cfba3a82fa625ae7ad6591c8b.tar.gz" + }, + { + "name": "nix:fod:ref", + "value": "0.10.4" + } + ] + }, + { + "type": "library", + "bom-ref": "pkg:nim/stew", + "name": "stew", + "version": "3c91b8694e15137a81ec7db37c6c58194ec94a6a", + "externalReferences": [ + { + "url": "https://github.com/status-im/nim-stew/archive/3c91b8694e15137a81ec7db37c6c58194ec94a6a.tar.gz", + "type": "source-distribution" + }, + { + "url": "https://github.com/status-im/nim-stew", + "type": "vcs" + } + ], + "properties": [ + { + "name": "nix:fod:method", + "value": "fetchzip" + }, + { + "name": "nix:fod:path", + "value": "/nix/store/mqg8qzsbcc8xqabq2yzvlhvcyqypk72c-source" + }, + { + "name": "nix:fod:rev", + "value": "3c91b8694e15137a81ec7db37c6c58194ec94a6a" + }, + { + "name": "nix:fod:sha256", + "value": "17lfhfxp5nxvld78xa83p258y80ks5jb4n53152cdr57xk86y07w" + }, + { + "name": "nix:fod:url", + "value": "https://github.com/status-im/nim-stew/archive/3c91b8694e15137a81ec7db37c6c58194ec94a6a.tar.gz" + } + ] + }, + { + "type": "library", + "bom-ref": "pkg:nim/getdns", + "name": "getdns", + "version": "20241222", + "externalReferences": [ + { + "url": "https://git.sr.ht/~ehmry/getdns-nim/archive/7cdedf05a2d9b3b6b0fffcfc548c63986ac7f5a7.tar.gz", + "type": "source-distribution" + }, + { + "url": "https://git.sr.ht/~ehmry/getdns-nim", + "type": "vcs" + } + ], + "properties": [ + { + "name": "nix:fod:method", + "value": "fetchzip" + }, + { + "name": "nix:fod:path", + "value": "/nix/store/k662j228f0xh75d75jb212zhy5qd85dv-source" + }, + { + "name": "nix:fod:rev", + "value": "7cdedf05a2d9b3b6b0fffcfc548c63986ac7f5a7" + }, + { + "name": "nix:fod:sha256", + "value": "1j80pv2kv7hxcmxpy6ykil01jywffaagcb1jad5aam4m9r2bfbp0" + }, + { + "name": "nix:fod:url", + "value": "https://git.sr.ht/~ehmry/getdns-nim/archive/7cdedf05a2d9b3b6b0fffcfc548c63986ac7f5a7.tar.gz" + }, + { + "name": "nix:fod:ref", + "value": "20241222" + }, + { + "name": "nix:fod:srcDir", + "value": "src" + } + ] + }, + { + "type": "library", + "bom-ref": "pkg:nim/solo5_dispatcher", + "name": "solo5_dispatcher", + "version": "20240522", + "externalReferences": [ + { + "url": "https://git.sr.ht/~ehmry/solo5_dispatcher/archive/cc64ef99416b22b12e4a076d33de9e25a163e57d.tar.gz", + "type": "source-distribution" + }, + { + "url": "https://git.sr.ht/~ehmry/solo5_dispatcher", + "type": "vcs" + } + ], + "properties": [ + { + "name": "nix:fod:method", + "value": "fetchzip" + }, + { + "name": "nix:fod:path", + "value": "/nix/store/4jj467pg4hs6warhksb8nsxn9ykz8c7c-source" + }, + { + "name": "nix:fod:rev", + "value": "cc64ef99416b22b12e4a076d33de9e25a163e57d" + }, + { + "name": "nix:fod:sha256", + "value": "1v9i9fqgx1g76yrmz2xwj9mxfwbjfpar6dsyygr68fv9031cqxq7" + }, + { + "name": "nix:fod:url", + "value": "https://git.sr.ht/~ehmry/solo5_dispatcher/archive/cc64ef99416b22b12e4a076d33de9e25a163e57d.tar.gz" + }, + { + "name": "nix:fod:ref", + "value": "20240522" + }, + { + "name": "nix:fod:srcDir", + "value": "pkg" + } + ] + } + ], + "dependencies": [ + { + "ref": "pkg:nim/syndicate_utils", + "dependsOn": [ + "pkg:nim/syndicate" + ] + }, + { + "ref": "pkg:nim/syndicate", + "dependsOn": [ + "pkg:nim/nimcrypto", + "pkg:nim/preserves", + "pkg:nim/sys", + "pkg:nim/taps" + ] + }, + { + "ref": "pkg:nim/preserves", + "dependsOn": [ + "pkg:nim/npeg", + "pkg:nim/bigints" + ] + }, + { + "ref": "pkg:nim/sys", + "dependsOn": [ + "pkg:nim/cps", + "pkg:nim/stew" + ] + }, + { + "ref": "pkg:nim/taps", + "dependsOn": [ + "pkg:nim/getdns", + "pkg:nim/sys", + "pkg:nim/cps", + "pkg:nim/solo5_dispatcher" + ] + }, + { + "ref": "pkg:nim/nimcrypto", + "dependsOn": [] + }, + { + "ref": "pkg:nim/npeg", + "dependsOn": [] + }, + { + "ref": "pkg:nim/bigints", + "dependsOn": [] + }, + { + "ref": "pkg:nim/cps", + "dependsOn": [] + }, + { + "ref": "pkg:nim/stew", + "dependsOn": [] + }, + { + "ref": "pkg:nim/getdns", + "dependsOn": [] + }, + { + "ref": "pkg:nim/solo5_dispatcher", + "dependsOn": [ + "pkg:nim/cps" + ] + } + ] +} From 953f72e76ec2379b28894a2457a372666c4d1acc Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 27 Jan 2025 02:10:23 +0100 Subject: [PATCH 206/287] nixos/*: tag manpage references --- nixos/modules/config/ldap.nix | 4 ++-- nixos/modules/config/mysql.nix | 2 +- nixos/modules/config/swap.nix | 6 +++--- nixos/modules/config/users-groups.nix | 2 +- nixos/modules/config/xdg/portals/wlr.nix | 2 +- nixos/modules/programs/gamemode.nix | 2 +- nixos/modules/programs/git.nix | 2 +- nixos/modules/programs/msmtp.nix | 6 +++--- nixos/modules/programs/shadow.nix | 2 +- nixos/modules/security/pam.nix | 2 +- nixos/modules/security/wrappers/default.nix | 2 +- nixos/modules/services/backup/btrbk.nix | 4 ++-- nixos/modules/services/backup/restic.nix | 2 +- nixos/modules/services/backup/tarsnap.nix | 8 ++++---- nixos/modules/services/cluster/k3s/default.nix | 2 +- nixos/modules/services/hardware/libinput.nix | 2 +- nixos/modules/services/hardware/thinkfan.nix | 4 ++-- nixos/modules/services/hardware/upower.nix | 2 +- .../modules/services/home-automation/esphome.nix | 2 +- nixos/modules/services/logging/journalwatch.nix | 6 +++--- nixos/modules/services/logging/syslogd.nix | 2 +- nixos/modules/services/mail/clamsmtp.nix | 6 +++--- nixos/modules/services/mail/cyrus-imap.nix | 6 +++--- nixos/modules/services/mail/offlineimap.nix | 4 ++-- nixos/modules/services/mail/opendkim.nix | 2 +- nixos/modules/services/mail/postfix.nix | 8 ++++---- nixos/modules/services/mail/postgrey.nix | 6 +++--- nixos/modules/services/misc/gpsd.nix | 2 +- .../monitoring/prometheus/exporters/restic.nix | 2 +- .../services/network-filesystems/cachefilesd.nix | 2 +- .../network-filesystems/openafs/client.nix | 2 +- .../network-filesystems/openafs/server.nix | 2 +- nixos/modules/services/networking/cgit.nix | 4 ++-- .../services/networking/hylafax/options.nix | 8 ++++---- nixos/modules/services/networking/minidlna.nix | 2 +- nixos/modules/services/networking/ngircd.nix | 2 +- nixos/modules/services/networking/ntopng.nix | 2 +- nixos/modules/services/networking/pppd.nix | 2 +- nixos/modules/services/networking/privoxy.nix | 2 +- nixos/modules/services/networking/r53-ddns.nix | 2 +- .../services/networking/robustirc-bridge.nix | 2 +- nixos/modules/services/networking/rpcbind.nix | 2 +- nixos/modules/services/networking/searx.nix | 2 +- nixos/modules/services/networking/ssh/sshd.nix | 4 ++-- nixos/modules/services/networking/tinydns.nix | 2 +- nixos/modules/services/security/clamav.nix | 6 +++--- nixos/modules/services/torrent/transmission.nix | 2 +- nixos/modules/services/web-apps/cloudlog.nix | 16 ++++++++-------- nixos/modules/services/web-apps/dex.nix | 2 +- nixos/modules/services/web-apps/gotosocial.nix | 2 +- nixos/modules/services/web-apps/miniflux.nix | 2 +- nixos/modules/services/web-servers/merecat.nix | 2 +- nixos/modules/services/web-servers/minio.nix | 2 +- nixos/modules/services/web-servers/pomerium.nix | 2 +- nixos/modules/services/web-servers/uwsgi.nix | 2 +- .../services/x11/display-managers/startx.nix | 2 +- .../modules/services/x11/display-managers/sx.nix | 2 +- nixos/modules/services/x11/picom.nix | 6 +++--- .../system/activation/activation-script.nix | 2 +- nixos/modules/system/boot/systemd/coredump.nix | 2 +- nixos/modules/system/boot/systemd/initrd.nix | 2 +- nixos/modules/system/boot/timesyncd.nix | 4 ++-- nixos/modules/tasks/filesystems/nfs.nix | 2 +- nixos/modules/tasks/network-interfaces.nix | 4 ++-- nixos/modules/virtualisation/docker.nix | 2 +- .../modules/virtualisation/nixos-containers.nix | 10 +++++----- nixos/modules/virtualisation/oci-containers.nix | 2 +- nixos/modules/virtualisation/waagent.nix | 2 +- 68 files changed, 112 insertions(+), 112 deletions(-) diff --git a/nixos/modules/config/ldap.nix b/nixos/modules/config/ldap.nix index 3a63b6d5ca2c..0a25edcda9cd 100644 --- a/nixos/modules/config/ldap.nix +++ b/nixos/modules/config/ldap.nix @@ -135,7 +135,7 @@ in type = types.lines; description = '' Extra configuration options that will be added verbatim at - the end of the nslcd configuration file (`nslcd.conf(5)`). + the end of the nslcd configuration file ({manpage}`nslcd.conf(5)`). ''; }; @@ -219,7 +219,7 @@ in type = types.lines; description = '' Extra configuration options that will be added verbatim at - the end of the ldap configuration file (`ldap.conf(5)`). + the end of the ldap configuration file ({manpage}`ldap.conf(5)`). If {option}`users.ldap.daemon` is enabled, this configuration will not be used. In that case, use {option}`users.ldap.daemon.extraConfig` instead. diff --git a/nixos/modules/config/mysql.nix b/nixos/modules/config/mysql.nix index 610b03c5e372..5cbd313d4c60 100644 --- a/nixos/modules/config/mysql.nix +++ b/nixos/modules/config/mysql.nix @@ -111,7 +111,7 @@ in - `0` (or `"plain"`): No encryption. Passwords are stored in plaintext. HIGHLY DISCOURAGED. - `1` (or `"Y"`): - Use crypt(3) function. + Use {manpage}`crypt(3)` function. - `2` (or `"mysql"`): Use the MySQL PASSWORD() function. It is possible that the encryption function used by `pam_mysql` is different from that of the MySQL server, as diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix index e945e18b1f25..e262d0fb1c7e 100644 --- a/nixos/modules/config/swap.nix +++ b/nixos/modules/config/swap.nix @@ -46,7 +46,7 @@ let If not specified, the amount of data to read from `source` will be determined by cryptsetup. - See `cryptsetup-open(8)` for details. + See `{manpage}`cryptsetup-open(8)`` for details. ''; }; @@ -60,7 +60,7 @@ let If not specified, the default sector size is determined from the underlying block device. - See `cryptsetup-open(8)` for details. + See `{manpage}`cryptsetup-open(8)`` for details. ''; }; @@ -158,7 +158,7 @@ let whole swap space is discarded at swapon invocation. If "pages", asynchronous discard on freed pages is performed, before returning to the available pages pool. With "both", both policies are activated. - See swapon(8) for more information. + See {manpage}`swapon(8)` for more information. ''; }; diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 38d40e99abd6..eb3c6c1bef7c 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -204,7 +204,7 @@ let homeMode = mkOption { type = types.strMatching "[0-7]{1,5}"; default = "700"; - description = "The user's home directory mode in numeric format. See chmod(1). The mode is only applied if {option}`users.users..createHome` is true."; + description = "The user's home directory mode in numeric format. See {manpage}`chmod(1)`. The mode is only applied if {option}`users.users..createHome` is true."; }; cryptHomeLuks = mkOption { diff --git a/nixos/modules/config/xdg/portals/wlr.nix b/nixos/modules/config/xdg/portals/wlr.nix index 1dd1cf6c7688..076dbda7e37d 100644 --- a/nixos/modules/config/xdg/portals/wlr.nix +++ b/nixos/modules/config/xdg/portals/wlr.nix @@ -28,7 +28,7 @@ in description = '' Configuration for `xdg-desktop-portal-wlr`. - See `xdg-desktop-portal-wlr(5)` for supported + See {manpage}`xdg-desktop-portal-wlr(5)` for supported values. ''; diff --git a/nixos/modules/programs/gamemode.nix b/nixos/modules/programs/gamemode.nix index d70419c32023..00ccfc076cef 100644 --- a/nixos/modules/programs/gamemode.nix +++ b/nixos/modules/programs/gamemode.nix @@ -26,7 +26,7 @@ in default = { }; description = '' System-wide configuration for GameMode (/etc/gamemode.ini). - See gamemoded(8) man page for available settings. + See {manpage}`gamemoded(8)` man page for available settings. ''; example = lib.literalExpression '' { diff --git a/nixos/modules/programs/git.nix b/nixos/modules/programs/git.nix index 574cde7e2553..69f50f6ec55f 100644 --- a/nixos/modules/programs/git.nix +++ b/nixos/modules/programs/git.nix @@ -47,7 +47,7 @@ in `config` to `[ { foo.x = 42; } { bar.y = 42; }]` will put the `foo` section before the `bar` section unlike the default alphabetical order, which can be helpful for sections such as `include` and - `includeIf`. See the CONFIGURATION FILE section of git-config(1) for + `includeIf`. See the CONFIGURATION FILE section of {manpage}`git-config(1)` for more information. ''; }; diff --git a/nixos/modules/programs/msmtp.nix b/nixos/modules/programs/msmtp.nix index 7a1941e0f949..11faf345388e 100644 --- a/nixos/modules/programs/msmtp.nix +++ b/nixos/modules/programs/msmtp.nix @@ -34,7 +34,7 @@ in }; description = '' Default values applied to all accounts. - See msmtp(1) for the available options. + See {manpage}`msmtp(1)` for the available options. ''; }; @@ -52,7 +52,7 @@ in description = '' Named accounts and their respective configurations. The special name "default" allows a default account to be defined. - See msmtp(1) for the available options. + See {manpage}`msmtp(1)` for the available options. Use `programs.msmtp.extraConfig` instead of this attribute set-based option if ordered account inheritance is needed. @@ -68,7 +68,7 @@ in default = ""; description = '' Extra lines to add to the msmtp configuration verbatim. - See msmtp(1) for the syntax and available options. + See {manpage}`msmtp(1)` for the syntax and available options. ''; }; }; diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix index ef5bad69e934..ba3235eef7d1 100644 --- a/nixos/modules/programs/shadow.nix +++ b/nixos/modules/programs/shadow.nix @@ -31,7 +31,7 @@ in description = '' Config options for the /etc/login.defs file, that defines the site-specific configuration for the shadow password suite. - See login.defs(5) man page for available options. + See {manpage}`login.defs(5)` man page for available options. ''; type = lib.types.submodule { freeformType = (pkgs.formats.keyValue { }).type; diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 6cde0c5527ad..e0834c54d91f 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -1483,7 +1483,7 @@ in the YubiCloud. Use "challenge-response" for offline validation using YubiKeys with HMAC-SHA-1 - Challenge-Response configurations. See the man-page ykpamcfg(1) for further + Challenge-Response configurations. See the man-page {manpage}`ykpamcfg(1)` for further details on how to configure offline Challenge-Response validation. More information can be found [here](https://developers.yubico.com/yubico-pam/Authentication_Using_Challenge-Response.html). diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index c885c25c2620..34e91f370179 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -214,7 +214,7 @@ in example = "10G"; type = lib.types.str; description = '' - Size limit for the /run/wrappers tmpfs. Look at mount(8), tmpfs size option, + Size limit for the /run/wrappers tmpfs. Look at {manpage}`mount(8)`, tmpfs size option, for the accepted syntax. WARNING: don't set to less than 64MB. ''; }; diff --git a/nixos/modules/services/backup/btrbk.nix b/nixos/modules/services/backup/btrbk.nix index 03cf7d08fa5a..9e39bb8ed4bb 100644 --- a/nixos/modules/services/backup/btrbk.nix +++ b/nixos/modules/services/backup/btrbk.nix @@ -163,7 +163,7 @@ in default = 10; }; ioSchedulingClass = mkOption { - description = "IO scheduling class for btrbk (see ionice(1) for a quick description). Applies to local instances, and remote ones connecting by ssh if set to idle."; + description = "IO scheduling class for btrbk (see {manpage}`ionice(1)` for a quick description). Applies to local instances, and remote ones connecting by ssh if set to idle."; type = types.enum [ "idle" "best-effort" @@ -181,7 +181,7 @@ in type = types.nullOr types.str; default = "daily"; description = '' - How often this btrbk instance is started. See systemd.time(7) for more information about the format. + How often this btrbk instance is started. See {manpage}`systemd.time(7)` for more information about the format. Setting it to null disables the timer, thus this instance can only be started manually. ''; }; diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index e4ca2740f8e1..604f399e0088 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -23,7 +23,7 @@ in default = null; description = '' file containing the credentials to access the repository, in the - format of an EnvironmentFile as described by systemd.exec(5) + format of an EnvironmentFile as described by {manpage}`systemd.exec(5)` ''; }; diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix index 235042a143e6..83edd0df3316 100644 --- a/nixos/modules/services/backup/tarsnap.nix +++ b/nixos/modules/services/backup/tarsnap.nix @@ -60,8 +60,8 @@ in `"/root/tarsnap.key"`. It's recommended for backups that you generate a key for every archive - using `tarsnap-keygen(1)`, and then generate a - write-only tarsnap key using `tarsnap-keymgmt(1)`, + using {manpage}`tarsnap-keygen(1)`, and then generate a + write-only tarsnap key using {manpage}`tarsnap-keymgmt(1)`, and keep your master key(s) for a particular machine off-site. The keyfile name should be given as a string and not a path, to @@ -86,11 +86,11 @@ in Use this option if you want to run multiple backups concurrently - each archive must have a unique key. You can generate a write-only key derived from your master key (which - is recommended) using `tarsnap-keymgmt(1)`. + is recommended) using {manpage}`tarsnap-keymgmt(1)`. Note: every archive must have an individual master key. You must generate multiple keys with - `tarsnap-keygen(1)`, and then generate write + {manpage}`tarsnap-keygen(1)`, and then generate write only keys from those. The keyfile name should be given as a string and not a path, to diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix index 97019ba5cb4d..f95ee01c7503 100644 --- a/nixos/modules/services/cluster/k3s/default.nix +++ b/nixos/modules/services/cluster/k3s/default.nix @@ -227,7 +227,7 @@ in environmentFile = lib.mkOption { type = lib.types.nullOr lib.types.path; description = '' - File path containing environment variables for configuring the k3s service in the format of an EnvironmentFile. See systemd.exec(5). + File path containing environment variables for configuring the k3s service in the format of an EnvironmentFile. See {manpage}`systemd.exec(5)`. ''; default = null; }; diff --git a/nixos/modules/services/hardware/libinput.nix b/nixos/modules/services/hardware/libinput.nix index 1ef62640ecce..47f5a8db327a 100644 --- a/nixos/modules/services/hardware/libinput.nix +++ b/nixos/modules/services/hardware/libinput.nix @@ -136,7 +136,7 @@ let default = null; example = "1 6 3 4 5 0 7"; description = '' - Sets the logical button mapping for this device, see XSetPointerMapping(3). The string must + Sets the logical button mapping for this device, see {manpage}`XSetPointerMapping(3)`. The string must be a space-separated list of button mappings in the order of the logical buttons on the device, starting with button 1. The default mapping is "1 2 3 ... 32". A mapping of 0 deac‐ tivates the button. Multiple buttons can have the same mapping. Invalid mapping strings are diff --git a/nixos/modules/services/hardware/thinkfan.nix b/nixos/modules/services/hardware/thinkfan.nix index 01c61a0e8147..023c0be0e2c7 100644 --- a/nixos/modules/services/hardware/thinkfan.nix +++ b/nixos/modules/services/hardware/thinkfan.nix @@ -249,7 +249,7 @@ in ]; description = '' A list of extra command line arguments to pass to thinkfan. - Check the thinkfan(1) manpage for available arguments. + Check the {manpage}`thinkfan(1)` manpage for available arguments. ''; }; @@ -259,7 +259,7 @@ in description = '' Thinkfan settings. Use this option to configure thinkfan settings not exposed in a NixOS option or to bypass one. - Before changing this, read the `thinkfan.conf(5)` + Before changing this, read the `{manpage}`thinkfan.conf(5)`` manpage and take a look at the example config file at ''; diff --git a/nixos/modules/services/hardware/upower.nix b/nixos/modules/services/hardware/upower.nix index 7b2ae8e8eee4..5a459a40d800 100644 --- a/nixos/modules/services/hardware/upower.nix +++ b/nixos/modules/services/hardware/upower.nix @@ -65,7 +65,7 @@ in on or off. We can't do much to fix these problems, but this is a way for users to make the laptop panel vanish, a state that might be used by a couple of user-space daemons. On Linux systems, see also - logind.conf(5). + {manpage}`logind.conf(5)`. ''; }; diff --git a/nixos/modules/services/home-automation/esphome.nix b/nixos/modules/services/home-automation/esphome.nix index 0673454aab89..6f06a704166f 100644 --- a/nixos/modules/services/home-automation/esphome.nix +++ b/nixos/modules/services/home-automation/esphome.nix @@ -67,7 +67,7 @@ in ]; description = '' A list of device nodes to which {command}`esphome` has access to. - Refer to DeviceAllow in systemd.resource-control(5) for more information. + Refer to DeviceAllow in {manpage}`systemd.resource-control(5)` for more information. Beware that if a device is referred to by an absolute path instead of a device category, it will only allow devices that already are plugged in when the service is started. ''; diff --git a/nixos/modules/services/logging/journalwatch.nix b/nixos/modules/services/logging/journalwatch.nix index cfecf9c29428..19ec7f76af8c 100644 --- a/nixos/modules/services/logging/journalwatch.nix +++ b/nixos/modules/services/logging/journalwatch.nix @@ -135,7 +135,7 @@ in this patternBlock's {option}`filters` are applied. If `value` starts and ends with a slash, it is interpreted as an extended python regular expression, if not, it's an exact match. - The journal fields are explained in systemd.journal-fields(7). + The journal fields are explained in {manpage}`systemd.journal-fields(7)`. ''; }; @@ -210,7 +210,7 @@ in description = '' How often to run journalwatch. - The format is described in systemd.time(7). + The format is described in {manpage}`systemd.time(7)`. ''; }; accuracy = lib.mkOption { @@ -219,7 +219,7 @@ in description = '' The time window around the interval in which the journalwatch run will be scheduled. - The format is described in systemd.time(7). + The format is described in {manpage}`systemd.time(7)`. ''; }; }; diff --git a/nixos/modules/services/logging/syslogd.nix b/nixos/modules/services/logging/syslogd.nix index d1994c9f1b8e..fe1a562bdb0c 100644 --- a/nixos/modules/services/logging/syslogd.nix +++ b/nixos/modules/services/logging/syslogd.nix @@ -70,7 +70,7 @@ in type = lib.types.bool; default = false; description = '' - Accept logging through UDP. Option -r of syslogd(8). + Accept logging through UDP. Option -r of {manpage}`syslogd(8)`. ''; }; diff --git a/nixos/modules/services/mail/clamsmtp.nix b/nixos/modules/services/mail/clamsmtp.nix index e54d8893a3b6..6def179e5e10 100644 --- a/nixos/modules/services/mail/clamsmtp.nix +++ b/nixos/modules/services/mail/clamsmtp.nix @@ -43,7 +43,7 @@ in default = ""; example = "X-Virus-Scanned: ClamAV using ClamSMTP"; description = '' - A header to add to scanned messages. See clamsmtpd.conf(5) for + A header to add to scanned messages. See {manpage}`clamsmtpd.conf(5)` for more details. Empty means no header. ''; }; @@ -65,7 +65,7 @@ in example = "127.0.0.1:10025"; description = '' Address to wait for incoming SMTP connections on. See - clamsmtpd.conf(5) for more details. + {manpage}`clamsmtpd.conf(5)` for more details. ''; }; @@ -118,7 +118,7 @@ in default = null; description = '' Command to run when a virus is found. Please see VIRUS ACTION in - clamsmtpd(8) for a discussion of this option and its safe use. + {manpage}`clamsmtpd(8)` for a discussion of this option and its safe use. ''; }; diff --git a/nixos/modules/services/mail/cyrus-imap.nix b/nixos/modules/services/mail/cyrus-imap.nix index f5ace168b045..12d63431cd73 100644 --- a/nixos/modules/services/mail/cyrus-imap.nix +++ b/nixos/modules/services/mail/cyrus-imap.nix @@ -80,7 +80,7 @@ in type = int; default = 32; description = '' - Socket listen queue backlog size. See listen(2) for more information about a backlog. + Socket listen queue backlog size. See {manpage}`listen(2)` for more information about a backlog. Default is 32, which may be increased if you have a very high connection rate. ''; }; @@ -194,7 +194,7 @@ in DAEMON = mkOption { default = { }; description = '' - This section lists long running daemons to start before any SERVICES are spawned. master(8) will ensure that these processes are running, restarting any process which dies or forks. All listed processes will be shutdown when master(8) is exiting. + This section lists long running daemons to start before any SERVICES are spawned. {manpage}`master(8)` will ensure that these processes are running, restarting any process which dies or forks. All listed processes will be shutdown when {manpage}`master(8)` is exiting. ''; }; }; @@ -221,7 +221,7 @@ in type = path; default = "/run/cyrus/lmtp"; description = '' - Unix socket that lmtpd listens on, used by deliver(8). This should match the path specified in cyrus.conf(5). + Unix socket that lmtpd listens on, used by {manpage}`deliver(8)`. This should match the path specified in {manpage}`cyrus.conf(5)`. ''; }; idlesocket = mkOption { diff --git a/nixos/modules/services/mail/offlineimap.nix b/nixos/modules/services/mail/offlineimap.nix index 419c84739a02..655631b1f4a1 100644 --- a/nixos/modules/services/mail/offlineimap.nix +++ b/nixos/modules/services/mail/offlineimap.nix @@ -37,13 +37,13 @@ in onCalendar = lib.mkOption { type = lib.types.str; default = "*:0/3"; # every 3 minutes - description = "How often is offlineimap started. Default is '*:0/3' meaning every 3 minutes. See systemd.time(7) for more information about the format."; + description = "How often is offlineimap started. Default is '*:0/3' meaning every 3 minutes. See {manpage}`systemd.time(7)` for more information about the format."; }; timeoutStartSec = lib.mkOption { type = lib.types.str; default = "120sec"; # Kill if still alive after 2 minutes - description = "How long waiting for offlineimap before killing it. Default is '120sec' meaning every 2 minutes. See systemd.time(7) for more information about the format."; + description = "How long waiting for offlineimap before killing it. Default is '120sec' meaning every 2 minutes. See {manpage}`systemd.time(7)` for more information about the format."; }; }; config = lib.mkIf (cfg.enable || cfg.install) { diff --git a/nixos/modules/services/mail/opendkim.nix b/nixos/modules/services/mail/opendkim.nix index b2fbd6ce5413..cf5d27405b7a 100644 --- a/nixos/modules/services/mail/opendkim.nix +++ b/nixos/modules/services/mail/opendkim.nix @@ -65,7 +65,7 @@ in defaultText = lib.literalExpression ''"csl:''${config.networking.hostName}"''; example = "csl:example.com,mydomain.net"; description = '' - Local domains set (see `opendkim(8)` for more information on datasets). + Local domains set (see {manpage}`opendkim(8)` for more information on datasets). Messages from them are signed, not verified. ''; }; diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 75e8d8838a09..309e03266197 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -546,7 +546,7 @@ in type = lib.types.lines; default = ""; description = '' - Additional entries to put verbatim into aliases file, cf. man-page aliases(8). + Additional entries to put verbatim into aliases file, cf. man-page {manpage}`aliases(8)`. ''; }; @@ -631,7 +631,7 @@ in type = lib.types.lines; default = ""; description = '' - Entries for the virtual alias map, cf. man-page virtual(5). + Entries for the virtual alias map, cf. man-page {manpage}`virtual(5)`. ''; }; @@ -654,7 +654,7 @@ in List of accepted local users. Specify a bare username, an `"@domain.tld"` wild-card, or a complete `"user@domain.tld"` address. If set, these names end - up in the local recipient map -- see the local(8) man-page -- and + up in the local recipient map -- see the {manpage}`local(8)` man-page -- and effectively replace the system user database lookup that's otherwise used by default. ''; @@ -664,7 +664,7 @@ in default = ""; type = lib.types.lines; description = '' - Entries for the transport map, cf. man-page transport(8). + Entries for the transport map, cf. man-page {manpage}`transport(8)`. ''; }; diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix index 7ce9d40a912a..d655839162b1 100644 --- a/nixos/modules/services/mail/postgrey.nix +++ b/nixos/modules/services/mail/postgrey.nix @@ -119,7 +119,7 @@ in greylistAction = mkOption { type = str; default = "DEFER_IF_PERMIT"; - description = "Response status for greylisted messages (see access(5))"; + description = "Response status for greylisted messages (see {manpage}`access(5)`)"; }; greylistHeader = mkOption { type = str; @@ -170,12 +170,12 @@ in whitelistClients = mkOption { type = listOf path; default = [ ]; - description = "Client address whitelist files (see postgrey(8))"; + description = "Client address whitelist files (see {manpage}`postgrey(8)`)"; }; whitelistRecipients = mkOption { type = listOf path; default = [ ]; - description = "Recipient address whitelist files (see postgrey(8))"; + description = "Recipient address whitelist files (see {manpage}`postgrey(8)`)"; }; }; }; diff --git a/nixos/modules/services/misc/gpsd.nix b/nixos/modules/services/misc/gpsd.nix index 75a323332f36..5f64493cde0f 100644 --- a/nixos/modules/services/misc/gpsd.nix +++ b/nixos/modules/services/misc/gpsd.nix @@ -105,7 +105,7 @@ in ]; description = '' A list of extra command line arguments to pass to gpsd. - Check gpsd(8) mangpage for possible arguments. + Check {manpage}`gpsd(8)` mangpage for possible arguments. ''; }; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/restic.nix b/nixos/modules/services/monitoring/prometheus/exporters/restic.nix index 99cdaf81305b..c8de20be563c 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/restic.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/restic.nix @@ -54,7 +54,7 @@ in default = null; description = '' File containing the credentials to access the repository, in the - format of an EnvironmentFile as described by systemd.exec(5) + format of an EnvironmentFile as described by {manpage}`systemd.exec(5)` ''; }; diff --git a/nixos/modules/services/network-filesystems/cachefilesd.nix b/nixos/modules/services/network-filesystems/cachefilesd.nix index 6408e5949874..0c555fd60181 100644 --- a/nixos/modules/services/network-filesystems/cachefilesd.nix +++ b/nixos/modules/services/network-filesystems/cachefilesd.nix @@ -35,7 +35,7 @@ in type = lib.types.lines; default = ""; example = "brun 10%"; - description = "Additional configuration file entries. See cachefilesd.conf(5) for more information."; + description = "Additional configuration file entries. See {manpage}`cachefilesd.conf(5)` for more information."; }; }; diff --git a/nixos/modules/services/network-filesystems/openafs/client.nix b/nixos/modules/services/network-filesystems/openafs/client.nix index d0989253576b..15c59e8db81f 100644 --- a/nixos/modules/services/network-filesystems/openafs/client.nix +++ b/nixos/modules/services/network-filesystems/openafs/client.nix @@ -73,7 +73,7 @@ in }); description = '' This cell's database server records, added to the global - CellServDB. See CellServDB(5) man page for syntax. Ignored when + CellServDB. See {manpage}`CellServDB(5)` man page for syntax. Ignored when `afsdb` is set to `true`. ''; example = [ diff --git a/nixos/modules/services/network-filesystems/openafs/server.nix b/nixos/modules/services/network-filesystems/openafs/server.nix index 4286bc7dbd54..c3b71cb2b2ba 100644 --- a/nixos/modules/services/network-filesystems/openafs/server.nix +++ b/nixos/modules/services/network-filesystems/openafs/server.nix @@ -117,7 +117,7 @@ in advertisedAddresses = mkOption { type = types.listOf types.str; default = [ ]; - description = "List of IP addresses this server is advertised under. See NetInfo(5)"; + description = "List of IP addresses this server is advertised under. See {manpage}`NetInfo(5)`"; }; cellName = mkOption { diff --git a/nixos/modules/services/networking/cgit.nix b/nixos/modules/services/networking/cgit.nix index 126070aa26cc..9c1f1bf7bf8e 100644 --- a/nixos/modules/services/networking/cgit.nix +++ b/nixos/modules/services/networking/cgit.nix @@ -146,7 +146,7 @@ in }; repos = lib.mkOption { - description = "cgit repository settings, see cgitrc(5)"; + description = "cgit repository settings, see {manpage}`cgitrc(5)`"; type = with lib.types; attrsOf (attrsOf settingType); default = { }; example = { @@ -165,7 +165,7 @@ in }; settings = lib.mkOption { - description = "cgit configuration, see cgitrc(5)"; + description = "cgit configuration, see {manpage}`cgitrc(5)`"; type = lib.types.attrsOf repeatedSettingType; default = { }; example = lib.literalExpression '' diff --git a/nixos/modules/services/networking/hylafax/options.nix b/nixos/modules/services/networking/hylafax/options.nix index 8248f2a82eb0..d03c28c9019d 100644 --- a/nixos/modules/services/networking/hylafax/options.nix +++ b/nixos/modules/services/networking/hylafax/options.nix @@ -194,7 +194,7 @@ in will be symlinked to the location given here. This file must exist and be readable only by the `uucp` user. - See hosts.hfaxd(5) for details. + See {manpage}`hosts.hfaxd(5)` for details. This configuration permits access for all users: ``` environment.etc."hosts.hfaxd" = { @@ -299,7 +299,7 @@ in description = '' purging old files from the spooling area with {file}`faxcron` with the given frequency - (see systemd.time(7)) + (see {manpage}`systemd.time(7)`) ''; }; faxcron.infoDays = mkOption { @@ -339,7 +339,7 @@ in description = '' Purge old files from the spooling area with {file}`faxcron` with the given frequency - (see systemd.time(7)). + (see {manpage}`systemd.time(7)`). ''; }; faxqclean.archiving = mkOption { @@ -356,7 +356,7 @@ in `as-flagged` archives jobs that have been flagged for archiving by sendfax, `always` forces archiving of all jobs. - See also sendfax(1) and faxqclean(8). + See also {manpage}`sendfax(1)` and {manpage}`faxqclean(8)`. ''; }; faxqclean.doneqMinutes = mkOption { diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix index 8363f7950147..3846c8d29a13 100644 --- a/nixos/modules/services/networking/minidlna.nix +++ b/nixos/modules/services/networking/minidlna.nix @@ -12,7 +12,7 @@ in { options.services.minidlna.settings = lib.mkOption { default = {}; - description = "Configuration for `minidlna.conf(5)`."; + description = "Configuration for {manpage}`minidlna.conf(5)`."; type = lib.types.submodule { freeformType = format.type; diff --git a/nixos/modules/services/networking/ngircd.nix b/nixos/modules/services/networking/ngircd.nix index 5b2009e04915..491a34699d2a 100644 --- a/nixos/modules/services/networking/ngircd.nix +++ b/nixos/modules/services/networking/ngircd.nix @@ -29,7 +29,7 @@ in enable = mkEnableOption "the ngircd IRC server"; config = mkOption { - description = "The ngircd configuration (see ngircd.conf(5))."; + description = "The ngircd configuration (see {manpage}`ngircd.conf(5)`)."; type = types.lines; }; diff --git a/nixos/modules/services/networking/ntopng.nix b/nixos/modules/services/networking/ntopng.nix index d8b4b86a2651..a4b718864d37 100644 --- a/nixos/modules/services/networking/ntopng.nix +++ b/nixos/modules/services/networking/ntopng.nix @@ -58,7 +58,7 @@ in interfaces and displays its findings at http://localhost:''${toString config.${opt.http-port}}. Default username and password is admin/admin. - See the ntopng(8) manual page and http://www.ntop.org/products/ntop/ + See the {manpage}`ntopng(8)` manual page and http://www.ntop.org/products/ntop/ for more info. Note that enabling ntopng will also enable redis (key-value diff --git a/nixos/modules/services/networking/pppd.nix b/nixos/modules/services/networking/pppd.nix index b4ea3e213f88..a21ff203fea0 100644 --- a/nixos/modules/services/networking/pppd.nix +++ b/nixos/modules/services/networking/pppd.nix @@ -53,7 +53,7 @@ in config = mkOption { type = types.lines; default = ""; - description = "pppd configuration for this peer, see the pppd(8) man page."; + description = "pppd configuration for this peer, see the {manpage}`pppd(8)` man page."; }; }; } diff --git a/nixos/modules/services/networking/privoxy.nix b/nixos/modules/services/networking/privoxy.nix index 145eee919736..9c9353f175e9 100644 --- a/nixos/modules/services/networking/privoxy.nix +++ b/nixos/modules/services/networking/privoxy.nix @@ -114,7 +114,7 @@ in the disk usage, since Privoxy itself never deletes the certificates. ::: {.note} - The format is that of the `tmpfiles.d(5)` + The format is that of the {manpage}`tmpfiles.d(5)` Age parameter. ::: ''; diff --git a/nixos/modules/services/networking/r53-ddns.nix b/nixos/modules/services/networking/r53-ddns.nix index 9b4fa4c52672..6ca8499fe7e6 100644 --- a/nixos/modules/services/networking/r53-ddns.nix +++ b/nixos/modules/services/networking/r53-ddns.nix @@ -45,7 +45,7 @@ in type = types.str; description = '' File containing the AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY - in the format of an EnvironmentFile as described by systemd.exec(5) + in the format of an EnvironmentFile as described by {manpage}`systemd.exec(5)` ''; }; diff --git a/nixos/modules/services/networking/robustirc-bridge.nix b/nixos/modules/services/networking/robustirc-bridge.nix index 8bd7b12a9d71..36f9b4b46e0c 100644 --- a/nixos/modules/services/networking/robustirc-bridge.nix +++ b/nixos/modules/services/networking/robustirc-bridge.nix @@ -13,7 +13,7 @@ in extraFlags = mkOption { type = types.listOf types.str; default = []; - description = ''Extra flags passed to the {command}`robustirc-bridge` command. See [RobustIRC Documentation](https://robustirc.net/docs/adminguide.html#_bridge) or robustirc-bridge(1) for details.''; + description = ''Extra flags passed to the {command}`robustirc-bridge` command. See [RobustIRC Documentation](https://robustirc.net/docs/adminguide.html#_bridge) or {manpage}`robustirc-bridge(1)` for details.''; example = [ "-network robustirc.net" ]; diff --git a/nixos/modules/services/networking/rpcbind.nix b/nixos/modules/services/networking/rpcbind.nix index e7814e7cdee5..bfa6716c3682 100644 --- a/nixos/modules/services/networking/rpcbind.nix +++ b/nixos/modules/services/networking/rpcbind.nix @@ -16,7 +16,7 @@ with lib; description = '' Whether to enable `rpcbind`, an ONC RPC directory service notably used by NFS and NIS, and which can be queried - using the rpcinfo(1) command. `rpcbind` is a replacement for + using the {manpage}`rpcinfo(1)` command. `rpcbind` is a replacement for `portmap`. ''; }; diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix index 0a3b104ede20..7ad76026a03c 100644 --- a/nixos/modules/services/networking/searx.nix +++ b/nixos/modules/services/networking/searx.nix @@ -56,7 +56,7 @@ in type = types.nullOr types.path; default = null; description = '' - Environment file (see `systemd.exec(5)` + Environment file (see {manpage}`systemd.exec(5)` "EnvironmentFile=" section for the syntax) to define variables for Searx. This option can be used to safely include secret keys into the Searx configuration. diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 26ca39f73d39..ddab9f24b0b8 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -357,7 +357,7 @@ in type = lib.types.nullOr (lib.types.enum [ "QUIET" "FATAL" "ERROR" "INFO" "VERBOSE" "DEBUG" "DEBUG1" "DEBUG2" "DEBUG3" ]); default = "INFO"; # upstream default description = '' - Gives the verbosity level that is used when logging messages from sshd(8). Logging with a DEBUG level + Gives the verbosity level that is used when logging messages from {manpage}`sshd(8)`. Logging with a DEBUG level violates the privacy of users and is not recommended. ''; }; @@ -369,7 +369,7 @@ in # apply if cfg.useDns then "yes" else "no" default = false; description = '' - Specifies whether sshd(8) should look up the remote host name, and to check that the resolved host name for + Specifies whether {manpage}`sshd(8)` should look up the remote host name, and to check that the resolved host name for the remote IP address maps back to the very same IP address. If this option is set to no (the default) then only addresses and not host names may be used in ~/.ssh/authorized_keys from and sshd_config Match Host directives. diff --git a/nixos/modules/services/networking/tinydns.nix b/nixos/modules/services/networking/tinydns.nix index 2c44ad49296d..5fe42ffcd1f8 100644 --- a/nixos/modules/services/networking/tinydns.nix +++ b/nixos/modules/services/networking/tinydns.nix @@ -16,7 +16,7 @@ with lib; data = mkOption { type = types.lines; default = ""; - description = "The DNS data to serve, in the format described by tinydns-data(8)"; + description = "The DNS data to serve, in the format described by {manpage}`tinydns-data(8)`"; }; ip = mkOption { diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix index d4d2fe4689dc..d6df560c9974 100644 --- a/nixos/modules/services/security/clamav.nix +++ b/nixos/modules/services/security/clamav.nix @@ -53,7 +53,7 @@ in type = lib.types.str; default = "hourly"; description = '' - How often freshclam is invoked. See systemd.time(7) for more + How often freshclam is invoked. See {manpage}`systemd.time(7)` for more information about the format. ''; }; @@ -74,7 +74,7 @@ in type = lib.types.str; default = "hourly"; description = '' - How often freshclam is invoked. See systemd.time(7) for more + How often freshclam is invoked. See {manpage}`systemd.time(7)` for more information about the format. ''; }; @@ -105,7 +105,7 @@ in type = lib.types.str; default = "*-*-* 04:00:00"; description = '' - How often clamdscan is invoked. See systemd.time(7) for more + How often clamdscan is invoked. See {manpage}`systemd.time(7)` for more information about the format. By default this runs using 10 cores at most, be sure to run it at a time of low traffic. ''; diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 4d44ee56becd..397b11c3e013 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -181,7 +181,7 @@ in defaultText = literalExpression "if cfg.package == pkgs.transmission_3 then 18 else \"022\""; description = '' Sets transmission's file mode creation mask. - See the umask(2) manpage for more information. + See the {manpage}`umask(2)` manpage for more information. Users who want their saved torrents to be world-writable may want to set this value to 0/`"000"`. diff --git a/nixos/modules/services/web-apps/cloudlog.nix b/nixos/modules/services/web-apps/cloudlog.nix index 0c51a5118bbd..ebf733c1c6d5 100644 --- a/nixos/modules/services/web-apps/cloudlog.nix +++ b/nixos/modules/services/web-apps/cloudlog.nix @@ -173,7 +173,7 @@ in type = str; default = "daily"; description = '' - Specification (in the format described by systemd.time(7)) of the + Specification (in the format described by {manpage}`systemd.time(7)`) of the time at which the LoTW upload will occur. ''; }; @@ -191,7 +191,7 @@ in type = str; default = "daily"; description = '' - Specification (in the format described by systemd.time(7)) of the time + Specification (in the format described by {manpage}`systemd.time(7)`) of the time at which the Clublog upload will occur. ''; }; @@ -210,7 +210,7 @@ in type = str; default = "weekly"; description = '' - Specification (in the format described by systemd.time(7)) of the + Specification (in the format described by {manpage}`systemd.time(7)`) of the time at which the LoTW user update will occur. ''; }; @@ -228,7 +228,7 @@ in type = str; default = "monthly"; description = '' - Specification (in the format described by systemd.time(7)) of the + Specification (in the format described by {manpage}`systemd.time(7)`) of the time at which the DOK update will occur. ''; }; @@ -247,7 +247,7 @@ in type = str; default = "monthly"; description = '' - Specification (in the format described by systemd.time(7)) of the time + Specification (in the format described by {manpage}`systemd.time(7)`) of the time at which the Clublog SCP update will occur. ''; }; @@ -266,7 +266,7 @@ in type = str; default = "monthly"; description = '' - Specification (in the format described by systemd.time(7)) of the time + Specification (in the format described by {manpage}`systemd.time(7)`) of the time at which the WWFF update will occur. ''; }; @@ -284,7 +284,7 @@ in type = str; default = "daily"; description = '' - Specification (in the format described by systemd.time(7)) of the + Specification (in the format described by {manpage}`systemd.time(7)`) of the time at which the QRZ upload will occur. ''; }; @@ -302,7 +302,7 @@ in type = str; default = "monthly"; description = '' - Specification (in the format described by systemd.time(7)) of the time + Specification (in the format described by {manpage}`systemd.time(7)`) of the time at which the SOTA update will occur. ''; }; diff --git a/nixos/modules/services/web-apps/dex.nix b/nixos/modules/services/web-apps/dex.nix index f23e07a168cc..13af63892fe9 100644 --- a/nixos/modules/services/web-apps/dex.nix +++ b/nixos/modules/services/web-apps/dex.nix @@ -51,7 +51,7 @@ in type = types.nullOr types.path; default = null; description = '' - Environment file (see `systemd.exec(5)` + Environment file (see {manpage}`systemd.exec(5)` "EnvironmentFile=" section for the syntax) to define variables for dex. This option can be used to safely include secret keys into the dex configuration. ''; diff --git a/nixos/modules/services/web-apps/gotosocial.nix b/nixos/modules/services/web-apps/gotosocial.nix index dc40fb8156f9..b1e9a46a601c 100644 --- a/nixos/modules/services/web-apps/gotosocial.nix +++ b/nixos/modules/services/web-apps/gotosocial.nix @@ -80,7 +80,7 @@ in type = lib.types.nullOr lib.types.path; description = '' File path containing environment variables for configuring the GoToSocial service - in the format of an EnvironmentFile as described by systemd.exec(5). + in the format of an EnvironmentFile as described by {manpage}`systemd.exec(5)`. This option could be used to pass sensitive configuration to the GoToSocial daemon. diff --git a/nixos/modules/services/web-apps/miniflux.nix b/nixos/modules/services/web-apps/miniflux.nix index 8cacaa5aa330..098c920ab264 100644 --- a/nixos/modules/services/web-apps/miniflux.nix +++ b/nixos/modules/services/web-apps/miniflux.nix @@ -72,7 +72,7 @@ in description = '' File containing the ADMIN_USERNAME and ADMIN_PASSWORD (length >= 6) in the format of - an EnvironmentFile=, as described by systemd.exec(5). + an EnvironmentFile=, as described by {manpage}`systemd.exec(5)`. ''; example = "/etc/nixos/miniflux-admin-credentials"; }; diff --git a/nixos/modules/services/web-servers/merecat.nix b/nixos/modules/services/web-servers/merecat.nix index a669acaedb7e..5591407f5590 100644 --- a/nixos/modules/services/web-servers/merecat.nix +++ b/nixos/modules/services/web-servers/merecat.nix @@ -30,7 +30,7 @@ in inherit (format) type; default = { }; description = '' - Merecat configuration. Refer to merecat(8) for details on supported values. + Merecat configuration. Refer to {manpage}`merecat(8)` for details on supported values. ''; example = { hostname = "localhost"; diff --git a/nixos/modules/services/web-servers/minio.nix b/nixos/modules/services/web-servers/minio.nix index a3e1750d41be..4deedb076963 100644 --- a/nixos/modules/services/web-servers/minio.nix +++ b/nixos/modules/services/web-servers/minio.nix @@ -72,7 +72,7 @@ in description = '' File containing the MINIO_ROOT_USER, default is "minioadmin", and MINIO_ROOT_PASSWORD (length >= 8), default is "minioadmin"; in the format of - an EnvironmentFile=, as described by systemd.exec(5). + an EnvironmentFile=, as described by {manpage}`systemd.exec(5)`. ''; example = "/etc/nixos/minio-root-credentials"; }; diff --git a/nixos/modules/services/web-servers/pomerium.nix b/nixos/modules/services/web-servers/pomerium.nix index 441475f91ce6..5b65128b8d07 100644 --- a/nixos/modules/services/web-servers/pomerium.nix +++ b/nixos/modules/services/web-servers/pomerium.nix @@ -50,7 +50,7 @@ in default = null; description = '' Path to file containing secrets for Pomerium, in systemd - EnvironmentFile format. See the systemd.exec(5) man page. + EnvironmentFile format. See the {manpage}`systemd.exec(5)` man page. ''; }; }; diff --git a/nixos/modules/services/web-servers/uwsgi.nix b/nixos/modules/services/web-servers/uwsgi.nix index f35a2ba22977..e4657fff7a65 100644 --- a/nixos/modules/services/web-servers/uwsgi.nix +++ b/nixos/modules/services/web-servers/uwsgi.nix @@ -200,7 +200,7 @@ in ''; description = '' Grant capabilities to the uWSGI instance. See the - `capabilities(7)` for available values. + {manpage}`capabilities(7)` for available values. ::: {.note} uWSGI runs as an unprivileged user (even as Emperor) with the minimal diff --git a/nixos/modules/services/x11/display-managers/startx.nix b/nixos/modules/services/x11/display-managers/startx.nix index a990c9ed5ea5..2cf0657f5e0e 100644 --- a/nixos/modules/services/x11/display-managers/startx.nix +++ b/nixos/modules/services/x11/display-managers/startx.nix @@ -27,7 +27,7 @@ in which allows users to start X manually via the "startx" command from a vt shell. The X server runs under the user's id, not as root. The user must provide a ~/.xinitrc file containing session startup - commands, see startx(1). This is not automatically generated + commands, see {manpage}`startx(1)`. This is not automatically generated from the desktopManager and windowManager settings. ''; }; diff --git a/nixos/modules/services/x11/display-managers/sx.nix b/nixos/modules/services/x11/display-managers/sx.nix index 45ce6c383a71..7d168124e67f 100644 --- a/nixos/modules/services/x11/display-managers/sx.nix +++ b/nixos/modules/services/x11/display-managers/sx.nix @@ -18,7 +18,7 @@ in to start manually via the "sx" command from a vt shell. The X server runs under the user's id, not as root. The user must provide a ~/.config/sx/sxrc file containing session startup commands, see - sx(1). This is not automatically generated from the desktopManager + {manpage}`sx(1)`. This is not automatically generated from the desktopManager and windowManager settings. sx doesn't have a way to directly set X server flags, but it can be done by overriding its xorgserver dependency. diff --git a/nixos/modules/services/x11/picom.nix b/nixos/modules/services/x11/picom.nix index 237d78484286..e75ec5c2019f 100644 --- a/nixos/modules/services/x11/picom.nix +++ b/nixos/modules/services/x11/picom.nix @@ -126,7 +126,7 @@ in ]; description = '' List of conditions of windows that should not be faded. - See `picom(1)` man page for more examples. + See {manpage}`picom(1)` man page for more examples. ''; }; @@ -172,7 +172,7 @@ in ]; description = '' List of conditions of windows that should have no shadow. - See `picom(1)` man page for more examples. + See {manpage}`picom(1)` man page for more examples. ''; }; @@ -326,7 +326,7 @@ in description = '' Picom settings. Use this option to configure Picom settings not exposed in a NixOS option or to bypass one. For the available options see the - CONFIGURATION FILES section at `picom(1)`. + CONFIGURATION FILES section at {manpage}`picom(1)`. ''; }; }; diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index d26e41294d11..794fc3abdfeb 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -203,7 +203,7 @@ in type = types.nullOr types.path; visible = false; description = '' - The env(1) executable that is linked system-wide to + The {manpage}`env(1)` executable that is linked system-wide to `/usr/bin/env`. ''; }; diff --git a/nixos/modules/system/boot/systemd/coredump.nix b/nixos/modules/system/boot/systemd/coredump.nix index 672ad62f4926..747258c006ca 100644 --- a/nixos/modules/system/boot/systemd/coredump.nix +++ b/nixos/modules/system/boot/systemd/coredump.nix @@ -29,7 +29,7 @@ in type = types.lines; example = "Storage=journal"; description = '' - Extra config options for systemd-coredump. See coredump.conf(5) man page + Extra config options for systemd-coredump. See {manpage}`coredump.conf(5)` man page for available options. ''; }; diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index 3b07f2222ffa..332cfc2fbb13 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -163,7 +163,7 @@ in type = types.lines; example = "DefaultLimitCORE=infinity"; description = '' - Extra config options for systemd. See systemd-system.conf(5) man page + Extra config options for systemd. See {manpage}`systemd-system.conf(5)` man page for available options. ''; }; diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix index a2a544bf9829..6090cdf5adff 100644 --- a/nixos/modules/system/boot/timesyncd.nix +++ b/nixos/modules/system/boot/timesyncd.nix @@ -28,7 +28,7 @@ in `timesyncd.conf` file as opposed to setting this option to null which will remove `NTP=` entirely. - See man:timesyncd.conf(5) for details. + See man:{manpage}`timesyncd.conf(5)` for details. ''; }; fallbackServers = mkOption { @@ -42,7 +42,7 @@ in `timesyncd.conf` file as opposed to setting this option to null which will remove `FallbackNTP=` entirely. - See man:timesyncd.conf(5) for details. + See man:{manpage}`timesyncd.conf(5)` for details. ''; }; extraConfig = mkOption { diff --git a/nixos/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix index 33b0a8c6324c..2c65ebcea1b0 100644 --- a/nixos/modules/tasks/filesystems/nfs.nix +++ b/nixos/modules/tasks/filesystems/nfs.nix @@ -99,7 +99,7 @@ in default = { }; description = '' General configuration for NFS daemons and tools. - See nfs.conf(5) and related man pages for details. + See {manpage}`nfs.conf(5)` and related man pages for details. ''; example = lib.literalExpression '' { diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 13a4eaa30990..895099052efb 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -97,7 +97,7 @@ let default = null; description = '' Type of the route. See the `Route types` section - in the `ip-route(8)` manual page for the details. + in the {manpage}`ip-route(8)` manual page for the details. Note that `prohibit`, `blackhole`, `unreachable`, and `throw` cannot @@ -118,7 +118,7 @@ let example = { mtu = "1492"; window = "524288"; }; description = '' Other route options. See the symbol `OPTIONS` - in the `ip-route(8)` manual page for the details. + in the {manpage}`ip-route(8)` manual page for the details. You may also specify `metric`, `src`, `protocol`, `scope`, `from` diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index 741828c7468a..76f91c71fa59 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -34,7 +34,7 @@ in default = ["/run/docker.sock"]; description = '' A list of unix and tcp docker should listen to. The format follows - ListenStream as described in systemd.socket(5). + ListenStream as described in {manpage}`systemd.socket(5)`. ''; }; diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index fe0fca58c440..5f43e3322340 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -349,7 +349,7 @@ let Device node access modifier. Takes a combination `r` (read), `w` (write), and `m` (mknod). See the - `systemd.resource-control(5)` man page for more + {manpage}`systemd.resource-control(5)` man page for more information.''; }; }; @@ -563,7 +563,7 @@ in example = [ "CAP_NET_ADMIN" "CAP_MKNOD" ]; description = '' Grant additional capabilities to the container. See the - capabilities(7) and systemd-nspawn(1) man pages for more + {manpage}`capabilities(7)` and {manpage}`systemd-nspawn(1)` man pages for more information. ''; }; @@ -644,7 +644,7 @@ in shall run in. The specified path should refer to a (possibly bind-mounted) network namespace file, as exposed by the kernel below /proc//ns/net. This makes the container enter the given network namespace. One of the typical use cases is to give - a network namespace under /run/netns created by ip-netns(8). + a network namespace under /run/netns created by {manpage}`ip-netns(8)`. Note that this option cannot be used together with other network-related options, such as --private-network or --network-interface=. ''; @@ -737,7 +737,7 @@ in Mounts a set of tmpfs file systems into the container. Multiple paths can be specified. Valid items must conform to the --tmpfs argument - of systemd-nspawn. See systemd-nspawn(1) for details. + of systemd-nspawn. See {manpage}`systemd-nspawn(1)` for details. ''; }; @@ -747,7 +747,7 @@ in example = [ "--drop-capability=CAP_SYS_CHROOT" ]; description = '' Extra flags passed to the systemd-nspawn command. - See systemd-nspawn(1) for details. + See {manpage}`systemd-nspawn(1)` for details. ''; }; diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix index 89e2b7e0f863..642e3a5e6d76 100644 --- a/nixos/modules/virtualisation/oci-containers.nix +++ b/nixos/modules/virtualisation/oci-containers.nix @@ -155,7 +155,7 @@ let [Docker engine documentation](https://docs.docker.com/engine/logging/configure/) For Podman: - Refer to the docker-run(1) man page. + Refer to the {manpage}`docker-run(1)` man page. ''; }; diff --git a/nixos/modules/virtualisation/waagent.nix b/nixos/modules/virtualisation/waagent.nix index afdcfd6ebe35..55d9da027fe9 100644 --- a/nixos/modules/virtualisation/waagent.nix +++ b/nixos/modules/virtualisation/waagent.nix @@ -151,7 +151,7 @@ let ]; description = '' This option specifies disk mount options to be passed to the `mount -o` command. - For more information, see the `mount(8)` manual page. + For more information, see the {manpage}`mount(8)` manual page. ''; }; From 75b2b7e946b403d2d379129584250d7d5a84d7c8 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 27 Jan 2025 02:11:26 +0100 Subject: [PATCH 207/287] nixos/*: undo manual linking to known manpage urls Made with: jq Date: Mon, 27 Jan 2025 02:25:56 +0100 Subject: [PATCH 208/287] nixos/timesyncd: strip man: prefix from manpage links --- nixos/modules/system/boot/timesyncd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix index 6090cdf5adff..b13b16f74de5 100644 --- a/nixos/modules/system/boot/timesyncd.nix +++ b/nixos/modules/system/boot/timesyncd.nix @@ -28,7 +28,7 @@ in `timesyncd.conf` file as opposed to setting this option to null which will remove `NTP=` entirely. - See man:{manpage}`timesyncd.conf(5)` for details. + See {manpage}`timesyncd.conf(5)` for details. ''; }; fallbackServers = mkOption { @@ -42,7 +42,7 @@ in `timesyncd.conf` file as opposed to setting this option to null which will remove `FallbackNTP=` entirely. - See man:{manpage}`timesyncd.conf(5)` for details. + See {manpage}`timesyncd.conf(5)` for details. ''; }; extraConfig = mkOption { From 5e6998ae80c1638765adcb307a93539564b34b71 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 27 Jan 2025 02:47:16 +0100 Subject: [PATCH 209/287] nixos/autofs: fix manpage link --- nixos/modules/services/misc/autofs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/autofs.nix b/nixos/modules/services/misc/autofs.nix index cdb6d606d57e..e258fb20b7ea 100644 --- a/nixos/modules/services/misc/autofs.nix +++ b/nixos/modules/services/misc/autofs.nix @@ -49,7 +49,7 @@ in ''' ''; description = '' - Contents of `/etc/auto.master` file. See {command}`auto.master(5)` and {command}`autofs(5)`. + Contents of `/etc/auto.master` file. See {manpage}`auto.master(5)` and {manpage}`autofs(5)`. ''; }; From a619c149929a8cf4d6a46aa57482a4c381ec0f1e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 02:57:54 +0000 Subject: [PATCH 210/287] python312Packages.python-gvm: 24.12.0 -> 25.1.1 --- pkgs/development/python-modules/python-gvm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix index e091431b61f8..78dc4ea0b84a 100644 --- a/pkgs/development/python-modules/python-gvm/default.nix +++ b/pkgs/development/python-modules/python-gvm/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "python-gvm"; - version = "24.12.0"; + version = "25.1.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = "python-gvm"; tag = "v${version}"; - hash = "sha256-6K9Gv2ycQuCeH5GxtRfpwRqTQxpuqRZC82EvQCFSX4k="; + hash = "sha256-z78JnyAyWqNqFGuauIXitPO0D0WtHicBlD6Jno4G74Y="; }; build-system = [ poetry-core ]; From 2e4911a42cba4f15e57b2bd0de6fe3f87d70e662 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 03:35:14 +0000 Subject: [PATCH 211/287] vacuum-go: 0.15.3 -> 0.16.1 --- pkgs/by-name/va/vacuum-go/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix index 0a1a5b6a283f..4c4cfc91562e 100644 --- a/pkgs/by-name/va/vacuum-go/package.nix +++ b/pkgs/by-name/va/vacuum-go/package.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "vacuum-go"; - version = "0.15.3"; + version = "0.16.1"; src = fetchFromGitHub { owner = "daveshanley"; repo = "vacuum"; # using refs/tags because simple version gives: 'the given path has multiple possibilities' error tag = "v${version}"; - hash = "sha256-SI32ODbd3X4zMhS3LI4vwVn9/gwgabWZ/8Nx+L3KPYE="; + hash = "sha256-TljvCGquQJl+uJXRBJCximR5OgsdAgK/+eobQW9+fZo="; }; - vendorHash = "sha256-xTqrKkCRO6lUbzXI4/UrBoZsKU9mQW8cMrnZ2X3wzog="; + vendorHash = "sha256-Yuibhb0N8QHHjdB4v3jFVxz1T6SkhgFfcouPAjjA0lU="; env.CGO_ENABLED = 0; ldflags = [ From 13069f6a43f2ee5c74e40cf6a90548a38d6946a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 26 Jan 2025 19:48:03 -0800 Subject: [PATCH 212/287] impression: use fetchCargoVendor --- pkgs/by-name/im/impression/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/im/impression/package.nix b/pkgs/by-name/im/impression/package.nix index 22b359200ff3..0b38cd3d0f75 100644 --- a/pkgs/by-name/im/impression/package.nix +++ b/pkgs/by-name/im/impression/package.nix @@ -33,10 +33,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-F2ZyATDKnUgEOAI++54fR6coJOr9rtyGm5TzsKzkDmg="; }; - cargoDeps = rustPlatform.fetchCargoTarball { - inherit (finalAttrs) src; - name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-H4x7D25UzDdAEad7QEsZZGLXhfiUupm3mTrNho+ShFo="; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-mQyGQXEFmMkTvkZcniws/11u1RqnsxgNi9dvYn1Mx0o="; }; nativeBuildInputs = [ From 048932dfaa4f127832a0b0630e62b4aa61ef728c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 26 Jan 2025 19:50:04 -0800 Subject: [PATCH 213/287] mousai: use fetchCargoVendor --- pkgs/by-name/mo/mousai/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/mousai/package.nix b/pkgs/by-name/mo/mousai/package.nix index 5bbee8e4ac02..3a45a524d8e9 100644 --- a/pkgs/by-name/mo/mousai/package.nix +++ b/pkgs/by-name/mo/mousai/package.nix @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { hash = "sha256-lib2rPUTKudzbZQIGZxxxzvWNlbLkLdWtb9h7+C05QE="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-KrOvPeT8zhxSTNDRJPrAbUnSgnIQegRmNe5TEgGE8+s="; + hash = "sha256-59mxTtXQaGiHHbS4vOtwm5py/1BWwaSf+CBdKEtUpno="; }; nativeBuildInputs = [ From 48919f56745884cc738a1659ce323a468c34f275 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 27 Jan 2025 14:17:28 +1000 Subject: [PATCH 214/287] adminer-pematon: 4.12 -> 4.13 (#377142) --- pkgs/by-name/ad/adminer-pematon/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ad/adminer-pematon/package.nix b/pkgs/by-name/ad/adminer-pematon/package.nix index 2529fc4cf338..7238bfbf3b55 100644 --- a/pkgs/by-name/ad/adminer-pematon/package.nix +++ b/pkgs/by-name/ad/adminer-pematon/package.nix @@ -10,13 +10,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "adminer-pematon"; - version = "4.12"; + version = "4.13"; src = fetchFromGitHub { owner = "pematon"; repo = "adminer"; tag = "v${finalAttrs.version}"; - hash = "sha256-ExCHEsZ+VFmrom3632/1OOjb3zbZgiaZJDapBkBGUnQ="; + hash = "sha256-7kSQl4Ch9S+680FZBsO6ynsyF1GCkT8BPpBONmeJF9U="; }; nativeBuildInputs = [ From 51169532ba6ff8cc5a8520a442459dc900535927 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 27 Jan 2025 05:18:47 +0100 Subject: [PATCH 215/287] scx.rustscheds: useFetchCargoVendor (#377086) Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. --- pkgs/os-specific/linux/scx/scx_rustscheds.nix | 1 + pkgs/os-specific/linux/scx/version.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/scx/scx_rustscheds.nix b/pkgs/os-specific/linux/scx/scx_rustscheds.nix index 1502f6fbb352..2e4cabfb95ea 100644 --- a/pkgs/os-specific/linux/scx/scx_rustscheds.nix +++ b/pkgs/os-specific/linux/scx/scx_rustscheds.nix @@ -13,6 +13,7 @@ rustPlatform.buildRustPackage { pname = "scx_rustscheds"; inherit (scx-common) version src; + useFetchCargoVendor = true; inherit (scx-common.versionInfo.scx) cargoHash; # Copy compiled headers and libs from scx.cscheds diff --git a/pkgs/os-specific/linux/scx/version.json b/pkgs/os-specific/linux/scx/version.json index f1c52f59fe75..e603cab61294 100644 --- a/pkgs/os-specific/linux/scx/version.json +++ b/pkgs/os-specific/linux/scx/version.json @@ -2,7 +2,7 @@ "scx": { "version": "1.0.8", "hash": "sha256-eXui9fvi8C/HHp8wU7STrDC8b950YZzyhoLoGHXZ6S8=", - "cargoHash": "sha256-ymFO6w4Y/VIKrnf0uF0Sso4OSc1MY2CeEwaXsAL5cgo=" + "cargoHash": "sha256-TdwymmaP6rG+Shh/9ByhXIlo+9yZapi9vWN5/5Rd3RY=" }, "bpftool": { "rev": "183e7010387d1fc9f08051426e9a9fbd5f8d409e", From 7f92be44ef2d48a19476b6eabedc06862f1c5913 Mon Sep 17 00:00:00 2001 From: Esteban Macanek <75503218+EstebanMacanek@users.noreply.github.com> Date: Sat, 25 Jan 2025 13:56:18 -0300 Subject: [PATCH 216/287] maintainers: add EstebanMacanek --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fcc8363179a2..56bcf86bc00e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7102,6 +7102,11 @@ githubId = 16175276; keys = [ { fingerprint = "E4CE B0F0 B2EC 09A3 9678 F294 CC7A 7E3C 6CF3 1343"; } ]; }; + EstebanMacanek = { + name = "Esteban Macanek"; + github = "EstebanMacanek"; + githubId = 75503218; + }; ethancedwards8 = { email = "ethan@ethancedwards.com"; matrix = "@ethancedwards8:matrix.org"; From a55f19076909ffd0befcfb4c79235ae1bd0a5e31 Mon Sep 17 00:00:00 2001 From: Esteban Macanek <75503218+EstebanMacanek@users.noreply.github.com> Date: Sat, 25 Jan 2025 14:03:09 -0300 Subject: [PATCH 217/287] whatsapp-chat-exporter: fix missing dependency --- pkgs/by-name/wh/whatsapp-chat-exporter/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/wh/whatsapp-chat-exporter/package.nix b/pkgs/by-name/wh/whatsapp-chat-exporter/package.nix index 339ce42f2be5..bf5633e48c30 100644 --- a/pkgs/by-name/wh/whatsapp-chat-exporter/package.nix +++ b/pkgs/by-name/wh/whatsapp-chat-exporter/package.nix @@ -21,6 +21,7 @@ python3Packages.buildPythonApplication rec { jinja2 pycryptodome javaobj-py3 + vobject ]; meta = with lib; { @@ -34,6 +35,9 @@ python3Packages.buildPythonApplication rec { ''; license = licenses.mit; mainProgram = "wtsexporter"; - maintainers = with maintainers; [ bbenno ]; + maintainers = with maintainers; [ + bbenno + EstebanMacanek + ]; }; } From 30c8a4f5eddd740e5ef6318530f85eea03554452 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 04:59:27 +0000 Subject: [PATCH 218/287] siyuan: 3.1.19 -> 3.1.20 --- pkgs/by-name/si/siyuan/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index 5d59a7ff9487..269558ef9424 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -35,20 +35,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "siyuan"; - version = "3.1.19"; + version = "3.1.20"; src = fetchFromGitHub { owner = "siyuan-note"; repo = "siyuan"; rev = "v${finalAttrs.version}"; - hash = "sha256-5+IFCdLH+zHsJjLJauMTfBHB5vCyXbKniSa9bWHblRA="; + hash = "sha256-i02WcXN6IKD4N0z8qMKBvxpzI3rrlWRVSH+7cvlRndw="; }; kernel = buildGo123Module { name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/kernel"; - vendorHash = "sha256-JoQTWGhWfU6UOdFbZq3thfx0Nfth/gD1ruA4fs8/qBw="; + vendorHash = "sha256-YYQYHgb1MX0siYzxc9A2tK4htbCD8OH28tQv3QA1exQ="; patches = [ (replaceVars ./set-pandoc-path.patch { @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { src sourceRoot ; - hash = "sha256-357iBgxevtXus0Dpa8+LHKsO42HoHibkhRSy+tpD8jo="; + hash = "sha256-HwfOGwT9aB844QxqEDjnEJOFaL98yORZtzyHfU8kKW4="; }; sourceRoot = "${finalAttrs.src.name}/app"; From 4b31ae1f151c49dcb6f310d4c7728391763ef3a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 05:51:27 +0000 Subject: [PATCH 219/287] python312Packages.unstructured: 0.16.13 -> 0.16.15 --- pkgs/development/python-modules/unstructured/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index e9eed5709877..eac7e5e04224 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -113,7 +113,7 @@ grpcio, }: let - version = "0.16.13"; + version = "0.16.15"; in buildPythonPackage { pname = "unstructured"; @@ -124,7 +124,7 @@ buildPythonPackage { owner = "Unstructured-IO"; repo = "unstructured"; tag = version; - hash = "sha256-VVgSrXqfWEOjZAU54rGBW3m4FxZKJDmbFsWdgjiqMSs="; + hash = "sha256-Wp51LOgM/zE81324Qzu83XGupUMAzz2wn+COmNq95H8="; }; propagatedBuildInputs = [ From 2c1eeaf29e3bf0cbc783774cba2871af8ea0b8f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 05:52:19 +0000 Subject: [PATCH 220/287] baddns: 1.6.68 -> 1.7.86 --- pkgs/by-name/ba/baddns/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ba/baddns/package.nix b/pkgs/by-name/ba/baddns/package.nix index aea9b5bf287e..c36e0b7eb0ec 100644 --- a/pkgs/by-name/ba/baddns/package.nix +++ b/pkgs/by-name/ba/baddns/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "baddns"; - version = "1.6.68"; + version = "1.7.86"; pyproject = true; src = fetchFromGitHub { owner = "blacklanternsecurity"; repo = "baddns"; tag = version; - hash = "sha256-TQPjSmLXgcHYxBQFO1QPozs1XRaJDTakGN24LLuFdfY="; + hash = "sha256-Jj36aNNYCwqK/Yux92YmCxywftoizXZE39qLhLpjAaw="; }; pythonRelaxDeps = true; From eba96f6e8c1bb40956d35192712825696672fb3d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 06:30:28 +0000 Subject: [PATCH 221/287] legcord: 1.0.6 -> 1.0.8 --- pkgs/by-name/le/legcord/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/le/legcord/package.nix b/pkgs/by-name/le/legcord/package.nix index a6bd478b084a..5a16601782ba 100644 --- a/pkgs/by-name/le/legcord/package.nix +++ b/pkgs/by-name/le/legcord/package.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation rec { pname = "legcord"; - version = "1.0.6"; + version = "1.0.8"; src = fetchFromGitHub { owner = "Legcord"; repo = "Legcord"; rev = "v${version}"; - hash = "sha256-0dVuSqViMqhWBMEY36ZcXM1FYnMcDH5brp5gsMWg3Rc="; + hash = "sha256-VjEvW5vM6ByZUzQw21iH347M1KmED+zRrRiS2glyJ1w="; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; - hash = "sha256-QTePf/QE85OzXIcnwLJsCJJyRxwoV+FNef2Z9nAt35E="; + hash = "sha256-cgoFvCCjfR9HP1mJZJ0n/GELATO2lm0tDexSQE8fJGw="; }; ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; From 729d9ec466c3084aee447db17ff90bb6cd0bed55 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 03:09:54 +0000 Subject: [PATCH 222/287] pdi: 1.8.0 -> 1.8.1 --- pkgs/by-name/pd/pdi/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/pd/pdi/package.nix b/pkgs/by-name/pd/pdi/package.nix index 7b7cad6e15f3..77c6a8f5f725 100644 --- a/pkgs/by-name/pd/pdi/package.nix +++ b/pkgs/by-name/pd/pdi/package.nix @@ -30,15 +30,15 @@ let ] ); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pdi"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "pdidev"; repo = "pdi"; - tag = version; - hash = "sha256-l4vKWIitP0BqSRPxpv0UgjAOgHJ3Aecm1hT+f9BeqRA="; + tag = finalAttrs.version; + hash = "sha256-EUqgscpCubub2Zl/7fcgbdVx216Y2Ke7h8Zui2SieP8="; }; # Current hdf5 version in nixpkgs is 1.14.4.3 which is 4 numbers long and doesn't match the 3 number regex. :') @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { meta = { description = "PDI supports loose coupling of simulation codes with data handling libraries"; homepage = "https://pdi.dev/master/"; - changelog = "https://github.com/pdidev/pdi/releases/tag/${src.tag}"; + changelog = "https://github.com/pdidev/pdi/releases/tag/${finalAttrs.version}"; license = lib.licenses.bsd3; mainProgram = "pdirun"; maintainers = with lib.maintainers; [ GaetanLepage ]; @@ -90,4 +90,4 @@ stdenv.mkDerivation rec { lib.systems.inspect.patterns.isDarwin ]; }; -} +}) From f104c8eca09a5affe9fa1de5d98d33affb31ade3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 00:41:40 +0000 Subject: [PATCH 223/287] fpart: 1.6.0 -> 1.7.0 --- pkgs/by-name/fp/fpart/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fp/fpart/package.nix b/pkgs/by-name/fp/fpart/package.nix index e026291b47b4..ab74de18d983 100644 --- a/pkgs/by-name/fp/fpart/package.nix +++ b/pkgs/by-name/fp/fpart/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "fpart"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "martymac"; repo = "fpart"; rev = "fpart-${version}"; - sha256 = "sha256-kAvGLd5W633fRS+qVD/yclreFfcauyLygQGtzv7AP24="; + sha256 = "sha256-BQGSKDSuK2iB0o2v8I+XOwhYtU/0QtMevt4pgIfRhNQ="; }; nativeBuildInputs = [ autoreconfHook ]; From 3980a8216e669bbd46fbf389d439fce182b4dbc3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 07:12:13 +0000 Subject: [PATCH 224/287] tdlib: 1.8.42 -> 1.8.44 --- pkgs/by-name/td/tdlib/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/td/tdlib/package.nix b/pkgs/by-name/td/tdlib/package.nix index 01db609555d7..1b05ff79b37f 100644 --- a/pkgs/by-name/td/tdlib/package.nix +++ b/pkgs/by-name/td/tdlib/package.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation { pname = "tdlib"; - version = "1.8.42"; + version = "1.8.44"; src = fetchFromGitHub { owner = "tdlib"; @@ -45,8 +45,8 @@ stdenv.mkDerivation { # The tdlib authors do not set tags for minor versions, but # external programs depending on tdlib constrain the minor # version, hence we set a specific commit with a known version. - rev = "ef580cd3dd0e5223c2be503342dc29e128be866e"; - hash = "sha256-k1YQpQXYmEdoiyWeAcj2KRU+BcWuWbHpd4etxLspEoo="; + rev = "28c6f2e9c045372d50217919bf5768b7fbbe0294"; + hash = "sha256-IZ/VplO7PSzYVYmUa6nhJdI4kni8x5TZ7XWkf8JcmYI="; }; buildInputs = [ From 5ecccb2ecde32c837615e3c62242468881cf538a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 07:16:35 +0000 Subject: [PATCH 225/287] spring-boot-cli: 3.4.1 -> 3.4.2 --- pkgs/by-name/sp/spring-boot-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/spring-boot-cli/package.nix b/pkgs/by-name/sp/spring-boot-cli/package.nix index b741dab8889a..60ba89ab6373 100644 --- a/pkgs/by-name/sp/spring-boot-cli/package.nix +++ b/pkgs/by-name/sp/spring-boot-cli/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "spring-boot-cli"; - version = "3.4.1"; + version = "3.4.2"; src = fetchzip { url = "mirror://maven/org/springframework/boot/spring-boot-cli/${finalAttrs.version}/spring-boot-cli-${finalAttrs.version}-bin.zip"; - hash = "sha256-XJGopVQclKVfVXNlHj9LXu8Kt3hcfsajH5p63k6nQ94="; + hash = "sha256-pxGibIyg4C902pmth1rsgMb95yNVyYQenFmbQLDZSEo="; }; nativeBuildInputs = [ From 28467ff83d4d18db90c7f58d36f497c6010469c4 Mon Sep 17 00:00:00 2001 From: Wilson Bondanza Date: Mon, 27 Jan 2025 08:27:15 +0100 Subject: [PATCH 226/287] Revert "vue-typescript-plugin: init at 2.2.0" This reverts commit dd97fe94e0556f9e19b851b162871a28102e1434. --- 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 deletions(-) delete mode 100644 pkgs/by-name/vu/vue-typescript-plugin/package-lock.json delete mode 100644 pkgs/by-name/vu/vue-typescript-plugin/package.nix delete mode 100755 pkgs/by-name/vu/vue-typescript-plugin/update.sh diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 56bcf86bc00e..87a2515e1a31 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -24563,17 +24563,6 @@ 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 deleted file mode 100644 index c7c33b1b191b..000000000000 --- a/pkgs/by-name/vu/vue-typescript-plugin/package-lock.json +++ /dev/null @@ -1,269 +0,0 @@ -{ - "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 deleted file mode 100644 index 845be9488afc..000000000000 --- a/pkgs/by-name/vu/vue-typescript-plugin/package.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - 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 deleted file mode 100755 index 58544a7e1d07..000000000000 --- a/pkgs/by-name/vu/vue-typescript-plugin/update.sh +++ /dev/null @@ -1,30 +0,0 @@ -#! /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 a08d86f73f76..d187b9ee4378 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -50,7 +50,6 @@ 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 67b05da39d11a2114f8d916de33d43bd5281b8c6 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 27 Jan 2025 08:30:57 +0100 Subject: [PATCH 227/287] python312Packages.llama-cpp-python: mark as broken on aarch64-linux --- pkgs/development/python-modules/llama-cpp-python/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/llama-cpp-python/default.nix b/pkgs/development/python-modules/llama-cpp-python/default.nix index f7137c0778ee..ec69378235e6 100644 --- a/pkgs/development/python-modules/llama-cpp-python/default.nix +++ b/pkgs/development/python-modules/llama-cpp-python/default.nix @@ -114,6 +114,9 @@ buildPythonPackage rec { # Current thread 0x00000001f3decf40 (most recent call first): # File "/private/tmp/nix-build-python3.12-llama-cpp-python-0.3.2.drv-0/source/llama_cpp/_internals.py", line 51 in __init__ lib.systems.inspect.patterns.isDarwin + + # cc1: error: unknown value ‘native+nodotprod+noi8mm+nosve’ for ‘-mcpu’ + "aarch64-linux" ]; }; } From 16cda93bd61ba6b2e8e1f2f106bc9c40a988d4aa Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Mon, 27 Jan 2025 16:43:32 +0900 Subject: [PATCH 228/287] ArchiSteamFarm: 6.1.0.3 -> 6.1.1.3 Changelog: https://github.com/JustArchiNET/ArchiSteamFarm/releases/tag/6.1.1.3 Signed-off-by: Ludovico Piero --- .../misc/ArchiSteamFarm/default.nix | 4 +- .../misc/ArchiSteamFarm/deps.json | 98 +++++++++---------- .../misc/ArchiSteamFarm/web-ui/default.nix | 6 +- 3 files changed, 49 insertions(+), 59 deletions(-) diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 6bea8db998b7..b48ff429f651 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "ArchiSteamFarm"; # nixpkgs-update: no auto update - version = "6.1.0.3"; + version = "6.1.1.3"; src = fetchFromGitHub { owner = "JustArchiNET"; repo = "ArchiSteamFarm"; rev = version; - hash = "sha256-3NOeKdXb1tz4qx+tCs6QKfze2KLfyodKwt/aNx6tLvI="; + hash = "sha256-e0LzM0N5N7BHyQDRQIPziQrAilJN1aUttKyLod/T8rU="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_9_0; diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.json b/pkgs/applications/misc/ArchiSteamFarm/deps.json index b13c07a45602..6bb07afcc405 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.json +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.json @@ -281,8 +281,8 @@ }, { "pname": "Markdig.Signed", - "version": "0.38.0", - "hash": "sha256-yhO/GFoKdE/Z9SZPyGFe7DlnSd8dcAohqJNFqSqKLnk=" + "version": "0.39.1", + "hash": "sha256-jofkP6JUp4xuUjJ6B6+HDfBJ3+V2vgECt2CWmFq62k4=" }, { "pname": "Microsoft.ApplicationInsights", @@ -296,13 +296,13 @@ }, { "pname": "Microsoft.CodeAnalysis.ResxSourceGenerator", - "version": "3.11.0-beta1.24508.2", - "hash": "sha256-TpqR8oedeRXdPxwhesXwWU+FimbVcj1+WThE3iQe+zo=" + "version": "3.11.0-beta1.24527.2", + "hash": "sha256-NVqJ5cRa9G+ilWKazOTA8Xfm6ExOPpst8HMIFBC1/BU=" }, { "pname": "Microsoft.CodeCoverage", - "version": "17.11.1", - "hash": "sha256-1dLlK3NGh88PuFYZiYpT+izA96etxhU3BSgixDgdtGA=" + "version": "17.12.0", + "hash": "sha256-lGjifppD0OBMBp28pjUfPipaeXg739n8cPhtHWoo5RE=" }, { "pname": "Microsoft.Extensions.ApiDescription.Server", @@ -446,8 +446,8 @@ }, { "pname": "Microsoft.NET.Test.Sdk", - "version": "17.11.1", - "hash": "sha256-0JUEucQ2lzaPgkrjm/NFLBTbqU1dfhvhN3Tl3moE6mI=" + "version": "17.12.0", + "hash": "sha256-DKFEbhh2wPzahNeHdEoFig8tZh/LEVrFc5+zpT43Btg=" }, { "pname": "Microsoft.NETCore.Platforms", @@ -461,38 +461,38 @@ }, { "pname": "Microsoft.Testing.Extensions.Telemetry", - "version": "1.4.3", - "hash": "sha256-oZ+AsyGdjWDoYx+nkveuniU4yB1DZ3bjgOgnucEtbnc=" + "version": "1.5.0", + "hash": "sha256-aKKGFpsp88Yy29GLbWRWnEil2M2WEHjRXZ62Q8x5QRQ=" }, { "pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions", - "version": "1.4.3", - "hash": "sha256-Q3E2sfTL6VvuK1X2JQsNqUTS9AtpnH9mf2aXMj09bz8=" + "version": "1.5.0", + "hash": "sha256-oiePvWpZMkT2AnEpfzWgvaXJai6crgHdoUSMZct3JB0=" }, { "pname": "Microsoft.Testing.Extensions.VSTestBridge", - "version": "1.4.3", - "hash": "sha256-Sjx7GBgLYtX0nmjmViZHWVHwIZnL8aj+ivDK58GbA8k=" + "version": "1.5.0", + "hash": "sha256-XauIF+r05RDgORsnxEp6Cq0WZjLycJ1hPH79QUi/SgM=" }, { "pname": "Microsoft.Testing.Platform", - "version": "1.4.3", - "hash": "sha256-KqB3+uBGl0edpaGl6Qykubb3OrVTs6IcPWc59UQ/Iww=" + "version": "1.5.0", + "hash": "sha256-67ZNhvMifCIM7SFnwDN25EanRNKsjAFQWugrrYWAkrM=" }, { "pname": "Microsoft.Testing.Platform.MSBuild", - "version": "1.4.3", - "hash": "sha256-289hhblU55kDvzbiSQAFSxOyht1MlXT4e+bEQyQqils=" + "version": "1.5.0", + "hash": "sha256-nJ5fv8MwFw2PeJIZA9qKLfGPWYKmHww1CtVFICz6S00=" }, { "pname": "Microsoft.TestPlatform.ObjectModel", - "version": "17.11.1", - "hash": "sha256-5vX+vCzFY3S7xfMVIv8OlMMFtdedW9UIJzc0WEc+vm4=" + "version": "17.12.0", + "hash": "sha256-3XBHBSuCxggAIlHXmKNQNlPqMqwFlM952Av6RrLw1/w=" }, { "pname": "Microsoft.TestPlatform.TestHost", - "version": "17.11.1", - "hash": "sha256-wSkY0H1fQAq0H3LcKT4u7Y5RzhAAPa6yueVN84g8HxU=" + "version": "17.12.0", + "hash": "sha256-rf8Sh0fQq44Sneuvs64unkkIHg8kOjDGWE35j9iLx5I=" }, { "pname": "Microsoft.Win32.Registry", @@ -501,23 +501,23 @@ }, { "pname": "MSTest", - "version": "3.6.4", - "hash": "sha256-G7I371Rq+AQ+QmHbZ9/wOduj0Yfoa6rFxmvygf7Kol4=" + "version": "3.7.0", + "hash": "sha256-z302okYPT36ebQhReEihire5fyig5pLkrx09nLyVuME=" }, { "pname": "MSTest.Analyzers", - "version": "3.6.4", - "hash": "sha256-jlr8GVhTw32ErLq6YEMA4+EpWL5UO/q9I/BT9TDixK4=" + "version": "3.7.0", + "hash": "sha256-TVMFle7oE2ZU6U+VkJ0G9iNjJxnRU4rDIJCtZFwDhz0=" }, { "pname": "MSTest.TestAdapter", - "version": "3.6.4", - "hash": "sha256-ymaeH9pYE8O1ChlfJ4hvpV9KP9eVJCEm4xhGHngapQY=" + "version": "3.7.0", + "hash": "sha256-b6JCu2yyZmTZwZVd4MHaIwa01eQGWpFd8mNzHUBS6Tg=" }, { "pname": "MSTest.TestFramework", - "version": "3.6.4", - "hash": "sha256-paCBVA5XtiAB8OwkbJSbw7v+HvTFLN9qHRgvQaeJKC0=" + "version": "3.7.0", + "hash": "sha256-fIHwuc/zimd8oxvTiA3gmUzmJAj7JsQYh9IOb8NRJ/Y=" }, { "pname": "Newtonsoft.Json", @@ -574,11 +574,6 @@ "version": "1.10.0", "hash": "sha256-ZSpQFnNgkk3dO8Q7yokJ/VSl4wp5PuIv9nduxgC6UxU=" }, - { - "pname": "OpenTelemetry.Api", - "version": "1.9.0", - "hash": "sha256-raXpHi2DZ3mSLn9dnJYF64XaP23epdfu8zgagSpm8+4=" - }, { "pname": "OpenTelemetry.Api.ProviderBuilderExtensions", "version": "1.10.0", @@ -601,8 +596,8 @@ }, { "pname": "OpenTelemetry.Instrumentation.AspNetCore", - "version": "1.9.0", - "hash": "sha256-XYqa7kV4rhHPCgHsjQtMvyKCemW1OvQd/23QhjquYR4=" + "version": "1.10.1", + "hash": "sha256-HqMFDpFsMaPlgyFt1MU3Un+BysEoj5qPc8HVxTlt0mE=" }, { "pname": "OpenTelemetry.Instrumentation.Http", @@ -611,8 +606,8 @@ }, { "pname": "OpenTelemetry.Instrumentation.Runtime", - "version": "1.9.0", - "hash": "sha256-Xov89h4Py7MCz6SAOjV0tjtZvvjHbx7NyPXZsY1PZhk=" + "version": "1.10.0", + "hash": "sha256-cCTYKxHh1Qzu8X51B8gGsrxwKhVSqJfiql/+o4TWrwg=" }, { "pname": "protobuf-net", @@ -631,28 +626,28 @@ }, { "pname": "Swashbuckle.AspNetCore", - "version": "7.1.0", - "hash": "sha256-4puaFKTRLJtqy/bjcxr5JJuZ/Ko7MDw7MrxISHl002A=" + "version": "7.2.0", + "hash": "sha256-u1eg4GmYjaJAZdstRVvaTfGKnFRFLaxONhbOyiBKn5Y=" }, { "pname": "Swashbuckle.AspNetCore.Annotations", - "version": "7.1.0", - "hash": "sha256-4hD7FqfXeVySSRzLhZ2RSGEUdLjJRc4fqZIgAl5xjIA=" + "version": "7.2.0", + "hash": "sha256-zsg29If2aWbFK8tIpu60YBbD1i8vvGPupiAjcXCq0l0=" }, { "pname": "Swashbuckle.AspNetCore.Swagger", - "version": "7.1.0", - "hash": "sha256-xxekkBO9brFYO0oId6OQVXdv5nXGjpwR3ZEcGe6rr0Q=" + "version": "7.2.0", + "hash": "sha256-v0wp8/2prWFZhHm+T7onPh2sZNY+YjnLik1b1MLaaos=" }, { "pname": "Swashbuckle.AspNetCore.SwaggerGen", - "version": "7.1.0", - "hash": "sha256-4Gm9yxjueSeGFaedV8ncy+jtDwjFBVChpqCCK8E+qfY=" + "version": "7.2.0", + "hash": "sha256-zxxaHyHFPj3T8756QyaH9h+BkuUoV0xxKnbZUxnI8WU=" }, { "pname": "Swashbuckle.AspNetCore.SwaggerUI", - "version": "7.1.0", - "hash": "sha256-br975EeG6O2fwyk8cFcjU/JkYrI35ZkqHm94j3qM5Cg=" + "version": "7.2.0", + "hash": "sha256-EwJsqa4JBJhMzq+zgND3STyoZi1+6GaVQqXz3ZVP7p8=" }, { "pname": "System.Collections.Immutable", @@ -699,11 +694,6 @@ "version": "5.0.0", "hash": "sha256-6mW3N6FvcdNH/pB58pl+pFSCGWgyaP4hfVtC/SMWDV4=" }, - { - "pname": "System.Diagnostics.DiagnosticSource", - "version": "8.0.0", - "hash": "sha256-+aODaDEQMqla5RYZeq0Lh66j+xkPYxykrVvSCmJQ+Vs=" - }, { "pname": "System.Diagnostics.DiagnosticSource", "version": "9.0.0", diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index 28e4be38989c..6d0c35262370 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -7,7 +7,7 @@ buildNpmPackage rec { pname = "asf-ui"; - version = "c316254ddaf7837e7d43145268b53f91f23027dc"; + version = "6be24065cd4904389d94140f4ed1f6738b1f7fbb"; src = fetchFromGitHub { owner = "JustArchiNET"; @@ -15,10 +15,10 @@ buildNpmPackage rec { # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version rev = version; - hash = "sha256-teM8x1/O5QFO7bMGc474Dp9ssOLfdmYkDt7PIuvJ4Ss="; + hash = "sha256-DFl+DCNj4JFKZG1awX5rlsHzj+67OFyBj9d16zDiKRA="; }; - npmDepsHash = "sha256-8KqIUSWaeu5Tk8lw8F1O6KkXUfNqvjgxRNCePEMeLDo="; + npmDepsHash = "sha256-jZSiWZDckfGfgrBMHTX/sm7Pcl5ap3lfmwGi8SHXqu8="; installPhase = '' runHook preInstall From 22bd6330c05b780e8ac841285780ae60a1b12b72 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 07:50:36 +0000 Subject: [PATCH 229/287] snipaste: 2.10.3 -> 2.10.5 --- pkgs/by-name/sn/snipaste/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sn/snipaste/package.nix b/pkgs/by-name/sn/snipaste/package.nix index c45dc3b0167f..e742f8ab8f5d 100644 --- a/pkgs/by-name/sn/snipaste/package.nix +++ b/pkgs/by-name/sn/snipaste/package.nix @@ -5,10 +5,10 @@ }: let pname = "snipaste"; - version = "2.10.3"; + version = "2.10.5"; src = fetchurl { url = "https://download.snipaste.com/archives/Snipaste-${version}-x86_64.AppImage"; - hash = "sha256-/3y3dEcottZIKGLQY4VBZs7ClYVedNwXXFLKfHezS3Q="; + hash = "sha256-E6B60Z0AqY2BhkP52MaoUZc+sTlcRQLcb9hJ6Pw07yU="; }; contents = appimageTools.extract { inherit pname version src; }; in From 20c13980309051d6ec858340307985c9174796ec Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Mon, 27 Jan 2025 09:01:29 +0100 Subject: [PATCH 230/287] gfn-electron: 2.1.2 -> 2.1.3 --- pkgs/by-name/gf/gfn-electron/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gf/gfn-electron/package.nix b/pkgs/by-name/gf/gfn-electron/package.nix index d00abe7861b3..37eb0397f94f 100644 --- a/pkgs/by-name/gf/gfn-electron/package.nix +++ b/pkgs/by-name/gf/gfn-electron/package.nix @@ -7,7 +7,7 @@ makeBinaryWrapper, }: let - version = "2.1.2"; + version = "2.1.3"; in buildNpmPackage { pname = "gfn-electron"; @@ -17,10 +17,10 @@ buildNpmPackage { owner = "hmlendea"; repo = "gfn-electron"; tag = "v${version}"; - hash = "sha256-kTnM4wSDqP2V8hb4mDhbQYpVYouSnUkjuuCfITb/xgY="; + hash = "sha256-o5p7INuyrs4Fw0uoP9f3UpqpmJzHIFSBCBTTU2NfUMQ="; }; - npmDepsHash = "sha256-27N0hWOfkLQGaGspm4aCoVF6PWiUOAKs+JzbdQV94lo="; + npmDepsHash = "sha256-xp9uZAMrsPut91tQD3XfeENr7fXFg2bE89xShG1AcZk="; nativeBuildInputs = [ makeBinaryWrapper ]; From f5e15c0360aa825cd55f44f644d11f3150afddcd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 08:03:12 +0000 Subject: [PATCH 231/287] gitxray: 1.0.16.4 -> 1.0.17 --- pkgs/by-name/gi/gitxray/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/gitxray/package.nix b/pkgs/by-name/gi/gitxray/package.nix index 19976da2d5f1..565edc247fed 100644 --- a/pkgs/by-name/gi/gitxray/package.nix +++ b/pkgs/by-name/gi/gitxray/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "gitxray"; - version = "1.0.16.4"; + version = "1.0.17"; pyproject = true; src = fetchFromGitHub { owner = "kulkansecurity"; repo = "gitxray"; tag = version; - hash = "sha256-rxG/FXIvPPCmV8//Bq3Upu4kNjwVhPVTK4ADp9X3OL0="; + hash = "sha256-wPqjCIHYvU1QuQIXCrbzr8+JtwQmFNHzAjxr8AXkxrc="; }; build-system = with python3.pkgs; [ setuptools ]; From c40d9b20b07cdafe03913e260edd9e44184e2fba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 08:27:24 +0000 Subject: [PATCH 232/287] plasma-panel-colorizer: 1.2.0 -> 2.1.0 --- pkgs/by-name/pl/plasma-panel-colorizer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix index 93e811dfb4b3..97410aeaa8e1 100644 --- a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix +++ b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "plasma-panel-colorizer"; - version = "1.2.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "luisbocanegra"; repo = "plasma-panel-colorizer"; tag = "v${finalAttrs.version}"; - hash = "sha256-yeUicFoafKqj6suVJSaaNjmT+g+ZYb8QsguYyKNBYFA="; + hash = "sha256-Xv1yGIGIWqfxukJub0X2sH0XwtRTr13p+vDi+Wdgnkg="; }; nativeBuildInputs = [ From 4787ad39a9a275ea74544012b055fd8c059b34b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Mon, 27 Jan 2025 00:57:31 +0100 Subject: [PATCH 233/287] pnpm_10: 10.0.0 -> 10.1.0 --- pkgs/development/tools/pnpm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index d449a81d8eee..fbb5cf95f5d9 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -16,8 +16,8 @@ let hash = "sha256-wdpDcnzLwe1Cr/T9a9tLHpHmWoGObv/1skD78HC6Tq8="; }; "10" = { - version = "10.0.0"; - hash = "sha256-Q6v25yD7e8U8WRsIYmBcfTI9Cp0t0zvKwHsGLhPPSUg="; + version = "10.1.0"; + hash = "sha256-PuU+kUAR7H8abjqwxYuaAkoFK/4YKVsjtoVn1qal680="; }; }; From 053ca4580a33090ccda4c4090ab0b3c1b4a086ba Mon Sep 17 00:00:00 2001 From: Krzysztof Nazarewski Date: Mon, 27 Jan 2025 09:45:19 +0100 Subject: [PATCH 234/287] netbird-ui: fix meta.mainProgram --- pkgs/tools/networking/netbird/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index 37d867e827d4..9d74328236db 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -125,6 +125,6 @@ buildGoModule rec { vrifox saturn745 ]; - mainProgram = "netbird"; + mainProgram = if ui then "netbird-ui" else "netbird"; }; } From e31b0dabea5b234a5f08a1e23e7784e43b0f380e Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Mon, 27 Jan 2025 10:09:18 +0100 Subject: [PATCH 235/287] filebeat8: pin updateScript to major v8 --- pkgs/by-name/fi/filebeat8/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fi/filebeat8/package.nix b/pkgs/by-name/fi/filebeat8/package.nix index 1d96209ed89d..ee18b7fa34a5 100644 --- a/pkgs/by-name/fi/filebeat8/package.nix +++ b/pkgs/by-name/fi/filebeat8/package.nix @@ -29,7 +29,7 @@ buildGoModule rec { doInstallCheck = true; passthru = { - updateScript = nix-update-script { }; + updateScript = nix-update-script { extraArgs = [ "--version-regex=v(8\..*)" ]; }; }; meta = { From 295b5212fe02dcabf79d00b48aef4abf63deea93 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Dec 2024 01:36:15 +0000 Subject: [PATCH 236/287] ocamlPackages.ppx_irmin: 3.9.0 -> 3.10.0 --- pkgs/development/ocaml-modules/irmin/ppx.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/irmin/ppx.nix b/pkgs/development/ocaml-modules/irmin/ppx.nix index 4d22f4a833c0..14ff89f39627 100644 --- a/pkgs/development/ocaml-modules/irmin/ppx.nix +++ b/pkgs/development/ocaml-modules/irmin/ppx.nix @@ -9,11 +9,11 @@ buildDunePackage rec { pname = "ppx_irmin"; - version = "3.9.0"; + version = "3.10.0"; src = fetchurl { url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz"; - hash = "sha256-jgc6vhtf+1ttWMMmBsnX2rwyxTUBdWvoCpLtR3etUaA="; + hash = "sha256-kqneegoqNcL+ugw1qAax8N8kwcDRUWTuvz+RkpbSZxU="; }; minimalOCamlVersion = "4.10"; From 36c513967eedacf59cafe6b60d90ec9dbf274037 Mon Sep 17 00:00:00 2001 From: Krzysztof Nazarewski Date: Tue, 2 Apr 2024 12:04:11 +0200 Subject: [PATCH 237/287] netbird: 0.35.2 -> 0.36.3 --- pkgs/tools/networking/netbird/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index 9d74328236db..e11a548eb4aa 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -35,16 +35,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.36.3"; + version = "0.35.2"; src = fetchFromGitHub { owner = "netbirdio"; repo = "netbird"; - rev = "v${version}"; - hash = "sha256-ZAKVjBjffinOyHhzln/ny7tooZwtKHfMEDb/Uy0k6Gw="; + tag = "v${version}"; + hash = "sha256-CvKJiv3CyCRp0wyH+OZejOChcumnMOrA7o9wL4ElJio="; }; - vendorHash = "sha256-xZz2JkD3yD7tuXVFlMm2g1hRBItkGmO9OvnLdUfqai0="; + vendorHash = "sha256-CgfZZOiFDLf6vCbzovpwzt7FlO9BnzNSdR8e5U+xCDQ="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; From fc3f7c17e27920d1a56ba4eb1120dfdb1adf18ca Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sat, 25 Jan 2025 17:23:39 -0800 Subject: [PATCH 238/287] nixos/mattermost: disable telemetry by default We should disable telemetry but enable security update checks. Make both controlable in the module without digging into settings. Disabling telemetry also makes NixOS tests faster because the server tries to send telemetry on first start. --- .../modules/services/web-apps/mattermost.nix | 29 ++++++++++++++++++- nixos/tests/mattermost/default.nix | 1 + 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix index 9b420f8a51fc..e21164e1e74c 100644 --- a/nixos/modules/services/web-apps/mattermost.nix +++ b/nixos/modules/services/web-apps/mattermost.nix @@ -202,6 +202,7 @@ let ListenAddress = "${cfg.host}:${toString cfg.port}"; LocalModeSocketLocation = cfg.socket.path; EnableLocalMode = cfg.socket.enable; + EnableSecurityFixAlert = cfg.telemetry.enableSecurityAlerts; }; TeamSettings.SiteName = cfg.siteName; SqlSettings.DriverName = cfg.database.driver; @@ -233,7 +234,13 @@ let FileSettings.Directory = cfg.dataDir; PluginSettings.Directory = "${pluginDir}/server"; PluginSettings.ClientDirectory = "${pluginDir}/client"; - LogSettings.FileLocation = cfg.logDir; + LogSettings = { + FileLocation = cfg.logDir; + + # Reaches out to Mattermost's servers for telemetry; disable it by default. + # https://docs.mattermost.com/configure/environment-configuration-settings.html#enable-diagnostics-and-error-reporting + EnableDiagnostics = cfg.telemetry.enableDiagnostics; + }; } cfg.settings; mattermostConf = recursiveUpdate mattermostConfWithoutPlugins ( @@ -474,6 +481,26 @@ in ''; }; + telemetry = { + enableSecurityAlerts = mkOption { + type = types.bool; + default = true; + description = '' + True if we should enable security update checking. This reaches out to Mattermost's servers: + https://docs.mattermost.com/manage/telemetry.html#security-update-check-feature + ''; + }; + + enableDiagnostics = mkOption { + type = types.bool; + default = false; + description = '' + True if we should enable sending diagnostic data. This reaches out to Mattermost's servers: + https://docs.mattermost.com/manage/telemetry.html#error-and-diagnostics-reporting-feature + ''; + }; + }; + environment = mkOption { type = with types; attrsOf (either int str); default = { }; diff --git a/nixos/tests/mattermost/default.nix b/nixos/tests/mattermost/default.nix index 99ad4b110118..02f5e8ce247b 100644 --- a/nixos/tests/mattermost/default.nix +++ b/nixos/tests/mattermost/default.nix @@ -48,6 +48,7 @@ import ../make-test-python.nix ( database = { peerAuth = lib.mkDefault true; }; + telemetry.enableSecurityAlerts = false; settings = { SupportSettings.AboutLink = "https://nixos.org"; PluginSettings.AutomaticPrepackagedPlugins = false; From 672f423d0c0285db48b9da5459a0f2eaf5b2e24f Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sat, 25 Jan 2025 17:43:18 -0800 Subject: [PATCH 239/287] nixos/mattermost: default preferNixConfig to true Now that we are disabling telemetry by default, we should attempt to override it and other options in existing mutable configs, if the user had a mutable config and advances their system.stateVersion. --- nixos/modules/services/web-apps/mattermost.nix | 5 ++++- nixos/tests/mattermost/default.nix | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix index e21164e1e74c..56799a744806 100644 --- a/nixos/modules/services/web-apps/mattermost.nix +++ b/nixos/modules/services/web-apps/mattermost.nix @@ -462,7 +462,10 @@ in preferNixConfig = mkOption { type = types.bool; - default = false; + default = versionAtLeast config.system.stateVersion "25.05"; + defaultText = '' + versionAtLeast config.system.stateVersion "25.05"; + ''; description = '' If both mutableConfig and this option are set, the Nix configuration will take precedence over any settings configured in the server diff --git a/nixos/tests/mattermost/default.nix b/nixos/tests/mattermost/default.nix index 02f5e8ce247b..eb7b814e3983 100644 --- a/nixos/tests/mattermost/default.nix +++ b/nixos/tests/mattermost/default.nix @@ -94,6 +94,7 @@ import ../make-test-python.nix ( makeMattermost { mutableConfig = true; + preferNixConfig = false; settings.SupportSettings.HelpLink = "https://search.nixos.org"; } { @@ -105,7 +106,6 @@ import ../make-test-python.nix ( }; postgresMostlyMutable = makeMattermost { mutableConfig = true; - preferNixConfig = true; plugins = with pkgs; [ # Build the demo plugin. (mattermost.buildPlugin { From 26c0cc56a55a5fa004bb68adfe2103ee5c00c53d Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sat, 25 Jan 2025 17:29:42 -0800 Subject: [PATCH 240/287] release-notes/25.05: add details about disabled Mattermost telemetry --- nixos/doc/manual/release-notes/rl-2505.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 4b888f502d00..2fd72befc303 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -34,6 +34,8 @@ - `nixos-option` has been rewritten to a Nix expression called by a simple bash script. This lowers our maintenance threshold, makes eval errors less verbose, adds support for flake-based configurations, descending into `attrsOf` and `listOf` submodule options, and `--show-trace`. - The Mattermost module ({option}`services.mattermost`) and packages (`mattermost` and `mmctl`) have been substantially updated: + - {option}`services.mattermost.preferNixConfig` now defaults to true if you advance {option}`system.stateVersion` to 25.05. This means that if you have {option}`services.mattermost.mutableConfig` set, NixOS will override your settings to those that you define in the module. It is recommended to leave this at the default, even if you used a mutable config before, because it will ensure that your Mattermost data directories are correct. If you moved your data directories, you may want to review the module changes before upgrading. + - Mattermost telemetry reporting is now disabled by default, though security update notifications are enabled. Look at {option}`services.mattermost.telemetry` for options to control this behavior. - `pkgs.mattermostLatest` is now an option to track the latest (non-prerelease) Mattermost release. We test upgrade migrations from ESR releases (`pkgs.mattermost`) to `pkgs.mattermostLatest`. - The Mattermost frontend is now built from source and can be overridden. - Note that the Mattermost derivation containing both the webapp and server is now wrapped to allow them to be built independently, so overrides to both webapp and server look like `mattermost.overrideAttrs (prev: { webapp = prev.webapp.override { ... }; server = prev.server.override { ... }; })` now. From fffc77810e7549ab04c0e07c58eb0479cc19c08b Mon Sep 17 00:00:00 2001 From: kilianar Date: Mon, 27 Jan 2025 10:47:28 +0100 Subject: [PATCH 241/287] portfolio: 0.73.0 -> 0.74.0 https://github.com/portfolio-performance/portfolio/releases/tag/0.74.0 --- pkgs/by-name/po/portfolio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/portfolio/package.nix b/pkgs/by-name/po/portfolio/package.nix index 4e0b80d0635c..71d54e7fd88f 100644 --- a/pkgs/by-name/po/portfolio/package.nix +++ b/pkgs/by-name/po/portfolio/package.nix @@ -33,11 +33,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "PortfolioPerformance"; - version = "0.73.0"; + version = "0.74.0"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${finalAttrs.version}/PortfolioPerformance-${finalAttrs.version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-GCP1lvdXzvdUMKBZnSyoLBJ3sxI2/4JKAuDrtGZQJxo="; + hash = "sha256-RP+5mUoE7L+koS5AvI2J+H/7093+yAy9KXfgWedKAGQ="; }; nativeBuildInputs = [ From 4ccbe97736155d21546cc566d949e75f06e8b39b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 09:51:03 +0000 Subject: [PATCH 242/287] gum: 0.15.0 -> 0.15.1 --- pkgs/by-name/gu/gum/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gu/gum/package.nix b/pkgs/by-name/gu/gum/package.nix index 6fc7d68be6d5..31e1d6462a6d 100644 --- a/pkgs/by-name/gu/gum/package.nix +++ b/pkgs/by-name/gu/gum/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gum"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - hash = "sha256-DHIFU+dfZpeQo9kN9Krc1dhTf2HlnC7PEwTfN6RYmSU="; + hash = "sha256-5/ifKAKKl4adhTsrfIzViLuYpHyf1W6L0KQXk9EObow="; }; - vendorHash = "sha256-BcHwFj4nGmKcbVnLEVd9rK54DAyVNc2Dlt085N+HtFA="; + vendorHash = "sha256-H29cyhgC+ZI7CjFTfYb4ekvHfkMfUUzgCDtWXYW6iYM="; nativeBuildInputs = [ installShellFiles From e855c9164802bc2e28f022959cf89c7a4bdd1821 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 10:24:52 +0000 Subject: [PATCH 243/287] cargo-leptos: 0.2.25 -> 0.2.26 --- pkgs/by-name/ca/cargo-leptos/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-leptos/package.nix b/pkgs/by-name/ca/cargo-leptos/package.nix index 5979fbfc84e5..8cb3688c0ad7 100644 --- a/pkgs/by-name/ca/cargo-leptos/package.nix +++ b/pkgs/by-name/ca/cargo-leptos/package.nix @@ -16,16 +16,16 @@ let in rustPlatform.buildRustPackage rec { pname = "cargo-leptos"; - version = "0.2.25"; + version = "0.2.26"; src = fetchFromGitHub { owner = "leptos-rs"; repo = pname; rev = "v${version}"; - hash = "sha256-vgYr6mMS2O4/102R+6iCW9IBziM1tIav569d36iIbl8="; + hash = "sha256-v1gNH3pq5db/swsk79nEzgtR4jy3f/xHs4QaLnVcVYU="; }; - cargoHash = "sha256-Q3+tOpvzDqIn2M6Zrm1xK6TeTV4zrxK0PYgcIsEBIhE="; + cargoHash = "sha256-D9/ZXmXWrKhLLx2aJZgctidpxef53Z7H+X37m8Yz0Hs="; buildInputs = optionals isDarwin [ SystemConfiguration From 9721085275b30ae75cd7e63c848591e3a7e578b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 10:38:59 +0000 Subject: [PATCH 244/287] home-assistant-custom-lovelace-modules.hourly-weather: 6.6.0 -> 6.6.1 --- .../custom-lovelace-modules/hourly-weather/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix index c665e7f3a2cc..f046c21aecca 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "hourly-weather"; - version = "6.6.0"; + version = "6.6.1"; src = fetchFromGitHub { owner = "decompil3d"; repo = "lovelace-hourly-weather"; rev = version; - hash = "sha256-UlKObFzzjsjxqp2uKvI8BYHTFBWFLFg4RTnJkFplZCA="; + hash = "sha256-D2kCUcUgLyMVeba3xc02q/5PrEzXrBVCX+75F58j8y0="; }; - npmDepsHash = "sha256-cDRS87+uNbf4OOQ5w6gFFgeI52YblfAB0bS07wJg5r0="; + npmDepsHash = "sha256-gpyqQd4pRF4xKgfT9gRAVnXLSFThjfJV2yu4zOCvVpg="; env.CYPRESS_INSTALL_BINARY = "0"; From 6814f53cc04273c167d44e7b5a6d7a3527c75c12 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Mon, 27 Jan 2025 11:40:31 +0100 Subject: [PATCH 245/287] kubedb-cli: fix hash after tag was moved Signed-off-by: Paul Meyer --- pkgs/by-name/ku/kubedb-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ku/kubedb-cli/package.nix b/pkgs/by-name/ku/kubedb-cli/package.nix index b9a17df7cf66..5ee91afb4066 100644 --- a/pkgs/by-name/ku/kubedb-cli/package.nix +++ b/pkgs/by-name/ku/kubedb-cli/package.nix @@ -11,8 +11,8 @@ buildGoModule rec { src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; - rev = "v${version}"; - sha256 = "sha256-6AhL3IBAQ9Mngquh7XbnXEb4jDX1k2d3bwKBFRhEzHA="; + tag = "v${version}"; + hash = "sha256-e3kP1N6uhLKrOWfvl29vVB9D/bpj1W+1dGlaAuc8es0="; }; vendorHash = null; From 1ce79c9d5867fce621e3bf5c3f1910f1cfa290ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 10:47:04 +0000 Subject: [PATCH 246/287] nomino: 1.5.0 -> 1.6.0 --- pkgs/by-name/no/nomino/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/no/nomino/package.nix b/pkgs/by-name/no/nomino/package.nix index 6ef8f5bb7869..9b6d523b84d0 100644 --- a/pkgs/by-name/no/nomino/package.nix +++ b/pkgs/by-name/no/nomino/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "nomino"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "yaa110"; repo = pname; rev = version; - hash = "sha256-/5rKlPRo3+BsqPgHJ0M/JDGwA0c4rAiOd7gGClPfxMg="; + hash = "sha256-BWfgXg3DYdhSzO3qtkwDZ+BZGcIqm82G3ZryaetLYgM="; }; - cargoHash = "sha256-LaLMa66paTW9Wubus3phc7IgDW54sJFSf4VHnJHGq3o="; + cargoHash = "sha256-xmm9vOcHsRXw5zAptuiSF7xnA81HsHiG8v+nN/T77Yk="; meta = with lib; { description = "Batch rename utility for developers"; From 9aa6e4e059a67773efa293263838513afbdd2b11 Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Mon, 27 Jan 2025 11:55:16 +0100 Subject: [PATCH 247/287] n98-magerun: switch to buildComposerProject2 and tag (#377265) --- pkgs/by-name/n9/n98-magerun/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/n9/n98-magerun/package.nix b/pkgs/by-name/n9/n98-magerun/package.nix index c7012f32b1eb..995423c69797 100644 --- a/pkgs/by-name/n9/n98-magerun/package.nix +++ b/pkgs/by-name/n9/n98-magerun/package.nix @@ -5,18 +5,18 @@ nix-update-script, }: -php81.buildComposerProject (finalAttrs: { +php81.buildComposerProject2 (finalAttrs: { pname = "n98-magerun"; version = "2.3.0"; src = fetchFromGitHub { owner = "netz98"; repo = "n98-magerun"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-/RffdYgl2cs8mlq4vHtzUZ6j0viV8Ot/cB/cB1dstFM="; }; - vendorHash = "sha256-n608AY6AQdVuN3hfVQk02vJQ6hl/0+4LVBOsBL5o3+8="; + vendorHash = "sha256-huYLbqJaxeSST2WGcSdk4gR3d3KWSkIK/6tzVpCw0oQ="; passthru.updateScript = nix-update-script { # Excludes 1.x versions from the Github tags list From d42f4d5f45d0da88832818a06d9123942381c7d5 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 21:24:29 +0100 Subject: [PATCH 248/287] mdbook-graphviz: update source hash Tag was force pushed. Diff looks harmless: diff --git 1/nix/store/ng7d6w5n1vm09wrvzffv5fb68zvc2vrx-source/Cargo.toml 2/nix/store/alwq97v5w3j7g0prxdj8s0agmic4crly-source/Cargo.toml index 953121e..b1b81ef 100644 --- 1/nix/store/ng7d6w5n1vm09wrvzffv5fb68zvc2vrx-source/Cargo.toml +++ 2/nix/store/alwq97v5w3j7g0prxdj8s0agmic4crly-source/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mdbook-graphviz" -version = "0.2.0" +version = "0.2.1" authors = ["Dylan Owen "] description = "mdbook preprocessor to add graphviz support" readme = "Readme.md" --- pkgs/tools/text/mdbook-graphviz/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/mdbook-graphviz/default.nix b/pkgs/tools/text/mdbook-graphviz/default.nix index 5cc71d2871ae..00bc5e50c8b4 100644 --- a/pkgs/tools/text/mdbook-graphviz/default.nix +++ b/pkgs/tools/text/mdbook-graphviz/default.nix @@ -14,8 +14,10 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "dylanowen"; repo = pname; - rev = "v${version}"; - hash = "sha256-QLgTUQWfGoUV7L+nZKyO7yBYFi8/puikWkmDHQihc50="; + # Upstream has rewritten tags before: + # https://github.com/dylanowen/mdbook-graphviz/issues/180 + rev = "6e368ad745934fb9e10f224cfc0dc15d4f6fa114"; + hash = "sha256-f02SOyU5REm+uP4/vB/1yG9M0Vg8ShF2hj5NKuh0jLU="; }; cargoHash = "sha256-cMCNZ8Ezp7bFx4EnuZCXhqoaE0yN3iK9KnCYBYGPHKc="; From 58efc57ceb2db7ac4e01ffde0a313fb2560033a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 11:10:40 +0000 Subject: [PATCH 249/287] python312Packages.databricks-sdk: 0.40.0 -> 0.41.0 --- pkgs/development/python-modules/databricks-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/databricks-sdk/default.nix b/pkgs/development/python-modules/databricks-sdk/default.nix index 1db7d3e429dc..3e544760d2fd 100644 --- a/pkgs/development/python-modules/databricks-sdk/default.nix +++ b/pkgs/development/python-modules/databricks-sdk/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "databricks-sdk"; - version = "0.40.0"; + version = "0.41.0"; pyproject = true; src = fetchFromGitHub { owner = "databricks"; repo = "databricks-sdk-py"; tag = "v${version}"; - hash = "sha256-x8CbjWdholuIGVr3TxbFjEszu0owjSIm7+G3Sh+cHEk="; + hash = "sha256-mKytUMPipee/sg5VWBTfCg0sZwNg69pI+Uuqu1EhNIc="; }; build-system = [ From 7db3b7c28bd5e0b530b2675265fcb6adbd1b0026 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 27 Jan 2025 18:37:20 +0800 Subject: [PATCH 250/287] nixosTests.mate-wayland: Check for more text * As long as the dialog shows everything is fine, make the test less flaky. * Also use `pgrep` instead of `pgrep -f` when possible. --- nixos/tests/mate-wayland.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nixos/tests/mate-wayland.nix b/nixos/tests/mate-wayland.nix index 1e660087ec99..bf0989b2cf1d 100644 --- a/nixos/tests/mate-wayland.nix +++ b/nixos/tests/mate-wayland.nix @@ -42,10 +42,11 @@ import ./make-test-python.nix ( machine.wait_for_file("/run/user/${toString user.uid}/wayland-1") with subtest("Check if MATE session components actually start"): - for i in ["wayfire", "mate-panel", "mate-wayland.sh", "mate-wayland-components.sh"]: - machine.wait_until_succeeds(f"pgrep -f {i}") - # It is expected that this applet doesn't work in Wayland - machine.wait_for_text('WorkspaceSwitcherApplet') + for i in ["wayfire", "mate-panel", "mate-wayland.sh"]: + machine.wait_until_succeeds(f"pgrep {i}") + machine.wait_until_succeeds("pgrep -f mate-wayland-components.sh") + # It is expected that WorkspaceSwitcherApplet doesn't work in Wayland + machine.wait_for_text('(panel|Factory|Workspace|Switcher|Applet|configuration)') with subtest("Check if various environment variables are set"): cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf mate-panel)/environ" From 6f7b06b66c951f699c06f865c8b7f1dcd51df843 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 11:28:40 +0000 Subject: [PATCH 251/287] glooctl: 1.18.5 -> 1.18.6 --- pkgs/by-name/gl/glooctl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gl/glooctl/package.nix b/pkgs/by-name/gl/glooctl/package.nix index 8f4722c1b576..4f6b10e09f54 100644 --- a/pkgs/by-name/gl/glooctl/package.nix +++ b/pkgs/by-name/gl/glooctl/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "glooctl"; - version = "1.18.5"; + version = "1.18.6"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-0ITszVZnxbXSCie9lFotMwZYSVTAhqDgKiz19apPkog="; + hash = "sha256-kxNlTVU4VFqEhismth5qb0Ar335TYhO/2oE8tt9km3c="; }; vendorHash = "sha256-AEfDeUD7A4ZFgctNa8b1XeJMFnmcQCLvlQqNFM/gSCc="; From da43c1e3f1efe9bb9eec68ba8023e950944c4db1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 12:08:02 +0000 Subject: [PATCH 252/287] python312Packages.pyedflib: 0.1.38 -> 0.1.39 --- pkgs/development/python-modules/pyedflib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyedflib/default.nix b/pkgs/development/python-modules/pyedflib/default.nix index a83fe89795b0..00552dd9eceb 100644 --- a/pkgs/development/python-modules/pyedflib/default.nix +++ b/pkgs/development/python-modules/pyedflib/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pyedflib"; - version = "0.1.38"; + version = "0.1.39"; pyproject = true; src = fetchFromGitHub { owner = "holgern"; repo = "pyedflib"; tag = "v${version}"; - hash = "sha256-sj2O5ISAy12u4GdtucLaRfOeSA6o6FJpZWTyiLq5B3U="; + hash = "sha256-NHjeaNLbOxTPzTbQ9owFkessQY/QnxBSC8G93JahMGg="; }; build-system = [ From 871c57e5f8bf527e0b81c448aaae908c383f5df1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 12:21:00 +0000 Subject: [PATCH 253/287] sqldef: 0.17.27 -> 0.17.28 --- pkgs/by-name/sq/sqldef/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sq/sqldef/package.nix b/pkgs/by-name/sq/sqldef/package.nix index f2fb511a71b7..c84ebe37adcc 100644 --- a/pkgs/by-name/sq/sqldef/package.nix +++ b/pkgs/by-name/sq/sqldef/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "sqldef"; - version = "0.17.27"; + version = "0.17.28"; src = fetchFromGitHub { owner = "sqldef"; repo = "sqldef"; rev = "v${version}"; - hash = "sha256-h0WOd3w6G9jmdhKzfD0AtdTzeLZgEPQ9LPlbIsASm34="; + hash = "sha256-DfH+5QArv3aI3ECQ5XK/mjNsKbZ4yEEY3LFZPuPvxDo="; }; proxyVendor = true; From 28af2a6ec46cb3343592edaff3cb396ab68b936b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 12:22:08 +0000 Subject: [PATCH 254/287] lazysql: 0.3.3 -> 0.3.4 --- pkgs/by-name/la/lazysql/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/lazysql/package.nix b/pkgs/by-name/la/lazysql/package.nix index 171585a0b42a..50d88562e007 100644 --- a/pkgs/by-name/la/lazysql/package.nix +++ b/pkgs/by-name/la/lazysql/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "lazysql"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "jorgerojas26"; repo = "lazysql"; rev = "v${version}"; - hash = "sha256-+7KchZbd/XJ+c5ndA4arbKabeMxX1ZTOVs7Nw+TSxGI="; + hash = "sha256-APbfaAHufpEaBdXO13afmdnpSA98LhXUhYZ6TK/gazk="; }; vendorHash = "sha256-ef3GngaaoNEJAOF5IlTQhTrO5P22w5p7G91TYJasfGk="; From d65ff67488a71153f9e60e60a6a4159a773e8919 Mon Sep 17 00:00:00 2001 From: Christoph Honal Date: Thu, 23 Jan 2025 17:31:05 +0100 Subject: [PATCH 255/287] rastertoezpl: init at 1.1.12 --- pkgs/by-name/ra/rastertoezpl/package.nix | 38 ++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 pkgs/by-name/ra/rastertoezpl/package.nix diff --git a/pkgs/by-name/ra/rastertoezpl/package.nix b/pkgs/by-name/ra/rastertoezpl/package.nix new file mode 100644 index 000000000000..58a037ab2929 --- /dev/null +++ b/pkgs/by-name/ra/rastertoezpl/package.nix @@ -0,0 +1,38 @@ +{ + stdenv, + lib, + fetchurl, + cups, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "rastertoezpl"; + version = "1.1.12"; + + src = fetchurl { + url = "https://godex.s3-accelerate.amazonaws.com/tWHDYruxWFM98frjWNTE,g.file?v01"; + name = "${finalAttrs.pname}-${finalAttrs.version}-source.tar.gz"; + hash = "sha256-iBhM8Mht/XncWU75cd485WK5GZtJNv78yMsFsD0eKWQ="; + }; + + buildInputs = [ cups ]; + + configureFlags = [ + "--datarootdir=${placeholder "out"}/share" + "PPDDIR=${placeholder "out"}/share/cups/model" + ]; + + postInstall = '' + mkdir -p $out/lib/cups/filter + ln -s $out/libexec/rastertoezpl/rastertoezpl $out/lib/cups/filter/rastertoezpl + gzip -9n $out/share/cups/model/godex/*.ppd + ''; + + meta = { + description = "CUPS driver for GODEX printers"; + homepage = "https://www.godexintl.com/downloads"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ stargate01 ]; + platforms = lib.platforms.linux; + }; +}) From d9bde042b1f15c7cfddaae99d081b474189ecf71 Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Mon, 27 Jan 2025 21:33:08 +0800 Subject: [PATCH 256/287] wownero: pin boost 1.86 --- pkgs/by-name/wo/wownero/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wo/wownero/package.nix b/pkgs/by-name/wo/wownero/package.nix index 9b658084b87b..5933810851dd 100644 --- a/pkgs/by-name/wo/wownero/package.nix +++ b/pkgs/by-name/wo/wownero/package.nix @@ -5,7 +5,7 @@ fetchFromGitea, cmake, python3, - boost, + boost186, libsodium, openssl, rapidjson, @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { buildInputs = [ - boost + boost186 libsodium openssl rapidjson From 4e279b9ded9cba7f11731bc3e27e40fac93f11b2 Mon Sep 17 00:00:00 2001 From: "\"Gaetan Lepage\"" <"gaetan@glepage.com"> Date: Mon, 27 Jan 2025 14:38:02 +0100 Subject: [PATCH 257/287] vimPlugins.blink-copilot: init at 2025-01-27 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 6cf9976d9c6f..39b00d195e16 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1302,6 +1302,18 @@ final: prev: meta.homepage = "https://github.com/Saghen/blink.compat/"; }; + blink-copilot = buildVimPlugin { + pname = "blink-copilot"; + version = "2025-01-27"; + src = fetchFromGitHub { + owner = "fang2hou"; + repo = "blink-copilot"; + rev = "7e63f20b8e96191e5c87bf96fc35da3547993be2"; + sha256 = "10lm90xa7w3ww94acivshnzkp4q2bfrq9zff2z5amrp3cxlga0rf"; + }; + meta.homepage = "https://github.com/fang2hou/blink-copilot/"; + }; + blink-emoji-nvim = buildVimPlugin { pname = "blink-emoji.nvim"; version = "2025-01-04"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 4ebe4530e035..d3e516ef2402 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -105,6 +105,7 @@ https://github.com/max397574/better-escape.nvim/,, https://github.com/LunarVim/bigfile.nvim/,, https://github.com/APZelos/blamer.nvim/,HEAD, https://github.com/giuxtaposition/blink-cmp-copilot/,HEAD, +https://github.com/fang2hou/blink-copilot/,HEAD, https://github.com/moyiz/blink-emoji.nvim/,HEAD, https://github.com/mikavilpas/blink-ripgrep.nvim/,HEAD, https://github.com/Saghen/blink.compat/,HEAD, From cad725befac932fc986063bb8b0201cc597a3614 Mon Sep 17 00:00:00 2001 From: arthsmn Date: Mon, 27 Jan 2025 10:22:59 -0300 Subject: [PATCH 258/287] lime3ds: fix build --- pkgs/by-name/li/lime3ds/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/li/lime3ds/package.nix b/pkgs/by-name/li/lime3ds/package.nix index f927ff1c1283..3b18a88f6e91 100644 --- a/pkgs/by-name/li/lime3ds/package.nix +++ b/pkgs/by-name/li/lime3ds/package.nix @@ -119,6 +119,12 @@ stdenv.mkDerivation (finalAttrs: { url = "https://raw.githubusercontent.com/Tatsh/tatsh-overlay/fa2f92b888f8c0aab70414ca560b823ffb33b122/games-emulation/lime3ds/files/lime3ds-0002-boost-fix.patch"; hash = "sha256-XJogqvQE7I5lVHtvQja0woVlO40blhFOqnoYftIQwJs="; }) + + # Fix boost 1.87 + (fetchpatch { + url = "https://raw.githubusercontent.com/Tatsh/tatsh-overlay/5c4497d9b67fa6f2fa327b2f2ce4cb5be8c9f2f7/games-emulation/lime3ds/files/lime3ds-0003-boost-1.87-fixes.patch"; + hash = "sha256-mwfI7fTx9aWF/EjMW3bxoz++A+6ONbNA70tT5nkhDUU="; + }) ]; postPatch = '' From 9dbe664d61eccf47737264918ff608d168cc9fb2 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sun, 26 Jan 2025 04:43:37 +0100 Subject: [PATCH 259/287] aerc: add maintainers --- pkgs/by-name/ae/aerc/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ae/aerc/package.nix b/pkgs/by-name/ae/aerc/package.nix index dd8416badbb7..be2f29bd60c4 100644 --- a/pkgs/by-name/ae/aerc/package.nix +++ b/pkgs/by-name/ae/aerc/package.nix @@ -92,7 +92,10 @@ buildGoModule rec { description = "Email client for your terminal"; homepage = "https://aerc-mail.org/"; changelog = "https://git.sr.ht/~rjarry/aerc/tree/${version}/item/CHANGELOG.md"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + defelo + sikmir + ]; mainProgram = "aerc"; license = lib.licenses.mit; platforms = lib.platforms.unix; From 5645cd22d4a4ed66449986cd96f49ebc043cb5d6 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 27 Jan 2025 15:43:23 +0100 Subject: [PATCH 260/287] linux: expose make flags for modules in `linuxKernel.packages.linux_X_Y` Closes #376820 The issue with providing `moduleMakeFlags` via `passthru` of the kernel package is that when this package gets overriden[1], the `moduleMakeFlags` list still references the kernel without the overrides. This broke e.g. kernel modules of linux-rpi4 which can be reproduced with nix-build --argstr system aarch64-linux -A linuxKernel.packages.linux_rpi4.zfs_2_3 This used to break with Error: modDirVersion 6.6.51 specified in the Nix expression is wrong, it should be: 6.6.51-v8 since KBUILD_OUTPUT referenced the kernel without the changes from `overrideDerivation` that also changes the `modDirVersion`. The new approach is to add the build flags right into `linuxKernel.packages.linux_X_Y`: that way we don't need any hacks to update `moduleMakeFlags` when the derivation with the passthru gets overridden. By using the fixpoint of the package-set, the `kernelModuleMakeFlags` list is correctly updated. E.g. given with import ./. {}; linuxKernel.packages.linux_6_6.extend (self: super: { kernel = super.kernel.overrideAttrs (_: { name = "linux-snens"; }); }) the `makeFlags` is correctly updated: $ nix-instantiate snenskek.nix -A zfs_2_3.makeFlags --eval --strict [ "ARCH=x86_64" "CROSS_COMPILE=" "KBUILD_OUTPUT=/nix/store/gsp68549k1aqbwxwczpgw67w5jjn4shw-linux-snens-dev/lib/modules/6.6.74/build" ] [1] E.g. `linux-rpi4`. --- pkgs/applications/emulators/cdemu/vhba.nix | 3 +- pkgs/os-specific/linux/acpi-call/default.nix | 3 +- pkgs/os-specific/linux/akvcam/default.nix | 3 +- pkgs/os-specific/linux/amneziawg/default.nix | 3 +- pkgs/os-specific/linux/apfs/default.nix | 3 +- pkgs/os-specific/linux/batman-adv/default.nix | 3 +- pkgs/os-specific/linux/bbswitch/default.nix | 3 +- pkgs/os-specific/linux/can-isotp/default.nix | 3 +- pkgs/os-specific/linux/cryptodev/default.nix | 3 +- pkgs/os-specific/linux/ddcci/default.nix | 3 +- pkgs/os-specific/linux/digimend/default.nix | 3 +- pkgs/os-specific/linux/dpdk-kmods/default.nix | 3 +- pkgs/os-specific/linux/drbd/driver.nix | 3 +- pkgs/os-specific/linux/ena/default.nix | 3 +- pkgs/os-specific/linux/evdi/default.nix | 3 +- pkgs/os-specific/linux/fanout/default.nix | 3 +- .../linux/framework-laptop-kmod/default.nix | 3 +- pkgs/os-specific/linux/fwts/module.nix | 3 +- pkgs/os-specific/linux/gasket/default.nix | 3 +- .../linux/gcadapter-oc-kmod/default.nix | 3 +- .../linux/hid-ite8291r3/default.nix | 3 +- pkgs/os-specific/linux/hid-t150/default.nix | 3 +- pkgs/os-specific/linux/hid-tmff2/default.nix | 4 +-- .../linux/ipu6-drivers/default.nix | 3 +- pkgs/os-specific/linux/ithc/default.nix | 3 +- .../os-specific/linux/ivsc-driver/default.nix | 3 +- pkgs/os-specific/linux/jool/default.nix | 3 +- .../linux/kernel/manual-config.nix | 36 +++++++++---------- .../os-specific/linux/kernel/perf/default.nix | 3 +- .../linux/lenovo-legion/default.nix | 3 +- pkgs/os-specific/linux/lkrg/default.nix | 3 +- .../linux/lttng-modules/default.nix | 3 +- pkgs/os-specific/linux/mba6x_bl/default.nix | 3 +- .../mbp2018-bridge-drv/default.nix | 3 +- pkgs/os-specific/linux/msi-ec/default.nix | 3 +- .../linux/mstflint_access/default.nix | 4 +-- pkgs/os-specific/linux/nct6687d/default.nix | 3 +- pkgs/os-specific/linux/netatop/default.nix | 3 +- pkgs/os-specific/linux/nullfs/default.nix | 3 +- pkgs/os-specific/linux/nvidia-x11/generic.nix | 3 +- pkgs/os-specific/linux/nvidia-x11/open.nix | 3 +- pkgs/os-specific/linux/openrazer/driver.nix | 3 +- .../os-specific/linux/qc71_laptop/default.nix | 3 +- pkgs/os-specific/linux/r8168/default.nix | 4 +-- pkgs/os-specific/linux/rtl8189es/default.nix | 3 +- pkgs/os-specific/linux/rtl8192eu/default.nix | 3 +- pkgs/os-specific/linux/rtl8814au/default.nix | 3 +- pkgs/os-specific/linux/rtl8821ce/default.nix | 3 +- pkgs/os-specific/linux/rtl8821cu/default.nix | 3 +- pkgs/os-specific/linux/rtl88x2bu/default.nix | 3 +- pkgs/os-specific/linux/rtw88/default.nix | 3 +- pkgs/os-specific/linux/rtw89/default.nix | 3 +- .../linux/rust-out-of-tree-module/default.nix | 3 +- .../os-specific/linux/shufflecake/default.nix | 3 +- pkgs/os-specific/linux/tmon/default.nix | 3 +- pkgs/os-specific/linux/trelay/default.nix | 3 +- pkgs/os-specific/linux/tsme-test/default.nix | 3 +- .../linux/tuxedo-drivers/default.nix | 3 +- .../linux/v4l2loopback/default.nix | 4 +-- .../linux/veikk-linux-driver/default.nix | 3 +- .../linux/virtio_vmmci/default.nix | 4 +-- pkgs/os-specific/linux/vmm_clock/default.nix | 3 +- pkgs/os-specific/linux/xpadneo/default.nix | 3 +- pkgs/os-specific/linux/zenergy/default.nix | 3 +- pkgs/os-specific/linux/zfs/generic.nix | 6 ++-- pkgs/top-level/linux-kernels.nix | 3 ++ 66 files changed, 150 insertions(+), 89 deletions(-) diff --git a/pkgs/applications/emulators/cdemu/vhba.nix b/pkgs/applications/emulators/cdemu/vhba.nix index b5487fa68c45..5ef0048324a4 100644 --- a/pkgs/applications/emulators/cdemu/vhba.nix +++ b/pkgs/applications/emulators/cdemu/vhba.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { hash = "sha256-zjTLriw2zvjX0Jxfa9QtaHG5tTC7cLTKEA+WSCP+Dpg="; }; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 2bce3881edca..504b713b908d 100644 --- a/pkgs/os-specific/linux/acpi-call/default.nix +++ b/pkgs/os-specific/linux/acpi-call/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 cd2022097d51..ffbdf880efa8 100644 --- a/pkgs/os-specific/linux/akvcam/default.nix +++ b/pkgs/os-specific/linux/akvcam/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { sourceRoot = "${src.name}/src"; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 9e21f4176b55..1f60be0fb0fb 100644 --- a/pkgs/os-specific/linux/amneziawg/default.nix +++ b/pkgs/os-specific/linux/amneziawg/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, srcOnly, kernel, + kernelModuleMakeFlags, nix-update-script, }: @@ -28,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { ]; makeFlags = - kernel.moduleMakeFlags + kernelModuleMakeFlags ++ [ "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 1e46fbb9121a..0a1c392700b9 100644 --- a/pkgs/os-specific/linux/apfs/default.nix +++ b/pkgs/os-specific/linux/apfs/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, nixosTests, }: @@ -23,7 +24,7 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 14ee2a8db539..653769aa8a9b 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, kernel, + kernelModuleMakeFlags, }: let @@ -19,7 +20,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 bdf71c470725..eab7eb5a1d93 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, fetchpatch, kernel, + kernelModuleMakeFlags, runtimeShell, }: @@ -41,7 +42,7 @@ stdenv.mkDerivation { --replace "/lib/modules" "${kernel.dev}/lib/modules" ''; - makeFlags = kernel.moduleMakeFlags; + makeFlags = kernelModuleMakeFlags; 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 9e348e78e315..b01cb541f446 100644 --- a/pkgs/os-specific/linux/can-isotp/default.nix +++ b/pkgs/os-specific/linux/can-isotp/default.nix @@ -2,6 +2,7 @@ lib, stdenv, kernel, + kernelModuleMakeFlags, fetchFromGitHub, }: @@ -18,7 +19,7 @@ stdenv.mkDerivation { sha256 = "1laax93czalclg7cy9iq1r7hfh9jigh7igj06y9lski75ap2vhfq"; }; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 eee504a0633d..7e8e7d3f6982 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel ? false, + kernelModuleMakeFlags ? [], }: stdenv.mkDerivation (finalAttrs: { @@ -19,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 cfe8b16da956..29f7fe8b5d02 100644 --- a/pkgs/os-specific/linux/ddcci/default.nix +++ b/pkgs/os-specific/linux/ddcci/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitLab, kernel, + kernelModuleMakeFlags, fetchpatch, }: @@ -39,7 +40,7 @@ stdenv.mkDerivation rec { --replace depmod \# ''; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 3262b1d0c1c1..e94ae1646dfa 100644 --- a/pkgs/os-specific/linux/digimend/default.nix +++ b/pkgs/os-specific/linux/digimend/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { rm -r $out/lib/udev ''; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 6db752a885b6..72938768fb01 100644 --- a/pkgs/os-specific/linux/dpdk-kmods/default.nix +++ b/pkgs/os-specific/linux/dpdk-kmods/default.nix @@ -3,6 +3,7 @@ stdenv, fetchzip, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" ]; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 a76758fbdb8e..c2e81f7864c8 100644 --- a/pkgs/os-specific/linux/drbd/driver.nix +++ b/pkgs/os-specific/linux/drbd/driver.nix @@ -3,6 +3,7 @@ lib, fetchurl, kernel, + kernelModuleMakeFlags, nixosTests, flex, coccinelle, @@ -29,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 40e22d2008fc..c812eac392fa 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, gitUpdater, kernel, + kernelModuleMakeFlags, }: let rev-prefix = "ena_linux_"; @@ -23,7 +24,7 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags; + makeFlags = kernelModuleMakeFlags; 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 8703fb9010ac..a3a0d3629f52 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, libdrm, python3, }: @@ -39,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { python3WithLibs ]; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 99ee011fcf8e..36b2bef05ebc 100644 --- a/pkgs/os-specific/linux/fanout/default.nix +++ b/pkgs/os-specific/linux/fanout/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, kmod, nixosTests, }: @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 4bb8f4f0e79e..6f3edcd7d3a9 100644 --- a/pkgs/os-specific/linux/framework-laptop-kmod/default.nix +++ b/pkgs/os-specific/linux/framework-laptop-kmod/default.nix @@ -2,6 +2,7 @@ lib, stdenv, kernel, + kernelModuleMakeFlags, fetchFromGitHub, unstableGitUpdater, }: @@ -19,7 +20,7 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 7caafe491ab2..76326198b8be 100644 --- a/pkgs/os-specific/linux/fwts/module.nix +++ b/pkgs/os-specific/linux/fwts/module.nix @@ -3,6 +3,7 @@ stdenv, fwts, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" ]; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "INSTALL_MOD_PATH=${placeholder "out"}" ]; diff --git a/pkgs/os-specific/linux/gasket/default.nix b/pkgs/os-specific/linux/gasket/default.nix index 43bcd899742c..0be0a18024a1 100644 --- a/pkgs/os-specific/linux/gasket/default.nix +++ b/pkgs/os-specific/linux/gasket/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, fetchpatch2, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { cd src ''; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "-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 adac60eb2489..d621bf282f6f 100644 --- a/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix +++ b/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, kmod, }: @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 5f24fda01d9e..e3d4fc23c620 100644 --- a/pkgs/os-specific/linux/hid-ite8291r3/default.nix +++ b/pkgs/os-specific/linux/hid-ite8291r3/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 74a254b6e22f..dd96c044c99f 100644 --- a/pkgs/os-specific/linux/hid-t150/default.nix +++ b/pkgs/os-specific/linux/hid-t150/default.nix @@ -3,6 +3,7 @@ lib, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { sourceRoot = "${src.name}/hid-t150"; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 3784746ca9d3..e74cde0a254b 100644 --- a/pkgs/os-specific/linux/hid-tmff2/default.nix +++ b/pkgs/os-specific/linux/hid-tmff2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, kernel }: +{ stdenv, lib, fetchFromGitHub, kernel, kernelModuleMakeFlags }: stdenv.mkDerivation { pname = "hid-tmff2"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 0be218282d2c..c7aaa3789d6d 100644 --- a/pkgs/os-specific/linux/ipu6-drivers/default.nix +++ b/pkgs/os-specific/linux/ipu6-drivers/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, ivsc-driver, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 0ede651706bc..9f721bfae939 100644 --- a/pkgs/os-specific/linux/ithc/default.nix +++ b/pkgs/os-specific/linux/ithc/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 93ce524672a2..b52e21344c73 100644 --- a/pkgs/os-specific/linux/ivsc-driver/default.nix +++ b/pkgs/os-specific/linux/ivsc-driver/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation { @@ -18,7 +19,7 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 e1d892d33fd0..0af71b24ac95 100644 --- a/pkgs/os-specific/linux/jool/default.nix +++ b/pkgs/os-specific/linux/jool/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, nixosTests, }: @@ -22,7 +23,7 @@ stdenv.mkDerivation { sed -e 's@/lib/modules/\$(.*)@${kernel.dev}/lib/modules/${kernel.modDirVersion}@' -i src/mod/*/Makefile ''; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "-C src/mod" "INSTALL_MOD_PATH=${placeholder "out"}" ]; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 0b5e64dd6d4d..8ef763d87214 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -434,28 +434,26 @@ let "LD=${stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ld" ] ++ (stdenv.hostPlatform.linux-kernel.makeFlags or []) ++ extraMakeFlags; +in - finalKernel = stdenv.mkDerivation ( - builtins.foldl' lib.recursiveUpdate {} [ - (drvAttrs config stdenv.hostPlatform.linux-kernel kernelPatches configfile) - { - inherit pname version; +stdenv.mkDerivation ( + builtins.foldl' lib.recursiveUpdate {} [ + (drvAttrs config stdenv.hostPlatform.linux-kernel kernelPatches configfile) + { + inherit pname version; - enableParallelBuilding = true; + enableParallelBuilding = true; - hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ]; + hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ]; - makeFlags = [ - "O=$(buildRoot)" - ] ++ commonMakeFlags; + makeFlags = [ + "O=$(buildRoot)" + ] ++ commonMakeFlags; - passthru.moduleMakeFlags = [ - "KBUILD_OUTPUT=${finalKernel.dev}/lib/modules/${finalKernel.modDirVersion}/build" - ] ++ commonMakeFlags; + passthru = { inherit commonMakeFlags; }; - karch = stdenv.hostPlatform.linuxArch; - } - (optionalAttrs (pos != null) { inherit pos; }) - ] - ); -in finalKernel) + karch = stdenv.hostPlatform.linuxArch; + } + (optionalAttrs (pos != null) { inherit pos; }) + ] +)) diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index c5228f4aca2b..2f4cb169c338 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -4,6 +4,7 @@ fetchurl, fetchpatch, kernel, + kernelModuleMakeFlags, elfutils, python3, perl, @@ -101,7 +102,7 @@ stdenv.mkDerivation { "WERROR=0" "ASCIIDOC8=1" ] - ++ kernel.moduleMakeFlags + ++ kernelModuleMakeFlags ++ 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 ef1acb055077..006d929bd8a3 100644 --- a/pkgs/os-specific/linux/lenovo-legion/default.nix +++ b/pkgs/os-specific/linux/lenovo-legion/default.nix @@ -2,6 +2,7 @@ lib, stdenv, kernel, + kernelModuleMakeFlags, bash, lenovo-legion, }: @@ -18,7 +19,7 @@ stdenv.mkDerivation { sed -i -e '/depmod/d' ./Makefile ''; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 760e08d4cbbf..2a3c09ff5c96 100644 --- a/pkgs/os-specific/linux/lkrg/default.nix +++ b/pkgs/os-specific/linux/lkrg/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: let isKernelRT = @@ -25,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 75421fed139e..846c5ae0beff 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 2b4acd172bbb..46c149854c47 100644 --- a/pkgs/os-specific/linux/mba6x_bl/default.nix +++ b/pkgs/os-specific/linux/mba6x_bl/default.nix @@ -1,6 +1,7 @@ { fetchFromGitHub, kernel, + kernelModuleMakeFlags, lib, stdenv, }: @@ -21,7 +22,7 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 388777c1f6f7..717f680ab088 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 @@ -2,6 +2,7 @@ lib, stdenv, kernel, + kernelModuleMakeFlags, fetchFromGitHub, }: @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags; + makeFlags = kernelModuleMakeFlags; 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 d73eae69a05b..f21be652c5ad 100644 --- a/pkgs/os-specific/linux/msi-ec/default.nix +++ b/pkgs/os-specific/linux/msi-ec/default.nix @@ -5,6 +5,7 @@ linuxPackages, git, kernel ? linuxPackages.kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation { pname = "msi-ec-kmods"; @@ -23,7 +24,7 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 0ce131315b71..75ad6034fbd9 100644 --- a/pkgs/os-specific/linux/mstflint_access/default.nix +++ b/pkgs/os-specific/linux/mstflint_access/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, kernel, kmod, mstflint }: +{ lib, stdenv, fetchurl, kernel, kmod, mstflint, kernelModuleMakeFlags }: stdenv.mkDerivation rec { pname = "mstflint_access"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 218f7f0eb8d0..eadcb88e9c7a 100644 --- a/pkgs/os-specific/linux/nct6687d/default.nix +++ b/pkgs/os-specific/linux/nct6687d/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, nix-update-script, }: @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "-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 e116f0925712..4dc26015f0b8 100644 --- a/pkgs/os-specific/linux/netatop/default.nix +++ b/pkgs/os-specific/linux/netatop/default.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, kernel, + kernelModuleMakeFlags, kmod, zlib, }: @@ -48,7 +49,7 @@ stdenv.mkDerivation { kmod=${kmod} substituteAllInPlace netatop.service ''; - makeFlags = kernel.moduleMakeFlags; + makeFlags = kernelModuleMakeFlags; 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 5b6a5517d6de..db2c52d6c068 100644 --- a/pkgs/os-specific/linux/nullfs/default.nix +++ b/pkgs/os-specific/linux/nullfs/default.nix @@ -3,6 +3,7 @@ lib, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { pname = "nullfs"; @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 1c11334d002c..f1f52bc6ce81 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -42,6 +42,7 @@ fetchurl, fetchzip, kernel ? null, + kernelModuleMakeFlags ? [], perl, nukeReferences, which, @@ -215,7 +216,7 @@ let kernelVersion = if libsOnly then null else kernel.modDirVersion; makeFlags = lib.optionals (!libsOnly) ( - kernel.moduleMakeFlags + kernelModuleMakeFlags ++ [ "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 e0e1c0b33ab8..6d27b4dd0b98 100644 --- a/pkgs/os-specific/linux/nvidia-x11/open.nix +++ b/pkgs/os-specific/linux/nvidia-x11/open.nix @@ -3,6 +3,7 @@ lib, fetchFromGitHub, kernel, + kernelModuleMakeFlags, nvidia_x11, hash, patches ? [ ], @@ -25,7 +26,7 @@ stdenv.mkDerivation ( nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 1d80b27c84fd..e6af64c8ebda 100644 --- a/pkgs/os-specific/linux/openrazer/driver.nix +++ b/pkgs/os-specific/linux/openrazer/driver.nix @@ -2,6 +2,7 @@ coreutils, fetchFromGitHub, kernel, + kernelModuleMakeFlags, stdenv, lib, util-linux, @@ -20,7 +21,7 @@ stdenv.mkDerivation ( nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 72a0c7db798e..e6e51938518b 100644 --- a/pkgs/os-specific/linux/qc71_laptop/default.nix +++ b/pkgs/os-specific/linux/qc71_laptop/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 7403f6d2ef86..f84b8a294717 100644 --- a/pkgs/os-specific/linux/r8168/default.nix +++ b/pkgs/os-specific/linux/r8168/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, kernel }: +{ stdenv, lib, fetchFromGitHub, kernel, kernelModuleMakeFlags }: let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless/realtek/r8168"; @@ -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.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "-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 33fbd30fd2bb..561b7ca72e14 100644 --- a/pkgs/os-specific/linux/rtl8189es/default.nix +++ b/pkgs/os-specific/linux/rtl8189es/default.nix @@ -3,6 +3,7 @@ lib, fetchFromGitHub, kernel, + kernelModuleMakeFlags, bc, nukeReferences, }: @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { substituteInPlace ./Makefile --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 4a98cd915276..cb6c7fe94cf9 100644 --- a/pkgs/os-specific/linux/rtl8192eu/default.nix +++ b/pkgs/os-specific/linux/rtl8192eu/default.nix @@ -3,6 +3,7 @@ lib, fetchFromGitHub, kernel, + kernelModuleMakeFlags, bc, }: @@ -25,7 +26,7 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies ++ [ bc ]; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/rtl8814au/default.nix b/pkgs/os-specific/linux/rtl8814au/default.nix index a29075695896..dd8968e0f541 100644 --- a/pkgs/os-specific/linux/rtl8814au/default.nix +++ b/pkgs/os-specific/linux/rtl8814au/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation { @@ -17,7 +18,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags; + makeFlags = kernelModuleMakeFlags; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index 8715a71652a5..d3ceefef0027 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, bc, }: @@ -20,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { hardeningDisable = [ "pic" ]; nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags; + makeFlags = kernelModuleMakeFlags; prePatch = '' substituteInPlace ./Makefile \ diff --git a/pkgs/os-specific/linux/rtl8821cu/default.nix b/pkgs/os-specific/linux/rtl8821cu/default.nix index 70f2b9f572c2..063c50e7c25b 100644 --- a/pkgs/os-specific/linux/rtl8821cu/default.nix +++ b/pkgs/os-specific/linux/rtl8821cu/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, bc, }: @@ -20,7 +21,7 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags; + makeFlags = kernelModuleMakeFlags; prePatch = '' substituteInPlace ./Makefile \ diff --git a/pkgs/os-specific/linux/rtl88x2bu/default.nix b/pkgs/os-specific/linux/rtl88x2bu/default.nix index 119795f2c3aa..5940e90a3abc 100644 --- a/pkgs/os-specific/linux/rtl88x2bu/default.nix +++ b/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, bc, }: @@ -20,7 +21,7 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags; + makeFlags = kernelModuleMakeFlags; prePatch = '' substituteInPlace ./Makefile \ diff --git a/pkgs/os-specific/linux/rtw88/default.nix b/pkgs/os-specific/linux/rtw88/default.nix index 0c830c34cd29..70c36a670bc9 100644 --- a/pkgs/os-specific/linux/rtw88/default.nix +++ b/pkgs/os-specific/linux/rtw88/default.nix @@ -3,6 +3,7 @@ lib, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: let @@ -20,7 +21,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/rtw89/default.nix b/pkgs/os-specific/linux/rtw89/default.nix index 8e90bcf9f08d..4d45b8695881 100644 --- a/pkgs/os-specific/linux/rtw89/default.nix +++ b/pkgs/os-specific/linux/rtw89/default.nix @@ -3,6 +3,7 @@ lib, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: let @@ -20,7 +21,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; 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 61c807be3911..5f0d646e3f27 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 @@ -2,6 +2,7 @@ lib, fetchFromGitHub, kernel, + kernelModuleMakeFlags, unstableGitUpdater, }: kernel.stdenv.mkDerivation { @@ -17,7 +18,7 @@ kernel.stdenv.mkDerivation { }; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/shufflecake/default.nix b/pkgs/os-specific/linux/shufflecake/default.nix index aed568556714..acc7ab0b340a 100644 --- a/pkgs/os-specific/linux/shufflecake/default.nix +++ b/pkgs/os-specific/linux/shufflecake/default.nix @@ -1,6 +1,7 @@ { lib, kernel, + kernelModuleMakeFlags, stdenv, fetchFromGitea, libgcrypt, @@ -22,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { libgcrypt lvm2 ]; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 fe721e2912fd..9b3b04753458 100644 --- a/pkgs/os-specific/linux/tmon/default.nix +++ b/pkgs/os-specific/linux/tmon/default.nix @@ -2,6 +2,7 @@ lib, stdenv, kernel, + kernelModuleMakeFlags, ncurses, }: @@ -17,7 +18,7 @@ stdenv.mkDerivation { cd tools/thermal/tmon ''; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "INSTALL_ROOT=\"$(out)\"" "BINDIR=bin" ]; diff --git a/pkgs/os-specific/linux/trelay/default.nix b/pkgs/os-specific/linux/trelay/default.nix index 4b9684bcbbc5..ec2155ea213f 100644 --- a/pkgs/os-specific/linux/trelay/default.nix +++ b/pkgs/os-specific/linux/trelay/default.nix @@ -3,6 +3,7 @@ lib, fetchgit, kernel, + kernelModuleMakeFlags, kmod, }: let @@ -30,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { cp '${./Makefile}' Makefile ''; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 8f47dbe9f652..a88db395cd4f 100644 --- a/pkgs/os-specific/linux/tsme-test/default.nix +++ b/pkgs/os-specific/linux/tsme-test/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation { @@ -18,7 +19,7 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 1fd18d36f56f..9c80d1dc7767 100644 --- a/pkgs/os-specific/linux/tuxedo-drivers/default.nix +++ b/pkgs/os-specific/linux/tuxedo-drivers/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitLab, kernel, + kernelModuleMakeFlags, kmod, pahole, }: @@ -22,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ pahole ]; nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "KERNELRELEASE=${kernel.modDirVersion}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=${placeholder "out"}" diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix index 104c0c687f1b..6ea951876d0a 100644 --- a/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, kernel, kmod }: +{ lib, stdenv, fetchFromGitHub, kernel, kmod, kernelModuleMakeFlags }: let version = "0.13.2"; @@ -28,7 +28,7 @@ in stdenv.mkDerivation { outputs = [ "out" "bin" ]; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 55b1cf931d70..55ce63db7902 100644 --- a/pkgs/os-specific/linux/veikk-linux-driver/default.nix +++ b/pkgs/os-specific/linux/veikk-linux-driver/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ kernel ]; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 5c5fda8b8d13..6e8a6cea95f7 100644 --- a/pkgs/os-specific/linux/virtio_vmmci/default.nix +++ b/pkgs/os-specific/linux/virtio_vmmci/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, kernel }: +{ stdenv, lib, fetchFromGitHub, kernel, kernelModuleMakeFlags }: stdenv.mkDerivation rec { name = "virtio_vmmci"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { CONFIG_RTC_HCTOSYS yes ''; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 5d5bac541f47..11242fccbc95 100644 --- a/pkgs/os-specific/linux/vmm_clock/default.nix +++ b/pkgs/os-specific/linux/vmm_clock/default.nix @@ -3,6 +3,7 @@ lib, fetchFromGitHub, kernel, + kernelModuleMakeFlags, }: stdenv.mkDerivation rec { @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { CONFIG_RTC_HCTOSYS yes ''; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "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 eefe8b139b0a..70f1ef00cad7 100644 --- a/pkgs/os-specific/linux/xpadneo/default.nix +++ b/pkgs/os-specific/linux/xpadneo/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, bluez, nixosTests, nix-update-script, @@ -26,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = kernel.moduleBuildDependencies; buildInputs = [ bluez ]; - makeFlags = kernel.moduleMakeFlags ++ [ + makeFlags = kernelModuleMakeFlags ++ [ "-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 2a737fb34f57..d78c02e0dd2d 100644 --- a/pkgs/os-specific/linux/zenergy/default.nix +++ b/pkgs/os-specific/linux/zenergy/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, kernel, + kernelModuleMakeFlags, kmod, }: @@ -27,7 +28,7 @@ stdenv.mkDerivation { "pic" ]; - makeFlags = kernel.moduleMakeFlags ++ [ "KDIR=${kernelDirectory}" ]; + makeFlags = kernelModuleMakeFlags ++ [ "KDIR=${kernelDirectory}" ]; installTargets = [ "modules_install" ]; diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index 690baaa5c510..31742d4f7cb9 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -34,6 +34,7 @@ let # Kernel dependencies kernel ? null, + kernelModuleMakeFlags ? [ ], enablePython ? true, ... }@outerArgs: @@ -191,10 +192,10 @@ let "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ] - ++ kernel.moduleMakeFlags + ++ kernelModuleMakeFlags ); - makeFlags = optionals buildKernel kernel.moduleMakeFlags; + makeFlags = optionals buildKernel kernelModuleMakeFlags; enableParallelBuilding = true; @@ -264,6 +265,7 @@ let outputs = [ "out" ] ++ optionals buildUser [ "dev" ]; passthru = { + inherit kernel; inherit enableMail kernelModuleAttribute; latestCompatibleLinuxPackages = lib.warn "zfs.latestCompatibleLinuxPackages is deprecated and is now pointing at the default kernel. If using the stable LTS kernel (default `linuxPackages` is not possible then you must explicitly pin a specific kernel release. For example, `boot.kernelPackages = pkgs.linuxPackages_6_6`. Please be aware that non-LTS kernels are likely to go EOL before ZFS supports the latest supported non-LTS release, requiring manual intervention." linuxPackages; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index a63c22a7a8c9..e348e3b89729 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -322,6 +322,9 @@ in { # to help determine module compatibility inherit (kernel) isZen isHardened isLibre; inherit (kernel) kernelOlder kernelAtLeast; + kernelModuleMakeFlags = self.kernel.commonMakeFlags ++ [ + "KBUILD_OUTPUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; # Obsolete aliases (these packages do not depend on the kernel). inherit (pkgs) odp-dpdk pktgen; # added 2018-05 inherit (pkgs) bcc bpftrace; # added 2021-12 From 7b5ed4120d1e3652a7be0da3dc2eed809de70d8d Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Mon, 27 Jan 2025 16:16:03 +0100 Subject: [PATCH 261/287] victoriametrics: 1.109.0 -> 1.110.0 --- pkgs/by-name/vi/victoriametrics/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index 118f84900d9c..bcdbaa465213 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.109.0"; + version = "1.110.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; rev = "v${version}"; - hash = "sha256-ZeHQxJtUZSFwWeQgHcEXdq9GR26HH4NOuLnO8S4u21o="; + hash = "sha256-TrM2YyxZZZw+wGMIFACJExtQb6aJwDe1xe63OQqCjDo="; }; vendorHash = null; From 80223d5e0c5bef1b22bfce1721b9a54839b965d2 Mon Sep 17 00:00:00 2001 From: liberodark Date: Fri, 24 Jan 2025 13:43:48 +0100 Subject: [PATCH 262/287] stretchly: 1.16.0 -> 1.17.2 --- pkgs/by-name/st/stretchly/package.nix | 32 +++++++++------------------ 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/st/stretchly/package.nix b/pkgs/by-name/st/stretchly/package.nix index b921992f6817..684cf57eadc2 100644 --- a/pkgs/by-name/st/stretchly/package.nix +++ b/pkgs/by-name/st/stretchly/package.nix @@ -4,18 +4,17 @@ fetchurl, makeWrapper, electron, - common-updater-scripts, - writeShellScript, makeDesktopItem, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "stretchly"; - version = "1.16.0"; + version = "1.17.2"; src = fetchurl { url = "https://github.com/hovancik/stretchly/releases/download/v${finalAttrs.version}/stretchly-${finalAttrs.version}.tar.xz"; - hash = "sha256-gOMUXGldtZUfqLABJHfbToYe0pcAn8dRWEFxCi/gY9Y="; + hash = "sha256-IsVmdsmLfNkZ7B9i8TjTHMymsmYLJY5AJleAoEwnUKk="; }; icon = fetchurl { @@ -40,19 +39,6 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru = { - updateScript = writeShellScript "update-stretchly" '' - set -eu -o pipefail - - # get the latest release version - latest_version=$(curl -s https://api.github.com/repos/hovancik/stretchly/releases/latest | jq --raw-output .tag_name | sed -e 's/^v//') - - echo "updating to $latest_version..." - - ${common-updater-scripts}/bin/update-source-version stretchly "$latest_version" - ''; - }; - desktopItem = makeDesktopItem { name = finalAttrs.pname; exec = finalAttrs.pname; @@ -62,7 +48,11 @@ stdenv.mkDerivation (finalAttrs: { categories = [ "Utility" ]; }; - meta = with lib; { + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { description = "Break time reminder app"; longDescription = '' stretchly is a cross-platform electron app that reminds you to take @@ -73,9 +63,9 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://hovancik.net/stretchly"; downloadPage = "https://hovancik.net/stretchly/downloads/"; - license = licenses.bsd2; - maintainers = with maintainers; [ _1000101 ]; - platforms = platforms.linux; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ _1000101 ]; + platforms = lib.platforms.linux; mainProgram = "stretchly"; }; }) From d87487856861e41585033d31c452c01e85bc3cb8 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 27 Jan 2025 11:45:05 +0100 Subject: [PATCH 263/287] python312Packages.jaxopt: disable flaky test --- pkgs/development/python-modules/jaxopt/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jaxopt/default.nix b/pkgs/development/python-modules/jaxopt/default.nix index dbab34993a5c..c8ada5b43e31 100644 --- a/pkgs/development/python-modules/jaxopt/default.nix +++ b/pkgs/development/python-modules/jaxopt/default.nix @@ -89,11 +89,12 @@ buildPythonPackage rec { "test_binary_logit_log_likelihood" # AssertionError (flaky numerical tests) - "test_logreg_with_intercept_manual_loop3" - "test_inv_hessian_product_pytree3" - "test_multiclass_logreg6" "test_Rosenbrock2" "test_Rosenbrock5" + "test_gradient1" + "test_inv_hessian_product_pytree3" + "test_logreg_with_intercept_manual_loop3" + "test_multiclass_logreg6" ]; meta = { From 62fff9635ca22fd9aa9bc33ab7ac0e1b5ebe7332 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 15:30:40 +0000 Subject: [PATCH 264/287] amazon-ssm-agent: 3.3.1345.0 -> 3.3.1611.0 --- pkgs/by-name/am/amazon-ssm-agent/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/am/amazon-ssm-agent/package.nix b/pkgs/by-name/am/amazon-ssm-agent/package.nix index 0f9544044be8..17c70f916af5 100644 --- a/pkgs/by-name/am/amazon-ssm-agent/package.nix +++ b/pkgs/by-name/am/amazon-ssm-agent/package.nix @@ -42,13 +42,13 @@ let in buildGoModule rec { pname = "amazon-ssm-agent"; - version = "3.3.1345.0"; + version = "3.3.1611.0"; src = fetchFromGitHub { owner = "aws"; repo = "amazon-ssm-agent"; tag = version; - hash = "sha256-6MGb6P3PYfnoztLdLhOm/smCjyWuV7ZGJtK40l4yFB0="; + hash = "sha256-mwru2BAnVSYLXoA+g7eizadSYLr9c3ikEJipo7N1n4Y="; }; vendorHash = null; From 5b1b7838b63129f7e5c67e11d3c1b8a6bf1fdc0e Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Mon, 27 Jan 2025 16:37:41 +0100 Subject: [PATCH 265/287] phpmd: switch to buildComposerProject2, tag and versionCheckHook (#377325) * phpmd: switch to buildComposerProject2 * phpmd: switch to tag * phpmd: add versionCheckHook --- pkgs/development/php-packages/phpmd/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/php-packages/phpmd/default.nix b/pkgs/development/php-packages/phpmd/default.nix index ae190e9102a4..419af98804aa 100644 --- a/pkgs/development/php-packages/phpmd/default.nix +++ b/pkgs/development/php-packages/phpmd/default.nix @@ -2,23 +2,28 @@ lib, fetchFromGitHub, php, + versionCheckHook, }: -php.buildComposerProject (finalAttrs: { +php.buildComposerProject2 (finalAttrs: { pname = "phpmd"; version = "2.15.0"; src = fetchFromGitHub { owner = "phpmd"; repo = "phpmd"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-nTuJGzOZnkqrfE9R9Vujz/zGJRLlj8+yRZmmnxWrieQ="; }; # Missing `composer.lock` from the repository. # Issue open at https://github.com/phpmd/phpmd/issues/1056 composerLock = ./composer.lock; - vendorHash = "sha256-vr0wQkfhXHLEz8Q5nEq5Bocu1U1nDhXUlaHBsysvuRQ="; + vendorHash = "sha256-AahAs3Gq1OQ+CW3+rU8NnWcR3hKzVNq7s3llsO4mQ38="; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; meta = { changelog = "https://github.com/phpmd/phpmd/releases/tag/${finalAttrs.version}"; From a0762f435f946020709d752200ddf4b3a5b3dd69 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 15:42:18 +0000 Subject: [PATCH 266/287] narsil: bbc8fc5efd779ec885045f9b8d903d0df1bec1b2 -> f5ec6bd6b8013f2a2b74fc45b6f4c53744590ec5 --- pkgs/by-name/na/narsil/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/na/narsil/package.nix b/pkgs/by-name/na/narsil/package.nix index 01abb4b7eb2f..fe82a1c51c67 100644 --- a/pkgs/by-name/na/narsil/package.nix +++ b/pkgs/by-name/na/narsil/package.nix @@ -14,13 +14,13 @@ }: stdenv.mkDerivation rec { pname = "narsil"; - version = "bbc8fc5efd779ec885045f9b8d903d0df1bec1b2"; + version = "f5ec6bd6b8013f2a2b74fc45b6f4c53744590ec5"; src = fetchFromGitHub { owner = "NickMcConnell"; repo = "NarSil"; rev = version; - hash = "sha256-keN1IJao80Pr8SpHe0tYXg14l9rBfboyNoDaivzWsyM="; + hash = "sha256-xMY9XmFsjcucLPfwTXiC0oQ2UkWIkWCehvycesqbWn0="; }; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch=main" ]; }; From 2c537622d5d9ee83679e4d5c5b8b4d66b0bfe658 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 15:52:20 +0000 Subject: [PATCH 267/287] capslock: 0.2.6 -> 0.2.7 --- pkgs/by-name/ca/capslock/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/capslock/package.nix b/pkgs/by-name/ca/capslock/package.nix index 4460368a1123..5deac4688fef 100644 --- a/pkgs/by-name/ca/capslock/package.nix +++ b/pkgs/by-name/ca/capslock/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "capslock"; - version = "0.2.6"; + version = "0.2.7"; src = fetchFromGitHub { owner = "google"; repo = "capslock"; rev = "v${version}"; - hash = "sha256-8B9L/lLRxDI6/qUCbL8VM37glDFBTaqb0fGI9BYfICU="; + hash = "sha256-kRuEcrx9LBzCpXFWlc9bSsgZt84T8R8VFdbAWAseSPQ="; }; - vendorHash = "sha256-gmvnpJurjhCGS3/FH6HBZ0Zwx57ArSaw5dLHtJXCFc8="; + vendorHash = "sha256-CUw4ukSAs12dprgcQRfdoKzY7gbzUCHk0t2SrUMtrxo="; subPackages = [ "cmd/capslock" ]; From 255a75ad74c543748a4ec1ca4cf3f07d2c66e737 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 16:25:32 +0000 Subject: [PATCH 268/287] roslyn-ls: 4.13.0-3.25051.1 -> 4.14.0-1.25060.2 --- pkgs/by-name/ro/roslyn-ls/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix index 6e01757f5149..689b7002afe0 100644 --- a/pkgs/by-name/ro/roslyn-ls/package.nix +++ b/pkgs/by-name/ro/roslyn-ls/package.nix @@ -32,18 +32,18 @@ in buildDotnetModule rec { inherit pname dotnet-sdk dotnet-runtime; - vsVersion = "2.61.27"; + vsVersion = "2.62.18"; src = fetchFromGitHub { owner = "dotnet"; repo = "roslyn"; rev = "VSCode-CSharp-${vsVersion}"; - hash = "sha256-mqlCfgymhH/pR/GW3qZd0rmLdNezgVGZS6Q6zaNor8E="; + hash = "sha256-oy1xYM6Kd/8uAQQdvsxLNkycs9OOs7SEe+dzYc4RMeM="; }; # versioned independently from vscode-csharp # "roslyn" in here: # https://github.com/dotnet/vscode-csharp/blob/main/package.json - version = "4.13.0-3.25051.1"; + version = "4.14.0-1.25060.2"; projectFile = "src/LanguageServer/${project}/${project}.csproj"; useDotnetFromEnv = true; nugetDeps = ./deps.json; From b5f82750ab072b0c89f1424b96abf36ff380c965 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 27 Jan 2025 17:27:57 +0100 Subject: [PATCH 269/287] python312Packages.blackjax: disable failing tests --- .../python-modules/blackjax/default.nix | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/blackjax/default.nix b/pkgs/development/python-modules/blackjax/default.nix index 69865be6e5bd..5b02bf3450d6 100644 --- a/pkgs/development/python-modules/blackjax/default.nix +++ b/pkgs/development/python-modules/blackjax/default.nix @@ -49,17 +49,28 @@ buildPythonPackage rec { pytest-xdist ]; - disabledTestPaths = - [ "tests/test_benchmarks.py" ] - ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ - # Assertion errors on numerical values - "tests/mcmc/test_integrators.py" - ]; + disabledTestPaths = [ + "tests/test_benchmarks.py" + + # Assertion errors on numerical values + "tests/mcmc/test_integrators.py" + ]; disabledTests = [ # too slow "test_adaptive_tempered_smc" + + # AssertionError on numerical values + "test_barker" + "test_mclmc" + "test_mcse4" + "test_normal_univariate" + "test_nuts__with_device" + "test_nuts__with_jit" + "test_nuts__without_device" + "test_nuts__without_jit" + "test_smc_waste_free__with_jit" ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # Numerical test (AssertionError) From 77efc48642865afdd057ba4a0ffe9650490aa46b Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Mon, 27 Jan 2025 18:21:29 +0100 Subject: [PATCH 270/287] php.packages.box: switch to buildComposerProject2, tag and add versionCheckHook (#377342) * php.packages.box: switch to buildComposerProject2 * php.packages.box: switch to tag * php.packages.box: add versionCheckHook --- pkgs/development/php-packages/box/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/php-packages/box/default.nix b/pkgs/development/php-packages/box/default.nix index 15a348ddf421..00f9aa271c2c 100644 --- a/pkgs/development/php-packages/box/default.nix +++ b/pkgs/development/php-packages/box/default.nix @@ -2,20 +2,24 @@ lib, php82, fetchFromGitHub, + versionCheckHook, }: -php82.buildComposerProject (finalAttrs: { +php82.buildComposerProject2 (finalAttrs: { pname = "box"; version = "4.6.2"; src = fetchFromGitHub { owner = "box-project"; repo = "box"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-gYIAP9pTjahNkpNNXx0c8sQm+9Kaq6/IAo/xI5bNy7Y="; }; - vendorHash = "sha256-HCbjW4HdyQNWDEHXj9U1t3S3EKcrPV1z/9I1ClFsMsc="; + vendorHash = "sha256-TAubvl+rsdQdqKz+lRg1oX/ENuRyHoJQVmL1ELz24fg="; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; meta = { changelog = "https://github.com/box-project/box/releases/tag/${finalAttrs.version}"; From 6fa05399767b9e420e80839516a275bcd8ad9943 Mon Sep 17 00:00:00 2001 From: oddlama Date: Mon, 27 Jan 2025 19:09:58 +0100 Subject: [PATCH 271/287] home-assistant-custom-lovelace-modules.clock-weather-card: init at 2.8.7 --- .../clock-weather-card/package.nix | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix new file mode 100644 index 000000000000..e224e4ce98ee --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix @@ -0,0 +1,49 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + fetchYarnDeps, + nodejs, + yarnConfigHook, + yarnBuildHook, +}: +stdenvNoCC.mkDerivation rec { + pname = "clock-weather-card"; + version = "2.8.7"; + + src = fetchFromGitHub { + owner = "pkissling"; + repo = "clock-weather-card"; + tag = "v${version}"; + hash = "sha256-ylJNI0DE+3j8EZFpUmuuBnII8nBMrJ5bhlGVh3M25eo="; + }; + + offlineCache = fetchYarnDeps { + yarnLock = src + "/yarn.lock"; + hash = "sha256-EUuPF2kS6CaJ2MUYoBocLOQyOgkhRHd34ul+efJua7Q="; + }; + + nativeBuildInputs = [ + nodejs + yarnConfigHook + yarnBuildHook + ]; + + installPhase = '' + runHook preInstall + + mkdir $out + cp ./dist/clock-weather-card.js $out/ + + runHook postInstall + ''; + + meta = { + description = "A Home Assistant Card indicating today's date/time, along with an iOS inspired weather forecast for the next days with animated icons"; + homepage = "https://github.com/pkissling/clock-weather-card"; + changelog = "https://github.com/pkissling/clock-weather-card/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ oddlama ]; + platforms = lib.platforms.all; + }; +} From 8945c06304624c5981796adf622e5e83beeb8689 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 18:15:36 +0000 Subject: [PATCH 272/287] oauth2-proxy: 7.8.0 -> 7.8.1 --- pkgs/by-name/oa/oauth2-proxy/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/oa/oauth2-proxy/package.nix b/pkgs/by-name/oa/oauth2-proxy/package.nix index 11422054cf03..5b0aaaff4a18 100644 --- a/pkgs/by-name/oa/oauth2-proxy/package.nix +++ b/pkgs/by-name/oa/oauth2-proxy/package.nix @@ -6,12 +6,12 @@ buildGoModule rec { pname = "oauth2-proxy"; - version = "7.8.0"; + version = "7.8.1"; src = fetchFromGitHub { repo = pname; owner = "oauth2-proxy"; - sha256 = "sha256-fNnneMsqwxO0CMJAr1pUSCMDt0/fS7tS6KLs8ExKMTE="; + sha256 = "sha256-NU9/BLyTEWGqt9SJNbvF4kSG/op8TEpYV2A24/V29PM="; rev = "v${version}"; }; From 2ede59bdbd4e28b63d2a79441c17b667bfaf1ddd Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Mon, 27 Jan 2025 19:34:06 +0100 Subject: [PATCH 273/287] php.packages.phive: switch to buildComposerProject2 and tag (#377352) * php.packages.phive: switch to buildComposerProject2 * php.packages.phive: switch to tag --- pkgs/development/php-packages/phive/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/php-packages/phive/default.nix b/pkgs/development/php-packages/phive/default.nix index 51a9df9087e3..e3d8801049f8 100644 --- a/pkgs/development/php-packages/phive/default.nix +++ b/pkgs/development/php-packages/phive/default.nix @@ -4,18 +4,18 @@ php, }: -php.buildComposerProject (finalAttrs: { +php.buildComposerProject2 (finalAttrs: { pname = "phive"; version = "0.15.3"; src = fetchFromGitHub { owner = "phar-io"; repo = "phive"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-6vNhmIDE3kwZGMrDnGNGVV6/lb32Yb3ooWDYOC7SUcs="; }; - vendorHash = "sha256-iBNH4n4AVE47CYmwO6s6WBAuRe7JzzvoNruYfVbxPck="; + vendorHash = "sha256-wNqQfVRm4kEWpYfdo8HBESh0L4cXPrTlHnBI79b1Al0="; meta = { changelog = "https://github.com/phar-io/phive/releases/tag/${finalAttrs.version}"; From e09d88a50988bb516aa24f5e468f5ac85ef19e56 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Jan 2025 19:41:55 +0100 Subject: [PATCH 274/287] python312Packages.ldfparser: 0.25.0 -> 0.26.0 Diff: https://github.com/c4deszes/ldfparser/compare/refs/tags/v0.25.0...v0.26.0 Changelog: https://github.com/c4deszes/ldfparser/blob/0.26.0/CHANGELOG.md --- pkgs/development/python-modules/ldfparser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ldfparser/default.nix b/pkgs/development/python-modules/ldfparser/default.nix index 42abf5cfd9a9..a73651db76fc 100644 --- a/pkgs/development/python-modules/ldfparser/default.nix +++ b/pkgs/development/python-modules/ldfparser/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "ldfparser"; - version = "0.25.0"; + version = "0.26.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "c4deszes"; repo = "ldfparser"; tag = "v${version}"; - hash = "sha256-SZ9mWV5PjkQ2OiScPSMrunkKQWmuYW2lB2JvpTGNbY4="; + hash = "sha256-SVl/O0/2k1Y4lta+3BFkddyBZfYO2vqh4Xx1ZXNwXN4="; }; build-system = [ setuptools ]; From 026ee7faf4892c0f65b275480393b617530a09d9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 27 Jan 2025 19:44:55 +0100 Subject: [PATCH 275/287] python312Packages.aiohomeconnect: 0.11.2 -> 0.11.4 Diff: https://github.com/MartinHjelmare/aiohomeconnect/compare/refs/tags/v0.11.2...v0.11.4 Changelog: https://github.com/MartinHjelmare/aiohomeconnect/blob/refs/tags/v0.11.4/CHANGELOG.md --- pkgs/development/python-modules/aiohomeconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohomeconnect/default.nix b/pkgs/development/python-modules/aiohomeconnect/default.nix index ffa755c21533..e2ed0f5b81de 100644 --- a/pkgs/development/python-modules/aiohomeconnect/default.nix +++ b/pkgs/development/python-modules/aiohomeconnect/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aiohomeconnect"; - version = "0.11.2"; + version = "0.11.4"; pyproject = true; disabled = pythonOlder "3.11"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiohomeconnect"; tag = "v${version}"; - hash = "sha256-YnQypKeVYoHD445fv9n643qIqjTCInCfbTHPUrMePJI="; + hash = "sha256-feAjp1DjZeNTOf0lWN23pap7oDiqSx0v6tf6uIVf1fU="; }; pythonRelaxDeps = [ "httpx" ]; From 795a518ce93849dadbf5246cbb2e2f003cec4252 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 27 Jan 2025 11:22:14 -0800 Subject: [PATCH 276/287] signalbackup-tools: 20250122 -> 20250127-1 Diff: https://github.com/bepaald/signalbackup-tools/compare/20250122...20250127-1 --- pkgs/by-name/si/signalbackup-tools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index 69d13e8bfe2c..004de05929a6 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20250122"; + version = "20250127-1"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; rev = version; - hash = "sha256-rsA0i87zC6hyQa8xIyveID/nNwAD2YMG3BHYtWKxg1I="; + hash = "sha256-6JHHiT1OwLPKxA0rbGiwhwF4PiuS5yguoNtB7dpTJPI="; }; nativeBuildInputs = [ From c2504d232a73f86b1b43342329f2743371b2660d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 27 Jan 2025 20:32:27 +0100 Subject: [PATCH 277/287] vimPlugins.lua-async-await: fix deprecation --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ------------ pkgs/applications/editors/vim/plugins/overrides.nix | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 39b00d195e16..71554b6c7554 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -6529,18 +6529,6 @@ final: prev: meta.homepage = "https://github.com/nvim-java/lua-async/"; }; - lua-async-await = buildVimPlugin { - pname = "lua-async-await"; - version = "2024-03-31"; - src = fetchFromGitHub { - owner = "nvim-java"; - repo = "lua-async"; - rev = "652d94df34e97abe2d4a689edbc4270e7ead1a98"; - sha256 = "0jpw9008xghqmzjnikwq417p497lj7v9hkjbrach5p652yca07s8"; - }; - meta.homepage = "https://github.com/nvim-java/lua-async/"; - }; - lualine-lsp-progress = buildVimPlugin { pname = "lualine-lsp-progress"; version = "2021-10-23"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 1b682954f6c1..766bb21dce49 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -2255,7 +2255,7 @@ in nvim-java = super.nvim-java.overrideAttrs { dependencies = with self; [ - lua-async-await + lua-async mason-nvim nui-nvim nvim-dap From b1d65ad64d1bb852960dc36a4cc41bb053143a4a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 19:52:23 +0000 Subject: [PATCH 278/287] labwc-tweaks-gtk: 0-unstable-2025-01-11 -> 0-unstable-2025-01-26 --- pkgs/by-name/la/labwc-tweaks-gtk/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/la/labwc-tweaks-gtk/package.nix b/pkgs/by-name/la/labwc-tweaks-gtk/package.nix index 9a794c513ab9..545ffcd43ca2 100644 --- a/pkgs/by-name/la/labwc-tweaks-gtk/package.nix +++ b/pkgs/by-name/la/labwc-tweaks-gtk/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "labwc-tweaks-gtk"; - version = "0-unstable-2025-01-11"; + version = "0-unstable-2025-01-26"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc-tweaks-gtk"; - rev = "d954bc6bce2e86893c0470de36beae0542eceaad"; - hash = "sha256-c+6AolglEF/+voa5mDwm3JLIA4btFOBI8e2/ZxCApGg="; + rev = "5b811cc25dac6a024a50175ef56c4831883965d9"; + hash = "sha256-wBiHcSYczOjSm9X46oOUt1rRm0QioHOovbPMZMnLYmM="; }; nativeBuildInputs = [ From 172cbe7e03e411ff9cf71e34ce1881b78e2adf55 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Mon, 27 Jan 2025 15:25:15 -0500 Subject: [PATCH 279/287] zed-editor: 0.170.2 -> 0.170.4 (#377358) --- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index d768673af00d..2aeecc1e9d03 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -95,7 +95,7 @@ let in rustPlatform.buildRustPackage rec { pname = "zed-editor"; - version = "0.170.2"; + version = "0.170.4"; outputs = [ "out" ] ++ lib.optional buildRemoteServer "remote_server"; @@ -103,7 +103,7 @@ rustPlatform.buildRustPackage rec { owner = "zed-industries"; repo = "zed"; tag = "v${version}"; - hash = "sha256-E9p/JHHIQ2nQ6LeFob1tDf6UopeEWL/Z7INstehvfEI="; + hash = "sha256-sfvTvz5RUBQiO9XxPVZNxc1xyx/BN6oU16uYfxgruuY="; }; patches = [ @@ -123,7 +123,7 @@ rustPlatform.buildRustPackage rec { ''; useFetchCargoVendor = true; - cargoHash = "sha256-A9sTR5MCLXskhvJHVGRQ/rSLwOKqhfgJi5zaGsgglL0="; + cargoHash = "sha256-W1olZKtbt7TCVh8KRJf5+NL/eILdO2j1Jx1OBXGL+CY="; nativeBuildInputs = [ From 04e51a6c3d51eee62e7e78e53cde56d884996a3c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 28 Jan 2025 06:27:21 +1000 Subject: [PATCH 280/287] iosevka-bin: 32.3.1 -> 32.4.0 (#377380) --- pkgs/by-name/io/iosevka-bin/package.nix | 2 +- pkgs/by-name/io/iosevka-bin/variants.nix | 180 +++++++++++------------ 2 files changed, 91 insertions(+), 91 deletions(-) diff --git a/pkgs/by-name/io/iosevka-bin/package.nix b/pkgs/by-name/io/iosevka-bin/package.nix index 753b347b895a..cadfedce6ebe 100644 --- a/pkgs/by-name/io/iosevka-bin/package.nix +++ b/pkgs/by-name/io/iosevka-bin/package.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "32.3.1"; + version = "32.4.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip"; diff --git a/pkgs/by-name/io/iosevka-bin/variants.nix b/pkgs/by-name/io/iosevka-bin/variants.nix index dcc9a09f2568..470c00cd856e 100644 --- a/pkgs/by-name/io/iosevka-bin/variants.nix +++ b/pkgs/by-name/io/iosevka-bin/variants.nix @@ -1,93 +1,93 @@ # This file was autogenerated. DO NOT EDIT! { - Iosevka = "1lpjvk31is2wm7705ilb826cpsgwfsx5182ic6lavpjigjnwi4qr"; - IosevkaAile = "0bagp60c44ksl1irh02hdjn4dw963l1z0k77nkmipqrgxl8g00vc"; - IosevkaCurly = "1sp72p2vxmjqjlxfkiyzg5gibymss8vxrvp7c32fybi5dfyixy28"; - IosevkaCurlySlab = "0wbrca2qjwd5g1jic10lfzgg3rpd70plx0q73fjlj7gpx4af7j25"; - IosevkaEtoile = "0jnbn5w04brx87ir708vi9nh0zx41znvk8anbxhi8smn7p8krd52"; - IosevkaSlab = "1l70z14xrh4aiib3yx32ypnxaj96gimiq72ar1w06mi445s3bka1"; - IosevkaSS01 = "0wfcjlkl2l6nyxy8gpsrmmvp5dsjz5qbz94ixviian2067lmy9n6"; - IosevkaSS02 = "0lj1vjvk3977kszc21p2pjmmfj68gj43dj69qn01wzfh6sy8qjwm"; - IosevkaSS03 = "0qd8nrd1j62khj865w52p9sanliyw19i8i3c49haw5pcwpylsgw5"; - IosevkaSS04 = "0dpm6jkszr75w6v023wd4yk1zrvfw1p3q7a9n4svr8vxmimn0b7m"; - IosevkaSS05 = "1naqv4nfl1bkl1gkmccls7104ixah9bkjyw6hn1434dgfgb7fhh3"; - IosevkaSS06 = "1cknkhcj8pqaz65s62rvpw1c6mr59hkn623lr8jzfz5wy018xy73"; - IosevkaSS07 = "0skn5i6wd40kzrlh6b483j0861imwa0zfalv6d022lxadznzld9f"; - IosevkaSS08 = "0lj48zk5il5jd7p3wyhcgqszkcyjzdmskbldjp31avjhjpmv0l78"; - IosevkaSS09 = "0w7w7jvs3jk6iimkb2g3c6w1a6rmmwnvh7gzh7zs5dirzyx2wcsd"; - IosevkaSS10 = "0f61cpjlw05r21i8pjx005yjy3wiw1rkrxmp12fd5v5hmj88m7wh"; - IosevkaSS11 = "138svbwr42hhhxbi330adhbyjqp1zfxvbv1nnc74pj94zijj6vzp"; - IosevkaSS12 = "1dil93hrghpg38wz3988zfd25hm7bx69zm6qw369x5216hcknz2v"; - IosevkaSS13 = "1ah6s1akc1m4hl21j64xnvd2jy2pmdafkkkvi1jhdvcq36k6nsm9"; - IosevkaSS14 = "1v2780dzyaazp0r2z1nclms2f26v4g2s7k1wqxw34fjzlzpkfcfa"; - IosevkaSS15 = "0m2fkvrnbz4h6ncsim9ixvp15g6rl1lsb62cvhfpq9bnydpzzxby"; - IosevkaSS16 = "0b3d6zkd5rn5dg6zq9airj96cjmbc30ds8qi3c610jvca865gh1m"; - IosevkaSS17 = "16x4n7cvhp017dg3a94chg5pg2svimlblmhbxnyic5nzy27hq26f"; - IosevkaSS18 = "18iab2dafsj1y18rvhvr53dyfawk6gxxsss4h4r9vajvp08y3qra"; - SGr-Iosevka = "0523fpvvypb0a1zj881n352vkbgybwz8859i8rqayxn1l766w8kx"; - SGr-IosevkaCurly = "0gfpw0ilk5j4r7kz53w99jsc309j8c4a9cxcahpssb6cnygpm6cp"; - SGr-IosevkaCurlySlab = "1gig9h22x9nw3zds3z9bqry9kvvgl197lkjf5x9pbbc8ah9m25iz"; - SGr-IosevkaFixed = "1bqn0v3z2vqi7lgxhwmbm7s62llyammpbs524na59m99g8rxa8dr"; - SGr-IosevkaFixedCurly = "1pwv91cpf672wdrvmv6adjkbnnrrdqqla2iyd9baxni44qmk9dji"; - SGr-IosevkaFixedCurlySlab = "0wsgx32d45a1iwz67hl40kwbz6j7g6c83f3nhq156pqa5v0afk2d"; - SGr-IosevkaFixedSlab = "04ms0gnz55fp6y01f6qskwmxfj8hy3kwxigpmqlghlzygbyfx7mf"; - SGr-IosevkaFixedSS01 = "0ffrhysjr5qggx5ccglsa44j5l25jz7a7kypcanpglpfzja011q2"; - SGr-IosevkaFixedSS02 = "1a0khkqs6fw9vzrd23a1nnjzz5vimgx1d5m1bzk761fsbrgv9jn0"; - SGr-IosevkaFixedSS03 = "0h25vb2d3qs778pv01l6slx3d4q5mz9vmqr5lb6ch1zczilz5i9q"; - SGr-IosevkaFixedSS04 = "0za23nay4909cyy3vjh2k28975cbabrqqxifw5wlyqwsi8ajr8hs"; - SGr-IosevkaFixedSS05 = "1kgfryzqddywdv8wyc38fwhx6nbh9fij2g4xfs25xiwfsprl36lm"; - SGr-IosevkaFixedSS06 = "0z9y16sipzqdgi36315zsa3hr4cy394g0f6j99lz8p027r14mbd1"; - SGr-IosevkaFixedSS07 = "1rfpri0fl7iihi6850zr96jlvcsarvv1jfsyhkmj8rclpd1zqgwk"; - SGr-IosevkaFixedSS08 = "046pwn81w7ijda9v7hwwgxja76n15l70c2zaa3wx5cqpkkadm4f3"; - SGr-IosevkaFixedSS09 = "1dqb4d8dr1mj34625pzvp8sngky98900vv9m1n8fid9lg1kix0jp"; - SGr-IosevkaFixedSS10 = "0d29vzvw1mhb6i1i8fmwgiycx30lpjgv38jmx8gnb837q5295r62"; - SGr-IosevkaFixedSS11 = "0khvm0bxm207va69a932v45dsafqlgzyx4fi146msx67h9nz9i57"; - SGr-IosevkaFixedSS12 = "1l1imghykch93n11y0a6hs1512xlcsxq3c4mk040zzy8dflbl9w4"; - SGr-IosevkaFixedSS13 = "1xb6janlz1cpns2pacsj2pbchghgzbz6mqgnq14z2x646ag90290"; - SGr-IosevkaFixedSS14 = "085q55s1rn52swlizcxw6wrdy73ilv6h0ypysh6zjqcrlgpda3x6"; - SGr-IosevkaFixedSS15 = "1m2adjy4rh7w2hjfb86kdagwasvai5fk83lincbh84avxlwz28sf"; - SGr-IosevkaFixedSS16 = "1w2f2glipy3h9sdw8l3ng7abl0421v176fi7phxjci90mxdj1i2l"; - SGr-IosevkaFixedSS17 = "1dvnxfyp89x7qrmjrkgzc14c0xxdfq1qb71bbks69zcnsmcm4zr1"; - SGr-IosevkaFixedSS18 = "1hms6c5g0p0j2dxyp1jdkc0kar1jwqzmjafafm6vjpnm8gaz5pz1"; - SGr-IosevkaSlab = "04539yj4yq854af0lm9p68njjigarigpk16h3qv8x8n1l2rkrq0z"; - SGr-IosevkaSS01 = "1gfcnj0wbm1x6zb1w9acp0q7775wdahdwd397fmpg662l0ss25mq"; - SGr-IosevkaSS02 = "0pm76nkpgjsnz44ngk93slsy5jv32821l4vrzn5d785bbdzzzf8d"; - SGr-IosevkaSS03 = "0cvmam87jzk83zfzjb2pcqvzh2zvr4ljjbg55ij1q7xhd64rqpaj"; - SGr-IosevkaSS04 = "1jq16mz0p8xy4ikyn7bjbvnrhlpvkz6y0ih84xbfkgig66hq43g1"; - SGr-IosevkaSS05 = "1phvc0ssssh7l5rdn1xby0bp4q3asr333xrf3dfiavx7ldysyipq"; - SGr-IosevkaSS06 = "0ybb7slxwsg87avhyyyvyrx469lf00bb8aw4371ypp34bbs10zr8"; - SGr-IosevkaSS07 = "0c2ym41kzxq3jnj131qc4q451blmaks5rd5ai1fb8xkzzwzfjin3"; - SGr-IosevkaSS08 = "0305v7pzxwp34kvwp6ysiirw0vl0z81hh629nsg3dm8a4da86b7h"; - SGr-IosevkaSS09 = "14zl7lab38xwp2k1fmqgnmm3bxf6ribk23bk531l6bgwdzxd84ds"; - SGr-IosevkaSS10 = "19a24pfcwiidpvfncf955q856kz2imqwmcvf93afwmpd7aya5gi2"; - SGr-IosevkaSS11 = "1b9ayk0ykxdcxlafqh49g5gyck1s9kpyd66nfg6jd1d3ql3ryajh"; - SGr-IosevkaSS12 = "01rby2jx0gc6n5ch79qjdfq8sp2bm4ji28dcixycv03sjq96agdz"; - SGr-IosevkaSS13 = "0rmkx6bzwvbcqaa950lng8aizkm9m3zrrwxzrfydgf6xx1s37ac5"; - SGr-IosevkaSS14 = "0xf41gjq55xk1fkys1j324zrh1ds545s8bdlliq1kzik0i6gbjli"; - SGr-IosevkaSS15 = "0izk1snd2rsh1gaa6rikr1grn3lwfkg3hnsikfqj16fixpxm752j"; - SGr-IosevkaSS16 = "1zr5706wq1jbfhngwnd6i9dy4izhv43p8pz0l0ly6f4zgcx3533a"; - SGr-IosevkaSS17 = "1lwj5mdhmnq9qkjkql2vawihbjf0dp50s8s8i2gq5cciy861i0qx"; - SGr-IosevkaSS18 = "155kwdny6fcaavd8mg8j1j6s9sfj35ig2cx75h7dkqsblbmcz2z2"; - SGr-IosevkaTerm = "0snj7i9ipa1ilancqcdwcw12s427nj9z3vgmmf71hbba9f82az1c"; - SGr-IosevkaTermCurly = "119ay1rxci8bg59687ckd2n61a6g09h4a6lk7319caw3s1w3mj6d"; - SGr-IosevkaTermCurlySlab = "0j1pis6aj1sblm4png0y1mihz3b1f4l8g768grnrfzl338nfg90v"; - SGr-IosevkaTermSlab = "05vqfdhrxrbsb81j2yrsfjqzmrhin9qf9jncx220dp7qvkjpjsza"; - SGr-IosevkaTermSS01 = "1j2sgpgnavll25ah6dr408bbq1i0mp0jvd5cgdfa4lq9nk9aa6c2"; - SGr-IosevkaTermSS02 = "0rx3kdin2rf8nr1jf7kw1ch6zgilgirflgkq9lyx83qq79dhakma"; - SGr-IosevkaTermSS03 = "1984r56grgrcm6lmm8mkik6n79pvwhzpfygd204rcqm267mw3hml"; - SGr-IosevkaTermSS04 = "168dxikfxqc66j3k8amf9bqcdzw053g4rl1cbxw3mxa72ay822j9"; - SGr-IosevkaTermSS05 = "0fy5mxw3yb82mr7jqm5fr2990xav794x3w419n7zs5bx8gj3l28c"; - SGr-IosevkaTermSS06 = "1fiw3qmkfhfzhns0b9gkb6bzfn17qkwyx3a8i3y2q2567hr6j1v4"; - SGr-IosevkaTermSS07 = "14fmhhrv1f39b6shp4y8aqmmvf245l12ga00af75mdan13mqsj1s"; - SGr-IosevkaTermSS08 = "1mcjlhvg1sci7y3whj4zc3lf8k880pvl8w2lf2fkyyz01x4x3ixw"; - SGr-IosevkaTermSS09 = "17wlci26hzjxawgars1dfdj0nn4a64r24fh1m8xvay8c6n0id50d"; - SGr-IosevkaTermSS10 = "113mjv8hxzjcimzwg1fy1z3ii44ncaxd1kcq1n2f5czdcsawx1lj"; - SGr-IosevkaTermSS11 = "0hp6b8c4ggzl6j4bjbw6dwphh4klwg6qrfmksqng0p8hvsf5lkp6"; - SGr-IosevkaTermSS12 = "1v7l7x8c7dmaim5rjdlvn66parfpzslc8y5c77r0c1rxafxgkycd"; - SGr-IosevkaTermSS13 = "1z855ikw3d8gnsz8xsdnfzl4pzxyp6p6yx6mjkw8rigjgk95kq8s"; - SGr-IosevkaTermSS14 = "1m7csblfpc0i6ly6jlizma5h6j73y9c2dhgqgqqw0r3cgrg249wi"; - SGr-IosevkaTermSS15 = "10l5b9p0b5m1884wmq0jk5i31hbizy6rn19i3qj6ifnf0mni3zxs"; - SGr-IosevkaTermSS16 = "07rb6vpa9rq7czdc68jw68n9k742hbd1hcwa9zgd0njnwf78fjjr"; - SGr-IosevkaTermSS17 = "0sm63f8r27lfvk7is9ldaa9shcfwbkydd16zd78g0n13nniiw0h7"; - SGr-IosevkaTermSS18 = "1rx38sqclkxiql402fc33d9v4y65y3cz9wyx1p97c5wa3j686ngh"; + Iosevka = "1wmp1xsvq6d7ybxdiscb04ry5fl3p7pbnqrm551pklgp30afcb0k"; + IosevkaAile = "19hrycbav3r134i1f3135j68lzk4r6iq996qv45nfy5vdiwka56n"; + IosevkaCurly = "1ibybiad4nx7n3q89ffw5d3q72c221v2vmb47hs4xiax8kjajijx"; + IosevkaCurlySlab = "09856251vpgch7d989kamyw7f46vwjlyhy22r82vvfvlfni9qvip"; + IosevkaEtoile = "11c3ky7f5k2qi5jq5jdai2s9nav5z5kqy8p8klhc9nqr7qbsgknc"; + IosevkaSlab = "0pd70bzgxwi0mgb9j5b3bz4zd8q5s85x6ipq0b3adxa3n0lni2xj"; + IosevkaSS01 = "01j36nxdh91rjkx3ccqdqj7czl5w35s4ml3y0fhjk13rfi3ikqk5"; + IosevkaSS02 = "193lwrz5bza0rrfab1mginq90ar0icxrysbiv8nm9d9cq6k67spk"; + IosevkaSS03 = "0x2g4q0ina97pv1rpm9mhw5as6il3nqpixpjy5nskb47vklnww0z"; + IosevkaSS04 = "1nr2nzp51swvxmkbsipppixjqdqqp28q7njh0zhwrw9ln2mv5ykf"; + IosevkaSS05 = "1sgbszbzgznkkjw3xiffbvfh9wx4rmw4a2332dwl3hqjsky2yb0c"; + IosevkaSS06 = "0bdxgm5v9xngwyygqxaihsaryj9nk7jr86a35sh83p8x92696dr3"; + IosevkaSS07 = "00cjyy477pllfcl84pms3hs7v59iz4xx24rh6mrp6gwm1dixk0lj"; + IosevkaSS08 = "0k4aifq8d6ry0q23yjfhmsz0hq55xg0ja8skjsnba67mmw3lmhls"; + IosevkaSS09 = "12z6bircf48p4i1pfglrdmm7dnrbg48d34d6x0andcshckh2z32m"; + IosevkaSS10 = "1jm8jdrlydwdi2ahgyw691j0akq7xv7xki6v4qdwdccjblzq38x4"; + IosevkaSS11 = "1p27lbp48rbr501al4hh1n10v2mi2l8jncyr2b16x6lx699dragh"; + IosevkaSS12 = "0mpjh3v072xvxl258b9700x4x0z17fwhq526z7v6pfvr1bpa7qd6"; + IosevkaSS13 = "029jhjymzq0x48mwds1yawp6v57zrsb1y9riy1rw3d5cq307p8np"; + IosevkaSS14 = "0bvi0nyn0rbrg0i8xq2zhr9sc8sl1xjbjslrd7x6h9xh8vpk67yn"; + IosevkaSS15 = "00dw3gy3ib151zlizbfac3zsxs0ap8qmfx4apghv5n9y815lsdfz"; + IosevkaSS16 = "16jrjv6rjh1xwj4yf91c17n1qpqv3vnnnbz7dj4g7rmpb9s5hqkz"; + IosevkaSS17 = "05nkynn2ri2lkm2ghd4vcb67qm00rl8f1fp17x4l84id36qbzy14"; + IosevkaSS18 = "1zb96ll1q514av1qqmlaf38py66jqyfy7f0ka8r8ln7jnnfbmsr1"; + SGr-Iosevka = "1knzbqr8yzbdwrbq9v00p87xp3gbnspcn9lwg5kx7y4s9k4xx4d3"; + SGr-IosevkaCurly = "1ggnp299h8n54v7l7526phwczcr30ssy58lp4as64jh3kdrpkm5s"; + SGr-IosevkaCurlySlab = "1wr15jsjnkyqf4vaxv0ckbsjnqcdzhp28xhma7h46invmicamz0b"; + SGr-IosevkaFixed = "0b89p0f6f2igyg930w7izs2y6027s0p6i9v7hd6y60h1c1g4h3zr"; + SGr-IosevkaFixedCurly = "09j0jpm2ym7m1gryphvdjy07bdadjfq2k33rkxdi3mm5c9ryr497"; + SGr-IosevkaFixedCurlySlab = "15ycyyi9y2671gdswvdg56wbiixfa3xdgh0rfbp5gxamaji52jba"; + SGr-IosevkaFixedSlab = "0rgkdji5figxa8fvl5f0xnw5sx1300g77h92bvn19p1479cpkqnd"; + SGr-IosevkaFixedSS01 = "074l13i6vfyvj4dr4373vhck6wx451xbinsy2nkmh1l0f4ybk722"; + SGr-IosevkaFixedSS02 = "0dmsncllnb09h9s4874v0ayadyx6ysacyd4px8gpzdgd5vwyddp5"; + SGr-IosevkaFixedSS03 = "001zgvyrls4ajklsinz003rvqx9aqhc4b65xksinm0n88p8c6l5v"; + SGr-IosevkaFixedSS04 = "146f0cmq28g1lkfapj78grqpsrl22208h6vj7k838rbkxx2vqazy"; + SGr-IosevkaFixedSS05 = "1ax08sgfnwki6qkfnzk3wc5i4i6r8nfzwdn4srz8mfwfm1mlcyps"; + SGr-IosevkaFixedSS06 = "0ypcnsqifmrh005hql6f6lql5ykgsfvanc2p24x521nrn1dy73va"; + SGr-IosevkaFixedSS07 = "15xijwfirrwph6n8pky350k5gfx5mhfhgbhhaahvd3wgl1wc3z1d"; + SGr-IosevkaFixedSS08 = "02l00b0zp8nxw7ma6rr8gvvkw2hxk8d3d3p0vrcf1fq1rarsrdhh"; + SGr-IosevkaFixedSS09 = "1hf9zdzgxgjdqd1msb2n8vmfqmz66vh7ksf436yddyzcmlflkg54"; + SGr-IosevkaFixedSS10 = "1k7z4bkf63a621p36ldgilj7d3x8cnkfjqma74l0a5m2cf8nhlhk"; + SGr-IosevkaFixedSS11 = "091cz89i7igh61ni7cnd8w7yx29x90v96ckjdaw2mvhg0bdkydxi"; + SGr-IosevkaFixedSS12 = "0mydmf6g8cybl00bzxr5l9ak8marp94wi73926xhks2saap9lzmj"; + SGr-IosevkaFixedSS13 = "1q3aa628k0wvyi20xgvwh6j2b9c6sfln1dvqwk89fa6cpqjd15qx"; + SGr-IosevkaFixedSS14 = "1hazszzhv7c3y242bk9v913v11l4f8difl7g3rk9w16x8bhcqykj"; + SGr-IosevkaFixedSS15 = "05i6sdspi33l5l4lc68xcnpq9jsfjd21xz2cblgg8mpxi5pcxwnx"; + SGr-IosevkaFixedSS16 = "0zcpgs611hicd9snhvwlbk2n94dnr76y8vg8ai41gy3d5ss5wgvc"; + SGr-IosevkaFixedSS17 = "1kgmiznjwlspq3sb4mz5p94cc9jakq00sg934sjj24kh4pxpc17p"; + SGr-IosevkaFixedSS18 = "1c6sbvbwlpyiq4vh1ydg2a963k001kcvgvw50r6ajv2dkq3b5hxf"; + SGr-IosevkaSlab = "1lprgw2ckvp1v9b0q6ygrij9mk6mnr7bjzhdp3v5r1mpyzhxznf8"; + SGr-IosevkaSS01 = "07ksz7bva2b47h6320rzg8wdpq2240rlym0988w8chslyi2g9cya"; + SGr-IosevkaSS02 = "0dj5f7v1m78rp0ahzp99dir8b87cdbmf2lzrp3m8g37hwjpjzi6h"; + SGr-IosevkaSS03 = "1v35nwwzkmbvrwil8kydw19v44gniyx7d77ri6kzxliwb86nd2rz"; + SGr-IosevkaSS04 = "1cmvm37jm7mzmv1llpi6091xvpvh6mvimgbiqwxr6vysaal7iwz2"; + SGr-IosevkaSS05 = "1v19ry9bpa5gdg8n1ni9kb4qrjw7jj8haqgaazkxqd5kqd0i0xbf"; + SGr-IosevkaSS06 = "0bn4c99ipf6ij52cia788wplhgpppb82pfwpd9h94775cy1qnwmp"; + SGr-IosevkaSS07 = "0cxw5in1v5pb0955c8pql7lla5cc70c7jvphx95kg17xdn0vf7zy"; + SGr-IosevkaSS08 = "1qy4ah3qrdcd8vm98njhycinp282b68picc1xzyrb1cs73wcmymx"; + SGr-IosevkaSS09 = "1hnzbjnfrg068gscia60cx5r1wvkylnnvnwxbbr49kx19j4nb9mw"; + SGr-IosevkaSS10 = "0x1h6j4731ain7s91sjkifm0zz2l18dv7qk4d4vg99am0mykr0kr"; + SGr-IosevkaSS11 = "0m8wd4shac32w4lhx3a1zcgg515bdgj29121342aasj8in65hzsw"; + SGr-IosevkaSS12 = "1h79lqih6xdvzzgb4xi3v3c1v9x08vby7l1rkiypkl66s7n2qmvz"; + SGr-IosevkaSS13 = "1kgksvsl35v4vjypw3qi5kcnnwcalwbh878p9q4wqrnx7x9q6f21"; + SGr-IosevkaSS14 = "1kv5zk7habxi85v7ihkgm857r81v52h6qwqcva55y8cycicbxc6f"; + SGr-IosevkaSS15 = "1a1wsi4vbfmnhvwh17k4z4zdcgsprqx15hkkpbv1ndshdmd0cnac"; + SGr-IosevkaSS16 = "1gy1a38x79yay6396qdn3a56hhyrslskriar58lxyjdzd8v052m4"; + SGr-IosevkaSS17 = "1flhbavmzdbi1pcnjdk0zfxh4lg284w7czw472y28xsawdpa6ylx"; + SGr-IosevkaSS18 = "1yva22hc60v22r1gsa06wxg6zdq7xg7kznq3zdicaa1z9jaj5is3"; + SGr-IosevkaTerm = "0nf100ymnmkcnj3pvrnsnsb8nanw4asvmmahbvbjwbscq9y5v1pp"; + SGr-IosevkaTermCurly = "1c6csjl5mhw7rvpkx36v57h5nd2mwy8xlpcisbv2x6mr6cmiypq0"; + SGr-IosevkaTermCurlySlab = "1mpfzk4pdpiwk7i93alw8whv6j6qq3by7mar33hqdfnwc8ry971s"; + SGr-IosevkaTermSlab = "19fjijgcfr368c946lkr7xac1gs74bxrax1rn1c0nr8b9qw8y241"; + SGr-IosevkaTermSS01 = "1q9j91mg19mgpx7a5bbkg5dfwza60zc5yakqb7ifcaybxphwzgzc"; + SGr-IosevkaTermSS02 = "1v4m60y7z4v6kjrsi16ibslf5bfxmh70qp4q6id5w83307acx4af"; + SGr-IosevkaTermSS03 = "062p5n78ny74ndhfywdv0ggm3hzscqq6z41yhz0x6pc6390ab3vn"; + SGr-IosevkaTermSS04 = "08s8140vf1bib5rg5slzp3w2zckf7czdij11jznj61qj5z6069qd"; + SGr-IosevkaTermSS05 = "01fa9hwznvls1shwglzvh6lvhwn2c2ys7pzvw131qd5fbj11nfxs"; + SGr-IosevkaTermSS06 = "0k22nm9y7zsbw9wyvkcnh8r7a9p78fdnqhr4k72winhnj0az4nhi"; + SGr-IosevkaTermSS07 = "0n4cds8bar6w420g6plvs8iwizskgs04m216bsnxa7mfmr368d8v"; + SGr-IosevkaTermSS08 = "1agzv2vsiry7x6681ic33cxyryv34fr66qpxcihx5xf2ky565vwv"; + SGr-IosevkaTermSS09 = "1x82wii0hpcnffvbkql6r8yj0s3m4vl6iyrd15dnhs38qrvahkj2"; + SGr-IosevkaTermSS10 = "0jpar4ggsr0gg2b6y3bjl5k6ffnwdi2l2vz4i24n10ldcdb6kygd"; + SGr-IosevkaTermSS11 = "0kpq91wdzkfkfldkcbxjddjvznaanz5nycvqh66zbvsfsy89i69c"; + SGr-IosevkaTermSS12 = "0q8vkmkzxszhi9mqmb0jyjqaiss2z588iqvy3xp0qzzqs6w4vvcp"; + SGr-IosevkaTermSS13 = "1n0isq8vfn5lfwxn2cjfaymkaiw131ykllzbv5b7kqlj32cj3q42"; + SGr-IosevkaTermSS14 = "1hjdbpc264b1glwvfzbfrrkjxpr238byk9pw55swklzrj6q0v7sw"; + SGr-IosevkaTermSS15 = "1sfxic3268bz7b6psnkkwbjmr4ipaf5alscr3kfwz5g03avhiz9x"; + SGr-IosevkaTermSS16 = "0l74n9mafv0zh1qcy4gxmfkf2mjhjcplfxkcxmm4ymgybgxcqrc8"; + SGr-IosevkaTermSS17 = "00q78cwj368rgk5lhlncs39h99w1dqbpg9nkqxqjqkgdqyd2ivwb"; + SGr-IosevkaTermSS18 = "128c6d1bblhfn9npgp56l5zyk4gyyq9p854mi3950r1zg89963x3"; } From 40cf14fdbdce3833475e2535409244eddd67bbe0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 28 Jan 2025 06:28:55 +1000 Subject: [PATCH 281/287] home-manager: 0-unstable-2025-01-13 -> 0-unstable-2025-01-27 (#377348) --- pkgs/by-name/ho/home-manager/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix index 4e6e920d98e7..94160846668f 100644 --- a/pkgs/by-name/ho/home-manager/package.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -19,14 +19,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "0-unstable-2025-01-13"; + version = "0-unstable-2025-01-27"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "fc52a210b60f2f52c74eac41a8647c1573d2071d"; - hash = "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE="; + rev = "e1ae908bcc30af792b0bb0a52e53b03d2577255e"; + hash = "sha256-xiPARGKwocaMtv+U/rgi+h2g56CZZEmrcl7ldRaslq8="; }; nativeBuildInputs = [ From 215b417971827591b88f0e74e7d8e25a1134303d Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Mon, 27 Jan 2025 21:29:48 +0100 Subject: [PATCH 282/287] linuxPackages.nvidia_x11.open: don't include date for reproducibility (#377335) Signed-off-by: Paul Meyer --- pkgs/os-specific/linux/nvidia-x11/open.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/nvidia-x11/open.nix b/pkgs/os-specific/linux/nvidia-x11/open.nix index 6d27b4dd0b98..108466d4e8ec 100644 --- a/pkgs/os-specific/linux/nvidia-x11/open.nix +++ b/pkgs/os-specific/linux/nvidia-x11/open.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation ( "SYSSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" "SYSOUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "MODLIB=$(out)/lib/modules/${kernel.modDirVersion}" + "DATE=" { aarch64-linux = "TARGET_ARCH=aarch64"; x86_64-linux = "TARGET_ARCH=x86_64"; From 327028baa0e7a7efebebaa266651fe7221baa00a Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Mon, 27 Jan 2025 21:33:43 +0100 Subject: [PATCH 283/287] nixos/pixelfed: fix typo in nginx submodule description Signed-off-by: Christoph Heiss --- nixos/modules/services/web-apps/pixelfed.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/pixelfed.nix b/nixos/modules/services/web-apps/pixelfed.nix index 4c64a10951ab..41416e5e529e 100644 --- a/nixos/modules/services/web-apps/pixelfed.nix +++ b/nixos/modules/services/web-apps/pixelfed.nix @@ -109,7 +109,7 @@ in { } ''; description = '' - With this option, you can customize an nginx virtual host which already has sensible defaults for Dolibarr. + With this option, you can customize an nginx virtual host which already has sensible defaults for Pixelfed. Set to {} if you do not need any customization to the virtual host. If enabled, then by default, the {option}`serverName` is `''${domain}`, From 6de7de04a886d2857df3ce130558f194283609b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 20:34:57 +0000 Subject: [PATCH 284/287] gtuber: 0-unstable-2024-10-11 -> 0-unstable-2025-01-19 --- pkgs/by-name/gt/gtuber/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gt/gtuber/package.nix b/pkgs/by-name/gt/gtuber/package.nix index 71e504cb8e5f..750c7acdd7ff 100644 --- a/pkgs/by-name/gt/gtuber/package.nix +++ b/pkgs/by-name/gt/gtuber/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation { pname = "gtuber"; - version = "0-unstable-2024-10-11"; + version = "0-unstable-2025-01-19"; src = fetchFromGitHub { owner = "Rafostar"; repo = "gtuber"; - rev = "468bf02a8adcf69b1bd6dd7b5dbcdcc0bfdb6922"; - hash = "sha256-pEiHqcxkrxZRD9xW/R9DNDdp5foxaHK2SAuzmPNegaY="; + rev = "446e26668a4e01fc2ca9c261a7f1c281577e566d"; + hash = "sha256-5Z6sID7Alm4FWl1qCQV1w5DmGsmor2vbnZUJi3Is650="; }; nativeBuildInputs = [ From 876605aadb7599f222e6b2492e9718ec4a80078c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 20:35:03 +0000 Subject: [PATCH 285/287] fswatch: 1.18.0 -> 1.18.2 --- pkgs/development/tools/misc/fswatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index 814838532766..bf6fcf41cef1 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "fswatch"; - version = "1.18.0"; + version = "1.18.2"; src = fetchFromGitHub { owner = "emcrisostomo"; repo = "fswatch"; rev = version; - sha256 = "sha256-n9EDEF5swC7UyvC0cd+U/u4Wd050Jf9h2AVtEVbUICA="; + sha256 = "sha256-u9+sayp0U6TudffGP2Bb2PbbSMjUHCb6gGBq3jKQ3EQ="; }; nativeBuildInputs = [ From d177ad4a037cc2e5daa47c9bc1262144923196f7 Mon Sep 17 00:00:00 2001 From: Felix Kimmel <91203390+TheRobot2105@users.noreply.github.com> Date: Mon, 27 Jan 2025 21:39:22 +0100 Subject: [PATCH 286/287] vscode-extensions.hirse.vscode-ungit: init at 2.5.2 (#377322) * maintainers: add therobot2105 * vscode-extensions.hirse.vscode-ungit: init at 2.5.2 --- maintainers/maintainer-list.nix | 6 ++++++ .../editors/vscode/extensions/default.nix | 16 ++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 02865fd4ff37..18032c354f0c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -22994,6 +22994,12 @@ githubId = 5409166; name = "Rishi Desai"; }; + therobot2105 = { + email = "felix.kimmel@web.de"; + github = "TheRobot2105"; + githubId = 91203390; + name = "Felix Kimmel"; + }; thesola10 = { email = "me@thesola.io"; github = "Thesola10"; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 3a4a86852d42..17681f58ce00 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2384,6 +2384,22 @@ let }; }; + hirse.vscode-ungit = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-ungit"; + publisher = "hirse"; + version = "2.5.2"; + hash = "sha256-0CFYL6rBecB8rNnk4IAtg03ZPdSJ9qxwnVdhdQedxsQ="; + }; + meta = { + description = "Ungit in Visual Studio Code."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Hirse.vscode-ungit"; + homepage = "https://github.com/hirse/vscode-ungit"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.therobot2105 ]; + }; + }; + hiukky.flate = buildVscodeMarketplaceExtension { mktplcRef = { name = "flate"; From e7b90458b25486d70445b9e3322caae0e9af1c05 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 23:18:13 +0000 Subject: [PATCH 287/287] firefox-devedition-unwrapped: 135.0b4 -> 135.0b9 --- .../browsers/firefox/packages/firefox-devedition.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix index e9386bf99c6c..ae63bc7d9d87 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix @@ -9,13 +9,13 @@ buildMozillaMach rec { pname = "firefox-devedition"; - version = "135.0b4"; + version = "135.0b9"; applicationName = "Mozilla Firefox Developer Edition"; requireSigning = false; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "d3ee20d264c4c26308b814f4cc997349a6df32da17b9a29514b0504f7548606f4b6793ccd2e7464babf6588f13bfcc0e0641f9ac8d620f7da7d7e45684fdf775"; + sha512 = "bf09f999b347492b841a26fcbcfb4d37e5f74528a05ffab47572dcaae01cb43e70baf58e83cc5153498a6a6ad2cb69507b628fba840090c91f4dbca62717a435"; }; meta = {