From 5057f78ee4d317b597131c9a8d072cb1e669540a Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 24 Oct 2024 21:40:25 -0400 Subject: [PATCH 1/3] goreleaser: 2.2.0 -> 2.3.2 Diff: https://github.com/goreleaser/goreleaser/compare/v2.2.0...v2.3.2 --- pkgs/tools/misc/goreleaser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index eb6d6351f2e6..b450a68e9e8d 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -9,16 +9,16 @@ }: buildGoModule rec { pname = "goreleaser"; - version = "2.2.0"; + version = "2.3.2"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - hash = "sha256-E/jLCjyXId5XsIBiDUxi7w9Dybb4SZJRc5gkCwHsTww="; + hash = "sha256-YKcduPxcXU1Ixexr/DxeVRfLxYdHNFcGNLbBiH6cIUU="; }; - vendorHash = "sha256-+7SWKJGJlFyYkPjU3N5bWHbIzXBzG/fc9Yhy/jXt2lc="; + vendorHash = "sha256-3gC2wZz3t6ObqAJ2g80kTrW2OEAyBptdqmN7cQKqZ/w="; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.builtBy=nixpkgs" ]; From ae2a0a82c09a1894a55fe758d38c7f7813bfc878 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 24 Oct 2024 21:44:08 -0400 Subject: [PATCH 2/3] goreleaser: move to pkgs/by-name --- .../default.nix => by-name/go/goreleaser/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/goreleaser/default.nix => by-name/go/goreleaser/package.nix} (100%) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/by-name/go/goreleaser/package.nix similarity index 100% rename from pkgs/tools/misc/goreleaser/default.nix rename to pkgs/by-name/go/goreleaser/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a83767058ee7..ba27fa529b6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8066,8 +8066,6 @@ with pkgs; gopro = callPackage ../tools/video/gopro { }; - goreleaser = callPackage ../tools/misc/goreleaser { }; - goreplay = callPackage ../tools/networking/goreplay { }; gost = callPackage ../tools/networking/gost { }; From c7a7caec6deea7e17c3f26146d6b8bb3d2afbc00 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 24 Oct 2024 21:44:29 -0400 Subject: [PATCH 3/3] goreleaser: nixfmt --- pkgs/by-name/go/goreleaser/package.nix | 31 ++++++++++++++++---------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/go/goreleaser/package.nix b/pkgs/by-name/go/goreleaser/package.nix index b450a68e9e8d..13742e1b8c4b 100644 --- a/pkgs/by-name/go/goreleaser/package.nix +++ b/pkgs/by-name/go/goreleaser/package.nix @@ -1,11 +1,12 @@ -{ stdenv -, lib -, buildGoModule -, fetchFromGitHub -, installShellFiles -, buildPackages -, testers -, goreleaser +{ + stdenv, + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + buildPackages, + testers, + goreleaser, }: buildGoModule rec { pname = "goreleaser"; @@ -20,8 +21,12 @@ buildGoModule rec { vendorHash = "sha256-3gC2wZz3t6ObqAJ2g80kTrW2OEAyBptdqmN7cQKqZ/w="; - ldflags = - [ "-s" "-w" "-X main.version=${version}" "-X main.builtBy=nixpkgs" ]; + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + "-X main.builtBy=nixpkgs" + ]; # tests expect the source files to be a build repo doCheck = false; @@ -29,8 +34,10 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; postInstall = - let emulator = stdenv.hostPlatform.emulator buildPackages; - in '' + let + emulator = stdenv.hostPlatform.emulator buildPackages; + in + '' ${emulator} $out/bin/goreleaser man > goreleaser.1 installManPage ./goreleaser.1 installShellCompletion --cmd goreleaser \