From a043fda72b1eb5873cc2c34afd4085019e156a3e Mon Sep 17 00:00:00 2001
From: stupidcomputer <ryan@beepboop.systems>
Date: Wed, 31 Jul 2024 13:35:16 -0500
Subject: [PATCH] neocities-cli: remove package due to duplication

---
 pkgs/by-name/ne/neocities-cli/Gemfile      |   2 -
 pkgs/by-name/ne/neocities-cli/Gemfile.lock |  48 ------
 pkgs/by-name/ne/neocities-cli/gemset.nix   | 169 ---------------------
 pkgs/by-name/ne/neocities-cli/package.nix  |  22 ---
 pkgs/by-name/ne/neocities/Gemfile.lock     |   3 +-
 pkgs/by-name/ne/neocities/gemset.nix       | 108 ++++++-------
 pkgs/by-name/ne/neocities/package.nix      |   7 +-
 7 files changed, 62 insertions(+), 297 deletions(-)
 delete mode 100644 pkgs/by-name/ne/neocities-cli/Gemfile
 delete mode 100644 pkgs/by-name/ne/neocities-cli/Gemfile.lock
 delete mode 100644 pkgs/by-name/ne/neocities-cli/gemset.nix
 delete mode 100644 pkgs/by-name/ne/neocities-cli/package.nix

