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: ba37a7f0180e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 870284d10ea8
Choose a head ref
  • 7 commits
  • 4 files changed
  • 3 contributors

Commits on Sep 28, 2017

  1. mpg123: 1.25.4 -> 1.25.7 for multiple CVEs 

    Fixes at least CVE-2017-10683, CVE-2017-11126, CVE-2017-9545,
CVE-2017-12797.

(cherry picked from commit 6c283ae)
    @fpletz
    fpletz committed Sep 28, 2017
    Copy the full SHA
    d377659 View commit details

  2. postfix: 3.1.3 -> 3.2.3 

    Possibly fixes security issues. No CVE yet.

(cherry picked from commit 14e53aa)
    @fpletz
    fpletz committed Sep 28, 2017
    Copy the full SHA
    4733986 View commit details

  3. fossil: 1.36 -> 2.2 

    (cherry picked from commit 3f8f8bf)
    @lheckemann @fpletz
    lheckemann authored and fpletz committed Sep 28, 2017
    Copy the full SHA
    d17c78a View commit details

  4. fossil: 2.2 -> 2.3 

    Fixes XSS vulnerability on the /help webpage. No CVE known.

(cherry picked from commit faed026)
    @fpletz
    fpletz committed Sep 28, 2017
    Copy the full SHA
    c55bebe View commit details

  5. augeas: 1.5.0 -> 1.7.0 

    (cherry picked from commit d9bc414)
    @fpletz
    ndowens authored and fpletz committed Sep 28, 2017
    Copy the full SHA
    dd62f59 View commit details

  6. augeas: 1.7.0 -> 1.8.0 

    (cherry picked from commit 856a7e7)
    @fpletz
    ndowens authored and fpletz committed Sep 28, 2017
    Copy the full SHA
    6185621 View commit details

  7. augeas: 1.8.0 -> 1.8.1 for CVE-2017-7555 

    (cherry picked from commit d2b6e9c)
    @fpletz
    fpletz committed Sep 28, 2017
    Copy the full SHA
    870284d View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/audio/mpg123/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{stdenv, fetchurl, alsaLib }:

stdenv.mkDerivation rec {
name = "mpg123-1.25.4";
name = "mpg123-1.25.7";

src = fetchurl {
url = "mirror://sourceforge/mpg123/${name}.tar.bz2";
sha256 = "1rxknrnl3ji5hi5rbckpzhbl1k5r8i53kcys4xdgg0xbi8765dfd";
sha256 = "1ws40fglyyk51jvmz8gfapjkw1g51pkch1rffdsbh4b1yay5xc9i";
};

buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
9 changes: 5 additions & 4 deletions pkgs/applications/version-management/fossil/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,15 +2,16 @@
, tcllib, withJson ? true}:

stdenv.mkDerivation rec {
name = "fossil-1.36";
name = "fossil-${version}";
version = "2.3";

src = fetchurl {
urls =
urls =
[
https://fossil-scm.org/index.html/uv/download/fossil-src-1.36.tar.gz
"https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz"
];
name = "${name}.tar.gz";
sha256 = "04px1mnq5dlc6gaihxj5nj6k7ac43wfryzifaairjh74qmgc6xi6";
sha256 = "0paalvb4rdyr79v6rwspaha5n4dqb92df9irijha13m3apsanwzh";
};

buildInputs = [ zlib openssl readline sqlite which ed ]
4 changes: 2 additions & 2 deletions pkgs/servers/mail/postfix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -22,11 +22,11 @@ in stdenv.mkDerivation rec {

name = "postfix-${version}";

version = "3.1.3";
version = "3.2.3";

src = fetchurl {
url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz";
sha256 = "0ya9h7ynhq8h7zgq0qkvfwx5rsam7i3vkbyh6rx63qlpcxz15y2j";
sha256 = "1gs025smgynrlsg44cypjam99ds92mc9q46l5085d9sy0xfrf2sv";
};

buildInputs = [ makeWrapper gnused db openssl cyrus_sasl icu pcre ]
10 changes: 5 additions & 5 deletions pkgs/tools/system/augeas/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,20 +2,20 @@

stdenv.mkDerivation rec {
name = "augeas-${version}";
version = "1.5.0";
version = "1.8.1";

src = fetchurl {
url = "http://download.augeas.net/${name}.tar.gz";
sha256 = "0gzpafrflkr0incq58vjkabfncrpc97d7mdgglkr57iyzvkbcfr2";
sha256 = "1yf93fqwav1zsl8dpyfkf0g11w05mmfckqy6qsjy5zkklnspbkv5";
};

buildInputs = [ pkgconfig readline libxml2 ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ readline libxml2 ];

meta = with stdenv.lib; {
description = "Configuration editing tool";
license = licenses.lgpl2;
homepage = http://augeas.net/;
maintainers = with maintainers; [offline];
maintainers = with maintainers; [ offline ndowens ];
platforms = platforms.unix;
};
}