From 54f63650cdbbbbfcd09c1b90ff092f906f7a7fa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Tue, 18 Feb 2025 18:24:22 +0100 Subject: [PATCH 01/29] protoc-gen-connect-es: remove `protoc-gen-connect-es` is no longer needed since `protoc-gen-es` v2 generates service information now: https://github.com/connectrpc/connect-es/pull/1224 --- .../pr/protoc-gen-connect-es/package.nix | 39 ------------------- .../pr/protoc-gen-connect-es/update.sh | 30 -------------- pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+), 69 deletions(-) delete mode 100644 pkgs/by-name/pr/protoc-gen-connect-es/package.nix delete mode 100755 pkgs/by-name/pr/protoc-gen-connect-es/update.sh diff --git a/pkgs/by-name/pr/protoc-gen-connect-es/package.nix b/pkgs/by-name/pr/protoc-gen-connect-es/package.nix deleted file mode 100644 index 6940b01b88fd..000000000000 --- a/pkgs/by-name/pr/protoc-gen-connect-es/package.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - buildNpmPackage, - fetchFromGitHub, - npm-lockfile-fix, -}: - -buildNpmPackage rec { - pname = "protoc-gen-connect-es"; - version = "1.6.1"; - - src = fetchFromGitHub { - owner = "connectrpc"; - repo = "connect-es"; - tag = "v${version}"; - hash = "sha256-cB1OTolnwHOqeXrj8wL5FbFnjok6s03z1jC58ABTW3o="; - - postFetch = '' - ${lib.getExe npm-lockfile-fix} $out/package-lock.json - ''; - }; - - npmDepsHash = "sha256-VkvWHKERJwG7MVZ5Pb7ufRCBBWkcoMCoabtMETcPvrU="; - - npmWorkspace = "packages/protoc-gen-connect-es"; - - passthru.updateScript = ./update.sh; - - meta = with lib; { - description = "Protobuf plugin for generating Connect-ecompatiblenabled ECMAScript code"; - homepage = "https://github.com/connectrpc/connect-es"; - changelog = "https://github.com/connectrpc/connect-es/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ - felschr - jtszalay - ]; - }; -} diff --git a/pkgs/by-name/pr/protoc-gen-connect-es/update.sh b/pkgs/by-name/pr/protoc-gen-connect-es/update.sh deleted file mode 100755 index 6306267da77f..000000000000 --- a/pkgs/by-name/pr/protoc-gen-connect-es/update.sh +++ /dev/null @@ -1,30 +0,0 @@ -#! /usr/bin/env -S nix shell nixpkgs#gnugrep nixpkgs#gnused nixpkgs#coreutils nixpkgs#curl nixpkgs#wget nixpkgs#jq nixpkgs#nix-update nixpkgs#prefetch-npm-deps nixpkgs#npm-lockfile-fix nixpkgs#nodejs --command bash - -set -euo pipefail - -version="$( - curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s "https://api.github.com/repos/connectrpc/connect-es/releases" | - jq -r 'map(select(.prerelease == false)) | .[0].tag_name' | - grep -oP "^v\K.*" -)" -url="https://raw.githubusercontent.com/connectrpc/connect-es/v$version/" - -if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then - echo "Already up to date!" - exit 0 -fi - -tmp="$(mktemp -d)" -trap 'rm -rf -- "$tmp"' EXIT - -pushd -- "$tmp" -wget "$url/package-lock.json" -npm-lockfile-fix package-lock.json -npm_hash=$(prefetch-npm-deps package-lock.json) -popd - -pushd "$(dirname "${BASH_SOURCE[0]}")" -sed -i 's#npmDepsHash = "[^"]*"#npmDepsHash = "'"$npm_hash"'"#' package.nix -popd - -nix-update protoc-gen-connect-es --version "$version" diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1f24eadb8713..6c1db0292ba8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1162,6 +1162,7 @@ mapAliases { protobuf3_24 = protobuf_24; protobuf3_23 = protobuf_23; protobuf3_21 = protobuf_21; + protoc-gen-connect-es = throw "'protoc-gen-connect-es' has been removed because it is deprecated upstream. Functionality has been integrated into 'protoc-gen-es' v2."; # Added 2025-02-18 protonup = protonup-ng; # Added 2022-11-06 protonvpn-gui_legacy = throw "protonvpn-gui_legacy source code was removed from upstream. Use protonvpn-gui instead."; # Added 2024-10-12 proxmark3-rrg = proxmark3; # Added 2023-07-25 From 23ddba7a80ac3e6d19500c89fd513ef537edad8f Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Fri, 28 Feb 2025 17:00:05 +0100 Subject: [PATCH 02/29] cachix: set meta.mainProgram --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30f86fc3ec11..cf5557fdb340 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8568,7 +8568,11 @@ with pkgs; inherit (callPackages ../development/libraries/c-blosc { }) c-blosc c-blosc2; - cachix = lib.getBin haskellPackages.cachix; + cachix = (lib.getBin haskellPackages.cachix).overrideAttrs (old: { + meta = (old.meta or {}) // { + mainProgram = old.meta.mainProgram or "cachix"; + }; + }); cubeb = callPackage ../development/libraries/audio/cubeb { inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreServices; From 8ae6b06dc99b5a2c5310fcdb47c08a9bad43c76d Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman Date: Sat, 1 Mar 2025 22:31:05 +0000 Subject: [PATCH 03/29] lzwolf: drop Quote from upstream [1]: > Unfortunately, LZWolf's development has been discontinued as of the > 5th of March, 2023. The engine is still a fantastic source port for the > building of mods, with a lot of cool features to take advantage of, but > will not be following ECWolf to a 1.4 release. The packaging is also unmaintained on our side and sources require patches to even compile with gcc >= 13. [1]: https://beta.wolf3d.net/engines/LZWolf --- pkgs/by-name/sd/SDL2_mixer_2_0/package.nix | 4 - pkgs/games/lzwolf/default.nix | 92 ---------------------- pkgs/top-level/aliases.nix | 2 +- pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 99 deletions(-) delete mode 100644 pkgs/games/lzwolf/default.nix diff --git a/pkgs/by-name/sd/SDL2_mixer_2_0/package.nix b/pkgs/by-name/sd/SDL2_mixer_2_0/package.nix index a886e85d5a9e..96b3d40f10fb 100644 --- a/pkgs/by-name/sd/SDL2_mixer_2_0/package.nix +++ b/pkgs/by-name/sd/SDL2_mixer_2_0/package.nix @@ -1,9 +1,7 @@ -# SDL2_mixer_2_0 pinned for lzwolf { SDL2_mixer, fetchFromGitHub, fetchpatch, - lzwolf, timidity, }: @@ -34,8 +32,6 @@ let substituteInPlace timidity/options.h \ --replace "/usr/share/timidity" "${timidity}/share/timidity" ''; - - passthru.tests.lzwolf = lzwolf; }; in SDL2_mixer.overrideAttrs (_: attrset) diff --git a/pkgs/games/lzwolf/default.nix b/pkgs/games/lzwolf/default.nix deleted file mode 100644 index 9537d959253e..000000000000 --- a/pkgs/games/lzwolf/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ - stdenv, - lib, - fetchFromBitbucket, - fetchpatch, - p7zip, - cmake, - SDL2, - bzip2, - zlib, - libjpeg, - libsndfile, - mpg123, - pkg-config, - SDL2_net, - SDL2_mixer, -}: - -stdenv.mkDerivation rec { - pname = "lzwolf"; - # Fix-Me: Remember to remove SDL2_mixer pin (at top-level) on next lzwolf upgrade. - version = "unstable-2022-12-26"; - - src = fetchFromBitbucket { - owner = "linuxwolf6"; - repo = "lzwolf"; - rev = "a24190604296e16941c601b57afe4350462fc659"; - hash = "sha256-CtBdvk6LXb/ll92Fxig/M4t4QNj8dNFJYd8F99b47kQ="; - }; - - patches = [ - # Pull fix pending upstream inclusion for `gcc-13` support: - # https://bitbucket.org/linuxwolf6/lzwolf/pull-requests/5 - (fetchpatch { - name = "gcc-13.patch"; - url = "https://bitbucket.org/soturi/lzwolf/commits/41f212026dff4f089d1c0921cb49ab1a2b81e0d6/raw"; - hash = "sha256-EgSdDaZovD7DyZ0BkuX8ZdsrX7J7v8/D6y5P1NWGJew="; - }) - # Fixes build with gcc >= 14. Picked patch from the original ecwolf repo. - (fetchpatch { - name = "tmemory.h-const-correctness.patch"; - url = "https://bitbucket.org/ecwolf/ecwolf/commits/400aaf96a36a14ab8eab18a670ba6439046f3bb0/raw"; - hash = "sha256-2YwHEctBPyprs0DVsazimGEgmiCba24zh2dFfw9tOnU="; - }) - ]; - - postPatch = '' - # SDL2_net-2.2.0 changed CMake component name slightly. - substituteInPlace src/CMakeLists.txt \ - --replace 'SDL2::SDL2_net' 'SDL2_net::SDL2_net' - ''; - - nativeBuildInputs = [ - p7zip - pkg-config - cmake - ]; - buildInputs = [ - SDL2 - bzip2 - zlib - libjpeg - SDL2_mixer - SDL2_net - libsndfile - mpg123 - ]; - - cmakeFlags = [ - "-DGPL=ON" - ]; - - doCheck = true; - - installPhase = '' - install -Dm755 lzwolf "$out/lib/lzwolf/lzwolf" - for i in *.pk3; do - install -Dm644 "$i" "$out/lib/lzwolf/$i" - done - mkdir -p $out/bin - ln -s $out/lib/lzwolf/lzwolf $out/bin/lzwolf - ''; - - meta = with lib; { - homepage = "https://bitbucket.org/linuxwolf6/lzwolf"; - description = "Enhanced fork of ECWolf, a Wolfenstein 3D source port"; - mainProgram = "lzwolf"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1a516fa3850c..abca1569ecf3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -903,7 +903,7 @@ mapAliases { lxd = lib.warnOnInstantiate "lxd has been renamed to lxd-lts" lxd-lts; # Added 2024-04-01 lxd-unwrapped = lib.warnOnInstantiate "lxd-unwrapped has been renamed to lxd-unwrapped-lts" lxd-unwrapped-lts; # Added 2024-04-01 lzma = throw "'lzma' has been renamed to/replaced by 'xz'"; # Converted to throw 2024-10-17 - + lzwolf = throw "'lzwolf' has been removed because it's no longer maintained upstream. Consider using 'ecwolf'"; # Added 2025-03-02 ### M ### ma1sd = throw "ma1sd was dropped as it is unmaintained"; # Added 2024-07-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8da5800d902..944ac2d922e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4137,8 +4137,6 @@ with pkgs; xz = callPackage ../tools/compression/xz { }; - lzwolf = callPackage ../games/lzwolf { SDL2_mixer = SDL2_mixer_2_0; }; - madlang = haskell.lib.compose.justStaticExecutables haskellPackages.madlang; mailnag = callPackage ../applications/networking/mailreaders/mailnag { From 51ff0ade3b217689bf7872d8499978174bd79311 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Sun, 2 Mar 2025 09:39:24 +0000 Subject: [PATCH 04/29] kermit: fix build --- pkgs/by-name/ke/kermit/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ke/kermit/package.nix b/pkgs/by-name/ke/kermit/package.nix index 5dcbe23d9eb6..b68c09f33a29 100644 --- a/pkgs/by-name/ke/kermit/package.nix +++ b/pkgs/by-name/ke/kermit/package.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation { make -f makefile install ''; + env.NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration -Wno-implicit-int"; + meta = with lib; { homepage = "https://www.kermitproject.org/ck90.html"; description = "Portable Scriptable Network and Serial Communication Software"; From f8b07beb6a998975da9cef69f36f895668b9db43 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 3 Mar 2025 00:48:42 +0100 Subject: [PATCH 05/29] python313Packages.sopel: fix build --- pkgs/development/python-modules/sopel/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix index 744c4550d9eb..ac425065d52a 100644 --- a/pkgs/development/python-modules/sopel/default.nix +++ b/pkgs/development/python-modules/sopel/default.nix @@ -52,7 +52,10 @@ buildPythonPackage rec { pythonRemoveDeps = [ "sopel-help" ]; - pythonRelaxDeps = [ "sqlalchemy" ]; + pythonRelaxDeps = [ + "sqlalchemy" + "xmltodict" + ]; nativeCheckInputs = [ pytestCheckHook ]; From adb168c52ec2c847898608053f4e0314465b2035 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 3 Mar 2025 01:33:03 +0100 Subject: [PATCH 06/29] python313Packages.mrsqm: r4 -> v.0.0.7 was downgraded in bf8d14b4a0340393b69de7d6e3302a718b7942f1 fixes https://hydra.nixos.org/build/287832420 --- pkgs/development/python-modules/mrsqm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/mrsqm/default.nix b/pkgs/development/python-modules/mrsqm/default.nix index 66136d339607..9133b0fe4910 100644 --- a/pkgs/development/python-modules/mrsqm/default.nix +++ b/pkgs/development/python-modules/mrsqm/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "mrsqm"; - version = "4"; + version = "0.0.7"; pyproject = true; build-system = [ @@ -27,8 +27,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mlgig"; repo = "mrsqm"; - tag = "r${version}"; - hash = "sha256-59f18zItV3K6tXcg1v1q2Z8HYrQB8T0ntaaqjxeAEbM="; + tag = "v.${version}"; + hash = "sha256-5K6vCU0HExnmYNThZNDCbEtII9bUGauxDtKkJXe/85Q="; }; buildInputs = [ fftw ]; @@ -44,7 +44,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace-fail "'pytest-runner'" "" + --replace-fail "setup_requires=['pytest-runner']," "" substituteInPlace pyproject.toml \ --replace-fail "numpy==" "numpy>=" ''; From dfdd4230f240dbb1c40f4c738d310c1c6a5ccfa8 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 3 Mar 2025 01:44:37 +0100 Subject: [PATCH 07/29] python313Packages.anybadge: fix build, modernize --- .../python-modules/anybadge/default.nix | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/anybadge/default.nix b/pkgs/development/python-modules/anybadge/default.nix index dc7fffcf2582..4f4a22c047a2 100644 --- a/pkgs/development/python-modules/anybadge/default.nix +++ b/pkgs/development/python-modules/anybadge/default.nix @@ -2,34 +2,45 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, packaging, pytestCheckHook, pythonOlder, requests, + sh, }: buildPythonPackage rec { pname = "anybadge"; version = "1.16.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jongracecox"; - repo = pname; + repo = "anybadge"; tag = "v${version}"; hash = "sha256-9qGmiIGzVdWHMyurMqTqEz+NKYlc/5zt6HPsssCH4Pk="; }; - # setup.py reads its version from the TRAVIS_TAG environment variable - TRAVIS_TAG = "v${version}"; + postPatch = '' + substituteInPlace setup.py \ + --replace-fail '=get_version(),' "='$version'," + ''; - propagatedBuildInputs = [ packaging ]; + build-system = [ + setuptools + ]; + + dependencies = [ + packaging + ]; nativeCheckInputs = [ pytestCheckHook requests + sh ]; disabledTests = [ @@ -44,11 +55,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "anybadge" ]; - meta = with lib; { + meta = { description = "Python tool for generating badges for your projects"; homepage = "https://github.com/jongracecox/anybadge"; changelog = "https://github.com/jongracecox/anybadge/releases/tag/${src.tag}"; - license = licenses.mit; - maintainers = with maintainers; [ fabiangd ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fabiangd ]; }; } From 77fb2f71f01f923c89a8373613ebcf95c4ed1013 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 3 Mar 2025 02:08:38 +0100 Subject: [PATCH 08/29] castero: fix build --- pkgs/by-name/ca/castero/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/ca/castero/package.nix b/pkgs/by-name/ca/castero/package.nix index 7e57f150c335..bc1d84690fb0 100644 --- a/pkgs/by-name/ca/castero/package.nix +++ b/pkgs/by-name/ca/castero/package.nix @@ -17,6 +17,7 @@ python3.pkgs.buildPythonApplication rec { }; build-system = with python3.pkgs; [ + setuptools wheel ]; @@ -48,6 +49,11 @@ python3.pkgs.buildPythonApplication rec { "test_datafile_download" "test_display_get_input_str" "test_display_get_y_n" + # > assert mymenu.metadata == episode1.metadata + # E AssertionError: assert '' == + # E + where '' = .metadata + # E + and = episode1.metadata + "test_menu_episode_metadata" ]; pythonImportsCheck = [ From f17646e697e1423c381f5957e10f5f4d6a144b54 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 3 Mar 2025 06:10:19 +0100 Subject: [PATCH 09/29] python313Packages.trimesh: 4.6.3 -> 4.6.4 Changelog: https://github.com/mikedh/trimesh/releases/tag/4.6.4 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 7cfb226fcdb4..36e9e24fd81a 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.6.3"; + version = "4.6.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mikedh"; repo = "trimesh"; tag = version; - hash = "sha256-QKV0qb36BfJWbmbqTXzPFY2X6SD+B3FxWSoDltDP8fM="; + hash = "sha256-kkIGAeWFrgOIbvBnZFRQue7Fh7REKF/CHgJLBEZliLM="; }; build-system = [ setuptools ]; From 8152e5409d5e6bfc1210baba2153e63f43174f36 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 4 Mar 2025 00:20:58 +0100 Subject: [PATCH 10/29] python313Packages.datafusion: fix build fixes https://hydra.nixos.org/build/290691235 --- pkgs/development/python-modules/datafusion/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/datafusion/default.nix b/pkgs/development/python-modules/datafusion/default.nix index 46d27a50e93e..3584e4be235f 100644 --- a/pkgs/development/python-modules/datafusion/default.nix +++ b/pkgs/development/python-modules/datafusion/default.nix @@ -69,7 +69,8 @@ buildPythonPackage rec { dependencies = [ pyarrow - ] ++ lib.optionals (pythonOlder "3.13") [ typing-extensions ]; + typing-extensions + ]; nativeCheckInputs = [ pytestCheckHook From 2b88093cf7e4f2f5acffd644fd690abc99aafbca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Mar 2025 01:56:10 +0000 Subject: [PATCH 11/29] libsForQt5.qtstyleplugin-kvantum: 1.1.3 -> 1.1.4 --- pkgs/development/libraries/qtstyleplugin-kvantum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 20b8ea9b43db..5bc3ad62197a 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "qtstyleplugin-kvantum${lib.optionalString isQt5 "5"}"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${finalAttrs.version}"; - hash = "sha256-x2XsJ26y9y6IF9aY0fmAcvO4zmwLjvE2Lfvzw+GqchM="; + hash = "sha256-49QnPwGQo4gOxO7EUJnn0JoQl6LgrEOW3cks3IT3fnU="; }; nativeBuildInputs = [ From 2c636ad0caffc5faba2d2d16791b34229b26ed76 Mon Sep 17 00:00:00 2001 From: aleksana Date: Tue, 4 Mar 2025 17:38:09 +0800 Subject: [PATCH 12/29] gnome-commander: 1.18.1-unstable-2024-10-18 -> 1.18.2 I have to apologize to users, that I miscalculated their trend towards adopting Rust and GTK4. They are not releasing a new version based on the main branch, but the GTK3 one, so I decided to align with upstream to switch back to GTK3 here. --- pkgs/by-name/gn/gnome-commander/package.nix | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/gn/gnome-commander/package.nix b/pkgs/by-name/gn/gnome-commander/package.nix index 4504abf84c3b..5b03c4178e94 100644 --- a/pkgs/by-name/gn/gnome-commander/package.nix +++ b/pkgs/by-name/gn/gnome-commander/package.nix @@ -7,10 +7,7 @@ pkg-config, flex, itstool, - rustPlatform, - rustc, - cargo, - wrapGAppsHook4, + wrapGAppsHook3, desktop-file-utils, exiv2, libgsf, @@ -22,14 +19,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-commander"; - version = "1.18.1-unstable-2024-10-18"; + version = "1.18.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "gnome-commander"; - rev = "28dadb1ef9342bb1a5f9a65b1a5bf3bd80e3d30a"; - hash = "sha256-DxsZJht+PD3vY5vc1vzpRD8FHBPKcjK4qfke5nhvHS0="; + tag = finalAttrs.version; + hash = "sha256-dNZDlpvpN5hh/3YccZPJDEFkBLv9I8YOdFT/COp7+Uw="; }; # hard-coded schema paths @@ -40,21 +37,13 @@ stdenv.mkDerivation (finalAttrs: { '/share/gsettings-schemas/${finalAttrs.finalPackage.name}/glib-2.0/schemas' ''; - cargoDeps = rustPlatform.fetchCargoVendor { - inherit (finalAttrs) pname version src; - hash = "sha256-dOd/4n8G/zEsF0ClqhI2QBLosEz3uyzC9q5sHDVWAx4="; - }; - nativeBuildInputs = [ meson ninja pkg-config flex itstool - rustPlatform.cargoSetupHook - rustc - cargo - wrapGAppsHook4 + wrapGAppsHook3 desktop-file-utils ]; From ec0d31d375f8f782561ac0483782d40385bceb5e Mon Sep 17 00:00:00 2001 From: arminius-smh Date: Tue, 4 Mar 2025 18:22:28 +0100 Subject: [PATCH 13/29] swayosd: 0.1.0 -> 0.2.0 --- pkgs/by-name/sw/swayosd/package.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/sw/swayosd/package.nix b/pkgs/by-name/sw/swayosd/package.nix index d4ed483bc8ed..e4c63e331eea 100644 --- a/pkgs/by-name/sw/swayosd/package.nix +++ b/pkgs/by-name/sw/swayosd/package.nix @@ -3,11 +3,12 @@ rustPlatform, fetchFromGitHub, pkg-config, - wrapGAppsHook3, + wrapGAppsHook4, brightnessctl, cargo, coreutils, - gtk-layer-shell, + dbus, + gtk4-layer-shell, libevdev, libinput, libpulseaudio, @@ -20,22 +21,22 @@ }: stdenv.mkDerivation rec { pname = "swayosd"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "ErikReider"; repo = "SwayOSD"; rev = "v${version}"; - hash = "sha256-GyvRWEzTxQxTAk+xCLFsHdd1SttBliOgJ6eZqAxQMME="; + hash = "sha256-V3V18BoBRJU8mtvwWXvdYPbKBDIHdu5LzVSkDkGJjFU="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-oeLhJwlOITp8YHJdZQY7oo8Z31WUT4Y70dHd3tDDsk8="; + hash = "sha256-b5Ei6k9p/KiyiSSl5zxDXrTgGAq24O5ll0BvyJ/41F8="; }; nativeBuildInputs = [ - wrapGAppsHook3 + wrapGAppsHook4 pkg-config meson rustc @@ -45,10 +46,11 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk-layer-shell + gtk4-layer-shell libevdev libinput libpulseaudio + dbus udev sassc ]; From 14518fc5aaa95d44d402e000b04eefdb326eacc5 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 4 Mar 2025 23:43:38 +0100 Subject: [PATCH 14/29] python313Packages.mrsqm: add updateScript This is to try and prevent downgrade come next python-updates --- pkgs/development/python-modules/mrsqm/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/mrsqm/default.nix b/pkgs/development/python-modules/mrsqm/default.nix index 9133b0fe4910..33b4b044dd3b 100644 --- a/pkgs/development/python-modules/mrsqm/default.nix +++ b/pkgs/development/python-modules/mrsqm/default.nix @@ -11,6 +11,7 @@ pip, setuptools, pytestCheckHook, + nix-update-script, }: buildPythonPackage rec { @@ -63,6 +64,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "mrsqm" ]; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "v\\.(.*)" + ]; + }; + meta = { description = "MrSQM (Multiple Representations Sequence Miner) is a time series classifier"; homepage = "https://pypi.org/project/mrsqm"; From 3e30957ac42d66cc8ba6c53a108dafdd872abf97 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Tue, 4 Mar 2025 21:53:55 -0500 Subject: [PATCH 15/29] vimix-cursor-theme: remove --- .../by-name/vi/vimix-cursor-theme/package.nix | 34 ------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 pkgs/by-name/vi/vimix-cursor-theme/package.nix diff --git a/pkgs/by-name/vi/vimix-cursor-theme/package.nix b/pkgs/by-name/vi/vimix-cursor-theme/package.nix deleted file mode 100644 index a030580e7ff4..000000000000 --- a/pkgs/by-name/vi/vimix-cursor-theme/package.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - stdenvNoCC, - fetchFromGitHub, - lib, -}: - -stdenvNoCC.mkDerivation rec { - pname = "vimix-cursor-theme"; - version = "2020-02-24"; - - src = fetchFromGitHub { - owner = "vinceliuice"; - repo = "Vimix-cursors"; - rev = version; - hash = "sha256-TfcDer85+UOtDMJVZJQr81dDy4ekjYgEvH1RE1IHMi4="; - }; - - installPhase = '' - sed -i 's/Vimix Cursors$/Vimix-Cursors/g' dist{,-white}/index.theme - - install -dm 755 $out/share/icons/Vimix-Cursors{,-White} - - cp -dr --no-preserve='ownership' dist/* $out/share/icons/Vimix-Cursors - cp -dr --no-preserve='ownership' dist-white/* $out/share/icons/Vimix-Cursors-White - ''; - - meta = with lib; { - description = "X-cursor theme inspired by Materia design and based on capitaine-cursors"; - homepage = "https://github.com/vinceliuice/Vimix-cursors"; - license = licenses.gpl3Only; - platforms = platforms.all; - maintainers = with maintainers; [ redxtech ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8ccf7791d8c6..119cf699e1aa 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1561,6 +1561,7 @@ mapAliases { vim_configurable = vim-full; # Added 2022-12-04 vinagre = throw "'vinagre' has been removed as it has been archived upstream. Consider using 'gnome-connections' or 'remmina' instead"; # Added 2024-09-14 libviperfx = throw "'libviperfx' was removed as it is broken and not maintained upstream"; # Added 2024-12-16 + vimix-cursor-theme = throw "'vimix-cursor-theme' has been superseded by 'vimix-cursors'"; # Added 2025-03-04 viper4linux-gui = throw "'viper4linux-gui' was removed as it is broken and not maintained upstream"; # Added 2024-12-16 viper4linux = throw "'viper4linux' was removed as it is broken and not maintained upstream"; # Added 2024-12-16 virtscreen = throw "'virtscreen' has been removed, as it was broken and unmaintained"; # Added 2024-10-17 From 15c9d7eb99925e42bbd6195281e747e5485c7ee3 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Wed, 5 Mar 2025 10:52:55 +0100 Subject: [PATCH 16/29] electron_32-bin: 32.3.2 -> 32.3.3 - Changelog: https://github.com/electron/electron/releases/tag/v32.3.3 - Diff: https://github.com/electron/electron/compare/refs/tags/v32.3.2...v32.3.3 - Fixes CVE-2025-0445 - Fixes CVE-2025-0998 --- 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 20997ed13c45..1e5258128361 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": "f644ac51590a5d2e16318aca9a2ad70f9b5c45cc2edf2524b33d15dd0add4193", - "aarch64-linux": "5223d8bb21aac0a55dd09587773d93b0ca4c8c4161ac56158d93199973c8200c", - "armv7l-linux": "153a37e43175064539c63550fee2104fc21b95279daaf8fc38dd617dbfcd2c52", - "headers": "1sdvj3a05yrvy3b8bgzn8b2diz2ivlh4jsvhcffid0wbb17in2xj", - "x86_64-darwin": "e85b8ca35d0710087c2915f5dab07828733b2a1aaad04ae4907f0754346a09c6", - "x86_64-linux": "6afd83962ecbfbad19fe06d101ae00ee0662f4612c70620deb61cf6fac5b8118" + "aarch64-darwin": "67e5f8ce2c395b6b5a4c896ee1f2558b0003d0a54a7f4aef3b7760409ffc5825", + "aarch64-linux": "6b18f435855284852be2b2c1b49e58df380a56784d78b358a13ea77bbace4a8a", + "armv7l-linux": "a067329d55cc6648e9f783fd8b01b93da45ac21892b8096d758b30a87505c1a7", + "headers": "0pb06wlx5zz0asrh05c90q0np14c4swkvhzrcqmcyfz7ihczqh5a", + "x86_64-darwin": "0499216feffc2ba56438d8c4ac89cf40117baee6335099f5b12457d339f465a6", + "x86_64-linux": "0e1f1540492e48e3b8805f87c5096c3b99995c4c1b581ee57e9c836538bae813" }, - "version": "32.3.2" + "version": "32.3.3" }, "33": { "hashes": { From 19f37d5f2dac83b0ec23425a811211464c1d502b Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Wed, 5 Mar 2025 10:53:00 +0100 Subject: [PATCH 17/29] electron-chromedriver_32: 32.3.2 -> 32.3.3 - Changelog: https://github.com/electron/electron/releases/tag/v32.3.3 - Diff: https://github.com/electron/electron/compare/refs/tags/v32.3.2...v32.3.3 - Fixes CVE-2025-0445 - Fixes CVE-2025-0998 --- .../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 d46e6108235b..613d3ca321a7 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": "50ffb73f7ac2705dc1500977dfe391f21895eefdb1eac642786ff9e3904f667e", - "aarch64-linux": "780c79bd0f96498c8934262c56b105c53ced1fe7a6b442d1c32bcf2737bc8782", - "armv7l-linux": "11aefc9f15b62c7102824927aa34ce07c479de9102212d00e96ff2f5ac268d89", - "headers": "1sdvj3a05yrvy3b8bgzn8b2diz2ivlh4jsvhcffid0wbb17in2xj", - "x86_64-darwin": "305ed9ef27305e8ee7a851e6ca169de360ee607497b5577174c67cfe4836f9ad", - "x86_64-linux": "27d0c689b9a8564220adae3aea2a6f42411c986795f779a729fe90aed93fee61" + "aarch64-darwin": "a5fd8e33f01833f567655900e9685ca7141be4a83ed05bbcb2f5b4e6af1c7c91", + "aarch64-linux": "2535230e99cf356285c19af32586940e3416c22546bea0b38d71e6dd2579fa8f", + "armv7l-linux": "bda58c490006c5df0e5a87038e38943ec2e8e222496bfb1ac590f4732e5ffcf6", + "headers": "0pb06wlx5zz0asrh05c90q0np14c4swkvhzrcqmcyfz7ihczqh5a", + "x86_64-darwin": "9fa0bb73f1c9d1c011f35c664beb3cdd06def063d4a72a581663776e5808579b", + "x86_64-linux": "adfb974ccb29edc2365b244e3c4d06dae6a0bd4f5cf280ff62271959a8aad10e" }, - "version": "32.3.2" + "version": "32.3.3" }, "33": { "hashes": { From c24d10244d7ac8cd1b808525c3776eee43cbfce7 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Mon, 17 Feb 2025 21:09:12 +0000 Subject: [PATCH 18/29] cartridges: 2.11 -> 2.11.1 Diff: https://github.com/kra-mo/cartridges/compare/v2.11...v2.11.1 Changelog: https://github.com/kra-mo/cartridges/releases/tag/v2.11.1 --- pkgs/by-name/ca/cartridges/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ca/cartridges/package.nix b/pkgs/by-name/ca/cartridges/package.nix index 3edfca864c12..1d1c3bd18885 100644 --- a/pkgs/by-name/ca/cartridges/package.nix +++ b/pkgs/by-name/ca/cartridges/package.nix @@ -19,14 +19,14 @@ python3Packages.buildPythonApplication rec { pname = "cartridges"; - version = "2.11"; + version = "2.11.1"; pyproject = false; src = fetchFromGitHub { owner = "kra-mo"; repo = "cartridges"; tag = "v${version}"; - hash = "sha256-6v/R83eYq993epcAkcf9jyNakKuGmSsGXrQYQMro6nI="; + hash = "sha256-2w7qHTEaRnVDRa0e39Dg9H7pjhgM2UATe8pGYncYILE="; }; strictDeps = true; From 55fbd4b35dee12b909f176e778c9e5372e857d98 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Fri, 7 Mar 2025 06:11:39 +0000 Subject: [PATCH 19/29] zed-editor: 0.176.2 -> 0.176.3 Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com> --- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index af81eebb6f03..1be9aeb6ec90 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -98,7 +98,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.176.2"; + version = "0.176.3"; outputs = [ "out" ] @@ -110,7 +110,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-uTq9/skBMz8n2NjGBQKOIOMp/rTDL+azEUzV4jTUJvE="; + hash = "sha256-5bn70R5phHZmAf/71IK8o2laHcCo92cCiaKQ7xo0Uag="; }; patches = [ @@ -136,7 +136,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-b4YTVrz2nOwQnVU42E+LD1YjsUAWN7+fCr2z8IVwH6o="; + cargoHash = "sha256-IaAY1u5xLomvUtb4FjE4uE0w01rMmyR/DH0QD9cOK5Y="; nativeBuildInputs = [ From e3ec614d7b3e910604b6a7db1a9c7e5c37ba1c47 Mon Sep 17 00:00:00 2001 From: installer Date: Thu, 6 Mar 2025 21:22:35 +0100 Subject: [PATCH 20/29] vscode-extension.johnpapa.winteriscoming: init at 1.4.4 --- .../editors/vscode/extensions/default.nix | 2 ++ .../johnpapa.winteriscoming/default.nix | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/applications/editors/vscode/extensions/johnpapa.winteriscoming/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index da20ebd26ea0..fce9cce3f578 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2808,6 +2808,8 @@ let }; }; + johnpapa.winteriscoming = callPackage ./johnpapa.winteriscoming { }; + jgclark.vscode-todo-highlight = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-todo-highlight"; diff --git a/pkgs/applications/editors/vscode/extensions/johnpapa.winteriscoming/default.nix b/pkgs/applications/editors/vscode/extensions/johnpapa.winteriscoming/default.nix new file mode 100644 index 000000000000..33f9759fe054 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/johnpapa.winteriscoming/default.nix @@ -0,0 +1,17 @@ +{ lib, vscode-utils }: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "winteriscoming"; + publisher = "johnpapa"; + version = "1.4.4"; + hash = "sha256-47zCB7VDj+gYXUeblbNsWnGMJt4U4UMyqU1NYTmz2Jc="; + }; + meta = { + description = "Preferred dark/light themes by John Papa"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=johnpapa.winteriscoming"; + homepage = "https://github.com/johnpapa/vscode-winteriscoming"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.therobot2105 ]; + }; +} From 5aa6f0aa52a8de4acb80333dd3d40d6dbd6e4b25 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 7 Mar 2025 06:54:50 +0000 Subject: [PATCH 21/29] mold: 2.36.0 -> 2.37.0 Changes: https://github.com/rui314/mold/releases/tag/v2.37.0 --- pkgs/by-name/mo/mold/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/mold/package.nix b/pkgs/by-name/mo/mold/package.nix index d775a850e7f6..8ae3b9a4c67e 100644 --- a/pkgs/by-name/mo/mold/package.nix +++ b/pkgs/by-name/mo/mold/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "mold"; - version = "2.36.0"; + version = "2.37.0"; src = fetchFromGitHub { owner = "rui314"; repo = "mold"; rev = "v${version}"; - hash = "sha256-lJEQG2JPOwWMnYaOYBisusRNYKPLHtxtVtaRPhNl+fQ="; + hash = "sha256-Be5czR6ODN4NnJ0f3NYP2shLbawJHU/EU2aHqTBRKzE="; }; nativeBuildInputs = [ From 56ef85ba0c5caf58abbe6f94282d4943eabf18e9 Mon Sep 17 00:00:00 2001 From: oluceps Date: Fri, 7 Mar 2025 16:39:20 +0800 Subject: [PATCH 22/29] go-graft, gg: merge duplicated package --- pkgs/by-name/gg/gg/package.nix | 43 ---------------------------- pkgs/by-name/go/go-graft/package.nix | 31 ++++++++++++++++---- 2 files changed, 26 insertions(+), 48 deletions(-) delete mode 100644 pkgs/by-name/gg/gg/package.nix diff --git a/pkgs/by-name/gg/gg/package.nix b/pkgs/by-name/gg/gg/package.nix deleted file mode 100644 index f1a08af09d38..000000000000 --- a/pkgs/by-name/gg/gg/package.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, - installShellFiles, -}: -buildGoModule rec { - pname = "gg"; - version = "0.2.19"; - - src = fetchFromGitHub { - owner = "mzz2017"; - repo = "gg"; - rev = "v${version}"; - hash = "sha256-DXW0NtFYvcCX4CgMs5/5HPaO9f9eFtw401wmJdCbHPU="; - }; - - vendorHash = "sha256-fnM4ycqDyruCdCA1Cr4Ki48xeQiTG4l5dLVuAafEm14="; - - ldflags = [ - "-s" - "-w" - ]; - - nativeBuildInputs = [ installShellFiles ]; - - postInstall = '' - installShellCompletion --cmd gg \ - --bash completion/bash/gg \ - --fish completion/fish/gg.fish \ - --zsh completion/zsh/_gg - ''; - - meta = with lib; { - homepage = "https://github.com/mzz2017/gg"; - changelog = "https://github.com/mzz2017/gg/releases/tag/${src.rev}"; - description = "Command-line tool for one-click proxy in your research and development"; - license = licenses.agpl3Only; - mainProgram = "gg"; - maintainers = with maintainers; [ oluceps ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/go/go-graft/package.nix b/pkgs/by-name/go/go-graft/package.nix index 29de38c5a38a..96bd24aa40a3 100644 --- a/pkgs/by-name/go/go-graft/package.nix +++ b/pkgs/by-name/go/go-graft/package.nix @@ -1,4 +1,9 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ + lib, + fetchFromGitHub, + buildGoModule, + installShellFiles, +}: buildGoModule rec { pname = "go-graft"; @@ -8,20 +13,36 @@ buildGoModule rec { owner = "mzz2017"; repo = "gg"; rev = "v${version}"; - sha256 = "sha256-DXW0NtFYvcCX4CgMs5/5HPaO9f9eFtw401wmJdCbHPU="; + hash = "sha256-DXW0NtFYvcCX4CgMs5/5HPaO9f9eFtw401wmJdCbHPU="; }; env.CGO_ENABLED = 0; - ldflags = [ "-X github.com/mzz2017/gg/cmd.Version=${version}" "-s" "-w" ]; + ldflags = [ + "-X github.com/mzz2017/gg/cmd.Version=${version}" + "-s" + "-w" + ]; + vendorHash = "sha256-fnM4ycqDyruCdCA1Cr4Ki48xeQiTG4l5dLVuAafEm14="; - subPackages = [ "." ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd gg \ + --bash completion/bash/gg \ + --fish completion/fish/gg.fish \ + --zsh completion/zsh/_gg + ''; meta = with lib; { description = "Command-line tool for one-click proxy in your research and development without installing v2ray or anything else"; homepage = "https://github.com/mzz2017/gg"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ xyenon ]; + maintainers = with maintainers; [ + xyenon + oluceps + ]; mainProgram = "gg"; platforms = platforms.linux; }; From 7500cb1861202a8010bd51946a2f6b876687179d Mon Sep 17 00:00:00 2001 From: oluceps Date: Fri, 7 Mar 2025 16:43:05 +0800 Subject: [PATCH 23/29] go-graft: alias to gg --- pkgs/top-level/aliases.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 39160fd7420d..97990373f6fc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -529,6 +529,7 @@ mapAliases { gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11 gfortran7 = throw "gfortran7 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20 gfortran8 = throw "gfortran8 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20 + gg = go-graft; # Added 2025-03-07 ghostwriter = makePlasma5Throw "ghostwriter"; # Added 2023-03-18 git-codeowners = throw "'git-codeowners' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 gmp5 = throw "'gmp5' has been removed as it is unmaintained. Consider using 'gmp' instead"; # Added 2024-10-28 From b59729a0ae95c49ae352797acd166131df0225c2 Mon Sep 17 00:00:00 2001 From: oluceps Date: Fri, 7 Mar 2025 17:10:36 +0800 Subject: [PATCH 24/29] go-graft: clarify license to agpl3Only --- pkgs/by-name/go/go-graft/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/go/go-graft/package.nix b/pkgs/by-name/go/go-graft/package.nix index 96bd24aa40a3..d3aa64278372 100644 --- a/pkgs/by-name/go/go-graft/package.nix +++ b/pkgs/by-name/go/go-graft/package.nix @@ -38,7 +38,7 @@ buildGoModule rec { meta = with lib; { description = "Command-line tool for one-click proxy in your research and development without installing v2ray or anything else"; homepage = "https://github.com/mzz2017/gg"; - license = licenses.agpl3Plus; + license = licenses.agpl3Only; maintainers = with maintainers; [ xyenon oluceps From 2270999fd0b5b4542b9e549bf25a188bf1540a0e Mon Sep 17 00:00:00 2001 From: oluceps Date: Fri, 7 Mar 2025 17:11:15 +0800 Subject: [PATCH 25/29] go-graft: add changelog --- pkgs/by-name/go/go-graft/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/go/go-graft/package.nix b/pkgs/by-name/go/go-graft/package.nix index d3aa64278372..5f7d2d339cb2 100644 --- a/pkgs/by-name/go/go-graft/package.nix +++ b/pkgs/by-name/go/go-graft/package.nix @@ -37,6 +37,7 @@ buildGoModule rec { meta = with lib; { description = "Command-line tool for one-click proxy in your research and development without installing v2ray or anything else"; + changelog = "https://github.com/mzz2017/gg/releases/tag/${src.rev}"; homepage = "https://github.com/mzz2017/gg"; license = licenses.agpl3Only; maintainers = with maintainers; [ From 5aab35504452da13626059b1cafd461e3618f7f2 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Fri, 7 Mar 2025 12:55:50 +0530 Subject: [PATCH 26/29] zed-editor.fhs: add entrypoint zed-editor-fhs in all-packages Just like vscode-fhs. This will make it show up on `search.nixos.org`, and also cache it. Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com> --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6dc6c75d07c9..de103b4c0dae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15758,6 +15758,8 @@ with pkgs; autoconf = buildPackages.autoconf269; }; + zed-editor-fhs = zed-editor.fhs; + zgv = callPackage ../applications/graphics/zgv { # Enable the below line for terminal display. Note # that it requires sixel graphics compatible terminals like mlterm From 97891783561c8245d2a75c96aa09cd7479846032 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Fri, 7 Mar 2025 11:54:12 +0530 Subject: [PATCH 27/29] zed-editor: use finalAttrs.finalPackage whenever possible Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com> --- pkgs/by-name/ze/zed-editor/package.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 1be9aeb6ec90..0e0d55693488 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -27,7 +27,6 @@ gitUpdater, cargo-about, versionCheckHook, - zed-editor, buildFHSEnv, cargo-bundle, git, @@ -59,6 +58,7 @@ let # extension tooling without significant pain. fhs = { + zed-editor, additionalPkgs ? pkgs: [ ], }: buildFHSEnv { @@ -309,17 +309,22 @@ rustPlatform.buildRustPackage (finalAttrs: { rev-prefix = "v"; ignoredVersions = "(*-pre|0.999999.0|0.9999-temporary)"; }; - fhs = fhs { }; - fhsWithPackages = f: fhs { additionalPkgs = f; }; + fhs = fhs { zed-editor = finalAttrs.finalPackage; }; + fhsWithPackages = + f: + fhs { + zed-editor = finalAttrs.finalPackage; + additionalPkgs = f; + }; tests = { remoteServerVersion = testers.testVersion { - package = zed-editor.remote_server; + package = finalAttrs.finalPackage.remote_server; command = "zed-remote-server-stable-${finalAttrs.version} version"; }; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { - withGles = zed-editor.override { withGLES = true; }; + withGles = finalAttrs.finalPackage.override { withGLES = true; }; }; }; From a85d10330ef191be65377f75f026129cfc976e6d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Mar 2025 12:17:16 +0100 Subject: [PATCH 28/29] aapt: disable on aarch64-linux --- pkgs/by-name/aa/aapt/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/aa/aapt/package.nix b/pkgs/by-name/aa/aapt/package.nix index 84c2f156662e..c9944f844520 100644 --- a/pkgs/by-name/aa/aapt/package.nix +++ b/pkgs/by-name/aa/aapt/package.nix @@ -52,6 +52,10 @@ stdenvNoCC.mkDerivation rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ linsui ]; platforms = lib.platforms.unix; + badPlatforms = [ + # The linux executable only supports x86_64 + "aarch64-linux" + ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; } From 8f6fc1e620c7432d64a318630c2b59fbfbbfa35b Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 7 Mar 2025 12:25:44 +0100 Subject: [PATCH 29/29] rabbit: fix build, relax dependencies --- pkgs/by-name/ra/rabbit/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ra/rabbit/package.nix b/pkgs/by-name/ra/rabbit/package.nix index 4db22b625251..e13cc97328a0 100644 --- a/pkgs/by-name/ra/rabbit/package.nix +++ b/pkgs/by-name/ra/rabbit/package.nix @@ -18,6 +18,10 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "numpy" + "scikit-learn" + "scipy" + "tqdm" + "urllib3" ]; build-system = with python3.pkgs; [