From 50ab490bdb7fc70f2b5b04349ae1c02b2d443a92 Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Sat, 19 Dec 2020 06:34:09 +0000 Subject: [PATCH 1/2] maintainers: add applePrincess --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b0babe8da74..751a2604fb0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -686,6 +686,16 @@ githubId = 1078530; name = "Alexandre Peyroux"; }; + applePrincess = { + email = "appleprincess@appleprincess.io"; + github = "applePrincess"; + githubId = 17154507; + name = "Lein Matsumaru"; + keys = [{ + longkeyid = "rsa4096/0xAAA50652F0479205"; + fingerprint = "BF8B F725 DA30 E53E 7F11 4ED8 AAA5 0652 F047 9205"; + }]; + }; ar1a = { email = "aria@ar1as.space"; github = "ar1a"; From 3e17811f0d0cbe2b5ad9e72afb148dccfb896d8f Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Sat, 19 Dec 2020 06:37:28 +0000 Subject: [PATCH 2/2] zsteg: init at 0.2.2 --- pkgs/tools/security/zsteg/Gemfile | 2 ++ pkgs/tools/security/zsteg/Gemfile.lock | 19 +++++++++++ pkgs/tools/security/zsteg/default.nix | 16 ++++++++++ pkgs/tools/security/zsteg/gemset.nix | 44 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 5 files changed, 83 insertions(+) create mode 100644 pkgs/tools/security/zsteg/Gemfile create mode 100644 pkgs/tools/security/zsteg/Gemfile.lock create mode 100644 pkgs/tools/security/zsteg/default.nix create mode 100644 pkgs/tools/security/zsteg/gemset.nix diff --git a/pkgs/tools/security/zsteg/Gemfile b/pkgs/tools/security/zsteg/Gemfile new file mode 100644 index 00000000000..814e5fe8ad4 --- /dev/null +++ b/pkgs/tools/security/zsteg/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'zsteg' diff --git a/pkgs/tools/security/zsteg/Gemfile.lock b/pkgs/tools/security/zsteg/Gemfile.lock new file mode 100644 index 00000000000..b611fb93f5a --- /dev/null +++ b/pkgs/tools/security/zsteg/Gemfile.lock @@ -0,0 +1,19 @@ +GEM + remote: https://rubygems.org/ + specs: + iostruct (0.0.4) + rainbow (3.0.0) + zpng (0.3.1) + rainbow + zsteg (0.2.2) + iostruct + zpng (>= 0.3.1) + +PLATFORMS + ruby + +DEPENDENCIES + zsteg + +BUNDLED WITH + 2.1.4 diff --git a/pkgs/tools/security/zsteg/default.nix b/pkgs/tools/security/zsteg/default.nix new file mode 100644 index 00000000000..e47f285de70 --- /dev/null +++ b/pkgs/tools/security/zsteg/default.nix @@ -0,0 +1,16 @@ +{ lib, bundlerApp }: + +bundlerApp { + pname = "zsteg"; + + gemdir = ./.; + + exes = [ "zsteg" ]; + + meta = with lib; { + description = "Detect stegano-hidden data in PNG & BMP."; + homepage = "http://zed.0xff.me/"; + license = licenses.mit; + maintainers = with maintainers; [ applePrincess ]; + }; +} diff --git a/pkgs/tools/security/zsteg/gemset.nix b/pkgs/tools/security/zsteg/gemset.nix new file mode 100644 index 00000000000..4f5bd79ce44 --- /dev/null +++ b/pkgs/tools/security/zsteg/gemset.nix @@ -0,0 +1,44 @@ +{ + iostruct = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kwp6ryis32j3z7myw8g7v1yszwrwyl04g2c7flr42pwxga1afxc"; + type = "gem"; + }; + version = "0.0.4"; + }; + rainbow = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; + type = "gem"; + }; + version = "3.0.0"; + }; + zpng = { + dependencies = ["rainbow"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ciyab7qxqsxjhfvr6rbpdzg655fi1zygqg9sd9m6wmgc037dj74"; + type = "gem"; + }; + version = "0.3.1"; + }; + zsteg = { + dependencies = ["iostruct" "zpng"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mwajlsgs27449n2yf2f9hz8g46qv9bz9f58i9cz1jg58spvpxpk"; + type = "gem"; + }; + version = "0.2.2"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ddecc16470..1b026a53612 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26363,6 +26363,8 @@ in zscroll = callPackage ../applications/misc/zscroll {}; + zsteg = callPackage ../tools/security/zsteg { }; + zynaddsubfx = zyn-fusion; zynaddsubfx-fltk = callPackage ../applications/audio/zynaddsubfx {