From 5a93954d8c8d55fb3362d3d3b32a2ea7bcfaf176 Mon Sep 17 00:00:00 2001 From: novenary Date: Tue, 13 Jun 2023 19:18:05 +0300 Subject: [PATCH 1/3] shotgun: remove build script workaround No longer necessary as of 2.4.0. See: https://github.com/neXromancers/shotgun/commit/ba5c70bb20ea1d56c4a5df43d467d107f2c7c418 --- pkgs/tools/graphics/shotgun/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/tools/graphics/shotgun/default.nix b/pkgs/tools/graphics/shotgun/default.nix index 8805da7ebe71..d2b030594150 100644 --- a/pkgs/tools/graphics/shotgun/default.nix +++ b/pkgs/tools/graphics/shotgun/default.nix @@ -17,11 +17,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libXrandr libX11 ]; - # build script tries to run git to get the current tag - postPatch = '' - echo "fn main() {}" > build.rs - ''; - meta = with lib; { description = "Minimal X screenshot utility"; homepage = "https://github.com/neXromancers/shotgun"; From 5ace6ef7debec3b712a9063ba3863a91e4331178 Mon Sep 17 00:00:00 2001 From: novenary Date: Tue, 13 Jun 2023 19:26:04 +0300 Subject: [PATCH 2/3] shotgun: 2.4.0 -> 2.5.0 --- pkgs/tools/graphics/shotgun/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/graphics/shotgun/default.nix b/pkgs/tools/graphics/shotgun/default.nix index d2b030594150..eab31c3bfda5 100644 --- a/pkgs/tools/graphics/shotgun/default.nix +++ b/pkgs/tools/graphics/shotgun/default.nix @@ -1,21 +1,17 @@ -{ lib, rustPlatform, fetchFromGitHub, pkg-config, libXrandr, libX11 }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "shotgun"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "neXromancers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fcb+eZXzpuEPFSZexbgDpoBX85gsiIqPlcPXruNGenk="; + sha256 = "sha256-ovqPBZznDQnQa9YW1xXA02Jl0AQ7sJNpzovA1SVR8Zc="; }; - cargoSha256 = "sha256-n5HPl2h0fr0MyGBivNVrrs23HAllIYtwaw1aaKWHCe4="; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ libXrandr libX11 ]; + cargoSha256 = "sha256-mWifSN9Hpsivq0RdZ9l9+8CWaZMHfzzhT2r27FAuesU="; meta = with lib; { description = "Minimal X screenshot utility"; From dc8eaddb93d8baec870f2c3735e6112e180517ec Mon Sep 17 00:00:00 2001 From: novenary Date: Tue, 13 Jun 2023 19:30:44 +0300 Subject: [PATCH 3/3] shotgun: add novenary to maintainers I am upstream, so I think it's appropriate for me to be listed here too. --- pkgs/tools/graphics/shotgun/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/shotgun/default.nix b/pkgs/tools/graphics/shotgun/default.nix index eab31c3bfda5..fd774726285b 100644 --- a/pkgs/tools/graphics/shotgun/default.nix +++ b/pkgs/tools/graphics/shotgun/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { description = "Minimal X screenshot utility"; homepage = "https://github.com/neXromancers/shotgun"; license = with licenses; [ mpl20 ]; - maintainers = with maintainers; [ figsoda lumi ]; + maintainers = with maintainers; [ figsoda lumi novenary ]; platforms = platforms.linux; }; }