diff --git a/flake.nix b/flake.nix index 8729dfa..b56eee9 100644 --- a/flake.nix +++ b/flake.nix @@ -66,7 +66,7 @@ # Native-only packages — skip on s390x cross (gitea's pnpm step and # cgo+sqlite link don't cross-compile cleanly). // nixpkgs.lib.optionalAttrs (sys == "x86_64-linux" || sys == "aarch64-linux") { - gitea-projects-api = + gitea-local-fork = let # Our fork's go.mod requires Go 1.26.3; nixpkgs at this pin has # only 1.26.0 (and unstable has 1.26.2). Bump the package's src. @@ -78,7 +78,7 @@ }; }); in - pkgs.callPackage ./packages/gitea-projects-api.nix { + pkgs.callPackage ./packages/gitea-local-fork.nix { buildGoModule = pkgs.buildGoModule.override { inherit go; }; }; } diff --git a/justfile b/justfile index c1c2e15..229d740 100644 --- a/justfile +++ b/justfile @@ -29,16 +29,17 @@ antigravity-build-no-fhs: antigravity-update: nix flake update antigravity-nix -# ── gitea-projects-api ───────────────────────────────────── +# ── gitea-local-fork ─────────────────────────────────────── +# Builds Oleks's local gitea fork (/home/oleks/projects/gitea, branch oleks/main). # Build the gitea fork (compiles Go 1.26.3 first time; ~5-8 min cold) gitea-build: - nix build .#gitea-projects-api --print-build-logs + nix build .#gitea-local-fork --print-build-logs -# Refresh gitea-projects-api: bump rev/hashes/version, retag the gitea fork, push both repos +# Refresh gitea-local-fork: bump rev/hashes/version, retag the gitea fork, push both repos gitea-update: nix run nixpkgs#nix-update -- \ - --flake gitea-projects-api \ + --flake gitea-local-fork \ --use-update-script # Run gitea from the attic-cached build (no local recompile) @@ -46,4 +47,4 @@ gitea-run: nix run \ --extra-substituters "https://nix-cache-custom.oleks.space/attic-infra-cache-k3s-1" \ --extra-trusted-public-keys "attic-infra-cache-k3s-1:qYSNK3DmttQXCFqn1t50qoWGtQNPRFWq9mgQjD05DeU=" \ - git+https://git.oleks.space/oleks/flake-hub#gitea-projects-api -- --help + git+https://git.oleks.space/oleks/flake-hub#gitea-local-fork -- --help diff --git a/packages/gitea-projects-api.nix b/packages/gitea-local-fork.nix similarity index 77% rename from packages/gitea-projects-api.nix rename to packages/gitea-local-fork.nix index 6eb15af..97cc6ec 100644 --- a/packages/gitea-projects-api.nix +++ b/packages/gitea-local-fork.nix @@ -16,14 +16,25 @@ sqliteSupport ? true, }: -# Custom Gitea built from oleks/gitea feat/projects-api — upstream PR #37518 -# (Projects REST API) on top of upstream main. +# Custom Gitea built from Oleks's local fork. +# +# Fork repo (local working copy): /home/oleks/projects/gitea +# Fork remote: https://git.oleks.space/oleks/gitea.git +# Tracked branch: oleks/main (the fork's integration tip; +# formerly `feat/projects-api`, renamed +# 2026-05-13. Carries upstream/main + +# PR #37518 Projects REST API + a few +# fork-local commits.) +# Pin discipline: nix-update bumps `rev` and tags the fork +# at `v` (see passthru.updateScript +# below) so the rev stays reachable even +# after future force-pushes / rebases. # # Mirrors the structure of nixpkgs' gitea derivation (frontend pnpm sub-drv # + buildGoModule with go:embed of public/) but with our fork as src. let - pname = "gitea-projects-api"; + pname = "gitea-local-fork"; version = "1.26.0-unstable-2026-05-12"; src = fetchgit { @@ -140,9 +151,9 @@ buildGoModule { inherit (frontend) pnpmDeps; # Custom update flow: refresh hashes + retag the gitea fork + push. - # Invoke with `nix-update --use-update-script gitea-projects-api` or + # Invoke with `nix-update --use-update-script gitea-local-fork` or # `just gitea-update` (which passes `--use-update-script`). - updateScript = ../scripts/update-gitea-projects-api.sh; + updateScript = ../scripts/update-gitea-local-fork.sh; }; meta = {