diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-01-15 17:43:00 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-01-15 18:24:42 +0100 |
| commit | 8afb65ff6601e837b190423b0cdbbd18f3fa94b8 (patch) | |
| tree | c091f5490a8dcb457d43c161dac729a25ae0ee8a | |
| parent | a848207c161419b89b1e6f079f2edd6b0163d9bf (diff) | |
| download | nixlib-8afb65ff6601e837b190423b0cdbbd18f3fa94b8.tar nixlib-8afb65ff6601e837b190423b0cdbbd18f3fa94b8.tar.gz nixlib-8afb65ff6601e837b190423b0cdbbd18f3fa94b8.tar.bz2 nixlib-8afb65ff6601e837b190423b0cdbbd18f3fa94b8.tar.lz nixlib-8afb65ff6601e837b190423b0cdbbd18f3fa94b8.tar.xz nixlib-8afb65ff6601e837b190423b0cdbbd18f3fa94b8.tar.zst nixlib-8afb65ff6601e837b190423b0cdbbd18f3fa94b8.zip | |
libav_12: init at 12
| -rw-r--r-- | pkgs/development/libraries/libav/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 37ebf972e024..7bf969b78da9 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -28,6 +28,7 @@ let result = { libav_0_8 = libavFun "0.8.19" "c79350d6fa071fcd66448ffc713fe3b9754876a8"; libav_11 = libavFun "11.8" "y18hmrzy7jqq7h9ys54nrr4s49mkzsfh"; + libav_12 = libavFun "12" "4ecde7274621c82a6882b7614d907b28de25cc4e"; }; libavFun = version : sha1 : stdenv.mkDerivation rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4bcbf0260d7c..90be53fc3a0b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7802,7 +7802,7 @@ in libav = libav_11; # branch 11 is API-compatible with branch 10 libav_all = callPackage ../development/libraries/libav { }; - inherit (libav_all) libav_0_8 libav_11; + inherit (libav_all) libav_0_8 libav_11 libav_12; libavc1394 = callPackage ../development/libraries/libavc1394 { }; |