From e789cac7db0c07c42e89ab867e12fbb01feb7f1f Mon Sep 17 00:00:00 2001 From: nikstur Date: Fri, 11 Oct 2024 18:17:32 +0200 Subject: [PATCH 1/3] userborn: add meta.changelog --- pkgs/by-name/us/userborn/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/us/userborn/package.nix b/pkgs/by-name/us/userborn/package.nix index 233a1ebb1264..fcdbc3266cab 100644 --- a/pkgs/by-name/us/userborn/package.nix +++ b/pkgs/by-name/us/userborn/package.nix @@ -51,6 +51,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { homepage = "https://github.com/nikstur/userborn"; description = "Declaratively bear (manage) Linux users and groups"; + changelog = "https://github.com/nikstur/userborn/blob/${version}/CHANGELOG.md"; license = licenses.mit; platforms = platforms.linux; maintainers = with lib.maintainers; [ nikstur ]; From 1bbc8f7ba37c9b498aeb955ce08f13e6fc6672b8 Mon Sep 17 00:00:00 2001 From: nikstur Date: Fri, 11 Oct 2024 18:17:48 +0200 Subject: [PATCH 2/3] userborn: platforms.linux -> platform.unix --- pkgs/by-name/us/userborn/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/us/userborn/package.nix b/pkgs/by-name/us/userborn/package.nix index fcdbc3266cab..2f8d34e84c74 100644 --- a/pkgs/by-name/us/userborn/package.nix +++ b/pkgs/by-name/us/userborn/package.nix @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage rec { description = "Declaratively bear (manage) Linux users and groups"; changelog = "https://github.com/nikstur/userborn/blob/${version}/CHANGELOG.md"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with lib.maintainers; [ nikstur ]; mainProgram = "userborn"; }; From 4f78bc8b21b09c83c75ebea5b400529f5c34d997 Mon Sep 17 00:00:00 2001 From: nikstur Date: Fri, 11 Oct 2024 18:17:08 +0200 Subject: [PATCH 3/3] userborn: 0.2.0 -> 0.3.0 --- pkgs/by-name/us/userborn/package.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/us/userborn/package.nix b/pkgs/by-name/us/userborn/package.nix index 2f8d34e84c74..5290fd054338 100644 --- a/pkgs/by-name/us/userborn/package.nix +++ b/pkgs/by-name/us/userborn/package.nix @@ -2,36 +2,29 @@ lib, rustPlatform, fetchFromGitHub, - makeBinaryWrapper, - mkpasswd, + libxcrypt, nixosTests, nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "userborn"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "nikstur"; repo = "userborn"; rev = version; - hash = "sha256-LEKdgmw1inBOi0sriG8laCrtx0ycqR5ftdnmszadx3U="; + hash = "sha256-ABePye1zuGDH74BL6AP05rR9eBOYu1SoVpd2TcZQMW8="; }; sourceRoot = "${src.name}/rust/userborn"; - cargoHash = "sha256-Pjzu6db2WomNsC+jNK1fr1u7koZwUvWPIY5JHMo1gkA="; + cargoHash = "sha256-/S2rkZyXHN5NiW9TFhKguqtf/udFcDOTfV2jYRMV14s="; - nativeBuildInputs = [ makeBinaryWrapper ]; + nativeBuildInputs = [ rustPlatform.bindgenHook ]; - buildInputs = [ mkpasswd ]; - - nativeCheckInputs = [ mkpasswd ]; - - postInstall = '' - wrapProgram $out/bin/userborn --prefix PATH : ${lib.makeBinPath [ mkpasswd ]} - ''; + buildInputs = [ libxcrypt ]; stripAllList = [ "bin" ];