From 8e6e68bb608b03dfdf37271889cd32d63458e8e2 Mon Sep 17 00:00:00 2001 From: Mutsuha Asada Date: Tue, 1 Oct 2024 14:18:16 +0900 Subject: [PATCH 1/2] buildpack: modernized derivation and formatted via nixfmt-rfc-style - Removed `rec` - Removed `with lib;` - Changed `v${version}` to `refs/tags/v${version}` in `rev` - Formatted via nixfmt-rfc-style - Added @momeemt to maintainers --- pkgs/development/tools/buildpack/default.nix | 26 ++++++++++++++------ 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix index 31a4c70bd68f..548550164391 100644 --- a/pkgs/development/tools/buildpack/default.nix +++ b/pkgs/development/tools/buildpack/default.nix @@ -1,13 +1,21 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, +}: -buildGoModule rec { +let pname = "pack"; version = "0.35.1"; +in +buildGoModule { + inherit pname version; src = fetchFromGitHub { owner = "buildpacks"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-iQkYtnobhAt73JMRrejk0DkOH1ZW2bqfZx05ZrDG5bA="; }; @@ -17,7 +25,11 @@ buildGoModule rec { subPackages = [ "cmd/pack" ]; - ldflags = [ "-s" "-w" "-X github.com/buildpacks/pack.Version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X github.com/buildpacks/pack.Version=${version}" + ]; postInstall = '' installShellCompletion --cmd pack \ @@ -26,12 +38,12 @@ buildGoModule rec { --fish $(PACK_HOME=$PWD $out/bin/pack completion --shell fish) ''; - meta = with lib; { + meta = { homepage = "https://buildpacks.io/"; changelog = "https://github.com/buildpacks/pack/releases/tag/v${version}"; description = "CLI for building apps using Cloud Native Buildpacks"; mainProgram = "pack"; - license = licenses.asl20; - maintainers = [ ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ momeemt ]; }; } From b5b06a23ec63f12ad68914bff7b977be9bedf087 Mon Sep 17 00:00:00 2001 From: Mutsuha Asada Date: Tue, 1 Oct 2024 14:19:12 +0900 Subject: [PATCH 2/2] buildpack: moved to by-name --- .../buildpack/default.nix => by-name/bu/buildpack/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/buildpack/default.nix => by-name/bu/buildpack/package.nix} (100%) diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/by-name/bu/buildpack/package.nix similarity index 100% rename from pkgs/development/tools/buildpack/default.nix rename to pkgs/by-name/bu/buildpack/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 131cca72e54e..51dae615f91b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4189,8 +4189,6 @@ with pkgs; btrbk = callPackage ../tools/backup/btrbk { }; - buildpack = callPackage ../development/tools/buildpack { }; - bonk = callPackage ../tools/misc/bonk { }; bottom-rs = callPackage ../tools/misc/bottom-rs { };