Merge branch 'staging-18.03' into release-18.03

Not completely finished on Hydra yet, but they're security updates.
release-18.03-flake
Vladimír Čunát 2018-06-19 10:07:24 +02:00
commit d320a06229
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 8 additions and 3 deletions

View File

@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
sha256 = "0v21p59cb3z77ch1v6q5dcrd733h91f3m8ifnd7kkkr8gzn17d5x";
name = "CVE-2017-14160";
})
(fetchpatch {
url = "https://gitlab.xiph.org/xiph/vorbis/commit/112d3bd0aaa.diff";
sha256 = "1k77y3q36npy8mkkz40f6cb46l2ldrwyrd191m29s8rnbhnafdf7";
name = "CVE-2018-10392.patch";
})
];
nativeBuildInputs = [ pkgconfig ];

View File

@ -3,11 +3,11 @@
assert interactive -> readline != null && ncurses != null;
stdenv.mkDerivation {
name = "sqlite-3.22.0";
name = "sqlite-3.23.1";
src = fetchurl {
url = "http://sqlite.org/2018/sqlite-autoconf-3220000.tar.gz";
sha256 = "04n6hnw2g818d7r92cp2608kd5mhzyysy83k29kbq1mp709an918";
url = https://sqlite.org/2018/sqlite-autoconf-3230100.tar.gz;
sha256 = "09ggapjhqjb2pzk0wkfczil77plijg3d77m2bpzlwx2y7ql2p14j";
};
outputs = [ "bin" "dev" "out" ];