From bc1b7b43e06b8cf0ab23c71df89a5af7f16c9ff2 Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Wed, 16 Apr 2025 22:49:46 +0200 Subject: [PATCH] forgejo-lts: 7.0.14 -> 11.0.0 Release-Notes: https://codeberg.org/forgejo/forgejo/milestone/9323 --- pkgs/by-name/fo/forgejo/generic.nix | 12 ++++++++---- pkgs/by-name/fo/forgejo/lts.nix | 8 ++++---- .../fo/forgejo/package-json-npm-build-frontend.patch | 12 ------------ 3 files changed, 12 insertions(+), 20 deletions(-) delete mode 100644 pkgs/by-name/fo/forgejo/package-json-npm-build-frontend.patch diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix index 4e475c733c22..1aacb193be16 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 = '' + mv "$GOPATH/bin/forgejo.org" "$GOPATH/bin/gitea" + ''; + postInstall = '' mkdir $data cp -R ./{templates,options} ${frontend}/public $data @@ -187,7 +191,7 @@ buildGoModule rec { description = "Self-hosted lightweight software forge"; homepage = "https://forgejo.org"; changelog = "https://codeberg.org/forgejo/forgejo/releases/tag/v${version}"; - license = if lib.versionAtLeast version "9.0.0" then lib.licenses.gpl3Plus else lib.licenses.mit; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ emilylange urandom diff --git a/pkgs/by-name/fo/forgejo/lts.nix b/pkgs/by-name/fo/forgejo/lts.nix index 5b42631ffce4..164d97538163 100644 --- a/pkgs/by-name/fo/forgejo/lts.nix +++ b/pkgs/by-name/fo/forgejo/lts.nix @@ -1,8 +1,8 @@ import ./generic.nix { - version = "7.0.14"; - hash = "sha256-DtGJStiXuJl0m4K6+DNxsBBaj9dB4bEmMqpGS3WGPD4="; - npmDepsHash = "sha256-R78/L6HS8pUNccrctBJ2E8ndS/RBHd+mTvl0JPoxr8Q="; - vendorHash = "sha256-18tJJ3dBVR9d7PFBRFtOVVtZAcdKucmbOTXHdk7U89s="; + version = "11.0.0"; + hash = "sha256-j/SmfWFfYDApqGXcH/gRF6c7gUCTkLYFTglgtdq9u/U="; + npmDepsHash = "sha256-laHHXq59/7+rJSYTD1Aq/AvFcio6vsnWkeV8enq3yTg="; + vendorHash = "sha256-REHrSuvAB5fbJ1WR+rggGZUSMy0FWnAkQQbTIqN2K2E="; lts = true; nixUpdateExtraArgs = [ "--override-filename" 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"