From ecb9bc83b2987d9a8382df8842662a47d619e738 Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 30 May 2025 00:21:48 +0200 Subject: [PATCH 1/6] miniserve: use finalAttrs pattern --- pkgs/by-name/mi/miniserve/package.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix index 70196d7d6bcc..39903d1a37c0 100644 --- a/pkgs/by-name/mi/miniserve/package.nix +++ b/pkgs/by-name/mi/miniserve/package.nix @@ -7,27 +7,23 @@ curl, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "miniserve"; version = "0.28.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-jrQnmIYap5eHVWPqoRsXVroB0VWLKxesi3rB/WylR0U="; }; useFetchCargoVendor = true; cargoHash = "sha256-SosRbtk5gBcOVropy+HVFFmLLexu29GjchC6zFweiYw="; - nativeBuildInputs = [ - installShellFiles - ]; + nativeBuildInputs = [ installShellFiles ]; - nativeCheckInputs = [ - curl - ]; + nativeCheckInputs = [ curl ]; checkFlags = [ "--skip=bind_ipv4_ipv6::case_2" @@ -52,9 +48,9 @@ rustPlatform.buildRustPackage rec { meta = { description = "CLI tool to serve files and directories over HTTP"; homepage = "https://github.com/svenstaro/miniserve"; - changelog = "https://github.com/svenstaro/miniserve/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/svenstaro/miniserve/blob/v${finalAttrs.version}/CHANGELOG.md"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "miniserve"; }; -} +}) From 9d88cb90f604908751bf05e059c1f90d6ad0dc8e Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 30 May 2025 00:22:21 +0200 Subject: [PATCH 2/6] miniserve: use tag in fetchFromGitHub --- pkgs/by-name/mi/miniserve/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix index 39903d1a37c0..756224465e2f 100644 --- a/pkgs/by-name/mi/miniserve/package.nix +++ b/pkgs/by-name/mi/miniserve/package.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jrQnmIYap5eHVWPqoRsXVroB0VWLKxesi3rB/WylR0U="; }; From f31bcc275d301e67062b07c43b5bb0793204bc81 Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 30 May 2025 00:26:46 +0200 Subject: [PATCH 3/6] miniserve: add versionCheckHook --- pkgs/by-name/mi/miniserve/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix index 756224465e2f..140e01be1e36 100644 --- a/pkgs/by-name/mi/miniserve/package.nix +++ b/pkgs/by-name/mi/miniserve/package.nix @@ -5,6 +5,7 @@ installShellFiles, stdenv, curl, + versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -45,6 +46,10 @@ rustPlatform.buildRustPackage (finalAttrs: { __darwinAllowLocalNetworking = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + meta = { description = "CLI tool to serve files and directories over HTTP"; homepage = "https://github.com/svenstaro/miniserve"; From d4f2f43e48137eae7e24500b6b80b6e1a1a8a5a4 Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 30 May 2025 00:32:06 +0200 Subject: [PATCH 4/6] miniserve: add updateScript --- pkgs/by-name/mi/miniserve/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix index 140e01be1e36..98f171be57d8 100644 --- a/pkgs/by-name/mi/miniserve/package.nix +++ b/pkgs/by-name/mi/miniserve/package.nix @@ -6,6 +6,7 @@ stdenv, curl, versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -50,6 +51,8 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckProgramArg = "--version"; doInstallCheck = true; + passthru.updateScript = nix-update-script { }; + meta = { description = "CLI tool to serve files and directories over HTTP"; homepage = "https://github.com/svenstaro/miniserve"; From 5058f4a040ee547c16e2f24fc63998ef60adbba5 Mon Sep 17 00:00:00 2001 From: Defelo Date: Thu, 29 May 2025 22:42:50 +0000 Subject: [PATCH 5/6] miniserve: 0.28.0 -> 0.29.0 --- pkgs/by-name/mi/miniserve/package.nix | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix index 98f171be57d8..c89b69b28fb6 100644 --- a/pkgs/by-name/mi/miniserve/package.nix +++ b/pkgs/by-name/mi/miniserve/package.nix @@ -2,7 +2,10 @@ lib, rustPlatform, fetchFromGitHub, + pkg-config, installShellFiles, + openssl, + cacert, stdenv, curl, versionCheckHook, @@ -11,21 +14,29 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "miniserve"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; tag = "v${finalAttrs.version}"; - hash = "sha256-jrQnmIYap5eHVWPqoRsXVroB0VWLKxesi3rB/WylR0U="; + hash = "sha256-HHTNBqMYf7WrqJl5adPmH87xfrzV4TKJckpwTPiiw7w="; }; useFetchCargoVendor = true; - cargoHash = "sha256-SosRbtk5gBcOVropy+HVFFmLLexu29GjchC6zFweiYw="; + cargoHash = "sha256-Rjql9cyw7RS66HE50iUrjNvS5JRhR1HBaalOY9eDGH4="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + pkg-config + installShellFiles + ]; - nativeCheckInputs = [ curl ]; + buildInputs = [ openssl ]; + + nativeCheckInputs = [ + curl + cacert + ]; checkFlags = [ "--skip=bind_ipv4_ipv6::case_2" From 529d5138d6b582c7530b864ea4e9efecaf669079 Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 30 May 2025 00:43:05 +0200 Subject: [PATCH 6/6] miniserve: add defelo as maintainer --- pkgs/by-name/mi/miniserve/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix index c89b69b28fb6..34f88c26958e 100644 --- a/pkgs/by-name/mi/miniserve/package.nix +++ b/pkgs/by-name/mi/miniserve/package.nix @@ -69,7 +69,10 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/svenstaro/miniserve"; changelog = "https://github.com/svenstaro/miniserve/blob/v${finalAttrs.version}/CHANGELOG.md"; license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ figsoda ]; + maintainers = with lib.maintainers; [ + figsoda + defelo + ]; mainProgram = "miniserve"; }; })