diff --git a/pkgs/by-name/ne/neocities-cli/Gemfile b/pkgs/by-name/ne/neocities-cli/Gemfile
deleted file mode 100644
index f9e464079d0f..000000000000
--- a/pkgs/by-name/ne/neocities-cli/Gemfile
+++ /dev/null
@@ -1,2 +0,0 @@
-source 'https://rubygems.org'
-gem 'neocities'
diff --git a/pkgs/by-name/ne/neocities-cli/Gemfile.lock b/pkgs/by-name/ne/neocities-cli/Gemfile.lock
deleted file mode 100644
index 91b35afca94d..000000000000
--- a/pkgs/by-name/ne/neocities-cli/Gemfile.lock
+++ /dev/null
@@ -1,48 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    equatable (0.5.0)
-    httpclient-fixcerts (2.8.5)
-    necromancer (0.4.0)
-    neocities (0.0.18)
-      httpclient-fixcerts (~> 2.8, >= 2.8.5)
-      pastel (~> 0.7, = 0.7.2)
-      rake (~> 12.3, >= 12.3.1)
-      tty-prompt (~> 0.12, = 0.12.0)
-      tty-table (~> 0.10, = 0.10.0)
-    pastel (0.7.2)
-      equatable (~> 0.5.0)
-      tty-color (~> 0.4.0)
-    rake (12.3.3)
-    strings (0.1.8)
-      strings-ansi (~> 0.1)
-      unicode-display_width (~> 1.5)
-      unicode_utils (~> 1.4)
-    strings-ansi (0.2.0)
-    tty-color (0.4.3)
-    tty-cursor (0.4.0)
-    tty-prompt (0.12.0)
-      necromancer (~> 0.4.0)
-      pastel (~> 0.7.0)
-      tty-cursor (~> 0.4.0)
-      wisper (~> 1.6.1)
-    tty-screen (0.6.5)
-    tty-table (0.10.0)
-      equatable (~> 0.5.0)
-      necromancer (~> 0.4.0)
-      pastel (~> 0.7.2)
-      strings (~> 0.1.0)
-      tty-screen (~> 0.6.4)
-    unicode-display_width (1.8.0)
-    unicode_utils (1.4.0)
-    wisper (1.6.1)
-
-PLATFORMS
-  ruby
-  x86_64-linux
-
-DEPENDENCIES
-  neocities
-
-BUNDLED WITH
-   2.5.5
diff --git a/pkgs/by-name/ne/neocities-cli/gemset.nix b/pkgs/by-name/ne/neocities-cli/gemset.nix
deleted file mode 100644
index 573cee83eed2..000000000000
--- a/pkgs/by-name/ne/neocities-cli/gemset.nix
+++ /dev/null
@@ -1,169 +0,0 @@
-{
-  equatable = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1sjm9zjakyixyvsqziikdrsqfzis6j3fq23crgjkp6fwkfgndj7x";
-      type = "gem";
-    };
-    version = "0.5.0";
-  };
-  httpclient-fixcerts = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1zfszylh51y8ic8sbff3mwf30jb0gj270r5nxkcm1ydxad19w6sl";
-      type = "gem";
-    };
-    version = "2.8.5";
-  };
-  necromancer = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0v9nhdkv6zrp7cn48xv7n2vjhsbslpvs0ha36mfkcd56cp27pavz";
-      type = "gem";
-    };
-    version = "0.4.0";
-  };
-  neocities = {
-    dependencies =
-      [ "httpclient-fixcerts" "pastel" "rake" "tty-prompt" "tty-table" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1hfvy4gc7rzxkgl2dbrjs2fqzi5mphmr22rjfhk6n0i3bd0wazbw";
-      type = "gem";
-    };
-    version = "0.0.18";
-  };
-  pastel = {
-    dependencies = [ "equatable" "tty-color" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1yf30d9kzpm96gw9kwbv31p0qigwfykn8qdis5950plnzgc1vlp1";
-      type = "gem";
-    };
-    version = "0.7.2";
-  };
-  rake = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1cvaqarr1m84mhc006g3l1vw7sa5qpkcw0138lsxlf769zdllsgp";
-      type = "gem";
-    };
-    version = "12.3.3";
-  };
-  strings = {
-    dependencies = [ "strings-ansi" "unicode-display_width" "unicode_utils" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "111876lcqrykh30w7zzkrl06d6rj9lq24y625m28674vgfxkkcz0";
-      type = "gem";
-    };
-    version = "0.1.8";
-  };
-  strings-ansi = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "120wa6yjc63b84lprglc52f40hx3fx920n4dmv14rad41rv2s9lh";
-      type = "gem";
-    };
-    version = "0.2.0";
-  };
-  tty-color = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0zz5xa6xbrj69h334d8nx7z732fz80s1a0b02b53mim95p80s7bk";
-      type = "gem";
-    };
-    version = "0.4.3";
-  };
-  tty-cursor = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "07whfm8mnp7l49s2cm2qy1snhsqq3a90sqwb71gvym4hm2kx822a";
-      type = "gem";
-    };
-    version = "0.4.0";
-  };
-  tty-prompt = {
-    dependencies = [ "necromancer" "pastel" "tty-cursor" "wisper" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1026nyqhgmgxi2nmk8xk3hca07gy5rpisjs8y6w00wnw4f01kpv0";
-      type = "gem";
-    };
-    version = "0.12.0";
-  };
-  tty-screen = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0azpjgyhdm8ycblnx9crq3dgb2x8yg454a13n60zfpsc0n138sw1";
-      type = "gem";
-    };
-    version = "0.6.5";
-  };
-  tty-table = {
-    dependencies =
-      [ "equatable" "necromancer" "pastel" "strings" "tty-screen" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "05krrj1x5pmfbz74paszrsr1316w9b9jlc4wpd9s9gpzqfzwjzcg";
-      type = "gem";
-    };
-    version = "0.10.0";
-  };
-  unicode-display_width = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2";
-      type = "gem";
-    };
-    version = "1.8.0";
-  };
-  unicode_utils = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0h1a5yvrxzlf0lxxa1ya31jcizslf774arnsd89vgdhk4g7x08mr";
-      type = "gem";
-    };
-    version = "1.4.0";
-  };
-  wisper = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "19bw0z1qw1dhv7gn9lad25hgbgpb1bkw8d599744xdfam158ms2s";
-      type = "gem";
-    };
-    version = "1.6.1";
-  };
-}
diff --git a/pkgs/by-name/ne/neocities-cli/package.nix b/pkgs/by-name/ne/neocities-cli/package.nix
deleted file mode 100644
index 546c29918082..000000000000
--- a/pkgs/by-name/ne/neocities-cli/package.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ lib
-, bundlerApp
-, bundlerUpdateScript
-}:
-
-bundlerApp {
-  pname = "neocities";
-  gemdir = ./.;
-  exes = [ "neocities" ];
-
-  passthru.updateScript = bundlerUpdateScript "neocities";
-
-  meta = with lib; {
-    description = "Neocities Gem - A CLI and library for using the Neocities web site API";
-    homepage = "https://github.com/neocities/neocities-ruby";
-    license = licenses.mit;
-    mainProgram = "neocities";
-    maintainers = with maintainers; [ dawoox ];
-    platforms = platforms.unix;
-  };
-}
-
diff --git a/pkgs/by-name/ne/neocities/Gemfile.lock b/pkgs/by-name/ne/neocities/Gemfile.lock
index 3c49da1d033b..91b35afca94d 100644
--- a/pkgs/by-name/ne/neocities/Gemfile.lock
+++ b/pkgs/by-name/ne/neocities/Gemfile.lock
@@ -39,9 +39,10 @@ GEM
 
 PLATFORMS
   ruby
