diff --git a/pkgs/by-name/as/asc-key-to-qr-code-gif/package.nix b/pkgs/by-name/as/asc-key-to-qr-code-gif/package.nix new file mode 100644 index 000000000000..32f8517a2b12 --- /dev/null +++ b/pkgs/by-name/as/asc-key-to-qr-code-gif/package.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + imagemagick, + qrencode, + testQR ? false, + zbar ? null, +}: +assert testQR -> zbar != false; +stdenvNoCC.mkDerivation { + pname = "asc-key-to-qr-code-gif"; + version = "0-unstable-2018-06-13"; + + src = fetchFromGitHub { + owner = "yishilin14"; + repo = "asc-key-to-qr-code-gif"; + rev = "5b7b239a0089a5269444cbe8a651c99dd43dce3f"; + sha256 = "0yrc302a2fhbzryb10718ky4fymfcps3lk67ivis1qab5kbp6z8r"; + }; + + dontBuild = true; + + postPatch = + let + substitutions = + [ + ''--replace-fail "convert" "${lib.getExe imagemagick}"'' + ''--replace-fail "qrencode" "${lib.getExe qrencode}"'' + ] + ++ lib.optionals testQR [ + ''--replace-fail "hash zbarimg" "true"'' # hash does not work on NixOS + ''--replace-fail "$(zbarimg --raw" "$(${zbar}/bin/zbarimg --raw"'' + ]; + in + '' + substituteInPlace asc-to-gif.sh ${lib.concatStringsSep " " substitutions} + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp asc-to-gif.sh $out/bin/asc-to-gif + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/yishilin14/asc-key-to-qr-code-gif"; + description = "Convert ASCII-armored PGP keys to animated QR code"; + license = lib.licenses.unfree; # program does not have a license + mainProgram = "asc-to-gif"; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ + asymmetric + NotAShelf + ]; + }; +} diff --git a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix deleted file mode 100644 index 3091a8c91554..000000000000 --- a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, imagemagick, qrencode -, testQR ? false, zbar ? null -}: - -assert testQR -> zbar != false; - -stdenv.mkDerivation { - pname = "asc-key-to-qr-code-gif"; - version = "20180613"; - - src = fetchFromGitHub { - owner = "yishilin14"; - repo = "asc-key-to-qr-code-gif"; - rev = "5b7b239a0089a5269444cbe8a651c99dd43dce3f"; - sha256 = "0yrc302a2fhbzryb10718ky4fymfcps3lk67ivis1qab5kbp6z8r"; - }; - - dontBuild = true; - dontStrip = true; - dontPatchELF = true; - - preInstall = let - substitutions = [ - ''--replace "convert" "${imagemagick}/bin/convert"'' - ''--replace "qrencode" "${qrencode.bin}/bin/qrencode"'' - ] ++ lib.optionals testQR [ - ''--replace "hash zbarimg" "true"'' # hash does not work on NixOS - ''--replace "$(zbarimg --raw" "$(${zbar.out}/bin/zbarimg --raw"'' - ]; - in '' - substituteInPlace asc-to-gif.sh ${lib.concatStringsSep " " substitutions} - ''; - - installPhase = '' - mkdir -p $out/bin - cp * $out/bin/ - ''; - - meta = with lib; { - homepage = "https://github.com/yishilin14/asc-key-to-qr-code-gif"; - description = "Convert ASCII-armored PGP keys to animated QR code"; - mainProgram = "asc-to-gif.sh"; - platforms = platforms.unix; - maintainers = with maintainers; [ asymmetric ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9e889de1649..6a930105dca7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3921,8 +3921,6 @@ with pkgs; xjadeo = callPackage ../tools/video/xjadeo { }; - asc-key-to-qr-code-gif = callPackage ../tools/security/asc-key-to-qr-code-gif { }; - go-audit = callPackage ../tools/system/go-audit { }; gopass = callPackage ../tools/security/gopass { };