diff options
| author | Vladyslav M <dywedir@gra.red> | 2019-06-04 01:46:26 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-04 01:46:26 +0300 |
| commit | b36bf7e2e22b34764bd89878fcec5f6e76a3e627 (patch) | |
| tree | efc6c5ace6f10b923cc001942f268294288613b4 /pkgs/tools/security | |
| parent | aa1edd09f15fec0fa0f894b2b87844a9451b7fa0 (diff) | |
| parent | b39e516708fd236116412e4fc15e4b6778ef6481 (diff) | |
hashcat: 5.0.0 -> 5.1.0 (#62142)
hashcat: 5.0.0 -> 5.1.0
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/hashcat/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/tools/security/hashcat/use-installed-xxhash.patch | 22 |
2 files changed, 5 insertions, 27 deletions
diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index 8316adb5a1e2..72a13c0f259e 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -1,23 +1,23 @@ { stdenv, fetchurl, makeWrapper, opencl-headers, ocl-icd, xxHash }: stdenv.mkDerivation rec { - name = "hashcat-${version}"; - version = "5.0.0"; + pname = "hashcat"; + version = "5.1.0"; src = fetchurl { url = "https://hashcat.net/files/hashcat-${version}.tar.gz"; - sha256 = "13xh1lmzdppvx8wr8blqhdr8vpa24j099kz2xzb9pcnqy26dk4kh"; + sha256 = "0f73y4cg8c7a6q7x34qvpfi4g3lw6j9bnn0a13g43aqyiskflfr8"; }; - patches = [ ./use-installed-xxhash.patch ]; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ opencl-headers xxHash ]; makeFlags = [ "PREFIX=${placeholder "out"}" - "OPENCL_HEADERS_KHRONOS=${opencl-headers}/include" "COMPTIME=1337" "VERSION_TAG=${version}" + "USE_SYSTEM_OPENCL=1" + "USE_SYSTEM_XXHASH=1" ]; postFixup = '' diff --git a/pkgs/tools/security/hashcat/use-installed-xxhash.patch b/pkgs/tools/security/hashcat/use-installed-xxhash.patch deleted file mode 100644 index d02303558ebb..000000000000 --- a/pkgs/tools/security/hashcat/use-installed-xxhash.patch +++ /dev/null @@ -1,22 +0,0 @@ -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) |