From e4ded4af8fe53b9eaa8d17a0ccd098111f129474 Mon Sep 17 00:00:00 2001 From: Skye J Date: Tue, 7 Jul 2026 15:58:33 -0400 Subject: [PATCH] openvox: create an alias for puppet and remove puppet --- pkgs/by-name/pu/puppet/Gemfile | 12 -- pkgs/by-name/pu/puppet/Gemfile.lock | 57 ------- pkgs/by-name/pu/puppet/gemset.nix | 245 ---------------------------- pkgs/by-name/pu/puppet/package.nix | 31 ---- pkgs/top-level/aliases.nix | 1 + 5 files changed, 1 insertion(+), 345 deletions(-) delete mode 100644 pkgs/by-name/pu/puppet/Gemfile delete mode 100644 pkgs/by-name/pu/puppet/Gemfile.lock delete mode 100644 pkgs/by-name/pu/puppet/gemset.nix delete mode 100644 pkgs/by-name/pu/puppet/package.nix diff --git a/pkgs/by-name/pu/puppet/Gemfile b/pkgs/by-name/pu/puppet/Gemfile deleted file mode 100644 index 4f4008418bb2..000000000000 --- a/pkgs/by-name/pu/puppet/Gemfile +++ /dev/null @@ -1,12 +0,0 @@ -# frozen_string_literal: true - -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 deleted file mode 100644 index 02ff6bbd4e72..000000000000 --- a/pkgs/by-name/pu/puppet/Gemfile.lock +++ /dev/null @@ -1,57 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - base64 (0.3.0) - benchmark (0.4.1) - concurrent-ruby (1.3.5) - deep_merge (1.2.2) - facter (4.10.0) - hocon (~> 1.3) - thor (>= 1.0.1, < 1.3) - fast_gettext (3.1.0) - prime - forwardable (1.3.3) - getoptlong (0.2.1) - hocon (1.4.0) - locale (2.1.4) - 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, < 4) - getoptlong (~> 0.2.0) - locale (~> 2.1) - multi_json (~> 1.13) - puppet-resource_api (~> 1.5) - scanf (~> 1.0) - 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.1) - singleton (0.3.0) - syslog (0.3.0) - logger - thor (1.2.2) - -PLATFORMS - aarch64-linux - ruby - -DEPENDENCIES - base64 - benchmark - ostruct - puppet - racc - syslog - -BUNDLED WITH - 2.6.9 diff --git a/pkgs/by-name/pu/puppet/gemset.nix b/pkgs/by-name/pu/puppet/gemset.nix deleted file mode 100644 index 64f6ba2b726c..000000000000 --- a/pkgs/by-name/pu/puppet/gemset.nix +++ /dev/null @@ -1,245 +0,0 @@ -{ - 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 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1"; - type = "gem"; - }; - version = "1.3.5"; - }; - deep_merge = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0fjn4civid68a3zxnbgyjj6krs3l30dy8b4djpg6fpzrsyix7kl3"; - type = "gem"; - }; - version = "1.2.2"; - }; - facter = { - dependencies = [ - "hocon" - "thor" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "17d561xf4s5016fm9jkfkkafn6660g04fz1yp5xfvkb0j4xj32mp"; - type = "gem"; - }; - 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 = "198vy9dxyzibqdbw9jg8p2ljj9iknkyiqlyl229vz55rjxrz08zx"; - type = "gem"; - }; - version = "0.2.1"; - }; - hocon = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "106dmzsl1bxkqw5xaif012nwwfr3k9wff32cqc77ibjngknj6477"; - type = "gem"; - }; - version = "1.4.0"; - }; - locale = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "107pm4ccmla23z963kyjldgngfigvchnv85wr6m69viyxxrrjbsj"; - type = "gem"; - }; - 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 = "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 = "0.1.4"; - }; - puppet = { - dependencies = [ - "concurrent-ruby" - "deep_merge" - "facter" - "fast_gettext" - "getoptlong" - "locale" - "multi_json" - "puppet-resource_api" - "scanf" - "semantic_puppet" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0fia3ji6isnqz4a31aq8k4nd8p7vkxn80hhgqfdc8kkrba7xxxgj"; - type = "gem"; - }; - version = "8.10.0"; - }; - puppet-resource_api = { - dependencies = [ "hocon" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0rxy5s7hl707x4sc1b4v2yqyii6pkym2gmsam3ri0f0xmmzyg0jb"; - type = "gem"; - }; - 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 = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "000vxsci3zq8m1wl7mmppj7sarznrqlm6v2x2hdfmbxcwpvvfgak"; - type = "gem"; - }; - version = "1.0.0"; - }; - semantic_puppet = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - 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 = "0.3.0"; - }; - thor = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg"; - type = "gem"; - }; - version = "1.2.2"; - }; -} diff --git a/pkgs/by-name/pu/puppet/package.nix b/pkgs/by-name/pu/puppet/package.nix deleted file mode 100644 index ecffefd5d439..000000000000 --- a/pkgs/by-name/pu/puppet/package.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - bundlerApp, - bundlerUpdateScript, - lib, - puppet, - ruby_3_4, - testers, -}: - -(bundlerApp.override { ruby = ruby_3_4; }) { - pname = "puppet"; - gemdir = ./.; - exes = [ "puppet" ]; - - passthru = { - tests.version = testers.testVersion { - package = puppet; - command = "HOME=$(mktemp -d) puppet --version"; - inherit ((import ./gemset.nix).puppet) version; - }; - updateScript = bundlerUpdateScript "puppet"; - }; - - meta = { - description = "Server automation framework and application"; - homepage = "https://github.com/puppetlabs/puppet"; - license = lib.licenses.asl20; - mainProgram = "puppet"; - maintainers = with lib.maintainers; [ baloo ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6845ce9ff612..e539a7d335d4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1863,6 +1863,7 @@ mapAliases { pscid = throw "'pscid' has been removed because it was unmaintained upstream"; # Added 2025-12-12 psi = throw "'psi' has been removed as it depended on EOL qt5 webengine. Consider moving to psi-plus, a somewhat more maintained fork."; # Added 2026-04-15 pulp = throw "'pulp' has been removed because it was unmaintained upstream"; # Added 2025-12-12 + puppet = warnAlias "'puppet' has been replaced by 'openvox'" openvox; # Added 2026-07-07 purescript-psa = throw "'purescript-psa' has been removed because it was unmaintained within nixpkgs"; # Added 2025-12-12 purple-discord = throw "'purple-discord' has been renamed to/replaced by 'pidginPackages.purple-discord'"; # Converted to throw 2025-10-27 purple-facebook = throw "'purple-facebook' has been removed as it is unmaintained and doesn't support e2ee enforced by facebook."; # Added 2025-09-17