From 303d0ed896cfd5d32c64f54a35f769521f68bee7 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 17 Sep 2023 15:11:05 -0400 Subject: [PATCH] static-server: init at 1.2.1 https://github.com/eliben/static-server --- pkgs/by-name/st/static-server/package.nix | 56 +++++++++++++++++++++ pkgs/by-name/st/static-server/version.patch | 23 +++++++++ 2 files changed, 79 insertions(+) create mode 100644 pkgs/by-name/st/static-server/package.nix create mode 100644 pkgs/by-name/st/static-server/version.patch diff --git a/pkgs/by-name/st/static-server/package.nix b/pkgs/by-name/st/static-server/package.nix new file mode 100644 index 00000000000..3a5f0748f96 --- /dev/null +++ b/pkgs/by-name/st/static-server/package.nix @@ -0,0 +1,56 @@ +{ lib +, buildGo121Module +, fetchFromGitHub +, curl +, stdenv +, testers +, static-server +, substituteAll +}: + +buildGo121Module rec { + pname = "static-server"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "eliben"; + repo = "static-server"; + rev = "v${version}"; + hash = "sha256-AZcNh/kF6IdAceA7qe+nhRlwU4yGh19av/S1Zt7iKIs="; + }; + + vendorHash = "sha256-1p3dCLLo+MTPxf/Y3zjxTagUi+tq7nZSj4ZB/aakJGY="; + + patches = [ + # patch out debug.ReadBuidlInfo since version information is not available with buildGoModule + (substituteAll { + src = ./version.patch; + inherit version; + }) + ]; + + nativeCheckInputs = [ + curl + ]; + + ldflags = [ "-s" "-w" ]; + + # tests sometimes fail with SIGQUIT on darwin + doCheck = !stdenv.isDarwin; + + passthru.tests = { + version = testers.testVersion { + package = static-server; + }; + }; + + __darwinAllowLocalNetworking = true; + + meta = with lib; { + description = "A simple, zero-configuration HTTP server CLI for serving static files"; + homepage = "https://github.com/eliben/static-server"; + license = licenses.unlicense; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "static-server"; + }; +} diff --git a/pkgs/by-name/st/static-server/version.patch b/pkgs/by-name/st/static-server/version.patch new file mode 100644 index 00000000000..c92d7e482ed --- /dev/null +++ b/pkgs/by-name/st/static-server/version.patch @@ -0,0 +1,23 @@ +--- a/internal/server/server.go ++++ b/internal/server/server.go +@@ -15,7 +15,6 @@ import ( + "net" + "net/http" + "os" +- "runtime/debug" + "strings" + ) + +@@ -50,11 +49,7 @@ func Main() int { + flags.Parse(os.Args[1:]) + + if *versionFlag { +- if buildInfo, ok := debug.ReadBuildInfo(); ok { +- fmt.Printf("%v %v\n", programName, buildInfo.Main.Version) +- } else { +- errorLog.Printf("version info unavailable! run 'go version -m %v'", programName) +- } ++ fmt.Printf("%v %v\n", programName, "@version@") + os.Exit(0) + } +