Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4fcf0bbb2086
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 762ee9e3ac14
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 4, 2019

  1. john: 1.8.0-jumbo-1 -> 1.9.0-jumbo-1 

    https://www.openwall.com/lists/announce/2019/05/14/1
    @dtzWill
    dtzWill committed Jun 4, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    nomadium Miguel Landaeta
    GPG key ID: AFB8E0FC9231CC6D
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0e3a443 View commit details

Commits on Jun 7, 2019

  1. Merge pull request #62686 from dtzWill/update/jtr-1.9.0 

    john: 1.8.0-jumbo-1 -> 1.9.0-jumbo-1
    @dtzWill
    dtzWill authored Jun 7, 2019
    Copy the full SHA
    762ee9e View commit details
Showing with 3 additions and 19 deletions.
  1. +3 −5 pkgs/tools/security/john/default.nix
  2. +0 −14 pkgs/tools/security/john/gcc5.patch
8 changes: 3 additions & 5 deletions pkgs/tools/security/john/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,15 +6,13 @@ with stdenv.lib;

stdenv.mkDerivation rec {
name = "john-${version}";
version = "1.8.0-jumbo-1";
version = "1.9.0-jumbo-1";

src = fetchurl {
url = "http://www.openwall.com/john/j/${name}.tar.xz";
sha256 = "08q92sfdvkz47rx6qjn7qv57cmlpy7i7rgddapq5384mb413vjds";
url = "http://www.openwall.com/john/k/${name}.tar.xz";
sha256 = "0fvz3v41hnaiv1ggpxanfykyfjq79cwp9qcqqn63vic357w27lgm";
};

patches = [ ./gcc5.patch ];

postPatch = ''
sed -ri -e '
s!^(#define\s+CFG_[A-Z]+_NAME\s+).*/!\1"'"$out"'/etc/john/!
14 changes: 0 additions & 14 deletions pkgs/tools/security/john/gcc5.patch
View file

This file was deleted.