public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát
2016-01-18 09:48:49 +01:00
parent 85628148de c23b0856fd
commit 620c147cce
284 changed files with 11434 additions and 1452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/ffmpeg/2.2.nix
View File

@@ -1,7 +0,0 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "${branch}.15";
branch = "2.2";
sha256 = "1s2mf1lvvwj6vkbp0wdr21xki864xsfi1rsjaa67q5m9dx4rrnr4";
})