From e9d89ed0eb437200cbae2c868b04a900b8365235 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 27 Mar 2025 12:11:08 -0500 Subject: [PATCH] localized: Migrate ruby admin tools to by-name Migrate to by-name --- .../admin => by-name/fa}/fastlane/Gemfile | 0 .../fa}/fastlane/Gemfile.lock | 10 +- .../admin => by-name/fa}/fastlane/gemset.nix | 33 +++++- .../fa/fastlane/package.nix} | 0 .../admin => by-name/it}/itamae/Gemfile | 0 .../admin => by-name/it}/itamae/Gemfile.lock | 28 +++-- .../admin => by-name/it}/itamae/gemset.nix | 54 ++++++--- .../it/itamae/package.nix} | 0 .../admin => by-name/ox}/oxidized/Gemfile | 0 .../ox}/oxidized/Gemfile.lock | 50 +++++---- .../admin => by-name/ox}/oxidized/gemset.nix | 105 ++++++++++-------- .../ox/oxidized/package.nix} | 0 pkgs/top-level/all-packages.nix | 6 - 13 files changed, 175 insertions(+), 111 deletions(-) rename pkgs/{tools/admin => by-name/fa}/fastlane/Gemfile (100%) rename pkgs/{tools/admin => by-name/fa}/fastlane/Gemfile.lock (97%) rename pkgs/{tools/admin => by-name/fa}/fastlane/gemset.nix (96%) rename pkgs/{tools/admin/fastlane/default.nix => by-name/fa/fastlane/package.nix} (100%) rename pkgs/{tools/admin => by-name/it}/itamae/Gemfile (100%) rename pkgs/{tools/admin => by-name/it}/itamae/Gemfile.lock (61%) rename pkgs/{tools/admin => by-name/it}/itamae/gemset.nix (71%) rename pkgs/{tools/admin/itamae/default.nix => by-name/it/itamae/package.nix} (100%) rename pkgs/{tools/admin => by-name/ox}/oxidized/Gemfile (100%) rename pkgs/{tools/admin => by-name/ox}/oxidized/Gemfile.lock (76%) rename pkgs/{tools/admin => by-name/ox}/oxidized/gemset.nix (80%) rename pkgs/{tools/admin/oxidized/default.nix => by-name/ox/oxidized/package.nix} (100%) diff --git a/pkgs/tools/admin/fastlane/Gemfile b/pkgs/by-name/fa/fastlane/Gemfile similarity index 100% rename from pkgs/tools/admin/fastlane/Gemfile rename to pkgs/by-name/fa/fastlane/Gemfile diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/by-name/fa/fastlane/Gemfile.lock similarity index 97% rename from pkgs/tools/admin/fastlane/Gemfile.lock rename to pkgs/by-name/fa/fastlane/Gemfile.lock index 50f4212ec318..e19da6e89c5d 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/by-name/fa/fastlane/Gemfile.lock @@ -5,18 +5,20 @@ GEM base64 nkf rexml + abbrev (0.1.2) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) artifactory (3.0.17) atomos (0.1.3) aws-eventstream (1.3.2) - aws-partitions (1.1068.0) - aws-sdk-core (3.220.1) + aws-partitions (1.1075.0) + aws-sdk-core (3.221.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) base64 jmespath (~> 1, >= 1.6.1) + logger aws-sdk-kms (1.99.0) aws-sdk-core (~> 3, >= 3.216.0) aws-sigv4 (~> 1.5) @@ -159,6 +161,7 @@ GEM json (2.10.2) jwt (2.10.1) base64 + logger (1.7.0) mini_magick (4.13.2) mini_mime (1.1.5) multi_json (1.15.0) @@ -209,7 +212,7 @@ GEM colored2 (~> 3.1) nanaimo (~> 0.4.0) rexml (>= 3.3.6, < 4.0) - xcpretty (0.4.0) + xcpretty (0.4.1) rouge (~> 3.28.0) xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) @@ -218,6 +221,7 @@ PLATFORMS ruby DEPENDENCIES + abbrev (~> 0.1.2) fastlane BUNDLED WITH diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/by-name/fa/fastlane/gemset.nix similarity index 96% rename from pkgs/tools/admin/fastlane/gemset.nix rename to pkgs/by-name/fa/fastlane/gemset.nix index 7565ccee0a62..2d5101d1b85f 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/by-name/fa/fastlane/gemset.nix @@ -1,4 +1,14 @@ { + abbrev = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0hj2qyx7rzpc7awhvqlm597x7qdxwi4kkml4aqnp5jylmsm4w6xd"; + type = "gem"; + }; + version = "0.1.2"; + }; addressable = { dependencies = [ "public_suffix" ]; groups = [ "default" ]; @@ -45,10 +55,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lmnx4sa9wm9ffqsjbybxzlgz6h4clf96s694sdn2lz1qcx0fq2i"; + sha256 = "1jb72jj18a9l98ghmi8ny9nys4w3hcny0xyi0dzl3ms0knsrrn3i"; type = "gem"; }; - version = "1.1068.0"; + version = "1.1075.0"; }; aws-sdk-core = { dependencies = [ @@ -57,15 +67,16 @@ "aws-sigv4" "base64" "jmespath" + "logger" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0cjdqmy5hjbgzc0iac1i143va76qgp7jc7hg1aviy1n8cgywq44y"; + sha256 = "0jmd8rf68jf99ksklwaflym07issvr1il1qpzmpaf59avhcxgjjy"; type = "gem"; }; - version = "3.220.1"; + version = "3.221.0"; }; aws-sdk-kms = { dependencies = [ @@ -673,6 +684,16 @@ }; version = "2.10.1"; }; + logger = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr"; + type = "gem"; + }; + version = "1.7.0"; + }; mini_magick = { groups = [ "default" ]; platforms = [ ]; @@ -1034,10 +1055,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1lbwk77g28jjhin3qjrh7ldfsgf7aszi9j60mp8yz10i3wyqgvqj"; + sha256 = "14iqgwrdfzc00b3dc5pal4gm9n7w5hn3wdgmsvirwn7n47km0k5i"; type = "gem"; }; - version = "0.4.0"; + version = "0.4.1"; }; xcpretty-travis-formatter = { dependencies = [ "xcpretty" ]; diff --git a/pkgs/tools/admin/fastlane/default.nix b/pkgs/by-name/fa/fastlane/package.nix similarity index 100% rename from pkgs/tools/admin/fastlane/default.nix rename to pkgs/by-name/fa/fastlane/package.nix diff --git a/pkgs/tools/admin/itamae/Gemfile b/pkgs/by-name/it/itamae/Gemfile similarity index 100% rename from pkgs/tools/admin/itamae/Gemfile rename to pkgs/by-name/it/itamae/Gemfile diff --git a/pkgs/tools/admin/itamae/Gemfile.lock b/pkgs/by-name/it/itamae/Gemfile.lock similarity index 61% rename from pkgs/tools/admin/itamae/Gemfile.lock rename to pkgs/by-name/it/itamae/Gemfile.lock index 0d5e3792a658..0dad58c0fb5a 100644 --- a/pkgs/tools/admin/itamae/Gemfile.lock +++ b/pkgs/by-name/it/itamae/Gemfile.lock @@ -2,12 +2,14 @@ GEM remote: https://rubygems.org/ specs: ansi (1.5.0) - bcrypt_pbkdf (1.1.0) - docker-api (2.2.0) - excon (>= 0.47.0) + base64 (0.2.0) + bcrypt_pbkdf (1.1.1) + docker-api (2.4.0) + excon (>= 0.64.0) multi_json ed25519 (1.3.0) - excon (0.99.0) + excon (1.2.5) + logger hashie (5.0.0) itamae (1.14.1) ansi @@ -15,22 +17,24 @@ GEM schash (~> 0.1.0) specinfra (>= 2.64.0, < 3.0.0) thor (>= 1.0.0) + logger (1.7.0) multi_json (1.15.0) - net-scp (4.0.0) + net-scp (4.1.0) net-ssh (>= 2.6.5, < 8.0.0) - net-ssh (7.0.1) - net-telnet (0.1.1) + net-ssh (7.3.0) + net-telnet (0.2.0) schash (0.1.2) sfl (2.3) - specinfra (2.84.1) + specinfra (2.92.0) + base64 net-scp net-ssh (>= 2.7) - net-telnet (= 0.1.1) + net-telnet sfl - thor (1.2.1) + thor (1.3.2) PLATFORMS - aarch64-linux + ruby DEPENDENCIES bcrypt_pbkdf @@ -39,4 +43,4 @@ DEPENDENCIES itamae BUNDLED WITH - 2.3.26 + 2.6.2 diff --git a/pkgs/tools/admin/itamae/gemset.nix b/pkgs/by-name/it/itamae/gemset.nix similarity index 71% rename from pkgs/tools/admin/itamae/gemset.nix rename to pkgs/by-name/it/itamae/gemset.nix index f0accad4dd10..a9abf91ee919 100644 --- a/pkgs/tools/admin/itamae/gemset.nix +++ b/pkgs/by-name/it/itamae/gemset.nix @@ -9,15 +9,25 @@ }; version = "1.5.0"; }; + base64 = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; + }; bcrypt_pbkdf = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ndamfaivnkhc6hy0yqyk2gkwr6f3bz6216lh74hsiiyk3axz445"; + sha256 = "04rb3rp9bdxn1y3qiflfpj7ccwb8ghrfbydh5vfz1l9px3fpg41g"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; docker-api = { dependencies = [ @@ -28,10 +38,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0g7dbniz15b3l2sy6xh0j0998dr5jypf3xg3bsygp0108vv7waxy"; + sha256 = "1rk3vpc7v8jrz432l24bgszwnjj1nsaygj79kcc1i1ycyhsffjw2"; type = "gem"; }; - version = "2.2.0"; + version = "2.4.0"; }; ed25519 = { groups = [ "default" ]; @@ -44,14 +54,15 @@ version = "1.3.0"; }; excon = { + dependencies = [ "logger" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0j826kfvzn7nc5pv950n270r0sx1702k988ad11cdlav3dcxxw09"; + sha256 = "17asr18vawi08g3wbif0wdi8bnyj01d125saydl9j1f03fv0n16a"; type = "gem"; }; - version = "0.99.0"; + version = "1.2.5"; }; hashie = { groups = [ "default" ]; @@ -80,6 +91,16 @@ }; version = "1.14.1"; }; + logger = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr"; + type = "gem"; + }; + version = "1.7.0"; + }; multi_json = { groups = [ "default" ]; platforms = [ ]; @@ -96,30 +117,30 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1si2nq9l6jy5n2zw1q59a5gaji7v9vhy8qx08h4fg368906ysbdk"; + sha256 = "0p8s7l4pr6hkn0l6rxflsc11alwi1kfg5ysgvsq61lz5l690p6x9"; type = "gem"; }; - version = "4.0.0"; + version = "4.1.0"; }; net-ssh = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1qp3i8bi7ji1np0530bp2p9zrrn6galvmbsivxwpkjdpjdyn19sr"; + sha256 = "1w1ypxa3n6mskkwb00b489314km19l61p5h3bar6zr8cng27c80p"; type = "gem"; }; - version = "7.0.1"; + version = "7.3.0"; }; net-telnet = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "13qxznpwmc3hs51b76wqx2w29r158gzzh8719kv2gpi56844c8fx"; + sha256 = "16nkxc79nqm7fd6w1fba4kb98vpgwnyfnlwxarpdcgywz300fc15"; type = "gem"; }; - version = "0.1.1"; + version = "0.2.0"; }; schash = { groups = [ "default" ]; @@ -143,6 +164,7 @@ }; specinfra = { dependencies = [ + "base64" "net-scp" "net-ssh" "net-telnet" @@ -152,19 +174,19 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1qzhb7k66gi375ymnkwiy4alr7jw2c9ih7hv1lv5j5nda10hfb1p"; + sha256 = "0aswlmhh152c974i8bn8d90kjbwadp0bjgs9kgpxxb3vffsfxc1w"; type = "gem"; }; - version = "2.84.1"; + version = "2.92.0"; }; thor = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; + sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f"; type = "gem"; }; - version = "1.2.1"; + version = "1.3.2"; }; } diff --git a/pkgs/tools/admin/itamae/default.nix b/pkgs/by-name/it/itamae/package.nix similarity index 100% rename from pkgs/tools/admin/itamae/default.nix rename to pkgs/by-name/it/itamae/package.nix diff --git a/pkgs/tools/admin/oxidized/Gemfile b/pkgs/by-name/ox/oxidized/Gemfile similarity index 100% rename from pkgs/tools/admin/oxidized/Gemfile rename to pkgs/by-name/ox/oxidized/Gemfile diff --git a/pkgs/tools/admin/oxidized/Gemfile.lock b/pkgs/by-name/ox/oxidized/Gemfile.lock similarity index 76% rename from pkgs/tools/admin/oxidized/Gemfile.lock rename to pkgs/by-name/ox/oxidized/Gemfile.lock index a08c4ef149bd..660cf7cdb813 100644 --- a/pkgs/tools/admin/oxidized/Gemfile.lock +++ b/pkgs/by-name/ox/oxidized/Gemfile.lock @@ -14,7 +14,7 @@ GEM base64 (0.2.0) bcrypt_pbkdf (1.1.1) charlock_holmes (0.7.9) - date (3.3.4) + date (3.4.1) ed25519 (1.3.0) emk-sinatra-url-for (0.2.1) sinatra (>= 0.9.1.1) @@ -23,20 +23,21 @@ GEM thor tilt htmlentities (4.3.4) - json (2.7.2) + json (2.10.2) + logger (1.7.0) multi_json (1.15.0) - mustermann (3.0.0) + mustermann (3.0.3) ruby2_keywords (~> 0.0.1) - net-ftp (0.3.7) + net-ftp (0.3.8) net-protocol time net-protocol (0.2.2) timeout - net-scp (4.0.0) + net-scp (4.1.0) net-ssh (>= 2.6.5, < 8.0.0) - net-ssh (7.2.3) + net-ssh (7.3.0) net-telnet (0.2.0) - nio4r (2.7.3) + nio4r (2.7.4) oxidized (0.30.1) asetus (~> 0.1) bcrypt_pbkdf (~> 1.0) @@ -59,38 +60,41 @@ GEM sinatra (>= 1.4.6, < 5.0) sinatra-contrib (>= 1.4.6, < 5.0) psych (3.3.4) - puma (6.4.2) + puma (6.4.3) nio4r (~> 2.0) - rack (3.1.7) - rack-protection (4.0.0) + rack (3.1.12) + rack-protection (4.1.1) base64 (>= 0.1.0) + logger (>= 1.6.0) rack (>= 3.0.0, < 4) - rack-session (2.0.0) + rack-session (2.1.0) + base64 (>= 0.1.0) rack (>= 3.0.0) ruby2_keywords (0.0.5) - rugged (1.7.2) - sinatra (4.0.0) + rugged (1.9.0) + sinatra (4.1.1) + logger (>= 1.6.0) mustermann (~> 3.0) rack (>= 3.0.0, < 4) - rack-protection (= 4.0.0) + rack-protection (= 4.1.1) rack-session (>= 2.0.0, < 3) tilt (~> 2.0) - sinatra-contrib (4.0.0) + sinatra-contrib (4.1.1) multi_json (>= 0.0.2) mustermann (~> 3.0) - rack-protection (= 4.0.0) - sinatra (= 4.0.0) + rack-protection (= 4.1.1) + sinatra (= 4.1.1) tilt (~> 2.0) slop (4.10.1) temple (0.10.3) - thor (1.3.1) - tilt (2.4.0) - time (0.3.0) + thor (1.3.2) + tilt (2.6.0) + time (0.4.1) date - timeout (0.4.1) + timeout (0.4.3) PLATFORMS - x86_64-linux + ruby DEPENDENCIES oxidized (= 0.30.1) @@ -99,4 +103,4 @@ DEPENDENCIES psych (~> 3.3.2) BUNDLED WITH - 2.5.9 + 2.6.2 diff --git a/pkgs/tools/admin/oxidized/gemset.nix b/pkgs/by-name/ox/oxidized/gemset.nix similarity index 80% rename from pkgs/tools/admin/oxidized/gemset.nix rename to pkgs/by-name/ox/oxidized/gemset.nix index e392920b7743..3bbb47bc3d0c 100644 --- a/pkgs/tools/admin/oxidized/gemset.nix +++ b/pkgs/by-name/ox/oxidized/gemset.nix @@ -44,10 +44,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "149jknsq999gnhy865n33fkk22s0r447k76x9pmcnnwldfv2q7wp"; + sha256 = "0kz6mc4b9m49iaans6cbx031j9y7ldghpi5fzsdh0n3ixwa8w9mz"; type = "gem"; }; - version = "3.3.4"; + version = "3.4.1"; }; ed25519 = { groups = [ "default" ]; @@ -100,10 +100,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q"; + sha256 = "01lbdaizhkxmrw4y8j3wpvsryvnvzmg0pfs56c52laq2jgdfmq1l"; type = "gem"; }; - version = "2.7.2"; + version = "2.10.2"; + }; + logger = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr"; + type = "gem"; + }; + version = "1.7.0"; }; multi_json = { groups = [ "default" ]; @@ -121,10 +131,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0rwbq20s2gdh8dljjsgj5s6wqqfmnbclhvv2c2608brv7jm6jdbd"; + sha256 = "123ycmq6pkivv29bqbv79jv2cs04xakzd0fz1lalgvfs5nxfky6i"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.3"; }; net-ftp = { dependencies = [ @@ -135,10 +145,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1vhwqx8k5xscl6j6gdf1xs1lz6fwm8k8s1n7pwhk22cxnxcfmnnh"; + sha256 = "0kw7g0j35fla8438s90m72b3xr0mqnpgm910qcwrgnvyg903xmi8"; type = "gem"; }; - version = "0.3.7"; + version = "0.3.8"; }; net-protocol = { dependencies = [ "timeout" ]; @@ -157,20 +167,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1si2nq9l6jy5n2zw1q59a5gaji7v9vhy8qx08h4fg368906ysbdk"; + sha256 = "0p8s7l4pr6hkn0l6rxflsc11alwi1kfg5ysgvsq61lz5l690p6x9"; type = "gem"; }; - version = "4.0.0"; + version = "4.1.0"; }; net-ssh = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0sqbq5aks9xxnldbd2hy20ypnd59zcra98ql0r7jjc26s5rgc18n"; + sha256 = "1w1ypxa3n6mskkwb00b489314km19l61p5h3bar6zr8cng27c80p"; type = "gem"; }; - version = "7.2.3"; + version = "7.3.0"; }; net-telnet = { groups = [ "default" ]; @@ -187,10 +197,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "017nbw87dpr4wyk81cgj8kxkxqgsgblrkxnmmadc77cg9gflrfal"; + sha256 = "1a9www524fl1ykspznz54i0phfqya4x45hqaz67in9dvw1lfwpfr"; type = "gem"; }; - version = "2.7.3"; + version = "2.7.4"; }; oxidized = { dependencies = [ @@ -267,22 +277,37 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0i2vaww6qcazj0ywva1plmjnj6rk23b01szswc5jhcq7s2cikd1y"; + sha256 = "0gml1rixrfb0naciq3mrnqkpcvm9ahgps1c04hzxh4b801f69914"; type = "gem"; }; - version = "6.4.2"; + version = "6.4.3"; }; rack = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "12z55b90vvr4sh93az2yfr3fg91jivsag8lcg0k360d99vdq568f"; + sha256 = "0h65a1f9gsqx2ryisdy4lrd9a9l8gdv65dcscw9ynwwjr1ak1n00"; type = "gem"; }; - version = "3.1.7"; + version = "3.1.12"; }; rack-protection = { + dependencies = [ + "base64" + "logger" + "rack" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0sniswjyi0yn949l776h7f67rvx5w9f04wh69z5g19vlsnjm98ji"; + type = "gem"; + }; + version = "4.1.1"; + }; + rack-session = { dependencies = [ "base64" "rack" @@ -291,21 +316,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1xmvcxgm1jq92hqxm119gfk95wzl0d46nb2c2c6qqsm4ra2n3nyh"; + sha256 = "1452c1bhh6fdnv17s1z65ajwh08axqnlmkhnr1qyyn2vacb3jz23"; type = "gem"; }; - version = "4.0.0"; - }; - rack-session = { - dependencies = [ "rack" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "10afdpmy9kh0qva96slcyc59j4gkk9av8ilh58cnj0qq7q3b416v"; - type = "gem"; - }; - version = "2.0.0"; + version = "2.1.0"; }; ruby2_keywords = { groups = [ "default" ]; @@ -322,13 +336,14 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1sccng15h8h3mcjxfgvxy85lfpswbj0nhmzwwsqdffbzqgsb2jch"; + sha256 = "1b7gcf6pxg4x607bica68dbz22b4kch33yi0ils6x3c8ql9akakz"; type = "gem"; }; - version = "1.7.2"; + version = "1.9.0"; }; sinatra = { dependencies = [ + "logger" "mustermann" "rack" "rack-protection" @@ -339,10 +354,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0za92lv4s7xhgkkm6xxf7ib0b3bsyj8drxgkrskgsb5g3mxnixjl"; + sha256 = "002dkzdc1xqhvz5sdnj4vb0apczhs07mnpgq4kkd5dd1ka2pp6af"; type = "gem"; }; - version = "4.0.0"; + version = "4.1.1"; }; sinatra-contrib = { dependencies = [ @@ -356,10 +371,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0r9khg85m60w0i77jpnm2irh9m4k0ia4mlicapj8dr7s6ykqd9dh"; + sha256 = "1giziwf8mgki581jf40zzw3dhjkkmdg3yxbrahj9krd5h24vb90y"; type = "gem"; }; - version = "4.0.0"; + version = "4.1.1"; }; slop = { groups = [ "default" ]; @@ -386,20 +401,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps"; + sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.2"; }; tilt = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0kds7wkxmb038cwp6ravnwn8k65ixc68wpm8j5jx5bhx8ndg4x6z"; + sha256 = "0szpapi229v3scrvw1pgy0vpjm7z3qlf58m1198kxn70cs278g96"; type = "gem"; }; - version = "2.4.0"; + version = "2.6.0"; }; time = { dependencies = [ "date" ]; @@ -407,19 +422,19 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0c15v19hyxjcfzaviqlwhgajgyrrlb0pjilza6mkv49bhspy6av6"; + sha256 = "0qgarmdyqypzsaanf4w9vqrd9axrcrjqilxwrfmxp954102kcpq3"; type = "gem"; }; - version = "0.3.0"; + version = "0.4.1"; }; timeout = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "16mvvsmx90023wrhf8dxc1lpqh0m8alk65shb7xcya6a9gflw7vg"; + sha256 = "03p31w5ghqfsbz5mcjzvwgkw3h9lbvbknqvrdliy8pxmn9wz02cm"; type = "gem"; }; - version = "0.4.1"; + version = "0.4.3"; }; } diff --git a/pkgs/tools/admin/oxidized/default.nix b/pkgs/by-name/ox/oxidized/package.nix similarity index 100% rename from pkgs/tools/admin/oxidized/default.nix rename to pkgs/by-name/ox/oxidized/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 966a08bebffb..4350314eb7a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3174,8 +3174,6 @@ with pkgs; inherit (darwin) autoSignDarwinBinariesHook; }; - fastlane = callPackage ../tools/admin/fastlane { }; - fontmatrix = libsForQt5.callPackage ../applications/graphics/fontmatrix { }; fox = callPackage ../development/libraries/fox {}; @@ -4362,8 +4360,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) VideoDecodeAcceleration; }; - oxidized = callPackage ../tools/admin/oxidized { }; - p4c = callPackage ../development/compilers/p4c { protobuf = protobuf_21; }; @@ -17103,8 +17099,6 @@ with pkgs; image_optim = callPackage ../applications/graphics/image_optim { inherit (nodePackages) svgo; }; - itamae = callPackage ../tools/admin/itamae { }; - # using the new configuration style proposal which is unstable jack1 = callPackage ../misc/jackaudio/jack1.nix { };