[Backport release-25.11] fetchFrom{Forgejo,Codeberg}: init, treewide: fetchFromGitea -> fetchFromCodeberg, docs#488172
Merged
SigmaSquadron merged 4 commits intoNixOS:release-25.11from Feb 10, 2026
Conversation
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
This report is automatically generated by the PR / Check / cherry-pick CI workflow.
Some of the commits in this PR require the author's and reviewer's attention.
Sometimes it is not possible to cherry-pick exactly the same patch.
This most frequently happens when resolving merge conflicts.
The range-diff will help to review the resolution of conflicts.
If you need to merge this PR despite the warnings, please dismiss this review shortly before merging.
Warning
Difference between b4f577f and original 3562403 may warrant inspection.
Show diff
@@ Commit message
Co-authored-by: Gutyina Gergő <gutyina.gergo.2@gmail.com>
Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
+ (cherry picked from commit 3562403503f705f700bcbd9b1c1bae1c6641f519)
+ Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
+
## pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix ##
@@
{
@@ pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix
}:
@@ pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix: vimUtils.buildVimPlugin {
pname = "cmp-async-path";
- version = "0-unstable-2026-01-09";
+ version = "0-unstable-2025-11-04";
- src = fetchFromGitea {
- domain = "codeberg.org";
+ src = fetchFromCodeberg {
owner = "FelipeLema";
repo = "cmp-async-path";
- rev = "9c2374deb32c2bec8b27e928c6f57090e9a875d2";
+ rev = "b8aade3a0626f2bc1d3cd79affcd7da9f47f7ab1";
- ## pkgs/applications/editors/vim/plugins/non-generated/zig-vim/default.nix ##
+ ## pkgs/applications/misc/ubpm/default.nix ##
@@
{
+ stdenv,
lib,
- vimUtils,
- fetchFromGitea,
+ fetchFromCodeberg,
- nix-update-script,
- }:
- vimUtils.buildVimPlugin {
- pname = "zig.vim";
- version = "0-unstable-2026-01-16";
+ qmake,
+ qttools,
+ qtbase,
+@@ pkgs/applications/misc/ubpm/default.nix: stdenv.mkDerivation (finalAttrs: {
+ pname = "ubpm";
+ version = "1.10.0";
- src = fetchFromGitea {
- domain = "codeberg.org";
+ src = fetchFromCodeberg {
- owner = "ziglang";
- repo = "zig.vim";
- rev = "fc01f73ce0636723a03b784b63a7a89f2f9a84ae";
+ owner = "LazyT";
+ repo = "ubpm";
+ rev = finalAttrs.version;
- ## pkgs/applications/networking/browsers/librewolf/src.nix ##
+ ## pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix ##
@@
{
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;
-
- ## pkgs/by-name/ar/arcan/sources.nix ##
-@@
- {
- fetchFromGitHub,
+ buildLua,
- fetchFromGitea,
+ fetchFromCodeberg,
- }:
-
- {
-@@
- pname = "arcan";
- version = "0.7.1";
+ unstableGitUpdater,
+ curl,
+ coreutils,
+@@ pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix: buildLua {
+ version = "0-unstable-2025-09-09";
+ scriptPath = "sponsorblock_minimal.lua";
- src = fetchFromGitea {
- domain = "codeberg.org";
+ src = fetchFromCodeberg {
- owner = "letoram";
- repo = "arcan";
- tag = self.version;
+ owner = "jouni";
+ repo = "mpv_sponsorblock_minimal";
+ rev = "fc0db1fbffc873ca02ced7602274393fde8857e5";
## pkgs/by-name/bi/bibiman/package.nix ##
@@
@@ pkgs/by-name/ca/caffeine-ng/package.nix
pkg-config,
@@ pkgs/by-name/ca/caffeine-ng/package.nix: python3Packages.buildPythonApplication rec {
version = "4.2.0";
- pyproject = false;
+ format = "other";
- src = fetchFromGitea {
- domain = "codeberg.org";
@@ pkgs/by-name/ca/calamares/package.nix: stdenv.mkDerivation (finalAttrs: {
repo = "calamares";
tag = "v${finalAttrs.version}";
- ## pkgs/by-name/ca/cat9/package.nix ##
-@@
- {
- lib,
-- fetchFromGitea,
-+ fetchFromCodeberg,
- stdenvNoCC,
- }:
-
-@@ pkgs/by-name/ca/cat9/package.nix: stdenvNoCC.mkDerivation (finalAttrs: {
- pname = "cat9";
- version = "0-unstable-2025-12-26";
-
-- src = fetchFromGitea {
-- domain = "codeberg.org";
-+ src = fetchFromCodeberg {
- owner = "letoram";
- repo = "cat9";
- rev = "8d2b30545c3e87c8f2e161d755b53c23a48bcf05";
-
- ## pkgs/by-name/ce/censor/package.nix ##
-@@
- {
- lib,
-- fetchFromGitea,
-+ fetchFromCodeberg,
- python3Packages,
- wrapGAppsHook4,
- gobject-introspection,
-@@ pkgs/by-name/ce/censor/package.nix: python3Packages.buildPythonApplication rec {
- version = "0.3.0";
- pyproject = false;
-
-- src = fetchFromGitea {
-- domain = "codeberg.org";
-+ src = fetchFromCodeberg {
- owner = "censor";
- repo = "Censor";
- tag = "v${version}";
-
## pkgs/by-name/co/codeberg-cli/package.nix ##
@@
{
@@ pkgs/by-name/co/codeberg-cli/package.nix
openssl,
@@ pkgs/by-name/co/codeberg-cli/package.nix: rustPlatform.buildRustPackage rec {
pname = "codeberg-cli";
- version = "0.5.4";
+ version = "0.5.1";
- src = fetchFromGitea {
- domain = "codeberg.org";
@@ pkgs/by-name/co/comaps/package.nix: organicmaps.overrideAttrs (oldAttrs: rec {
repo = "comaps";
tag = "v${version}";
- ## pkgs/by-name/cu/cunicu/package.nix ##
-@@
- lib,
- stdenv,
- buildGoModule,
-- fetchFromGitea,
-+ fetchFromCodeberg,
- installShellFiles,
- versionCheckHook,
- protobuf,
-@@ pkgs/by-name/cu/cunicu/package.nix: buildGoModule rec {
- pname = "cunicu";
- version = "0.12.0";
-
-- src = fetchFromGitea {
-- domain = "codeberg.org";
-+ src = fetchFromCodeberg {
- owner = "cunicu";
- repo = "cunicu";
- rev = "v${version}";
-
## pkgs/by-name/cu/curv/package.nix ##
@@
{
@@ pkgs/by-name/cu/curv/package.nix
pkg-config,
@@ pkgs/by-name/cu/curv/package.nix: stdenv.mkDerivation {
pname = "curv";
- version = "0.5-unstable-2026-01-23";
+ version = "0.5-unstable-2025-01-20";
- src = fetchFromGitea {
- domain = "codeberg.org";
+ src = fetchFromCodeberg {
owner = "doug-moen";
repo = "curv";
- rev = "17d03b534c69976ed60936beb8b7cc38e8c12c13";
+ rev = "ef082c6612407dd8abce06015f9a16b1ebf661b8";
## pkgs/by-name/da/dabet/package.nix ##
@@
@@ pkgs/by-name/de/deltatouch/package.nix
- fetchFromGitea,
+ fetchFromCodeberg,
fetchFromGitHub,
+ fetchpatch,
cmake,
- intltool,
@@ pkgs/by-name/de/deltatouch/package.nix: stdenv.mkDerivation (finalAttrs: {
pname = "deltatouch";
- version = "2.25.1";
+ version = "2.22.0";
- src = fetchFromGitea {
- domain = "codeberg.org";
@@ pkgs/by-name/de/dev86/package.nix
stdenv.mkDerivation (finalAttrs: {
pname = "dev86";
- version = "1.0.1-unstable-2025-02-12";
+ version = "1.0.1";
- src = fetchFromGitea {
- domain = "codeberg.org";
+ src = fetchFromCodeberg {
owner = "jbruchon";
repo = "dev86";
- rev = "0332db1ceb238fa7f98603cdf4223a1d839d4b31";
+ tag = "v${finalAttrs.version}";
## pkgs/by-name/di/didu/package.nix ##
@@
@@ pkgs/by-name/do/door-knocker/package.nix: stdenv.mkDerivation (finalAttrs: {
repo = "door-knocker";
rev = finalAttrs.version;
- ## pkgs/by-name/du/durden/package.nix ##
-@@
- {
- 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;
-
## pkgs/by-name/du/dut/package.nix ##
@@
{
@@ pkgs/by-name/ed/eduvpn-client/package.nix
gtk3,
@@ pkgs/by-name/ed/eduvpn-client/package.nix: python3Packages.buildPythonApplication rec {
version = "4.6.0";
- pyproject = true;
+ format = "pyproject";
- src = fetchFromGitea {
- domain = "codeberg.org";
@@ pkgs/by-name/fc/fcft/package.nix
pkg-config,
meson,
ninja,
-@@ pkgs/by-name/fc/fcft/package.nix: stdenv.mkDerivation (finalAttrs: {
+@@ pkgs/by-name/fc/fcft/package.nix: stdenv.mkDerivation rec {
pname = "fcft";
- version = "3.3.3";
+ version = "3.3.2";
- src = fetchFromGitea {
- domain = "codeberg.org";
+ src = fetchFromCodeberg {
owner = "dnkl";
repo = "fcft";
- rev = finalAttrs.version;
+ rev = version;
## pkgs/by-name/fe/fehlstart/package.nix ##
@@
@@ pkgs/by-name/fi/find-billy/package.nix
godot_4,
makeWrapper,
just,
-@@ pkgs/by-name/fi/find-billy/package.nix: stdenv.mkDerivation (finalAttrs: {
+@@ pkgs/by-name/fi/find-billy/package.nix: stdenv.mkDerivation rec {
pname = "find-billy";
version = "1.1.0";
@@ pkgs/by-name/fi/find-billy/package.nix: stdenv.mkDerivation (finalAttrs: {
+ src = fetchFromCodeberg {
owner = "annaaurora";
repo = "Find-Billy";
- rev = "v${finalAttrs.version}";
+ rev = "v${version}";
## pkgs/by-name/fj/fjo/package.nix ##
@@
@@ pkgs/by-name/fo/forgejo-cli/package.nix
writableTmpDirAsHomeHook,
@@ pkgs/by-name/fo/forgejo-cli/package.nix: rustPlatform.buildRustPackage (finalAttrs: {
pname = "forgejo-cli";
- version = "0.4.0";
+ version = "0.3.0";
- src = fetchFromGitea {
- domain = "codeberg.org";
+ src = fetchFromCodeberg {
- owner = "forgejo-contrib";
+ owner = "Cyborus";
repo = "forgejo-cli";
tag = "v${finalAttrs.version}";
## pkgs/by-name/fo/forgejo/generic.nix ##
@@
- lndir,
+ xorg,
runCommand,
stdenv,
- fetchFromGitea,
@@ pkgs/by-name/gi/git-pages-cli/package.nix
versionCheckHook,
@@ pkgs/by-name/gi/git-pages-cli/package.nix: buildGoModule (finalAttrs: {
pname = "git-pages-cli";
- version = "1.5.2";
+ version = "1.3.1";
- src = fetchFromGitea {
- domain = "codeberg.org";
@@ pkgs/by-name/gi/gitolite/package.nix: stdenv.mkDerivation (finalAttrs: {
repo = "gitolite";
tag = "v${finalAttrs.version}";
- ## pkgs/by-name/go/go-errorlint/package.nix ##
-@@
- {
- lib,
- buildGoModule,
-- fetchFromGitea,
-+ fetchFromCodeberg,
- nix-update-script,
- }:
-
-@@ pkgs/by-name/go/go-errorlint/package.nix: buildGoModule rec {
- pname = "go-errorlint";
- version = "1.9.0";
-
-- src = fetchFromGitea {
-- domain = "codeberg.org";
-+ src = fetchFromCodeberg {
- owner = "polyfloyd";
- repo = "go-errorlint";
- rev = "v${version}";
-
- ## pkgs/by-name/go/gose/package.nix ##
-@@
- 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}";
-
[...truncated...]Hint: The full diffs are also available in the runner logs with slightly better highlighting.
nixpkgs-ci
bot
added
10.rebuild-linux: 1-10
Member
|
Please rebase to fix the merge conflict. |
nixpkgs-ci
bot
added
the
2.status: merge conflict
It's 'fetchFromGitea', with the domain already set. Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net> (cherry picked from commit dcc52f0)
Simple alias, as Gitea's fetcher is compatible with Forgejo. Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net> (cherry picked from commit adf7a48)
…o and fetchFromCodeberg Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net> (cherry picked from commit a1c9639)
SigmaSquadron
force-pushed
the
push-uuxkxqqpvvtx
branch
from
5cdb028 to
5ecb3fe
Compare
Contributor
Author
|
Rebased. |
nixpkgs-ci
bot
removed
the
2.status: merge conflict
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ő <gutyina.gergo.2@gmail.com>
Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
(cherry picked from commit 3562403)
Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
SigmaSquadron
force-pushed
the
push-uuxkxqqpvvtx
branch
from
5ecb3fe to
b4f577f
Compare
SuperSandro2000
approved these changes
Feb 9, 2026
nixpkgs-ci
bot
added
12.approvals: 1
Contributor
Author
|
I'll go ahead and merge before we get another conflict. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Manual backport of #483216.
The following missing packages are expected from the treewide diff:
Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.