From 981dd3761a7a91a00924ee73d54c08f693a255c3 Mon Sep 17 00:00:00 2001
From: Alexis Destrez <alexis.destrez@pm.me>
Date: Mon, 23 Jan 2023 21:00:56 +0100
Subject: [PATCH 1/2] maintainers: add krostar

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3f534813908c..1a36ec5e033a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7787,6 +7787,12 @@
     githubId = 17659803;
     name = "Matthias Axel Kröll";
   };
+  krostar = {
+    email = "alexis.destrez@pm.me";
+    github = "krostar";
+    githubId = 5759930;
+    name = "Alexis Destrez";
+  };
   kristian-brucaj = {
     email = "kbrucaj@gmail.com";
     github = "Kristian-Brucaj";

From 5dc8d5c7450c3d8f4d500e5c288d40e802174b96 Mon Sep 17 00:00:00 2001
From: Alexis Destrez <alexis.destrez@pm.me>
Date: Mon, 23 Jan 2023 21:01:12 +0100
Subject: [PATCH 2/2] gci: init at 0.9.0

---
 pkgs/development/tools/gci/default.nix | 25 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/tools/gci/default.nix

diff --git a/pkgs/development/tools/gci/default.nix b/pkgs/development/tools/gci/default.nix
new file mode 100644
index 000000000000..170b9c41dc9f
--- /dev/null
+++ b/pkgs/development/tools/gci/default.nix
@@ -0,0 +1,25 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+buildGoModule rec {
+  pname = "gci";
+  version = "0.9.0";
+
+  src = fetchFromGitHub {
+    owner = "daixiang0";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-qWEEcIbTgYmGVnnTW+hM8e8nw5VLWN1TwzdUIZrxF3s=";
+  };
+
+  vendorSha256 = "sha256-dlt+i/pEP3RzW4JwndKTU7my2Nn7/2rLFlk8n1sFR60=";
+
+  meta = with lib; {
+    description = "Controls golang package import order and makes it always deterministic";
+    homepage = "https://github.com/daixiang0/gci";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [krostar];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 718e941b508c..25df2f7f4d58 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26016,6 +26016,8 @@ with pkgs;
 
   iferr = callPackage ../development/tools/iferr { };
 
+  gci = callPackage ../development/tools/gci { };
+
   ginkgo = callPackage ../development/tools/ginkgo { };
 
   gdlv = darwin.apple_sdk_11_0.callPackage ../development/tools/gdlv {