Refactor gitea package

main
Carsten Kragelund 2023-05-06 16:53:27 +02:00
parent f7a6d90e20
commit 442b8a556b
Signed by: nyx
GPG Key ID: CADDADEEC9F753C0
3 changed files with 16 additions and 20 deletions

@ -1,18 +1,16 @@
{ pkgs, ... }: { pkgs, giteaVersion, ... }:
let let
nodeNix = (import ./node.nix { inherit pkgs; }); giteaVersion = "1.19.3";
src = pkgs.fetchgit { url = "https://github.com/nyxkrage/gitea"; rev = giteaVersion; hash = "sha256-KQEBq1BFQRLJW9fJq4W1sOsAqOCfNHKY/+cT8rkXxv4="; };
nodeNix = (import ./node.nix { inherit pkgs giteaVersion src; });
nodeEnv = (pkgs.callPackage (nodeNix + "/default.nix") { }); nodeEnv = (pkgs.callPackage (nodeNix + "/default.nix") { });
in in
pkgs.buildGoModule rec { pkgs.buildGoModule rec {
pname = "gitea-build"; pname = "gitea-build";
version = "1.19.3-nyx"; version = "${giteaVersion}-nyx";
vendorHash = "sha256-gfHyssQrY5r3rQAzonM3Rv/BDIYGEY/PiOZEyoGGeiw="; vendorSha256 = "sha256-gfHyssQrY5r3rQAzonM3Rv/BDIYGEY/PiOZEyoGGeiw=";
src = pkgs.fetchgit { inherit src;
url = "https://github.com/nyxkrage/gitea";
rev = "1.19.3";
hash = "sha256-KQEBq1BFQRLJW9fJq4W1sOsAqOCfNHKY/+cT8rkXxv4=";
};
nativeBuildInputs = [ nativeBuildInputs = [
pkgs.gnumake pkgs.gnumake
@ -20,7 +18,6 @@ pkgs.buildGoModule rec {
pkgs.nodejs pkgs.nodejs
pkgs.nodePackages.npm pkgs.nodePackages.npm
pkgs.git pkgs.git
]; ];
buildPhase = '' buildPhase = ''

@ -1,6 +1,6 @@
{ pkgs, ... }: pkgs.unstable.gitea.overrideAttrs (old: rec { { pkgs, ... }: pkgs.unstable.gitea.overrideAttrs (old: rec {
pname = "gitea"; pname = "gitea";
version = "1.19.3-nyx"; version = "1.19.3";
src = "${import ./build.nix { inherit pkgs; }}/gitea-src-${version}.tar.gz"; src = "${import ./build.nix { inherit pkgs; giteaVersion = version; }}/gitea-src-${version}-nyx.tar.gz";
}) })

@ -1,20 +1,19 @@
{ pkgs, ... }: { pkgs, giteaVersion, src, ... }:
let
escapeSlash = str: builtins.replaceStrings [ "/" ] [ "\\/"] str;
in
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation rec {
pname = "gitea-node-env"; pname = "gitea-node-env";
version = "1.19.3-nyx"; version = "${giteaVersion}-nyx";
src = pkgs.fetchgit { inherit src;
url = "https://github.com/nyxkrage/gitea";
rev = "1.19.3";
hash = "sha256-KQEBq1BFQRLJW9fJq4W1sOsAqOCfNHKY/+cT8rkXxv4=";
};
nativeBuildInputs = [ pkgs.node2nix ]; nativeBuildInputs = [ pkgs.node2nix ];
buildPhase = '' buildPhase = ''
mkdir nix mkdir nix
node2nix -i ${src}/package.json -l ${src}/package-lock.json node2nix -i ${src}/package.json -l ${src}/package-lock.json
sed -r -i 's/src = .+?nix\/store.+?;/src = fetchgit { url = "https:\/\/github.com\/nyxkrage\/gitea"; rev = "1.19.3"; hash = "sha256-KQEBq1BFQRLJW9fJq4W1sOsAqOCfNHKY\/+cT8rkXxv4="; };/' node-packages.nix sed -r -i 's/src = .+?nix\/store.+?;/src = fetchgit { url = "${escapeSlash src.url}"; rev = "${escapeSlash src.rev}"; hash = "${escapeSlash src.outputHash}"; };/' node-packages.nix
''; '';
installPhase = '' installPhase = ''