From 39755de0411953f0fc035e4714664440defeee0d Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Sun, 31 Aug 2025 14:26:04 +0800
Subject: [PATCH 1/2] unp: 2.0-pre9 -> 2.0

---
 pkgs/by-name/un/unp/package.nix | 46 ++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/un/unp/package.nix b/pkgs/by-name/un/unp/package.nix
index 66c6fefea165..1a1888b137c8 100644
--- a/pkgs/by-name/un/unp/package.nix
+++ b/pkgs/by-name/un/unp/package.nix
@@ -1,7 +1,8 @@
 {
   stdenv,
   lib,
-  fetchurl,
+  fetchFromGitLab,
+  installShellFiles,
   makeWrapper,
   perl,
   unzip,
@@ -20,31 +21,40 @@ let
   ++ extraBackends;
 
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "unp";
-  version = "2.0-pre9";
-  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ perl ];
+  version = "2.0";
 
-  src = fetchurl {
-    url = "mirror://debian/pool/main/u/unp/unp_2.0~pre9.tar.xz";
-    sha256 = "1lp5vi9x1qi3b21nzv0yqqacj6p74qkl5zryzwq30rjkyvahjya1";
-    name = "unp_2.0_pre9.tar.xz";
+  src = fetchFromGitLab {
+    domain = "salsa.debian.org";
+    owner = "blade";
+    repo = "unp";
+    tag = "debian/${finalAttrs.version}";
+    hash = "sha256-6lYyKnNUkz9PKdn++zHe2SMdFsgaajStIdSaenbXIRo=";
   };
 
-  dontConfigure = true;
-  dontBuild = true;
-  installPhase = ''
-    mkdir -p $out/bin
-    mkdir -p $out/share/man/man1
-    install ./unp $out/bin/unp
-    install ./ucat $out/bin/ucat
-    cp debian/unp.1 $out/share/man/man1
+  nativeBuildInputs = [
+    installShellFiles
+    makeWrapper
+  ];
 
+  buildInputs = [ perl ];
+
+  dontConfigure = true;
+
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    installBin unp ucat
+    installManPage debian/unp.1
     wrapProgram $out/bin/unp \
       --prefix PATH : ${lib.makeBinPath runtime_bins}
     wrapProgram $out/bin/ucat \
       --prefix PATH : ${lib.makeBinPath runtime_bins}
+
+    runHook postInstall
   '';
 
   meta = with lib; {
@@ -54,4 +64,4 @@ stdenv.mkDerivation {
     maintainers = [ maintainers.timor ];
     platforms = platforms.all;
   };
-}
+})

From c37abc4993c3002a2cf55d99e0d6135b4588a2ce Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Sun, 31 Aug 2025 14:26:34 +0800
Subject: [PATCH 2/2] unp: remove with lib

---
 pkgs/by-name/un/unp/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/un/unp/package.nix b/pkgs/by-name/un/unp/package.nix
index 1a1888b137c8..4b084bfb161b 100644
--- a/pkgs/by-name/un/unp/package.nix
+++ b/pkgs/by-name/un/unp/package.nix
@@ -57,11 +57,11 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Command line tool for unpacking archives easily";
     homepage = "https://packages.qa.debian.org/u/unp.html";
-    license = with licenses; [ gpl2Only ];
-    maintainers = [ maintainers.timor ];
-    platforms = platforms.all;
+    license = with lib.licenses; [ gpl2Only ];
+    maintainers = [ lib.maintainers.timor ];
+    platforms = lib.platforms.all;
   };
 })