From 5a28164394b7a62d69b89b89d28943fdfc895d86 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Oct 2025 12:59:17 +0200 Subject: [PATCH 01/30] python313Packages.django-auditlog: 3.2.1 -> 3.3.0 Diff: https://github.com/jazzband/django-auditlog/compare/v3.2.1...v3.3.0 Changelog: https://github.com/jazzband/django-auditlog/blob/v3.3.0/CHANGELOG.md --- pkgs/development/python-modules/django-auditlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-auditlog/default.nix b/pkgs/development/python-modules/django-auditlog/default.nix index 61b66c736806..ca505c3114e0 100644 --- a/pkgs/development/python-modules/django-auditlog/default.nix +++ b/pkgs/development/python-modules/django-auditlog/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "django-auditlog"; - version = "3.2.1"; + version = "3.3.0"; pyproject = true; src = fetchFromGitHub { owner = "jazzband"; repo = "django-auditlog"; tag = "v${version}"; - hash = "sha256-159p82PT3za3wp2XhekGxy+NYxLyQfAyUOyhDjyr2CI="; + hash = "sha256-ZOCLlS9SUY8W3jfA+51gy5yUchJr+rpBzH+Sx1G/kUM="; }; nativeBuildInputs = [ From f61fa80551954b10f9066d6e652c6d16eb558a2f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Oct 2025 13:00:49 +0200 Subject: [PATCH 02/30] python313Packages.django-auditlog: modernize --- pkgs/development/python-modules/django-auditlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-auditlog/default.nix b/pkgs/development/python-modules/django-auditlog/default.nix index ca505c3114e0..029100aad941 100644 --- a/pkgs/development/python-modules/django-auditlog/default.nix +++ b/pkgs/development/python-modules/django-auditlog/default.nix @@ -26,12 +26,12 @@ buildPythonPackage rec { hash = "sha256-ZOCLlS9SUY8W3jfA+51gy5yUchJr+rpBzH+Sx1G/kUM="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ django python-dateutil ]; From c9180a41fc79b8f45f54099e12597ac8ec7f21ac Mon Sep 17 00:00:00 2001 From: Haseeb Majid Date: Thu, 15 Jan 2026 08:31:23 +0000 Subject: [PATCH 03/30] templ: 0.3.960 -> 0.3.977 Update to version 0.3.977. included changelog: https://github.com/a-h/templ/releases/tag/v0.3.977 --- pkgs/by-name/te/templ/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/templ/package.nix b/pkgs/by-name/te/templ/package.nix index 8e7202fa05aa..e15296288815 100644 --- a/pkgs/by-name/te/templ/package.nix +++ b/pkgs/by-name/te/templ/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "templ"; - version = "0.3.960"; + version = "0.3.977"; src = fetchFromGitHub { owner = "a-h"; repo = "templ"; rev = "v${version}"; - hash = "sha256-GCbqaRC9KipGdGfgnGjJu04/rJlg+2lgi2vluP05EV4="; + hash = "sha256-KABEveISMy31B4kXoYY5IwFouoI4L9Jco5qMcnpeL2s="; }; vendorHash = "sha256-pVZjZCXT/xhBCMyZdR7kEmB9jqhTwRISFp63bQf6w5A="; From 8db1d486dd2468581901c3ad5812061785d52b4d Mon Sep 17 00:00:00 2001 From: Haseeb Majid Date: Thu, 15 Jan 2026 08:31:52 +0000 Subject: [PATCH 04/30] templ: enable auto-update with nix-update --- pkgs/by-name/te/templ/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/te/templ/package.nix b/pkgs/by-name/te/templ/package.nix index e15296288815..e6f7970c4567 100644 --- a/pkgs/by-name/te/templ/package.nix +++ b/pkgs/by-name/te/templ/package.nix @@ -2,6 +2,7 @@ lib, buildGoModule, fetchFromGitHub, + nix-update-script, }: buildGoModule rec { @@ -27,6 +28,8 @@ buildGoModule rec { "-extldflags -static" ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Language for writing HTML user interfaces in Go"; homepage = "https://github.com/a-h/templ"; From ae62462a02246f7dc1e8b1974304e0b09dcded48 Mon Sep 17 00:00:00 2001 From: Ryan Grant Date: Thu, 22 Jan 2026 19:43:49 -0800 Subject: [PATCH 05/30] maintainers: add theconcierge --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 68df7f46738a..f3ae7970766b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -26189,6 +26189,12 @@ githubId = 18369995; keys = [ { fingerprint = "3D8C A43C FBA2 5D28 0196 19F0 AB11 0475 B417 291D"; } ]; }; + theconcierge = { + name = "TheConcierge"; + email = "therealconcierge@proton.me"; + github = "TheConcierge"; + githubId = 10949861; + }; thedavidmeister = { email = "thedavidmeister@gmail.com"; github = "thedavidmeister"; From dc3b38e754b05f731d00a9c8236d89ff96bbddbc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Jan 2026 19:18:53 +0000 Subject: [PATCH 06/30] python3Packages.xclim: 0.59.1 -> 0.60.0 --- pkgs/development/python-modules/xclim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xclim/default.nix b/pkgs/development/python-modules/xclim/default.nix index aa6ba7aecd2e..f0f88a744398 100644 --- a/pkgs/development/python-modules/xclim/default.nix +++ b/pkgs/development/python-modules/xclim/default.nix @@ -35,14 +35,14 @@ }: buildPythonPackage rec { pname = "xclim"; - version = "0.59.1"; + version = "0.60.0"; pyproject = true; src = fetchFromGitHub { owner = "Ouranosinc"; repo = "xclim"; tag = "v${version}"; - hash = "sha256-n9HJoIHLyLWxrgCuDZDQ9dcW7frgEA/LoYqnTEBLqD8="; + hash = "sha256-dVa4/nvMg2iBW7j3eePZFggedLJXLF/4oU0k7zIp8d0="; }; build-system = [ From ba38bc4e0a5fc8ad654d70eff2e2791c7f0fbd67 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Mon, 26 Jan 2026 05:44:08 +0100 Subject: [PATCH 07/30] various: use stdenv.mkDerivation instead of qt5.mkDerivation this shouldn't create any rebuilds --- pkgs/applications/audio/lmms/default.nix | 6 ++++-- pkgs/applications/audio/sfxr-qt/default.nix | 6 ++++-- .../editors/notepadqq/default.nix | 8 +++++--- pkgs/applications/editors/okteta/default.nix | 6 ++++-- .../emulators/yabause/default.nix | 6 ++++-- .../graphics/awesomebump/default.nix | 13 +++++++++---- .../unigine-superposition/default.nix | 1 - .../applications/misc/cask-server/default.nix | 6 ++++-- pkgs/applications/misc/confclerk/default.nix | 11 ++++++++--- pkgs/applications/misc/coolreader/default.nix | 5 +++-- pkgs/applications/misc/cura/default.nix | 6 ++++-- pkgs/applications/misc/ddcui/default.nix | 6 ++++-- pkgs/applications/misc/diffpdf/default.nix | 5 +++-- pkgs/applications/misc/evtest-qt/default.nix | 10 +++++++--- .../misc/googleearth-pro/default.nix | 5 +++-- pkgs/applications/misc/heimer/default.nix | 6 ++++-- pkgs/applications/misc/k4dirstat/default.nix | 15 ++++++++++----- pkgs/applications/misc/klayout/default.nix | 7 ++++--- .../applications/misc/ksmoothdock/default.nix | 6 ++++-- pkgs/applications/misc/lyx/default.nix | 6 ++++-- .../misc/maliit-framework/default.nix | 6 ++++-- .../misc/maliit-keyboard/default.nix | 6 ++++-- pkgs/applications/misc/michabo/default.nix | 6 ++++-- pkgs/applications/misc/moolticute/default.nix | 8 +++++--- pkgs/applications/misc/nixnote2/default.nix | 14 +++++++++----- pkgs/applications/misc/openambit/default.nix | 6 ++++-- pkgs/applications/misc/openbrf/default.nix | 13 ++++++++----- pkgs/applications/misc/opentx/default.nix | 10 ++++++---- pkgs/applications/misc/pure-maps/default.nix | 6 ++++-- pkgs/applications/misc/qlcplus/default.nix | 8 +++++--- pkgs/applications/misc/qsudo/default.nix | 6 ++++-- .../misc/qsyncthingtray/default.nix | 13 ++++++++----- .../misc/qt-box-editor/default.nix | 14 +++++++++----- pkgs/applications/misc/rescuetime/default.nix | 9 ++++++--- pkgs/applications/misc/rsibreak/default.nix | 6 ++++-- pkgs/applications/misc/twmn/default.nix | 8 +++++--- .../networking/datovka/default.nix | 14 +++++++++----- .../instant-messengers/psi-plus/default.nix | 8 +++++--- .../instant-messengers/psi/default.nix | 6 ++++-- .../instant-messengers/ripcord/default.nix | 6 ++++-- .../instant-messengers/tensor/default.nix | 12 ++++++++---- .../instant-messengers/twinkle/default.nix | 6 ++++-- .../networking/irc/kvirc/default.nix | 6 ++++-- .../networking/irc/quassel/default.nix | 7 ++++--- .../networking/ostinato/default.nix | 8 +++++--- .../networking/p2p/eiskaltdcpp/default.nix | 5 +++-- .../networking/p2p/retroshare/default.nix | 6 ++++-- .../networking/remote/teamviewer/default.nix | 4 ++-- pkgs/applications/office/mytetra/default.nix | 6 ++++-- pkgs/applications/office/qpdfview/default.nix | 10 ++++++---- pkgs/applications/office/semantik/default.nix | 6 ++++-- pkgs/applications/radio/pothos/default.nix | 5 +++-- pkgs/applications/radio/qsstv/default.nix | 6 ++++-- .../science/electronics/eagle/eagle.nix | 6 ++++-- .../electronics/openhantek6022/default.nix | 6 ++++-- .../science/physics/xflr5/default.nix | 12 ++++++++---- .../science/robotics/apmplanner2/default.nix | 12 ++++++++---- pkgs/applications/search/recoll/default.nix | 7 ++++--- .../video/anilibria-winmaclinux/default.nix | 5 +++-- pkgs/applications/video/clipgrab/default.nix | 6 ++++-- pkgs/applications/video/minitube/default.nix | 10 ++++++---- pkgs/applications/video/mythtv/default.nix | 6 ++++-- pkgs/applications/video/qarte/default.nix | 7 +++++-- .../video/qmediathekview/default.nix | 5 +++-- pkgs/applications/video/smtube/default.nix | 10 +++++++--- .../virtualization/qtemu/default.nix | 6 ++++-- pkgs/by-name/co/cockatrice/package.nix | 4 +++- pkgs/by-name/pe/pentobi/package.nix | 4 +++- pkgs/by-name/po/pokerth/package.nix | 4 +++- pkgs/by-name/va/vapoursynth/editor.nix | 10 +++++++--- .../interpreters/supercollider/default.nix | 6 +++--- pkgs/development/libraries/g2o/default.nix | 9 ++++++--- pkgs/development/libraries/herqq/default.nix | 11 ++++++++--- .../libraries/libosmscout/default.nix | 6 ++++-- .../nemo-qml-plugin-dbus/default.nix | 10 +++++++--- .../analysis/massif-visualizer/default.nix | 6 ++++-- pkgs/development/tools/boomerang/default.nix | 6 ++++-- pkgs/development/tools/misc/gede/default.nix | 6 ++++-- .../tools/ofono-phonesim/default.nix | 6 ++++-- pkgs/development/tools/tora/default.nix | 8 +++++--- pkgs/os-specific/linux/wpa_supplicant/gui.nix | 6 ++++-- pkgs/servers/pulseaudio/qpaeq.nix | 7 +++++-- pkgs/tools/filesystems/kio-fuse/default.nix | 6 ++++-- pkgs/tools/graphics/gnuplot/default.nix | 9 ++++++--- pkgs/tools/graphics/pfstools/default.nix | 5 +++-- pkgs/tools/graphics/rocket/default.nix | 10 +++++++--- pkgs/tools/misc/antimicrox/default.nix | 10 ++++++---- .../misc/coreboot-configurator/default.nix | 5 +++-- pkgs/tools/misc/dialogbox/default.nix | 5 +++-- pkgs/tools/misc/kronometer/default.nix | 6 ++++-- pkgs/tools/misc/qflipper/default.nix | 4 ++-- pkgs/tools/misc/qjoypad/default.nix | 8 +++++--- pkgs/tools/misc/radeon-profile/default.nix | 12 ++++++++---- pkgs/tools/misc/ultrastar-creator/default.nix | 6 ++++-- pkgs/tools/misc/ultrastar-manager/default.nix | 19 ++++++++++++++----- .../security/chrome-token-signing/default.nix | 12 ++++++++---- pkgs/tools/security/kwalletcli/default.nix | 6 ++++-- pkgs/tools/system/testdisk/default.nix | 9 ++++++--- pkgs/tools/text/glogg/default.nix | 9 ++++++--- pkgs/tools/typesetting/tikzit/default.nix | 6 ++++-- 100 files changed, 493 insertions(+), 261 deletions(-) diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 5031a40afc7a..409a5b768ba3 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -1,9 +1,11 @@ { lib, + stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, + wrapQtAppsHook, alsa-lib ? null, carla ? null, fftwFloat, @@ -22,10 +24,9 @@ qtx11extras, qttools, SDL ? null, - mkDerivation, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "lmms"; version = "1.2.2"; @@ -41,6 +42,7 @@ mkDerivation rec { cmake qttools pkg-config + wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/audio/sfxr-qt/default.nix b/pkgs/applications/audio/sfxr-qt/default.nix index d7662d7e07fd..f94171ef892b 100644 --- a/pkgs/applications/audio/sfxr-qt/default.nix +++ b/pkgs/applications/audio/sfxr-qt/default.nix @@ -1,9 +1,10 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, cmake, extra-cmake-modules, + wrapQtAppsHook, qtbase, qtquickcontrols2, SDL, @@ -13,7 +14,7 @@ nixosTests, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "sfxr-qt"; version = "1.5.1"; @@ -35,6 +36,7 @@ mkDerivation rec { setuptools ] )) + wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/editors/notepadqq/default.nix b/pkgs/applications/editors/notepadqq/default.nix index 6f3d1917ef07..5e40331bf42f 100644 --- a/pkgs/applications/editors/notepadqq/default.nix +++ b/pkgs/applications/editors/notepadqq/default.nix @@ -1,18 +1,19 @@ { - mkDerivation, lib, + stdenv, fetchFromGitHub, pkg-config, which, + qttools, + wrapQtAppsHook, libuchardet, qtbase, qtsvg, - qttools, qtwebengine, qtwebsockets, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "notepadqq"; # shipping a beta build as there's no proper release which supports qtwebengine version = "2.0.0-beta"; @@ -34,6 +35,7 @@ mkDerivation rec { pkg-config which qttools + wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index c66fac69c6bf..64236e708a55 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -1,9 +1,10 @@ { - mkDerivation, lib, + stdenv, fetchurl, extra-cmake-modules, kdoctools, + wrapQtAppsHook, qtscript, kconfig, kinit, @@ -17,7 +18,7 @@ shared-mime-info, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "okteta"; version = "0.26.24"; @@ -30,6 +31,7 @@ mkDerivation rec { qtscript extra-cmake-modules kdoctools + wrapQtAppsHook ]; buildInputs = [ shared-mime-info ]; diff --git a/pkgs/applications/emulators/yabause/default.nix b/pkgs/applications/emulators/yabause/default.nix index e743e4a5c9bf..7a41fc71cf02 100644 --- a/pkgs/applications/emulators/yabause/default.nix +++ b/pkgs/applications/emulators/yabause/default.nix @@ -1,9 +1,10 @@ { - mkDerivation, lib, + stdenv, fetchurl, cmake, pkg-config, + wrapQtAppsHook, qtbase, qt5, libGLU, @@ -13,7 +14,7 @@ SDL2 ? null, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "yabause"; version = "0.9.15"; @@ -25,6 +26,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config + wrapQtAppsHook ]; buildInputs = [ qtbase diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix index 78028135186d..c789ef1ddeee 100644 --- a/pkgs/applications/graphics/awesomebump/default.nix +++ b/pkgs/applications/graphics/awesomebump/default.nix @@ -1,6 +1,6 @@ { - mkDerivation, lib, + stdenv, fetchgit, qtbase, qmake, @@ -8,6 +8,7 @@ flex, bison, qtdeclarative, + wrapQtAppsHook, }: let @@ -20,7 +21,7 @@ let fetchSubmodules = true; }; - qtnproperty = mkDerivation { + qtnproperty = stdenv.mkDerivation { name = "qtnproperty"; inherit src; sourceRoot = "${src.name}/Sources/utils/QtnProperty"; @@ -34,13 +35,14 @@ let qmake flex bison + wrapQtAppsHook ]; postInstall = '' install -D bin-linux/QtnPEG $out/bin/QtnPEG ''; }; in -mkDerivation { +stdenv.mkDerivation { pname = "awesomebump"; inherit version; @@ -52,7 +54,10 @@ mkDerivation { qtdeclarative ]; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ + qmake + wrapQtAppsHook + ]; preBuild = '' ln -sf ${qtnproperty}/bin/QtnPEG Sources/utils/QtnProperty/bin-linux/QtnPEG diff --git a/pkgs/applications/graphics/unigine-superposition/default.nix b/pkgs/applications/graphics/unigine-superposition/default.nix index c1bd6e8c12f7..4f848d725a1a 100644 --- a/pkgs/applications/graphics/unigine-superposition/default.nix +++ b/pkgs/applications/graphics/unigine-superposition/default.nix @@ -20,7 +20,6 @@ libXrender, autoPatchelfHook, makeWrapper, - mkDerivation, xkeyboard_config, fetchurl, buildFHSEnv, diff --git a/pkgs/applications/misc/cask-server/default.nix b/pkgs/applications/misc/cask-server/default.nix index b642494ea28d..309a07d7cb2b 100644 --- a/pkgs/applications/misc/cask-server/default.nix +++ b/pkgs/applications/misc/cask-server/default.nix @@ -1,12 +1,13 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, cmake, extra-cmake-modules, + wrapQtAppsHook, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "cask-server"; version = "0.6.0"; @@ -20,6 +21,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules + wrapQtAppsHook ]; meta = { diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/applications/misc/confclerk/default.nix index db5b552b6451..7c7750203830 100644 --- a/pkgs/applications/misc/confclerk/default.nix +++ b/pkgs/applications/misc/confclerk/default.nix @@ -1,12 +1,13 @@ { lib, - mkDerivation, + stdenv, fetchurl, qtbase, qmake, + wrapQtAppsHook, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "confclerk"; version = "0.7.2"; @@ -16,7 +17,11 @@ mkDerivation rec { }; buildInputs = [ qtbase ]; - nativeBuildInputs = [ qmake ]; + + nativeBuildInputs = [ + qmake + wrapQtAppsHook + ]; postInstall = '' mkdir -p $out/bin diff --git a/pkgs/applications/misc/coolreader/default.nix b/pkgs/applications/misc/coolreader/default.nix index 537d4dc9e56d..39c9cddd78d9 100644 --- a/pkgs/applications/misc/coolreader/default.nix +++ b/pkgs/applications/misc/coolreader/default.nix @@ -1,9 +1,9 @@ { stdenv, - mkDerivation, fetchFromGitHub, cmake, pkg-config, + wrapQtAppsHook, lib, qttools, fribidi, @@ -11,7 +11,7 @@ zstd, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "coolreader"; version = "3.2.58"; @@ -27,6 +27,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config + wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index 96417baaac4d..2c61f94510ec 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -1,9 +1,10 @@ { - mkDerivation, lib, + stdenv, fetchFromGitHub, cmake, python3, + wrapQtAppsHook, qtbase, qtquickcontrols2, qtgraphicaleffects, @@ -11,7 +12,7 @@ plugins ? [ ], }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "cura"; version = "4.13.1"; @@ -52,6 +53,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake python3.pkgs.wrapPython + wrapQtAppsHook ]; cmakeFlags = [ diff --git a/pkgs/applications/misc/ddcui/default.nix b/pkgs/applications/misc/ddcui/default.nix index a7768e99dd07..4b247360196e 100644 --- a/pkgs/applications/misc/ddcui/default.nix +++ b/pkgs/applications/misc/ddcui/default.nix @@ -1,15 +1,16 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, cmake, pkg-config, + wrapQtAppsHook, qtbase, qttools, ddcutil, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "ddcui"; version = "0.6.0"; @@ -25,6 +26,7 @@ mkDerivation rec { # file is not currently written to support PREFIX installations. cmake pkg-config + wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix index 7700edcb4f93..6ccea371e6e3 100644 --- a/pkgs/applications/misc/diffpdf/default.nix +++ b/pkgs/applications/misc/diffpdf/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, - mkDerivation, fetchurl, fetchpatch, qmake, qttools, + wrapQtAppsHook, qtbase, poppler, }: -mkDerivation rec { +stdenv.mkDerivation rec { version = "2.1.3"; pname = "diffpdf"; @@ -30,6 +30,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake qttools + wrapQtAppsHook ]; buildInputs = [ qtbase diff --git a/pkgs/applications/misc/evtest-qt/default.nix b/pkgs/applications/misc/evtest-qt/default.nix index bd009007d3cc..4067d0d5d311 100644 --- a/pkgs/applications/misc/evtest-qt/default.nix +++ b/pkgs/applications/misc/evtest-qt/default.nix @@ -1,14 +1,15 @@ { - mkDerivation, lib, + stdenv, qtbase, cmake, + wrapQtAppsHook, fetchFromGitHub, fetchpatch, unstableGitUpdater, }: -mkDerivation { +stdenv.mkDerivation { pname = "evtest-qt"; version = "0.2.0-unstable-2023-09-13"; @@ -30,7 +31,10 @@ mkDerivation { }) ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + wrapQtAppsHook + ]; buildInputs = [ qtbase ]; diff --git a/pkgs/applications/misc/googleearth-pro/default.nix b/pkgs/applications/misc/googleearth-pro/default.nix index 5684d80f6e47..a2f2b7a3385f 100644 --- a/pkgs/applications/misc/googleearth-pro/default.nix +++ b/pkgs/applications/misc/googleearth-pro/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, - mkDerivation, fetchurl, freetype, glib, @@ -30,6 +29,7 @@ xkeyboardconfig, autoPatchelfHook, + wrapQtAppsHook, }: let arch = @@ -38,7 +38,7 @@ let else throw "Unsupported system ${stdenv.hostPlatform.system} "; in -mkDerivation rec { +stdenv.mkDerivation rec { pname = "googleearth-pro"; version = "7.3.6.10201"; @@ -51,6 +51,7 @@ mkDerivation rec { dpkg makeWrapper autoPatchelfHook + wrapQtAppsHook ]; propagatedBuildInputs = [ xkeyboardconfig ]; buildInputs = [ diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index b4d31298c87c..d6545bd6c645 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -1,14 +1,15 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, fetchpatch, cmake, + wrapQtAppsHook, qttools, qtbase, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "heimer"; version = "4.5.0"; @@ -35,6 +36,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake + wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/misc/k4dirstat/default.nix b/pkgs/applications/misc/k4dirstat/default.nix index b9377ea69e4d..53b4d511b73f 100644 --- a/pkgs/applications/misc/k4dirstat/default.nix +++ b/pkgs/applications/misc/k4dirstat/default.nix @@ -1,17 +1,18 @@ { - mkDerivation, - extra-cmake-modules, + lib, + stdenv, fetchFromGitHub, + extra-cmake-modules, + wrapQtAppsHook, kiconthemes, kio, kjobwidgets, kxmlgui, - lib, testers, k4dirstat, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "k4dirstat"; version = "3.4.3"; @@ -22,7 +23,11 @@ mkDerivation rec { hash = "sha256-TXMUtiPS7qRLm6cCy2ZntYrcNJ0fn6X+3o3P5u7oo08="; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + extra-cmake-modules + wrapQtAppsHook + ]; + buildInputs = [ kiconthemes kio diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 77928cdc2580..51ebe629d37b 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -1,9 +1,10 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, python3, ruby, + wrapQtAppsHook, qtbase, qtmultimedia, qttools, @@ -11,10 +12,9 @@ which, perl, libgit2, - stdenv, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "klayout"; version = "0.30.4-1"; @@ -35,6 +35,7 @@ mkDerivation rec { perl python3 ruby + wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/misc/ksmoothdock/default.nix b/pkgs/applications/misc/ksmoothdock/default.nix index e5665632ed04..b751b4a0d67e 100644 --- a/pkgs/applications/misc/ksmoothdock/default.nix +++ b/pkgs/applications/misc/ksmoothdock/default.nix @@ -1,14 +1,15 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, cmake, extra-cmake-modules, + wrapQtAppsHook, kactivities, qtbase, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "KSmoothDock"; version = "6.3"; @@ -28,6 +29,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules + wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index fb30c9daea60..76f3e6059e40 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -1,18 +1,19 @@ { fetchurl, lib, - mkDerivation, + stdenv, pkg-config, python3, file, bc, qtbase, + wrapQtAppsHook, qtsvg, hunspell, makeWrapper, # , mythes, boost }: -mkDerivation rec { +stdenv.mkDerivation rec { version = "2.4.4"; pname = "lyx"; @@ -27,6 +28,7 @@ mkDerivation rec { makeWrapper python3 qtbase + wrapQtAppsHook ]; buildInputs = [ qtbase diff --git a/pkgs/applications/misc/maliit-framework/default.nix b/pkgs/applications/misc/maliit-framework/default.nix index 6bcc95825548..0394a4650254 100644 --- a/pkgs/applications/misc/maliit-framework/default.nix +++ b/pkgs/applications/misc/maliit-framework/default.nix @@ -1,6 +1,6 @@ { - mkDerivation, lib, + stdenv, fetchFromGitHub, fetchpatch, @@ -24,9 +24,10 @@ pkg-config, wayland-protocols, wayland-scanner, + wrapQtAppsHook, }: -mkDerivation { +stdenv.mkDerivation { pname = "maliit-framework"; version = "2.3.0-unstable-2024-06-24"; @@ -59,6 +60,7 @@ mkDerivation { pkg-config wayland-protocols wayland-scanner + wrapQtAppsHook ]; cmakeFlags = [ diff --git a/pkgs/applications/misc/maliit-keyboard/default.nix b/pkgs/applications/misc/maliit-keyboard/default.nix index c5a5405a967a..822aa5c2e773 100644 --- a/pkgs/applications/misc/maliit-keyboard/default.nix +++ b/pkgs/applications/misc/maliit-keyboard/default.nix @@ -1,6 +1,6 @@ { - mkDerivation, lib, + stdenv, fetchFromGitHub, anthy, @@ -16,9 +16,10 @@ cmake, pkg-config, wrapGAppsHook3, + wrapQtAppsHook, }: -mkDerivation { +stdenv.mkDerivation { pname = "maliit-keyboard"; version = "2.3.1-unstable-2024-09-04"; @@ -55,6 +56,7 @@ mkDerivation { cmake pkg-config wrapGAppsHook3 + wrapQtAppsHook ]; postInstall = '' diff --git a/pkgs/applications/misc/michabo/default.nix b/pkgs/applications/misc/michabo/default.nix index b4469a072f54..482cace47eb3 100644 --- a/pkgs/applications/misc/michabo/default.nix +++ b/pkgs/applications/misc/michabo/default.nix @@ -1,9 +1,10 @@ { lib, - mkDerivation, + stdenv, makeDesktopItem, fetchFromGitLab, qmake, + wrapQtAppsHook, # qt qtbase, qtwebsockets, @@ -17,7 +18,7 @@ let }; in -mkDerivation rec { +stdenv.mkDerivation rec { pname = "michabo"; version = "0.1"; @@ -31,6 +32,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake + wrapQtAppsHook ]; buildInputs = [ qtbase diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix index 8ee9daf1b7f8..fe87ff3a1429 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/pkgs/applications/misc/moolticute/default.nix @@ -1,16 +1,17 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, libusb1, pkg-config, qmake, - qtbase, qttools, + wrapQtAppsHook, + qtbase, qtwebsockets, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "moolticute"; version = "1.03.0"; @@ -30,6 +31,7 @@ mkDerivation rec { pkg-config qmake qttools + wrapQtAppsHook ]; buildInputs = [ libusb1 diff --git a/pkgs/applications/misc/nixnote2/default.nix b/pkgs/applications/misc/nixnote2/default.nix index b9f92e3f3634..7da021150311 100644 --- a/pkgs/applications/misc/nixnote2/default.nix +++ b/pkgs/applications/misc/nixnote2/default.nix @@ -1,17 +1,18 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, + qmake, + wrapQtAppsHook, boost, qtbase, qtwebkit, poppler, - qmake, hunspell, html-tidy, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "nixnote2"; version = "2.0.2"; @@ -22,6 +23,11 @@ mkDerivation rec { sha256 = "0cfq95mxvcgby66r61gclm1a2c6zck5aln04xmg2q8kg6p9d31fr"; }; + nativeBuildInputs = [ + qmake + wrapQtAppsHook + ]; + buildInputs = [ boost qtbase @@ -30,8 +36,6 @@ mkDerivation rec { hunspell ]; - nativeBuildInputs = [ qmake ]; - postPatch = '' # Fix location of poppler-qt5.h for f in threads/indexrunner.cpp html/noteformatter.cpp utilities/noteindexer.cpp gui/plugins/popplerviewer.h gui/plugins/pluginfactory.h gui/plugins/popplerviewer.cpp ; do diff --git a/pkgs/applications/misc/openambit/default.nix b/pkgs/applications/misc/openambit/default.nix index 358a7a00a151..0c8f6c9cfcde 100644 --- a/pkgs/applications/misc/openambit/default.nix +++ b/pkgs/applications/misc/openambit/default.nix @@ -1,17 +1,18 @@ { + stdenv, cmake, fetchFromGitHub, fetchpatch, lib, libusb1, - mkDerivation, python3, qtbase, qttools, + wrapQtAppsHook, udev, zlib, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "openambit"; version = "0.5"; @@ -49,6 +50,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake qttools + wrapQtAppsHook ]; buildInputs = [ libusb1 diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix index 8a7792b8e85f..e131ff45ce97 100644 --- a/pkgs/applications/misc/openbrf/default.nix +++ b/pkgs/applications/misc/openbrf/default.nix @@ -1,19 +1,19 @@ { - mkDerivation, lib, stdenv, fetchFromGitHub, fetchpatch, + qmake, + wrapQtAppsHook, qtbase, vcg, glew, - qmake, libGLU, eigen, libGL, }: -mkDerivation { +stdenv.mkDerivation { pname = "openbrf"; version = "unstable-2016-01-09"; @@ -33,6 +33,11 @@ mkDerivation { }) ]; + nativeBuildInputs = [ + qmake + wrapQtAppsHook + ]; + buildInputs = [ qtbase vcg @@ -40,8 +45,6 @@ mkDerivation { eigen ]; - nativeBuildInputs = [ qmake ]; - qmakeFlags = [ "openBrf.pro" ]; env.NIX_CFLAGS_COMPILE = "-isystem ${lib.getDev eigen}/include/eigen3"; diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix index 0abe97282fad..147a72df6c71 100644 --- a/pkgs/applications/misc/opentx/default.nix +++ b/pkgs/applications/misc/opentx/default.nix @@ -1,21 +1,22 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, cmake, gcc-arm-embedded, python3Packages, + qttools, + udevCheckHook, + wrapQtAppsHook, qtbase, qtmultimedia, - qttools, SDL, gtest, dfu-util, avrdude, - udevCheckHook, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "opentx"; version = "2.3.15"; @@ -36,6 +37,7 @@ mkDerivation rec { python3Packages.pillow qttools udevCheckHook + wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/misc/pure-maps/default.nix b/pkgs/applications/misc/pure-maps/default.nix index 4da7653baac7..d71d1d633cc0 100644 --- a/pkgs/applications/misc/pure-maps/default.nix +++ b/pkgs/applications/misc/pure-maps/default.nix @@ -1,9 +1,10 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, cmake, qttools, + wrapQtAppsHook, kirigami2, qtquickcontrols2, qtlocation, @@ -15,7 +16,7 @@ pyotherside, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "pure-maps"; version = "3.4.2"; @@ -32,6 +33,7 @@ mkDerivation rec { python3 qttools python3.pkgs.wrapPython + wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix index decbd649ef74..6bb2506b6ea4 100644 --- a/pkgs/applications/misc/qlcplus/default.nix +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -1,9 +1,11 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, qmake, pkg-config, + udevCheckHook, + wrapQtAppsHook, udev, qtmultimedia, qtscript, @@ -15,10 +17,9 @@ libusb-compat-0_1, libsndfile, libmad, - udevCheckHook, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qlcplus"; version = "5.0.0"; @@ -33,6 +34,7 @@ mkDerivation rec { qmake pkg-config udevCheckHook + wrapQtAppsHook ]; buildInputs = [ udev diff --git a/pkgs/applications/misc/qsudo/default.nix b/pkgs/applications/misc/qsudo/default.nix index 9364d7b3020a..460007221caf 100644 --- a/pkgs/applications/misc/qsudo/default.nix +++ b/pkgs/applications/misc/qsudo/default.nix @@ -1,13 +1,14 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, qmake, + wrapQtAppsHook, qtbase, sudo, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qsudo"; version = "2020.03.27"; @@ -22,6 +23,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake + wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index dd844ae36546..dfbf0429082f 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -1,20 +1,20 @@ { - mkDerivation, stdenv, lib, fetchFromGitHub, fetchpatch, + cmake, + wrapQtAppsHook, procps, qtbase, qtwebengine, qtwebkit, - cmake, syncthing, preferQWebView ? false, preferNative ? true, }: -mkDerivation rec { +stdenv.mkDerivation rec { version = "0.5.8"; pname = "qsyncthingtray"; @@ -25,14 +25,17 @@ mkDerivation rec { sha256 = "1n9g4j7qznvg9zl6x163pi9f7wsc3x6q76i33psnm7x2v1i22x5w"; }; + nativeBuildInputs = [ + cmake + wrapQtAppsHook + ]; + buildInputs = [ qtbase qtwebengine ] ++ lib.optional preferQWebView qtwebkit; - nativeBuildInputs = [ cmake ]; - cmakeFlags = [ ] ++ lib.optional preferQWebView "-DQST_BUILD_WEBKIT=1" diff --git a/pkgs/applications/misc/qt-box-editor/default.nix b/pkgs/applications/misc/qt-box-editor/default.nix index 03777a0373f0..77192ff48c7e 100644 --- a/pkgs/applications/misc/qt-box-editor/default.nix +++ b/pkgs/applications/misc/qt-box-editor/default.nix @@ -1,15 +1,16 @@ { - mkDerivation, lib, + stdenv, fetchFromGitHub, + qmake, + wrapQtAppsHook, qtbase, qtsvg, - qmake, leptonica, tesseract4, }: -mkDerivation { +stdenv.mkDerivation { pname = "qt-box-editor"; version = "unstable-2019-07-14"; @@ -20,6 +21,11 @@ mkDerivation { hash = "sha256-3dWnAu0CLO3atjbC1zJEnL3vzsIEecDDDhW3INMfCv4="; }; + nativeBuildInputs = [ + qmake + wrapQtAppsHook + ]; + buildInputs = [ qtbase qtsvg @@ -27,8 +33,6 @@ mkDerivation { tesseract4 ]; - nativeBuildInputs = [ qmake ]; - # https://github.com/zdenop/qt-box-editor/issues/87 postPatch = '' sed -i '/allheaders.h/a#include ' src/TessTools.h diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index 7e45f6203232..bf49a24c4c04 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -3,12 +3,12 @@ lib, fetchurl, dpkg, + wrapQtAppsHook, patchelf, qt5, libXtst, libXext, libX11, - mkDerivation, libXScrnSaver, writeScript, common-updater-scripts, @@ -32,12 +32,15 @@ let sha256 = "09ng0yal66d533vzfv27k9l2va03rqbqmsni43qi3hgx7w9wx5ii"; }; in -mkDerivation rec { +stdenv.mkDerivation rec { # https://www.rescuetime.com/updates/linux_release_notes.html inherit version; pname = "rescuetime"; inherit src; - nativeBuildInputs = [ dpkg ]; + nativeBuildInputs = [ + dpkg + wrapQtAppsHook + ]; # avoid https://github.com/NixOS/patchelf/issues/99 dontStrip = true; diff --git a/pkgs/applications/misc/rsibreak/default.nix b/pkgs/applications/misc/rsibreak/default.nix index a001a100a75b..eaf712c54871 100644 --- a/pkgs/applications/misc/rsibreak/default.nix +++ b/pkgs/applications/misc/rsibreak/default.nix @@ -1,9 +1,10 @@ { - mkDerivation, fetchurl, lib, + stdenv, extra-cmake-modules, kdoctools, + wrapQtAppsHook, knotifyconfig, kidletime, kwindowsystem, @@ -11,7 +12,7 @@ kcrash, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "rsibreak"; version = "0.12.13"; @@ -23,6 +24,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules kdoctools + wrapQtAppsHook ]; propagatedBuildInputs = [ knotifyconfig diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix index 4f84bf31bc34..e3eb09fce7d7 100644 --- a/pkgs/applications/misc/twmn/default.nix +++ b/pkgs/applications/misc/twmn/default.nix @@ -1,14 +1,15 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, - qtbase, qmake, pkg-config, + wrapQtAppsHook, + qtbase, boost, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "twmn"; version = "2025_10_23"; @@ -22,6 +23,7 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config qmake + wrapQtAppsHook ]; buildInputs = [ qtbase diff --git a/pkgs/applications/networking/datovka/default.nix b/pkgs/applications/networking/datovka/default.nix index 40a2e4d17292..067e29a5770a 100644 --- a/pkgs/applications/networking/datovka/default.nix +++ b/pkgs/applications/networking/datovka/default.nix @@ -1,17 +1,18 @@ { lib, - mkDerivation, + stdenv, fetchurl, + pkg-config, + wrapQtAppsHook, libxml2, libdatovka, qmake, qtbase, qtwebsockets, qtsvg, - pkg-config, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "datovka"; version = "4.26.0"; @@ -20,6 +21,11 @@ mkDerivation rec { sha256 = "sha256-pEdjh/c4vhirj2R9bYDdi2FL7N9x67kTOyfXiJDzMKE="; }; + nativeBuildInputs = [ + pkg-config + wrapQtAppsHook + ]; + buildInputs = [ libdatovka qmake @@ -29,8 +35,6 @@ mkDerivation rec { qtwebsockets ]; - nativeBuildInputs = [ pkg-config ]; - meta = { description = "Client application for operating Czech government-provided Databox infomation system"; homepage = "https://www.datovka.cz/"; diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index 86d1f2f7f260..03670bebed13 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -1,8 +1,9 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, cmake, + wrapQtAppsHook, qtbase, qtmultimedia, qtimageformats, @@ -43,7 +44,7 @@ assert builtins.elem (lib.toLower chatType) [ assert enablePsiMedia -> enablePlugins; -mkDerivation rec { +stdenv.mkDerivation rec { pname = "psi-plus"; version = "1.5.2115"; @@ -66,7 +67,8 @@ mkDerivation rec { ] ++ lib.optionals enablePsiMedia [ pkg-config - ]; + ] + ++ [ wrapQtAppsHook ]; buildInputs = [ qtbase diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index 9b7ac59cd4e1..44aa11883449 100644 --- a/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -1,9 +1,10 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, cmake, qtbase, + wrapQtAppsHook, qtmultimedia, qtx11extras, qttools, @@ -14,7 +15,7 @@ hunspell, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "psi"; version = "1.5"; src = fetchFromGitHub { @@ -30,6 +31,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake qttools + wrapQtAppsHook ]; buildInputs = [ qtbase diff --git a/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/pkgs/applications/networking/instant-messengers/ripcord/default.nix index 116336eb2a70..45142b721044 100644 --- a/pkgs/applications/networking/instant-messengers/ripcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/ripcord/default.nix @@ -1,6 +1,6 @@ { lib, - mkDerivation, + stdenv, fetchurl, makeFontsConf, appimageTools, @@ -9,6 +9,7 @@ qtmultimedia, qtwebsockets, qtimageformats, + wrapQtAppsHook, autoPatchelfHook, desktop-file-utils, imagemagick, @@ -20,7 +21,7 @@ alsa-lib, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "ripcord"; version = "0.4.29"; @@ -41,6 +42,7 @@ mkDerivation rec { autoPatchelfHook desktop-file-utils imagemagick + wrapQtAppsHook ]; buildInputs = [ libsodium diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix index 74e95ecf03df..a9588a52b0b7 100644 --- a/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -1,18 +1,18 @@ { - mkDerivation, lib, stdenv, fetchFromGitHub, + qmake, + wrapQtAppsHook, qtbase, qtquickcontrols, - qmake, makeDesktopItem, }: # we now have libqmatrixclient so a future version of tensor that supports it # should use that -mkDerivation rec { +stdenv.mkDerivation rec { pname = "tensor"; version = "unstable-2017-02-21"; @@ -24,11 +24,15 @@ mkDerivation rec { fetchSubmodules = true; }; + nativeBuildInputs = [ + qmake + wrapQtAppsHook + ]; + buildInputs = [ qtbase qtquickcontrols ]; - nativeBuildInputs = [ qmake ]; desktopItem = makeDesktopItem { name = "tensor"; diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/applications/networking/instant-messengers/twinkle/default.nix index b09b724dc20a..67e00c5c379a 100644 --- a/pkgs/applications/networking/instant-messengers/twinkle/default.nix +++ b/pkgs/applications/networking/instant-messengers/twinkle/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, fetchFromGitHub, cmake, libxml2, @@ -16,11 +17,11 @@ alsa-lib, speex, ilbc, - mkDerivation, bcg729, + wrapQtAppsHook, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "twinkle"; version = "unstable-2024-20-11"; @@ -51,6 +52,7 @@ mkDerivation rec { bison flex bcg729 + wrapQtAppsHook ]; cmakeFlags = [ diff --git a/pkgs/applications/networking/irc/kvirc/default.nix b/pkgs/applications/networking/irc/kvirc/default.nix index e7ba832a0f4b..84174949a0f5 100644 --- a/pkgs/applications/networking/irc/kvirc/default.nix +++ b/pkgs/applications/networking/irc/kvirc/default.nix @@ -1,6 +1,6 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, qtbase, qtmultimedia, @@ -9,9 +9,10 @@ pkg-config, cmake, gettext, + wrapQtAppsHook, }: -mkDerivation { +stdenv.mkDerivation { pname = "kvirc"; version = "2022-06-29"; @@ -33,6 +34,7 @@ mkDerivation { pkg-config cmake gettext + wrapQtAppsHook ]; meta = { diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 0d942c724b4a..46ae3e118578 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -10,8 +10,8 @@ fetchFromGitHub, cmake, makeWrapper, + wrapQtAppsHook, dconf, - mkDerivation, qtbase, boost, zlib, @@ -45,7 +45,7 @@ let edf = flag: feature: [ ("-D" + feature + (if flag then "=ON" else "=OFF")) ]; in -(if !buildClient then stdenv.mkDerivation else mkDerivation) rec { +stdenv.mkDerivation rec { pname = "quassel${tag}"; version = "0.14.0"; @@ -62,7 +62,8 @@ in nativeBuildInputs = [ cmake makeWrapper - ]; + ] + ++ lib.optional buildClient wrapQtAppsHook; buildInputs = [ qtbase boost diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix index d5a3a05d4da3..09001da1999b 100644 --- a/pkgs/applications/networking/ostinato/default.nix +++ b/pkgs/applications/networking/ostinato/default.nix @@ -1,9 +1,11 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, fetchurl, qmake, + copyDesktopItems, + wrapQtAppsHook, makeDesktopItem, qtbase, qtscript, @@ -14,10 +16,9 @@ diffutils, gawk, libnl, - copyDesktopItems, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "ostinato"; version = "1.3.0"; @@ -44,6 +45,7 @@ mkDerivation rec { nativeBuildInputs = [ copyDesktopItems qmake + wrapQtAppsHook ]; patches = [ ./drone_ini.patch ]; diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index 9dad2f63d9d9..bcc69afddec1 100644 --- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -5,9 +5,9 @@ fetchpatch2, cmake, pkg-config, + wrapQtAppsHook, bzip2, libX11, - mkDerivation, qtbase, qttools, qtmultimedia, @@ -22,7 +22,7 @@ perl, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "eiskaltdcpp"; version = "2.4.2"; @@ -43,6 +43,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config + wrapQtAppsHook ]; buildInputs = [ qtbase diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index 48e29311b7a9..42ba28a0e96f 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -1,11 +1,12 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, fetchpatch2, qmake, cmake, pkg-config, + wrapQtAppsHook, miniupnpc, bzip2, speex, @@ -21,7 +22,7 @@ libgnome-keyring, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "retroshare"; version = "0.6.7.2"; @@ -51,6 +52,7 @@ mkDerivation rec { pkg-config qmake cmake + wrapQtAppsHook ]; buildInputs = [ speex diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 3dca39a4d274..ec7087df3beb 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -1,5 +1,4 @@ { - mkDerivation, lib, stdenv, fetchurl, @@ -23,7 +22,7 @@ minizip, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "teamviewer"; # teamviewer itself has not development files but the dev output removes propagated other dev outputs from runtime outputs = [ @@ -57,6 +56,7 @@ mkDerivation rec { autoPatchelfHook makeWrapper wrapQtAppsHook + wrapQtAppsHook ]; buildInputs = [ minizip diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix index 3ab36cc1684a..1a766edfb70c 100644 --- a/pkgs/applications/office/mytetra/default.nix +++ b/pkgs/applications/office/mytetra/default.nix @@ -1,14 +1,15 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, qmake, qtsvg, makeWrapper, + wrapQtAppsHook, xdg-utils, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "mytetra"; version = "1.44.183"; @@ -22,6 +23,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake makeWrapper + wrapQtAppsHook ]; buildInputs = [ qtsvg ]; diff --git a/pkgs/applications/office/qpdfview/default.nix b/pkgs/applications/office/qpdfview/default.nix index 1b79408c475e..1eae8b47442e 100644 --- a/pkgs/applications/office/qpdfview/default.nix +++ b/pkgs/applications/office/qpdfview/default.nix @@ -1,12 +1,13 @@ { lib, - mkDerivation, + stdenv, fetchurl, qmake, - qtbase, qttools, - qtsvg, pkg-config, + wrapQtAppsHook, + qtbase, + qtsvg, poppler, djvulibre, libspectre, @@ -15,7 +16,7 @@ ghostscript, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qpdfview"; version = "0.5.0"; @@ -28,6 +29,7 @@ mkDerivation rec { qmake qttools pkg-config + wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/office/semantik/default.nix b/pkgs/applications/office/semantik/default.nix index 5c805344b115..8837fe610e48 100644 --- a/pkgs/applications/office/semantik/default.nix +++ b/pkgs/applications/office/semantik/default.nix @@ -1,10 +1,11 @@ { lib, - mkDerivation, + stdenv, fetchFromGitLab, wafHook, pkg-config, cmake, + wrapQtAppsHook, qtbase, python3, qtwebengine, @@ -23,7 +24,7 @@ kdelibs4support, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "semantik"; version = "1.2.10"; @@ -66,6 +67,7 @@ mkDerivation rec { pkg-config wafHook cmake + wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/radio/pothos/default.nix b/pkgs/applications/radio/pothos/default.nix index bde117a91be9..b98ebbcda412 100644 --- a/pkgs/applications/radio/pothos/default.nix +++ b/pkgs/applications/radio/pothos/default.nix @@ -1,6 +1,6 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, fetchpatch, cmake, @@ -20,7 +20,7 @@ python3, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "pothos"; version = "0.7.1"; @@ -68,6 +68,7 @@ mkDerivation rec { pkg-config doxygen wrapQtAppsHook + wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/radio/qsstv/default.nix b/pkgs/applications/radio/qsstv/default.nix index f62d87719f26..f0536ad67ba9 100644 --- a/pkgs/applications/radio/qsstv/default.nix +++ b/pkgs/applications/radio/qsstv/default.nix @@ -1,11 +1,12 @@ { - mkDerivation, lib, + stdenv, fetchurl, qtbase, qmake, openjpeg, pkg-config, + wrapQtAppsHook, fftw, libpulseaudio, alsa-lib, @@ -14,7 +15,7 @@ fftwFloat, }: -mkDerivation rec { +stdenv.mkDerivation rec { version = "9.5.8"; pname = "qsstv"; @@ -26,6 +27,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake pkg-config + wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix index 24e018f300d3..3856e9148aa9 100644 --- a/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/pkgs/applications/science/electronics/eagle/eagle.nix @@ -1,8 +1,8 @@ { lib, stdenv, - mkDerivation, fetchurl, + wrapQtAppsHook, makeDesktopItem, libXrender, libXrandr, @@ -48,7 +48,7 @@ let qtwebengine ]; in -mkDerivation rec { +stdenv.mkDerivation rec { pname = "eagle"; version = "9.6.2"; @@ -69,6 +69,8 @@ mkDerivation rec { categories = [ "Development" ]; }; + nativeBuildInputs = [ wrapQtAppsHook ]; + buildInputs = [ libXrender libXrandr diff --git a/pkgs/applications/science/electronics/openhantek6022/default.nix b/pkgs/applications/science/electronics/openhantek6022/default.nix index 50e972b47730..e92a92890c6c 100644 --- a/pkgs/applications/science/electronics/openhantek6022/default.nix +++ b/pkgs/applications/science/electronics/openhantek6022/default.nix @@ -1,9 +1,10 @@ { - mkDerivation, lib, + stdenv, fetchFromGitHub, makeWrapper, cmake, + wrapQtAppsHook, qtbase, qttools, fftw, @@ -11,7 +12,7 @@ libglvnd, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "openhantek6022"; version = "3.4.0"; @@ -25,6 +26,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper + wrapQtAppsHook ]; buildInputs = [ fftw diff --git a/pkgs/applications/science/physics/xflr5/default.nix b/pkgs/applications/science/physics/xflr5/default.nix index a795bb08e3f2..2ec048864429 100644 --- a/pkgs/applications/science/physics/xflr5/default.nix +++ b/pkgs/applications/science/physics/xflr5/default.nix @@ -1,11 +1,12 @@ { - mkDerivation, lib, - qmake, + stdenv, fetchsvn, + qmake, + wrapQtAppsHook, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "xflr5"; version = "6.61"; @@ -16,7 +17,10 @@ mkDerivation rec { sha256 = "sha256-Uj6R15OT5i5tAJEYWqyFyN5Z51Wz5RjO26mWC3Y6QAI="; }; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ + qmake + wrapQtAppsHook + ]; meta = { description = "Analysis tool for airfoils, wings and planes"; diff --git a/pkgs/applications/science/robotics/apmplanner2/default.nix b/pkgs/applications/science/robotics/apmplanner2/default.nix index e606edb0fe0e..50fa1c2a3e22 100644 --- a/pkgs/applications/science/robotics/apmplanner2/default.nix +++ b/pkgs/applications/science/robotics/apmplanner2/default.nix @@ -1,8 +1,9 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, qmake, + wrapQtAppsHook, qtbase, qtscript, qtwebkit, @@ -18,7 +19,7 @@ SDL2, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "apmplanner2"; version = "2.0.28"; @@ -29,6 +30,11 @@ mkDerivation rec { sha256 = "0wvbfjnnf7sh6fpgw8gimh5hgzywj3nwrgr80r782f5gayd3v2l1"; }; + nativeBuildInputs = [ + qmake + wrapQtAppsHook + ]; + buildInputs = [ alsa-lib libsndfile @@ -45,8 +51,6 @@ mkDerivation rec { qtquickcontrols2 ]; - nativeBuildInputs = [ qmake ]; - qmakeFlags = [ "apm_planner.pro" ]; # this ugly hack is necessary, as `bin/apmplanner2` needs the contents of `share/APMPlanner2` inside of `bin/` diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index fc88a70ce5a8..850ad120df28 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -2,7 +2,6 @@ stdenv, fetchurl, lib, - mkDerivation, antiword, aspell, bison, @@ -32,6 +31,7 @@ python3Packages, qtbase, qttools, + wrapQtAppsHook, unrtf, untex, unzip, @@ -73,7 +73,7 @@ let useInotify = if stdenv.hostPlatform.isLinux then "true" else "false"; in -mkDerivation rec { +stdenv.mkDerivation rec { pname = "recoll"; version = "1.43.9"; @@ -127,7 +127,8 @@ mkDerivation rec { ] ++ lib.optionals withPython [ python3Packages.setuptools - ]; + ] + ++ [ wrapQtAppsHook ]; buildInputs = [ aspell diff --git a/pkgs/applications/video/anilibria-winmaclinux/default.nix b/pkgs/applications/video/anilibria-winmaclinux/default.nix index a2b8be867f0b..ede6378d08ac 100644 --- a/pkgs/applications/video/anilibria-winmaclinux/default.nix +++ b/pkgs/applications/video/anilibria-winmaclinux/default.nix @@ -1,6 +1,6 @@ { - mkDerivation, lib, + stdenv, fetchFromGitHub, qmake, pkg-config, @@ -19,7 +19,7 @@ mpv-unwrapped, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "anilibria-winmaclinux"; version = "2.2.32"; @@ -68,6 +68,7 @@ mkDerivation rec { pkg-config wrapQtAppsHook copyDesktopItems + wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index 866fb9e28a57..b3f633374529 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -1,11 +1,12 @@ { lib, + stdenv, fetchurl, makeDesktopItem, ffmpeg, qmake, qttools, - mkDerivation, + wrapQtAppsHook, qtbase, qtdeclarative, qtlocation, @@ -15,7 +16,7 @@ yt-dlp, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "clipgrab"; version = "3.9.7"; @@ -37,6 +38,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake qttools + wrapQtAppsHook ]; patches = [ diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index 33f3e1c300b7..84fdbfc86845 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -1,13 +1,14 @@ { - mkDerivation, lib, + stdenv, fetchFromGitHub, + qmake, + qttools, + wrapQtAppsHook, phonon, phonon-backend-vlc, qtbase, - qmake, qtdeclarative, - qttools, qtx11extras, mpv, @@ -15,7 +16,7 @@ withAPIKey ? "AIzaSyBQvZXseEVvgu5Ega_DI-AIJ55v0OsHmVY", }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "minitube"; version = "3.9.3"; @@ -36,6 +37,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake qttools + wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 63bb5b4a4f56..1fd414087914 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -1,6 +1,6 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, which, qtbase, @@ -33,6 +33,7 @@ autoconf, automake, file, + wrapQtAppsHook, exiv2, linuxHeaders, soundtouch, @@ -41,7 +42,7 @@ withWebKit ? false, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "mythtv"; version = "35.0"; @@ -98,6 +99,7 @@ mkDerivation rec { autoconf automake file + wrapQtAppsHook ]; configureFlags = [ "--dvb-path=${linuxHeaders}/include" ]; diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix index ee29477708ed..297493de9da8 100644 --- a/pkgs/applications/video/qarte/default.nix +++ b/pkgs/applications/video/qarte/default.nix @@ -1,7 +1,8 @@ { - mkDerivation, lib, + stdenv, fetchbzr, + wrapQtAppsHook, python3, rtmpdump, }: @@ -14,7 +15,7 @@ let ] ); in -mkDerivation { +stdenv.mkDerivation { pname = "qarte"; version = "5.5.0"; @@ -24,6 +25,8 @@ mkDerivation { sha256 = "sha256-+Ixe4bWKubH/XBESwmP2NWS8bH0jq611c3MZn7W87Jw="; }; + nativeBuildInputs = [ wrapQtAppsHook ]; + buildInputs = [ pythonEnv ]; installPhase = '' diff --git a/pkgs/applications/video/qmediathekview/default.nix b/pkgs/applications/video/qmediathekview/default.nix index 2c5ff03d0a85..0abe2d514ca7 100644 --- a/pkgs/applications/video/qmediathekview/default.nix +++ b/pkgs/applications/video/qmediathekview/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, - mkDerivation, fetchFromGitHub, boost, qtbase, xz, qmake, pkg-config, + wrapQtAppsHook, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "QMediathekView"; version = "0.2.1"; @@ -35,6 +35,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake pkg-config + wrapQtAppsHook ]; installFlags = [ "INSTALL_ROOT=$(out)" ]; diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix index c700f54d1192..c7f28dc30aca 100644 --- a/pkgs/applications/video/smtube/default.nix +++ b/pkgs/applications/video/smtube/default.nix @@ -1,13 +1,14 @@ { lib, - mkDerivation, + stdenv, fetchurl, qmake, + wrapQtAppsHook, qtscript, qtwebkit, }: -mkDerivation rec { +stdenv.mkDerivation rec { version = "21.10.0"; pname = "smtube"; @@ -22,7 +23,10 @@ mkDerivation rec { dontUseQmakeConfigure = true; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ + qmake + wrapQtAppsHook + ]; buildInputs = [ qtscript qtwebkit diff --git a/pkgs/applications/virtualization/qtemu/default.nix b/pkgs/applications/virtualization/qtemu/default.nix index 5a654a01f166..bc415d463712 100644 --- a/pkgs/applications/virtualization/qtemu/default.nix +++ b/pkgs/applications/virtualization/qtemu/default.nix @@ -1,14 +1,15 @@ { lib, - mkDerivation, + stdenv, fetchFromGitLab, pkg-config, qmake, + wrapQtAppsHook, qtbase, qemu, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qtemu"; version = "2.1"; @@ -22,6 +23,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake pkg-config + wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/by-name/co/cockatrice/package.nix b/pkgs/by-name/co/cockatrice/package.nix index e070035d344c..9c900b55a9f4 100644 --- a/pkgs/by-name/co/cockatrice/package.nix +++ b/pkgs/by-name/co/cockatrice/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, qt5, fetchFromGitHub, cmake, @@ -8,7 +9,7 @@ let protobuf = protobuf_21; in -qt5.mkDerivation rec { +stdenv.mkDerivation rec { pname = "cockatrice"; version = "2025-04-03-Release-2.10.2"; @@ -22,6 +23,7 @@ qt5.mkDerivation rec { nativeBuildInputs = [ cmake qt5.wrapQtAppsHook + qt5.wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/by-name/pe/pentobi/package.nix b/pkgs/by-name/pe/pentobi/package.nix index 816a3901cd7a..c7d84eb6d0aa 100644 --- a/pkgs/by-name/pe/pentobi/package.nix +++ b/pkgs/by-name/pe/pentobi/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, qt5, appstream, fetchFromGitHub, @@ -9,7 +10,7 @@ docbook_xsl, }: -qt5.mkDerivation rec { +stdenv.mkDerivation rec { version = "20.0"; pname = "pentobi"; @@ -24,6 +25,7 @@ qt5.mkDerivation rec { cmake docbook_xsl qt5.qttools + qt5.wrapQtAppsHook ]; buildInputs = [ appstream diff --git a/pkgs/by-name/po/pokerth/package.nix b/pkgs/by-name/po/pokerth/package.nix index 39b70fbd9f18..bd56a816c9a5 100644 --- a/pkgs/by-name/po/pokerth/package.nix +++ b/pkgs/by-name/po/pokerth/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, qt5, fetchFromGitHub, fetchpatch, @@ -21,7 +22,7 @@ let protobuf = protobuf_21; in -qt5.mkDerivation rec { +stdenv.mkDerivation rec { pname = "pokerth-${target}"; version = "1.1.2"; @@ -62,6 +63,7 @@ qt5.mkDerivation rec { nativeBuildInputs = [ qt5.qmake qt5.wrapQtAppsHook + qt5.wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/by-name/va/vapoursynth/editor.nix b/pkgs/by-name/va/vapoursynth/editor.nix index 163ce819051e..3291bb7d625c 100644 --- a/pkgs/by-name/va/vapoursynth/editor.nix +++ b/pkgs/by-name/va/vapoursynth/editor.nix @@ -1,19 +1,19 @@ { lib, stdenv, - mkDerivation, fetchFromGitHub, makeWrapper, runCommand, python3, vapoursynth, qmake, + wrapQtAppsHook, qtbase, qtwebsockets, }: let - unwrapped = mkDerivation rec { + unwrapped = stdenv.mkDerivation rec { pname = "vapoursynth-editor"; version = "R19-mod-4"; @@ -29,7 +29,11 @@ let --replace-fail "TARGET = vsedit-32bit" "TARGET = vsedit" ''; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ + qmake + wrapQtAppsHook + ]; + buildInputs = [ qtbase vapoursynth diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 4ef2631b8d7d..3f29b8d985dd 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, - mkDerivation, fetchpatch, fetchurl, cmake, @@ -31,7 +30,7 @@ withWebengine ? false, # vulnerable, so disabled by default }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "supercollider"; version = "3.13.1"; @@ -69,7 +68,8 @@ mkDerivation rec { qttools libsForQt5.wrapQtAppsHook ] - ++ lib.optionals useSCEL [ emacs ]; + ++ lib.optionals useSCEL [ emacs ] + ++ [ libsForQt5.wrapQtAppsHook ]; buildInputs = [ gcc diff --git a/pkgs/development/libraries/g2o/default.nix b/pkgs/development/libraries/g2o/default.nix index 117c2382a990..c37e20027906 100644 --- a/pkgs/development/libraries/g2o/default.nix +++ b/pkgs/development/libraries/g2o/default.nix @@ -1,9 +1,9 @@ { lib, stdenv, - mkDerivation, fetchFromGitHub, cmake, + wrapQtAppsHook, eigen, suitesparse, blas, @@ -14,7 +14,7 @@ spdlog, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "g2o"; version = "20241228"; @@ -34,7 +34,10 @@ mkDerivation rec { ]; separateDebugInfo = true; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + wrapQtAppsHook + ]; buildInputs = [ eigen suitesparse diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix index 5c902bc3ee8f..939b4086ee03 100644 --- a/pkgs/development/libraries/herqq/default.nix +++ b/pkgs/development/libraries/herqq/default.nix @@ -1,17 +1,22 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, qmake, + wrapQtAppsHook, qtmultimedia, qtbase, }: -mkDerivation rec { +stdenv.mkDerivation rec { version = "unstable-20-06-26"; pname = "herqq"; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ + qmake + wrapQtAppsHook + ]; + buildInputs = [ qtbase qtmultimedia diff --git a/pkgs/development/libraries/libosmscout/default.nix b/pkgs/development/libraries/libosmscout/default.nix index 0a7ece7a51bc..7c850d962ff1 100644 --- a/pkgs/development/libraries/libosmscout/default.nix +++ b/pkgs/development/libraries/libosmscout/default.nix @@ -1,16 +1,17 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, + wrapQtAppsHook, marisa, qttools, qtlocation, }: -mkDerivation { +stdenv.mkDerivation { pname = "libosmscout"; version = "2022.04.25"; @@ -36,6 +37,7 @@ mkDerivation { nativeBuildInputs = [ cmake pkg-config + wrapQtAppsHook ]; buildInputs = [ marisa diff --git a/pkgs/development/libraries/nemo-qml-plugin-dbus/default.nix b/pkgs/development/libraries/nemo-qml-plugin-dbus/default.nix index 46ad5ea80bf9..e499f7705ba8 100644 --- a/pkgs/development/libraries/nemo-qml-plugin-dbus/default.nix +++ b/pkgs/development/libraries/nemo-qml-plugin-dbus/default.nix @@ -1,12 +1,13 @@ { - mkDerivation, lib, + stdenv, fetchFromGitLab, qmake, + wrapQtAppsHook, qtbase, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "nemo-qml-plugin-dbus"; version = "2.1.24"; @@ -18,7 +19,10 @@ mkDerivation rec { sha256 = "1ilg929456d3k0xkvxa5r4k7i4kkw9i8kgah5xx1yq0d9wka0l77"; }; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ + qmake + wrapQtAppsHook + ]; postPatch = '' substituteInPlace dbus.pro --replace ' tests' "" diff --git a/pkgs/development/tools/analysis/massif-visualizer/default.nix b/pkgs/development/tools/analysis/massif-visualizer/default.nix index 71e6d2f8a572..0b1c5009c972 100644 --- a/pkgs/development/tools/analysis/massif-visualizer/default.nix +++ b/pkgs/development/tools/analysis/massif-visualizer/default.nix @@ -1,9 +1,10 @@ { - mkDerivation, lib, + stdenv, fetchurl, extra-cmake-modules, shared-mime-info, + wrapQtAppsHook, qtsvg, qtxmlpatterns, karchive, @@ -16,7 +17,7 @@ kgraphviewer, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "massif-visualizer"; version = "0.7.0"; @@ -30,6 +31,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules shared-mime-info + wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix index b96d48068359..9c97b3b82a80 100644 --- a/pkgs/development/tools/boomerang/default.nix +++ b/pkgs/development/tools/boomerang/default.nix @@ -1,6 +1,6 @@ { - mkDerivation, lib, + stdenv, fetchFromGitHub, fetchpatch, cmake, @@ -8,9 +8,10 @@ capstone, bison, flex, + wrapQtAppsHook, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "boomerang"; version = "0.5.2"; # NOTE: When bumping version beyond 0.5.2, you likely need to remove @@ -33,6 +34,7 @@ mkDerivation rec { cmake bison flex + wrapQtAppsHook ]; buildInputs = [ qtbase diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix index 6b6d64829692..857c8a6fb84f 100644 --- a/pkgs/development/tools/misc/gede/default.nix +++ b/pkgs/development/tools/misc/gede/default.nix @@ -1,17 +1,18 @@ { - mkDerivation, lib, + stdenv, fetchFromGitHub, makeWrapper, python3, qtbase, qmake, qtserialport, + wrapQtAppsHook, ctags, gdb, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "gede"; version = "2.22.1"; @@ -28,6 +29,7 @@ mkDerivation rec { python3 qmake qtserialport + wrapQtAppsHook ]; strictDeps = true; diff --git a/pkgs/development/tools/ofono-phonesim/default.nix b/pkgs/development/tools/ofono-phonesim/default.nix index bda989f71a85..32a33f54b0ea 100644 --- a/pkgs/development/tools/ofono-phonesim/default.nix +++ b/pkgs/development/tools/ofono-phonesim/default.nix @@ -1,13 +1,14 @@ { lib, - mkDerivation, + stdenv, fetchzip, autoreconfHook, pkg-config, + wrapQtAppsHook, qtbase, }: -mkDerivation { +stdenv.mkDerivation { pname = "ofono-phonesim"; version = "unstable-2019-11-18"; @@ -19,6 +20,7 @@ mkDerivation { nativeBuildInputs = [ autoreconfHook pkg-config + wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix index 0ae2c7deb581..ad8fef2839c1 100644 --- a/pkgs/development/tools/tora/default.nix +++ b/pkgs/development/tools/tora/default.nix @@ -1,10 +1,12 @@ { - mkDerivation, lib, + stdenv, fetchFromGitHub, cmake, extra-cmake-modules, makeWrapper, + qttools, + wrapQtAppsHook, boost, doxygen, openssl, @@ -14,10 +16,9 @@ loki, qscintilla, qtbase, - qttools, }: -mkDerivation { +stdenv.mkDerivation { pname = "tora"; version = "3.2.176"; @@ -33,6 +34,7 @@ mkDerivation { extra-cmake-modules makeWrapper qttools + wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix index 68a8331b5bab..b91d46bca6a6 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix @@ -1,14 +1,15 @@ { lib, - mkDerivation, + stdenv, qtbase, qmake, inkscape, imagemagick, + wrapQtAppsHook, wpa_supplicant, }: -mkDerivation { +stdenv.mkDerivation { pname = "wpa_gui"; inherit (wpa_supplicant) version src patches; @@ -17,6 +18,7 @@ mkDerivation { qmake inkscape imagemagick + wrapQtAppsHook ]; postPatch = '' diff --git a/pkgs/servers/pulseaudio/qpaeq.nix b/pkgs/servers/pulseaudio/qpaeq.nix index 1b24600fe4e1..85de713bcc54 100644 --- a/pkgs/servers/pulseaudio/qpaeq.nix +++ b/pkgs/servers/pulseaudio/qpaeq.nix @@ -1,5 +1,6 @@ { - mkDerivation, + stdenv, + wrapQtAppsHook, makeDesktopItem, python3, lib, @@ -21,10 +22,12 @@ let startupNotify = false; }; in -mkDerivation { +stdenv.mkDerivation { pname = "qpaeq"; inherit (pulseaudio) version src; + nativeBuildInputs = [ wrapQtAppsHook ]; + buildInputs = [ (python3.withPackages ( diff --git a/pkgs/tools/filesystems/kio-fuse/default.nix b/pkgs/tools/filesystems/kio-fuse/default.nix index ad6e84e2f10b..3a3406866235 100644 --- a/pkgs/tools/filesystems/kio-fuse/default.nix +++ b/pkgs/tools/filesystems/kio-fuse/default.nix @@ -1,14 +1,15 @@ { lib, - mkDerivation, + stdenv, fetchgit, cmake, extra-cmake-modules, + wrapQtAppsHook, kio, fuse3, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "kio-fuse"; version = "5.1.0"; @@ -21,6 +22,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules + wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index b94567b12009..f27f4a04551d 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -28,8 +28,8 @@ gnused ? null, coreutils ? null, withQt ? false, - mkDerivation, qttools, + wrapQtAppsHook, qtbase, qtsvg, }: @@ -38,7 +38,7 @@ assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != n let withX = libX11 != null && !aquaterm && !stdenv.hostPlatform.isDarwin; in -(if withQt then mkDerivation else stdenv.mkDerivation) rec { +stdenv.mkDerivation rec { pname = "gnuplot"; version = "6.0.4"; @@ -52,7 +52,10 @@ in pkg-config texinfo ] - ++ lib.optional withQt qttools; + ++ lib.optionals withQt [ + qttools + wrapQtAppsHook + ]; buildInputs = [ cairo diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index 50d491759a86..a5ffd9d2d859 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, - mkDerivation, fetchurl, cmake, pkg-config, + wrapQtAppsHook, openexr, zlib, imagemagick6, @@ -22,7 +22,7 @@ opencv, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "pfstools"; version = "2.2.0"; @@ -53,6 +53,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config + wrapQtAppsHook ]; buildInputs = [ openexr diff --git a/pkgs/tools/graphics/rocket/default.nix b/pkgs/tools/graphics/rocket/default.nix index c8efbf199abb..f252870bc426 100644 --- a/pkgs/tools/graphics/rocket/default.nix +++ b/pkgs/tools/graphics/rocket/default.nix @@ -1,12 +1,13 @@ { - mkDerivation, lib, + stdenv, fetchFromGitHub, qmake, + wrapQtAppsHook, qtbase, }: -mkDerivation { +stdenv.mkDerivation { pname = "rocket"; version = "2018-06-09"; @@ -17,7 +18,10 @@ mkDerivation { sha256 = "13bdg2dc6ypk17sz39spqdlb3wai2y085bdb36pls2as2nf22drp"; }; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ + qmake + wrapQtAppsHook + ]; buildInputs = [ qtbase ]; dontConfigure = true; diff --git a/pkgs/tools/misc/antimicrox/default.nix b/pkgs/tools/misc/antimicrox/default.nix index fef3147a5641..02d7cc78a20b 100644 --- a/pkgs/tools/misc/antimicrox/default.nix +++ b/pkgs/tools/misc/antimicrox/default.nix @@ -1,18 +1,19 @@ { - mkDerivation, lib, + stdenv, cmake, extra-cmake-modules, pkg-config, + itstool, + udevCheckHook, + wrapQtAppsHook, SDL2, qttools, xorg, fetchFromGitHub, - itstool, - udevCheckHook, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "antimicrox"; version = "3.5.1"; @@ -29,6 +30,7 @@ mkDerivation rec { pkg-config itstool udevCheckHook + wrapQtAppsHook ]; buildInputs = [ SDL2 diff --git a/pkgs/tools/misc/coreboot-configurator/default.nix b/pkgs/tools/misc/coreboot-configurator/default.nix index 0c44e23bee3c..250d51ee798c 100644 --- a/pkgs/tools/misc/coreboot-configurator/default.nix +++ b/pkgs/tools/misc/coreboot-configurator/default.nix @@ -1,9 +1,9 @@ { lib, + stdenv, fetchFromGitHub, inkscape, meson, - mkDerivation, ninja, # We will resolve pkexec from the path because it has a setuid wrapper on # NixOS meaning that we cannot just use the path from the nix store. @@ -19,7 +19,7 @@ wrapQtAppsHook, }: -mkDerivation { +stdenv.mkDerivation { pname = "coreboot-configurator"; version = "unstable-2023-01-17"; @@ -36,6 +36,7 @@ mkDerivation { ninja pkg-config wrapQtAppsHook + wrapQtAppsHook ]; buildInputs = [ yaml-cpp diff --git a/pkgs/tools/misc/dialogbox/default.nix b/pkgs/tools/misc/dialogbox/default.nix index f11bce479b4a..b4d932c7f2d9 100644 --- a/pkgs/tools/misc/dialogbox/default.nix +++ b/pkgs/tools/misc/dialogbox/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, - mkDerivation, fetchFromGitHub, qmake, + wrapQtAppsHook, qtbase, }: -mkDerivation { +stdenv.mkDerivation { pname = "dialogbox"; version = "1.0+unstable=2020-11-16"; @@ -20,6 +20,7 @@ mkDerivation { nativeBuildInputs = [ qmake + wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix index 5ad32d67810e..812128c0c029 100644 --- a/pkgs/tools/misc/kronometer/default.nix +++ b/pkgs/tools/misc/kronometer/default.nix @@ -1,16 +1,17 @@ { - mkDerivation, fetchurl, + stdenv, fetchpatch, lib, extra-cmake-modules, kdoctools, + wrapQtAppsHook, kconfig, kcrash, kinit, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "kronometer"; version = "2.3.0"; @@ -36,6 +37,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules kdoctools + wrapQtAppsHook ]; propagatedBuildInputs = [ kconfig diff --git a/pkgs/tools/misc/qflipper/default.nix b/pkgs/tools/misc/qflipper/default.nix index 62f253871e8e..3d2f1c873242 100644 --- a/pkgs/tools/misc/qflipper/default.nix +++ b/pkgs/tools/misc/qflipper/default.nix @@ -9,7 +9,6 @@ qmake, wrapGAppsHook3, wrapQtAppsHook, - mkDerivation, qttools, qtbase, @@ -31,7 +30,7 @@ let commit = "nix-${version}"; in -mkDerivation { +stdenv.mkDerivation { inherit pname version; src = fetchFromGitHub { @@ -48,6 +47,7 @@ mkDerivation { qttools wrapGAppsHook3 wrapQtAppsHook + wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix index e2b56f9b53bf..23861b295af7 100644 --- a/pkgs/tools/misc/qjoypad/default.nix +++ b/pkgs/tools/misc/qjoypad/default.nix @@ -1,16 +1,17 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, pkg-config, cmake, + qttools, + wrapQtAppsHook, libX11, libXtst, qtbase, - qttools, qtx11extras, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qjoypad"; version = "4.3.1"; @@ -30,6 +31,7 @@ mkDerivation rec { pkg-config cmake qttools + wrapQtAppsHook ]; buildInputs = [ libX11 diff --git a/pkgs/tools/misc/radeon-profile/default.nix b/pkgs/tools/misc/radeon-profile/default.nix index d9156426e5e2..f1d2c7470477 100644 --- a/pkgs/tools/misc/radeon-profile/default.nix +++ b/pkgs/tools/misc/radeon-profile/default.nix @@ -1,20 +1,24 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, + qmake, + wrapQtAppsHook, qtbase, qtcharts, - qmake, libXrandr, libdrm, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "radeon-profile"; version = "20200824"; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ + qmake + wrapQtAppsHook + ]; buildInputs = [ qtbase qtcharts diff --git a/pkgs/tools/misc/ultrastar-creator/default.nix b/pkgs/tools/misc/ultrastar-creator/default.nix index 2af29bf9ae83..6e7074ead176 100644 --- a/pkgs/tools/misc/ultrastar-creator/default.nix +++ b/pkgs/tools/misc/ultrastar-creator/default.nix @@ -1,10 +1,11 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, qmake, qtbase, pkg-config, + wrapQtAppsHook, taglib, libbass, libbass_fx, @@ -15,7 +16,7 @@ # there’s a WIP branch here: # https://github.com/UltraStar-Deluxe/UltraStar-Creator/commits/BASS_removed -mkDerivation { +stdenv.mkDerivation { pname = "ultrastar-creator"; version = "2019-04-23"; @@ -45,6 +46,7 @@ mkDerivation { nativeBuildInputs = [ qmake pkg-config + wrapQtAppsHook ]; buildInputs = [ qtbase diff --git a/pkgs/tools/misc/ultrastar-manager/default.nix b/pkgs/tools/misc/ultrastar-manager/default.nix index 870ac9b4987a..822f27bff0fc 100644 --- a/pkgs/tools/misc/ultrastar-manager/default.nix +++ b/pkgs/tools/misc/ultrastar-manager/default.nix @@ -1,8 +1,9 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, pkg-config, + wrapQtAppsHook, symlinkJoin, qmake, diffPlugins, @@ -46,10 +47,12 @@ let inherit rev sha256; }; in - mkDerivation { + stdenv.mkDerivation { name = "${src.name}-patched"; inherit src; + nativeBuildInputs = [ wrapQtAppsHook ]; + dontInstall = true; patchPhase = '' @@ -80,10 +83,12 @@ let buildPlugin = name: - mkDerivation { + stdenv.mkDerivation { name = "ultrastar-manager-${name}-plugin-${version}"; src = patchedSrc; + nativeBuildInputs = [ wrapQtAppsHook ]; + buildInputs = [ qmake ] ++ buildInputs; postPatch = '' @@ -107,7 +112,7 @@ let }; in -mkDerivation { +stdenv.mkDerivation { pname = "ultrastar-manager"; inherit version; src = patchedSrc; @@ -134,7 +139,11 @@ mkDerivation { make install ''; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + wrapQtAppsHook + ]; + inherit buildInputs; meta = { diff --git a/pkgs/tools/security/chrome-token-signing/default.nix b/pkgs/tools/security/chrome-token-signing/default.nix index 330383160a02..a32680b02f4a 100644 --- a/pkgs/tools/security/chrome-token-signing/default.nix +++ b/pkgs/tools/security/chrome-token-signing/default.nix @@ -1,14 +1,15 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, + pkg-config, + wrapQtAppsHook, qmake, pcsclite, - pkg-config, opensc, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "chrome-token-signing"; version = "1.1.5"; @@ -19,7 +20,10 @@ mkDerivation rec { sha256 = "sha256-wKy/RVR7jx5AkMJgHXsuV+jlzyfH5nDRggcIUgh2ML4="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + wrapQtAppsHook + ]; buildInputs = [ qmake pcsclite diff --git a/pkgs/tools/security/kwalletcli/default.nix b/pkgs/tools/security/kwalletcli/default.nix index 4b5922899f7c..ea7902622c53 100644 --- a/pkgs/tools/security/kwalletcli/default.nix +++ b/pkgs/tools/security/kwalletcli/default.nix @@ -1,9 +1,10 @@ { - mkDerivation, fetchFromGitHub, lib, + stdenv, makeWrapper, pkg-config, + wrapQtAppsHook, kcoreaddons, ki18n, kwallet, @@ -11,7 +12,7 @@ pinentry-qt, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "kwalletcli"; version = "3.03"; @@ -42,6 +43,7 @@ mkDerivation rec { nativeBuildInputs = [ makeWrapper pkg-config + wrapQtAppsHook ]; # if using just kwallet, cmake will be added as a buildInput and fail the build propagatedBuildInputs = [ diff --git a/pkgs/tools/system/testdisk/default.nix b/pkgs/tools/system/testdisk/default.nix index b6b9c97afa58..ca47782144d0 100644 --- a/pkgs/tools/system/testdisk/default.nix +++ b/pkgs/tools/system/testdisk/default.nix @@ -1,11 +1,11 @@ { - mkDerivation, lib, stdenv, fetchurl, ncurses, libuuid, pkg-config, + wrapQtAppsHook, libjpeg, zlib, libewf-legacy, @@ -25,7 +25,7 @@ assert enableQt -> qtbase != null; assert enableQt -> qttools != null; assert enableQt -> qwt != null; -(if enableQt then mkDerivation else stdenv.mkDerivation) rec { +stdenv.mkDerivation rec { pname = "testdisk"; version = "7.2"; src = fetchurl { @@ -55,7 +55,10 @@ assert enableQt -> qwt != null; qwt ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + ] + ++ lib.optional enableQt wrapQtAppsHook; env.NIX_CFLAGS_COMPILE = "-Wno-unused"; diff --git a/pkgs/tools/text/glogg/default.nix b/pkgs/tools/text/glogg/default.nix index 82bf05853720..4242c3e00d62 100644 --- a/pkgs/tools/text/glogg/default.nix +++ b/pkgs/tools/text/glogg/default.nix @@ -1,13 +1,13 @@ { - mkDerivation, lib, stdenv, fetchFromGitHub, qmake, + wrapQtAppsHook, boost, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "glogg"; version = "1.1.4"; @@ -23,7 +23,10 @@ mkDerivation rec { --replace "boost_program_options-mt" "boost_program_options" ''; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ + qmake + wrapQtAppsHook + ]; buildInputs = [ boost ]; qmakeFlags = [ "VERSION=${version}" ]; diff --git a/pkgs/tools/typesetting/tikzit/default.nix b/pkgs/tools/typesetting/tikzit/default.nix index e084c56b00a1..481bc29d1d6f 100644 --- a/pkgs/tools/typesetting/tikzit/default.nix +++ b/pkgs/tools/typesetting/tikzit/default.nix @@ -1,6 +1,6 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, qmake, qttools, @@ -8,9 +8,10 @@ poppler, flex, bison, + wrapQtAppsHook, }: -mkDerivation { +stdenv.mkDerivation { pname = "tikzit"; version = "2.1.6"; @@ -26,6 +27,7 @@ mkDerivation { qttools flex bison + wrapQtAppsHook ]; buildInputs = [ qtbase From dfd0be8cd2d8d2c7156e4a74a2ca426315351460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 27 Jan 2026 20:52:41 +0100 Subject: [PATCH 08/30] buildFHSEnv: don't overwrite env vars to /usr prefix Overwriting needlessly breaks using buildFHSEnv programs inside other derivations / build envs. Fix it by prepending the FHS paths instead. (I think the FHS paths should have the lowest priority, by suffixing them, but prefixing is a less disruptive change, so do that for now.) Test setup: $ NIXPKGS_ALLOW_UNFREE=1 nix-build -A quartus-prime-lite Before: $ NIX_CFLAGS_COMPILE="-I /path" NIX_CFLAGS_LINK="-L /path" NIX_LDFLAGS="-L /path" PKG_CONFIG_PATH=/path ACLOCAL_PATH=/path ./result/bin/quartus-prime-lite bash -c 'printf "NIX_CFLAGS_COMPILE=$NIX_CFLAGS_COMPILE\nNIX_CFLAGS_LINK=$NIX_CFLAGS_LINK\nNIX_LDFLAGS=$NIX_LDFLAGS\nPKG_CONFIG_PATH=$PKG_CONFIG_PATH\nACLOCAL_PATH=$ACLOCAL_PATH\n"' NIX_CFLAGS_COMPILE=-idirafter /usr/include NIX_CFLAGS_LINK=-L/usr/lib -L/usr/lib32 NIX_LDFLAGS=-L/usr/lib -L/usr/lib32 PKG_CONFIG_PATH=/usr/lib/pkgconfig ACLOCAL_PATH=/usr/share/aclocal After: $ NIX_CFLAGS_COMPILE="-I /path" NIX_CFLAGS_LINK="-L /path" NIX_LDFLAGS="-L /path" PKG_CONFIG_PATH=/path ACLOCAL_PATH=/path ./result/bin/quartus-prime-lite bash -c 'printf "NIX_CFLAGS_COMPILE=$NIX_CFLAGS_COMPILE\nNIX_CFLAGS_LINK=$NIX_CFLAGS_LINK\nNIX_LDFLAGS=$NIX_LDFLAGS\nPKG_CONFIG_PATH=$PKG_CONFIG_PATH\nACLOCAL_PATH=$ACLOCAL_PATH\n"' NIX_CFLAGS_COMPILE=-idirafter /usr/include -I /path NIX_CFLAGS_LINK=-L/usr/lib -L/usr/lib32 -L /path NIX_LDFLAGS=-L/usr/lib -L/usr/lib32 -L /path PKG_CONFIG_PATH=/usr/lib/pkgconfig:/path ACLOCAL_PATH=/usr/share/aclocal:/path (I also included GST_PLUGIN_SYSTEM_PATH_1_0, although it's not a "build" oriented variable.) --- .../build-fhsenv-bubblewrap/buildFHSEnv.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix index de9afda8d1bb..34d1e9c2fa1f 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix @@ -125,15 +125,16 @@ let unset NIX_ENFORCE_PURITY export NIX_BINTOOLS_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1 export NIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1 - export NIX_CFLAGS_COMPILE='-idirafter /usr/include' - export NIX_CFLAGS_LINK='-L/usr/lib -L/usr/lib32' - export NIX_LDFLAGS='-L/usr/lib -L/usr/lib32' - export PKG_CONFIG_PATH=/usr/lib/pkgconfig - export ACLOCAL_PATH=/usr/share/aclocal + export NIX_CFLAGS_COMPILE="-idirafter /usr/include"''${NIX_CFLAGS_COMPILE:+" $NIX_CFLAGS_COMPILE"} + export NIX_CFLAGS_LINK="-L/usr/lib -L/usr/lib32"''${NIX_CFLAGS_LINK:+" $NIX_CFLAGS_LINK"} + export NIX_LDFLAGS="-L/usr/lib -L/usr/lib32"''${NIX_LDFLAGS:+" $NIX_LDFLAGS"} + export PKG_CONFIG_PATH=/usr/lib/pkgconfig''${PKG_CONFIG_PATH:+":$PKG_CONFIG_PATH"} + export ACLOCAL_PATH=/usr/share/aclocal''${ACLOCAL_PATH:+":$ACLOCAL_PATH"} # GStreamer searches for plugins relative to its real binary's location # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/bd97973ce0f2c5495bcda5cccd4f7ef7dcb7febc - export GST_PLUGIN_SYSTEM_PATH_1_0=/usr/lib/gstreamer-1.0:/usr/lib32/gstreamer-1.0 + export GST_PLUGIN_SYSTEM_PATH_1_0=/usr/lib/gstreamer-1.0:/usr/lib32/gstreamer-1.0''${GST_PLUGIN_SYSTEM_PATH_1_0:+":$GST_PLUGIN_SYSTEM_PATH_1_0"} + ${profile} ''; From 180e8ae2a0d6c600712480fcf116a50e99381875 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 30 Jan 2026 08:56:18 +0800 Subject: [PATCH 09/30] nemo-with-extensions: Fix open with root with polkit 127 https://github.com/polkit-org/polkit/commit/9aa43e089d870a8ee695e625237c5b731b250678 --- pkgs/by-name/ne/nemo-with-extensions/package.nix | 3 ++- pkgs/by-name/ne/nemo/package.nix | 7 ------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ne/nemo-with-extensions/package.nix b/pkgs/by-name/ne/nemo-with-extensions/package.nix index 9bdf5deba5ca..03aa00431e99 100644 --- a/pkgs/by-name/ne/nemo-with-extensions/package.nix +++ b/pkgs/by-name/ne/nemo-with-extensions/package.nix @@ -46,7 +46,8 @@ symlinkJoin { # Point to wrapped binary in all service files for file in "share/dbus-1/services/nemo.FileManager1.service" \ - "share/dbus-1/services/nemo.service" + "share/dbus-1/services/nemo.service" \ + "share/polkit-1/actions/org.nemo.root.policy" do rm "$out/$file" substitute "${nemo}/$file" "$out/$file" \ diff --git a/pkgs/by-name/ne/nemo/package.nix b/pkgs/by-name/ne/nemo/package.nix index 6c7285943c23..ef4694e6f8e9 100644 --- a/pkgs/by-name/ne/nemo/package.nix +++ b/pkgs/by-name/ne/nemo/package.nix @@ -87,13 +87,6 @@ stdenv.mkDerivation rec { "--localedir=${cinnamon-translations}/share/locale" ]; - postInstall = '' - # This fixes open as root and handles nemo-with-extensions well. - # https://github.com/NixOS/nixpkgs/issues/297570 - substituteInPlace $out/share/polkit-1/actions/org.nemo.root.policy \ - --replace-fail "$out/bin/nemo" "/run/current-system/sw/bin/nemo" - ''; - preFixup = '' gappsWrapperArgs+=( --prefix XDG_DATA_DIRS : "${ From 6f158658d28b33f13367684d6cf1685c2ba8b89f Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Fri, 30 Jan 2026 02:16:02 +0100 Subject: [PATCH 10/30] various: deduplicate wrapQtAppsHook --- pkgs/applications/networking/remote/teamviewer/default.nix | 1 - pkgs/applications/radio/pothos/default.nix | 1 - pkgs/applications/video/anilibria-winmaclinux/default.nix | 1 - pkgs/by-name/co/cockatrice/package.nix | 1 - pkgs/by-name/po/pokerth/package.nix | 1 - pkgs/development/interpreters/supercollider/default.nix | 3 +-- pkgs/tools/misc/coreboot-configurator/default.nix | 1 - pkgs/tools/misc/qflipper/default.nix | 1 - 8 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index ec7087df3beb..7ab61b6a91c1 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -56,7 +56,6 @@ stdenv.mkDerivation rec { autoPatchelfHook makeWrapper wrapQtAppsHook - wrapQtAppsHook ]; buildInputs = [ minizip diff --git a/pkgs/applications/radio/pothos/default.nix b/pkgs/applications/radio/pothos/default.nix index b98ebbcda412..3fc19a371219 100644 --- a/pkgs/applications/radio/pothos/default.nix +++ b/pkgs/applications/radio/pothos/default.nix @@ -68,7 +68,6 @@ stdenv.mkDerivation rec { pkg-config doxygen wrapQtAppsHook - wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/video/anilibria-winmaclinux/default.nix b/pkgs/applications/video/anilibria-winmaclinux/default.nix index ede6378d08ac..7a017714b26a 100644 --- a/pkgs/applications/video/anilibria-winmaclinux/default.nix +++ b/pkgs/applications/video/anilibria-winmaclinux/default.nix @@ -68,7 +68,6 @@ stdenv.mkDerivation rec { pkg-config wrapQtAppsHook copyDesktopItems - wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/by-name/co/cockatrice/package.nix b/pkgs/by-name/co/cockatrice/package.nix index 9c900b55a9f4..6b2447462897 100644 --- a/pkgs/by-name/co/cockatrice/package.nix +++ b/pkgs/by-name/co/cockatrice/package.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake qt5.wrapQtAppsHook - qt5.wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/by-name/po/pokerth/package.nix b/pkgs/by-name/po/pokerth/package.nix index bd56a816c9a5..22b8c7190e67 100644 --- a/pkgs/by-name/po/pokerth/package.nix +++ b/pkgs/by-name/po/pokerth/package.nix @@ -63,7 +63,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qt5.qmake qt5.wrapQtAppsHook - qt5.wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 3f29b8d985dd..a72d4f4c4c80 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -68,8 +68,7 @@ stdenv.mkDerivation rec { qttools libsForQt5.wrapQtAppsHook ] - ++ lib.optionals useSCEL [ emacs ] - ++ [ libsForQt5.wrapQtAppsHook ]; + ++ lib.optionals useSCEL [ emacs ]; buildInputs = [ gcc diff --git a/pkgs/tools/misc/coreboot-configurator/default.nix b/pkgs/tools/misc/coreboot-configurator/default.nix index 250d51ee798c..631e18581624 100644 --- a/pkgs/tools/misc/coreboot-configurator/default.nix +++ b/pkgs/tools/misc/coreboot-configurator/default.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation { ninja pkg-config wrapQtAppsHook - wrapQtAppsHook ]; buildInputs = [ yaml-cpp diff --git a/pkgs/tools/misc/qflipper/default.nix b/pkgs/tools/misc/qflipper/default.nix index 3d2f1c873242..d1ea8a0da1fa 100644 --- a/pkgs/tools/misc/qflipper/default.nix +++ b/pkgs/tools/misc/qflipper/default.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation { qttools wrapGAppsHook3 wrapQtAppsHook - wrapQtAppsHook ]; buildInputs = [ From c1d6123460beffba5a595012152ede730a8bac97 Mon Sep 17 00:00:00 2001 From: Jo Date: Fri, 30 Jan 2026 07:18:22 +0100 Subject: [PATCH 11/30] altair: update github owner Got moved into a github org --- pkgs/by-name/al/altair/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/altair/package.nix b/pkgs/by-name/al/altair/package.nix index 6f46cf3feabd..e4059055cbeb 100644 --- a/pkgs/by-name/al/altair/package.nix +++ b/pkgs/by-name/al/altair/package.nix @@ -10,7 +10,7 @@ let version = "8.5.0"; src = fetchurl { - url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; + url = "https://github.com/altair-graphql/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; sha256 = "sha256-ImcnV+Z1J+6wGs3HmlCpXmLb/BbyEcunY+IZ2cbD8Ns="; }; @@ -34,7 +34,7 @@ appimageTools.wrapType2 { meta = { description = "Feature-rich GraphQL Client IDE"; mainProgram = "altair"; - homepage = "https://github.com/imolorhe/altair"; + homepage = "https://github.com/altair-graphql/altair"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ evalexpr ]; platforms = [ "x86_64-linux" ]; From db79d1edb008e58d00fa15593b77d82a24df8d02 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 30 Jan 2026 12:49:38 +0000 Subject: [PATCH 12/30] shoko: 5.2.4 -> 5.2.5 --- pkgs/by-name/sh/shoko/deps.json | 8 ++++---- pkgs/by-name/sh/shoko/package.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/sh/shoko/deps.json b/pkgs/by-name/sh/shoko/deps.json index b6a073b86b27..bf36441b2b94 100644 --- a/pkgs/by-name/sh/shoko/deps.json +++ b/pkgs/by-name/sh/shoko/deps.json @@ -46,13 +46,13 @@ }, { "pname": "Magick.NET-Q8-AnyCPU", - "version": "14.9.1", - "hash": "sha256-4svX77hA0bfAo9Lbbks6RfAwB4DbUI8mwduMbmyaEfQ=" + "version": "14.10.2", + "hash": "sha256-A59uS2ahwzpbr+MAlUV+dGroLYShs12X7SoRHe8ogxc=" }, { "pname": "Magick.NET.Core", - "version": "14.9.1", - "hash": "sha256-FkFcEeK08Jrp9y1znQzy4uyW6sMU1bVi3s5e5em2of4=" + "version": "14.10.2", + "hash": "sha256-Dbx2XVhb0oe0zz1I9XAT+d41fY3hqwQIxt53zKlU+6k=" }, { "pname": "MessagePack", diff --git a/pkgs/by-name/sh/shoko/package.nix b/pkgs/by-name/sh/shoko/package.nix index b378d8cf67c0..ee87e1e50a0f 100644 --- a/pkgs/by-name/sh/shoko/package.nix +++ b/pkgs/by-name/sh/shoko/package.nix @@ -12,13 +12,13 @@ buildDotnetModule (finalAttrs: { pname = "shoko"; - version = "5.2.4"; + version = "5.2.5"; src = fetchFromGitHub { owner = "ShokoAnime"; repo = "ShokoServer"; tag = "v${finalAttrs.version}"; - hash = "sha256-dV2q1eCCBsqe/zsmVoCyBpnbUXQ2tPoWWlZTypZLHV8="; + hash = "sha256-NH7HCneYR0LP96jihz8aS8ifcxnCm7h5GnIYf1k5274="; fetchSubmodules = true; }; From 05ff12cde1499caeb7c8df00160e8578193c6716 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 30 Jan 2026 16:05:45 +0000 Subject: [PATCH 13/30] mapnik: 4.2.0 -> 4.2.1 --- pkgs/by-name/ma/mapnik/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/mapnik/package.nix b/pkgs/by-name/ma/mapnik/package.nix index 55a8ffaa4275..92701d101898 100644 --- a/pkgs/by-name/ma/mapnik/package.nix +++ b/pkgs/by-name/ma/mapnik/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mapnik"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "mapnik"; repo = "mapnik"; tag = "v${finalAttrs.version}"; - hash = "sha256-hlPH0gvEURidPeEnDgpDfp89haMSBoZahoW/xNNZ5XA="; + hash = "sha256-olAM49kcYlhtQUwPk+YjQrLc+ChU+rl3f/A2DDbDLf4="; fetchSubmodules = true; }; From eeb1bdb73fd7e470b3e57beb0834f982c1694c06 Mon Sep 17 00:00:00 2001 From: bernborgess Date: Fri, 30 Jan 2026 14:14:51 -0300 Subject: [PATCH 14/30] lazarus: 4.0-0 -> 4.4-0 --- pkgs/development/compilers/fpc/lazarus.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index 5526d7b94f8d..76507c48f3ef 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -27,7 +27,7 @@ # 1. the build date is embedded in the binary through `$I %DATE%` - we should dump that let - version = "4.0-0"; + version = "4.4-0"; # as of 2.0.10 a suffix is being added. That may or may not disappear and then # come back, so just leave this here. @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${majorMinorPatch version}/lazarus-${version}.tar.gz"; - hash = "sha256-vIM7RxzXqCYSiavND1OhFjuMcG5FmD+zq6kmEiM5z8s="; + hash = "sha256-GQ7ce3p7GEMFAslkpF399UGP8Wu8rVwEQjszoJ0izAY="; }; postPatch = '' From abcb3047a03140d80a5eb80c100b6531f1004afe Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Sat, 31 Jan 2026 01:26:09 +0100 Subject: [PATCH 15/30] python3packages.pydal: add meta.changelog --- pkgs/development/python-modules/pydal/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pydal/default.nix b/pkgs/development/python-modules/pydal/default.nix index dce483024e0c..4a80bb8308db 100644 --- a/pkgs/development/python-modules/pydal/default.nix +++ b/pkgs/development/python-modules/pydal/default.nix @@ -52,6 +52,7 @@ buildPythonPackage rec { meta = { description = "Python Database Abstraction Layer"; homepage = "https://github.com/web2py/pydal"; + changelog = "https://github.com/web2py/pydal/commits/v${version}"; license = with lib.licenses; [ bsd3 ]; maintainers = with lib.maintainers; [ wamserma ]; }; From 4c4bfade4e95323ac606ac8224e19e0f473e77aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 31 Jan 2026 01:01:41 +0000 Subject: [PATCH 16/30] datafusion-cli: 52.0.0 -> 52.1.0 --- pkgs/by-name/da/datafusion-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/da/datafusion-cli/package.nix b/pkgs/by-name/da/datafusion-cli/package.nix index 4e616988d4d7..a806f08c35c8 100644 --- a/pkgs/by-name/da/datafusion-cli/package.nix +++ b/pkgs/by-name/da/datafusion-cli/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "datafusion-cli"; - version = "52.0.0"; + version = "52.1.0"; src = fetchFromGitHub { name = "datafusion-cli-source"; owner = "apache"; repo = "arrow-datafusion"; tag = finalAttrs.version; - hash = "sha256-IwDDm9Chgep6DxUe0+BT2m6i3s6FVQRcMmLQNcQJRZ8="; + hash = "sha256-ViO4Z+8l8hv7gZ1behRlIgV+kdWiGwy+DyaBJrq+gyY="; }; - cargoHash = "sha256-t7ADlBSpjlUCrJnXGl44EZobbiQJqc1vaJPcpx4kJvw="; + cargoHash = "sha256-KZa4/J7JSOP7TN85fj+QzxUTSMOLcZ+rsjNA/bYU+uU="; buildAndTestSubdir = "datafusion-cli"; From b31aefe50cd7952a83a1d48fb284660196691460 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 31 Jan 2026 02:34:28 +0000 Subject: [PATCH 17/30] dash-mpd-cli: 0.2.28 -> 0.2.30 --- pkgs/by-name/da/dash-mpd-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/da/dash-mpd-cli/package.nix b/pkgs/by-name/da/dash-mpd-cli/package.nix index 6417c19fefce..9b1759872af4 100644 --- a/pkgs/by-name/da/dash-mpd-cli/package.nix +++ b/pkgs/by-name/da/dash-mpd-cli/package.nix @@ -24,16 +24,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "dash-mpd-cli"; - version = "0.2.28"; + version = "0.2.30"; src = fetchFromGitHub { owner = "emarsden"; repo = "dash-mpd-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-Q8+HTDdeaqDroBZ1AS+jDxf0yq20jZ+raRCh7gEJYn8="; + hash = "sha256-wFVBHexL0I8eeqWs7V6nS6WFtBVGXQdxuWDCMhFNMJA="; }; - cargoHash = "sha256-YnA/LTw9xCLSnNuFDXlsGzAiTdsst2uIDewuohkkgDU="; + cargoHash = "sha256-CrSlXfMfJnZBqLqHa4KK/q4eH6TyaayCOBQEhjQClbo="; nativeBuildInputs = [ makeWrapper From d67fbf9536f31587546f9d09e1f894f1a0ec7a53 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 31 Jan 2026 03:05:40 +0000 Subject: [PATCH 18/30] python3Packages.onnxmltools: 1.14.0 -> 1.16.0 --- pkgs/development/python-modules/onnxmltools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/onnxmltools/default.nix b/pkgs/development/python-modules/onnxmltools/default.nix index 97989b997c5d..c6b14a648a09 100644 --- a/pkgs/development/python-modules/onnxmltools/default.nix +++ b/pkgs/development/python-modules/onnxmltools/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "onnxmltools"; - version = "1.14.0"; + version = "1.16.0"; pyproject = true; src = fetchFromGitHub { owner = "onnx"; repo = "onnxmltools"; tag = version; - hash = "sha256-CcZlGLX8/ANHnhoOv5s/ybBN74gRH/8eLYJ6q/BJo/4="; + hash = "sha256-2cAxk/Qvu39N/IaIofuTFMciKyxVv3kwsnH4xpGrkIg="; }; build-system = [ From 9aa66aaff327017a65f3f21ac96acbfc15fef976 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 31 Jan 2026 04:31:46 +0000 Subject: [PATCH 19/30] python3Packages.posthog: 7.6.0 -> 7.8.0 --- pkgs/development/python-modules/posthog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/posthog/default.nix b/pkgs/development/python-modules/posthog/default.nix index 8353d9eb076c..70bfb566f7ff 100644 --- a/pkgs/development/python-modules/posthog/default.nix +++ b/pkgs/development/python-modules/posthog/default.nix @@ -22,14 +22,14 @@ buildPythonPackage (finalAttrs: { pname = "posthog"; - version = "7.6.0"; + version = "7.8.0"; pyproject = true; src = fetchFromGitHub { owner = "PostHog"; repo = "posthog-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-eMfFiNqILLom1Q4uCY76LOJijqnzD07KgD69GCxexGY="; + hash = "sha256-7ZM+vmI/9I1eaexVffl76BO5ctxKN51xoaOmP6lFYCU="; }; build-system = [ setuptools ]; From e0c1a77f1fc1878bd044225431bffa09a4860123 Mon Sep 17 00:00:00 2001 From: Ryan Grant Date: Thu, 22 Jan 2026 19:52:31 -0800 Subject: [PATCH 20/30] python3Packages.gpiodevice: init at 0.0.4 --- .../python-modules/gpiodevice/default.nix | 58 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/development/python-modules/gpiodevice/default.nix diff --git a/pkgs/development/python-modules/gpiodevice/default.nix b/pkgs/development/python-modules/gpiodevice/default.nix new file mode 100644 index 000000000000..8f29837fb3e8 --- /dev/null +++ b/pkgs/development/python-modules/gpiodevice/default.nix @@ -0,0 +1,58 @@ +{ + lib, + python, + buildPythonPackage, + pytestCheckHook, + fetchFromGitHub, + hatchling, + hatch-fancy-pypi-readme, + libgpiod, + mock, +}: +buildPythonPackage (finalAttrs: { + pname = "gpiodevice"; + version = "0.0.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pimoroni"; + repo = "gpiodevice-python"; + tag = "v${finalAttrs.version}"; + hash = "sha256-1vZHRCHUmG+t0TYxYzc2qwElKrcLa0WmQ+FI5GTN1A8="; + }; + + build-system = [ + hatchling + hatch-fancy-pypi-readme + ]; + + dependencies = [ + libgpiod + ]; + + nativeCheckInputs = [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "gpiodevice" ]; + + # The build explicitly copies over these docs files, which cause collisions with other pimoroni repos. + # Preserve the files (especially license), but move elsewhere. + postInstall = '' + mkdir -p $out/share/doc/${finalAttrs.pname} + mkdir -p $out/share/licenses/${finalAttrs.pname} + + mv "$out/${python.sitePackages}/LICENSE" $out/share/licenses/${finalAttrs.pname} + mv "$out/${python.sitePackages}/README.md" $out/share/doc/${finalAttrs.pname}/ + mv "$out/${python.sitePackages}/CHANGELOG.md" $out/share/doc/${finalAttrs.pname}/ + ''; + + meta = { + description = "Helper library for working with Linux gpiochip devices"; + homepage = "https://github.com/pimoroni/gpiodevice-python"; + changelog = "https://github.com/pimoroni/gpiodevice-python/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ theconcierge ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1ed705affa04..30976848f3e8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6478,6 +6478,8 @@ self: super: with self; { gpib-ctypes = callPackage ../development/python-modules/gpib-ctypes { }; + gpiodevice = callPackage ../development/python-modules/gpiodevice { }; + gpiozero = callPackage ../development/python-modules/gpiozero { }; gprof2dot = callPackage ../development/python-modules/gprof2dot { inherit (pkgs) graphviz; }; From 834df9e4742b3de8adb31310ade7a7ad1bc91533 Mon Sep 17 00:00:00 2001 From: Ryan Grant Date: Thu, 22 Jan 2026 20:04:05 -0800 Subject: [PATCH 21/30] python3Packages.inky: init at 2.3.0 --- .../python-modules/inky/default.nix | 64 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 66 insertions(+) create mode 100644 pkgs/development/python-modules/inky/default.nix diff --git a/pkgs/development/python-modules/inky/default.nix b/pkgs/development/python-modules/inky/default.nix new file mode 100644 index 000000000000..ee90cb351eb5 --- /dev/null +++ b/pkgs/development/python-modules/inky/default.nix @@ -0,0 +1,64 @@ +{ + lib, + python, + buildPythonPackage, + pytestCheckHook, + fetchFromGitHub, + hatchling, + hatch-fancy-pypi-readme, + hatch-requirements-txt, + numpy, + pillow, + smbus2, + spidev, + gpiodevice, +}: +buildPythonPackage (finalAttrs: { + pname = "inky"; + version = "2.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pimoroni"; + repo = "inky"; + tag = "v${finalAttrs.version}"; + hash = "sha256-1z2AZr6mlrl1O071iWS+tbWopUEUzLZe/QTmvl2atxQ="; + }; + + build-system = [ + hatchling + hatch-fancy-pypi-readme + hatch-requirements-txt + ]; + + dependencies = [ + numpy + pillow + smbus2 + spidev + gpiodevice + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "inky" ]; + + # The build explicitly copies over these docs files, which cause collisions with other pimoroni repos. + # Preserve the files (especially license), but move elsewhere. + postInstall = '' + mkdir -p $out/share/doc/${finalAttrs.pname} + mkdir -p $out/share/licenses/${finalAttrs.pname} + + mv "$out/${python.sitePackages}/LICENSE" $out/share/licenses/${finalAttrs.pname}/ + mv "$out/${python.sitePackages}/README.md" $out/share/doc/${finalAttrs.pname}/ + mv "$out/${python.sitePackages}/CHANGELOG.md" $out/share/doc/${finalAttrs.pname}/ + ''; + + meta = { + description = "Python library for Inky pHAT, Inky wHAT and Inky Impression e-paper displays for Raspberry Pi."; + homepage = "https://github.com/pimoroni/inky"; + changelog = "https://github.com/pimoroni/inky/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ theconcierge ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 30976848f3e8..afe680b80f5e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7390,6 +7390,8 @@ self: super: with self; { inkex = callPackage ../development/python-modules/inkex { }; + inky = callPackage ../development/python-modules/inky { }; + inline-snapshot = callPackage ../development/python-modules/inline-snapshot { }; inotify = callPackage ../development/python-modules/inotify { }; From 2a57b8f6855b172c8bf13827fb59ffbfedfa4f82 Mon Sep 17 00:00:00 2001 From: crertel Date: Sat, 31 Jan 2026 00:06:27 -0600 Subject: [PATCH 22/30] lmstudio: 0.4.0.17 -> 0.4.1.1 --- pkgs/by-name/lm/lmstudio/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index 290aa01855dd..44f6ab2372f4 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -7,10 +7,10 @@ let pname = "lmstudio"; - version_aarch64-darwin = "0.4.0-17"; - hash_aarch64-darwin = "sha256-76Sf1Ew/9IoP0jum64XDiqVnRJNnR99yGzTO3Ys+znU="; - version_x86_64-linux = "0.4.0-17"; - hash_x86_64-linux = "sha256-Su6AalleuxKA9PJiONKZoinCbEaGqgJUwIMA5Bisebs="; + version_aarch64-darwin = "0.4.1-1"; + hash_aarch64-darwin = "sha256-rVmBKDejuOYprHbQ/UhiAm8PfVgGoPTXbx1Qkdi4j+g="; + version_x86_64-linux = "0.4.1-1"; + hash_x86_64-linux = "sha256-0Y4XjK3vfWeY8Z5tQfM6KX4modKFCRy8MNqCUtGKRvA="; meta = { description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)"; From fc4d5e9e9356f2659637ff4d5b3c3fdea2ac0de9 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Sat, 31 Jan 2026 13:31:13 +0530 Subject: [PATCH 23/30] maintainers: add phanirithvij to ngi team Signed-off-by: phanirithvij --- maintainers/team-list.nix | 1 + nixos/modules/services/security/reaction.nix | 1 - nixos/tests/reaction-firewall.nix | 1 - nixos/tests/reaction.nix | 1 - 4 files changed, 1 insertion(+), 3 deletions(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 2153056117c9..e5f2f6402293 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -566,6 +566,7 @@ with lib.maintainers; ethancedwards8 fricklerhandwerk OPNA2608 + phanirithvij prince213 wegank ]; diff --git a/nixos/modules/services/security/reaction.nix b/nixos/modules/services/security/reaction.nix index 1edf4bcc698d..63e7eb586f60 100644 --- a/nixos/modules/services/security/reaction.nix +++ b/nixos/modules/services/security/reaction.nix @@ -204,7 +204,6 @@ in with lib.maintainers; [ ppom - phanirithvij ] ++ lib.teams.ngi.members; } diff --git a/nixos/tests/reaction-firewall.nix b/nixos/tests/reaction-firewall.nix index a3d46cbfda8d..49d4d276da02 100644 --- a/nixos/tests/reaction-firewall.nix +++ b/nixos/tests/reaction-firewall.nix @@ -73,7 +73,6 @@ with lib.maintainers; [ ppom - phanirithvij ] ++ lib.teams.ngi.members; } diff --git a/nixos/tests/reaction.nix b/nixos/tests/reaction.nix index 730c230e4226..4cef6ead87a9 100644 --- a/nixos/tests/reaction.nix +++ b/nixos/tests/reaction.nix @@ -104,7 +104,6 @@ with lib.maintainers; [ ppom - phanirithvij ] ++ lib.teams.ngi.members; } From dcc52f0124398d37e1c10c5778dcbfa6ac3433dc Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sat, 24 Jan 2026 10:20:49 +1100 Subject: [PATCH 24/30] fetchFromCodeberg: init It's 'fetchFromGitea', with the domain already set. Signed-off-by: Fernando Rodrigues --- pkgs/build-support/fetchcodeberg/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 pkgs/build-support/fetchcodeberg/default.nix diff --git a/pkgs/build-support/fetchcodeberg/default.nix b/pkgs/build-support/fetchcodeberg/default.nix new file mode 100644 index 000000000000..4277e5a5613c --- /dev/null +++ b/pkgs/build-support/fetchcodeberg/default.nix @@ -0,0 +1,2 @@ +{ lib, fetchFromGitea }: +lib.makeOverridable (args: fetchFromGitea ({ domain = "codeberg.org"; } // args)) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13ce3260d34a..5004d2adc5a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -645,6 +645,8 @@ with pkgs; fetchFromGitea = callPackage ../build-support/fetchgitea { }; + fetchFromCodeberg = callPackage ../build-support/fetchcodeberg { }; + fetchFromGitHub = callPackage ../build-support/fetchgithub { }; fetchFromBitbucket = callPackage ../build-support/fetchbitbucket { }; From adf7a4850b7d89c0658bdae2daff9680832680a7 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sat, 24 Jan 2026 10:20:49 +1100 Subject: [PATCH 25/30] fetchFromForgejo: init Simple alias, as Gitea's fetcher is compatible with Forgejo. Signed-off-by: Fernando Rodrigues --- 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 5004d2adc5a8..33d2fdea20f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -645,6 +645,8 @@ with pkgs; fetchFromGitea = callPackage ../build-support/fetchgitea { }; + fetchFromForgejo = fetchFromGitea; + fetchFromCodeberg = callPackage ../build-support/fetchcodeberg { }; fetchFromGitHub = callPackage ../build-support/fetchgithub { }; From a1c9639328fb90f894a726d6bca0896fab878b36 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sat, 24 Jan 2026 10:50:18 +1100 Subject: [PATCH 26/30] doc: expand fetchFromGitea's documentation to include fetchFromForgejo and fetchFromCodeberg Signed-off-by: Fernando Rodrigues --- doc/build-helpers/fetchers.chapter.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/build-helpers/fetchers.chapter.md b/doc/build-helpers/fetchers.chapter.md index 3bd2d0751fb7..493dff82a101 100644 --- a/doc/build-helpers/fetchers.chapter.md +++ b/doc/build-helpers/fetchers.chapter.md @@ -855,9 +855,11 @@ Used with Mercurial. Expects `url`, `rev`, `hash`, overridable with [`.over A number of fetcher functions wrap part of `fetchurl` and `fetchzip`. They are mainly convenience functions intended for commonly used destinations of source code in Nixpkgs. These wrapper fetchers are listed below. -## `fetchFromGitea` {#fetchfromgitea} +## `fetchFromGitea`, `fetchFromForgejo` and `fetchFromCodeberg` {#fetchfromgitea} -`fetchFromGitea` expects five arguments. `domain` is the gitea server name. `owner` is a string corresponding to the Gitea user or organization that controls this repository. `repo` corresponds to the name of the software repository. These are located at the top of every Gitea HTML page as `owner`/`repo`. `rev` corresponds to the Git commit hash or tag (e.g `v1.0`) that will be downloaded from Git. Finally, `hash` corresponds to the hash of the extracted directory. Again, other hash algorithms are also available but `hash` is currently preferred. +`fetchFromGitea`, also aliased to `fetchFromForgejo`, expects five arguments. `domain` is the Gitea/Forgejo server name. `owner` is a string corresponding to the user or organization that controls this repository. `repo` corresponds to the name of the software repository. These are located at the top of every Gitea/Forgejo HTML page as `owner`/`repo`. `rev` corresponds to the Git commit hash or tag (e.g `v1.0`) that will be downloaded from Git. Finally, `hash` corresponds to the hash of the extracted directory. Again, other hash algorithms are also available but `hash` is currently preferred. + +As is currently the most popular public Forgejo server, the `fetchFromCodeberg` fetcher is also available, which pre-fills the `domain` attribute. ## `fetchFromGitHub` {#fetchfromgithub} From 3562403503f705f700bcbd9b1c1bae1c6641f519 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sat, 31 Jan 2026 21:01:33 +1100 Subject: [PATCH 27/30] treewide: fetchFromGitea -> fetchFromCodeberg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Most packages that used fetchFromGitea fetch their sources from Codeberg, so might as well migrate them. The following command was used for this treewide: ```fish for i in (rg 'fetchFromGitea \{\n *domain = "codeberg.org";' --multiline --files-with-matches) sed -z 's/fetchFromGitea {\n *domain = "codeberg.org";/fetchFromCodeberg {/g' $i > $i.tmp && mv $i.tmp $i sed -i 's/fetchFromGitea/fetchFromCodeberg/g' $i end ``` The following paths were manually edited: * pkgs/by-name/xr/xrsh/package.nix * pkgs/applications/networking/browsers/librewolf/src.nix * pkgs/by-name/go/gotosocial/package.nix * pkgs/by-name/ka/katawa-shoujo-re-engineered/package.nix Co-authored-by: Gutyina Gergő Signed-off-by: Fernando Rodrigues --- .../vim/plugins/non-generated/cmp-async-path/default.nix | 5 ++--- .../vim/plugins/non-generated/zig-vim/default.nix | 5 ++--- pkgs/applications/networking/browsers/librewolf/src.nix | 5 ++--- pkgs/by-name/ar/arcan/sources.nix | 5 ++--- pkgs/by-name/bi/bibiman/package.nix | 5 ++--- pkgs/by-name/bi/biboumi/package.nix | 5 ++--- pkgs/by-name/ca/caffeine-ng/package.nix | 5 ++--- pkgs/by-name/ca/calamares/package.nix | 5 ++--- pkgs/by-name/ca/cat9/package.nix | 5 ++--- pkgs/by-name/ce/censor/package.nix | 5 ++--- pkgs/by-name/co/codeberg-cli/package.nix | 5 ++--- pkgs/by-name/co/codeberg-pages/package.nix | 5 ++--- pkgs/by-name/co/colorpanes/package.nix | 5 ++--- pkgs/by-name/co/comaps/package.nix | 5 ++--- pkgs/by-name/cu/cunicu/package.nix | 5 ++--- pkgs/by-name/cu/curv/package.nix | 5 ++--- pkgs/by-name/da/dabet/package.nix | 5 ++--- pkgs/by-name/de/delfin/package.nix | 5 ++--- pkgs/by-name/de/deltatouch/package.nix | 5 ++--- pkgs/by-name/de/dev86/package.nix | 5 ++--- pkgs/by-name/di/didu/package.nix | 5 ++--- pkgs/by-name/do/door-knocker/package.nix | 5 ++--- pkgs/by-name/du/durden/package.nix | 5 ++--- pkgs/by-name/du/dut/package.nix | 5 ++--- pkgs/by-name/dw/dwl/package.nix | 5 ++--- pkgs/by-name/ed/eduvpn-client/package.nix | 5 ++--- pkgs/by-name/ev/evscript/package.nix | 5 ++--- pkgs/by-name/fa/faircamp/package.nix | 5 ++--- pkgs/by-name/fc/fcft/package.nix | 5 ++--- pkgs/by-name/fe/fehlstart/package.nix | 5 ++--- pkgs/by-name/fi/find-billy/package.nix | 5 ++--- pkgs/by-name/fj/fjo/package.nix | 5 ++--- pkgs/by-name/fn/fnott/package.nix | 5 ++--- pkgs/by-name/fo/foot/package.nix | 5 ++--- pkgs/by-name/fo/forgejo-cli/package.nix | 5 ++--- pkgs/by-name/fo/forgejo/generic.nix | 5 ++--- pkgs/by-name/fu/fuzzel/package.nix | 5 ++--- pkgs/by-name/fy/fyi/package.nix | 5 ++--- pkgs/by-name/ga/game-devices-udev-rules/package.nix | 5 ++--- pkgs/by-name/ga/gamja/package.nix | 5 ++--- pkgs/by-name/ge/gex/package.nix | 5 ++--- pkgs/by-name/gi/git-pages-cli/package.nix | 5 ++--- pkgs/by-name/gi/git-unroll/package.nix | 5 ++--- pkgs/by-name/gi/gitolite/package.nix | 5 ++--- pkgs/by-name/go/go-errorlint/package.nix | 5 ++--- pkgs/by-name/go/gose/package.nix | 5 ++--- pkgs/by-name/go/gotosocial/package.nix | 9 ++++----- pkgs/by-name/gu/guile-hoot/package.nix | 5 ++--- pkgs/by-name/gu/guile-json-rpc/package.nix | 5 ++--- pkgs/by-name/gu/guile-lsp-server/package.nix | 5 ++--- pkgs/by-name/gu/guile-srfi-145/package.nix | 5 ++--- pkgs/by-name/gu/guile-srfi-180/package.nix | 5 ++--- pkgs/by-name/gu/gumbo/package.nix | 5 ++--- pkgs/by-name/gu/gummy/package.nix | 5 ++--- pkgs/by-name/ha/hail/package.nix | 5 ++--- pkgs/by-name/ha/harmonist/package.nix | 5 ++--- pkgs/by-name/hx/hxtools/package.nix | 5 ++--- pkgs/by-name/if/ifstate/package.nix | 5 ++--- pkgs/by-name/ij/ijq/package.nix | 5 ++--- pkgs/by-name/in/inhibridge/package.nix | 5 ++--- pkgs/by-name/in/inxi/package.nix | 5 ++--- pkgs/by-name/ip/ipam/package.nix | 5 ++--- pkgs/by-name/ip/ipmitool/package.nix | 5 ++--- pkgs/by-name/jd/jdupes/package.nix | 5 ++--- pkgs/by-name/jo/jogger/package.nix | 5 ++--- pkgs/by-name/ka/kabeljau/package.nix | 5 ++--- pkgs/by-name/ka/katawa-shoujo-re-engineered/package.nix | 5 ++--- pkgs/by-name/ka/kaufkauflist/package.nix | 5 ++--- pkgs/by-name/ke/keyoxide-cli/package.nix | 5 ++--- pkgs/by-name/ki/kitget/package.nix | 5 ++--- pkgs/by-name/ko/komikku/package.nix | 5 ++--- pkgs/by-name/kx/kx-aspe-cli/package.nix | 5 ++--- pkgs/by-name/l8/l8w8jwt/package.nix | 5 ++--- pkgs/by-name/la/lauti/package.nix | 5 ++--- pkgs/by-name/lc/lcagent/package.nix | 5 ++--- pkgs/by-name/lc/lcrq/package.nix | 5 ++--- pkgs/by-name/lc/lcsync/package.nix | 5 ++--- pkgs/by-name/lc/lctime/package.nix | 5 ++--- pkgs/by-name/li/libHX/package.nix | 5 ++--- pkgs/by-name/li/libid3tag/package.nix | 5 ++--- pkgs/by-name/li/libjodycode/package.nix | 5 ++--- pkgs/by-name/li/librecast/package.nix | 5 ++--- pkgs/by-name/li/libssc/package.nix | 5 ++--- pkgs/by-name/li/listenbrainz-mpd/package.nix | 5 ++--- pkgs/by-name/li/litemdview/package.nix | 5 ++--- pkgs/by-name/ls/lspmux/package.nix | 5 ++--- pkgs/by-name/lx/lxqt-panel-profiles/package.nix | 5 ++--- pkgs/by-name/ly/ly/package.nix | 5 ++--- pkgs/by-name/md/mdhtml/package.nix | 5 ++--- pkgs/by-name/me/meme-bingo-web/package.nix | 5 ++--- pkgs/by-name/me/mergiraf/package.nix | 5 ++--- pkgs/by-name/me/mew/package.nix | 5 ++--- pkgs/by-name/mi/mitra/package.nix | 5 ++--- pkgs/by-name/mk/mkvtoolnix/package.nix | 5 ++--- pkgs/by-name/ml/mlmmj/package.nix | 5 ++--- pkgs/by-name/mo/mozhi/package.nix | 5 ++--- pkgs/by-name/mp/mpv/scripts/sponsorblock-minimal.nix | 5 ++--- pkgs/by-name/ne/newsraft/package.nix | 5 ++--- pkgs/by-name/ng/ngn-k/package.nix | 5 ++--- pkgs/by-name/ni/nix-web/package.nix | 5 ++--- pkgs/by-name/nm/nm-file-secret-agent/package.nix | 5 ++--- pkgs/by-name/no/nodeinfo/package.nix | 5 ++--- pkgs/by-name/ns/nsxiv/package.nix | 5 ++--- pkgs/by-name/nu/nucleus/package.nix | 5 ++--- pkgs/by-name/op/openpgp-card-tools/package.nix | 5 ++--- pkgs/by-name/ou/outfly/package.nix | 5 ++--- pkgs/by-name/pa/pam_mount/package.nix | 5 ++--- pkgs/by-name/pa/pay-respects/package.nix | 5 ++--- pkgs/by-name/pc/pcapc/package.nix | 5 ++--- pkgs/by-name/ph/phantom/package.nix | 5 ++--- pkgs/by-name/po/poezio/package.nix | 5 ++--- pkgs/by-name/qi/qiv/package.nix | 5 ++--- pkgs/by-name/ra/ratman/package.nix | 5 ++--- pkgs/by-name/re/readeck/package.nix | 5 ++--- pkgs/by-name/re/recordbox/package.nix | 5 ++--- pkgs/by-name/ri/rimgo/package.nix | 5 ++--- pkgs/by-name/ri/river-classic/package.nix | 5 ++--- pkgs/by-name/rp/rpPPPoE/package.nix | 5 ++--- pkgs/by-name/rs/rsop/package.nix | 5 ++--- pkgs/by-name/rw/rwedid/package.nix | 5 ++--- pkgs/by-name/sa/sanctity/package.nix | 5 ++--- pkgs/by-name/sa/satellite/package.nix | 5 ++--- pkgs/by-name/se/seehecht/package.nix | 5 ++--- pkgs/by-name/se/seppo/package.nix | 5 ++--- pkgs/by-name/sn/snac2/package.nix | 5 ++--- pkgs/by-name/sn/snekim/package.nix | 5 ++--- pkgs/by-name/so/soju/package.nix | 5 ++--- pkgs/by-name/so/soundalike/package.nix | 8 +++----- pkgs/by-name/so/soundtouch/package.nix | 5 ++--- pkgs/by-name/sq/sqlauncher/package.nix | 5 ++--- pkgs/by-name/ss/ssh-openpgp-auth/generic.nix | 5 ++--- pkgs/by-name/ss/ssh-tools/package.nix | 5 ++--- pkgs/by-name/st/stockpile/package.nix | 5 ++--- pkgs/by-name/sx/sxcs/package.nix | 5 ++--- pkgs/by-name/sy/synadm/package.nix | 5 ++--- pkgs/by-name/te/tenacity/package.nix | 5 ++--- pkgs/by-name/tl/tllist/package.nix | 5 ++--- pkgs/by-name/tu/turbocase/package.nix | 5 ++--- pkgs/by-name/tu/turnon/package.nix | 5 ++--- pkgs/by-name/tu/turntable/package.nix | 5 ++--- pkgs/by-name/ty/typesetter/package.nix | 5 ++--- pkgs/by-name/ub/ubpm/package.nix | 5 ++--- pkgs/by-name/up/upsies/package.nix | 5 ++--- pkgs/by-name/uw/uwu-colors/package.nix | 5 ++--- pkgs/by-name/wa/wallust/package.nix | 5 ++--- pkgs/by-name/wa/waylock/package.nix | 5 ++--- pkgs/by-name/wb/wbg/package.nix | 5 ++--- pkgs/by-name/wl/wlock/package.nix | 5 ++--- pkgs/by-name/wm/wmenu/package.nix | 5 ++--- .../by-name/wo/woodpecker-pipeline-transform/package.nix | 5 ++--- pkgs/by-name/wo/wownero/package.nix | 8 +++----- pkgs/by-name/wx/wxc/package.nix | 5 ++--- pkgs/by-name/x1/x11basic/package.nix | 5 ++--- pkgs/by-name/xa/xarcan/package.nix | 5 ++--- pkgs/by-name/xc/xcalib/package.nix | 5 ++--- pkgs/by-name/xd/xdg-terminal-exec-mkhl/package.nix | 5 ++--- pkgs/by-name/xm/xmppc/package.nix | 5 ++--- pkgs/by-name/xr/xrsh/package.nix | 5 ++--- pkgs/by-name/ya/yambar/package.nix | 5 ++--- pkgs/by-name/zi/zig-shell-completions/package.nix | 5 ++--- pkgs/development/compilers/zig/generic.nix | 5 ++--- pkgs/development/hare-third-party/hare-toml/default.nix | 5 ++--- pkgs/development/misc/haskell/changelog-d/default.nix | 5 ++--- .../python-modules/aiobtclientapi/default.nix | 5 ++--- .../python-modules/aiobtclientrpc/default.nix | 5 ++--- pkgs/development/python-modules/aioxmpp/default.nix | 5 ++--- pkgs/development/python-modules/clickclick/default.nix | 5 ++--- pkgs/development/python-modules/countryguess/default.nix | 5 ++--- .../python-modules/desktop-entry-lib/default.nix | 5 ++--- .../python-modules/django-allauth/default.nix | 5 ++--- pkgs/development/python-modules/eheimdigital/default.nix | 5 ++--- pkgs/development/python-modules/fortune/default.nix | 5 ++--- pkgs/development/python-modules/highctidh/default.nix | 5 ++--- pkgs/development/python-modules/inflate64/default.nix | 5 ++--- .../python-modules/liberty-parser/default.nix | 5 ++--- .../python-modules/multivolumefile/default.nix | 5 ++--- pkgs/development/python-modules/psnawp/default.nix | 5 ++--- pkgs/development/python-modules/pybcj/default.nix | 5 ++--- pkgs/development/python-modules/pydle/default.nix | 5 ++--- pkgs/development/python-modules/pyimgbox/default.nix | 5 ++--- pkgs/development/python-modules/pykakasi/default.nix | 5 ++--- pkgs/development/python-modules/pyppmd/default.nix | 5 ++--- pkgs/kde/third-party/krohnkite/default.nix | 5 ++--- pkgs/os-specific/linux/shufflecake/default.nix | 5 ++--- .../home-assistant/custom-components/gpio/package.nix | 5 ++--- pkgs/tools/networking/knock/package.nix | 5 ++--- 186 files changed, 376 insertions(+), 564 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix index be06a8fb9b08..182f170c34db 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix @@ -1,7 +1,7 @@ { lib, vimUtils, - fetchFromGitea, + fetchFromCodeberg, nix-update-script, vimPlugins, }: @@ -9,8 +9,7 @@ vimUtils.buildVimPlugin { pname = "cmp-async-path"; version = "0-unstable-2026-01-09"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "FelipeLema"; repo = "cmp-async-path"; rev = "9c2374deb32c2bec8b27e928c6f57090e9a875d2"; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/zig-vim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/zig-vim/default.nix index 53186307e380..2b8769c381b7 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/zig-vim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/zig-vim/default.nix @@ -1,15 +1,14 @@ { lib, vimUtils, - fetchFromGitea, + fetchFromCodeberg, nix-update-script, }: vimUtils.buildVimPlugin { pname = "zig.vim"; version = "0-unstable-2026-01-16"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "ziglang"; repo = "zig.vim"; rev = "fc01f73ce0636723a03b784b63a7a89f2f9a84ae"; diff --git a/pkgs/applications/networking/browsers/librewolf/src.nix b/pkgs/applications/networking/browsers/librewolf/src.nix index da05c980e09b..fd8e8a7656bc 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.nix +++ b/pkgs/applications/networking/browsers/librewolf/src.nix @@ -1,17 +1,16 @@ { lib, fetchurl, - fetchFromGitea, + fetchFromCodeberg, }: let src = lib.importJSON ./src.json; in { inherit (src) packageVersion; - source = fetchFromGitea ( + source = fetchFromCodeberg ( src.source // { - domain = "codeberg.org"; owner = "librewolf"; repo = "source"; fetchSubmodules = true; diff --git a/pkgs/by-name/ar/arcan/sources.nix b/pkgs/by-name/ar/arcan/sources.nix index 2296acf66870..6a6ad741753a 100644 --- a/pkgs/by-name/ar/arcan/sources.nix +++ b/pkgs/by-name/ar/arcan/sources.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, - fetchFromGitea, + fetchFromCodeberg, }: { @@ -10,8 +10,7 @@ pname = "arcan"; version = "0.7.1"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "letoram"; repo = "arcan"; tag = self.version; diff --git a/pkgs/by-name/bi/bibiman/package.nix b/pkgs/by-name/bi/bibiman/package.nix index a6c049d37067..335a55c26b47 100644 --- a/pkgs/by-name/bi/bibiman/package.nix +++ b/pkgs/by-name/bi/bibiman/package.nix @@ -1,5 +1,5 @@ { - fetchFromGitea, + fetchFromCodeberg, lib, nix-update-script, rustPlatform, @@ -10,8 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "bibiman"; version = "0.15.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "lukeflo"; repo = "bibiman"; tag = "v${version}"; diff --git a/pkgs/by-name/bi/biboumi/package.nix b/pkgs/by-name/bi/biboumi/package.nix index ccf3d25dd507..5f6794d43965 100644 --- a/pkgs/by-name/bi/biboumi/package.nix +++ b/pkgs/by-name/bi/biboumi/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, cmake, libuuid, expat, @@ -28,8 +28,7 @@ stdenv.mkDerivation { pname = "biboumi"; version = "9.0-unstable-2025-10-27"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "poezio"; repo = "biboumi"; rev = "61242c35bc825d58c9db4301b5696bc17428bf98"; diff --git a/pkgs/by-name/ca/caffeine-ng/package.nix b/pkgs/by-name/ca/caffeine-ng/package.nix index 4033294abba9..823ed674c67d 100644 --- a/pkgs/by-name/ca/caffeine-ng/package.nix +++ b/pkgs/by-name/ca/caffeine-ng/package.nix @@ -1,5 +1,5 @@ { - fetchFromGitea, + fetchFromCodeberg, meson, ninja, pkg-config, @@ -22,8 +22,7 @@ python3Packages.buildPythonApplication rec { version = "4.2.0"; pyproject = false; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "WhyNotHugo"; repo = "caffeine-ng"; rev = "v${version}"; diff --git a/pkgs/by-name/ca/calamares/package.nix b/pkgs/by-name/ca/calamares/package.nix index 7c55735d5acb..18f4fc3034f0 100644 --- a/pkgs/by-name/ca/calamares/package.nix +++ b/pkgs/by-name/ca/calamares/package.nix @@ -5,7 +5,7 @@ writeShellScriptBin, xdg-utils, - fetchFromGitea, + fetchFromCodeberg, cmake, ninja, @@ -38,8 +38,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "calamares"; version = "3.4.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "Calamares"; repo = "calamares"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/ca/cat9/package.nix b/pkgs/by-name/ca/cat9/package.nix index 47d105555b55..a06a11131ab4 100644 --- a/pkgs/by-name/ca/cat9/package.nix +++ b/pkgs/by-name/ca/cat9/package.nix @@ -1,6 +1,6 @@ { lib, - fetchFromGitea, + fetchFromCodeberg, stdenvNoCC, }: @@ -8,8 +8,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cat9"; version = "0-unstable-2025-12-26"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "letoram"; repo = "cat9"; rev = "8d2b30545c3e87c8f2e161d755b53c23a48bcf05"; diff --git a/pkgs/by-name/ce/censor/package.nix b/pkgs/by-name/ce/censor/package.nix index 6aa4cebf3ac0..1017f43d0b42 100644 --- a/pkgs/by-name/ce/censor/package.nix +++ b/pkgs/by-name/ce/censor/package.nix @@ -1,6 +1,6 @@ { lib, - fetchFromGitea, + fetchFromCodeberg, python3Packages, wrapGAppsHook4, gobject-introspection, @@ -16,8 +16,7 @@ python3Packages.buildPythonApplication rec { version = "0.3.0"; pyproject = false; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "censor"; repo = "Censor"; tag = "v${version}"; diff --git a/pkgs/by-name/co/codeberg-cli/package.nix b/pkgs/by-name/co/codeberg-cli/package.nix index cc5dbc5a705f..68fc1cc1d00c 100644 --- a/pkgs/by-name/co/codeberg-cli/package.nix +++ b/pkgs/by-name/co/codeberg-cli/package.nix @@ -1,5 +1,5 @@ { - fetchFromGitea, + fetchFromCodeberg, installShellFiles, lib, openssl, @@ -11,8 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "codeberg-cli"; version = "0.5.4"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "Aviac"; repo = "codeberg-cli"; rev = "v${version}"; diff --git a/pkgs/by-name/co/codeberg-pages/package.nix b/pkgs/by-name/co/codeberg-pages/package.nix index 0c64b41bb0fa..9834beececbc 100644 --- a/pkgs/by-name/co/codeberg-pages/package.nix +++ b/pkgs/by-name/co/codeberg-pages/package.nix @@ -1,6 +1,6 @@ { lib, - fetchFromGitea, + fetchFromCodeberg, buildGoModule, nix-update-script, }: @@ -9,8 +9,7 @@ buildGoModule rec { pname = "codeberg-pages"; version = "6.4"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "Codeberg"; repo = "pages-server"; rev = "v${version}"; diff --git a/pkgs/by-name/co/colorpanes/package.nix b/pkgs/by-name/co/colorpanes/package.nix index c7888967acdc..234bc0a88b2c 100644 --- a/pkgs/by-name/co/colorpanes/package.nix +++ b/pkgs/by-name/co/colorpanes/package.nix @@ -1,15 +1,14 @@ { lib, rustPlatform, - fetchFromGitea, + fetchFromCodeberg, }: rustPlatform.buildRustPackage rec { pname = "colorpanes"; version = "3.0.1"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "annaaurora"; repo = "colorpanes"; rev = "v${version}"; diff --git a/pkgs/by-name/co/comaps/package.nix b/pkgs/by-name/co/comaps/package.nix index dadb09e62f0a..14eeda4a94bb 100644 --- a/pkgs/by-name/co/comaps/package.nix +++ b/pkgs/by-name/co/comaps/package.nix @@ -2,7 +2,7 @@ lib, organicmaps, fetchurl, - fetchFromGitea, + fetchFromCodeberg, boost, gtest, glm, @@ -38,8 +38,7 @@ organicmaps.overrideAttrs (oldAttrs: rec { pname = "comaps"; version = "2025.11.07-2"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "comaps"; repo = "comaps"; tag = "v${version}"; diff --git a/pkgs/by-name/cu/cunicu/package.nix b/pkgs/by-name/cu/cunicu/package.nix index 75bb5851609a..00b496de837e 100644 --- a/pkgs/by-name/cu/cunicu/package.nix +++ b/pkgs/by-name/cu/cunicu/package.nix @@ -2,7 +2,7 @@ lib, stdenv, buildGoModule, - fetchFromGitea, + fetchFromCodeberg, installShellFiles, versionCheckHook, protobuf, @@ -14,8 +14,7 @@ buildGoModule rec { pname = "cunicu"; version = "0.12.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "cunicu"; repo = "cunicu"; rev = "v${version}"; diff --git a/pkgs/by-name/cu/curv/package.nix b/pkgs/by-name/cu/curv/package.nix index 4d445fa00c80..f69186b22704 100644 --- a/pkgs/by-name/cu/curv/package.nix +++ b/pkgs/by-name/cu/curv/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, cmake, git, pkg-config, @@ -29,8 +29,7 @@ stdenv.mkDerivation { pname = "curv"; version = "0.5-unstable-2026-01-23"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "doug-moen"; repo = "curv"; rev = "17d03b534c69976ed60936beb8b7cc38e8c12c13"; diff --git a/pkgs/by-name/da/dabet/package.nix b/pkgs/by-name/da/dabet/package.nix index 87cf7ea12a35..fbbc7856fcaf 100644 --- a/pkgs/by-name/da/dabet/package.nix +++ b/pkgs/by-name/da/dabet/package.nix @@ -1,15 +1,14 @@ { lib, rustPlatform, - fetchFromGitea, + fetchFromCodeberg, }: rustPlatform.buildRustPackage rec { pname = "dabet"; version = "3.0.1"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "annaaurora"; repo = "dabet"; rev = "v${version}"; diff --git a/pkgs/by-name/de/delfin/package.nix b/pkgs/by-name/de/delfin/package.nix index 9575d4f96bcf..c4e32fa7d3a0 100644 --- a/pkgs/by-name/de/delfin/package.nix +++ b/pkgs/by-name/de/delfin/package.nix @@ -4,7 +4,7 @@ appstream, cargo, desktop-file-utils, - fetchFromGitea, + fetchFromCodeberg, gitUpdater, gtk4, libadwaita, @@ -24,8 +24,7 @@ stdenv.mkDerivation rec { pname = "delfin"; version = "0.4.8"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "avery42"; repo = "delfin"; rev = "v${version}"; diff --git a/pkgs/by-name/de/deltatouch/package.nix b/pkgs/by-name/de/deltatouch/package.nix index 5ba82a4515ad..97d579abf41e 100644 --- a/pkgs/by-name/de/deltatouch/package.nix +++ b/pkgs/by-name/de/deltatouch/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, fetchFromGitHub, cmake, intltool, @@ -32,8 +32,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "deltatouch"; version = "2.25.1"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "lk108"; repo = "deltatouch"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/de/dev86/package.nix b/pkgs/by-name/de/dev86/package.nix index 9b19da1d43e8..ba075a1d7418 100644 --- a/pkgs/by-name/de/dev86/package.nix +++ b/pkgs/by-name/de/dev86/package.nix @@ -1,15 +1,14 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, }: stdenv.mkDerivation (finalAttrs: { pname = "dev86"; version = "1.0.1-unstable-2025-02-12"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "jbruchon"; repo = "dev86"; rev = "0332db1ceb238fa7f98603cdf4223a1d839d4b31"; diff --git a/pkgs/by-name/di/didu/package.nix b/pkgs/by-name/di/didu/package.nix index 6a63d9095dc8..bc574cbcb6cc 100644 --- a/pkgs/by-name/di/didu/package.nix +++ b/pkgs/by-name/di/didu/package.nix @@ -1,15 +1,14 @@ { lib, rustPlatform, - fetchFromGitea, + fetchFromCodeberg, }: rustPlatform.buildRustPackage rec { pname = "didu"; version = "2.5.2"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "annaaurora"; repo = "didu"; rev = "v${version}"; diff --git a/pkgs/by-name/do/door-knocker/package.nix b/pkgs/by-name/do/door-knocker/package.nix index 658560673848..8f6e4442a1f4 100644 --- a/pkgs/by-name/do/door-knocker/package.nix +++ b/pkgs/by-name/do/door-knocker/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - fetchFromGitea, + fetchFromCodeberg, blueprint-compiler, desktop-file-utils, glib, @@ -17,8 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "door-knocker"; version = "0.8.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "tytan652"; repo = "door-knocker"; rev = finalAttrs.version; diff --git a/pkgs/by-name/du/durden/package.nix b/pkgs/by-name/du/durden/package.nix index add016690ff1..57ec7ed07277 100644 --- a/pkgs/by-name/du/durden/package.nix +++ b/pkgs/by-name/du/durden/package.nix @@ -1,15 +1,14 @@ { lib, stdenvNoCC, - fetchFromGitea, + fetchFromCodeberg, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "durden"; version = "0.6.3"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "letoram"; repo = "durden"; tag = finalAttrs.version; diff --git a/pkgs/by-name/du/dut/package.nix b/pkgs/by-name/du/dut/package.nix index 3185cbc763ea..24e445433530 100644 --- a/pkgs/by-name/du/dut/package.nix +++ b/pkgs/by-name/du/dut/package.nix @@ -1,15 +1,14 @@ { stdenv, lib, - fetchFromGitea, + fetchFromCodeberg, }: stdenv.mkDerivation { pname = "dut"; version = "0-unstable-2024-07-31"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "201984"; repo = "dut"; rev = "041c6f26162c2286776fac246ddbda312da1563d"; diff --git a/pkgs/by-name/dw/dwl/package.nix b/pkgs/by-name/dw/dwl/package.nix index ae12368f19e1..0c28d18fa496 100644 --- a/pkgs/by-name/dw/dwl/package.nix +++ b/pkgs/by-name/dw/dwl/package.nix @@ -1,6 +1,6 @@ { lib, - fetchFromGitea, + fetchFromCodeberg, installShellFiles, libX11, libinput, @@ -41,8 +41,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "dwl"; version = "0.7"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "dwl"; repo = "dwl"; rev = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/ed/eduvpn-client/package.nix b/pkgs/by-name/ed/eduvpn-client/package.nix index 63c57085ef8a..47bcfbda3928 100644 --- a/pkgs/by-name/ed/eduvpn-client/package.nix +++ b/pkgs/by-name/ed/eduvpn-client/package.nix @@ -1,6 +1,6 @@ { lib, - fetchFromGitea, + fetchFromCodeberg, gdk-pixbuf, gobject-introspection, gtk3, @@ -16,8 +16,7 @@ python3Packages.buildPythonApplication rec { version = "4.6.0"; pyproject = true; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "eduVPN"; repo = "linux-app"; rev = version; diff --git a/pkgs/by-name/ev/evscript/package.nix b/pkgs/by-name/ev/evscript/package.nix index 675cad69b85e..81e347269928 100644 --- a/pkgs/by-name/ev/evscript/package.nix +++ b/pkgs/by-name/ev/evscript/package.nix @@ -1,15 +1,14 @@ { lib, rustPlatform, - fetchFromGitea, + fetchFromCodeberg, }: rustPlatform.buildRustPackage rec { pname = "evscript"; version = "0.1.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "valpackett"; repo = "evscript"; rev = version; diff --git a/pkgs/by-name/fa/faircamp/package.nix b/pkgs/by-name/fa/faircamp/package.nix index 16788fb7e169..831deab64748 100644 --- a/pkgs/by-name/fa/faircamp/package.nix +++ b/pkgs/by-name/fa/faircamp/package.nix @@ -1,7 +1,7 @@ { lib, rustPlatform, - fetchFromGitea, + fetchFromCodeberg, makeWrapper, pkg-config, glib, @@ -17,8 +17,7 @@ rustPlatform.buildRustPackage rec { pname = "faircamp"; version = "1.7.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "simonrepp"; repo = "faircamp"; rev = version; diff --git a/pkgs/by-name/fc/fcft/package.nix b/pkgs/by-name/fc/fcft/package.nix index a59b2da9f9a2..71a3e443499d 100644 --- a/pkgs/by-name/fc/fcft/package.nix +++ b/pkgs/by-name/fc/fcft/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - fetchFromGitea, + fetchFromCodeberg, pkg-config, meson, ninja, @@ -35,8 +35,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fcft"; version = "3.3.3"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "dnkl"; repo = "fcft"; rev = finalAttrs.version; diff --git a/pkgs/by-name/fe/fehlstart/package.nix b/pkgs/by-name/fe/fehlstart/package.nix index 730d8155ab28..93ea50e75891 100644 --- a/pkgs/by-name/fe/fehlstart/package.nix +++ b/pkgs/by-name/fe/fehlstart/package.nix @@ -5,15 +5,14 @@ gtk3, glib, keybinder3, - fetchFromGitea, + fetchFromCodeberg, }: stdenv.mkDerivation { pname = "fehlstart"; version = "0.5-unstable-2025-01-12"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "chuvok"; repo = "fehlstart"; rev = "cf08d6c3964da9abc8d1af0725894fef62352064"; diff --git a/pkgs/by-name/fi/find-billy/package.nix b/pkgs/by-name/fi/find-billy/package.nix index 7cdb6dfd7a40..5ae0bddf5b23 100644 --- a/pkgs/by-name/fi/find-billy/package.nix +++ b/pkgs/by-name/fi/find-billy/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - fetchFromGitea, + fetchFromCodeberg, godot_4, makeWrapper, just, @@ -14,8 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "find-billy"; version = "1.1.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "annaaurora"; repo = "Find-Billy"; rev = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/fj/fjo/package.nix b/pkgs/by-name/fj/fjo/package.nix index 6d73be045dce..a82ca86af011 100644 --- a/pkgs/by-name/fj/fjo/package.nix +++ b/pkgs/by-name/fj/fjo/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, rustPlatform, openssl, pkg-config, @@ -11,8 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "fjo"; version = "0.3.5"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "VoiDD"; repo = "fjo"; rev = "v${version}"; diff --git a/pkgs/by-name/fn/fnott/package.nix b/pkgs/by-name/fn/fnott/package.nix index ff0a1cd1259d..e185e4b33ce7 100644 --- a/pkgs/by-name/fn/fnott/package.nix +++ b/pkgs/by-name/fn/fnott/package.nix @@ -2,7 +2,7 @@ stdenv, lib, gitUpdater, - fetchFromGitea, + fetchFromCodeberg, pkg-config, meson, ninja, @@ -23,8 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fnott"; version = "1.8.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "dnkl"; repo = "fnott"; rev = finalAttrs.version; diff --git a/pkgs/by-name/fo/foot/package.nix b/pkgs/by-name/fo/foot/package.nix index bafdde217258..f8119264478a 100644 --- a/pkgs/by-name/fo/foot/package.nix +++ b/pkgs/by-name/fo/foot/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - fetchFromGitea, + fetchFromCodeberg, fetchurl, runCommand, fcft, @@ -99,8 +99,7 @@ stdenv.mkDerivation { pname = "foot"; inherit version; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "dnkl"; repo = "foot"; tag = version; diff --git a/pkgs/by-name/fo/forgejo-cli/package.nix b/pkgs/by-name/fo/forgejo-cli/package.nix index 0cba165ee615..c3fb383b9465 100644 --- a/pkgs/by-name/fo/forgejo-cli/package.nix +++ b/pkgs/by-name/fo/forgejo-cli/package.nix @@ -2,7 +2,7 @@ lib, stdenv, rustPlatform, - fetchFromGitea, + fetchFromCodeberg, pkg-config, installShellFiles, writableTmpDirAsHomeHook, @@ -15,8 +15,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "forgejo-cli"; version = "0.4.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "forgejo-contrib"; repo = "forgejo-cli"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix index c11dd55225ca..7941ab8de3b5 100644 --- a/pkgs/by-name/fo/forgejo/generic.nix +++ b/pkgs/by-name/fo/forgejo/generic.nix @@ -24,14 +24,13 @@ lndir, runCommand, stdenv, - fetchFromGitea, + fetchFromCodeberg, buildNpmPackage, writableTmpDirAsHomeHook, }: let - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "forgejo"; repo = "forgejo"; inherit rev hash; diff --git a/pkgs/by-name/fu/fuzzel/package.nix b/pkgs/by-name/fu/fuzzel/package.nix index c627c93f5fa9..535feedcc4b7 100644 --- a/pkgs/by-name/fu/fuzzel/package.nix +++ b/pkgs/by-name/fu/fuzzel/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - fetchFromGitea, + fetchFromCodeberg, pkg-config, meson, ninja, @@ -29,8 +29,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fuzzel"; version = "1.13.1"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "dnkl"; repo = "fuzzel"; rev = finalAttrs.version; diff --git a/pkgs/by-name/fy/fyi/package.nix b/pkgs/by-name/fy/fyi/package.nix index cf6cc59ddc40..c8218a4e8c19 100644 --- a/pkgs/by-name/fy/fyi/package.nix +++ b/pkgs/by-name/fy/fyi/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - fetchFromGitea, + fetchFromCodeberg, pkg-config, meson, ninja, @@ -12,8 +12,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fyi"; version = "1.0.4"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "dnkl"; repo = "fyi"; rev = finalAttrs.version; diff --git a/pkgs/by-name/ga/game-devices-udev-rules/package.nix b/pkgs/by-name/ga/game-devices-udev-rules/package.nix index 57e74e370bd5..dc8dd8e0ac96 100644 --- a/pkgs/by-name/ga/game-devices-udev-rules/package.nix +++ b/pkgs/by-name/ga/game-devices-udev-rules/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, bash, udevCheckHook, }: @@ -10,8 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "game-devices-udev-rules"; version = "0.25"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "fabiscafe"; repo = "game-devices-udev"; tag = finalAttrs.version; diff --git a/pkgs/by-name/ga/gamja/package.nix b/pkgs/by-name/ga/gamja/package.nix index 891fa8a9a613..063f6ce8b5a8 100644 --- a/pkgs/by-name/ga/gamja/package.nix +++ b/pkgs/by-name/ga/gamja/package.nix @@ -1,6 +1,6 @@ { lib, - fetchFromGitea, + fetchFromCodeberg, buildNpmPackage, writeText, # https://codeberg.org/emersion/gamja/src/branch/master/doc/config-file.md @@ -10,8 +10,7 @@ buildNpmPackage rec { pname = "gamja"; version = "1.0.0-beta.11"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "emersion"; repo = "gamja"; rev = "v${version}"; diff --git a/pkgs/by-name/ge/gex/package.nix b/pkgs/by-name/ge/gex/package.nix index ad822106807e..28c4827df3b8 100644 --- a/pkgs/by-name/ge/gex/package.nix +++ b/pkgs/by-name/ge/gex/package.nix @@ -1,7 +1,7 @@ { lib, rustPlatform, - fetchFromGitea, + fetchFromCodeberg, pkg-config, libgit2, nix-update-script, @@ -13,8 +13,7 @@ rustPlatform.buildRustPackage rec { pname = "gex"; version = "0.6.4"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "Piturnah"; repo = "gex"; tag = "v${version}"; diff --git a/pkgs/by-name/gi/git-pages-cli/package.nix b/pkgs/by-name/gi/git-pages-cli/package.nix index 73dab6b04fe8..acdb89c84e52 100644 --- a/pkgs/by-name/gi/git-pages-cli/package.nix +++ b/pkgs/by-name/gi/git-pages-cli/package.nix @@ -1,6 +1,6 @@ { buildGoModule, - fetchFromGitea, + fetchFromCodeberg, lib, nix-update-script, versionCheckHook, @@ -10,8 +10,7 @@ buildGoModule (finalAttrs: { pname = "git-pages-cli"; version = "1.5.2"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "git-pages"; repo = "git-pages-cli"; rev = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/gi/git-unroll/package.nix b/pkgs/by-name/gi/git-unroll/package.nix index 42595efc14b8..0a526fc5839a 100644 --- a/pkgs/by-name/gi/git-unroll/package.nix +++ b/pkgs/by-name/gi/git-unroll/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, makeWrapper, bash, @@ -17,8 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "git-unroll"; version = "0-unstable-2025-08-14"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "gm6k"; repo = "git-unroll"; rev = "a66aad56af0440e1d6e807518af298264861b2c7"; diff --git a/pkgs/by-name/gi/gitolite/package.nix b/pkgs/by-name/gi/gitolite/package.nix index 3c4789cd8f0a..5d3e72420666 100644 --- a/pkgs/by-name/gi/gitolite/package.nix +++ b/pkgs/by-name/gi/gitolite/package.nix @@ -1,7 +1,7 @@ { stdenv, coreutils, - fetchFromGitea, + fetchFromCodeberg, git, lib, makeWrapper, @@ -14,8 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gitolite"; version = "3.6.14"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "sitaramc"; repo = "gitolite"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/go/go-errorlint/package.nix b/pkgs/by-name/go/go-errorlint/package.nix index 8353d8f6d9cb..10a0fff9c1f6 100644 --- a/pkgs/by-name/go/go-errorlint/package.nix +++ b/pkgs/by-name/go/go-errorlint/package.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, - fetchFromGitea, + fetchFromCodeberg, nix-update-script, }: @@ -9,8 +9,7 @@ buildGoModule rec { pname = "go-errorlint"; version = "1.9.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "polyfloyd"; repo = "go-errorlint"; rev = "v${version}"; diff --git a/pkgs/by-name/go/gose/package.nix b/pkgs/by-name/go/gose/package.nix index a17f88eb2008..969ae059488c 100644 --- a/pkgs/by-name/go/gose/package.nix +++ b/pkgs/by-name/go/gose/package.nix @@ -3,14 +3,13 @@ buildNpmPackage, nix-update-script, versionCheckHook, - fetchFromGitea, + fetchFromCodeberg, lib, }: let version = "0.11.4"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { repo = "gose"; owner = "stv0g"; tag = "v${version}"; diff --git a/pkgs/by-name/go/gotosocial/package.nix b/pkgs/by-name/go/gotosocial/package.nix index 601f7ec23270..5188263f0652 100644 --- a/pkgs/by-name/go/gotosocial/package.nix +++ b/pkgs/by-name/go/gotosocial/package.nix @@ -1,19 +1,18 @@ { lib, fetchurl, - fetchFromGitea, + fetchFromCodeberg, buildGo124Module, nixosTests, }: let - domain = "codeberg.org"; owner = "superseriousbusiness"; repo = "gotosocial"; version = "0.20.3"; web-assets = fetchurl { - url = "https://${domain}/${owner}/${repo}/releases/download/v${version}/${repo}_${version}_web-assets.tar.gz"; + url = "https://codeberg.org/${owner}/${repo}/releases/download/v${version}/${repo}_${version}_web-assets.tar.gz"; hash = "sha256-Xh4SgzBG2Cm4SaMb9lebW/gBv94HuVXNSjd8L+bowUg="; }; in @@ -21,8 +20,8 @@ buildGo124Module rec { inherit version; pname = repo; - src = fetchFromGitea { - inherit domain owner repo; + src = fetchFromCodeberg { + inherit owner repo; tag = "v${version}"; hash = "sha256-tWICsPN9r3mJqcs0EHE1+QFhQCzI1pD1eXZXSi2Peo4="; }; diff --git a/pkgs/by-name/gu/guile-hoot/package.nix b/pkgs/by-name/gu/guile-hoot/package.nix index 9851d8a192b2..f0369e8521da 100644 --- a/pkgs/by-name/gu/guile-hoot/package.nix +++ b/pkgs/by-name/gu/guile-hoot/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, autoreconfHook, guile, pkg-config, @@ -13,8 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "guile-hoot"; version = "0.7.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "spritely"; repo = "hoot"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/gu/guile-json-rpc/package.nix b/pkgs/by-name/gu/guile-json-rpc/package.nix index 60022c2dedfa..6fb0522f4474 100644 --- a/pkgs/by-name/gu/guile-json-rpc/package.nix +++ b/pkgs/by-name/gu/guile-json-rpc/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, guile, pkg-config, guile-srfi-145, @@ -11,8 +11,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "guile-json-rpc"; version = "0.5.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "rgherdt"; repo = "scheme-json-rpc"; tag = finalAttrs.version; diff --git a/pkgs/by-name/gu/guile-lsp-server/package.nix b/pkgs/by-name/gu/guile-lsp-server/package.nix index ca4df00a636f..08d03d1654fe 100644 --- a/pkgs/by-name/gu/guile-lsp-server/package.nix +++ b/pkgs/by-name/gu/guile-lsp-server/package.nix @@ -2,7 +2,7 @@ lib, guile, stdenv, - fetchFromGitea, + fetchFromCodeberg, pkg-config, bash, makeWrapper, @@ -12,8 +12,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "guile-lsp-server"; version = "0.4.8"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "rgherdt"; repo = "scheme-lsp-server"; tag = finalAttrs.version; diff --git a/pkgs/by-name/gu/guile-srfi-145/package.nix b/pkgs/by-name/gu/guile-srfi-145/package.nix index c3c57783d6cb..c8b48bbb2bb4 100644 --- a/pkgs/by-name/gu/guile-srfi-145/package.nix +++ b/pkgs/by-name/gu/guile-srfi-145/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, guile, guile-irregex, }: @@ -9,8 +9,7 @@ stdenv.mkDerivation { pname = "guile-srfi-145"; version = "0-unstable-2023-06-04"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "rgherdt"; repo = "srfi"; rev = "e598c28eb78e9c3e44f5c3c3d997ef28abb6f32e"; diff --git a/pkgs/by-name/gu/guile-srfi-180/package.nix b/pkgs/by-name/gu/guile-srfi-180/package.nix index fc38e935bfbf..b54e95958d69 100644 --- a/pkgs/by-name/gu/guile-srfi-180/package.nix +++ b/pkgs/by-name/gu/guile-srfi-180/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, guile, guile-irregex, }: @@ -9,8 +9,7 @@ stdenv.mkDerivation { pname = "guile-srfi-180"; version = "0-unstable-2023-06-04"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "rgherdt"; repo = "srfi"; rev = "e598c28eb78e9c3e44f5c3c3d997ef28abb6f32e"; diff --git a/pkgs/by-name/gu/gumbo/package.nix b/pkgs/by-name/gu/gumbo/package.nix index 6c8524460ec7..82c8adf62351 100644 --- a/pkgs/by-name/gu/gumbo/package.nix +++ b/pkgs/by-name/gu/gumbo/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, autoreconfHook, }: @@ -9,8 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gumbo"; version = "0.13.2"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "gumbo-parser"; repo = "gumbo-parser"; rev = finalAttrs.version; diff --git a/pkgs/by-name/gu/gummy/package.nix b/pkgs/by-name/gu/gummy/package.nix index 362cda104db9..eb272661ea7a 100644 --- a/pkgs/by-name/gu/gummy/package.nix +++ b/pkgs/by-name/gu/gummy/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, testers, cmake, libX11, @@ -23,8 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gummy"; version = "0.6.1"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "fusco"; repo = "gummy"; rev = finalAttrs.version; diff --git a/pkgs/by-name/ha/hail/package.nix b/pkgs/by-name/ha/hail/package.nix index 5c66ab427658..1d40d4440f6d 100644 --- a/pkgs/by-name/ha/hail/package.nix +++ b/pkgs/by-name/ha/hail/package.nix @@ -1,7 +1,7 @@ { lib, rustPlatform, - fetchFromGitea, + fetchFromCodeberg, pkg-config, fontconfig, freetype, @@ -17,8 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hail"; version = "0.3.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "periwinkle"; repo = "hail"; tag = finalAttrs.version; diff --git a/pkgs/by-name/ha/harmonist/package.nix b/pkgs/by-name/ha/harmonist/package.nix index 9617b6abf07b..1123b3aaef0d 100644 --- a/pkgs/by-name/ha/harmonist/package.nix +++ b/pkgs/by-name/ha/harmonist/package.nix @@ -1,15 +1,14 @@ { lib, buildGoModule, - fetchFromGitea, + fetchFromCodeberg, }: buildGoModule (finalAttrs: { pname = "harmonist"; version = "0.6.1"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "anaseto"; repo = "harmonist"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/hx/hxtools/package.nix b/pkgs/by-name/hx/hxtools/package.nix index d8ec121244d6..deef21e399f1 100644 --- a/pkgs/by-name/hx/hxtools/package.nix +++ b/pkgs/by-name/hx/hxtools/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, pkg-config, autoreconfHook, bash, @@ -15,8 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "hxtools"; version = "20251011"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { tag = "rel-${finalAttrs.version}"; owner = "jengelh"; repo = "hxtools"; diff --git a/pkgs/by-name/if/ifstate/package.nix b/pkgs/by-name/if/ifstate/package.nix index 49c858bceb08..37237c75a1f9 100644 --- a/pkgs/by-name/if/ifstate/package.nix +++ b/pkgs/by-name/if/ifstate/package.nix @@ -3,7 +3,7 @@ stdenv, yq, python3Packages, - fetchFromGitea, + fetchFromCodeberg, iproute2, libbpf, nixosTests, @@ -14,8 +14,7 @@ let version = "2.2.3"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "liske"; repo = "ifstate"; tag = version; diff --git a/pkgs/by-name/ij/ijq/package.nix b/pkgs/by-name/ij/ijq/package.nix index e5219eae7cc2..22d4d85de852 100644 --- a/pkgs/by-name/ij/ijq/package.nix +++ b/pkgs/by-name/ij/ijq/package.nix @@ -1,6 +1,6 @@ { buildGoModule, - fetchFromGitea, + fetchFromCodeberg, lib, jq, installShellFiles, @@ -13,8 +13,7 @@ buildGoModule rec { pname = "ijq"; version = "1.2.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "gpanders"; repo = "ijq"; rev = "v${version}"; diff --git a/pkgs/by-name/in/inhibridge/package.nix b/pkgs/by-name/in/inhibridge/package.nix index 22c1a372c585..334159ecc294 100644 --- a/pkgs/by-name/in/inhibridge/package.nix +++ b/pkgs/by-name/in/inhibridge/package.nix @@ -1,14 +1,13 @@ { lib, rustPlatform, - fetchFromGitea, + fetchFromCodeberg, }: rustPlatform.buildRustPackage rec { pname = "inhibridge"; version = "0.3.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "Scrumplex"; repo = "inhibridge"; rev = version; diff --git a/pkgs/by-name/in/inxi/package.nix b/pkgs/by-name/in/inxi/package.nix index 1ca7af8652f9..76ff658989c7 100644 --- a/pkgs/by-name/in/inxi/package.nix +++ b/pkgs/by-name/in/inxi/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, perl, perlPackages, makeWrapper, @@ -65,8 +65,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "inxi"; version = "3.3.39-1"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "smxi"; repo = "inxi"; tag = finalAttrs.version; diff --git a/pkgs/by-name/ip/ipam/package.nix b/pkgs/by-name/ip/ipam/package.nix index aca7c99b477a..93be98debc32 100644 --- a/pkgs/by-name/ip/ipam/package.nix +++ b/pkgs/by-name/ip/ipam/package.nix @@ -2,7 +2,7 @@ lib, stdenv, buildGoModule, - fetchFromGitea, + fetchFromCodeberg, installShellFiles, }: @@ -10,8 +10,7 @@ buildGoModule rec { pname = "ipam"; version = "0.3.0-1"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "lauralani"; repo = "ipam"; rev = "v${version}"; diff --git a/pkgs/by-name/ip/ipmitool/package.nix b/pkgs/by-name/ip/ipmitool/package.nix index 565b815874fa..525cccfc2a8f 100644 --- a/pkgs/by-name/ip/ipmitool/package.nix +++ b/pkgs/by-name/ip/ipmitool/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - fetchFromGitea, + fetchFromCodeberg, autoreconfHook, pkg-config, openssl, @@ -19,8 +19,7 @@ stdenv.mkDerivation { pname = "ipmitool"; version = "1.8.19-unstable-2025-02-18"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "IPMITool"; repo = "ipmitool"; rev = "3c91e6d91ec6090fe548c55ef301c33ff20c8ed8"; diff --git a/pkgs/by-name/jd/jdupes/package.nix b/pkgs/by-name/jd/jdupes/package.nix index 226e316306ad..767ba5ac7527 100644 --- a/pkgs/by-name/jd/jdupes/package.nix +++ b/pkgs/by-name/jd/jdupes/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, libjodycode, }: @@ -9,8 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "jdupes"; version = "1.31.1"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "jbruchon"; repo = "jdupes"; rev = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/jo/jogger/package.nix b/pkgs/by-name/jo/jogger/package.nix index 3c67a0fafb9a..dd938e52d4ad 100644 --- a/pkgs/by-name/jo/jogger/package.nix +++ b/pkgs/by-name/jo/jogger/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, rustPlatform, meson, ninja, @@ -23,8 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "jogger"; version = "1.2.5"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "baarkerlounger"; repo = "jogger"; tag = finalAttrs.version; diff --git a/pkgs/by-name/ka/kabeljau/package.nix b/pkgs/by-name/ka/kabeljau/package.nix index 6937a9bafe18..ac951fddccfb 100644 --- a/pkgs/by-name/ka/kabeljau/package.nix +++ b/pkgs/by-name/ka/kabeljau/package.nix @@ -1,7 +1,7 @@ { stdenvNoCC, lib, - fetchFromGitea, + fetchFromCodeberg, just, imagemagick, makeWrapper, @@ -13,8 +13,7 @@ stdenvNoCC.mkDerivation rec { pname = "kabeljau"; version = "2.1.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "annaaurora"; repo = "kabeljau"; rev = "v${version}"; diff --git a/pkgs/by-name/ka/katawa-shoujo-re-engineered/package.nix b/pkgs/by-name/ka/katawa-shoujo-re-engineered/package.nix index 6545ac693b3d..7b1568e69aca 100644 --- a/pkgs/by-name/ka/katawa-shoujo-re-engineered/package.nix +++ b/pkgs/by-name/ka/katawa-shoujo-re-engineered/package.nix @@ -1,7 +1,7 @@ { lib, stdenvNoCC, - fetchFromGitea, + fetchFromCodeberg, makeDesktopItem, copyDesktopItems, makeWrapper, @@ -12,9 +12,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "katawa-shoujo-re-engineered"; version = "2.0.3"; - src = fetchFromGitea { + src = fetchFromCodeberg { # GitHub mirror at fleetingheart/ksre - domain = "codeberg.org"; owner = "fhs"; repo = "katawa-shoujo-re-engineered"; rev = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/ka/kaufkauflist/package.nix b/pkgs/by-name/ka/kaufkauflist/package.nix index 5ff7103e7da9..8e4ad879104a 100644 --- a/pkgs/by-name/ka/kaufkauflist/package.nix +++ b/pkgs/by-name/ka/kaufkauflist/package.nix @@ -3,7 +3,7 @@ buildPackages, fetchFromGitHub, buildNpmPackage, - fetchFromGitea, + fetchFromCodeberg, nix-update-script, }: @@ -30,8 +30,7 @@ buildNpmPackage rec { pname = "kaufkauflist"; version = "4.0.2"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "annaaurora"; repo = "kaufkauflist"; rev = "v${version}"; diff --git a/pkgs/by-name/ke/keyoxide-cli/package.nix b/pkgs/by-name/ke/keyoxide-cli/package.nix index fc658b7c4525..d7836b3ff99e 100644 --- a/pkgs/by-name/ke/keyoxide-cli/package.nix +++ b/pkgs/by-name/ke/keyoxide-cli/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, fetchYarnDeps, yarnConfigHook, yarnBuildHook, @@ -14,8 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "keyoxide-cli"; version = "0.4.4"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "keyoxide"; repo = "keyoxide-cli"; tag = finalAttrs.version; diff --git a/pkgs/by-name/ki/kitget/package.nix b/pkgs/by-name/ki/kitget/package.nix index 6dc995e5de14..580315f0ca0a 100644 --- a/pkgs/by-name/ki/kitget/package.nix +++ b/pkgs/by-name/ki/kitget/package.nix @@ -1,6 +1,6 @@ { lib, - fetchFromGitea, + fetchFromCodeberg, rustPlatform, openssl, pkg-config, @@ -10,8 +10,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "kitget"; version = "0.0.2"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "koibtw"; repo = "kitget"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix index c3900db56c88..b5e9c7720267 100644 --- a/pkgs/by-name/ko/komikku/package.nix +++ b/pkgs/by-name/ko/komikku/package.nix @@ -1,6 +1,6 @@ { lib, - fetchFromGitea, + fetchFromCodeberg, desktop-file-utils, gettext, glib, @@ -27,8 +27,7 @@ python3.pkgs.buildPythonApplication rec { version = "1.101.0"; pyproject = false; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "valos"; repo = "Komikku"; tag = "v${version}"; diff --git a/pkgs/by-name/kx/kx-aspe-cli/package.nix b/pkgs/by-name/kx/kx-aspe-cli/package.nix index cc96385d3a03..8fed9502499c 100644 --- a/pkgs/by-name/kx/kx-aspe-cli/package.nix +++ b/pkgs/by-name/kx/kx-aspe-cli/package.nix @@ -1,7 +1,7 @@ { lib, rustPlatform, - fetchFromGitea, + fetchFromCodeberg, pkg-config, openssl, }: @@ -10,8 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "kx-aspe-cli"; version = "0-unstable-2024-04-06"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "keyoxide"; repo = "kx-aspe-cli"; rev = "492df7edae95a8636bb59c4e5c1607053dab2c78"; diff --git a/pkgs/by-name/l8/l8w8jwt/package.nix b/pkgs/by-name/l8/l8w8jwt/package.nix index 1f6765e9cc0e..e632841710de 100644 --- a/pkgs/by-name/l8/l8w8jwt/package.nix +++ b/pkgs/by-name/l8/l8w8jwt/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, cmake, }: @@ -9,8 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "l8w8jwt"; version = "2.5.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "GlitchedPolygons"; repo = "l8w8jwt"; tag = finalAttrs.version; diff --git a/pkgs/by-name/la/lauti/package.nix b/pkgs/by-name/la/lauti/package.nix index 59be0ae01f92..bc25d3f0f0c8 100644 --- a/pkgs/by-name/la/lauti/package.nix +++ b/pkgs/by-name/la/lauti/package.nix @@ -1,15 +1,14 @@ { lib, buildGoModule, - fetchFromGitea, + fetchFromCodeberg, callPackage, nixosTests, }: let version = "1.1.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "Klasse-Methode"; repo = "lauti"; tag = "v${version}"; diff --git a/pkgs/by-name/lc/lcagent/package.nix b/pkgs/by-name/lc/lcagent/package.nix index 47e2b02d263f..47791c21d271 100644 --- a/pkgs/by-name/lc/lcagent/package.nix +++ b/pkgs/by-name/lc/lcagent/package.nix @@ -1,5 +1,5 @@ { - fetchFromGitea, + fetchFromCodeberg, lib, stdenv, flex, @@ -12,8 +12,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "lcagent"; version = "0.1.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "librecast"; repo = "lcagent"; tag = finalAttrs.version; diff --git a/pkgs/by-name/lc/lcrq/package.nix b/pkgs/by-name/lc/lcrq/package.nix index 8ce9de456942..981b7a915f89 100644 --- a/pkgs/by-name/lc/lcrq/package.nix +++ b/pkgs/by-name/lc/lcrq/package.nix @@ -1,14 +1,13 @@ { stdenv, - fetchFromGitea, + fetchFromCodeberg, lib, }: stdenv.mkDerivation (finalAttrs: { pname = "lcrq"; version = "0.3.1"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "librecast"; repo = "lcrq"; rev = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/lc/lcsync/package.nix b/pkgs/by-name/lc/lcsync/package.nix index cc4746c77ddc..aceffbec5de7 100644 --- a/pkgs/by-name/lc/lcsync/package.nix +++ b/pkgs/by-name/lc/lcsync/package.nix @@ -1,5 +1,5 @@ { - fetchFromGitea, + fetchFromCodeberg, lcrq, lib, librecast, @@ -10,8 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "lcsync"; version = "0.3.2"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "librecast"; repo = "lcsync"; rev = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/lc/lctime/package.nix b/pkgs/by-name/lc/lctime/package.nix index daed70c1792e..b3b6240f4241 100644 --- a/pkgs/by-name/lc/lctime/package.nix +++ b/pkgs/by-name/lc/lctime/package.nix @@ -2,7 +2,7 @@ lib, stdenv, python3Packages, - fetchFromGitea, + fetchFromCodeberg, runCommand, lctime, ngspice, @@ -14,8 +14,7 @@ python3Packages.buildPythonApplication (finalAttrs: { version = "0.0.28"; pyproject = true; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "librecell"; repo = "lctime"; tag = finalAttrs.version; diff --git a/pkgs/by-name/li/libHX/package.nix b/pkgs/by-name/li/libHX/package.nix index 42a9ce958f86..ef813680172c 100644 --- a/pkgs/by-name/li/libHX/package.nix +++ b/pkgs/by-name/li/libHX/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, autoreconfHook, nix-update-script, }: @@ -10,8 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libHX"; version = "5.2"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { tag = "v${finalAttrs.version}"; owner = "jengelh"; repo = "libhx"; diff --git a/pkgs/by-name/li/libid3tag/package.nix b/pkgs/by-name/li/libid3tag/package.nix index c0402216d408..97e9f1a76e70 100644 --- a/pkgs/by-name/li/libid3tag/package.nix +++ b/pkgs/by-name/li/libid3tag/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, fetchpatch, cmake, gperf, @@ -17,8 +17,7 @@ stdenv.mkDerivation (finalAttrs: { "dev" ]; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "tenacityteam"; repo = "libid3tag"; rev = finalAttrs.version; diff --git a/pkgs/by-name/li/libjodycode/package.nix b/pkgs/by-name/li/libjodycode/package.nix index 4d936184afb0..c170bc447118 100644 --- a/pkgs/by-name/li/libjodycode/package.nix +++ b/pkgs/by-name/li/libjodycode/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, jdupes, fixDarwinDylibNames, }: @@ -16,8 +16,7 @@ stdenv.mkDerivation (finalAttrs: { "dev" ]; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "jbruchon"; repo = "libjodycode"; rev = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/li/librecast/package.nix b/pkgs/by-name/li/librecast/package.nix index 09788ebe8f46..9c817ca2534c 100644 --- a/pkgs/by-name/li/librecast/package.nix +++ b/pkgs/by-name/li/librecast/package.nix @@ -1,6 +1,6 @@ { stdenv, - fetchFromGitea, + fetchFromCodeberg, lcrq, lib, libsodium, @@ -10,8 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "librecast"; version = "0.11.2"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "librecast"; repo = "librecast"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/li/libssc/package.nix b/pkgs/by-name/li/libssc/package.nix index 7eba4d22b9d2..a0bed1bc8a3b 100644 --- a/pkgs/by-name/li/libssc/package.nix +++ b/pkgs/by-name/li/libssc/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, meson, ninja, glib, @@ -15,8 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libssc"; version = "0.2.2"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "DylanVanAssche"; repo = "libssc"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/li/listenbrainz-mpd/package.nix b/pkgs/by-name/li/listenbrainz-mpd/package.nix index dfba0edbbb44..d35f933bac25 100644 --- a/pkgs/by-name/li/listenbrainz-mpd/package.nix +++ b/pkgs/by-name/li/listenbrainz-mpd/package.nix @@ -1,7 +1,7 @@ { lib, rustPlatform, - fetchFromGitea, + fetchFromCodeberg, pkg-config, stdenv, openssl, @@ -15,8 +15,7 @@ rustPlatform.buildRustPackage rec { pname = "listenbrainz-mpd"; version = "2.3.9"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "elomatreb"; repo = "listenbrainz-mpd"; rev = "v${version}"; diff --git a/pkgs/by-name/li/litemdview/package.nix b/pkgs/by-name/li/litemdview/package.nix index 63f08fb7fd8f..ec6cb70175ee 100644 --- a/pkgs/by-name/li/litemdview/package.nix +++ b/pkgs/by-name/li/litemdview/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, gtkmm3, autoreconfHook, pkg-config, @@ -12,8 +12,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "litemdview"; version = "0.0.32"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "g0tsu"; repo = "litemdview"; rev = "litemdview-${finalAttrs.version}"; diff --git a/pkgs/by-name/ls/lspmux/package.nix b/pkgs/by-name/ls/lspmux/package.nix index 70e7d119d7ff..5e3fce8ce39d 100644 --- a/pkgs/by-name/ls/lspmux/package.nix +++ b/pkgs/by-name/ls/lspmux/package.nix @@ -1,6 +1,6 @@ { lib, - fetchFromGitea, + fetchFromCodeberg, rustPlatform, }: @@ -8,8 +8,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "lspmux"; version = "0.3.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "p2502"; repo = "lspmux"; rev = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/lx/lxqt-panel-profiles/package.nix b/pkgs/by-name/lx/lxqt-panel-profiles/package.nix index 341188ab873a..0d1e2e73693e 100644 --- a/pkgs/by-name/lx/lxqt-panel-profiles/package.nix +++ b/pkgs/by-name/lx/lxqt-panel-profiles/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, python3Packages, qt6, bash, @@ -15,8 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "lxqt-panel-profiles"; version = "1.3"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "MrReplikant"; repo = "lxqt-panel-profiles"; rev = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/ly/ly/package.nix b/pkgs/by-name/ly/ly/package.nix index 5119ca1660ad..7b937ad12d5e 100644 --- a/pkgs/by-name/ly/ly/package.nix +++ b/pkgs/by-name/ly/ly/package.nix @@ -1,6 +1,6 @@ { callPackage, - fetchFromGitea, + fetchFromCodeberg, lib, libxcb, linux-pam, @@ -19,8 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "ly"; version = "1.3.1"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "fairyglade"; repo = "ly"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/md/mdhtml/package.nix b/pkgs/by-name/md/mdhtml/package.nix index 46ea013e620f..a88caaeddf01 100644 --- a/pkgs/by-name/md/mdhtml/package.nix +++ b/pkgs/by-name/md/mdhtml/package.nix @@ -1,15 +1,14 @@ { lib, buildGoModule, - fetchFromGitea, + fetchFromCodeberg, }: buildGoModule rec { pname = "mdhtml"; version = "1.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "Tomkoid"; repo = "mdhtml"; rev = version; diff --git a/pkgs/by-name/me/meme-bingo-web/package.nix b/pkgs/by-name/me/meme-bingo-web/package.nix index 16588bf0af74..b1563ff8ab44 100644 --- a/pkgs/by-name/me/meme-bingo-web/package.nix +++ b/pkgs/by-name/me/meme-bingo-web/package.nix @@ -1,6 +1,6 @@ { lib, - fetchFromGitea, + fetchFromCodeberg, rustPlatform, makeWrapper, nix-update-script, @@ -10,8 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "meme-bingo-web"; version = "1.2.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "annaaurora"; repo = "meme-bingo-web"; rev = "v${version}"; diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix index 8945328f808b..33bf9bfb0761 100644 --- a/pkgs/by-name/me/mergiraf/package.nix +++ b/pkgs/by-name/me/mergiraf/package.nix @@ -1,6 +1,6 @@ { lib, - fetchFromGitea, + fetchFromCodeberg, rustPlatform, nix-update-script, @@ -13,8 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mergiraf"; version = "0.16.1"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "mergiraf"; repo = "mergiraf"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/me/mew/package.nix b/pkgs/by-name/me/mew/package.nix index ea7345ccfa51..ff3911fde990 100644 --- a/pkgs/by-name/me/mew/package.nix +++ b/pkgs/by-name/me/mew/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, # nativeBuildInputs pkg-config, @@ -18,8 +18,7 @@ stdenv.mkDerivation { pname = "mew"; version = "1.0-unstable-2025-06-20"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "sewn"; repo = "mew"; rev = "af6440da8fe6683cf0b873e0a98c293bf02c3447"; diff --git a/pkgs/by-name/mi/mitra/package.nix b/pkgs/by-name/mi/mitra/package.nix index bea392cf666a..bc056858f50d 100644 --- a/pkgs/by-name/mi/mitra/package.nix +++ b/pkgs/by-name/mi/mitra/package.nix @@ -2,7 +2,7 @@ lib, stdenv, rustPlatform, - fetchFromGitea, + fetchFromCodeberg, installShellFiles, }: @@ -10,8 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "mitra"; version = "4.16.1"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "silverpill"; repo = "mitra"; rev = "v${version}"; diff --git a/pkgs/by-name/mk/mkvtoolnix/package.nix b/pkgs/by-name/mk/mkvtoolnix/package.nix index 1fd01afbdbf5..4ecf155ba97b 100644 --- a/pkgs/by-name/mk/mkvtoolnix/package.nix +++ b/pkgs/by-name/mk/mkvtoolnix/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, pkg-config, autoreconfHook, rake, @@ -54,8 +54,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mkvtoolnix"; version = "96.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "mbunkus"; repo = "mkvtoolnix"; tag = "release-${finalAttrs.version}"; diff --git a/pkgs/by-name/ml/mlmmj/package.nix b/pkgs/by-name/ml/mlmmj/package.nix index aeedb8f1c644..756e3766e935 100644 --- a/pkgs/by-name/ml/mlmmj/package.nix +++ b/pkgs/by-name/ml/mlmmj/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, autoreconfHook, atf, pkg-config, @@ -11,8 +11,7 @@ stdenv.mkDerivation rec { pname = "mlmmj"; version = "1.5.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "mlmmj"; repo = "mlmmj"; tag = "RELEASE_" + lib.replaceStrings [ "." ] [ "_" ] version; diff --git a/pkgs/by-name/mo/mozhi/package.nix b/pkgs/by-name/mo/mozhi/package.nix index a47bf73ce67f..be9f50027abb 100644 --- a/pkgs/by-name/mo/mozhi/package.nix +++ b/pkgs/by-name/mo/mozhi/package.nix @@ -1,15 +1,14 @@ { lib, buildGoModule, - fetchFromGitea, + fetchFromCodeberg, unstableGitUpdater, }: buildGoModule { pname = "mozhi"; version = "0-unstable-2026-01-10"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "aryak"; repo = "mozhi"; rev = "6b3f675b8d4c8fb852e88f0696d0c4d72516e618"; diff --git a/pkgs/by-name/mp/mpv/scripts/sponsorblock-minimal.nix b/pkgs/by-name/mp/mpv/scripts/sponsorblock-minimal.nix index 6bbc22cd4cd6..81357dcd98a6 100644 --- a/pkgs/by-name/mp/mpv/scripts/sponsorblock-minimal.nix +++ b/pkgs/by-name/mp/mpv/scripts/sponsorblock-minimal.nix @@ -1,7 +1,7 @@ { lib, buildLua, - fetchFromGitea, + fetchFromCodeberg, unstableGitUpdater, curl, coreutils, @@ -12,8 +12,7 @@ buildLua { version = "0-unstable-2025-12-21"; scriptPath = "sponsorblock_minimal.lua"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "jouni"; repo = "mpv_sponsorblock_minimal"; rev = "8f4b186d6ea46e6fe0e5e94a53dda2f50dceb576"; diff --git a/pkgs/by-name/ne/newsraft/package.nix b/pkgs/by-name/ne/newsraft/package.nix index 8afd52549f36..5107418dbdc2 100644 --- a/pkgs/by-name/ne/newsraft/package.nix +++ b/pkgs/by-name/ne/newsraft/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, pkg-config, curl, expat, @@ -14,8 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "newsraft"; version = "0.35"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "newsraft"; repo = "newsraft"; rev = "newsraft-${finalAttrs.version}"; diff --git a/pkgs/by-name/ng/ngn-k/package.nix b/pkgs/by-name/ng/ngn-k/package.nix index f6121650c7f9..ae038879e230 100644 --- a/pkgs/by-name/ng/ngn-k/package.nix +++ b/pkgs/by-name/ng/ngn-k/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, runtimeShell, }: @@ -9,8 +9,7 @@ stdenv.mkDerivation { pname = "ngn-k"; version = "0-unstable-2025-01-04"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "ngn"; repo = "k"; rev = "feb51a61443dac03213c4e97edd8df679a4a3aaa"; diff --git a/pkgs/by-name/ni/nix-web/package.nix b/pkgs/by-name/ni/nix-web/package.nix index bc6b243339e7..f916c1c57825 100644 --- a/pkgs/by-name/ni/nix-web/package.nix +++ b/pkgs/by-name/ni/nix-web/package.nix @@ -2,7 +2,7 @@ lib, stdenv, rustPlatform, - fetchFromGitea, + fetchFromCodeberg, pkg-config, openssl, nixVersions, @@ -19,8 +19,7 @@ rustPlatform.buildRustPackage rec { pname = "nix-web"; version = "0.4.2"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "gorgon"; repo = "gorgon"; rev = "nix-web-v${version}"; diff --git a/pkgs/by-name/nm/nm-file-secret-agent/package.nix b/pkgs/by-name/nm/nm-file-secret-agent/package.nix index 0e7aa6054298..172f4b42840f 100644 --- a/pkgs/by-name/nm/nm-file-secret-agent/package.nix +++ b/pkgs/by-name/nm/nm-file-secret-agent/package.nix @@ -1,6 +1,6 @@ { lib, - fetchFromGitea, + fetchFromCodeberg, rustPlatform, dbus, networkmanager, @@ -11,8 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "nm-file-secret-agent"; version = "1.2.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "lilly"; repo = "nm-file-secret-agent"; rev = "v${version}"; diff --git a/pkgs/by-name/no/nodeinfo/package.nix b/pkgs/by-name/no/nodeinfo/package.nix index 8f975cc5b37b..17b2154ec6fc 100644 --- a/pkgs/by-name/no/nodeinfo/package.nix +++ b/pkgs/by-name/no/nodeinfo/package.nix @@ -1,6 +1,6 @@ { lib, - fetchFromGitea, + fetchFromCodeberg, buildGoModule, }: buildGoModule rec { @@ -8,8 +8,7 @@ buildGoModule rec { version = "1.0.0"; vendorHash = "sha256-P0klk3YWa2qprCUNUjiuF+Akxh246WCu4vwUAZmSDCw="; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "thefederationinfo"; repo = "nodeinfo-go"; tag = "v${version}"; diff --git a/pkgs/by-name/ns/nsxiv/package.nix b/pkgs/by-name/ns/nsxiv/package.nix index 5c7f46292a33..6cfd8644b8af 100644 --- a/pkgs/by-name/ns/nsxiv/package.nix +++ b/pkgs/by-name/ns/nsxiv/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, giflib, imlib2Full, libXft, @@ -15,8 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "nsxiv"; version = "33"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "nsxiv"; repo = "nsxiv"; rev = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/nu/nucleus/package.nix b/pkgs/by-name/nu/nucleus/package.nix index 219dd6b953b4..0f1987f1f10c 100644 --- a/pkgs/by-name/nu/nucleus/package.nix +++ b/pkgs/by-name/nu/nucleus/package.nix @@ -1,7 +1,7 @@ { lib, python3Packages, - fetchFromGitea, + fetchFromCodeberg, ninja, meson, pkg-config, @@ -21,8 +21,7 @@ python3Packages.buildPythonApplication { inherit version; pyproject = false; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "lo-vely"; repo = "nucleus"; tag = "v${version}"; diff --git a/pkgs/by-name/op/openpgp-card-tools/package.nix b/pkgs/by-name/op/openpgp-card-tools/package.nix index c0e800712df2..6f1b10535ba9 100644 --- a/pkgs/by-name/op/openpgp-card-tools/package.nix +++ b/pkgs/by-name/op/openpgp-card-tools/package.nix @@ -2,7 +2,7 @@ lib, stdenv, rustPlatform, - fetchFromGitea, + fetchFromCodeberg, installShellFiles, pkg-config, pcsclite, @@ -15,8 +15,7 @@ rustPlatform.buildRustPackage rec { pname = "openpgp-card-tools"; version = "0.11.10"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "openpgp-card"; repo = "openpgp-card-tools"; rev = "v${version}"; diff --git a/pkgs/by-name/ou/outfly/package.nix b/pkgs/by-name/ou/outfly/package.nix index a57e4438b9a8..527f94a2dbc4 100644 --- a/pkgs/by-name/ou/outfly/package.nix +++ b/pkgs/by-name/ou/outfly/package.nix @@ -1,6 +1,6 @@ { lib, - fetchFromGitea, + fetchFromCodeberg, rustPlatform, makeDesktopItem, pkg-config, @@ -18,8 +18,7 @@ rustPlatform.buildRustPackage rec { pname = "outfly"; version = "0.14.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "outfly"; repo = "outfly"; tag = "v${version}"; diff --git a/pkgs/by-name/pa/pam_mount/package.nix b/pkgs/by-name/pa/pam_mount/package.nix index a3c9ff0712db..3906ea4f1980 100644 --- a/pkgs/by-name/pa/pam_mount/package.nix +++ b/pkgs/by-name/pa/pam_mount/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, autoreconfHook, perl, pkg-config, @@ -19,8 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "pam_mount"; version = "2.22"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { tag = "v${finalAttrs.version}"; owner = "jengelh"; repo = "pam_mount"; diff --git a/pkgs/by-name/pa/pay-respects/package.nix b/pkgs/by-name/pa/pay-respects/package.nix index f2b82e49b3ff..fae20d3bebf9 100644 --- a/pkgs/by-name/pa/pay-respects/package.nix +++ b/pkgs/by-name/pa/pay-respects/package.nix @@ -1,6 +1,6 @@ { lib, - fetchFromGitea, + fetchFromCodeberg, rustPlatform, versionCheckHook, }: @@ -8,8 +8,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "pay-respects"; version = "0.7.9"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "iff"; repo = "pay-respects"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/pc/pcapc/package.nix b/pkgs/by-name/pc/pcapc/package.nix index 8bfeac8926a3..fc8d80fdd94e 100644 --- a/pkgs/by-name/pc/pcapc/package.nix +++ b/pkgs/by-name/pc/pcapc/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, libpcap, }: @@ -9,8 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "pcapc"; version = "1.0.1"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "post-factum"; repo = "pcapc"; rev = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/ph/phantom/package.nix b/pkgs/by-name/ph/phantom/package.nix index 48c1909604c0..75325e55c0dd 100644 --- a/pkgs/by-name/ph/phantom/package.nix +++ b/pkgs/by-name/ph/phantom/package.nix @@ -1,6 +1,6 @@ { stdenv, - fetchFromGitea, + fetchFromCodeberg, qt6, cmark-gfm, cmake, @@ -12,8 +12,7 @@ stdenv.mkDerivation { pname = "phantom"; version = "0.0.0-unstable-2025-12-22"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "ItsZariep"; repo = "Phantom"; rev = "7bba1e0a2d9b33d881fb999bb543324d14355505"; diff --git a/pkgs/by-name/po/poezio/package.nix b/pkgs/by-name/po/poezio/package.nix index 846af28d28db..88cbb15a9bc8 100644 --- a/pkgs/by-name/po/poezio/package.nix +++ b/pkgs/by-name/po/poezio/package.nix @@ -1,6 +1,6 @@ { lib, - fetchFromGitea, + fetchFromCodeberg, pkg-config, python3, }: @@ -10,8 +10,7 @@ python3.pkgs.buildPythonApplication rec { version = "0.14"; pyproject = true; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "poezio"; repo = "poezio"; rev = "v${version}"; diff --git a/pkgs/by-name/qi/qiv/package.nix b/pkgs/by-name/qi/qiv/package.nix index 03615b74947d..910ff960d594 100644 --- a/pkgs/by-name/qi/qiv/package.nix +++ b/pkgs/by-name/qi/qiv/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, pkg-config, gtk3, file, @@ -13,8 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "qiv"; version = "3.0.2"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "ciberandy"; repo = "qiv"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/ra/ratman/package.nix b/pkgs/by-name/ra/ratman/package.nix index ba755fa1e2ac..0c7e2422d2a7 100644 --- a/pkgs/by-name/ra/ratman/package.nix +++ b/pkgs/by-name/ra/ratman/package.nix @@ -1,6 +1,6 @@ { lib, - fetchFromGitea, + fetchFromCodeberg, fetchNpmDeps, installShellFiles, pkg-config, @@ -15,8 +15,7 @@ rustPlatform.buildRustPackage rec { pname = "ratman"; version = "0.7.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "irdest"; repo = "irdest"; tag = version; diff --git a/pkgs/by-name/re/readeck/package.nix b/pkgs/by-name/re/readeck/package.nix index 92fe8d79ac89..50541cb17818 100644 --- a/pkgs/by-name/re/readeck/package.nix +++ b/pkgs/by-name/re/readeck/package.nix @@ -1,6 +1,6 @@ { lib, - fetchFromGitea, + fetchFromCodeberg, fetchNpmDeps, buildGoModule, nodejs_22, @@ -12,8 +12,7 @@ buildGoModule rec { pname = "readeck"; version = "0.21.5"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "readeck"; repo = "readeck"; tag = version; diff --git a/pkgs/by-name/re/recordbox/package.nix b/pkgs/by-name/re/recordbox/package.nix index 0678773dacd5..0b01223eaf60 100644 --- a/pkgs/by-name/re/recordbox/package.nix +++ b/pkgs/by-name/re/recordbox/package.nix @@ -6,7 +6,7 @@ cargo, dbus, desktop-file-utils, - fetchFromGitea, + fetchFromCodeberg, glib, libglycin, glycin-loaders, @@ -31,8 +31,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "recordbox"; version = "0.10.4"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "edestcroix"; repo = "Recordbox"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/ri/rimgo/package.nix b/pkgs/by-name/ri/rimgo/package.nix index e153ee5ee582..8a5281c6c75d 100644 --- a/pkgs/by-name/ri/rimgo/package.nix +++ b/pkgs/by-name/ri/rimgo/package.nix @@ -1,6 +1,6 @@ { lib, - fetchFromGitea, + fetchFromCodeberg, buildGoModule, tailwindcss_3, }: @@ -8,8 +8,7 @@ buildGoModule rec { pname = "rimgo"; version = "1.2.6"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "rimgo"; repo = "rimgo"; rev = "v${version}"; diff --git a/pkgs/by-name/ri/river-classic/package.nix b/pkgs/by-name/ri/river-classic/package.nix index 4a2960157a7f..989d07331e18 100644 --- a/pkgs/by-name/ri/river-classic/package.nix +++ b/pkgs/by-name/ri/river-classic/package.nix @@ -2,7 +2,7 @@ lib, stdenv, callPackage, - fetchFromGitea, + fetchFromCodeberg, libGL, libX11, libevdev, @@ -29,8 +29,7 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ]; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "river"; repo = "river-classic"; hash = "sha256-UhWA7jmBDhktHqHds06C0GY+xzlQZZezYopsLmIAGgI="; diff --git a/pkgs/by-name/rp/rpPPPoE/package.nix b/pkgs/by-name/rp/rpPPPoE/package.nix index 04be5ad93585..74aa68d07526 100644 --- a/pkgs/by-name/rp/rpPPPoE/package.nix +++ b/pkgs/by-name/rp/rpPPPoE/package.nix @@ -1,15 +1,14 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, ppp, }: stdenv.mkDerivation (finalAttrs: { pname = "rp-pppoe"; version = "4.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "dskoll"; repo = "rp-pppoe"; tag = finalAttrs.version; diff --git a/pkgs/by-name/rs/rsop/package.nix b/pkgs/by-name/rs/rsop/package.nix index 6ff92c7fe5ba..3aa7976e1215 100644 --- a/pkgs/by-name/rs/rsop/package.nix +++ b/pkgs/by-name/rs/rsop/package.nix @@ -1,7 +1,7 @@ { lib, rustPlatform, - fetchFromGitea, + fetchFromCodeberg, pkg-config, pcsclite, nix-update-script, @@ -13,8 +13,7 @@ rustPlatform.buildRustPackage rec { pname = "rsop"; version = "0.9.3"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "heiko"; repo = "rsop"; rev = "rsop/v${version}"; diff --git a/pkgs/by-name/rw/rwedid/package.nix b/pkgs/by-name/rw/rwedid/package.nix index fff8bdfb429c..b891fb03e045 100644 --- a/pkgs/by-name/rw/rwedid/package.nix +++ b/pkgs/by-name/rw/rwedid/package.nix @@ -1,7 +1,7 @@ { lib, rustPlatform, - fetchFromGitea, + fetchFromCodeberg, pkg-config, udevCheckHook, xz, @@ -11,8 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "rwedid"; version = "0.3.2"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "ral"; repo = "rwedid"; rev = version; diff --git a/pkgs/by-name/sa/sanctity/package.nix b/pkgs/by-name/sa/sanctity/package.nix index 2e822be03a07..0142fe13efc7 100644 --- a/pkgs/by-name/sa/sanctity/package.nix +++ b/pkgs/by-name/sa/sanctity/package.nix @@ -1,15 +1,14 @@ { lib, rustPlatform, - fetchFromGitea, + fetchFromCodeberg, }: rustPlatform.buildRustPackage rec { pname = "sanctity"; version = "1.3.1"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "annaaurora"; repo = "sanctity"; rev = "v${version}"; diff --git a/pkgs/by-name/sa/satellite/package.nix b/pkgs/by-name/sa/satellite/package.nix index ace84e0a9681..df13d174641c 100644 --- a/pkgs/by-name/sa/satellite/package.nix +++ b/pkgs/by-name/sa/satellite/package.nix @@ -1,7 +1,7 @@ { lib, python3, - fetchFromGitea, + fetchFromCodeberg, gobject-introspection, libadwaita, modemmanager, @@ -15,8 +15,7 @@ python3.pkgs.buildPythonApplication rec { pyproject = true; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "tpikonen"; repo = "satellite"; tag = version; diff --git a/pkgs/by-name/se/seehecht/package.nix b/pkgs/by-name/se/seehecht/package.nix index c68d29816bfd..aa1dce7a9761 100644 --- a/pkgs/by-name/se/seehecht/package.nix +++ b/pkgs/by-name/se/seehecht/package.nix @@ -1,15 +1,14 @@ { lib, rustPlatform, - fetchFromGitea, + fetchFromCodeberg, }: rustPlatform.buildRustPackage rec { pname = "seehecht"; version = "3.0.3"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "annaaurora"; repo = "seehecht"; rev = "v${version}"; diff --git a/pkgs/by-name/se/seppo/package.nix b/pkgs/by-name/se/seppo/package.nix index 0c5488c639ff..de64312ee235 100644 --- a/pkgs/by-name/se/seppo/package.nix +++ b/pkgs/by-name/se/seppo/package.nix @@ -1,6 +1,6 @@ { ocamlPackages, - fetchFromGitea, + fetchFromCodeberg, ocaml-crunch, seppo, lib, @@ -14,8 +14,7 @@ ocamlPackages.buildDunePackage { pname = "seppo"; version = "0-unstable-2025-08-07"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "seppo"; repo = "seppo"; rev = "d927311cae64883fe2b88f5a1c7e17c8cc525bad"; diff --git a/pkgs/by-name/sn/snac2/package.nix b/pkgs/by-name/sn/snac2/package.nix index a8a1fca0fdb4..2a508fd337d7 100644 --- a/pkgs/by-name/sn/snac2/package.nix +++ b/pkgs/by-name/sn/snac2/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - fetchFromGitea, + fetchFromCodeberg, curl, openssl, nix-update-script, @@ -12,8 +12,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "snac2"; version = "2.89"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "grunfink"; repo = "snac2"; tag = finalAttrs.version; diff --git a/pkgs/by-name/sn/snekim/package.nix b/pkgs/by-name/sn/snekim/package.nix index 5591b97234ba..8deefd7515d2 100644 --- a/pkgs/by-name/sn/snekim/package.nix +++ b/pkgs/by-name/sn/snekim/package.nix @@ -1,15 +1,14 @@ { lib, buildNimPackage, - fetchFromGitea, + fetchFromCodeberg, }: buildNimPackage (finalAttrs: { pname = "snekim"; version = "1.2.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "annaaurora"; repo = "snekim"; rev = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/so/soju/package.nix b/pkgs/by-name/so/soju/package.nix index 70dbabad2119..a7135d57f745 100644 --- a/pkgs/by-name/so/soju/package.nix +++ b/pkgs/by-name/so/soju/package.nix @@ -1,6 +1,6 @@ { buildGoModule, - fetchFromGitea, + fetchFromCodeberg, installShellFiles, lib, nixosTests, @@ -14,8 +14,7 @@ buildGoModule (finalAttrs: { pname = "soju"; version = "0.10.1"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "emersion"; repo = "soju"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/so/soundalike/package.nix b/pkgs/by-name/so/soundalike/package.nix index 66a7ab3fad45..7e73238d6717 100644 --- a/pkgs/by-name/so/soundalike/package.nix +++ b/pkgs/by-name/so/soundalike/package.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, - fetchFromGitea, + fetchFromCodeberg, chromaprint, makeWrapper, versionCheckHook, @@ -11,8 +11,7 @@ buildGoModule rec { pname = "soundalike"; version = "0.1.2"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "derat"; repo = "soundalike"; tag = "v${version}"; @@ -36,8 +35,7 @@ buildGoModule rec { doCheck = true; # need to grab another repo for music test data testDataVersion = "0.0.1"; - testData = fetchFromGitea { - domain = "codeberg.org"; + testData = fetchFromCodeberg { owner = "derat"; repo = "soundalike-testdata"; tag = "v${testDataVersion}"; diff --git a/pkgs/by-name/so/soundtouch/package.nix b/pkgs/by-name/so/soundtouch/package.nix index 8bb777fe0b9c..911006b124db 100644 --- a/pkgs/by-name/so/soundtouch/package.nix +++ b/pkgs/by-name/so/soundtouch/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - fetchFromGitea, + fetchFromCodeberg, autoconf, automake, libtool, @@ -11,8 +11,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "soundtouch"; version = "2.4.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "soundtouch"; repo = "soundtouch"; rev = finalAttrs.version; diff --git a/pkgs/by-name/sq/sqlauncher/package.nix b/pkgs/by-name/sq/sqlauncher/package.nix index 0a5ad1f68f5a..fc514e4c048f 100644 --- a/pkgs/by-name/sq/sqlauncher/package.nix +++ b/pkgs/by-name/sq/sqlauncher/package.nix @@ -1,6 +1,6 @@ { stdenv, - fetchFromGitea, + fetchFromCodeberg, cmake, ninja, qt6, @@ -11,8 +11,7 @@ stdenv.mkDerivation { pname = "sqlauncher"; version = "0.0.0-unstable-2025-12-30"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "ItsZariep"; repo = "SQLauncher"; rev = "4a82d0f5d1394f3ff850297939b62357f7f3ce0f"; diff --git a/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix b/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix index 6b6aeacbbf05..f94b99a4037d 100644 --- a/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix +++ b/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix @@ -3,7 +3,7 @@ { lib, rustPlatform, - fetchFromGitea, + fetchFromCodeberg, pkg-config, just, rust-script, @@ -23,8 +23,7 @@ rustPlatform.buildRustPackage { inherit pname version; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "wiktor"; repo = "ssh-openpgp-auth"; # See also: https://codeberg.org/wiktor/ssh-openpgp-auth/pulls/92#issuecomment-1635274 diff --git a/pkgs/by-name/ss/ssh-tools/package.nix b/pkgs/by-name/ss/ssh-tools/package.nix index e8fc72f3d4e4..d84226b87566 100644 --- a/pkgs/by-name/ss/ssh-tools/package.nix +++ b/pkgs/by-name/ss/ssh-tools/package.nix @@ -2,7 +2,7 @@ lib, bash, buildGoModule, - fetchFromGitea, + fetchFromCodeberg, installShellFiles, perl, }: @@ -11,8 +11,7 @@ buildGoModule rec { pname = "ssh-tools"; version = "1.9"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "vaporup"; repo = "ssh-tools"; tag = "v${version}"; diff --git a/pkgs/by-name/st/stockpile/package.nix b/pkgs/by-name/st/stockpile/package.nix index 7b5151806943..7860c3378ea8 100644 --- a/pkgs/by-name/st/stockpile/package.nix +++ b/pkgs/by-name/st/stockpile/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, meson, ninja, pkg-config, @@ -17,8 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "stockpile"; version = "0.5.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "turtle"; repo = "stockpile"; tag = finalAttrs.version; diff --git a/pkgs/by-name/sx/sxcs/package.nix b/pkgs/by-name/sx/sxcs/package.nix index e85531c41077..18373029078f 100644 --- a/pkgs/by-name/sx/sxcs/package.nix +++ b/pkgs/by-name/sx/sxcs/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, libxcursor, libx11, installShellFiles, @@ -11,8 +11,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "sxcs"; version = "1.1.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "NRK"; repo = "sxcs"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/sy/synadm/package.nix b/pkgs/by-name/sy/synadm/package.nix index 5a3cede9f356..6dfbd9bbb397 100644 --- a/pkgs/by-name/sy/synadm/package.nix +++ b/pkgs/by-name/sy/synadm/package.nix @@ -1,7 +1,7 @@ { lib, python3Packages, - fetchFromGitea, + fetchFromCodeberg, nix-update-script, }: @@ -10,8 +10,7 @@ python3Packages.buildPythonApplication rec { version = "0.49.2"; pyproject = true; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "synadm"; repo = "synadm"; tag = "v${version}"; diff --git a/pkgs/by-name/te/tenacity/package.nix b/pkgs/by-name/te/tenacity/package.nix index 4af8231506fb..4f9fbbc5348a 100644 --- a/pkgs/by-name/te/tenacity/package.nix +++ b/pkgs/by-name/te/tenacity/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - fetchFromGitea, + fetchFromCodeberg, cmake, ninja, wxGTK32, @@ -52,8 +52,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "tenacity"; version = "1.3.4"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "tenacityteam"; repo = "tenacity"; fetchSubmodules = true; diff --git a/pkgs/by-name/tl/tllist/package.nix b/pkgs/by-name/tl/tllist/package.nix index e55db46383f0..d81811cbc55b 100644 --- a/pkgs/by-name/tl/tllist/package.nix +++ b/pkgs/by-name/tl/tllist/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - fetchFromGitea, + fetchFromCodeberg, meson, ninja, }: @@ -10,8 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "tllist"; version = "1.1.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "dnkl"; repo = "tllist"; rev = finalAttrs.version; diff --git a/pkgs/by-name/tu/turbocase/package.nix b/pkgs/by-name/tu/turbocase/package.nix index cfc46e3c5a27..38a5cd6d73cc 100644 --- a/pkgs/by-name/tu/turbocase/package.nix +++ b/pkgs/by-name/tu/turbocase/package.nix @@ -1,7 +1,7 @@ { lib, python3, - fetchFromGitea, + fetchFromCodeberg, }: python3.pkgs.buildPythonApplication rec { @@ -9,8 +9,7 @@ python3.pkgs.buildPythonApplication rec { version = "1.8.0"; pyproject = true; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "MartijnBraam"; repo = "TurboCase"; rev = version; diff --git a/pkgs/by-name/tu/turnon/package.nix b/pkgs/by-name/tu/turnon/package.nix index 1fa81fb30e80..117d223342b9 100644 --- a/pkgs/by-name/tu/turnon/package.nix +++ b/pkgs/by-name/tu/turnon/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, rustPlatform, cairo, pango, @@ -20,8 +20,7 @@ rustPlatform.buildRustPackage { pname = "turnon"; version = version; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "swsnr"; repo = "turnon"; rev = "v${version}"; diff --git a/pkgs/by-name/tu/turntable/package.nix b/pkgs/by-name/tu/turntable/package.nix index 078190806a3c..c7a83d50e297 100644 --- a/pkgs/by-name/tu/turntable/package.nix +++ b/pkgs/by-name/tu/turntable/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, meson, ninja, pkg-config, @@ -25,8 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "turntable"; version = "0.4.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "GeopJr"; repo = "Turntable"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/ty/typesetter/package.nix b/pkgs/by-name/ty/typesetter/package.nix index d2ac1c6f34d1..cdba9151e29c 100644 --- a/pkgs/by-name/ty/typesetter/package.nix +++ b/pkgs/by-name/ty/typesetter/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, rustPlatform, # nativeBuildInputs @@ -32,8 +32,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "typesetter"; version = "0.9.1"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "haydn"; repo = "typesetter"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/ub/ubpm/package.nix b/pkgs/by-name/ub/ubpm/package.nix index 7ed89497bee4..4a6f1b928b4c 100644 --- a/pkgs/by-name/ub/ubpm/package.nix +++ b/pkgs/by-name/ub/ubpm/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - fetchFromGitea, + fetchFromCodeberg, qt6, udev, pkg-config, @@ -12,8 +12,7 @@ stdenv.mkDerivation (finalAttrs: { version = "1.13.0-unstable-2025-10-18"; baseVersion = lib.head (lib.splitString "-" finalAttrs.version); - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "LazyT"; repo = "ubpm"; rev = "748ce8504185ae96dbdbd1cff5352d1eef2c046d"; diff --git a/pkgs/by-name/up/upsies/package.nix b/pkgs/by-name/up/upsies/package.nix index e210cc4253db..c7218760da58 100644 --- a/pkgs/by-name/up/upsies/package.nix +++ b/pkgs/by-name/up/upsies/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, fetchpatch, ffmpeg-headless, mediainfo, @@ -21,8 +21,7 @@ python3Packages.buildPythonApplication (finalAttrs: { version = "2026.01.03"; pyproject = true; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "plotski"; repo = "upsies"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/uw/uwu-colors/package.nix b/pkgs/by-name/uw/uwu-colors/package.nix index 4ee85a766f2d..e07d12e355b1 100644 --- a/pkgs/by-name/uw/uwu-colors/package.nix +++ b/pkgs/by-name/uw/uwu-colors/package.nix @@ -1,6 +1,6 @@ { lib, - fetchFromGitea, + fetchFromCodeberg, rustPlatform, }: @@ -8,8 +8,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uwu-colors"; version = "0.4.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "q60"; repo = "uwu_colors"; tag = finalAttrs.version; diff --git a/pkgs/by-name/wa/wallust/package.nix b/pkgs/by-name/wa/wallust/package.nix index 33d95f29d367..59768f6008f2 100644 --- a/pkgs/by-name/wa/wallust/package.nix +++ b/pkgs/by-name/wa/wallust/package.nix @@ -1,6 +1,6 @@ { lib, - fetchFromGitea, + fetchFromCodeberg, rustPlatform, nix-update-script, imagemagick, @@ -11,8 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "wallust"; version = "3.5.2"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "explosion-mental"; repo = "wallust"; rev = finalAttrs.version; diff --git a/pkgs/by-name/wa/waylock/package.nix b/pkgs/by-name/wa/waylock/package.nix index 3c5e8ccdafe1..465014f33b40 100644 --- a/pkgs/by-name/wa/waylock/package.nix +++ b/pkgs/by-name/wa/waylock/package.nix @@ -2,7 +2,7 @@ lib, stdenv, callPackage, - fetchFromGitea, + fetchFromCodeberg, libxkbcommon, pam, pkg-config, @@ -17,8 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "waylock"; version = "1.5.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "ifreund"; repo = "waylock"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/wb/wbg/package.nix b/pkgs/by-name/wb/wbg/package.nix index c387f186611a..f00ec38f63e8 100644 --- a/pkgs/by-name/wb/wbg/package.nix +++ b/pkgs/by-name/wb/wbg/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - fetchFromGitea, + fetchFromCodeberg, pkg-config, meson, ninja, @@ -24,8 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "wbg"; version = "1.3.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "dnkl"; repo = "wbg"; tag = finalAttrs.version; diff --git a/pkgs/by-name/wl/wlock/package.nix b/pkgs/by-name/wl/wlock/package.nix index d6273ae934cf..2b1617bc8192 100644 --- a/pkgs/by-name/wl/wlock/package.nix +++ b/pkgs/by-name/wl/wlock/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, pkg-config, wayland-scanner, wayland, @@ -16,8 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "wlock"; version = "1.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "sewn"; repo = "wlock"; tag = finalAttrs.version; diff --git a/pkgs/by-name/wm/wmenu/package.nix b/pkgs/by-name/wm/wmenu/package.nix index 3ae64c334677..0c426b0b155c 100644 --- a/pkgs/by-name/wm/wmenu/package.nix +++ b/pkgs/by-name/wm/wmenu/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, pkg-config, meson, ninja, @@ -20,8 +20,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "adnano"; repo = "wmenu"; tag = finalAttrs.version; diff --git a/pkgs/by-name/wo/woodpecker-pipeline-transform/package.nix b/pkgs/by-name/wo/woodpecker-pipeline-transform/package.nix index 9df34f995c53..f9224f901694 100644 --- a/pkgs/by-name/wo/woodpecker-pipeline-transform/package.nix +++ b/pkgs/by-name/wo/woodpecker-pipeline-transform/package.nix @@ -1,14 +1,13 @@ { lib, buildGoModule, - fetchFromGitea, + fetchFromCodeberg, }: buildGoModule rec { pname = "woodpecker-pipeline-transform"; version = "0.2.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "lafriks"; repo = "woodpecker-pipeline-transform"; rev = "v${version}"; diff --git a/pkgs/by-name/wo/wownero/package.nix b/pkgs/by-name/wo/wownero/package.nix index 47664be5cfcc..325a794cfe0e 100644 --- a/pkgs/by-name/wo/wownero/package.nix +++ b/pkgs/by-name/wo/wownero/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - fetchFromGitea, + fetchFromCodeberg, fetchpatch, cmake, python3, @@ -29,8 +29,7 @@ let rev = "633500ad8c8759995049ccd022107d1fa8a1bbc9"; hash = "sha256-26UmESotSWnQ21VbAYEappLpkEMyl0jiuCaezRYd/sE="; }; - randomwow = fetchFromGitea { - domain = "codeberg.org"; + randomwow = fetchFromCodeberg { owner = "wownero"; repo = "RandomWOW"; rev = "27b099b6dd6fef6e17f58c6dfe00009e9c5df587"; @@ -41,8 +40,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "wownero"; version = "0.11.3.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "wownero"; repo = "wownero"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/by-name/wx/wxc/package.nix b/pkgs/by-name/wx/wxc/package.nix index 7fd72baa53b0..9628cc8ed501 100644 --- a/pkgs/by-name/wx/wxc/package.nix +++ b/pkgs/by-name/wx/wxc/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, cmake, libGL, wxGTK32, @@ -11,8 +11,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "wxc"; version = "1.0.0.2"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "wxHaskell"; repo = "wxHaskell"; rev = "wxc-${finalAttrs.version}"; diff --git a/pkgs/by-name/x1/x11basic/package.nix b/pkgs/by-name/x1/x11basic/package.nix index a0756b46a437..5a9f4acfb32a 100644 --- a/pkgs/by-name/x1/x11basic/package.nix +++ b/pkgs/by-name/x1/x11basic/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, autoreconfHook, fig2dev, readline, @@ -14,8 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "x11basic"; version = "1.28-65"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "kollo"; repo = "X11Basic"; tag = finalAttrs.version; diff --git a/pkgs/by-name/xa/xarcan/package.nix b/pkgs/by-name/xa/xarcan/package.nix index a1449a8f6d47..b67513d0cc9e 100644 --- a/pkgs/by-name/xa/xarcan/package.nix +++ b/pkgs/by-name/xa/xarcan/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, arcan, audit, dbus, @@ -44,8 +44,7 @@ stdenv.mkDerivation (finalPackages: rec { pname = "xarcan"; version = "0.7.1"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "letoram"; repo = "xarcan"; tag = version; diff --git a/pkgs/by-name/xc/xcalib/package.nix b/pkgs/by-name/xc/xcalib/package.nix index 0ad51f9ee12f..196a54bcc1d6 100644 --- a/pkgs/by-name/xc/xcalib/package.nix +++ b/pkgs/by-name/xc/xcalib/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, cmake, ninja, libX11, @@ -15,8 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "xcalib"; version = "0.11"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "OpenICC"; repo = "xcalib"; tag = finalAttrs.version; diff --git a/pkgs/by-name/xd/xdg-terminal-exec-mkhl/package.nix b/pkgs/by-name/xd/xdg-terminal-exec-mkhl/package.nix index 1a31fd7b524c..f0c1c5b31db6 100644 --- a/pkgs/by-name/xd/xdg-terminal-exec-mkhl/package.nix +++ b/pkgs/by-name/xd/xdg-terminal-exec-mkhl/package.nix @@ -1,14 +1,13 @@ { lib, rustPlatform, - fetchFromGitea, + fetchFromCodeberg, }: rustPlatform.buildRustPackage rec { pname = "xdg-terminal-exec-mkhl"; version = "0.2.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "mkhl"; repo = "xdg-terminal-exec"; rev = "v${version}"; diff --git a/pkgs/by-name/xm/xmppc/package.nix b/pkgs/by-name/xm/xmppc/package.nix index 95ec0f3e21fe..5778b311e236 100644 --- a/pkgs/by-name/xm/xmppc/package.nix +++ b/pkgs/by-name/xm/xmppc/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, autoconf-archive, autoreconfHook, pkg-config, @@ -14,8 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "xmppc"; version = "0.1.2"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "Anoxinon_e.V."; repo = "xmppc"; rev = finalAttrs.version; diff --git a/pkgs/by-name/xr/xrsh/package.nix b/pkgs/by-name/xr/xrsh/package.nix index 863e2e579853..7c488702a22b 100644 --- a/pkgs/by-name/xr/xrsh/package.nix +++ b/pkgs/by-name/xr/xrsh/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, makeWrapper, unstableGitUpdater, writeShellApplication, @@ -12,9 +12,8 @@ stdenv.mkDerivation { pname = "xrsh"; version = "0-unstable-2025-05-23"; - src = fetchFromGitea { + src = fetchFromCodeberg { fetchSubmodules = true; - domain = "codeberg.org"; owner = "xrsh"; repo = "xrsh"; rev = "ab5efe4a337459886394b9c13550a543c4c4ae25"; diff --git a/pkgs/by-name/ya/yambar/package.nix b/pkgs/by-name/ya/yambar/package.nix index f25a80b9205d..aba3516e2259 100644 --- a/pkgs/by-name/ya/yambar/package.nix +++ b/pkgs/by-name/ya/yambar/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, alsa-lib, bison, fcft, @@ -34,8 +34,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "yambar"; version = "1.11.0"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "dnkl"; repo = "yambar"; rev = finalAttrs.version; diff --git a/pkgs/by-name/zi/zig-shell-completions/package.nix b/pkgs/by-name/zi/zig-shell-completions/package.nix index 08a21f7bd948..334532de5ae5 100644 --- a/pkgs/by-name/zi/zig-shell-completions/package.nix +++ b/pkgs/by-name/zi/zig-shell-completions/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, installShellFiles, unstableGitUpdater, }: @@ -10,8 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "zig-shell-completions"; version = "0-unstable-2025-11-25"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "ziglang"; repo = "shell-completions"; rev = "c2983a75dcbcaf3a1df74ab563a9bd3c8e7f448e"; diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix index 98a331a32fbd..3a64173a8521 100644 --- a/pkgs/development/compilers/zig/generic.nix +++ b/pkgs/development/compilers/zig/generic.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitea, + fetchFromCodeberg, cmake, llvmPackages, xcbuild, @@ -22,8 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "zig"; inherit version; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "ziglang"; repo = "zig"; rev = finalAttrs.version; diff --git a/pkgs/development/hare-third-party/hare-toml/default.nix b/pkgs/development/hare-third-party/hare-toml/default.nix index 0002db4c2fc2..2194b6595c9b 100644 --- a/pkgs/development/hare-third-party/hare-toml/default.nix +++ b/pkgs/development/hare-third-party/hare-toml/default.nix @@ -1,5 +1,5 @@ { - fetchFromGitea, + fetchFromCodeberg, fetchpatch, hareHook, lib, @@ -11,8 +11,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "hare-toml"; version = "0.1.2"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "lunacb"; repo = "hare-toml"; rev = "v${finalAttrs.version}"; diff --git a/pkgs/development/misc/haskell/changelog-d/default.nix b/pkgs/development/misc/haskell/changelog-d/default.nix index 06a5e7960980..c13a69bcdb19 100644 --- a/pkgs/development/misc/haskell/changelog-d/default.nix +++ b/pkgs/development/misc/haskell/changelog-d/default.nix @@ -6,7 +6,7 @@ Cabal-syntax, containers, directory, - fetchFromGitea, + fetchFromCodeberg, filepath, generic-lens-lite, lib, @@ -20,8 +20,7 @@ mkDerivation rec { pname = "changelog-d"; version = "1.0.2"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "fgaz"; repo = "changelog-d"; rev = "v${version}"; diff --git a/pkgs/development/python-modules/aiobtclientapi/default.nix b/pkgs/development/python-modules/aiobtclientapi/default.nix index 0bd027871905..68b95bd79d98 100644 --- a/pkgs/development/python-modules/aiobtclientapi/default.nix +++ b/pkgs/development/python-modules/aiobtclientapi/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchFromGitea, + fetchFromCodeberg, aiobtclientrpc, async-timeout, httpx, @@ -17,8 +17,7 @@ buildPythonPackage (finalAttrs: { version = "1.1.4"; pyproject = true; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "plotski"; repo = "aiobtclientapi"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/development/python-modules/aiobtclientrpc/default.nix b/pkgs/development/python-modules/aiobtclientrpc/default.nix index b206e8912923..c0fcd7472142 100644 --- a/pkgs/development/python-modules/aiobtclientrpc/default.nix +++ b/pkgs/development/python-modules/aiobtclientrpc/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchFromGitea, + fetchFromCodeberg, async-timeout, httpx, httpx-socks, @@ -20,8 +20,7 @@ buildPythonPackage (finalAttrs: { version = "5.0.1"; pyproject = true; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "plotski"; repo = "aiobtclientrpc"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/development/python-modules/aioxmpp/default.nix b/pkgs/development/python-modules/aioxmpp/default.nix index b1c5ae9e8d3a..1e0184d6a365 100644 --- a/pkgs/development/python-modules/aioxmpp/default.nix +++ b/pkgs/development/python-modules/aioxmpp/default.nix @@ -5,7 +5,7 @@ babel, buildPythonPackage, dnspython, - fetchFromGitea, + fetchFromCodeberg, lxml, multidict, pyasn1-modules, @@ -24,8 +24,7 @@ buildPythonPackage rec { version = "0.13.3"; pyproject = true; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "jssfr"; repo = "aioxmpp"; tag = "v${version}"; diff --git a/pkgs/development/python-modules/clickclick/default.nix b/pkgs/development/python-modules/clickclick/default.nix index baf60a69af7c..59c5afddccf3 100644 --- a/pkgs/development/python-modules/clickclick/default.nix +++ b/pkgs/development/python-modules/clickclick/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, click, - fetchFromGitea, + fetchFromCodeberg, flake8, pytest-cov-stub, pytestCheckHook, @@ -16,8 +16,7 @@ buildPythonPackage rec { version = "20.10.2"; pyproject = true; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "hjacobs"; repo = "python-clickclick"; rev = version; diff --git a/pkgs/development/python-modules/countryguess/default.nix b/pkgs/development/python-modules/countryguess/default.nix index 21df86b448a9..2f6d64371d7d 100644 --- a/pkgs/development/python-modules/countryguess/default.nix +++ b/pkgs/development/python-modules/countryguess/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchFromGitea, + fetchFromCodeberg, pytest-mock, pytestCheckHook, setuptools, @@ -12,8 +12,7 @@ buildPythonPackage (finalAttrs: { version = "0.4.9"; pyproject = true; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "plotski"; repo = "countryguess"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/development/python-modules/desktop-entry-lib/default.nix b/pkgs/development/python-modules/desktop-entry-lib/default.nix index d02e65868763..17f3a3cae32a 100644 --- a/pkgs/development/python-modules/desktop-entry-lib/default.nix +++ b/pkgs/development/python-modules/desktop-entry-lib/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, pytestCheckHook, - fetchFromGitea, + fetchFromCodeberg, setuptools, }: @@ -12,8 +12,7 @@ buildPythonPackage rec { pyproject = true; # We could use fetchPypi, but then the tests won't run - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "JakobDev"; repo = "desktop-entry-lib"; rev = version; diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix index ac796630d53c..033982391633 100644 --- a/pkgs/development/python-modules/django-allauth/default.nix +++ b/pkgs/development/python-modules/django-allauth/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchFromGitea, + fetchFromCodeberg, python, # build-system @@ -44,8 +44,7 @@ buildPythonPackage rec { version = "65.14.0"; pyproject = true; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "allauth"; repo = "django-allauth"; tag = version; diff --git a/pkgs/development/python-modules/eheimdigital/default.nix b/pkgs/development/python-modules/eheimdigital/default.nix index 87e7eae541b0..95d038fc66ba 100644 --- a/pkgs/development/python-modules/eheimdigital/default.nix +++ b/pkgs/development/python-modules/eheimdigital/default.nix @@ -1,7 +1,7 @@ { aiohttp, buildPythonPackage, - fetchFromGitea, + fetchFromCodeberg, hatchling, lib, yarl, @@ -12,8 +12,7 @@ buildPythonPackage rec { version = "1.5.0"; pyproject = true; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "autinerd"; repo = "eheimdigital"; tag = version; diff --git a/pkgs/development/python-modules/fortune/default.nix b/pkgs/development/python-modules/fortune/default.nix index 10f858de1330..f0976920e138 100644 --- a/pkgs/development/python-modules/fortune/default.nix +++ b/pkgs/development/python-modules/fortune/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchFromGitea, + fetchFromCodeberg, setuptools, }: let @@ -12,8 +12,7 @@ buildPythonPackage { inherit version; pyproject = true; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "jamesansley"; repo = "fortune"; tag = "v${version}"; diff --git a/pkgs/development/python-modules/highctidh/default.nix b/pkgs/development/python-modules/highctidh/default.nix index e93de00b4c3a..4763e41f3cb2 100644 --- a/pkgs/development/python-modules/highctidh/default.nix +++ b/pkgs/development/python-modules/highctidh/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, setuptools, pytestCheckHook, - fetchFromGitea, + fetchFromCodeberg, gitUpdater, }: buildPythonPackage rec { @@ -11,8 +11,7 @@ buildPythonPackage rec { version = "1.0.2025051200"; pyproject = true; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "vula"; repo = "highctidh"; tag = "v${version}"; diff --git a/pkgs/development/python-modules/inflate64/default.nix b/pkgs/development/python-modules/inflate64/default.nix index e844b2367110..163da02a4022 100644 --- a/pkgs/development/python-modules/inflate64/default.nix +++ b/pkgs/development/python-modules/inflate64/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchFromGitea, + fetchFromCodeberg, nix-update-script, setuptools, setuptools-scm, @@ -13,8 +13,7 @@ buildPythonPackage rec { version = "1.0.2"; pyproject = true; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "miurahr"; repo = "inflate64"; tag = "v${version}"; diff --git a/pkgs/development/python-modules/liberty-parser/default.nix b/pkgs/development/python-modules/liberty-parser/default.nix index 84e60242771f..e3e330253759 100644 --- a/pkgs/development/python-modules/liberty-parser/default.nix +++ b/pkgs/development/python-modules/liberty-parser/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchFromGitea, + fetchFromCodeberg, setuptools, lark, numpy, @@ -14,8 +14,7 @@ buildPythonPackage rec { version = "0.0.29"; pyproject = true; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "tok"; repo = "liberty-parser"; tag = version; diff --git a/pkgs/development/python-modules/multivolumefile/default.nix b/pkgs/development/python-modules/multivolumefile/default.nix index 5ae5bacb33f4..9609a11567de 100644 --- a/pkgs/development/python-modules/multivolumefile/default.nix +++ b/pkgs/development/python-modules/multivolumefile/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchFromGitea, + fetchFromCodeberg, setuptools, setuptools-scm, hypothesis, @@ -14,8 +14,7 @@ buildPythonPackage rec { version = "0.2.3"; pyproject = true; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "miurahr"; repo = "multivolume"; tag = "v${version}"; diff --git a/pkgs/development/python-modules/psnawp/default.nix b/pkgs/development/python-modules/psnawp/default.nix index d40c39ee4cc2..253641d2634d 100644 --- a/pkgs/development/python-modules/psnawp/default.nix +++ b/pkgs/development/python-modules/psnawp/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage, - fetchFromGitea, + fetchFromCodeberg, lib, poetry-core, pycountry, @@ -14,8 +14,7 @@ buildPythonPackage rec { version = "3.0.1"; pyproject = true; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "YoshikageKira"; repo = "psnawp"; tag = "v${version}"; diff --git a/pkgs/development/python-modules/pybcj/default.nix b/pkgs/development/python-modules/pybcj/default.nix index c82a9bff2a95..6de3621a9b70 100644 --- a/pkgs/development/python-modules/pybcj/default.nix +++ b/pkgs/development/python-modules/pybcj/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchFromGitea, + fetchFromCodeberg, setuptools, setuptools-scm, hypothesis, @@ -13,8 +13,7 @@ buildPythonPackage rec { version = "1.0.3"; pyproject = true; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "miurahr"; repo = "pybcj"; tag = "v${version}"; diff --git a/pkgs/development/python-modules/pydle/default.nix b/pkgs/development/python-modules/pydle/default.nix index 50597296374f..da06f1deb953 100644 --- a/pkgs/development/python-modules/pydle/default.nix +++ b/pkgs/development/python-modules/pydle/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage, - fetchFromGitea, + fetchFromCodeberg, lib, nix-update-script, poetry-core, @@ -13,8 +13,7 @@ buildPythonPackage rec { pname = "pydle"; version = "1.1.0"; pyproject = true; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "shiz"; repo = "pydle"; tag = "v${version}"; diff --git a/pkgs/development/python-modules/pyimgbox/default.nix b/pkgs/development/python-modules/pyimgbox/default.nix index 225ed464998d..1dca15949264 100644 --- a/pkgs/development/python-modules/pyimgbox/default.nix +++ b/pkgs/development/python-modules/pyimgbox/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchFromGitea, + fetchFromCodeberg, beautifulsoup4, httpx, pytest-asyncio, @@ -16,8 +16,7 @@ buildPythonPackage (finalAttrs: { version = "1.0.7"; pyproject = true; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "plotski"; repo = "pyimgbox"; tag = "v${finalAttrs.version}"; diff --git a/pkgs/development/python-modules/pykakasi/default.nix b/pkgs/development/python-modules/pykakasi/default.nix index cbb3d467ec26..d76f1326eecb 100644 --- a/pkgs/development/python-modules/pykakasi/default.nix +++ b/pkgs/development/python-modules/pykakasi/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, deprecated, - fetchFromGitea, + fetchFromCodeberg, jaconv, py-cpuinfo, pytest-benchmark, @@ -15,8 +15,7 @@ buildPythonPackage rec { version = "2.3.0"; pyproject = true; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "miurahr"; repo = "pykakasi"; tag = "v${version}"; diff --git a/pkgs/development/python-modules/pyppmd/default.nix b/pkgs/development/python-modules/pyppmd/default.nix index ba57dd3faa0d..477e27afa854 100644 --- a/pkgs/development/python-modules/pyppmd/default.nix +++ b/pkgs/development/python-modules/pyppmd/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchFromGitea, + fetchFromCodeberg, setuptools, setuptools-scm, hypothesis, @@ -15,8 +15,7 @@ buildPythonPackage rec { version = "1.1.1"; pyproject = true; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "miurahr"; repo = "pyppmd"; tag = "v${version}"; diff --git a/pkgs/kde/third-party/krohnkite/default.nix b/pkgs/kde/third-party/krohnkite/default.nix index 8b05e374a0ea..3de2916e8017 100644 --- a/pkgs/kde/third-party/krohnkite/default.nix +++ b/pkgs/kde/third-party/krohnkite/default.nix @@ -2,7 +2,7 @@ lib, nix-update-script, buildNpmPackage, - fetchFromGitea, + fetchFromCodeberg, nodejs_22, kwin, kpackage, @@ -12,8 +12,7 @@ buildNpmPackage (finalAttrs: { pname = "krohnkite"; version = "0.9.9.2"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "anametologin"; repo = "Krohnkite"; rev = finalAttrs.version; diff --git a/pkgs/os-specific/linux/shufflecake/default.nix b/pkgs/os-specific/linux/shufflecake/default.nix index c087b0c55382..6d18f4cf89e2 100644 --- a/pkgs/os-specific/linux/shufflecake/default.nix +++ b/pkgs/os-specific/linux/shufflecake/default.nix @@ -3,7 +3,7 @@ kernel, kernelModuleMakeFlags, stdenv, - fetchFromGitea, + fetchFromCodeberg, libgcrypt, lvm2, }: @@ -11,8 +11,7 @@ stdenv.mkDerivation (finalAttrs: { name = "shufflecake"; version = "0.5.5"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "shufflecake"; repo = "shufflecake-c"; rev = "v${finalAttrs.version}"; diff --git a/pkgs/servers/home-assistant/custom-components/gpio/package.nix b/pkgs/servers/home-assistant/custom-components/gpio/package.nix index 9ace56873262..9c53c94e7ee8 100644 --- a/pkgs/servers/home-assistant/custom-components/gpio/package.nix +++ b/pkgs/servers/home-assistant/custom-components/gpio/package.nix @@ -1,7 +1,7 @@ { lib, buildHomeAssistantComponent, - fetchFromGitea, + fetchFromCodeberg, libgpiod, }: @@ -10,8 +10,7 @@ buildHomeAssistantComponent rec { domain = "gpio"; version = "0.0.4"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "raboof"; repo = "ha-gpio"; rev = "v${version}"; diff --git a/pkgs/tools/networking/knock/package.nix b/pkgs/tools/networking/knock/package.nix index 26fc0dbcee8c..2ac33f93294f 100644 --- a/pkgs/tools/networking/knock/package.nix +++ b/pkgs/tools/networking/knock/package.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, - fetchFromGitea, + fetchFromCodeberg, installShellFiles, }: @@ -9,8 +9,7 @@ buildGoModule rec { pname = "knock"; version = "0.0.2"; - src = fetchFromGitea { - domain = "codeberg.org"; + src = fetchFromCodeberg { owner = "nat-418"; repo = "knock"; rev = "v${version}"; From 8a77a297cd6c024e0ff1162ef55f99af37590bbf Mon Sep 17 00:00:00 2001 From: Wolfgang Jeltsch Date: Sat, 31 Jan 2026 12:55:52 +0200 Subject: [PATCH 28/30] pam: add missing article to the `security.pam.enableUMask` docs --- nixos/modules/security/pam.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index def4227d34ce..01b5603dbf2d 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -2249,7 +2249,7 @@ in }; }; - security.pam.enableUMask = lib.mkEnableOption "umask PAM module"; + security.pam.enableUMask = lib.mkEnableOption "the umask PAM module"; security.pam.enableFscrypt = lib.mkEnableOption '' fscrypt, to automatically unlock directories with the user's login password. From 5e90d483cacd6a9f0d507d23753119bcc6d55b56 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 31 Jan 2026 11:07:59 +0000 Subject: [PATCH 29/30] simplex-chat-desktop: 6.4.8 -> 6.4.10 --- pkgs/by-name/si/simplex-chat-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix index 4d52355cd667..884314d38dcf 100644 --- a/pkgs/by-name/si/simplex-chat-desktop/package.nix +++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix @@ -8,7 +8,7 @@ let pname = "simplex-chat-desktop"; - version = "6.4.8"; + version = "6.4.10"; sources = { "aarch64-linux" = fetchurl { @@ -17,7 +17,7 @@ let }; "x86_64-linux" = fetchurl { url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage"; - hash = "sha256-2XyA4UZ9EMzFnFNFFek1ka2MURBFFKyMolGMYZPD5Zw="; + hash = "sha256-HueMU1cCOspIsDg4hC9ebMbIvkOtZGiSktB1VSMGgT8="; }; }; From 6c99841ac165f59e8df1a503387ef2e70c0f2b2f Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Sat, 31 Jan 2026 04:20:29 +0100 Subject: [PATCH 30/30] {recoll,psi-plus}: move wrapQtAppsHook in the list of nativeBuildInputs this cleans up the derivation at the cost of a rebuild --- .../networking/instant-messengers/psi-plus/default.nix | 4 ++-- pkgs/applications/search/recoll/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index 03670bebed13..184c69feb4e0 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -64,11 +64,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake qttools + wrapQtAppsHook ] ++ lib.optionals enablePsiMedia [ pkg-config - ] - ++ [ wrapQtAppsHook ]; + ]; buildInputs = [ qtbase diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 850ad120df28..382c681634c0 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -120,6 +120,7 @@ stdenv.mkDerivation rec { ninja pkg-config which + wrapQtAppsHook ] ++ lib.optionals withGui [ qtbase @@ -127,8 +128,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withPython [ python3Packages.setuptools - ] - ++ [ wrapQtAppsHook ]; + ]; buildInputs = [ aspell