From ab0bd8ca527f9e21a80562f39eb4a5a9a565780a Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 24 Mar 2024 15:48:22 +0100 Subject: [PATCH 01/14] puppet-lint: add meta, passthru.{tests,updateScript} --- .../tools/puppet/puppet-lint/default.nix | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/puppet/puppet-lint/default.nix b/pkgs/development/tools/puppet/puppet-lint/default.nix index 2940605b1b08..588d9f0c86fa 100644 --- a/pkgs/development/tools/puppet/puppet-lint/default.nix +++ b/pkgs/development/tools/puppet/puppet-lint/default.nix @@ -1,7 +1,30 @@ -{ bundlerApp }: +{ + bundlerApp, + bundlerUpdateScript, + lib, + puppet-lint, + testers, +}: bundlerApp { pname = "puppet-lint"; gemdir = ./.; exes = [ "puppet-lint" ]; + + passthru = { + tests.version = testers.testVersion { + package = puppet-lint; + version = (import ./gemset.nix).puppet-lint.version; + }; + updateScript = bundlerUpdateScript "puppet-lint"; + }; + + meta = { + description = "Checks Puppet code against the recommended Puppet language style guide"; + homepage = "https://github.com/puppetlabs/puppet-lint"; + changelog = "https://github.com/puppetlabs/puppet-lint/blob/main/CHANGELOG.md"; + license = lib.licenses.mit; + mainProgram = "puppet-lint"; + maintainers = with lib.maintainers; [ anthonyroussel ]; + }; } From 1e2f6ebbedc567823c188b256c7e55fc9612f51d Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 24 Mar 2024 15:57:25 +0100 Subject: [PATCH 02/14] puppet-lint: 2.5.2 -> 4.2.4 https://github.com/puppetlabs/puppet-lint/compare/2.5.2...v4.2.4 --- pkgs/development/tools/puppet/puppet-lint/Gemfile.lock | 4 ++-- pkgs/development/tools/puppet/puppet-lint/gemset.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock b/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock index 7569b5e2d13c..61842458aa5b 100644 --- a/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock +++ b/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - puppet-lint (2.5.2) + puppet-lint (4.2.4) PLATFORMS ruby @@ -10,4 +10,4 @@ DEPENDENCIES puppet-lint BUNDLED WITH - 2.2.24 + 2.5.6 diff --git a/pkgs/development/tools/puppet/puppet-lint/gemset.nix b/pkgs/development/tools/puppet/puppet-lint/gemset.nix index e3911e63536a..f936a39af0a0 100644 --- a/pkgs/development/tools/puppet/puppet-lint/gemset.nix +++ b/pkgs/development/tools/puppet/puppet-lint/gemset.nix @@ -4,9 +4,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rcj3cb6lf90g6vvhh3c9p8yn7pgibglf9k5878bzd6pn5ag0h9v"; + sha256 = "1n2pffwxj1n33hc7aw74g6a4gn5v7rawcs7rglidbdq1g4kzd829"; type = "gem"; }; - version = "2.5.2"; + version = "4.2.4"; }; } From 5b7b5e9e1df432451ae1d955537b4b9d96bd2233 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 24 Mar 2024 15:59:39 +0100 Subject: [PATCH 03/14] puppet-lint: move to pkgs/by-name --- .../tools/puppet => by-name/pu}/puppet-lint/Gemfile | 0 .../tools/puppet => by-name/pu}/puppet-lint/Gemfile.lock | 0 .../tools/puppet => by-name/pu}/puppet-lint/gemset.nix | 0 .../default.nix => by-name/pu/puppet-lint/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{development/tools/puppet => by-name/pu}/puppet-lint/Gemfile (100%) rename pkgs/{development/tools/puppet => by-name/pu}/puppet-lint/Gemfile.lock (100%) rename pkgs/{development/tools/puppet => by-name/pu}/puppet-lint/gemset.nix (100%) rename pkgs/{development/tools/puppet/puppet-lint/default.nix => by-name/pu/puppet-lint/package.nix} (100%) diff --git a/pkgs/development/tools/puppet/puppet-lint/Gemfile b/pkgs/by-name/pu/puppet-lint/Gemfile similarity index 100% rename from pkgs/development/tools/puppet/puppet-lint/Gemfile rename to pkgs/by-name/pu/puppet-lint/Gemfile diff --git a/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock b/pkgs/by-name/pu/puppet-lint/Gemfile.lock similarity index 100% rename from pkgs/development/tools/puppet/puppet-lint/Gemfile.lock rename to pkgs/by-name/pu/puppet-lint/Gemfile.lock diff --git a/pkgs/development/tools/puppet/puppet-lint/gemset.nix b/pkgs/by-name/pu/puppet-lint/gemset.nix similarity index 100% rename from pkgs/development/tools/puppet/puppet-lint/gemset.nix rename to pkgs/by-name/pu/puppet-lint/gemset.nix diff --git a/pkgs/development/tools/puppet/puppet-lint/default.nix b/pkgs/by-name/pu/puppet-lint/package.nix similarity index 100% rename from pkgs/development/tools/puppet/puppet-lint/default.nix rename to pkgs/by-name/pu/puppet-lint/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 690d87da8118..2581d85eeba0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19532,8 +19532,6 @@ with pkgs; puppet-bolt = callPackage ../tools/admin/puppet/puppet-bolt { }; - puppet-lint = callPackage ../development/tools/puppet/puppet-lint { }; - puppeteer-cli = callPackage ../tools/graphics/puppeteer-cli { }; pyrseas = callPackage ../development/tools/database/pyrseas { }; From 2e1fe503f85c2244328c3a5df239bbf63e6c6976 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 24 Mar 2024 16:18:33 +0100 Subject: [PATCH 04/14] puppet-bolt: 3.24.0 -> 3.28.0 https://github.com/puppetlabs/bolt/compare/3.24.0...3.28.0 --- .../admin/puppet/puppet-bolt/Gemfile.lock | 152 +++++----- .../tools/admin/puppet/puppet-bolt/gemset.nix | 278 +++++++++++------- 2 files changed, 247 insertions(+), 183 deletions(-) diff --git a/pkgs/tools/admin/puppet/puppet-bolt/Gemfile.lock b/pkgs/tools/admin/puppet/puppet-bolt/Gemfile.lock index d5c402330b3e..a0156a8912e4 100644 --- a/pkgs/tools/admin/puppet/puppet-bolt/Gemfile.lock +++ b/pkgs/tools/admin/puppet/puppet-bolt/Gemfile.lock @@ -1,24 +1,29 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (2.3.6) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - aws-eventstream (1.2.0) - aws-partitions (1.607.0) - aws-sdk-core (3.131.2) - aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.525.0) - aws-sigv4 (~> 1.1) + CFPropertyList (3.0.7) + base64 + nkf + rexml + addressable (2.8.6) + public_suffix (>= 2.0.2, < 6.0) + aws-eventstream (1.3.0) + aws-partitions (1.899.0) + aws-sdk-core (3.191.4) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.322.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-ec2 (1.444.0) + aws-sdk-core (~> 3, >= 3.191.0) aws-sigv4 (~> 1.1) - aws-sigv4 (1.5.0) + aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) - bindata (2.4.10) - bolt (3.24.0) - CFPropertyList (~> 2.2) + base64 (0.2.0) + bigdecimal (3.1.7) + bindata (2.5.0) + bolt (3.28.0) + CFPropertyList (>= 2.2) addressable (~> 2.5) aws-sdk-ec2 (~> 1) concurrent-ruby (~> 1.0) @@ -27,14 +32,14 @@ GEM jwt (~> 2.2) logging (~> 2.2) minitar (~> 0.6) - net-scp (~> 1.2) - net-ssh (>= 4.0, < 7.0) + net-scp (>= 1.2, < 5.0) + net-ssh (>= 4.0, < 8.0) net-ssh-krb (~> 0.5) orchestrator_client (~> 0.5) puppet (>= 6.18.0) puppet-resource_api (>= 1.8.1) - puppet-strings (~> 2.3) - puppetfile-resolver (~> 0.5) + puppet-strings (>= 2.3.0, < 5.0) + puppetfile-resolver (>= 0.6.2, < 1.0) r10k (~> 3.10) ruby_smb (~> 1.0) terminal-table (~> 3.0) @@ -42,15 +47,15 @@ GEM winrm-fs (~> 1.3) builder (3.2.4) colored2 (3.1.2) - concurrent-ruby (1.1.10) - connection_pool (2.2.5) + concurrent-ruby (1.2.3) + connection_pool (2.4.1) cri (2.15.11) deep_merge (1.2.2) - erubi (1.10.0) - facter (4.2.10) + erubi (1.12.0) + facter (4.6.1) hocon (~> 1.3) thor (>= 1.0.1, < 2.0) - faraday (1.10.0) + faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -75,31 +80,34 @@ GEM faraday-retry (1.0.3) faraday_middleware (1.2.0) faraday (~> 1.0) - fast_gettext (1.1.2) - ffi (1.15.5) - gettext (3.2.9) + fast_gettext (2.3.0) + ffi (1.16.3) + forwardable (1.3.3) + gettext (3.4.9) + erubi locale (>= 2.0.5) + prime + racc text (>= 1.3.0) - gettext-setup (0.34) - fast_gettext (~> 1.1.0) - gettext (>= 3.0.2, < 3.3.0) + gettext-setup (1.1.0) + fast_gettext (~> 2.1) + gettext (~> 3.4) locale gssapi (1.3.1) ffi (>= 1.0.1) gyoku (1.4.0) builder (>= 2.1.2) rexml (~> 3.0) - hiera (3.9.0) - hiera-eyaml (3.3.0) + hiera-eyaml (3.4.0) highline optimist - highline (2.0.3) - hocon (1.3.1) + highline (3.0.1) + hocon (1.4.0) httpclient (2.8.3) - jmespath (1.6.1) - jwt (2.2.3) + jmespath (1.6.2) + jwt (2.7.1) little-plugger (1.1.4) - locale (2.1.3) + locale (2.1.4) log4r (1.1.10) logging (2.3.1) little-plugger (~> 1.1) @@ -107,58 +115,63 @@ GEM minitar (0.9) molinillo (0.8.0) multi_json (1.15.0) - multipart-post (2.2.3) - net-http-persistent (4.0.1) + multipart-post (2.4.0) + net-http-persistent (4.0.2) connection_pool (~> 2.2) - net-scp (1.2.1) - net-ssh (>= 2.6.5) - net-ssh (6.1.0) + net-scp (4.0.0) + net-ssh (>= 2.6.5, < 8.0.0) + net-ssh (7.2.1) net-ssh-krb (0.5.1) gssapi (~> 1.3.0) net-ssh (>= 2.0) - nori (2.6.0) - optimist (3.0.1) - orchestrator_client (0.6.1) + nkf (0.2.0) + nori (2.7.0) + bigdecimal + optimist (3.1.0) + orchestrator_client (0.7.0) faraday (~> 1.4) net-http-persistent (~> 4.0) - public_suffix (4.0.7) - puppet (7.17.0) + prime (0.1.2) + forwardable + singleton + public_suffix (5.0.4) + puppet (8.5.1) concurrent-ruby (~> 1.0) deep_merge (~> 1.0) - facter (> 2.0.1, < 5) - fast_gettext (>= 1.1, < 3) - hiera (>= 3.2.1, < 4) + facter (>= 4.3.0, < 5) + fast_gettext (>= 2.1, < 3) locale (~> 2.1) - multi_json (~> 1.10) + multi_json (~> 1.13) puppet-resource_api (~> 1.5) scanf (~> 1.0) semantic_puppet (~> 1.0) - puppet-resource_api (1.8.14) + puppet-resource_api (1.9.0) hocon (>= 1.0) - puppet-strings (2.9.0) - rgen - yard (~> 0.9.5) + puppet-strings (4.1.2) + rgen (~> 0.9) + yard (~> 0.9) puppet_forge (3.2.0) faraday (~> 1.3) faraday_middleware (~> 1.0) minitar semantic_puppet (~> 1.0) - puppetfile-resolver (0.6.1) + puppetfile-resolver (0.6.3) molinillo (~> 0.6) semantic_puppet (~> 1.0) - r10k (3.15.0) + r10k (3.16.0) colored2 (= 3.1.2) cri (>= 2.15.10) fast_gettext (>= 1.1.0, < 3.0.0) gettext (>= 3.0.2, < 4.0.0) - gettext-setup (~> 0.24) - jwt (~> 2.2.3) + gettext-setup (>= 0.24, < 2.0.0) + jwt (>= 2.2.3, < 2.8.0) log4r (= 1.1.10) minitar (~> 0.9) multi_json (~> 1.10) - puppet_forge (>= 2.3.0) - rexml (3.2.5) - rgen (0.9.0) + puppet_forge (>= 2.3.0, < 4.0.0) + racc (1.7.3) + rexml (3.2.6) + rgen (0.9.1) ruby2_keywords (0.0.5) ruby_smb (1.1.0) bindata @@ -167,14 +180,14 @@ GEM rubyntlm (0.6.3) rubyzip (2.3.2) scanf (1.0.0) - semantic_puppet (1.0.4) + semantic_puppet (1.1.0) + singleton (0.2.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) text (1.3.1) - thor (1.2.1) - unicode-display_width (2.2.0) - webrick (1.7.0) - windows_error (0.1.4) + thor (1.3.1) + unicode-display_width (2.5.0) + windows_error (0.1.5) winrm (2.3.6) builder (>= 2.1.2) erubi (~> 1.8) @@ -189,8 +202,7 @@ GEM logging (>= 1.6.1, < 3.0) rubyzip (~> 2.0) winrm (~> 2.0) - yard (0.9.28) - webrick (~> 1.7.0) + yard (0.9.36) PLATFORMS ruby @@ -199,4 +211,4 @@ DEPENDENCIES bolt BUNDLED WITH - 2.3.9 + 2.5.6 diff --git a/pkgs/tools/admin/puppet/puppet-bolt/gemset.nix b/pkgs/tools/admin/puppet/puppet-bolt/gemset.nix index fc02ba396183..df8e2c3fb8ce 100644 --- a/pkgs/tools/admin/puppet/puppet-bolt/gemset.nix +++ b/pkgs/tools/admin/puppet/puppet-bolt/gemset.nix @@ -5,30 +5,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; + sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.6"; }; aws-eventstream = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz"; + sha256 = "0gvdg4yx4p9av2glmp7vsxhs0n8fj1ga9kq2xdb8f95j7b04qhzi"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; aws-partitions = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0af0fv57wgnzn4sjbhwd504dina62i60by3npl14ad4bc2aw7pnc"; + sha256 = "0mydgvc5wn4adsic86907hzyfhgvzaq6nr394pnvk83ryv4zx77p"; type = "gem"; }; - version = "1.607.0"; + version = "1.899.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -36,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "164abp3cvmvfa2qsgzbxvkafbhwbgn3qwknp0amwmxw5nwvz8p3s"; + sha256 = "0dlalj0pw6nfmmfqddjj8b5rv6lq1hqdq19im3s8fjq5ln5ij8lr"; type = "gem"; }; - version = "3.131.2"; + version = "3.191.4"; }; aws-sdk-ec2 = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -47,10 +47,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c56an4cmvr1ync8pif588b4alvv8zfchna092xjbdzx4ip1yrfg"; + sha256 = "19gfcb07kvywx9ymdf80k4i3yc61h41cdxnygp7197h92ff4qxhv"; type = "gem"; }; - version = "1.322.0"; + version = "1.444.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -58,20 +58,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xp7diwq7nv4vvxrl9x3lis2l4x6bissrfzbfyy6rv5bmj5w109z"; + sha256 = "1g3w27wzjy4si6kp49w10as6ml6g6zl3xrfqs5ikpfciidv9kpc4"; type = "gem"; }; - version = "1.5.0"; + version = "1.8.0"; + }; + base64 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; + }; + bigdecimal = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cq1c29zbkcxgdihqisirhcw76xc768z2zpd5vbccpq0l1lv76g7"; + type = "gem"; + }; + version = "3.1.7"; }; bindata = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06lqi4svq5qls9f7nnvd2zmjdqmi2sf82sq78ci5d78fq0z5x2vr"; + sha256 = "08r67nglsqnxrbn803szf5bdnqhchhq8kf2by94f37fcl65wpp19"; type = "gem"; }; - version = "2.4.10"; + version = "2.5.0"; }; bolt = { dependencies = ["CFPropertyList" "addressable" "aws-sdk-ec2" "concurrent-ruby" "ffi" "hiera-eyaml" "jwt" "logging" "minitar" "net-scp" "net-ssh" "net-ssh-krb" "orchestrator_client" "puppet" "puppet-resource_api" "puppet-strings" "puppetfile-resolver" "r10k" "ruby_smb" "terminal-table" "winrm" "winrm-fs"]; @@ -79,10 +99,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jshg2b2j24zgkh2nldwjqxm43dz9val6scxsjvq5kg3bwkdrby8"; + sha256 = "1abj694v2asrlzpr68shy3whf73ajk6626zqy6mhmyy8qmg8i19h"; type = "gem"; }; - version = "3.24.0"; + version = "3.28.0"; }; builder = { groups = ["default"]; @@ -95,14 +115,15 @@ version = "3.2.4"; }; CFPropertyList = { + dependencies = ["base64" "nkf" "rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hadm41xr1fq3qp74jd9l5q8l0j9083rgklgzsilllwaav7qrrid"; + sha256 = "0k1w5i4lb1z941m7ds858nly33f3iv12wvr1zav5x3fa99hj2my4"; type = "gem"; }; - version = "2.3.6"; + version = "3.0.7"; }; colored2 = { groups = ["default"]; @@ -119,20 +140,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; + sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; type = "gem"; }; - version = "1.1.10"; + version = "1.2.3"; }; connection_pool = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ffdxhgirgc86qb42yvmfj6v1v0x4lvi0pxn9zhghkff44wzra0k"; + sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g"; type = "gem"; }; - version = "2.2.5"; + version = "2.4.1"; }; cri = { groups = ["default"]; @@ -159,10 +180,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l"; + sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; type = "gem"; }; - version = "1.10.0"; + version = "1.12.0"; }; facter = { dependencies = ["hocon" "thor"]; @@ -170,10 +191,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16xwli99vqj5329wzmf0ifzikllrym46scm9xp28syfygsrz39j0"; + sha256 = "0pxpldfcf40dr9khra3sa131ij7gzd97bba2vpw89c785pl736a7"; type = "gem"; }; - version = "4.2.10"; + version = "4.6.1"; }; faraday = { dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"]; @@ -181,10 +202,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00palwawk897p5gypw5wjrh93d4p0xz2yl9w93yicb4kq7amh8d4"; + sha256 = "1c760q0ks4vj4wmaa7nh1dgvgqiwaw0mjr7v8cymy7i3ffgjxx90"; type = "gem"; }; - version = "1.10.0"; + version = "1.10.3"; }; faraday-em_http = { groups = ["default"]; @@ -303,31 +324,41 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ci71w9jb979c379c7vzm88nc3k6lf68kbrsgw9nlx5g4hng0s78"; + sha256 = "112gsrqah2w03kgi9mjsn6hl74mrwckphf223h36iayc4djf4lq2"; type = "gem"; }; - version = "1.1.2"; + version = "2.3.0"; }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; type = "gem"; }; - version = "1.15.5"; + version = "1.16.3"; }; - gettext = { - dependencies = ["locale" "text"]; + forwardable = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0764vj7gacn0aypm2bf6m46dzjzwzrjlmbyx6qwwwzbmi94r40wr"; + sha256 = "1b5g1i3xdvmxxpq4qp0z4v78ivqnazz26w110fh4cvzsdayz8zgi"; type = "gem"; }; - version = "3.2.9"; + version = "1.3.3"; + }; + gettext = { + dependencies = ["erubi" "locale" "prime" "racc" "text"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16h0kda5z4s4zqygyk0f52xzs9mlz9r4lnhjwk729hhmdbz68a19"; + type = "gem"; + }; + version = "3.4.9"; }; gettext-setup = { dependencies = ["fast_gettext" "gettext" "locale"]; @@ -335,10 +366,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vfnayz20xd8q0sz27816kvgia9z2dpj9fy7z15da239wmmnz7ga"; + sha256 = "1v6liz934gmx1wv1z6bvpim6aanbr66xjhb90lc9z1jxayczmm1a"; type = "gem"; }; - version = "0.34"; + version = "1.1.0"; }; gssapi = { dependencies = ["ffi"]; @@ -362,46 +393,36 @@ }; version = "1.4.0"; }; - hiera = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "01kh882rp9xdy2cx2avax79ywpfxqhnwsn05cxwyiqrhfkk36p4x"; - type = "gem"; - }; - version = "3.9.0"; - }; hiera-eyaml = { dependencies = ["highline" "optimist"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1iydhxavcniprqly7ad8c2413jwvrdf7zjmzl3xxlnkmq9900zf9"; + sha256 = "0m7zr33qfhvwxqx4kh61rabmbkhp3y4ans66kfpgrzjyvj1vdb6d"; type = "gem"; }; - version = "3.3.0"; + version = "3.4.0"; }; highline = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d"; + sha256 = "02ghhvigqbq4252gsi4w8a9klkdkybmbz29ghfp1y6sqzlcb466a"; type = "gem"; }; - version = "2.0.3"; + version = "3.0.1"; }; hocon = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mifv4vfvppfdpkd0cwgy634sj0aplz6ys84sp8s11qrnm6vlnmn"; + sha256 = "106dmzsl1bxkqw5xaif012nwwfr3k9wff32cqc77ibjngknj6477"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.0"; }; httpclient = { groups = ["default"]; @@ -418,20 +439,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0"; + sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.2"; }; jwt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "036i5fc09275ms49mw43mh4i9pwaap778ra2pmx06ipzyyjl6bfs"; + sha256 = "16z11alz13vfc4zs5l3fk6n51n2jw9lskvc4h4prnww0y797qd87"; type = "gem"; }; - version = "2.2.3"; + version = "2.7.1"; }; little-plugger = { groups = ["default"]; @@ -448,10 +469,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0997465kxvpxm92fiwc2b16l49mngk7b68g5k35ify0m3q0yxpdn"; + sha256 = "107pm4ccmla23z963kyjldgngfigvchnv85wr6m69viyxxrrjbsj"; type = "gem"; }; - version = "2.1.3"; + version = "2.1.4"; }; log4r = { groups = ["default"]; @@ -509,10 +530,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n0kvnrcrjn31jb97kcx3wj1f5kkjza7yygfq8rxzf3i57g7jaa6"; + sha256 = "1033p35166d9p97y4vajbbvr13pmkk9zwn7sylxpmk9jrpk8ri67"; type = "gem"; }; - version = "2.2.3"; + version = "2.4.0"; }; net-http-persistent = { dependencies = ["connection_pool"]; @@ -520,10 +541,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yfypmfg1maf20yfd22zzng8k955iylz7iip0mgc9lazw36g8li7"; + sha256 = "0i1as2lgnw7b4jid0gw5glv5hnxz36nmfsbr9rmxbcap72ijgy03"; type = "gem"; }; - version = "4.0.1"; + version = "4.0.2"; }; net-scp = { dependencies = ["net-ssh"]; @@ -531,20 +552,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j"; + sha256 = "1si2nq9l6jy5n2zw1q59a5gaji7v9vhy8qx08h4fg368906ysbdk"; type = "gem"; }; - version = "1.2.1"; + version = "4.0.0"; }; net-ssh = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jp3jgcn8cij407xx9ldb5h9c6jv13jc4cf6kk2idclz43ww21c9"; + sha256 = "1i01340c4i144vvn3x54lc2rb77ch829qipl1rh6rqwm3yxzml9w"; type = "gem"; }; - version = "6.1.0"; + version = "7.2.1"; }; net-ssh-krb = { dependencies = ["gssapi" "net-ssh"]; @@ -557,25 +578,36 @@ }; version = "0.5.1"; }; - nori = { + nkf = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "066wc774a2zp4vrq3k7k8p0fhv30ymqmxma1jj7yg5735zls8agn"; + sha256 = "09piyp2pd74klb9wcn0zw4mb5l0k9wzwppxggxi1yi95l2ym3hgv"; type = "gem"; }; - version = "2.6.0"; + version = "0.2.0"; + }; + nori = { + dependencies = ["bigdecimal"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12wfv36jzc0978ij5c56nnfh5k8ax574njawigs98ysmp1x5s2ql"; + type = "gem"; + }; + version = "2.7.0"; }; optimist = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vg2chy1cfmdj6c1gryl8zvjhhmb3plwgyh1jfnpq4fnfqv7asrk"; + sha256 = "0q4jqq3v1bxlfr9jgqmahnygkvl81lr6s1rhm8qg66c9xr9nz241"; type = "gem"; }; - version = "3.0.1"; + version = "3.1.0"; }; orchestrator_client = { dependencies = ["faraday" "net-http-persistent"]; @@ -583,31 +615,42 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lfispcl4sr1c7am22j55sj5xvsky422b3bh7645j3n12zqg7pp2"; + sha256 = "05jb10gjffrj5wy8ps1chki3n0z734bx1nx7a6wahh7cjnrqqmsg"; type = "gem"; }; - version = "0.6.1"; + version = "0.7.0"; + }; + prime = { + dependencies = ["forwardable" "singleton"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1973kz8lbck6ga5v42f55jk8b8pnbgwp9p67dl1xw15gvz55dsfl"; + type = "gem"; + }; + version = "0.1.2"; }; public_suffix = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb"; + sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m"; type = "gem"; }; - version = "4.0.7"; + version = "5.0.4"; }; puppet = { - dependencies = ["concurrent-ruby" "deep_merge" "facter" "fast_gettext" "hiera" "locale" "multi_json" "puppet-resource_api" "scanf" "semantic_puppet"]; + dependencies = ["concurrent-ruby" "deep_merge" "facter" "fast_gettext" "locale" "multi_json" "puppet-resource_api" "scanf" "semantic_puppet"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lfpmfjc95a7s19h1q0hwjcm6gzgiaxklpayxy32p8c2hzwzjk00"; + sha256 = "1dhax5d40c03n0lffy10mvs0c3mgfqq1dsc3gb5ihgb2l1sbs0a7"; type = "gem"; }; - version = "7.17.0"; + version = "8.5.1"; }; puppet-resource_api = { dependencies = ["hocon"]; @@ -615,10 +658,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dchnnrrx0wd0pcrry5aaqwnbbgvp81g6f3brqhgvkc397kly3lj"; + sha256 = "0rxy5s7hl707x4sc1b4v2yqyii6pkym2gmsam3ri0f0xmmzyg0jb"; type = "gem"; }; - version = "1.8.14"; + version = "1.9.0"; }; puppet-strings = { dependencies = ["rgen" "yard"]; @@ -626,10 +669,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w3rc5swdin44an1l5jgnljv46yflcd2d2zvakd54nvdh0r30ypx"; + sha256 = "0zcs25xxkfymks4knilryfpr8k0v7z3nazdm61v7a1x4rxhs7sxp"; type = "gem"; }; - version = "2.9.0"; + version = "4.1.2"; }; puppet_forge = { dependencies = ["faraday" "faraday_middleware" "minitar" "semantic_puppet"]; @@ -648,10 +691,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d36nzdlb7gvsikbvkm840qd5xglyph6ry395ynch6g75vlkr5xi"; + sha256 = "1kil8sbrl9c34ygrgm35893zygr4j6fjvfhbs4rs0b5n3cjrainm"; type = "gem"; }; - version = "0.6.1"; + version = "0.6.3"; }; r10k = { dependencies = ["colored2" "cri" "fast_gettext" "gettext" "gettext-setup" "jwt" "log4r" "minitar" "multi_json" "puppet_forge"]; @@ -659,30 +702,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hdlq01186w9bx270iyyk10w6jccxc4f0dx7kxgg6lnl1rsnkd4i"; + sha256 = "198bar06xqap19j9y831j98ahd3w4ky2k0klwaa39sa1p6fpcjdi"; type = "gem"; }; - version = "3.15.0"; + version = "3.16.0"; + }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; + type = "gem"; + }; + version = "1.7.3"; }; rexml = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; type = "gem"; }; - version = "3.2.5"; + version = "3.2.6"; }; rgen = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18ryflbkc2pvbb7jwl35pnyb1mlx9fby85dnqi7hsbz78mzsf87n"; + sha256 = "1abg3frzak6inwbr4caq6mfd5spx37xnwlxss8615jr12wh525vp"; type = "gem"; }; - version = "0.9.0"; + version = "0.9.1"; }; ruby2_keywords = { groups = ["default"]; @@ -740,10 +793,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gg1bizlgb8wswxwy3irgppqvd6mlr27qsp0fzpm459wffzq10sx"; + sha256 = "0ndqm3jnpdlwkk1jwqdyyb7yw7gv6r4kmjs30g09ap8siv80ilaj"; type = "gem"; }; - version = "1.0.4"; + version = "1.1.0"; + }; + singleton = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qq54imvbksnckzf9hrq9bjzcdb0n8wfv6l5jc0di10n88277jx6"; + type = "gem"; + }; + version = "0.2.0"; }; terminal-table = { dependencies = ["unicode-display_width"]; @@ -771,40 +834,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; + sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps"; type = "gem"; }; - version = "1.2.1"; + version = "1.3.1"; }; unicode-display_width = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nlfck6z986fngp0r74maswmyb1rcksc8xc3mfpw9cj23c3s8zwn"; + sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky"; type = "gem"; }; - version = "2.2.0"; - }; - webrick = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; - type = "gem"; - }; - version = "1.7.0"; + version = "2.5.0"; }; windows_error = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zmm2if81ia33hp18h8yrgnpgcdyrxziyf185r0zx8qy7n8mlchl"; + sha256 = "1825v7hvcl0xss6scyfv76i0cs0kvj72wy20kn7xqylw9avjga2r"; type = "gem"; }; - version = "0.1.4"; + version = "0.1.5"; }; winrm = { dependencies = ["builder" "erubi" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"]; @@ -829,14 +882,13 @@ version = "1.3.5"; }; yard = { - dependencies = ["webrick"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p1if8g9ww6hlpfkphqv3y1z0rbqnnrvb38c5qhnala0f8qpw6yk"; + sha256 = "1r0b8w58p7gy06wph1qdjv2p087hfnmhd9jk23vjdj803dn761am"; type = "gem"; }; - version = "0.9.28"; + version = "0.9.36"; }; } From 79f0d47bb9daca4c191be13e16633ce5bd0fb183 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 24 Mar 2024 16:22:36 +0100 Subject: [PATCH 05/14] puppet-bolt: add meta.changelog, maintainers, and remove `with lib;` --- .../admin/puppet/puppet-bolt/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/admin/puppet/puppet-bolt/default.nix b/pkgs/tools/admin/puppet/puppet-bolt/default.nix index cf6ffb6fb893..23047c3cff47 100644 --- a/pkgs/tools/admin/puppet/puppet-bolt/default.nix +++ b/pkgs/tools/admin/puppet/puppet-bolt/default.nix @@ -1,4 +1,11 @@ -{ lib, bundlerApp, makeWrapper, bundlerUpdateScript, puppet-bolt, testers }: +{ + bundlerApp, + bundlerUpdateScript, + lib, + makeWrapper, + puppet-bolt, + testers, +}: bundlerApp { pname = "bolt"; @@ -26,11 +33,13 @@ bundlerApp { updateScript = bundlerUpdateScript "puppet-bolt"; }; - meta = with lib; { + meta = { description = "Execute commands remotely over SSH and WinRM"; homepage = "https://github.com/puppetlabs/bolt"; - license = licenses.asl20; - maintainers = with maintainers; [ uvnikita ]; - platforms = platforms.unix; + changelog = "https://github.com/puppetlabs/bolt/blob/main/CHANGELOG.md"; + license = lib.licenses.asl20; + mainProgram = "bolt"; + maintainers = with lib.maintainers; [ uvnikita anthonyroussel ]; + platforms = lib.platforms.unix; }; } From 408f89c6ccc85df7b45474c2c436bf086e44cb5f Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 24 Mar 2024 16:23:28 +0100 Subject: [PATCH 06/14] puppet-bolt: move to pkgs/by-name --- pkgs/{tools/admin/puppet => by-name/pu}/puppet-bolt/Gemfile | 0 .../{tools/admin/puppet => by-name/pu}/puppet-bolt/Gemfile.lock | 0 pkgs/{tools/admin/puppet => by-name/pu}/puppet-bolt/gemset.nix | 0 .../default.nix => by-name/pu/puppet-bolt/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{tools/admin/puppet => by-name/pu}/puppet-bolt/Gemfile (100%) rename pkgs/{tools/admin/puppet => by-name/pu}/puppet-bolt/Gemfile.lock (100%) rename pkgs/{tools/admin/puppet => by-name/pu}/puppet-bolt/gemset.nix (100%) rename pkgs/{tools/admin/puppet/puppet-bolt/default.nix => by-name/pu/puppet-bolt/package.nix} (100%) diff --git a/pkgs/tools/admin/puppet/puppet-bolt/Gemfile b/pkgs/by-name/pu/puppet-bolt/Gemfile similarity index 100% rename from pkgs/tools/admin/puppet/puppet-bolt/Gemfile rename to pkgs/by-name/pu/puppet-bolt/Gemfile diff --git a/pkgs/tools/admin/puppet/puppet-bolt/Gemfile.lock b/pkgs/by-name/pu/puppet-bolt/Gemfile.lock similarity index 100% rename from pkgs/tools/admin/puppet/puppet-bolt/Gemfile.lock rename to pkgs/by-name/pu/puppet-bolt/Gemfile.lock diff --git a/pkgs/tools/admin/puppet/puppet-bolt/gemset.nix b/pkgs/by-name/pu/puppet-bolt/gemset.nix similarity index 100% rename from pkgs/tools/admin/puppet/puppet-bolt/gemset.nix rename to pkgs/by-name/pu/puppet-bolt/gemset.nix diff --git a/pkgs/tools/admin/puppet/puppet-bolt/default.nix b/pkgs/by-name/pu/puppet-bolt/package.nix similarity index 100% rename from pkgs/tools/admin/puppet/puppet-bolt/default.nix rename to pkgs/by-name/pu/puppet-bolt/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2581d85eeba0..0f0078e2e2c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19530,8 +19530,6 @@ with pkgs; pup = callPackage ../development/tools/pup { }; - puppet-bolt = callPackage ../tools/admin/puppet/puppet-bolt { }; - puppeteer-cli = callPackage ../tools/graphics/puppeteer-cli { }; pyrseas = callPackage ../development/tools/database/pyrseas { }; From fd3715a45d5c90bd5aef993b0da99063c6d303c7 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 24 Mar 2024 16:31:44 +0100 Subject: [PATCH 07/14] r10k: add anthonyroussel to maintainers --- pkgs/tools/system/r10k/default.nix | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/system/r10k/default.nix b/pkgs/tools/system/r10k/default.nix index 75b75d00253e..9b117c376b0f 100644 --- a/pkgs/tools/system/r10k/default.nix +++ b/pkgs/tools/system/r10k/default.nix @@ -1,4 +1,12 @@ -{ lib, bundlerApp, bundlerUpdateScript, makeWrapper, git, gnutar, gzip }: +{ + bundlerApp, + bundlerUpdateScript, + git, + gnutar, + gzip, + lib, + makeWrapper, +}: bundlerApp { pname = "r10k"; @@ -8,17 +16,23 @@ bundlerApp { nativeBuildInputs = [ makeWrapper ]; postBuild = '' - wrapProgram $out/bin/r10k --prefix PATH : ${lib.makeBinPath [ git gnutar gzip ]} + wrapProgram $out/bin/r10k --prefix PATH : ${ + lib.makeBinPath [ + git + gnutar + gzip + ] + } ''; passthru.updateScript = bundlerUpdateScript "r10k"; - meta = with lib; { + meta = { description = "Puppet environment and module deployment"; - homepage = "https://github.com/puppetlabs/r10k"; - license = licenses.asl20; - maintainers = with maintainers; [ zimbatm manveru nicknovitski ]; - platforms = platforms.unix; + homepage = "https://github.com/puppetlabs/r10k"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ zimbatm manveru nicknovitski anthonyroussel ]; + platforms = lib.platforms.unix; mainProgram = "r10k"; }; } From 8928b12689971f57edf37caa75a7f26bb3836258 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 24 Mar 2024 16:33:02 +0100 Subject: [PATCH 08/14] r10k: 3.4.1 -> 4.0.1 https://github.com/puppetlabs/r10k/compare/3.4.1...4.0.1 --- pkgs/tools/system/r10k/Gemfile.lock | 64 +++++++----- pkgs/tools/system/r10k/gemset.nix | 147 ++++++++++++++++++++++------ 2 files changed, 154 insertions(+), 57 deletions(-) diff --git a/pkgs/tools/system/r10k/Gemfile.lock b/pkgs/tools/system/r10k/Gemfile.lock index 9f55e273ef25..2fa564f46cbd 100644 --- a/pkgs/tools/system/r10k/Gemfile.lock +++ b/pkgs/tools/system/r10k/Gemfile.lock @@ -2,41 +2,55 @@ GEM remote: https://rubygems.org/ specs: colored2 (3.1.2) - cri (2.15.10) - faraday (0.17.3) - multipart-post (>= 1.2, < 3) - faraday_middleware (0.13.1) - faraday (>= 0.7.4, < 1.0) - fast_gettext (1.1.2) - gettext (3.2.9) + cri (2.15.11) + erubi (1.12.0) + faraday (2.9.0) + faraday-net_http (>= 2.0, < 3.2) + faraday-follow_redirects (0.3.0) + faraday (>= 1, < 3) + faraday-net_http (3.1.0) + net-http + fast_gettext (2.3.0) + forwardable (1.3.3) + gettext (3.4.9) + erubi locale (>= 2.0.5) + prime + racc text (>= 1.3.0) - gettext-setup (0.34) - fast_gettext (~> 1.1.0) - gettext (>= 3.0.2, < 3.3.0) + gettext-setup (1.1.0) + fast_gettext (~> 2.1) + gettext (~> 3.4) locale - locale (2.1.3) + jwt (2.7.1) + locale (2.1.4) log4r (1.1.10) minitar (0.9) - multi_json (1.14.1) - multipart-post (2.1.1) - puppet_forge (2.3.3) - faraday (>= 0.9.0, < 0.18.0, != 0.13.1) - faraday_middleware (>= 0.9.0, < 0.14.0) - gettext-setup (~> 0.11) + multi_json (1.15.0) + net-http (0.4.1) + uri + prime (0.1.2) + forwardable + singleton + puppet_forge (5.0.3) + faraday (~> 2.0) + faraday-follow_redirects (~> 0.3.0) minitar semantic_puppet (~> 1.0) - r10k (3.4.1) + r10k (4.0.1) colored2 (= 3.1.2) - cri (>= 2.15.10, < 3.0.0) - fast_gettext (~> 1.1.0) - gettext (>= 3.0.2, < 3.3.0) - gettext-setup (~> 0.24) + cri (>= 2.15.10) + gettext-setup (>= 0.24, < 2.0) + jwt (>= 2.2.3, < 2.8.0) log4r (= 1.1.10) + minitar (~> 0.9) multi_json (~> 1.10) - puppet_forge (~> 2.3.0) - semantic_puppet (1.0.2) + puppet_forge (>= 4.1, < 6) + racc (1.7.3) + semantic_puppet (1.1.0) + singleton (0.2.0) text (1.3.1) + uri (0.13.0) PLATFORMS ruby @@ -45,4 +59,4 @@ DEPENDENCIES r10k BUNDLED WITH - 2.1.4 + 2.5.6 diff --git a/pkgs/tools/system/r10k/gemset.nix b/pkgs/tools/system/r10k/gemset.nix index 9b46cce00da9..d00446690566 100644 --- a/pkgs/tools/system/r10k/gemset.nix +++ b/pkgs/tools/system/r10k/gemset.nix @@ -14,53 +14,84 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h45kw2s4bjwgbfsrncs30av0j4zjync3wmcc6lpdnzbcxs7yms2"; + sha256 = "1bhsgnjav94mz5vf3305gxz1g34gm9kxvnrn1dkz530r8bpj0hr5"; type = "gem"; }; - version = "2.15.10"; + version = "2.15.11"; }; - faraday = { - dependencies = ["multipart-post"]; + erubi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13aghksmni2sl15y7wfpx6k5l3lfd8j9gdyqi6cbw6jgc7bqyyn2"; + sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; type = "gem"; }; - version = "0.17.3"; + version = "1.12.0"; }; - faraday_middleware = { + faraday = { + dependencies = ["faraday-net_http"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qqb1rmk0f9m82iijjlqadh5yby1bhnr6svjk9vxdvh6f181988s"; + type = "gem"; + }; + version = "2.9.0"; + }; + faraday-follow_redirects = { dependencies = ["faraday"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a93rs58bakqck7bcihasz66a1riy22h2zpwrpmb13gp8mw3wkmr"; + sha256 = "1y87p3yk15bjbk0z9mf01r50lzxvp7agr56lbm9gxiz26mb9fbfr"; type = "gem"; }; - version = "0.13.1"; + version = "0.3.0"; + }; + faraday-net_http = { + dependencies = ["net-http"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17w51yk4rrm9rpnbc3x509s619kba0jga3qrj4b17l30950vw9qn"; + type = "gem"; + }; + version = "3.1.0"; }; fast_gettext = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ci71w9jb979c379c7vzm88nc3k6lf68kbrsgw9nlx5g4hng0s78"; + sha256 = "112gsrqah2w03kgi9mjsn6hl74mrwckphf223h36iayc4djf4lq2"; type = "gem"; }; - version = "1.1.2"; + version = "2.3.0"; }; - gettext = { - dependencies = ["locale" "text"]; + forwardable = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0764vj7gacn0aypm2bf6m46dzjzwzrjlmbyx6qwwwzbmi94r40wr"; + sha256 = "1b5g1i3xdvmxxpq4qp0z4v78ivqnazz26w110fh4cvzsdayz8zgi"; type = "gem"; }; - version = "3.2.9"; + version = "1.3.3"; + }; + gettext = { + dependencies = ["erubi" "locale" "prime" "racc" "text"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16h0kda5z4s4zqygyk0f52xzs9mlz9r4lnhjwk729hhmdbz68a19"; + type = "gem"; + }; + version = "3.4.9"; }; gettext-setup = { dependencies = ["fast_gettext" "gettext" "locale"]; @@ -68,20 +99,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vfnayz20xd8q0sz27816kvgia9z2dpj9fy7z15da239wmmnz7ga"; + sha256 = "1v6liz934gmx1wv1z6bvpim6aanbr66xjhb90lc9z1jxayczmm1a"; type = "gem"; }; - version = "0.34"; + version = "1.1.0"; + }; + jwt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16z11alz13vfc4zs5l3fk6n51n2jw9lskvc4h4prnww0y797qd87"; + type = "gem"; + }; + version = "2.7.1"; }; locale = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0997465kxvpxm92fiwc2b16l49mngk7b68g5k35ify0m3q0yxpdn"; + sha256 = "107pm4ccmla23z963kyjldgngfigvchnv85wr6m69viyxxrrjbsj"; type = "gem"; }; - version = "2.1.3"; + version = "2.1.4"; }; log4r = { groups = ["default"]; @@ -108,52 +149,84 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xy54mjf7xg41l8qrg1bqri75agdqmxap9z466fjismc1rn2jwfr"; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; type = "gem"; }; - version = "1.14.1"; + version = "1.15.0"; }; - multipart-post = { + net-http = { + dependencies = ["uri"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; + sha256 = "10n2n9aq00ih8v881af88l1zyrqgs5cl3njdw8argjwbl5ggqvm9"; type = "gem"; }; - version = "2.1.1"; + version = "0.4.1"; + }; + prime = { + dependencies = ["forwardable" "singleton"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1973kz8lbck6ga5v42f55jk8b8pnbgwp9p67dl1xw15gvz55dsfl"; + type = "gem"; + }; + version = "0.1.2"; }; puppet_forge = { - dependencies = ["faraday" "faraday_middleware" "gettext-setup" "minitar" "semantic_puppet"]; + dependencies = ["faraday" "faraday-follow_redirects" "minitar" "semantic_puppet"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lyd10ai27lxylywjxpwyxikx5hblsdchid3chymrrv55x217cny"; + sha256 = "168w15y5rnsm6wspqxn0wg543r89cbajc8wky0sg9vzpgpr27176"; type = "gem"; }; - version = "2.3.3"; + version = "5.0.3"; }; r10k = { - dependencies = ["colored2" "cri" "fast_gettext" "gettext" "gettext-setup" "log4r" "multi_json" "puppet_forge"]; + dependencies = ["colored2" "cri" "gettext-setup" "jwt" "log4r" "minitar" "multi_json" "puppet_forge"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nlckw4yr2ph14i9h0blsdb5zmrzqh3aknkm0dg3hrcx8ygncai6"; + sha256 = "1g7bx9k112mnxpnasj59zaz2c7x51ia856b5q41kfr3i9y2q3k78"; type = "gem"; }; - version = "3.4.1"; + version = "4.0.1"; + }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; + type = "gem"; + }; + version = "1.7.3"; }; semantic_puppet = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "046m45rdwpvfz77s7bxid27c89w329c1nj593p74wdd8kknf0nv0"; + sha256 = "0ndqm3jnpdlwkk1jwqdyyb7yw7gv6r4kmjs30g09ap8siv80ilaj"; type = "gem"; }; - version = "1.0.2"; + version = "1.1.0"; + }; + singleton = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qq54imvbksnckzf9hrq9bjzcdb0n8wfv6l5jc0di10n88277jx6"; + type = "gem"; + }; + version = "0.2.0"; }; text = { groups = ["default"]; @@ -165,4 +238,14 @@ }; version = "1.3.1"; }; + uri = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "094gk72ckazf495qc76gk09b5i318d5l9m7bicg2wxlrjcm3qm96"; + type = "gem"; + }; + version = "0.13.0"; + }; } From bc833bf0250e61ee702deac1750e68aaf3630e62 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 24 Mar 2024 16:34:50 +0100 Subject: [PATCH 09/14] r10k: add passthru.tests.version --- pkgs/tools/system/r10k/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/system/r10k/default.nix b/pkgs/tools/system/r10k/default.nix index 9b117c376b0f..ab38363ab596 100644 --- a/pkgs/tools/system/r10k/default.nix +++ b/pkgs/tools/system/r10k/default.nix @@ -6,6 +6,8 @@ gzip, lib, makeWrapper, + r10k, + testers, }: bundlerApp { @@ -25,7 +27,14 @@ bundlerApp { } ''; - passthru.updateScript = bundlerUpdateScript "r10k"; + passthru = { + tests.version = testers.testVersion { + command = "${lib.getExe r10k} version"; + package = r10k; + version = (import ./gemset.nix).r10k.version; + }; + updateScript = bundlerUpdateScript "r10k"; + }; meta = { description = "Puppet environment and module deployment"; From dc611ed73dd741ca81e94cc11bf812bb70502742 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 24 Mar 2024 16:37:15 +0100 Subject: [PATCH 10/14] r10k: move to pkgs/by-name --- pkgs/{tools/system => by-name/r1}/r10k/Gemfile | 0 pkgs/{tools/system => by-name/r1}/r10k/Gemfile.lock | 0 pkgs/{tools/system => by-name/r1}/r10k/gemset.nix | 0 .../system/r10k/default.nix => by-name/r1/r10k/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{tools/system => by-name/r1}/r10k/Gemfile (100%) rename pkgs/{tools/system => by-name/r1}/r10k/Gemfile.lock (100%) rename pkgs/{tools/system => by-name/r1}/r10k/gemset.nix (100%) rename pkgs/{tools/system/r10k/default.nix => by-name/r1/r10k/package.nix} (100%) diff --git a/pkgs/tools/system/r10k/Gemfile b/pkgs/by-name/r1/r10k/Gemfile similarity index 100% rename from pkgs/tools/system/r10k/Gemfile rename to pkgs/by-name/r1/r10k/Gemfile diff --git a/pkgs/tools/system/r10k/Gemfile.lock b/pkgs/by-name/r1/r10k/Gemfile.lock similarity index 100% rename from pkgs/tools/system/r10k/Gemfile.lock rename to pkgs/by-name/r1/r10k/Gemfile.lock diff --git a/pkgs/tools/system/r10k/gemset.nix b/pkgs/by-name/r1/r10k/gemset.nix similarity index 100% rename from pkgs/tools/system/r10k/gemset.nix rename to pkgs/by-name/r1/r10k/gemset.nix diff --git a/pkgs/tools/system/r10k/default.nix b/pkgs/by-name/r1/r10k/package.nix similarity index 100% rename from pkgs/tools/system/r10k/default.nix rename to pkgs/by-name/r1/r10k/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f0078e2e2c2..f498d35a48b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19547,8 +19547,6 @@ with pkgs; qxmledit = libsForQt5.callPackage ../applications/editors/qxmledit {} ; - r10k = callPackage ../tools/system/r10k { }; - radare2 = callPackage ../development/tools/analysis/radare2 ({ lua = lua5; } // (config.radare or {})); From 5ccb83a906d114d69c938fc09a57c04de9398cb6 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 24 Mar 2024 16:40:37 +0100 Subject: [PATCH 11/14] pdk: format with nixfmt-rfc-style --- pkgs/by-name/pd/pdk/package.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/pd/pdk/package.nix b/pkgs/by-name/pd/pdk/package.nix index 20d99e034d60..56270b8895b9 100644 --- a/pkgs/by-name/pd/pdk/package.nix +++ b/pkgs/by-name/pd/pdk/package.nix @@ -1,8 +1,9 @@ -{ lib, +{ bundlerApp, bundlerUpdateScript, + gnumake, + lib, makeWrapper, - gnumake }: bundlerApp { @@ -18,10 +19,10 @@ bundlerApp { passthru.updateScript = bundlerUpdateScript "pdk"; - meta = with lib; { + meta = { description = "Puppet Development Kit"; - homepage = "https://github.com/puppetlabs/pdk"; - license = licenses.asl20; - maintainers = with maintainers; [ netali ]; + homepage = "https://github.com/puppetlabs/pdk"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ netali ]; }; } From 6826d9de871ca589f1b34970c87ab5cbd1070dec Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 24 Mar 2024 16:40:53 +0100 Subject: [PATCH 12/14] pdk: add anthonyroussel to maintainers --- pkgs/by-name/pd/pdk/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/pd/pdk/package.nix b/pkgs/by-name/pd/pdk/package.nix index 56270b8895b9..025f0ad13e9f 100644 --- a/pkgs/by-name/pd/pdk/package.nix +++ b/pkgs/by-name/pd/pdk/package.nix @@ -23,6 +23,6 @@ bundlerApp { description = "Puppet Development Kit"; homepage = "https://github.com/puppetlabs/pdk"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ netali ]; + maintainers = with lib.maintainers; [ netali anthonyroussel ]; }; } From 6efd3efcb147e2cae621aad1e6aa6993f63c454c Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 24 Mar 2024 16:42:33 +0100 Subject: [PATCH 13/14] pdk: add passthru.tests.version, meta.changelog, meta.mainProgram --- pkgs/by-name/pd/pdk/package.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/pd/pdk/package.nix b/pkgs/by-name/pd/pdk/package.nix index 025f0ad13e9f..91bd27a53a44 100644 --- a/pkgs/by-name/pd/pdk/package.nix +++ b/pkgs/by-name/pd/pdk/package.nix @@ -4,6 +4,8 @@ gnumake, lib, makeWrapper, + pdk, + testers, }: bundlerApp { @@ -17,12 +19,20 @@ bundlerApp { wrapProgram $out/bin/pdk --prefix PATH : ${lib.makeBinPath [ gnumake ]} ''; - passthru.updateScript = bundlerUpdateScript "pdk"; + passthru = { + tests.version = testers.testVersion { + package = pdk; + version = (import ./gemset.nix).pdk.version; + }; + updateScript = bundlerUpdateScript "pdk"; + }; meta = { + changelog = "https://github.com/puppetlabs/pdk/blob/main/CHANGELOG.md"; description = "Puppet Development Kit"; homepage = "https://github.com/puppetlabs/pdk"; license = lib.licenses.asl20; + mainProgram = "pdk"; maintainers = with lib.maintainers; [ netali anthonyroussel ]; }; } From 7705fda40a3f262ce0afe352e7dbd57a62d250d1 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 24 Mar 2024 17:46:46 +0100 Subject: [PATCH 14/14] pdk: fix build for all ruby platforms --- pkgs/by-name/pd/pdk/Gemfile.lock | 12 ++++++------ pkgs/by-name/pd/pdk/gemset.nix | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/pd/pdk/Gemfile.lock b/pkgs/by-name/pd/pdk/Gemfile.lock index 9cf412d55a74..85ab3bacbae5 100644 --- a/pkgs/by-name/pd/pdk/Gemfile.lock +++ b/pkgs/by-name/pd/pdk/Gemfile.lock @@ -7,15 +7,15 @@ GEM concurrent-ruby (1.1.10) cri (2.15.11) deep_merge (1.2.2) - diff-lcs (1.5.0) - facter (4.5.1) + diff-lcs (1.5.1) + facter (4.6.1) hocon (~> 1.3) thor (>= 1.0.1, < 2.0) ffi (1.16.3) hitimes (2.0.0) hocon (1.4.0) httpclient (2.8.3) - json-schema (4.1.1) + json-schema (4.2.0) addressable (>= 2.8) json_pure (2.6.3) minitar (0.9) @@ -41,7 +41,7 @@ GEM tty-spinner (~> 0.9) tty-which (~> 0.5) public_suffix (5.0.4) - thor (1.3.0) + thor (1.3.1) tty-color (0.6.0) tty-cursor (0.7.1) tty-prompt (0.23.1) @@ -58,10 +58,10 @@ GEM wisper (2.0.1) PLATFORMS - x86_64-linux + ruby DEPENDENCIES pdk (= 3.0.1) BUNDLED WITH - 2.4.22 + 2.5.6 diff --git a/pkgs/by-name/pd/pdk/gemset.nix b/pkgs/by-name/pd/pdk/gemset.nix index cfc47fa4bb32..6d8fa5dceb08 100644 --- a/pkgs/by-name/pd/pdk/gemset.nix +++ b/pkgs/by-name/pd/pdk/gemset.nix @@ -55,10 +55,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9"; + sha256 = "1znxccz83m4xgpd239nyqxlifdb7m8rlfayk6s259186nkgj6ci7"; type = "gem"; }; - version = "1.5.0"; + version = "1.5.1"; }; facter = { dependencies = ["hocon" "thor"]; @@ -66,10 +66,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zpmih27d074zh4jvp4y0a539bh46rd3p02q2aiga3y4981nmh4w"; + sha256 = "0pxpldfcf40dr9khra3sa131ij7gzd97bba2vpw89c785pl736a7"; type = "gem"; }; - version = "4.5.1"; + version = "4.6.1"; }; ffi = { groups = ["default"]; @@ -117,10 +117,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j9dz9sf7swwmfahlngph8n9ibm0cx7mdy9zpv3w44578nbkka49"; + sha256 = "1h23nlk1a5xg7ayayzkanrgy3s5sk57vmc3awqbplqwzf8827rdd"; type = "gem"; }; - version = "4.1.1"; + version = "4.2.0"; }; json_pure = { groups = ["default"]; @@ -189,10 +189,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hx77jxkrwi66yvs10wfxqa8s25ds25ywgrrf66acm9nbfg7zp0s"; + sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; tty-color = { groups = ["default"];