From 956f94252a7fff048583c109e3fd4b7885f8fa9f Mon Sep 17 00:00:00 2001 From: liberodark Date: Mon, 28 Apr 2025 18:22:32 +0200 Subject: [PATCH] oxidized: 0.30.1 -> 0.33.0 --- pkgs/by-name/ox/oxidized/Gemfile | 13 ++--- pkgs/by-name/ox/oxidized/Gemfile.lock | 63 +++++++++++++----------- pkgs/by-name/ox/oxidized/gemset.nix | 71 ++++++++++++++++++++------- 3 files changed, 92 insertions(+), 55 deletions(-) diff --git a/pkgs/by-name/ox/oxidized/Gemfile b/pkgs/by-name/ox/oxidized/Gemfile index 7a7d3f0fb2ac..6ce79a159835 100644 --- a/pkgs/by-name/ox/oxidized/Gemfile +++ b/pkgs/by-name/ox/oxidized/Gemfile @@ -1,11 +1,6 @@ source 'https://rubygems.org' -gem 'oxidized', '0.30.1' -gem 'oxidized-web', '0.14.0' - -# The version on rubygems is not up2date -gem 'oxidized-script', git: 'https://github.com/ytti/oxidized-script.git', ref: '988cded5d89f52e274afb545bd3e011e19d5d22d' - -# Fix for https://github.com/ytti/oxidized/issues/2769 -gem 'psych', '~> 3.3.2' - +gem 'oxidized', '0.33.0' +gem 'oxidized-web', '0.16.0' +gem 'oxidized-script', '0.7.0' +gem 'psych', '~> 5.0' diff --git a/pkgs/by-name/ox/oxidized/Gemfile.lock b/pkgs/by-name/ox/oxidized/Gemfile.lock index 660cf7cdb813..667fe8266d0d 100644 --- a/pkgs/by-name/ox/oxidized/Gemfile.lock +++ b/pkgs/by-name/ox/oxidized/Gemfile.lock @@ -1,18 +1,11 @@ -GIT - remote: https://github.com/ytti/oxidized-script.git - revision: 988cded5d89f52e274afb545bd3e011e19d5d22d - ref: 988cded5d89f52e274afb545bd3e011e19d5d22d - specs: - oxidized-script (0.6.0) - oxidized (~> 0.28) - slop (~> 4.6) - GEM remote: https://rubygems.org/ specs: asetus (0.4.0) base64 (0.2.0) bcrypt_pbkdf (1.1.1) + bcrypt_pbkdf (1.1.1-arm64-darwin) + bcrypt_pbkdf (1.1.1-x86_64-darwin) charlock_holmes (0.7.9) date (3.4.1) ed25519 (1.3.0) @@ -23,7 +16,7 @@ GEM thor tilt htmlentities (4.3.4) - json (2.10.2) + json (2.11.3) logger (1.7.0) multi_json (1.15.0) mustermann (3.0.3) @@ -31,6 +24,7 @@ GEM net-ftp (0.3.8) net-protocol time + net-http-digest_auth (1.4.1) net-protocol (0.2.2) timeout net-scp (4.1.0) @@ -38,31 +32,40 @@ GEM net-ssh (7.3.0) net-telnet (0.2.0) nio4r (2.7.4) - oxidized (0.30.1) - asetus (~> 0.1) + ostruct (0.6.1) + oxidized (0.33.0) + asetus (~> 0.4) bcrypt_pbkdf (~> 1.0) ed25519 (~> 1.2) net-ftp (~> 0.2) - net-scp (~> 4.0) - net-ssh (~> 7.1) + net-http-digest_auth (~> 1.4) + net-scp (~> 4.1) + net-ssh (~> 7.3) net-telnet (~> 0.2) - psych (~> 3.3.2) + ostruct (~> 0.6) + psych (~> 5.0) rugged (~> 1.6) slop (~> 4.6) - oxidized-web (0.14.0) + oxidized-script (0.7.0) + oxidized (~> 0.29) + slop (~> 4.6) + oxidized-web (0.16.0) charlock_holmes (~> 0.7.5) emk-sinatra-url-for (~> 0.2) haml (~> 6.0) htmlentities (~> 4.3) json (~> 2.3) - oxidized (~> 0.26) - puma (>= 3.11.4, < 6.5.0) - sinatra (>= 1.4.6, < 5.0) - sinatra-contrib (>= 1.4.6, < 5.0) - psych (3.3.4) - puma (6.4.3) + ostruct (~> 0.6) + oxidized (~> 0.31) + puma (>= 3.11.4) + sinatra (>= 1.4.6) + sinatra-contrib (>= 1.4.6) + psych (5.2.3) + date + stringio + puma (6.6.0) nio4r (~> 2.0) - rack (3.1.12) + rack (3.1.13) rack-protection (4.1.1) base64 (>= 0.1.0) logger (>= 1.6.0) @@ -86,6 +89,7 @@ GEM sinatra (= 4.1.1) tilt (~> 2.0) slop (4.10.1) + stringio (3.1.7) temple (0.10.3) thor (1.3.2) tilt (2.6.0) @@ -94,13 +98,16 @@ GEM timeout (0.4.3) PLATFORMS + arm64-darwin ruby + x86_64-darwin + x86_64-linux DEPENDENCIES - oxidized (= 0.30.1) - oxidized-script! - oxidized-web (= 0.14.0) - psych (~> 3.3.2) + oxidized (= 0.33.0) + oxidized-script (= 0.7.0) + oxidized-web (= 0.16.0) + psych (~> 5.0) BUNDLED WITH - 2.6.2 + 2.5.22 diff --git a/pkgs/by-name/ox/oxidized/gemset.nix b/pkgs/by-name/ox/oxidized/gemset.nix index 3bbb47bc3d0c..c946d8773f98 100644 --- a/pkgs/by-name/ox/oxidized/gemset.nix +++ b/pkgs/by-name/ox/oxidized/gemset.nix @@ -100,10 +100,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "01lbdaizhkxmrw4y8j3wpvsryvnvzmg0pfs56c52laq2jgdfmq1l"; + sha256 = "1hfcz73wszgqprg2pr83qjbyfb0k93frbdvyhgmw0ryyl9cgc44s"; type = "gem"; }; - version = "2.10.2"; + version = "2.11.3"; }; logger = { groups = [ "default" ]; @@ -150,6 +150,16 @@ }; version = "0.3.8"; }; + net-http-digest_auth = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1nq859b0gh2vjhvl1qh1zrk09pc7p54r9i6nnn6sb06iv07db2jb"; + type = "gem"; + }; + version = "1.4.1"; + }; net-protocol = { dependencies = [ "timeout" ]; groups = [ "default" ]; @@ -202,15 +212,27 @@ }; version = "2.7.4"; }; + ostruct = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9"; + type = "gem"; + }; + version = "0.6.1"; + }; oxidized = { dependencies = [ "asetus" "bcrypt_pbkdf" "ed25519" "net-ftp" + "net-http-digest_auth" "net-scp" "net-ssh" "net-telnet" + "ostruct" "psych" "rugged" "slop" @@ -219,10 +241,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ry9rwksjb80wxd42zv5m5444n5hwhkbr4spa895jk2c1k5q1y0c"; + sha256 = "02vprgsqaafrnkz9fhj27mv8ngir4h1g07zc6s6f7gja5awfwqzm"; type = "gem"; }; - version = "0.30.1"; + version = "0.33.0"; }; oxidized-script = { dependencies = [ @@ -232,13 +254,11 @@ groups = [ "default" ]; platforms = [ ]; source = { - fetchSubmodules = false; - rev = "988cded5d89f52e274afb545bd3e011e19d5d22d"; - sha256 = "13vglj6w37xd6dqfn98xdan3kqbs460akj1rdr4bm7lsrpa281gf"; - type = "git"; - url = "https://github.com/ytti/oxidized-script.git"; + remotes = [ "https://rubygems.org" ]; + sha256 = "0734py1wb97zgjlsdd9rfw60pm0pnp02a53z0va5w5ng7sjn2zli"; + type = "gem"; }; - version = "0.6.0"; + version = "0.7.0"; }; oxidized-web = { dependencies = [ @@ -247,6 +267,7 @@ "haml" "htmlentities" "json" + "ostruct" "oxidized" "puma" "sinatra" @@ -256,20 +277,24 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0mf1kxjg49fxf988sqd9cni8j5r8xsp3218370ppinsy39l50782"; + sha256 = "1w16ha8rdnqb9j7v9mjdgfh4p0fdmwfxfprs167267ag1mah4268"; type = "gem"; }; - version = "0.14.0"; + version = "0.16.0"; }; psych = { + dependencies = [ + "date" + "stringio" + ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "186i2hc6sfvg4skhqf82kxaf4mb60g65fsif8w8vg1hc9mbyiaph"; + sha256 = "1vjrx3yd596zzi42dcaq5xw7hil1921r769dlbz08iniaawlp9c4"; type = "gem"; }; - version = "3.3.4"; + version = "5.2.3"; }; puma = { dependencies = [ "nio4r" ]; @@ -277,20 +302,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0gml1rixrfb0naciq3mrnqkpcvm9ahgps1c04hzxh4b801f69914"; + sha256 = "11xd3207k5rl6bz0qxhcb3zcr941rhx7ig2f19gxxmdk7s3hcp7j"; type = "gem"; }; - version = "6.4.3"; + version = "6.6.0"; }; rack = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0h65a1f9gsqx2ryisdy4lrd9a9l8gdv65dcscw9ynwwjr1ak1n00"; + sha256 = "14jpch41i6iclbgc8rykvkyn7ii8s9dwvn98k96qi0hqcbdpj30p"; type = "gem"; }; - version = "3.1.12"; + version = "3.1.13"; }; rack-protection = { dependencies = [ @@ -386,6 +411,16 @@ }; version = "4.10.1"; }; + stringio = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1yh78pg6lm28c3k0pfd2ipskii1fsraq46m6zjs5yc9a4k5vfy2v"; + type = "gem"; + }; + version = "3.1.7"; + }; temple = { groups = [ "default" ]; platforms = [ ];