From cf0033968af69cee994162a2798097ea8c0ba506 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Wed, 6 Nov 2024 20:54:06 +0800
Subject: [PATCH 1/4] tree-from-tags: move to by-name

---
 pkgs/{applications/audio => by-name/tr}/tree-from-tags/Gemfile  | 0
 .../audio => by-name/tr}/tree-from-tags/Gemfile.lock            | 0
 .../audio => by-name/tr}/tree-from-tags/gemset.nix              | 0
 .../default.nix => by-name/tr/tree-from-tags/package.nix}       | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 5 files changed, 2 deletions(-)
 rename pkgs/{applications/audio => by-name/tr}/tree-from-tags/Gemfile (100%)
 rename pkgs/{applications/audio => by-name/tr}/tree-from-tags/Gemfile.lock (100%)
 rename pkgs/{applications/audio => by-name/tr}/tree-from-tags/gemset.nix (100%)
 rename pkgs/{applications/audio/tree-from-tags/default.nix => by-name/tr/tree-from-tags/package.nix} (100%)

diff --git a/pkgs/applications/audio/tree-from-tags/Gemfile b/pkgs/by-name/tr/tree-from-tags/Gemfile
similarity index 100%
rename from pkgs/applications/audio/tree-from-tags/Gemfile
rename to pkgs/by-name/tr/tree-from-tags/Gemfile
diff --git a/pkgs/applications/audio/tree-from-tags/Gemfile.lock b/pkgs/by-name/tr/tree-from-tags/Gemfile.lock
similarity index 100%
rename from pkgs/applications/audio/tree-from-tags/Gemfile.lock
rename to pkgs/by-name/tr/tree-from-tags/Gemfile.lock
diff --git a/pkgs/applications/audio/tree-from-tags/gemset.nix b/pkgs/by-name/tr/tree-from-tags/gemset.nix
similarity index 100%
rename from pkgs/applications/audio/tree-from-tags/gemset.nix
rename to pkgs/by-name/tr/tree-from-tags/gemset.nix
diff --git a/pkgs/applications/audio/tree-from-tags/default.nix b/pkgs/by-name/tr/tree-from-tags/package.nix
similarity index 100%
rename from pkgs/applications/audio/tree-from-tags/default.nix
rename to pkgs/by-name/tr/tree-from-tags/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3226511390c..b8fb941dff00 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16211,8 +16211,6 @@ with pkgs;
     wlroots = wlroots_0_18;
   };
 
