public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #39929 from Mic92/john

Browse Source 
john: build with recent gcc
This commit is contained in:
xeji 2018-05-05 20:58:03 +02:00 committed by GitHub
commit 38ae2105b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/security/john/default.nix
View File

@ -69,6 +69,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2; license = licenses.gpl2;
homepage = https://github.com/magnumripper/JohnTheRipper/; homepage = https://github.com/magnumripper/JohnTheRipper/;
maintainers = with maintainers; [ offline ]; maintainers = with maintainers; [ offline ];
platforms = platforms.unix; platforms = [ "x86_64-linux" "x86_64-darwin"];
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -3145,9 +3145,7 @@ with pkgs;
go-jira = callPackage ../applications/misc/go-jira { }; go-jira = callPackage ../applications/misc/go-jira { };
john = callPackage ../tools/security/john { john = callPackage ../tools/security/john { };
gcc = gcc49; # doesn't build with gcc5
};
journalbeat = callPackage ../tools/system/journalbeat { }; journalbeat = callPackage ../tools/system/journalbeat { };