diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-07-17 06:37:13 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-07-17 06:38:04 +0200 |
| commit | 9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c (patch) | |
| tree | 946e5c7626f668079bcf35caf203a52c5d33f3c7 /pkgs/development/libraries/ffmpeg/2.7.nix | |
| parent | cf8309ef34b9ec18bc9aeca9e63f984e1be19b56 (diff) | |
| parent | 967abfc78660d0e49a32eac8fe19cec4b6b79d5c (diff) | |
| download | nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.gz nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.bz2 nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.lz nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.xz nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.zst nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.zip | |
Merge master into staging
There are larger-rebuild changes: gnutls and samba.
Diffstat (limited to 'pkgs/development/libraries/ffmpeg/2.7.nix')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/2.7.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/development/libraries/ffmpeg/2.7.nix b/pkgs/development/libraries/ffmpeg/2.7.nix new file mode 100644 index 00000000000..3e4708fdf46 --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/2.7.nix @@ -0,0 +1,7 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "${branch}.1"; + branch = "2.7"; + sha256 = "087pyx1wxvniq3wgj6z80wrb7ampwwsmwndmr7lymzhm4iyvj1vy"; +}) |