public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'roundup-15'

Browse Source
This commit is contained in:
Graham Christensen 2016-12-28 21:04:51 -05:00
commit f5ca9a4212
No known key found for this signature in database
GPG Key ID: 06121D366FE9435C
4 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/virtualization/qemu/default.nix
View File

@ -137,6 +137,17 @@ stdenv.mkDerivation rec {
# from http://git.qemu.org/?p=qemu.git;a=patch;h=ff55e94d23ae94c8628b0115320157c763eb3e06 # from http://git.qemu.org/?p=qemu.git;a=patch;h=ff55e94d23ae94c8628b0115320157c763eb3e06
./CVE-2016-9102.patch ./CVE-2016-9102.patch
(fetchpatch {
name = "qemu-CVE-2016-9911.patch";
url = "http://git.qemu.org/?p=qemu.git;a=patch;h=791f97758e223de3290592d169f8e6339c281714";
sha256 = "0952mpc81h42k5kqsw42prnw5vw86r3j88wk5z4sr1xd1sg428d6";
})
(fetchpatch {
name = "qemu-CVE-2016-9921_9922.patch";
url = "http://git.qemu.org/?p=qemu.git;a=commit;h=4299b90e9ba9ce5ca9024572804ba751aa1a7e70";
sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73";
})
] ++ optional nixosTestRunner ./force-uid0-on-9p.patch; ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch;
hardeningDisable = [ "stackprotector" ]; hardeningDisable = [ "stackprotector" ];

15
pkgs/development/libraries/crypto++/default.nix
View File

@ -1,22 +1,21 @@
{ fetchurl, stdenv, unzip }: { fetchurl, fetchFromGitHub, stdenv }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "crypto++-${version}"; name = "crypto++-${version}";
majorVersion = "5.6"; majorVersion = "5.6";
version = "${majorVersion}.4"; version = "${majorVersion}.5";
src = fetchurl { src = fetchFromGitHub {
url = "mirror://sourceforge/cryptopp/cryptopp564.zip"; owner = "weidai11";
sha256 = "1msar24a38rxzq0xgmjf09hzaw2lv6s48vnbbhfrf5awn1vh6hxy"; repo = "cryptopp";
rev = "CRYPTOPP_5_6_5";
sha256 = "1yk7jyf4va9425cg05llskpls2jm7n3jwy2hj5jm74zkr4mwpvl7";
}; };
patches = with stdenv; patches = with stdenv;
lib.optional (system != "i686-cygwin") ./dll.patch lib.optional (system != "i686-cygwin") ./dll.patch
++ lib.optional isDarwin ./GNUmakefile-darwin.patch; ++ lib.optional isDarwin ./GNUmakefile-darwin.patch;
buildInputs = [ unzip ];
sourceRoot = ".";
configurePhase = let configurePhase = let
marchflags = marchflags =

4
pkgs/servers/http/apache-httpd/2.4.nix
View File

@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
assert http2Support -> nghttp2 != null; assert http2Support -> nghttp2 != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.4.23"; version = "2.4.25";
name = "apache-httpd-${version}"; name = "apache-httpd-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
sha256 = "0n2yx3gjlpr4kgqx845fj6amnmg25r2l6a7rzab5hxnpmar985hc"; sha256 = "1cl0bkqg6srb1sypga0cn8dcmdyxldavij73zmmkxvlz3kgw4zpq";
}; };
# FIXME: -dev depends on -doc # FIXME: -dev depends on -doc

6
pkgs/servers/shellinabox/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pam, openssl, openssh, shadow, makeWrapper }: { stdenv, fetchFromGitHub, autoreconfHook, pam, openssl, openssh, shadow, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.19"; version = "2.20";
name = "shellinabox-${version}"; name = "shellinabox-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "shellinabox"; owner = "shellinabox";
repo = "shellinabox"; repo = "shellinabox";
rev = "1a8010f2c94a62e7398c4fa130dfe9e099dc55cd"; rev = "v${version}";
sha256 = "16cr7gbnh6vzsxlhg9j9avqrxbhbkqhsbvh197b0ccdwbb04ysan"; sha256 = "1hmfayh21cks2lyj572944ll0mmgsxbnj981b3hq3nhdg8ywzjfr";
}; };
patches = [ ./shellinabox-minus.patch ]; patches = [ ./shellinabox-minus.patch ];