From ead6603b6037a8ea6d6898241c7ae50888288bd3 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 13 Sep 2014 21:05:16 +0200 Subject: libav: update all branches, probably with security fixes --- pkgs/development/libraries/libav/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/development/libraries/libav') diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 264868e4a97..ce0b0d5d755 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -26,17 +26,17 @@ with { inherit (stdenv.lib) optional optionals; }; let result = { - libav_0_8 = libavFun "0.8.13" "1fr3rzykrlm1cla0csm9hqa3gcqp19hf5rgn70nyb9w92r67v685"; - libav_9 = libavFun "9.16" "18378gdgzqsxaacc9vl7ligwndbdvy95wbn50hs8xvdqn1rn916a"; - libav_10 = libavFun "10.4" "1zzvjfdlv9swhq7dzvli1pk8cn02q1076ax9m3cx9ipilbg21639"; + libav_0_8 = libavFun "0.8.16" "df88b8f7d04d47edea8b19d80814227f0c058e57"; + libav_9 = libavFun "9.17" "5899d51947b62f6b0cf9795ec2330d5ed59a3273"; + libav_10 = libavFun "10.5" "925a45d2700a436c28e0b663510fc8df5bb7e861"; }; - libavFun = version : sha256 : stdenv.mkDerivation rec { + libavFun = version : sha1 : stdenv.mkDerivation rec { name = "libav-${version}"; src = fetchurl { url = "${meta.homepage}/releases/${name}.tar.xz"; - inherit sha256; + inherit sha1; # upstream directly provides sha1 of releases over https }; configureFlags = assert stdenv.lib.all (x: x!=null) buildInputs; -- cgit 1.4.1 From 6a63d1e1e107c0a7c8fe77cdc2bf62155ca88d25 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 13 Sep 2014 21:43:12 +0200 Subject: libav: replace default 10 branch by the new 11 Upstream claims the upgrade is API-compatible. That is why I decided to drop the 10 branch completely. --- pkgs/development/libraries/libav/default.nix | 2 +- pkgs/top-level/all-packages.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/development/libraries/libav') diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index ce0b0d5d755..1313bc3feeb 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -28,7 +28,7 @@ let result = { libav_0_8 = libavFun "0.8.16" "df88b8f7d04d47edea8b19d80814227f0c058e57"; libav_9 = libavFun "9.17" "5899d51947b62f6b0cf9795ec2330d5ed59a3273"; - libav_10 = libavFun "10.5" "925a45d2700a436c28e0b663510fc8df5bb7e861"; + libav_11 = libavFun "11" "21f3c7c2154c0ad703872f2faa65ef20d6b7a14f"; }; libavFun = version : sha1 : stdenv.mkDerivation rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47953749272..be4cf627dbc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4894,7 +4894,7 @@ let gperftools = callPackage ../development/libraries/gperftools { }; gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { - callPackage = pkgs.newScope (pkgs // { libav = pkgs.libav_10; }); + callPackage = pkgs.newScope (pkgs // { inherit (pkgs) libav; }); }); gst_all = { @@ -5194,9 +5194,9 @@ let libatomic_ops = callPackage ../development/libraries/libatomic_ops {}; - libav = libav_10; + libav = libav_11; # branch 11 is API-compatible with branch 10 libav_all = callPackage ../development/libraries/libav { }; - inherit (libav_all) libav_0_8 libav_9 libav_10; + inherit (libav_all) libav_0_8 libav_9 libav_11; libavc1394 = callPackage ../development/libraries/libavc1394 { }; -- cgit 1.4.1 From c8f2a31de34e43094fd3d7ea9711893152eaa392 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sun, 22 Feb 2015 21:32:31 +0100 Subject: libav-11: maintenance update, including security CVE-2014-{8541,8542,8543,8547,8548,8549} --- pkgs/development/libraries/libav/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/libraries/libav') diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 1313bc3feeb..be3f803cff8 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -28,7 +28,7 @@ let result = { libav_0_8 = libavFun "0.8.16" "df88b8f7d04d47edea8b19d80814227f0c058e57"; libav_9 = libavFun "9.17" "5899d51947b62f6b0cf9795ec2330d5ed59a3273"; - libav_11 = libavFun "11" "21f3c7c2154c0ad703872f2faa65ef20d6b7a14f"; + libav_11 = libavFun "11.2" "52ba52cabe5d86b45ce62f56e11fa7912c6e5083"; }; libavFun = version : sha1 : stdenv.mkDerivation rec { -- cgit 1.4.1 From cdd00f47fa4f6504120e0d5788a8da64f7fa6bb1 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Fri, 6 Mar 2015 12:51:41 +0100 Subject: libav*.tools: remove overlapping paths, fixes #6682 --- pkgs/development/libraries/libav/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/libraries/libav') diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index be3f803cff8..04e85bcfc33 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -79,10 +79,10 @@ let outputs = [ "out" "tools" ]; + # move avplay to get rid of the SDL dependency in the main output postInstall = '' mkdir -p "$tools/bin" mv "$out/bin/avplay" "$tools/bin" - cp -s "$out"/bin/* "$tools/bin/" ''; doInstallCheck = false; # fails randomly -- cgit 1.4.1 From 07e49e6952d29e9f5dbf34f0df21949b6bbf47f9 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Thu, 12 Mar 2015 20:14:44 +0100 Subject: libav*: maintenance updates, including security --- pkgs/development/libraries/libav/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries/libav') diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 04e85bcfc33..41a8b391eb3 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -26,9 +26,9 @@ with { inherit (stdenv.lib) optional optionals; }; let result = { - libav_0_8 = libavFun "0.8.16" "df88b8f7d04d47edea8b19d80814227f0c058e57"; - libav_9 = libavFun "9.17" "5899d51947b62f6b0cf9795ec2330d5ed59a3273"; - libav_11 = libavFun "11.2" "52ba52cabe5d86b45ce62f56e11fa7912c6e5083"; + libav_0_8 = libavFun "0.8.17" "31ace2daeb8c105deed9cd3476df47318d417714"; + libav_9 = libavFun "9.18" "e10cde4587c4d4d3bb11d30c7b47e953664cd714"; + libav_11 = libavFun "11.3" "d9d4fd0ffeda7a244b31968c01d72f0042a56f7a"; }; libavFun = version : sha1 : stdenv.mkDerivation rec { -- cgit 1.4.1