From 07a57da4df733c09b0c55b4b0acf8b5585f79ffc Mon Sep 17 00:00:00 2001 From: isabel Date: Sun, 28 Apr 2024 18:20:40 +0100 Subject: [PATCH 1/2] treewide: adopt orphaned packages --- pkgs/applications/version-management/gitprompt-rs/default.nix | 3 +-- pkgs/development/tools/go-toml/default.nix | 3 +-- pkgs/development/tools/gotestsum/default.nix | 3 +-- pkgs/tools/networking/goflow2/default.nix | 3 +-- pkgs/tools/security/step-cli/default.nix | 2 +- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/version-management/gitprompt-rs/default.nix b/pkgs/applications/version-management/gitprompt-rs/default.nix index 3fc0d379af19..c4729126c037 100644 --- a/pkgs/applications/version-management/gitprompt-rs/default.nix +++ b/pkgs/applications/version-management/gitprompt-rs/default.nix @@ -1,5 +1,4 @@ { lib, fetchFromGitHub, rustPlatform, git }: - rustPlatform.buildRustPackage rec { pname = "gitprompt-rs"; version = "0.3.0"; @@ -22,7 +21,7 @@ rustPlatform.buildRustPackage rec { description = "Simple Git prompt"; homepage = "https://github.com/9ary/gitprompt-rs"; license = with licenses; [ mpl20 ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ isabelroses ]; mainProgram = "gitprompt-rs"; }; } diff --git a/pkgs/development/tools/go-toml/default.nix b/pkgs/development/tools/go-toml/default.nix index 2fcb524b5930..6e0cf84a82cc 100644 --- a/pkgs/development/tools/go-toml/default.nix +++ b/pkgs/development/tools/go-toml/default.nix @@ -1,5 +1,4 @@ { lib, buildGoModule, fetchFromGitHub }: - buildGoModule rec { pname = "go-toml"; version = "2.2.1"; @@ -25,7 +24,7 @@ buildGoModule rec { description = "Go library for the TOML language"; homepage = "https://github.com/pelletier/go-toml"; changelog = "https://github.com/pelletier/go-toml/releases/tag/v${version}"; - maintainers = [ ]; + maintainers = [ maintainers.isabelroses ]; license = licenses.mit; }; } diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix index e3528c272192..c6ff6001e6c7 100644 --- a/pkgs/development/tools/gotestsum/default.nix +++ b/pkgs/development/tools/gotestsum/default.nix @@ -2,7 +2,6 @@ , fetchFromGitHub , buildGoModule }: - buildGoModule rec { pname = "gotestsum"; version = "1.10.1"; @@ -33,6 +32,6 @@ buildGoModule rec { mainProgram = "gotestsum"; platforms = platforms.linux ++ platforms.darwin; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ isabelroses ]; }; } diff --git a/pkgs/tools/networking/goflow2/default.nix b/pkgs/tools/networking/goflow2/default.nix index 2a278a1c2a49..0909d0c7062c 100644 --- a/pkgs/tools/networking/goflow2/default.nix +++ b/pkgs/tools/networking/goflow2/default.nix @@ -2,7 +2,6 @@ , buildGoModule , fetchFromGitHub }: - buildGoModule rec { pname = "goflow2"; version = "2.1.3"; @@ -26,6 +25,6 @@ buildGoModule rec { description = "High performance sFlow/IPFIX/NetFlow Collector"; homepage = "https://github.com/netsampler/goflow2"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ isabelroses ]; }; } diff --git a/pkgs/tools/security/step-cli/default.nix b/pkgs/tools/security/step-cli/default.nix index afa484f6568b..d52a828ca590 100644 --- a/pkgs/tools/security/step-cli/default.nix +++ b/pkgs/tools/security/step-cli/default.nix @@ -33,7 +33,7 @@ buildGoModule rec { homepage = "https://smallstep.com/cli/"; changelog = "https://github.com/smallstep/cli/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ isabelroses ]; platforms = platforms.linux ++ platforms.darwin; mainProgram = "step"; }; From 56782917415f842552b60a04d54216f534ecc220 Mon Sep 17 00:00:00 2001 From: isabel Date: Sun, 28 Apr 2024 19:47:16 +0100 Subject: [PATCH 2/2] treewide: reformat --- .../version-management/gitprompt-rs/default.nix | 11 ++++++++--- pkgs/development/tools/go-toml/default.nix | 11 +++++++++-- pkgs/development/tools/gotestsum/default.nix | 7 ++++--- pkgs/tools/networking/goflow2/default.nix | 7 ++++--- 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/version-management/gitprompt-rs/default.nix b/pkgs/applications/version-management/gitprompt-rs/default.nix index c4729126c037..5447babaea16 100644 --- a/pkgs/applications/version-management/gitprompt-rs/default.nix +++ b/pkgs/applications/version-management/gitprompt-rs/default.nix @@ -1,4 +1,9 @@ -{ lib, fetchFromGitHub, rustPlatform, git }: +{ + lib, + fetchFromGitHub, + rustPlatform, + git, +}: rustPlatform.buildRustPackage rec { pname = "gitprompt-rs"; version = "0.3.0"; @@ -13,8 +18,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0avs833vb6q1avjbfygm55s83iy942xgqsx6qdzksry44n35s418"; postPatch = '' - substituteInPlace src/main.rs \ - --replace 'Command::new("git")' 'Command::new("${git}/bin/git")' + substituteInPlace src/main.rs \ + --replace 'Command::new("git")' 'Command::new("${git}/bin/git")' ''; meta = with lib; { diff --git a/pkgs/development/tools/go-toml/default.nix b/pkgs/development/tools/go-toml/default.nix index 6e0cf84a82cc..24b673cbf021 100644 --- a/pkgs/development/tools/go-toml/default.nix +++ b/pkgs/development/tools/go-toml/default.nix @@ -1,4 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ + lib, + buildGoModule, + fetchFromGitHub, +}: buildGoModule rec { pname = "go-toml"; version = "2.2.1"; @@ -18,7 +22,10 @@ buildGoModule rec { "cmd/tomltestgen" ]; - ldflags = [ "-s" "-w" ]; + ldflags = [ + "-s" + "-w" + ]; meta = with lib; { description = "Go library for the TOML language"; diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix index c6ff6001e6c7..f28f3f12970c 100644 --- a/pkgs/development/tools/gotestsum/default.nix +++ b/pkgs/development/tools/gotestsum/default.nix @@ -1,6 +1,7 @@ -{ lib -, fetchFromGitHub -, buildGoModule +{ + lib, + fetchFromGitHub, + buildGoModule, }: buildGoModule rec { pname = "gotestsum"; diff --git a/pkgs/tools/networking/goflow2/default.nix b/pkgs/tools/networking/goflow2/default.nix index 0909d0c7062c..6edd9b87f657 100644 --- a/pkgs/tools/networking/goflow2/default.nix +++ b/pkgs/tools/networking/goflow2/default.nix @@ -1,6 +1,7 @@ -{ lib -, buildGoModule -, fetchFromGitHub +{ + lib, + buildGoModule, + fetchFromGitHub, }: buildGoModule rec { pname = "goflow2";