From 6dffdac08693e97462cb1b9635ebf39024c135da Mon Sep 17 00:00:00 2001 From: zendo Date: Mon, 11 Nov 2024 14:00:06 +0800 Subject: [PATCH] bashly: 1.1.10 -> 1.2.6 --- pkgs/by-name/ba/bashly/Gemfile.lock | 30 ++++++---- pkgs/by-name/ba/bashly/gemset.nix | 86 +++++++++++++++++++++++------ pkgs/by-name/ba/bashly/package.nix | 35 ++++-------- 3 files changed, 99 insertions(+), 52 deletions(-) diff --git a/pkgs/by-name/ba/bashly/Gemfile.lock b/pkgs/by-name/ba/bashly/Gemfile.lock index b7d336769261..c3f08f1947ce 100644 --- a/pkgs/by-name/ba/bashly/Gemfile.lock +++ b/pkgs/by-name/ba/bashly/Gemfile.lock @@ -1,37 +1,47 @@ GEM remote: https://rubygems.org/ specs: - bashly (1.1.10) + bashly (1.2.6) colsole (>= 0.8.1, < 2) completely (~> 0.6.1) filewatcher (~> 2.0) gtx (~> 0.1) + logger (>= 1, < 3) lp (~> 0.2) mister_bin (~> 0.7) + ostruct (>= 0, < 2) psych (>= 3.3.2, < 7) + requires (~> 1.1.0) tty-markdown (~> 0.7) + cgi (0.4.1) colsole (1.0.0) - completely (0.6.2) + completely (0.6.3) colsole (>= 0.8.1, < 2) mister_bin (~> 0.7) docopt_ng (0.7.1) + erb (4.0.4) + cgi (>= 0.3.3) filewatcher (2.1.0) module_methods (~> 0.1.0) - gtx (0.1.0) + gtx (0.1.1) + erb (~> 4.0) kramdown (2.4.0) rexml + logger (1.6.1) lp (0.2.1) mister_bin (0.7.6) colsole (>= 0.8.1, < 2) docopt_ng (~> 0.7, >= 0.7.1) module_methods (0.1.0) + ostruct (0.6.1) pastel (0.8.0) tty-color (~> 0.5) - psych (5.1.2) + psych (5.2.0) stringio - rexml (3.2.6) - rouge (4.2.1) - stringio (3.1.0) + requires (1.1.0) + rexml (3.3.9) + rouge (4.5.0) + stringio (3.1.2) strings (0.2.1) strings-ansi (~> 0.2) unicode-display_width (>= 1.5, < 3.0) @@ -46,14 +56,14 @@ GEM tty-color (~> 0.5) tty-screen (~> 0.8) tty-screen (0.8.2) - unicode-display_width (2.5.0) + unicode-display_width (2.6.0) unicode_utils (1.4.0) PLATFORMS - x86_64-linux + ruby DEPENDENCIES bashly BUNDLED WITH - 2.3.26 + 2.5.16 diff --git a/pkgs/by-name/ba/bashly/gemset.nix b/pkgs/by-name/ba/bashly/gemset.nix index 234cd93b159d..9a95ade58ccf 100644 --- a/pkgs/by-name/ba/bashly/gemset.nix +++ b/pkgs/by-name/ba/bashly/gemset.nix @@ -1,14 +1,24 @@ { bashly = { - dependencies = ["colsole" "completely" "filewatcher" "gtx" "lp" "mister_bin" "psych" "tty-markdown"]; + dependencies = ["colsole" "completely" "filewatcher" "gtx" "logger" "lp" "mister_bin" "ostruct" "psych" "requires" "tty-markdown"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kdqpnkwgmb6kbrq9fyazj0jh0dh8srh86xjk92xrvgfps1kh5sy"; + sha256 = "0dzyqwf43i92jq5j66j31qvsbfcpd6zk74ssqz14kj51wn2d8vw3"; type = "gem"; }; - version = "1.1.10"; + version = "1.2.6"; + }; + cgi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0c5494n3n6l51n1w1vc118zckbqdzk7r6b656hswg72w0bif2ja3"; + type = "gem"; + }; + version = "0.4.1"; }; colsole = { groups = ["default"]; @@ -26,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12vf279w44d520vw28drxyi05wi1hyrg262ifjlhk9chjrnzcc7k"; + sha256 = "0ci8iza647hvc4f1cmf9mpsm3i78ysf6g6213wkyrr5jk296hjjb"; type = "gem"; }; - version = "0.6.2"; + version = "0.6.3"; }; docopt_ng = { groups = ["default"]; @@ -41,6 +51,17 @@ }; version = "0.7.1"; }; + erb = { + dependencies = ["cgi"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05wpc7pn1k6jik7i57vfrj6k5lda39hrny0q3706pi05c886w4fy"; + type = "gem"; + }; + version = "4.0.4"; + }; filewatcher = { dependencies = ["module_methods"]; groups = ["default"]; @@ -53,14 +74,15 @@ version = "2.1.0"; }; gtx = { + dependencies = ["erb"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10hfhicvv371gy1i16x6vry1xglvxl0zh7qr6f14pqsx32qih6ff"; + sha256 = "1w0hbr9i6jpn9spbb13ipg2fajkwa51y56jw21ziwsddmv997274"; type = "gem"; }; - version = "0.1.0"; + version = "0.1.1"; }; kramdown = { dependencies = ["rexml"]; @@ -73,6 +95,16 @@ }; version = "2.4.0"; }; + logger = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; + type = "gem"; + }; + version = "1.6.1"; + }; lp = { groups = ["default"]; platforms = []; @@ -104,6 +136,16 @@ }; version = "0.1.0"; }; + ostruct = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9"; + type = "gem"; + }; + version = "0.6.1"; + }; pastel = { dependencies = ["tty-color"]; groups = ["default"]; @@ -121,40 +163,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s5383m6004q76xm3lb732bp4sjzb6mxb6rbgn129gy2izsj4wrk"; + sha256 = "0wq567f615x1ilgaqlh4yzf322f96rgn45xw4nm4vwfaddszw0v6"; type = "gem"; }; - version = "5.1.2"; + version = "5.2.0"; + }; + requires = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dlibxp6jfdl4favj2pgsm2pw84hhr2cdiizfs51ldkpddm50njp"; + type = "gem"; + }; + version = "1.1.0"; }; rexml = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; + sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p"; type = "gem"; }; - version = "3.2.6"; + version = "3.3.9"; }; rouge = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zd1pdldi6h8x27dqim7cy8m69xr01aw5c8k1zhkz497n4np6wgk"; + sha256 = "0dllqyxlxsmsy4xdpgwbn6w9w6qsha9ay6cl5kq06jgw63k5dp10"; type = "gem"; }; - version = "4.2.1"; + version = "4.5.0"; }; stringio = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "063psvsn1aq6digpznxfranhcpmi0sdv2jhra5g0459sw0x2dxn1"; + sha256 = "0cd1kdrf62p2ya3ia4rz49d5012bqinvqjmcgkakknswz0l1hkr0"; type = "gem"; }; - version = "3.1.0"; + version = "3.1.2"; }; strings = { dependencies = ["strings-ansi" "unicode-display_width" "unicode_utils"]; @@ -213,10 +265,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky"; + sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj"; type = "gem"; }; - version = "2.5.0"; + version = "2.6.0"; }; unicode_utils = { groups = ["default"]; diff --git a/pkgs/by-name/ba/bashly/package.nix b/pkgs/by-name/ba/bashly/package.nix index 5a3d6661caa2..8611d5938935 100644 --- a/pkgs/by-name/ba/bashly/package.nix +++ b/pkgs/by-name/ba/bashly/package.nix @@ -1,31 +1,16 @@ -{ lib -, stdenvNoCC -, bundlerApp +{ + lib, + bundlerApp, + bundlerUpdateScript, }: -let - bashlyBundlerApp = bundlerApp { - pname = "bashly"; - gemdir = ./.; - exes = [ "bashly" ]; - }; -in -stdenvNoCC.mkDerivation (finalAttrs: { - name = "bashly"; +bundlerApp { + pname = "bashly"; - dontUnpack = true; + gemdir = ./.; + exes = [ "bashly" ]; - installPhase = '' - runHook preInstall - - mkdir $out; - cd $out; - - mkdir bin; pushd bin; - ln -vs ${bashlyBundlerApp}/bin/bashly; - - runHook postInstall - ''; + passthru.updateScript = bundlerUpdateScript "bashly"; meta = { description = "Bash command line framework and CLI generator"; @@ -35,4 +20,4 @@ stdenvNoCC.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ drupol ]; platforms = lib.platforms.unix; }; -}) +}