diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-11-18 12:11:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-18 12:11:58 +0000 |
| commit | f6fd7f44c7efaa614e17aca9a743b3aba34af5f7 (patch) | |
| tree | c535d20014bd418bd5f066c138ecb337a9ed60f8 /pkgs/tools | |
| parent | 74f9e555d3b93abb205e2e89550616d53a382db6 (diff) | |
| parent | df462d09e4f146bf85a3556af3bd7564802e979e (diff) | |
| download | nixlib-f6fd7f44c7efaa614e17aca9a743b3aba34af5f7.tar nixlib-f6fd7f44c7efaa614e17aca9a743b3aba34af5f7.tar.gz nixlib-f6fd7f44c7efaa614e17aca9a743b3aba34af5f7.tar.bz2 nixlib-f6fd7f44c7efaa614e17aca9a743b3aba34af5f7.tar.lz nixlib-f6fd7f44c7efaa614e17aca9a743b3aba34af5f7.tar.xz nixlib-f6fd7f44c7efaa614e17aca9a743b3aba34af5f7.tar.zst nixlib-f6fd7f44c7efaa614e17aca9a743b3aba34af5f7.zip | |
Merge pull request #50523 from kierdavis/hashcat-5.0.0
hashcat: 4.2.1 -> 5.0.0
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/security/hashcat/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/tools/security/hashcat/use-installed-xxhash.patch | 22 |
2 files changed, 27 insertions, 4 deletions
diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index 9bac2d6c8035..68866a8cad4f 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchurl, makeWrapper, opencl-headers, ocl-icd }: +{ stdenv, fetchurl, makeWrapper, opencl-headers, ocl-icd, xxHash }: stdenv.mkDerivation rec { name = "hashcat-${version}"; - version = "4.2.1"; + version = "5.0.0"; src = fetchurl { url = "https://hashcat.net/files/hashcat-${version}.tar.gz"; - sha256 = "082k5srjwkfvnvz0bfcg5r12m9c2qjyfhnp135mparkf831p7bbx"; + sha256 = "13xh1lmzdppvx8wr8blqhdr8vpa24j099kz2xzb9pcnqy26dk4kh"; }; + patches = [ ./use-installed-xxhash.patch ]; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ opencl-headers ]; + buildInputs = [ opencl-headers xxHash ]; makeFlags = [ "OPENCL_HEADERS_KHRONOS=${opencl-headers}/include" diff --git a/pkgs/tools/security/hashcat/use-installed-xxhash.patch b/pkgs/tools/security/hashcat/use-installed-xxhash.patch new file mode 100644 index 000000000000..d02303558ebb --- /dev/null +++ b/pkgs/tools/security/hashcat/use-installed-xxhash.patch @@ -0,0 +1,22 @@ +diff --git a/src/Makefile b/src/Makefile +index 3a1cd680..576353fe 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -189,7 +189,7 @@ endif + # brain and xxHash + ifeq ($(ENABLE_BRAIN),1) + CFLAGS += -DWITH_BRAIN +-CFLAGS += -Ideps/git/xxHash ++LFLAGS += -lxxhash + endif + + ## +@@ -313,7 +313,7 @@ WIN_32_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).WIN.32.o) + WIN_64_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).WIN.64.o) + + ifeq ($(ENABLE_BRAIN),1) +-OBJS_XXHASH := xxhash ++OBJS_XXHASH := + + NATIVE_STATIC_OBJS += $(foreach OBJ,$(OBJS_XXHASH),obj/$(OBJ).NATIVE.STATIC.o) + NATIVE_SHARED_OBJS += $(foreach OBJ,$(OBJS_XXHASH),obj/$(OBJ).NATIVE.SHARED.o) |