diff --git a/pkgs/by-name/pu/puppet/Gemfile b/pkgs/by-name/pu/puppet/Gemfile index d90f7b9cff0d3..4f4008418bb22 100644 --- a/pkgs/by-name/pu/puppet/Gemfile +++ b/pkgs/by-name/pu/puppet/Gemfile @@ -3,3 +3,10 @@ source "https://rubygems.org" gem "puppet" + +# ruby used to provide these in stdlib but now they must be defined +gem "base64" +gem "syslog" +gem "ostruct" +gem "benchmark" +gem "racc" diff --git a/pkgs/by-name/pu/puppet/Gemfile.lock b/pkgs/by-name/pu/puppet/Gemfile.lock index 290ba9d19235a..02ff6bbd4e721 100644 --- a/pkgs/by-name/pu/puppet/Gemfile.lock +++ b/pkgs/by-name/pu/puppet/Gemfile.lock @@ -1,20 +1,31 @@ GEM remote: https://rubygems.org/ specs: - concurrent-ruby (1.2.3) + base64 (0.3.0) + benchmark (0.4.1) + concurrent-ruby (1.3.5) deep_merge (1.2.2) - facter (4.7.0) + facter (4.10.0) hocon (~> 1.3) thor (>= 1.0.1, < 1.3) - fast_gettext (2.3.0) + fast_gettext (3.1.0) + prime + forwardable (1.3.3) + getoptlong (0.2.1) hocon (1.4.0) locale (2.1.4) - multi_json (1.15.0) - puppet (8.6.0) + logger (1.7.0) + multi_json (1.17.0) + ostruct (0.6.3) + prime (0.1.4) + forwardable + singleton + puppet (8.10.0) concurrent-ruby (~> 1.0) deep_merge (~> 1.0) facter (>= 4.3.0, < 5) - fast_gettext (>= 2.1, < 3) + fast_gettext (>= 2.1, < 4) + getoptlong (~> 0.2.0) locale (~> 2.1) multi_json (~> 1.13) puppet-resource_api (~> 1.5) @@ -22,16 +33,25 @@ GEM semantic_puppet (~> 1.0) puppet-resource_api (1.9.0) hocon (>= 1.0) + racc (1.8.1) scanf (1.0.0) - semantic_puppet (1.1.0) + semantic_puppet (1.1.1) + singleton (0.3.0) + syslog (0.3.0) + logger thor (1.2.2) PLATFORMS + aarch64-linux ruby - x86_64-linux DEPENDENCIES + base64 + benchmark + ostruct puppet + racc + syslog BUNDLED WITH - 2.5.9 + 2.6.9 diff --git a/pkgs/by-name/pu/puppet/gemset.nix b/pkgs/by-name/pu/puppet/gemset.nix index 3817f53b33fe2..64f6ba2b726cb 100644 --- a/pkgs/by-name/pu/puppet/gemset.nix +++ b/pkgs/by-name/pu/puppet/gemset.nix @@ -1,13 +1,33 @@ { + base64 = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0yx9yn47a8lkfcjmigk79fykxvr80r4m1i35q82sxzynpbm7lcr7"; + type = "gem"; + }; + version = "0.3.0"; + }; + benchmark = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1kicilpma5l0lwayqjb5577bm0hbjndj2gh150xz09xsgc1l1vyl"; + type = "gem"; + }; + version = "0.4.1"; + }; concurrent-ruby = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; + sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.5"; }; deep_merge = { groups = [ "default" ]; @@ -28,20 +48,41 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0bigvzjqmfd7s0wwmg22372iffy4jz71x25g1r1ij8h60bk1097h"; + sha256 = "17d561xf4s5016fm9jkfkkafn6660g04fz1yp5xfvkb0j4xj32mp"; type = "gem"; }; - version = "4.7.0"; + version = "4.10.0"; }; fast_gettext = { + dependencies = [ "prime" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1i9anyxdsz3lxlg9cg2dcad1fwykz4lr45v2q3nwjp477b1q8k4w"; + type = "gem"; + }; + version = "3.1.0"; + }; + forwardable = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1b5g1i3xdvmxxpq4qp0z4v78ivqnazz26w110fh4cvzsdayz8zgi"; + type = "gem"; + }; + version = "1.3.3"; + }; + getoptlong = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "112gsrqah2w03kgi9mjsn6hl74mrwckphf223h36iayc4djf4lq2"; + sha256 = "198vy9dxyzibqdbw9jg8p2ljj9iknkyiqlyl229vz55rjxrz08zx"; type = "gem"; }; - version = "2.3.0"; + version = "0.2.1"; }; hocon = { groups = [ "default" ]; @@ -63,15 +104,49 @@ }; version = "2.1.4"; }; + logger = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr"; + type = "gem"; + }; + version = "1.7.0"; + }; multi_json = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + sha256 = "06sabsvnw0x1aqdcswc6bqrqz6705548bfd8z22jxgxfjrn1yn3n"; + type = "gem"; + }; + version = "1.17.0"; + }; + ostruct = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "04nrir9wdpc4izqwqbysxyly8y7hsfr4fsv69rw91lfi9d5fv8lm"; + type = "gem"; + }; + version = "0.6.3"; + }; + prime = { + dependencies = [ + "forwardable" + "singleton" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0pi2g9sd9ssyrpvbybh4skrgzqrv0rrd1q7ylgrsd519gjzmwxad"; type = "gem"; }; - version = "1.15.0"; + version = "0.1.4"; }; puppet = { dependencies = [ @@ -79,6 +154,7 @@ "deep_merge" "facter" "fast_gettext" + "getoptlong" "locale" "multi_json" "puppet-resource_api" @@ -89,10 +165,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1b9a1spqh5zfmpr0f1rz597wr7s4d7d796768ms04ssd634r4539"; + sha256 = "0fia3ji6isnqz4a31aq8k4nd8p7vkxn80hhgqfdc8kkrba7xxxgj"; type = "gem"; }; - version = "8.6.0"; + version = "8.10.0"; }; puppet-resource_api = { dependencies = [ "hocon" ]; @@ -105,6 +181,16 @@ }; version = "1.9.0"; }; + racc = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; + type = "gem"; + }; + version = "1.8.1"; + }; scanf = { groups = [ "default" ]; platforms = [ ]; @@ -120,10 +206,31 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ndqm3jnpdlwkk1jwqdyyb7yw7gv6r4kmjs30g09ap8siv80ilaj"; + sha256 = "15ksbizvakfx0zfdgjbh34hqnrnkjj47m4kbnsg58mpqsx45pzqm"; + type = "gem"; + }; + version = "1.1.1"; + }; + singleton = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0y2pc7lr979pab5n5lvk3jhsi99fhskl5f2s6004v8sabz51psl3"; + type = "gem"; + }; + version = "0.3.0"; + }; + syslog = { + dependencies = [ "logger" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "023lbh48fcn72gwyh1x52ycs1wx1bnhdajmv0qvkidmdsmxnxzjd"; type = "gem"; }; - version = "1.1.0"; + version = "0.3.0"; }; thor = { groups = [ "default" ]; diff --git a/pkgs/by-name/pu/puppet/package.nix b/pkgs/by-name/pu/puppet/package.nix index 9d5f738cad7e4..37d5afc1bc6ca 100644 --- a/pkgs/by-name/pu/puppet/package.nix +++ b/pkgs/by-name/pu/puppet/package.nix @@ -3,10 +3,11 @@ bundlerUpdateScript, lib, puppet, + ruby_3_4, testers, }: -bundlerApp { +(bundlerApp.override { ruby = ruby_3_4; }) { pname = "puppet"; gemdir = ./.; exes = [ "puppet" ];