From 21c3959b68cd7857d6509e648c1b022ef695630c Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Tue, 8 Jul 2025 11:57:01 -0500 Subject: [PATCH 1/2] cewl: Update all gems to latest versions. (cherry picked from commit 11e6cc131b6530561ab058f05600ccee8df17856) --- pkgs/by-name/ce/cewl/Gemfile.lock | 42 +++++++------------------------ pkgs/by-name/ce/cewl/gemset.nix | 28 ++++++++++----------- pkgs/by-name/ce/cewl/package.nix | 11 +++++--- 3 files changed, 30 insertions(+), 51 deletions(-) diff --git a/pkgs/by-name/ce/cewl/Gemfile.lock b/pkgs/by-name/ce/cewl/Gemfile.lock index e88d23591d21..42ff144bcd9a 100644 --- a/pkgs/by-name/ce/cewl/Gemfile.lock +++ b/pkgs/by-name/ce/cewl/Gemfile.lock @@ -1,52 +1,28 @@ GEM remote: https://rubygems.org/ specs: - logger (1.6.6) + logger (1.7.0) mime (0.4.4) - mime-types (3.6.0) + mime-types (3.7.0) logger - mime-types-data (~> 3.2015) - mime-types-data (3.2025.0304) + mime-types-data (~> 3.2025, >= 3.2025.0507) + mime-types-data (3.2025.0701) mini_exiftool (2.14.0) ostruct (>= 0.6.0) pstore (>= 0.1.3) - mini_portile2 (2.8.8) - nokogiri (1.18.3) + mini_portile2 (2.8.9) + nokogiri (1.18.8) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.18.3-aarch64-linux-gnu) - racc (~> 1.4) - nokogiri (1.18.3-aarch64-linux-musl) - racc (~> 1.4) - nokogiri (1.18.3-arm-linux-gnu) - racc (~> 1.4) - nokogiri (1.18.3-arm-linux-musl) - racc (~> 1.4) - nokogiri (1.18.3-arm64-darwin) - racc (~> 1.4) - nokogiri (1.18.3-x86_64-darwin) - racc (~> 1.4) - nokogiri (1.18.3-x86_64-linux-gnu) - racc (~> 1.4) - nokogiri (1.18.3-x86_64-linux-musl) - racc (~> 1.4) - ostruct (0.6.1) - pstore (0.1.4) + ostruct (0.6.2) + pstore (0.2.0) racc (1.8.1) rexml (3.4.1) rubyzip (2.4.1) spider (0.5.4) PLATFORMS - aarch64-linux-gnu - aarch64-linux-musl - arm-linux-gnu - arm-linux-musl - arm64-darwin ruby - x86_64-darwin - x86_64-linux-gnu - x86_64-linux-musl DEPENDENCIES mime @@ -58,4 +34,4 @@ DEPENDENCIES spider BUNDLED WITH - 2.6.2 + 2.6.9 diff --git a/pkgs/by-name/ce/cewl/gemset.nix b/pkgs/by-name/ce/cewl/gemset.nix index 0d7857f638fb..b0daffb654de 100644 --- a/pkgs/by-name/ce/cewl/gemset.nix +++ b/pkgs/by-name/ce/cewl/gemset.nix @@ -4,10 +4,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "05s008w9vy7is3njblmavrbdzyrwwc1fsziffdr58w9pwqj8sqfx"; + sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr"; type = "gem"; }; - version = "1.6.6"; + version = "1.7.0"; }; mime = { groups = [ "default" ]; @@ -28,20 +28,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0r34mc3n7sxsbm9mzyzy8m3dvq7pwbryyc8m452axkj0g2axnwbg"; + sha256 = "0mjyxl7c0xzyqdqa8r45hqg7jcw2prp3hkp39mdf223g4hfgdsyw"; type = "gem"; }; - version = "3.6.0"; + version = "3.7.0"; }; mime-types-data = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "15sh43bmq39sqa1q5l5wiazyim71m6jg572fgy5p0ba3h5c3inby"; + sha256 = "0qg107qpl8gwmqjxcqiz37a3xmsgp503h9n74y8vyq0jj63gcz8w"; type = "gem"; }; - version = "3.2025.0304"; + version = "3.2025.0701"; }; mini_exiftool = { dependencies = [ @@ -62,10 +62,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf"; + sha256 = "12f2830x7pq3kj0v8nz0zjvaw02sv01bqs1zwdrc04704kwcgmqc"; type = "gem"; }; - version = "2.8.8"; + version = "2.8.9"; }; nokogiri = { dependencies = [ @@ -76,30 +76,30 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0npx535cs8qc33n0lpbbwl0p9fi3a5bczn6ayqhxvknh9yqw77vb"; + sha256 = "0rb306hbky6cxfyc8vrwpvl40fdapjvhsk62h08gg9wwbn3n8x4c"; type = "gem"; }; - version = "1.18.3"; + version = "1.18.8"; }; ostruct = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9"; + sha256 = "1h6gazp5837xbz1aqvq9x0a5ffpw32nhvknn931a4074k6i04wvd"; type = "gem"; }; - version = "0.6.1"; + version = "0.6.2"; }; pstore = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "11mvc9s72fq7bl6h3f1rcng4ffa0nbjy1fr9wpshgzn4b9zznxm2"; + sha256 = "1a3lrq8k62n8bazhxgdmjykni9wv0mcjks5vi1g274i3wblcgrfn"; type = "gem"; }; - version = "0.1.4"; + version = "0.2.0"; }; racc = { groups = [ "default" ]; diff --git a/pkgs/by-name/ce/cewl/package.nix b/pkgs/by-name/ce/cewl/package.nix index e415a1bdc950..098f36398310 100644 --- a/pkgs/by-name/ce/cewl/package.nix +++ b/pkgs/by-name/ce/cewl/package.nix @@ -3,6 +3,7 @@ lib, fetchFromGitHub, bundlerEnv, + bundlerUpdateScript, }: let @@ -17,8 +18,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "digininja"; repo = "CeWL"; - rev = version; - sha256 = "sha256-5LTZUr3OMeu1NODhIgBiVqtQnUWYfZTm73q61vT3rXc="; + tag = version; + hash = "sha256-5LTZUr3OMeu1NODhIgBiVqtQnUWYfZTm73q61vT3rXc="; }; buildInputs = [ rubyEnv.wrappedRuby ]; @@ -29,10 +30,12 @@ stdenv.mkDerivation rec { mv $out/bin/cewl.rb $out/bin/cewl ''; - meta = with lib; { + passthru.updateScript = bundlerUpdateScript "cewl"; + + meta = { description = "Custom wordlist generator"; mainProgram = "cewl"; homepage = "https://digi.ninja/projects/cewl.php/"; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; }; } From 76d2b5b18a77871316344e5d6a95e19ba5040560 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Fri, 21 Nov 2025 22:58:38 -0500 Subject: [PATCH 2/2] cewl: regenerate lockfile Fixes GHSA-353f-x4gh-cqq8 (cherry picked from commit 7968ed466d96899746cf4b2f45a43cace9a49b93) --- pkgs/by-name/ce/cewl/Gemfile.lock | 14 +++++++------- pkgs/by-name/ce/cewl/gemset.nix | 24 ++++++++++++------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/ce/cewl/Gemfile.lock b/pkgs/by-name/ce/cewl/Gemfile.lock index 42ff144bcd9a..6f9bd20b1e0f 100644 --- a/pkgs/by-name/ce/cewl/Gemfile.lock +++ b/pkgs/by-name/ce/cewl/Gemfile.lock @@ -6,20 +6,20 @@ GEM mime-types (3.7.0) logger mime-types-data (~> 3.2025, >= 3.2025.0507) - mime-types-data (3.2025.0701) + mime-types-data (3.2025.0924) mini_exiftool (2.14.0) ostruct (>= 0.6.0) pstore (>= 0.1.3) mini_portile2 (2.8.9) - nokogiri (1.18.8) + nokogiri (1.18.10) mini_portile2 (~> 2.8.2) racc (~> 1.4) - ostruct (0.6.2) + ostruct (0.6.3) pstore (0.2.0) racc (1.8.1) - rexml (3.4.1) - rubyzip (2.4.1) - spider (0.5.4) + rexml (3.4.4) + rubyzip (3.2.2) + spider (0.7.0) PLATFORMS ruby @@ -34,4 +34,4 @@ DEPENDENCIES spider BUNDLED WITH - 2.6.9 + 2.7.2 diff --git a/pkgs/by-name/ce/cewl/gemset.nix b/pkgs/by-name/ce/cewl/gemset.nix index b0daffb654de..1fc11621b17b 100644 --- a/pkgs/by-name/ce/cewl/gemset.nix +++ b/pkgs/by-name/ce/cewl/gemset.nix @@ -38,10 +38,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qg107qpl8gwmqjxcqiz37a3xmsgp503h9n74y8vyq0jj63gcz8w"; + sha256 = "0a27k4jcrx7pvb0p59fn1frh14iy087c2aygrdkmgwsrbshvqxpj"; type = "gem"; }; - version = "3.2025.0701"; + version = "3.2025.0924"; }; mini_exiftool = { dependencies = [ @@ -76,20 +76,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0rb306hbky6cxfyc8vrwpvl40fdapjvhsk62h08gg9wwbn3n8x4c"; + sha256 = "1hcwwr2h8jnqqxmf8mfb52b0dchr7pm064ingflb78wa00qhgk6m"; type = "gem"; }; - version = "1.18.8"; + version = "1.18.10"; }; ostruct = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1h6gazp5837xbz1aqvq9x0a5ffpw32nhvknn931a4074k6i04wvd"; + sha256 = "04nrir9wdpc4izqwqbysxyly8y7hsfr4fsv69rw91lfi9d5fv8lm"; type = "gem"; }; - version = "0.6.2"; + version = "0.6.3"; }; pstore = { groups = [ "default" ]; @@ -116,29 +116,29 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7"; + sha256 = "0hninnbvqd2pn40h863lbrn9p11gvdxp928izkag5ysx8b1s5q0r"; type = "gem"; }; - version = "3.4.1"; + version = "3.4.4"; }; rubyzip = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "05an0wz87vkmqwcwyh5rjiaavydfn5f4q1lixcsqkphzvj7chxw5"; + sha256 = "0g2vx9bwl9lgn3w5zacl52ax57k4zqrsxg05ixf42986bww9kvf0"; type = "gem"; }; - version = "2.4.1"; + version = "3.2.2"; }; spider = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0fix7zhnvlfqg66bxwdpbsffbynzdnaifnxpakn07bjh3rdj75cx"; + sha256 = "0v9pshmv9k19pld2a57c9zarab5gjdd239xa9b1qr0x8ndf2c3bb"; type = "gem"; }; - version = "0.5.4"; + version = "0.7.0"; }; }