diff options
| author | Marie Ramlow <me@nycode.dev> | 2025-04-16 22:49:46 +0200 |
|---|---|---|
| committer | emilylange <git@emilylange.de> | 2025-04-18 22:24:59 +0200 |
| commit | df2a272d41983ebb4014345a3183029538723ece (patch) | |
| tree | 04a1711a2bd127edd0d31b7777467849100c6ef8 | |
| parent | Merge: [Backport release-24.11] element-{web,desktop}: 1.11.96 -> 1.11.97 (#3... (diff) | |
| download | nixpkgs-df2a272d41983ebb4014345a3183029538723ece.tar.gz | |
forgejo: 10.0.3 -> 11.0.0
Release-Notes: https://codeberg.org/forgejo/forgejo/milestone/9323
(cherry picked from commit bc1b7b43e06b8cf0ab23c71df89a5af7f16c9ff2)
| -rw-r--r-- | pkgs/by-name/fo/forgejo/generic.nix | 10 | ||||
| -rw-r--r-- | pkgs/by-name/fo/forgejo/package-json-npm-build-frontend.patch | 12 | ||||
| -rw-r--r-- | pkgs/by-name/fo/forgejo/package.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
4 files changed, 15 insertions, 19 deletions
diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix index 1d3b9d5cda17..9e9bc0e5ba76 100644 --- a/pkgs/by-name/fo/forgejo/generic.nix +++ b/pkgs/by-name/fo/forgejo/generic.nix @@ -40,9 +40,9 @@ let pname = "forgejo-frontend"; inherit src version npmDepsHash; - patches = [ - ./package-json-npm-build-frontend.patch - ]; + buildPhase = '' + ./node_modules/.bin/webpack + ''; # override npmInstallHook installPhase = '' @@ -128,6 +128,10 @@ buildGoModule rec { in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + preInstall = lib.optionalString (lib.versionAtLeast version "11") '' + mv "$GOPATH/bin/forgejo.org" "$GOPATH/bin/gitea" + ''; + postInstall = '' mkdir $data cp -R ./{templates,options} ${frontend}/public $data diff --git a/pkgs/by-name/fo/forgejo/package-json-npm-build-frontend.patch b/pkgs/by-name/fo/forgejo/package-json-npm-build-frontend.patch deleted file mode 100644 index f04634fc1844..000000000000 --- a/pkgs/by-name/fo/forgejo/package-json-npm-build-frontend.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/package.json b/package.json -index 0abf6fe8b9..9d6ae0fdff 100644 ---- a/package.json -+++ b/package.json -@@ -1,4 +1,7 @@ - { -+ "scripts": { -+ "build": "node_modules/.bin/webpack" -+ }, - "type": "module", - "engines": { - "node": ">= 18.0.0" diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index f2cc87fe1fe3..d9b00bc3b22b 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -1,8 +1,8 @@ import ./generic.nix { - version = "10.0.3"; - hash = "sha256-bt1lgp6UiZeiZiIN3vZZbUygHVX1lEE5uOkPXrjk68o="; - npmDepsHash = "sha256-e3SE6cu1xCBdoMRqp2Gcjcay/EwjF+bTdPOlpL1STvw="; - vendorHash = "sha256-b3+zxsKRylgfdW0Yiz0QryObMKdtiMCt0hB3DtAGFrQ="; + version = "11.0.0"; + hash = "sha256-j/SmfWFfYDApqGXcH/gRF6c7gUCTkLYFTglgtdq9u/U="; + npmDepsHash = "sha256-laHHXq59/7+rJSYTD1Aq/AvFcio6vsnWkeV8enq3yTg="; + vendorHash = "sha256-REHrSuvAB5fbJ1WR+rggGZUSMy0FWnAkQQbTIqN2K2E="; lts = false; nixUpdateExtraArgs = [ "--override-filename" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2623ebca90e1..31225e1f2eb9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1372,6 +1372,10 @@ with pkgs; datalad-gooey = with python3Packages; toPythonApplication datalad-gooey; + forgejo = callPackage ../by-name/fo/forgejo/package.nix { + buildGoModule = buildGo124Module; + }; + forgejo-lts = callPackage ../by-name/fo/forgejo/lts.nix { }; gfold = callPackage ../applications/version-management/gfold { }; |