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: b3dab5b088a7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 232340f35bca
Choose a head ref
  • 12 commits
  • 11 files changed
  • 1 contributor

Commits on Sep 28, 2017

  1. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    jonringer Jonathan Ringer
    Copy the full SHA
    6dd6f10 View commit details
  2. mongoc: 1.7.0 -> 1.8.0

    fpletz committed Sep 28, 2017
    Copy the full SHA
    cc258a6 View commit details
  3. Copy the full SHA
    8a5b8ae View commit details
  4. Copy the full SHA
    15a6c2c View commit details
  5. samba3: mark as vulnerable

    fpletz committed Sep 28, 2017
    Copy the full SHA
    c02c47d View commit details
  6. Copy the full SHA
    41b43b2 View commit details
  7. Copy the full SHA
    c7e16f5 View commit details
  8. Copy the full SHA
    58f15c1 View commit details
  9. php70: 7.0.22 -> 7.0.24

    fpletz committed Sep 28, 2017
    Copy the full SHA
    d27ebcb View commit details
  10. php71: 7.1.8 -> 7.1.9

    fpletz committed Sep 28, 2017
    Copy the full SHA
    09b6f1e View commit details
  11. Copy the full SHA
    8678f14 View commit details
  12. Copy the full SHA
    232340f View commit details
8 changes: 4 additions & 4 deletions pkgs/development/interpreters/php/default.nix
Original file line number Diff line number Diff line change
@@ -330,12 +330,12 @@ in {
};

php70 = generic {
version = "7.0.22";
sha256 = "1ppxdlyb9vapcmzylml447vrlizam72h1w41vvn15pdbd5zv5q48";
version = "7.0.24";
sha256 = "06fgpljz6xpxxkpf4cv9rqz8g504l9ikbw5aq0hqh5sgd611kycv";
};

php71 = generic {
version = "7.1.8";
sha256 = "1y527hs9yh9lmr38q3rf7gkhnvk49vh4nyhci6852mjhjh5a0r3h";
version = "7.1.9";
sha256 = "1blvzm2js8mrdbmwks0v6nlb5wj4789ixzmlxm1l8z6xvw8cqk9i";
};
}
4 changes: 2 additions & 2 deletions pkgs/development/libraries/kerberos/krb5.nix
Original file line number Diff line number Diff line change
@@ -12,11 +12,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "${type}krb5-${version}";
majorVersion = "1.15";
version = "${majorVersion}";
version = "${majorVersion}.2";

src = fetchurl {
url = "${meta.homepage}dist/krb5/${majorVersion}/krb5-${version}.tar.gz";
sha256 = "0z0jxm6ppbxi9anv2h12nrb5lpwl95f96kw6dx7sn268fhkpad7x";
sha256 = "0zn8s7anb10hw3nzwjz7vg10fgmmgvwnibn2zrn3nppjxn9f6f8n";
};

configureFlags = [ "--with-tcl=no" "--localstatedir=/var/lib"]
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libbson/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
name = "libbson-${version}";
version = "1.6.1";
version = "1.8.0";

src = fetchFromGitHub {
owner = "mongodb";
repo = "libbson";
rev = version;
sha256 = "1ilxbv4yjgf0vfzaa8lzn40hv5x1737ny2g2q1wmm8bl39m0viiw";
sha256 = "1bd9z07q3faq5k4521d9inv0j836w6hrsd0vj2sapjlq8jmqgslg";
};

nativeBuildInputs = [ cmake ];
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libraw/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "libraw-${version}";
version = "0.18.2";
version = "0.18.5";

src = fetchurl {
url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz";
sha256 = "1imby9x88pjx4ad1frdi3bfb8dw90ccyj5pb6w3i6i0iijrnndnf";
sha256 = "0y519nlvl4bfnnxbwry35f6gbcv6jbbpd2lmiwv6pbyzv4a7saps";
};

