diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-11 00:07:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-11 00:07:11 +0000 |
| commit | 07e8aeb3a02180a4dce55dd9c4ad83b8563dc1ea (patch) | |
| tree | ce62bb9b3b5fcf72d4675f8ae1b67c4726f4e424 /pkgs/tools/graphics | |
| parent | d8e8bb12105bc446b169610551382d22c2ac22d9 (diff) | |
| parent | 523850d2466cb6c3d61ad1f3bc0deff55db8adec (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/perceptualdiff/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/tools/graphics/qrcode/default.nix | 10 |
2 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/tools/graphics/perceptualdiff/default.nix b/pkgs/tools/graphics/perceptualdiff/default.nix index 454352986edf..f2281bc5d35f 100644 --- a/pkgs/tools/graphics/perceptualdiff/default.nix +++ b/pkgs/tools/graphics/perceptualdiff/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/myint/perceptualdiff"; license = licenses.gpl2Plus; maintainers = with maintainers; [ uri-canva ]; - platforms = platforms.x86; + platforms = platforms.unix; + broken = stdenv.hostPlatform.system == "aarch64-darwin"; }; } diff --git a/pkgs/tools/graphics/qrcode/default.nix b/pkgs/tools/graphics/qrcode/default.nix index 93a620b57792..2067d1a97e2e 100644 --- a/pkgs/tools/graphics/qrcode/default.nix +++ b/pkgs/tools/graphics/qrcode/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { - pname = "qrcode-git"; - version = "20160804"; + pname = "qrcode"; + version = "unstable-2016-08-04"; src = fetchFromGitHub { - owner = "qsantos"; - repo = "qrcode"; - rev = "ad0fdb4aafd0d56b903f110f697abaeb27deee73"; + owner = "qsantos"; + repo = "qrcode"; + rev = "ad0fdb4aafd0d56b903f110f697abaeb27deee73"; sha256 = "0v81745nx5gny2g05946k8j553j18a29ikmlyh6c3syq6c15k8cf"; }; |