From 7041483103e1e2ab0a4742a3639b03029ad9d34f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Jan 2025 06:44:06 +0000 Subject: [PATCH 01/85] 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 02/85] 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 40a2ea84338980d868f5ce2903bfc2c1b9353d05 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Jan 2025 22:14:24 +0000 Subject: [PATCH 03/85] 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 04/85] 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 05/85] 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 06/85] 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 07/85] 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 08/85] 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 09/85] 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 10/85] 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 11/85] 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 12/85] 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 f941b5323c65781cfe2d0c0ed3b25d9071a9cd85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Jan 2025 19:38:51 +0000 Subject: [PATCH 13/85] 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 da5a0cfeba808bc82fb33ef07eccd350fca9956b Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 19 Jan 2025 23:01:11 +0100 Subject: [PATCH 14/85] 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 15/85] 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 48f7505b0705d8cfa18cc7faee1d8440b18f9103 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 23 Jan 2025 02:34:13 +0800 Subject: [PATCH 16/85] 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 17/85] 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 18/85] 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 19/85] 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 57e086f7c0afca8d2c6b1392174862ae8a3234c9 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 24 Jan 2025 02:14:38 +0100 Subject: [PATCH 20/85] 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 21/85] 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 22/85] 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 23/85] 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 24/85] 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 25/85] 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 26/85] 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 27/85] 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 918b2becd2741690c4da00ac89afda329ee9ef9f Mon Sep 17 00:00:00 2001 From: "Berk D. Demir" Date: Sat, 25 Jan 2025 00:39:17 -0800 Subject: [PATCH 28/85] 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 687320fd382e5cbe3a14320485d74ff79f2755ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 12:05:04 +0000 Subject: [PATCH 29/85] 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 96c99d0145b22456bc117eb0914f96df741346d3 Mon Sep 17 00:00:00 2001 From: sanana Date: Tue, 14 Jan 2025 21:11:36 +0300 Subject: [PATCH 30/85] 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 31/85] 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 0baa7efcbc8d10c2b61188f470ed8e4a0b82fb97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jan 2025 16:21:11 +0000 Subject: [PATCH 32/85] 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 33/85] 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 34/85] 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 35/85] 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 36/85] 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 37/85] 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 38/85] 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 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 39/85] 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 485d02f8168b14907dcbd64d76870bd3c01e99ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 02:14:55 +0000 Subject: [PATCH 40/85] 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 e934052fa417b5742e9309691d36cd6213c8929e Mon Sep 17 00:00:00 2001 From: a-kenji Date: Sun, 26 Jan 2025 13:02:46 +0100 Subject: [PATCH 41/85] 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 42/85] 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 43/85] 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 2d9867ac833ca8a6171a15c3b2aa65c66369a688 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Sun, 26 Jan 2025 08:30:16 -0600 Subject: [PATCH 44/85] 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 d85b17634b8e8a80b53044ab9bdd1e159ea1470a Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Sun, 26 Jan 2025 08:36:14 -0600 Subject: [PATCH 45/85] 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 787497b8433b36c2feacef9dbcc324d970c93af8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 15:34:52 +0000 Subject: [PATCH 46/85] 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 47/85] 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 48/85] 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 49/85] 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 1217130d9958eecbd46c542d3ab33ad4140611cb Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 24 Jan 2025 02:14:40 +0100 Subject: [PATCH 50/85] 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 51/85] 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 cf8c83b562dc1b903fe4b92c8f889ad59706f974 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 16:32:28 +0000 Subject: [PATCH 52/85] 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 53/85] 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 54/85] 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 ac0247e7199c1a35083bf256261d595256c6459d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 26 Jan 2025 17:37:52 +0100 Subject: [PATCH 55/85] 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 56/85] 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 57/85] 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 58/85] 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 51ec829b3f9cb0fea062ab9fa036a0da0587d1d6 Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Sun, 26 Jan 2025 23:20:31 +0530 Subject: [PATCH 59/85] 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 60/85] 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 61/85] 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 62/85] 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 de2554ad4302450dc5d1544b067dcea828e2c8a2 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 26 Jan 2025 19:56:06 +0100 Subject: [PATCH 63/85] 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 64/85] 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 9d5e0238abcebe9438eee0dadc05daa7d9043069 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 20:33:22 +0100 Subject: [PATCH 65/85] 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 66/85] 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 67/85] 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 68/85] 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 5edf29e205d112251f9c54dc1a0e7f9c9f344789 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 20:44:55 +0100 Subject: [PATCH 69/85] 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 bfc84011e58b55db7d153924b12648f4cb73b61d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 19:53:31 +0000 Subject: [PATCH 70/85] 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 01c1c14c2381d9e568cef4cf0355b9a57e112cf0 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 26 Jan 2025 20:13:58 +0100 Subject: [PATCH 71/85] 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 0039ab36b84fdb4bbf25defc12bdc0347bbbe2ee Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 21:06:45 +0100 Subject: [PATCH 72/85] 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 89a8c6d4802f847fccd8754a21d9a240bc1d9af9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 21:34:44 +0100 Subject: [PATCH 73/85] 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 74/85] 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 b70743f5bb9f023c405dd54e9a67fb4dc89a6081 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 26 Jan 2025 19:54:58 +0100 Subject: [PATCH 75/85] 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 76/85] 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 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 77/85] 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 ec685ba06713f4a5de120f234a62ebb327462200 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 20:56:05 +0000 Subject: [PATCH 78/85] 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 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 79/85] 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 80/85] 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 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 81/85] 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 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 82/85] 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 83/85] 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 84/85] 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 479d8786151352de75ea8198ec40624ee18f1f00 Mon Sep 17 00:00:00 2001 From: Palmer Cox Date: Sat, 25 Jan 2025 22:21:43 -0500 Subject: [PATCH 85/85] 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" ];