outputs = [ "out" "lib" "dev" "doc" ];
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libtiff/default.nix
Original file line number Diff line number Diff line change
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {

prePatch =let
debian = fetchurl {
url = http://snapshot.debian.org/archive/debian-debug/20170602T031313Z/pool/main/t/tiff/tiff_4.0.8-2.debian.tar.xz;
sha256 = "1ssjh6vn9rvl2jwm34i3p89g8lj0c7fj3cziva9rj4vasfps58ng";
url = http://snapshot.debian.org/archive/debian-debug/20170928T093547Z/pool/main/t/tiff/tiff_4.0.8-5.debian.tar.xz;
sha256 = "11qkiliw04dmdvdd5z2lv5hh2fiwa29qbhkxvlvmb4yslnmyywha";
};
in ''
tar xf '${debian}'
4 changes: 2 additions & 2 deletions pkgs/development/libraries/mongoc/default.nix
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@

stdenv.mkDerivation rec {
name = "mongoc-${version}";
version = "1.7.0";
version = "1.8.0";

src = fetchzip {
url = "https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz";
sha256 = "1s0j7wmgdkgawzd75psh5ml35lkx68h6pimqrnfp2z1ggzcwajgn";
sha256 = "1vnnk3pwbcmwva1010bl111kdcdx3yb2w7j7a78hhvrm1k9r1wp8";
};

propagatedBuildInputs = [ libbson ];
17 changes: 11 additions & 6 deletions pkgs/development/libraries/oniguruma/default.nix
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
{ stdenv, fetchurl }:
{ stdenv, fetchFromGitHub, cmake }:

stdenv.mkDerivation rec {
name = "onig-5.9.5";
name = "onig-${version}";
version = "6.6.1";

src = fetchurl {
url = http://www.geocities.jp/kosako3/oniguruma/archive/onig-5.9.5.tar.gz;
sha256 = "12j3fsdb8hbhnj29hysal9l7i7s71l0ln3lx8hjpxx5535wawjcz";
src = fetchFromGitHub {
owner = "kkos";
repo = "oniguruma";
rev = "v${version}";
sha256 = "062g5443dyxsraq346panfqvbd6wal6nmb336n4dw1rszx576sxz";
};

nativeBuildInputs = [ cmake ];

meta = {
homepage = http://www.geocities.jp/kosako3/oniguruma/;
homepage = https://github.com/kkos/oniguruma;
description = "Regular expressions library";
license = stdenv.lib.licenses.bsd2;
maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
3 changes: 3 additions & 0 deletions pkgs/servers/samba/3.x.nix
Original file line number Diff line number Diff line change
@@ -91,5 +91,8 @@ stdenv.mkDerivation rec {
homepage = http://www.samba.org/;
description = "The standard Windows interoperability suite of programs for Linux and Unix";
platforms = stdenv.lib.platforms.linux;
knownVulnerabilities = [
"Numerous CVEs and no patches from upstream for 3.x since 2014."
];
};
}
4 changes: 2 additions & 2 deletions pkgs/servers/samba/4.x.nix
Original file line number Diff line number Diff line change
@@ -19,11 +19,11 @@ with lib;

stdenv.mkDerivation rec {
name = "samba-${version}";
version = "4.6.7";
version = "4.6.8";

src = fetchurl {
url = "mirror://samba/pub/samba/stable/${name}.tar.gz";
sha256 = "1ynxndfk45zkkylz3jsrx42a7kmm42jddk5bdhihyf88vs9l7wly";
sha256 = "0pap686cl0j5c9v1v09krpqdk416x3851fbcap5ysp1zajrfw7aq";
};

outputs = [ "out" "dev" "man" ];
4 changes: 2 additions & 2 deletions pkgs/tools/archivers/unrar/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "unrar-${version}";
version = "5.5.5";
version = "5.5.7";

src = fetchurl {
url = "http://www.rarlab.com/rar/unrarsrc-${version}.tar.gz";
sha256 = "1vv1s1pa0pf1r0h7dw89ha9y68x7hdm82csnkh6ms0igrcwkhmd4";
sha256 = "13rd69ss6jqsa6yxr8kmgs84kb67k822d2mbiz29m75zj46hmvwa";
};

postPatch = ''
10 changes: 6 additions & 4 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
@@ -17113,12 +17113,14 @@ in {
};

pyjwt = buildPythonPackage rec {
version = "1.4.2";
version = "1.5.3";
name = "pyjwt-${version}";

src = pkgs.fetchurl {
url = "http://github.com/progrium/pyjwt/archive/${version}.tar.gz";
sha256 = "06vg84aicwkv0kli8i4jhg0kc6298cmh38ib058q01yxzk6q17gn";
src = pkgs.fetchFromGitHub {
owner = "progrium";
repo = "pyjwt";
rev = version;
sha256 = "109zb3ka2lvp00r9nawa0lmljfikvhcj5yny19kcipz8mqia1gs8";
};

buildInputs = with self; [ pytestrunner pytestcov pytest coverage ];