From da5dcb65f7389d01a649297e6d973d55895fe0ce Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 26 Apr 2024 22:02:50 -0300 Subject: [PATCH 1/4] chezmoi: remove jhillyerd as maintainer [orphan] Since theey did not touch Nixpkgs since 2021-10-04 [1] [1] https://github.com/NixOS/nixpkgs/issues/290642 --- pkgs/tools/misc/chezmoi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index e5c2e9407c79..7c63f174f35e 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -38,7 +38,7 @@ buildGoModule rec { description = "Manage your dotfiles across multiple machines, securely"; changelog = "https://github.com/twpayne/chezmoi/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ jhillyerd ]; + maintainers = with maintainers; [ ]; mainProgram = "chezmoi"; }; } From 18e5fe0e7979e44d2d0f37a65ae42e21a5013d54 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 26 Apr 2024 22:07:53 -0300 Subject: [PATCH 2/4] chezmoi: migrate to by-name --- .../misc/chezmoi/default.nix => by-name/ch/chezmoi/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/chezmoi/default.nix => by-name/ch/chezmoi/package.nix} (100%) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/by-name/ch/chezmoi/package.nix similarity index 100% rename from pkgs/tools/misc/chezmoi/default.nix rename to pkgs/by-name/ch/chezmoi/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d228524c591..4e557d6a09dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3572,8 +3572,6 @@ with pkgs; changelogger = callPackage ../tools/misc/changelogger { }; - chezmoi = callPackage ../tools/misc/chezmoi { }; - chipsec = callPackage ../tools/security/chipsec { kernel = null; withDriver = false; From d2f0ed6113b835204875ced9ef91cdfe396a89d4 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 26 Apr 2024 22:14:33 -0300 Subject: [PATCH 3/4] chezmoi: refactor and adopt - get rid of rec --- pkgs/by-name/ch/chezmoi/package.nix | 89 ++++++++++++++++------------- 1 file changed, 49 insertions(+), 40 deletions(-) diff --git a/pkgs/by-name/ch/chezmoi/package.nix b/pkgs/by-name/ch/chezmoi/package.nix index 7c63f174f35e..20fc2c65b56a 100644 --- a/pkgs/by-name/ch/chezmoi/package.nix +++ b/pkgs/by-name/ch/chezmoi/package.nix @@ -1,44 +1,53 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, installShellFiles +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, }: -buildGoModule rec { - pname = "chezmoi"; - version = "2.47.4"; +let + argset = { + pname = "chezmoi"; + version = "2.47.4"; - src = fetchFromGitHub { - owner = "twpayne"; - repo = "chezmoi"; - rev = "v${version}"; - hash = "sha256-clhW/Y+OJ7iQVK8I2xwoVT9rXF2CXRBaUxDZrREAjYc="; + src = fetchFromGitHub { + owner = "twpayne"; + repo = "chezmoi"; + rev = "v${argset.version}"; + hash = "sha256-clhW/Y+OJ7iQVK8I2xwoVT9rXF2CXRBaUxDZrREAjYc="; + }; + + vendorHash = "sha256-8Puy1IKLMENduWyOAJtvpd7FV1a0IdmkMYztIJdeaBs="; + + nativeBuildInputs = [ + installShellFiles + ]; + + ldflags = [ + "-s" + "-w" + "-X main.version=${argset.version}" + "-X main.builtBy=nixpkgs" + ]; + + doCheck = false; + + postInstall = '' + installShellCompletion --bash --name chezmoi.bash completions/chezmoi-completion.bash + installShellCompletion --fish completions/chezmoi.fish + installShellCompletion --zsh completions/chezmoi.zsh + ''; + + subPackages = [ "." ]; + + meta = { + homepage = "https://www.chezmoi.io/"; + description = "Manage your dotfiles across multiple machines, securely"; + changelog = "https://github.com/twpayne/chezmoi/releases/tag/${argset.src.rev}"; + license = lib.licenses.mit; + mainProgram = "chezmoi"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; }; - - vendorHash = "sha256-8Puy1IKLMENduWyOAJtvpd7FV1a0IdmkMYztIJdeaBs="; - - doCheck = false; - - ldflags = [ - "-s" "-w" "-X main.version=${version}" "-X main.builtBy=nixpkgs" - ]; - - nativeBuildInputs = [ installShellFiles ]; - - postInstall = '' - installShellCompletion --bash --name chezmoi.bash completions/chezmoi-completion.bash - installShellCompletion --fish completions/chezmoi.fish - installShellCompletion --zsh completions/chezmoi.zsh - ''; - - subPackages = [ "." ]; - - meta = with lib; { - homepage = "https://www.chezmoi.io/"; - description = "Manage your dotfiles across multiple machines, securely"; - changelog = "https://github.com/twpayne/chezmoi/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ ]; - mainProgram = "chezmoi"; - }; -} +in +buildGoModule argset From 10b3cfca2eca1b53fca831078077ec737f42bc78 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 26 Apr 2024 22:20:51 -0300 Subject: [PATCH 4/4] chezmoi: 2.47.4 -> 2.48.0 --- pkgs/by-name/ch/chezmoi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ch/chezmoi/package.nix b/pkgs/by-name/ch/chezmoi/package.nix index 20fc2c65b56a..b808e0920643 100644 --- a/pkgs/by-name/ch/chezmoi/package.nix +++ b/pkgs/by-name/ch/chezmoi/package.nix @@ -8,16 +8,16 @@ let argset = { pname = "chezmoi"; - version = "2.47.4"; + version = "2.48.0"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${argset.version}"; - hash = "sha256-clhW/Y+OJ7iQVK8I2xwoVT9rXF2CXRBaUxDZrREAjYc="; + hash = "sha256-TclY4O5mA14cI7+qvGwt5jSHftxhGaa3ICVn8qdrKqs="; }; - vendorHash = "sha256-8Puy1IKLMENduWyOAJtvpd7FV1a0IdmkMYztIJdeaBs="; + vendorHash = "sha256-qoXfneNEAsvUgaEFHPF1bf/S8feFX+8HtwQy7nzy8Bo="; nativeBuildInputs = [ installShellFiles