From 07ee2b907d8deabcf6d7fb4269ad0b681f9c0f06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 3 May 2018 15:22:01 +0100 Subject: [PATCH 1/2] john: build with recent gcc --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f13edf9eba44..77f55ad2cbcc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3138,9 +3138,7 @@ with pkgs; go-jira = callPackage ../applications/misc/go-jira { }; - john = callPackage ../tools/security/john { - gcc = gcc49; # doesn't build with gcc5 - }; + john = callPackage ../tools/security/john { }; journalbeat = callPackage ../tools/system/journalbeat { }; From 7ac652df4b151f62b9627522a11c3937fb137603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 3 May 2018 17:06:37 +0100 Subject: [PATCH 2/2] john: disable aarch64 --- pkgs/tools/security/john/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index 7552b21ed333..e55e97656f63 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; homepage = https://github.com/magnumripper/JohnTheRipper/; maintainers = with maintainers; [ offline ]; - platforms = platforms.unix; + platforms = [ "x86_64-linux" "x86_64-darwin"]; }; }