diff options
| author | Domen Kožar <domen@dev.si> | 2016-03-23 12:54:47 +0000 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2016-03-23 12:54:47 +0000 |
| commit | d1c9f20db10289fccc473d96806b8893194aa52c (patch) | |
| tree | 04d6bb40e3a22c93f1b86b9787441b7fc077b3ab | |
| parent | 1049c9f3f2d4a907a65668b700881ece1cd57ebe (diff) | |
| parent | 9ba1afb94b3f5dda8bb171c56a7f60d15689b495 (diff) | |
| download | nixlib-d1c9f20db10289fccc473d96806b8893194aa52c.tar nixlib-d1c9f20db10289fccc473d96806b8893194aa52c.tar.gz nixlib-d1c9f20db10289fccc473d96806b8893194aa52c.tar.bz2 nixlib-d1c9f20db10289fccc473d96806b8893194aa52c.tar.lz nixlib-d1c9f20db10289fccc473d96806b8893194aa52c.tar.xz nixlib-d1c9f20db10289fccc473d96806b8893194aa52c.tar.zst nixlib-d1c9f20db10289fccc473d96806b8893194aa52c.zip | |
Merge pull request #14107 from nckx/drop-libav_9
libav: drop unused version 9.
| -rw-r--r-- | pkgs/development/libraries/libav/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 5b6e9c024b5c..4d5563adab02 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -27,7 +27,6 @@ with { inherit (stdenv.lib) optional optionals; }; let result = { libav_0_8 = libavFun "0.8.17" "31ace2daeb8c105deed9cd3476df47318d417714"; - libav_9 = libavFun "9.18" "e10cde4587c4d4d3bb11d30c7b47e953664cd714"; libav_11 = libavFun "11.6" "2296cbd7afe98591eb164cebe436dcb5582efc9d"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0304193cd792..fa31c10745ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7339,7 +7339,7 @@ let 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_11; + inherit (libav_all) libav_0_8 libav_11; libavc1394 = callPackage ../development/libraries/libavc1394 { }; |