From 2a93760a40828bc30a0fb0638f423b90444d7e32 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte.vanpetegem@ugent.be>
Date: Tue, 10 May 2022 09:59:02 +0200
Subject: [PATCH] Add patch for upstreamed uni package

---
 flake.nix                |  1 -
 packages/uni/default.nix | 24 ------------------
 patches/172302.patch     | 54 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 25 deletions(-)
 delete mode 100644 packages/uni/default.nix
 create mode 100644 patches/172302.patch

diff --git a/flake.nix b/flake.nix
index 7541ec23..6cb76bbb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -70,7 +70,6 @@
       customPackages = callPackage: {
         jdtls = callPackage ./packages/jdtls { };
         kotlin-language-server = callPackage ./packages/kotlin-language-server { };
-        uni = callPackage ./packages/uni { };
       }; in
     utils.lib.mkFlake {
       inherit self inputs;
diff --git a/packages/uni/default.nix b/packages/uni/default.nix
deleted file mode 100644
index 8e1bfb99..00000000
--- a/packages/uni/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib, buildGoModule, fetchFromGitHub }:
-
-buildGoModule rec {
-  pname = "uni";
-  version = "2.4.0";
-
-  src = fetchFromGitHub {
-    owner = "arp242";
-    repo = "uni";
-    rev = "v${version}";
-    sha256 = "ZBVUrS1/jUO0iLbK6P5ACw1vS5QPbSMkG9ZTdKrb8eo=";
-  };
-
-  vendorSha256 = "+gRESx8KCwfxCztY/68UO8KV+bJmjq3gbsrCFHBZyEI=";
-
-  doCheck = false;
-
-  meta = with lib; {
-    homepage = "https://github.com/arp242/uni";
-    description = "Query the Unicode database from the commandline, with good support for emojis";
-    license = licenses.mit;
-    maintainers = with maintainers; [ chvp ];
-  };
-}
diff --git a/patches/172302.patch b/patches/172302.patch
new file mode 100644
index 00000000..d198fbdf
--- /dev/null
+++ b/patches/172302.patch
@@ -0,0 +1,54 @@
+From 24506e9141888a548de2cb84fbe95ae0299ba9f4 Mon Sep 17 00:00:00 2001
+From: Charlotte Van Petegem <charlotte.vanpetegem@ugent.be>
+Date: Tue, 10 May 2022 09:55:17 +0200
+Subject: [PATCH] uni: init at 2.5.1
+
+---
+ pkgs/applications/misc/uni/default.nix | 24 ++++++++++++++++++++++++
+ pkgs/top-level/all-packages.nix        |  2 ++
+ 2 files changed, 26 insertions(+)
+ create mode 100644 pkgs/applications/misc/uni/default.nix
+
+diff --git a/pkgs/applications/misc/uni/default.nix b/pkgs/applications/misc/uni/default.nix
+new file mode 100644
+index 0000000000000..7ccbf3c953d3c
+--- /dev/null
++++ b/pkgs/applications/misc/uni/default.nix
+@@ -0,0 +1,24 @@
++{ lib, buildGoModule, fetchFromGitHub }:
++
++buildGoModule rec {
++  pname = "uni";
++  version = "2.5.1";
++
++  src = fetchFromGitHub {
++    owner = "arp242";
++    repo = "uni";
++    rev = "v${version}";
++    sha256 = "kWiglMuJdcD7z2MDfz1MbItB8r9BJ7LUqfPfJa8QkLA=";
++  };
++
++  vendorSha256 = "6HNFCUSJA6oduCx/SCUQQeCHGS7ohaWRunixdwMurBw=";
++
++  ldflags = [ "-X main.version=${version}" ];
++
++  meta = with lib; {
++    homepage = "https://github.com/arp242/uni";
++    description = "Query the Unicode database from the commandline, with good support for emojis";
++    license = licenses.mit;
++    maintainers = with maintainers; [ chvp ];
++  };
++}
+diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
+index bf0e839a16c87..15fc5df2a543d 100644
+--- a/pkgs/top-level/all-packages.nix
++++ b/pkgs/top-level/all-packages.nix
+@@ -29906,6 +29906,8 @@ with pkgs;
+     channel = "ungoogled-chromium";
+   });
+ 
++  uni = callPackage ../applications/misc/uni { };
++
+   unigine-valley = callPackage ../applications/graphics/unigine-valley { };
+ 
+   unigine-heaven = callPackage ../applications/graphics/unigine-heaven { };