-  tree-from-tags = callPackage ../applications/audio/tree-from-tags { };
-
   treesheets = callPackage ../applications/office/treesheets {
     wxGTK = wxGTK32;
     inherit (darwin.apple_sdk.frameworks) Cocoa;

From 5396211e60280d9987067cf19867feb5eba8aaaa Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Wed, 6 Nov 2024 20:54:21 +0800
Subject: [PATCH 2/4] tree-from-tags: nixfmt

---
 pkgs/by-name/tr/tree-from-tags/gemset.nix  |  2 +-
 pkgs/by-name/tr/tree-from-tags/package.nix | 47 ++++++++++++++--------
 2 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/tr/tree-from-tags/gemset.nix b/pkgs/by-name/tr/tree-from-tags/gemset.nix
index f482d174ebc2..67fd0af05823 100644
--- a/pkgs/by-name/tr/tree-from-tags/gemset.nix
+++ b/pkgs/by-name/tr/tree-from-tags/gemset.nix
@@ -1,7 +1,7 @@
 {
   taglib-ruby = {
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "0r8g7zdncc6243d000jn0grc1n70rn9mx16vggy3q7c4wgsa37xi";
       type = "gem";
     };
diff --git a/pkgs/by-name/tr/tree-from-tags/package.nix b/pkgs/by-name/tr/tree-from-tags/package.nix
index 9b81cc250c1b..05d8af544857 100644
--- a/pkgs/by-name/tr/tree-from-tags/package.nix
+++ b/pkgs/by-name/tr/tree-from-tags/package.nix
@@ -1,38 +1,51 @@
-{ lib, stdenv, bundlerEnv, ruby, fetchFromGitHub }:
+{
+  lib,
+  stdenv,
+  bundlerEnv,
+  ruby,
+  fetchFromGitHub,
+}:
 let
   version = "1.1";
   gems = bundlerEnv {
     name = "tree-from-tags-${version}-gems";
     inherit ruby;
-    gemdir  = ./.;
+    gemdir = ./.;
   };
-in stdenv.mkDerivation {
+in
+stdenv.mkDerivation {
   pname = "tree-from-tags";
   inherit version;
   src = fetchFromGitHub {
-    owner  = "dbrock";
-    repo   = "bongo";
-    rev    = version;
+    owner = "dbrock";
+    repo = "bongo";
+    rev = version;
     sha256 = "1nszph9mn98flyhn1jq3y6mdh6jymjkvj5ng36ql016dj92apvhv";
   };
-  buildInputs = [ gems ruby ];
+  buildInputs = [
+    gems
+    ruby
+  ];
   installPhase = ''
-    mkdir -p $out/{bin,share}
-    cp tree-from-tags.rb $out/share/
-    bin=$out/bin/tree-from-tags
-# we are using bundle exec to start in the bundled environment
-    cat > $bin <<EOF
-#!/bin/sh -e
-exec ${gems}/bin/bundle exec ${ruby}/bin/ruby "$out"/share/tree-from-tags.rb "\$@"
-EOF
-    chmod +x $bin
+        mkdir -p $out/{bin,share}
+        cp tree-from-tags.rb $out/share/
+        bin=$out/bin/tree-from-tags
+    # we are using bundle exec to start in the bundled environment
+        cat > $bin <<EOF
+    #!/bin/sh -e
+    exec ${gems}/bin/bundle exec ${ruby}/bin/ruby "$out"/share/tree-from-tags.rb "\$@"
+    EOF
+        chmod +x $bin
   '';
 
   meta = with lib; {
     description = "Create file hierarchies from media tags";
     homepage = "https://www.emacswiki.org/emacs/Bongo";
     platforms = ruby.meta.platforms;
-    maintainers = [ maintainers.livnev maintainers.dbrock ];
+    maintainers = [
+      maintainers.livnev
+      maintainers.dbrock
+    ];
     license = licenses.gpl2Plus;
     mainProgram = "tree-from-tags";
   };

From 2f037ff56f15393f7104931b2cb7e20db750e21e Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Wed, 6 Nov 2024 20:55:41 +0800
Subject: [PATCH 3/4] tree-from-tags: improvement

---
 pkgs/by-name/tr/tree-from-tags/gemset.nix  |  2 +-
 pkgs/by-name/tr/tree-from-tags/package.nix | 27 ++++++++++++----------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/tr/tree-from-tags/gemset.nix b/pkgs/by-name/tr/tree-from-tags/gemset.nix
index 67fd0af05823..4bfa217b1776 100644
--- a/pkgs/by-name/tr/tree-from-tags/gemset.nix
+++ b/pkgs/by-name/tr/tree-from-tags/gemset.nix
@@ -2,7 +2,7 @@
   taglib-ruby = {
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0r8g7zdncc6243d000jn0grc1n70rn9mx16vggy3q7c4wgsa37xi";
+      hash = "sha256-sZ+h9OOEHTz8e9uEXpPN4NjA8gNWAgDaIMIwZts/D2U=";
       type = "gem";
     };
     version = "0.7.1";
diff --git a/pkgs/by-name/tr/tree-from-tags/package.nix b/pkgs/by-name/tr/tree-from-tags/package.nix
index 05d8af544857..0a8b810d7bf5 100644
--- a/pkgs/by-name/tr/tree-from-tags/package.nix
+++ b/pkgs/by-name/tr/tree-from-tags/package.nix
@@ -16,37 +16,40 @@ in
 stdenv.mkDerivation {
   pname = "tree-from-tags";
   inherit version;
+
   src = fetchFromGitHub {
     owner = "dbrock";
     repo = "bongo";
     rev = version;
-    sha256 = "1nszph9mn98flyhn1jq3y6mdh6jymjkvj5ng36ql016dj92apvhv";
+    hash = "sha256-G+6rRJLNBECxGc8WuaesXhrYqvEDy2Chpw4lWxO8X9s=";
   };
+
   buildInputs = [
     gems
     ruby
   ];
+
   installPhase = ''
-        mkdir -p $out/{bin,share}
-        cp tree-from-tags.rb $out/share/
-        bin=$out/bin/tree-from-tags
+    mkdir -p $out/{bin,share}
+    cp tree-from-tags.rb $out/share/
+    bin=$out/bin/tree-from-tags
     # we are using bundle exec to start in the bundled environment
-        cat > $bin <<EOF
+    cat > $bin <<EOF
     #!/bin/sh -e
     exec ${gems}/bin/bundle exec ${ruby}/bin/ruby "$out"/share/tree-from-tags.rb "\$@"
     EOF
-        chmod +x $bin
+    chmod +x $bin
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Create file hierarchies from media tags";
     homepage = "https://www.emacswiki.org/emacs/Bongo";
-    platforms = ruby.meta.platforms;
-    maintainers = [
-      maintainers.livnev
-      maintainers.dbrock
+    platforms = lib.ruby.meta.platforms;
+    maintainers = with lib.maintainers; [
+      livnev
+      dbrock
     ];
-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     mainProgram = "tree-from-tags";
   };
 }

From 17934161dfd9d38392aa303bcfaff20b9c6d4424 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Wed, 6 Nov 2024 20:57:19 +0800
Subject: [PATCH 4/4] tree-from-tags: pin to ruby_3_1

---
 pkgs/by-name/tr/tree-from-tags/gemset.nix  | 2 +-
 pkgs/by-name/tr/tree-from-tags/package.nix | 2 +-
 pkgs/top-level/all-packages.nix            | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tr/tree-from-tags/gemset.nix b/pkgs/by-name/tr/tree-from-tags/gemset.nix
index 4bfa217b1776..67fd0af05823 100644
--- a/pkgs/by-name/tr/tree-from-tags/gemset.nix
+++ b/pkgs/by-name/tr/tree-from-tags/gemset.nix
@@ -2,7 +2,7 @@
   taglib-ruby = {
     source = {
       remotes = [ "https://rubygems.org" ];
-      hash = "sha256-sZ+h9OOEHTz8e9uEXpPN4NjA8gNWAgDaIMIwZts/D2U=";
+      sha256 = "0r8g7zdncc6243d000jn0grc1n70rn9mx16vggy3q7c4wgsa37xi";
       type = "gem";
     };
     version = "0.7.1";
diff --git a/pkgs/by-name/tr/tree-from-tags/package.nix b/pkgs/by-name/tr/tree-from-tags/package.nix
index 0a8b810d7bf5..eb571a41ddf4 100644
--- a/pkgs/by-name/tr/tree-from-tags/package.nix
+++ b/pkgs/by-name/tr/tree-from-tags/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Create file hierarchies from media tags";
     homepage = "https://www.emacswiki.org/emacs/Bongo";
-    platforms = lib.ruby.meta.platforms;
+    platforms = ruby.meta.platforms;
     maintainers = with lib.maintainers; [
       livnev
       dbrock
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b8fb941dff00..a849f0be5534 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19349,4 +19349,8 @@ with pkgs;
   cantata = callPackage ../by-name/ca/cantata/package.nix {
     ffmpeg = ffmpeg_6;
   };
+
+  tree-from-tags = callPackage ../by-name/tr/tree-from-tags/package.nix {
+    ruby = ruby_3_1;
+  };
 }