From 88b620a72b65e28523f5509809806b5e4766acf0 Mon Sep 17 00:00:00 2001 From: zendo Date: Sun, 10 Nov 2024 19:19:41 +0800 Subject: [PATCH 1/2] completely: move to by-name --- pkgs/{tools/misc => by-name/co}/completely/Gemfile | 0 pkgs/{tools/misc => by-name/co}/completely/Gemfile.lock | 0 pkgs/{tools/misc => by-name/co}/completely/gemset.nix | 0 .../default.nix => by-name/co/completely/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{tools/misc => by-name/co}/completely/Gemfile (100%) rename pkgs/{tools/misc => by-name/co}/completely/Gemfile.lock (100%) rename pkgs/{tools/misc => by-name/co}/completely/gemset.nix (100%) rename pkgs/{tools/misc/completely/default.nix => by-name/co/completely/package.nix} (100%) diff --git a/pkgs/tools/misc/completely/Gemfile b/pkgs/by-name/co/completely/Gemfile similarity index 100% rename from pkgs/tools/misc/completely/Gemfile rename to pkgs/by-name/co/completely/Gemfile diff --git a/pkgs/tools/misc/completely/Gemfile.lock b/pkgs/by-name/co/completely/Gemfile.lock similarity index 100% rename from pkgs/tools/misc/completely/Gemfile.lock rename to pkgs/by-name/co/completely/Gemfile.lock diff --git a/pkgs/tools/misc/completely/gemset.nix b/pkgs/by-name/co/completely/gemset.nix similarity index 100% rename from pkgs/tools/misc/completely/gemset.nix rename to pkgs/by-name/co/completely/gemset.nix diff --git a/pkgs/tools/misc/completely/default.nix b/pkgs/by-name/co/completely/package.nix similarity index 100% rename from pkgs/tools/misc/completely/default.nix rename to pkgs/by-name/co/completely/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3226511390c..73725413db7b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13763,8 +13763,6 @@ with pkgs; communi = libsForQt5.callPackage ../applications/networking/irc/communi { }; - completely = callPackage ../tools/misc/completely { }; - confclerk = libsForQt5.callPackage ../applications/misc/confclerk { }; copyq = qt6Packages.callPackage ../applications/misc/copyq { }; From 9828bad63a499f7e710196bf93f05da28d25d050 Mon Sep 17 00:00:00 2001 From: zendo Date: Sun, 10 Nov 2024 19:30:21 +0800 Subject: [PATCH 2/2] completely: 0.5.2 -> 0.6.3 --- pkgs/by-name/co/completely/Gemfile.lock | 18 +++++++++--------- pkgs/by-name/co/completely/gemset.nix | 20 ++++++++++---------- pkgs/by-name/co/completely/package.nix | 15 ++++++++------- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/pkgs/by-name/co/completely/Gemfile.lock b/pkgs/by-name/co/completely/Gemfile.lock index 656c96cbc40c..d6985978275b 100644 --- a/pkgs/by-name/co/completely/Gemfile.lock +++ b/pkgs/by-name/co/completely/Gemfile.lock @@ -1,14 +1,14 @@ GEM remote: https://rubygems.org/ specs: - colsole (0.8.2) - completely (0.5.2) - colsole (~> 0.6) - mister_bin (~> 0.7.2) - docopt (0.6.1) - mister_bin (0.7.3) - colsole (~> 0.7) - docopt (~> 0.6) + colsole (1.0.0) + completely (0.6.3) + colsole (>= 0.8.1, < 2) + mister_bin (~> 0.7) + docopt_ng (0.7.1) + mister_bin (0.7.6) + colsole (>= 0.8.1, < 2) + docopt_ng (~> 0.7, >= 0.7.1) PLATFORMS ruby @@ -17,4 +17,4 @@ DEPENDENCIES completely BUNDLED WITH - 2.4.5 + 2.5.16 diff --git a/pkgs/by-name/co/completely/gemset.nix b/pkgs/by-name/co/completely/gemset.nix index a078a113f6d4..f99da8f72218 100644 --- a/pkgs/by-name/co/completely/gemset.nix +++ b/pkgs/by-name/co/completely/gemset.nix @@ -4,10 +4,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l29sxy4p9jbvcihckxfsyqx98b8xwzd3hjqvdh1zxw8nv5walnp"; + sha256 = "1fvf6dz2wsvjk7q24z0dm8lajq3p2l6i5ywf3mxj683rmhwq49bg"; type = "gem"; }; - version = "0.8.2"; + version = "1.0.0"; }; completely = { dependencies = ["colsole" "mister_bin"]; @@ -15,30 +15,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w7cmmsp9m42c8w4j03kr98zy7x7yszw3qsm3ww600dmc0d0xd2b"; + sha256 = "0ci8iza647hvc4f1cmf9mpsm3i78ysf6g6213wkyrr5jk296hjjb"; type = "gem"; }; - version = "0.5.2"; + version = "0.6.3"; }; - docopt = { + docopt_ng = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rvlfbb7kzyagncm4zdpcjwrh682zamgf5rcf5qmj0bd6znkgy3k"; + sha256 = "0rsnl5s7k2s1gl4n4dg68ssg577kf11sl4a4l2lb2fpswj718950"; type = "gem"; }; - version = "0.6.1"; + version = "0.7.1"; }; mister_bin = { - dependencies = ["colsole" "docopt"]; + dependencies = ["colsole" "docopt_ng"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f51zs9wjpslhdadp8yfx4ij0jj1ya92cbzqlfd2wfr19wdr2jgd"; + sha256 = "0xx8cxvzcn47zsnshcllf477x4rbssrchvp76929qnsg5k9q7fas"; type = "gem"; }; - version = "0.7.3"; + version = "0.7.6"; }; } diff --git a/pkgs/by-name/co/completely/package.nix b/pkgs/by-name/co/completely/package.nix index 326887299c0c..47e6189bd530 100644 --- a/pkgs/by-name/co/completely/package.nix +++ b/pkgs/by-name/co/completely/package.nix @@ -1,6 +1,7 @@ -{ lib -, bundlerApp -, bundlerUpdateScript +{ + lib, + bundlerApp, + bundlerUpdateScript, }: bundlerApp { @@ -11,12 +12,12 @@ bundlerApp { passthru.updateScript = bundlerUpdateScript "completely"; - meta = with lib; { + meta = { description = "Generate bash completion scripts using a simple configuration file"; homepage = "https://github.com/DannyBen/completely"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ zendo ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ zendo ]; mainProgram = "completely"; }; }