+  x86_64-linux
 
 DEPENDENCIES
   neocities
 
 BUNDLED WITH
-   2.1.4
+   2.5.5
diff --git a/pkgs/by-name/ne/neocities/gemset.nix b/pkgs/by-name/ne/neocities/gemset.nix
index bb5b696cd14d..573cee83eed2 100644
--- a/pkgs/by-name/ne/neocities/gemset.nix
+++ b/pkgs/by-name/ne/neocities/gemset.nix
@@ -1,164 +1,166 @@
 {
   equatable = {
-    groups = ["default"];
-    platforms = [];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "1sjm9zjakyixyvsqziikdrsqfzis6j3fq23crgjkp6fwkfgndj7x";
       type = "gem";
     };
     version = "0.5.0";
   };
   httpclient-fixcerts = {
-    groups = ["default"];
-    platforms = [];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "1zfszylh51y8ic8sbff3mwf30jb0gj270r5nxkcm1ydxad19w6sl";
       type = "gem";
     };
     version = "2.8.5";
   };
   necromancer = {
-    groups = ["default"];
-    platforms = [];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "0v9nhdkv6zrp7cn48xv7n2vjhsbslpvs0ha36mfkcd56cp27pavz";
       type = "gem";
     };
     version = "0.4.0";
   };
   neocities = {
-    dependencies = ["httpclient-fixcerts" "pastel" "rake" "tty-prompt" "tty-table"];
-    groups = ["default"];
-    platforms = [];
+    dependencies =
+      [ "httpclient-fixcerts" "pastel" "rake" "tty-prompt" "tty-table" ];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "1hfvy4gc7rzxkgl2dbrjs2fqzi5mphmr22rjfhk6n0i3bd0wazbw";
       type = "gem";
     };
     version = "0.0.18";
   };
   pastel = {
-    dependencies = ["equatable" "tty-color"];
-    groups = ["default"];
-    platforms = [];
+    dependencies = [ "equatable" "tty-color" ];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "1yf30d9kzpm96gw9kwbv31p0qigwfykn8qdis5950plnzgc1vlp1";
       type = "gem";
     };
     version = "0.7.2";
   };
   rake = {
-    groups = ["default"];
-    platforms = [];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "1cvaqarr1m84mhc006g3l1vw7sa5qpkcw0138lsxlf769zdllsgp";
       type = "gem";
     };
     version = "12.3.3";
   };
   strings = {
-    dependencies = ["strings-ansi" "unicode-display_width" "unicode_utils"];
-    groups = ["default"];
-    platforms = [];
+    dependencies = [ "strings-ansi" "unicode-display_width" "unicode_utils" ];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "111876lcqrykh30w7zzkrl06d6rj9lq24y625m28674vgfxkkcz0";
       type = "gem";
     };
     version = "0.1.8";
   };
   strings-ansi = {
-    groups = ["default"];
-    platforms = [];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "120wa6yjc63b84lprglc52f40hx3fx920n4dmv14rad41rv2s9lh";
       type = "gem";
     };
     version = "0.2.0";
   };
   tty-color = {
-    groups = ["default"];
-    platforms = [];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "0zz5xa6xbrj69h334d8nx7z732fz80s1a0b02b53mim95p80s7bk";
       type = "gem";
     };
     version = "0.4.3";
   };
   tty-cursor = {
-    groups = ["default"];
-    platforms = [];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "07whfm8mnp7l49s2cm2qy1snhsqq3a90sqwb71gvym4hm2kx822a";
       type = "gem";
     };
     version = "0.4.0";
   };
   tty-prompt = {
-    dependencies = ["necromancer" "pastel" "tty-cursor" "wisper"];
-    groups = ["default"];
-    platforms = [];
+    dependencies = [ "necromancer" "pastel" "tty-cursor" "wisper" ];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "1026nyqhgmgxi2nmk8xk3hca07gy5rpisjs8y6w00wnw4f01kpv0";
       type = "gem";
     };
     version = "0.12.0";
   };
   tty-screen = {
-    groups = ["default"];
-    platforms = [];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "0azpjgyhdm8ycblnx9crq3dgb2x8yg454a13n60zfpsc0n138sw1";
       type = "gem";
     };
     version = "0.6.5";
   };
   tty-table = {
-    dependencies = ["equatable" "necromancer" "pastel" "strings" "tty-screen"];
-    groups = ["default"];
-    platforms = [];
+    dependencies =
+      [ "equatable" "necromancer" "pastel" "strings" "tty-screen" ];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "05krrj1x5pmfbz74paszrsr1316w9b9jlc4wpd9s9gpzqfzwjzcg";
       type = "gem";
     };
     version = "0.10.0";
   };
   unicode-display_width = {
-    groups = ["default"];
-    platforms = [];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2";
       type = "gem";
     };
     version = "1.8.0";
   };
   unicode_utils = {
-    groups = ["default"];
-    platforms = [];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "0h1a5yvrxzlf0lxxa1ya31jcizslf774arnsd89vgdhk4g7x08mr";
       type = "gem";
     };
     version = "1.4.0";
   };
   wisper = {
-    groups = ["default"];
-    platforms = [];
+    groups = [ "default" ];
+    platforms = [ ];
     source = {
-      remotes = ["https://rubygems.org"];
+      remotes = [ "https://rubygems.org" ];
       sha256 = "19bw0z1qw1dhv7gn9lad25hgbgpb1bkw8d599744xdfam158ms2s";
       type = "gem";
     };
diff --git a/pkgs/by-name/ne/neocities/package.nix b/pkgs/by-name/ne/neocities/package.nix
index 5950d1ba92b2..0907d14a2144 100644
--- a/pkgs/by-name/ne/neocities/package.nix
+++ b/pkgs/by-name/ne/neocities/package.nix
@@ -2,6 +2,7 @@
 , bundlerApp
 , bundlerUpdateScript
 }:
+
 bundlerApp {
   pname = "neocities";
   gemdir = ./.;
@@ -10,10 +11,12 @@ bundlerApp {
   passthru.updateScript = bundlerUpdateScript "neocities";
 
   meta = with lib; {
-    description = "The Neocities CLI, written in Ruby";
+    description = "CLI and library for interacting with the Neocities API";
     homepage = "https://github.com/neocities/neocities-ruby";
     license = licenses.mit;
-    maintainers = with maintainers; [ infinidoge ];
     mainProgram = "neocities";
+    maintainers = with maintainers; [ dawoox ];
+    platforms = platforms.unix;
   };
 }
+