pufferpanel: 2.6.7 -> 2.6.9

This commit is contained in:
Ivan Trubach 2023-08-27 12:42:31 +03:00
parent 9bb49e499f
commit 46c3bc7395

View File

@ -1,41 +1,40 @@
{ lib { lib
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, applyPatches
, buildGoModule , buildGoModule
, buildNpmPackage , buildNpmPackage
, makeWrapper , makeWrapper
, go-swag , go-swag
, nixosTests , nixosTests
, testers
, pufferpanel
}: }:
buildGoModule rec { buildGoModule rec {
pname = "pufferpanel"; pname = "pufferpanel";
version = "2.6.7"; version = "2.6.9";
src = applyPatches { src = fetchFromGitHub {
src = fetchFromGitHub { owner = "PufferPanel";
owner = "PufferPanel"; repo = "PufferPanel";
repo = "PufferPanel"; rev = "v${version}";
rev = "v${version}"; hash = "sha256-+ZZUoqCiSbrkaeYrm9X8SuX0INsGFegQNwa3WjBvgHQ=";
hash = "sha256-ay9NNcK+6QFobe/rwtZF8USl0vMbDZBg5z57fjA5VLw=";
};
patches = [
# Bump sha1cd package, otherwise i686-linux fails to build.
./bump-sha1cd.patch
# Seems to be an anti-feature. Startup is the only place where user/group is
# hardcoded and checked.
#
# There is no technical reason PufferPanel cannot run as a different user,
# especially for simple commands like `pufferpanel version`.
./disable-group-checks.patch
# Some tests do not have network requests stubbed :(
./skip-network-tests.patch
];
}; };
patches = [
# Bump sha1cd package, otherwise i686-linux fails to build.
./bump-sha1cd.patch
# Seems to be an anti-feature. Startup is the only place where user/group is
# hardcoded and checked.
#
# There is no technical reason PufferPanel cannot run as a different user,
# especially for simple commands like `pufferpanel version`.
./disable-group-checks.patch
# Some tests do not have network requests stubbed :(
./skip-network-tests.patch
];
ldflags = [ ldflags = [
"-s" "-s"
"-w" "-w"
@ -58,7 +57,7 @@ buildGoModule rec {
nativeBuildInputs = [ makeWrapper go-swag ]; nativeBuildInputs = [ makeWrapper go-swag ];
vendorHash = "sha256-Esfk7SvqiWeiobXSI+4wYVEH9yVkB+rO7bxUQ5TzvG4="; vendorHash = "sha256-402ND99FpU+zNV1e5Th1+aZKok49cIEdpPPLLfNyL3E=";
proxyVendor = true; proxyVendor = true;
# Generate code for Swagger documentation endpoints (see web/swagger/docs.go). # Generate code for Swagger documentation endpoints (see web/swagger/docs.go).
@ -91,6 +90,10 @@ buildGoModule rec {
passthru.tests = { passthru.tests = {
inherit (nixosTests) pufferpanel; inherit (nixosTests) pufferpanel;
version = testers.testVersion {
package = pufferpanel;
command = "${pname} version";
};
}; };
meta = with lib; { meta = with lib; {