From 001f99b21ff5139e64b6c378981046106010eb00 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 May 2025 19:57:19 +0000 Subject: [PATCH 1/2] zsteg: Migrate to by-name --- pkgs/{tools/security => by-name/zs}/zsteg/Gemfile | 0 pkgs/{tools/security => by-name/zs}/zsteg/Gemfile.lock | 0 pkgs/{tools/security => by-name/zs}/zsteg/gemset.nix | 0 .../security/zsteg/default.nix => by-name/zs/zsteg/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{tools/security => by-name/zs}/zsteg/Gemfile (100%) rename pkgs/{tools/security => by-name/zs}/zsteg/Gemfile.lock (100%) rename pkgs/{tools/security => by-name/zs}/zsteg/gemset.nix (100%) rename pkgs/{tools/security/zsteg/default.nix => by-name/zs/zsteg/package.nix} (100%) diff --git a/pkgs/tools/security/zsteg/Gemfile b/pkgs/by-name/zs/zsteg/Gemfile similarity index 100% rename from pkgs/tools/security/zsteg/Gemfile rename to pkgs/by-name/zs/zsteg/Gemfile diff --git a/pkgs/tools/security/zsteg/Gemfile.lock b/pkgs/by-name/zs/zsteg/Gemfile.lock similarity index 100% rename from pkgs/tools/security/zsteg/Gemfile.lock rename to pkgs/by-name/zs/zsteg/Gemfile.lock diff --git a/pkgs/tools/security/zsteg/gemset.nix b/pkgs/by-name/zs/zsteg/gemset.nix similarity index 100% rename from pkgs/tools/security/zsteg/gemset.nix rename to pkgs/by-name/zs/zsteg/gemset.nix diff --git a/pkgs/tools/security/zsteg/default.nix b/pkgs/by-name/zs/zsteg/package.nix similarity index 100% rename from pkgs/tools/security/zsteg/default.nix rename to pkgs/by-name/zs/zsteg/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8ed42c1930a..6dd81b012e7c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14662,8 +14662,6 @@ with pkgs; zotero_7 = pkgs.zotero; - zsteg = callPackage ../tools/security/zsteg { }; - zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { guiModule = "zest"; fftw = fftwSinglePrec; From c322f8d7c87a81d98accd2a461e814be3852d632 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 May 2025 20:00:34 +0000 Subject: [PATCH 2/2] zsteg: Update gems and add missing bundler updater. --- pkgs/by-name/zs/zsteg/Gemfile.lock | 8 ++++---- pkgs/by-name/zs/zsteg/gemset.nix | 12 ++++++------ pkgs/by-name/zs/zsteg/package.nix | 10 ++++++++-- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/zs/zsteg/Gemfile.lock b/pkgs/by-name/zs/zsteg/Gemfile.lock index 0cd593f60a0f..ef7578657924 100644 --- a/pkgs/by-name/zs/zsteg/Gemfile.lock +++ b/pkgs/by-name/zs/zsteg/Gemfile.lock @@ -2,12 +2,12 @@ GEM remote: https://rubygems.org/ specs: forwardable (1.3.3) - iostruct (0.0.5) - prime (0.1.2) + iostruct (0.5.0) + prime (0.1.3) forwardable singleton rainbow (3.1.1) - singleton (0.2.0) + singleton (0.3.0) zpng (0.4.5) rainbow (~> 3.1.1) zsteg (0.2.13) @@ -22,4 +22,4 @@ DEPENDENCIES zsteg BUNDLED WITH - 2.4.13 + 2.6.6 diff --git a/pkgs/by-name/zs/zsteg/gemset.nix b/pkgs/by-name/zs/zsteg/gemset.nix index 07dfcf016f01..37fa75cb8113 100644 --- a/pkgs/by-name/zs/zsteg/gemset.nix +++ b/pkgs/by-name/zs/zsteg/gemset.nix @@ -14,10 +14,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1z3vnb8mhzns3ybf78vlj5cy6lq4pyfm8n40kqba2s33xccs3kl0"; + sha256 = "0pswyhjz9d90bympsz6s0rgv24b8nrd4lk5y16kz67vdw6vbaqbp"; type = "gem"; }; - version = "0.0.5"; + version = "0.5.0"; }; prime = { dependencies = [ @@ -28,10 +28,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1973kz8lbck6ga5v42f55jk8b8pnbgwp9p67dl1xw15gvz55dsfl"; + sha256 = "1qsk9q2n4yb80f5mwslxzfzm2ckar25grghk95cj7sbc1p2k3w5s"; type = "gem"; }; - version = "0.1.2"; + version = "0.1.3"; }; rainbow = { groups = [ "default" ]; @@ -48,10 +48,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qq54imvbksnckzf9hrq9bjzcdb0n8wfv6l5jc0di10n88277jx6"; + sha256 = "0y2pc7lr979pab5n5lvk3jhsi99fhskl5f2s6004v8sabz51psl3"; type = "gem"; }; - version = "0.2.0"; + version = "0.3.0"; }; zpng = { dependencies = [ "rainbow" ]; diff --git a/pkgs/by-name/zs/zsteg/package.nix b/pkgs/by-name/zs/zsteg/package.nix index c078189f4f29..d2f58193729a 100644 --- a/pkgs/by-name/zs/zsteg/package.nix +++ b/pkgs/by-name/zs/zsteg/package.nix @@ -1,12 +1,18 @@ -{ lib, bundlerApp }: +{ + lib, + bundlerApp, + bundlerUpdateScript, +}: -bundlerApp { +bundlerApp rec { pname = "zsteg"; gemdir = ./.; exes = [ "zsteg" ]; + passthru.updateScript = bundlerUpdateScript pname; + meta = with lib; { description = "Detect stegano-hidden data in PNG & BMP"; homepage = "http://zed.0xff.me/";