From de907f6059c47a1d255f38f6d22cb406f0031040 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Fri, 11 Apr 2025 17:15:00 +0200 Subject: [PATCH 1/3] opengist: use writableTmpDirAsHomeHook --- pkgs/by-name/op/opengist/package.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/op/opengist/package.nix b/pkgs/by-name/op/opengist/package.nix index 9ab36bc952d7..3d3b5c2477b0 100644 --- a/pkgs/by-name/op/opengist/package.nix +++ b/pkgs/by-name/op/opengist/package.nix @@ -7,6 +7,7 @@ moreutils, jq, git, + writableTmpDirAsHomeHook, }: let # finalAttrs when 🥺 (buildGoModule does not support them) @@ -52,16 +53,11 @@ buildGoModule { "-X github.com/thomiceli/opengist/internal/config.OpengistVersion=v${version}" ]; - # required for tests nativeCheckInputs = [ git + writableTmpDirAsHomeHook ]; - # required for tests to not try to write into $HOME and fail - preCheck = '' - export OG_OPENGIST_HOME=$(mktemp -d) - ''; - doCheck = !stdenv.hostPlatform.isDarwin; checkPhase = '' From d344ca55871f89e31beed11f4b1d737cc47d45f9 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Fri, 11 Apr 2025 17:15:00 +0200 Subject: [PATCH 2/3] opengist: use finalAttrs pattern --- pkgs/by-name/op/opengist/package.nix | 34 ++++++++++++++++------------ 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/op/opengist/package.nix b/pkgs/by-name/op/opengist/package.nix index 3d3b5c2477b0..b46073964718 100644 --- a/pkgs/by-name/op/opengist/package.nix +++ b/pkgs/by-name/op/opengist/package.nix @@ -9,23 +9,26 @@ git, writableTmpDirAsHomeHook, }: -let - # finalAttrs when 🥺 (buildGoModule does not support them) - # https://github.com/NixOS/nixpkgs/issues/273815 + +buildGoModule (finalAttrs: { + pname = "opengist"; + version = "1.9.1"; + src = fetchFromGitHub { owner = "thomiceli"; repo = "opengist"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Zjn38OGnDtgD2OfIhgUxWo0Cx+ZmNv6UjJanASbjiYU="; }; frontend = buildNpmPackage { pname = "opengist-frontend"; - inherit version src; + inherit (finalAttrs) version src; + # npm complains of "invalid package". shrug. we can give it a version. postPatch = '' - ${lib.getExe jq} '.version = "${version}"' package.json | ${lib.getExe' moreutils "sponge"} package.json + ${lib.getExe jq} '.version = "${finalAttrs.version}"' package.json | ${lib.getExe' moreutils "sponge"} package.json ''; # copy pasta from the Makefile upstream, seems to be a workaround of sass @@ -42,15 +45,14 @@ let npmDepsHash = "sha256-Uh+oXd//G/lPAMXRxijjEOpQNmeXK/XCIU7DJN3ujaY="; }; -in -buildGoModule { - pname = "opengist"; - inherit version src; + vendorHash = "sha256-aqfr3yGyTXDtZDU8d1lbWWvFfY4fo6/PsSDwpiDtM90="; + tags = [ "fs_embed" ]; + ldflags = [ "-s" - "-X github.com/thomiceli/opengist/internal/config.OpengistVersion=v${version}" + "-X github.com/thomiceli/opengist/internal/config.OpengistVersion=v${finalAttrs.version}" ]; nativeCheckInputs = [ @@ -62,16 +64,18 @@ buildGoModule { checkPhase = '' runHook preCheck + make test + runHook postCheck ''; postPatch = '' - cp -R ${frontend}/public/{manifest.json,assets} public/ + cp -R ${finalAttrs.frontend}/public/{manifest.json,assets} public/ ''; passthru = { - inherit frontend; + inherit (finalAttrs) frontend; updateScript = ./update.sh; }; @@ -79,9 +83,9 @@ buildGoModule { description = "Self-hosted pastebin powered by Git"; homepage = "https://github.com/thomiceli/opengist"; license = lib.licenses.agpl3Only; - changelog = "https://github.com/thomiceli/opengist/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/thomiceli/opengist/blob/v${finalAttrs.version}/CHANGELOG.md"; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ phanirithvij ]; mainProgram = "opengist"; }; -} +}) From 30d504d04ecd7775af7c2f110a444647738d4fa1 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Fri, 11 Apr 2025 17:15:00 +0200 Subject: [PATCH 3/3] opengist: 1.9.1 -> 1.10.0 --- pkgs/by-name/op/opengist/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/opengist/package.nix b/pkgs/by-name/op/opengist/package.nix index b46073964718..d1f4254b7d08 100644 --- a/pkgs/by-name/op/opengist/package.nix +++ b/pkgs/by-name/op/opengist/package.nix @@ -13,13 +13,13 @@ buildGoModule (finalAttrs: { pname = "opengist"; - version = "1.9.1"; + version = "1.10.0"; src = fetchFromGitHub { owner = "thomiceli"; repo = "opengist"; tag = "v${finalAttrs.version}"; - hash = "sha256-Zjn38OGnDtgD2OfIhgUxWo0Cx+ZmNv6UjJanASbjiYU="; + hash = "sha256-cSPKtcD1V+WTSCkgi8eKhGbtW+WdCoetbiSrNvEVRW4="; }; frontend = buildNpmPackage { @@ -46,7 +46,7 @@ buildGoModule (finalAttrs: { npmDepsHash = "sha256-Uh+oXd//G/lPAMXRxijjEOpQNmeXK/XCIU7DJN3ujaY="; }; - vendorHash = "sha256-aqfr3yGyTXDtZDU8d1lbWWvFfY4fo6/PsSDwpiDtM90="; + vendorHash = "sha256-m2f9+PEMjVhlXs7b1neEWO0VY1fQSfe+T1aNEdtML28="; tags = [ "fs_embed" ];