feat(trash-d): use latest release instead of latest git and bump to 20

apps/update-sources/src/app.ts

@@ -79,6 +79,10 @@ const main = async() => {
         console.log(updateCustomPackage('some-sass-language-server'));
     }
 
+    if (args['t'] || args['trash-d']) {
+        console.log(runNixUpdate('trash-d'));
+    }
+
     if (args['v'] || args['vuetorrent']) {
         console.log(updateVuetorrent());
     }
@@ -139,6 +143,7 @@ const main = async() => {
         updatePackage('jmusicbot');
         updatePackage('pam-fprint-grosshack');
         updatePackage('protonhax');
+        updatePackage('trash-d');
 
 
         spawnSync('nixFastBuild', [], {

flake.lock

@@ -1718,7 +1718,6 @@
         "spotifywebapi-src": "spotifywebapi-src",
         "subscleaner-src": "subscleaner-src",
         "systems": "systems",
-        "trash-d-src": "trash-d-src",
         "treefmt-nix": "treefmt-nix",
         "ts-for-gir-src": "ts-for-gir-src",
         "tuya-local-src": "tuya-local-src",
@@ -1884,22 +1883,6 @@
         "type": "github"
       }
     },
-    "trash-d-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1734656654,
-        "narHash": "sha256-zYAEw3sW9jJgw0XFfi7IEdJTKybuRdBXMCqoI+AqJko=",
-        "owner": "rushsteve1",
-        "repo": "trash-d",
-        "rev": "2537f7b94998ed60989df370583d92235cd6d169",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rushsteve1",
-        "repo": "trash-d",
-        "type": "github"
-      }
-    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [

flake.nix

@@ -478,12 +478,6 @@
       repo = "default-linux";
       type = "github";
     };
-    trash-d-src = {
-      flake = false;
-      owner = "rushsteve1";
-      repo = "trash-d";
-      type = "github";
-    };
     treefmt-nix = {
       inputs.nixpkgs.follows = "nixpkgs";
       owner = "numtide";

inputs/default.nix

@@ -331,10 +331,6 @@ let
     }
 
     # Overlays & packages
-    {
-      owner = "rushsteve1";
-      repo = "trash-d";
-    }
     {
       type = "gitlab";
       owner = "rogs";

packages/trash-d/default.nix

@@ -2,43 +2,49 @@
   # nix build inputs
   lib,
   stdenv,
-  trash-d-src,
+  fetchFromGitHub,
   # deps
   dmd,
   dub,
-  ronn,
+  just,
+  scdoc,
   ...
 }: let
-  inherit (builtins) fromJSON readFile;
-  tag = (fromJSON (readFile "${trash-d-src}/dub.json")).version;
-
   pname = "trash";
-  version = "${tag}+${trash-d-src.shortRev}";
+  version = "20";
 in
   stdenv.mkDerivation {
     inherit pname version;
 
-    src = trash-d-src;
+    src = fetchFromGitHub {
+      owner = "rushsteve1";
+      repo = "trash-d";
+      rev = version;
+      hash = "sha256-x76kEqgwJGW4wmEyr3XzEXZ2AvRsm9ewrfjRjIsOphw=";
+    };
+
+    nativeBuildInputs = [
+      just
+    ];
 
     buildInputs = [
-      dub
-      ronn
       dmd
+      dub
+      scdoc
     ];
 
     buildPhase = ''
       # https://github.com/svanderburg/node2nix/issues/217#issuecomment-751311272
       export HOME=$(mktemp -d)
 
-      dub build
+      just release manpage
     '';
 
     installPhase = ''
-      mkdir -p $out/bin $out/man/man1
+      mkdir -p $out/{bin,man/man1}
 
-      cp -a ./build/trash $out/bin/
+      cp -a ./build/trash $out/bin
-
+      cp -a ./build/trash.1 $out/man/man1
-      ronn --roff --pipe MANUAL.md > $out/man/man1/trash.1
     '';
 
     meta = {