Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 14133ec1245f
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0449a653eb37
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Dec 29, 2019

  1. resilio-sync: 2.6.3 -> 2.6.4 

    This release is a hotfix for a WebUI security issue:
https://forum.resilio.com/topic/71647-latest-desktop-build-264/

(cherry picked from commit a868603)
    @danieldk @thoughtpolice
    danieldk authored and thoughtpolice committed Dec 29, 2019
    Copy the full SHA
    e04700a View commit details

  2. john: use proper configure flags 

    - need --disable-native-tests not --disable-native-macro
- --with-systemwide is better than -DJOHN_SYSTEMWIDE=1

Fixes #74918

(cherry picked from commit 73cf5d9)
    @matthewbauer @flokli
    matthewbauer authored and flokli committed Dec 29, 2019
    Copy the full SHA
    0449a65 View commit details
Showing with 7 additions and 6 deletions.
  1. +3 −3 pkgs/applications/networking/resilio-sync/default.nix
  2. +4 −3 pkgs/tools/security/john/default.nix
6 changes: 3 additions & 3 deletions pkgs/applications/networking/resilio-sync/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,13 +9,13 @@ let

in stdenv.mkDerivation rec {
pname = "resilio-sync";
version = "2.6.3";
version = "2.6.4";

src = fetchurl {
url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz";
sha256 = {
x86_64-linux = "114k7dsxn7lzv6mjq9alsqxypvkah4lmjn5w6brbvgd6m6pdwslz";
i686-linux = "1dh0hxbd33bs51xib3qwxw58h9j30v0dc10b4x4rwkbgsj11nc83";
x86_64-linux = "1c1yksjag58p7yjm72iiz82p2r01lq7kxvq7z5phmq5z6gxdg4a8";
i686-linux = "167baz9fzmzk50jffzvgmgyw1zw3955r3cb73z23qvw8zqzdqydc";
}.${stdenv.hostPlatform.system};
};

7 changes: 4 additions & 3 deletions pkgs/tools/security/john/default.nix
View file
Original file line number Diff line number Diff line change
@@ -31,7 +31,10 @@ stdenv.mkDerivation rec {
export AS=$CC
export LD=$CC
'';
configureFlags = [ "--disable-native-macro" ];
configureFlags = [
"--disable-native-tests"
"--with-systemwide"
];

buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 gcc pythonPackages.wrapPython perl makeWrapper ];
propagatedBuildInputs = (with pythonPackages; [ dpkt scapy lxml ]) ++ # For pcap2john.py
@@ -43,8 +46,6 @@ stdenv.mkDerivation rec {
# gcc: error: memdbg.o: No such file or directory
enableParallelBuilding = false;

NIX_CFLAGS_COMPILE = [ "-DJOHN_SYSTEMWIDE=1" ];

postInstall = ''
mkdir -p "$out/bin" "$out/etc/john" "$out/share/john" "$out/share/doc/john"
find -L ../run -mindepth 1 -maxdepth 1 -type f -executable \