From 73d046587a4cf95bec8b6588f5689e910b237520 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Mon, 21 Apr 2025 15:17:17 +0800
Subject: [PATCH] curlie: 1.7.2 -> 1.8.2

Diff: https://github.com/rs/curlie/compare/v1.7.2...v1.8.2
---
 .../by-name/cu/curlie/bump-golang-x-sys.patch | 37 -------------------
 pkgs/by-name/cu/curlie/package.nix            | 28 ++++++--------
 2 files changed, 12 insertions(+), 53 deletions(-)
 delete mode 100644 pkgs/by-name/cu/curlie/bump-golang-x-sys.patch

diff --git a/pkgs/by-name/cu/curlie/bump-golang-x-sys.patch b/pkgs/by-name/cu/curlie/bump-golang-x-sys.patch
deleted file mode 100644
index 0de9769d2216..000000000000
--- a/pkgs/by-name/cu/curlie/bump-golang-x-sys.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/go.mod b/go.mod
-index bebd23f..2ad575f 100644
---- a/go.mod
-+++ b/go.mod
-@@ -1,8 +1,8 @@
- module github.com/rs/curlie
-
- require (
--	golang.org/x/crypto v0.1.0
--	golang.org/x/sys v0.1.0
-+	golang.org/x/crypto v0.0.0-20180524125353-159ae71589f3
-+	golang.org/x/sys v0.0.0-20211110154304-99a53858aa08
- )
-
- go 1.13
-diff --git a/go.sum b/go.sum
-index 6b2e5c3..452bcf9 100644
---- a/go.sum
-+++ b/go.sum
-@@ -1,4 +1,6 @@
- github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-+golang.org/x/crypto v0.0.0-20180524125353-159ae71589f3 h1:mPCVkWhSH1DSDQg4ZwAFYMo/+evpqK1WzBt33b9TXRE=
-+golang.org/x/crypto v0.0.0-20180524125353-159ae71589f3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
- golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
- golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
- golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=
-@@ -10,6 +12,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
- golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
- golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
- golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-+golang.org/x/sys v0.0.0-20211110154304-99a53858aa08 h1:WecRHqgE09JBkh/584XIE6PMz5KKE/vER4izNUi30AQ=
-+golang.org/x/sys v0.0.0-20211110154304-99a53858aa08/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
- golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
- golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
---
-2.40.1
diff --git a/pkgs/by-name/cu/curlie/package.nix b/pkgs/by-name/cu/curlie/package.nix
index b215a3dfb105..0d26874856cd 100644
--- a/pkgs/by-name/cu/curlie/package.nix
+++ b/pkgs/by-name/cu/curlie/package.nix
@@ -1,32 +1,28 @@
 {
+  lib,
   buildGoModule,
   fetchFromGitHub,
-  lib,
   curlie,
   testers,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "curlie";
-  version = "1.7.2";
+  version = "1.8.2";
 
   src = fetchFromGitHub {
     owner = "rs";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-YOsq3cB+Pn2eC1Dky3fobBRR7GMxcf/tvWr6i3Vq/BE=";
+    repo = "curlie";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-BlpIDik4hkU4c+KCyAmgUURIN362RDQID/qo6Ojp2Ek=";
   };
 
-  patches = [
-    ./bump-golang-x-sys.patch
-  ];
-
-  vendorHash = "sha256-VsPdMUfS4UVem6uJgFISfFHQEKtIumDQktHQFPC1muc=";
+  vendorHash = "sha256-GBccl8V87u26dtrGpHR+rKqRBqX6lq1SBwfsPvj/+44=";
 
   ldflags = [
     "-s"
     "-w"
-    "-X main.version=${version}"
+    "-X main.version=${finalAttrs.version}"
   ];
 
   passthru.tests.version = testers.testVersion {
@@ -34,11 +30,11 @@ buildGoModule rec {
     command = "curlie version";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Frontend to curl that adds the ease of use of httpie, without compromising on features and performance";
     homepage = "https://curlie.io/";
-    maintainers = with maintainers; [ ma27 ];
-    license = licenses.mit;
+    maintainers = with lib.maintainers; [ ma27 ];
+    license = lib.licenses.mit;
     mainProgram = "curlie";
   };
-}
+})