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

Merge #2556: update xpra, pygtk and ffmpeg2

Browse Source
This commit is contained in:
Vladimír Čunát 2014-05-13 11:50:56 +02:00
commit 7f3dba49e5
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/ffmpeg/2.x.nix
View File

@ -5,11 +5,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ffmpeg-2.2.1"; name = "ffmpeg-2.2.2";
src = fetchurl { src = fetchurl {
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
sha256 = "153kfk8rzrfxx930rrk417b2m695dvy47v4hci3nd49iggx9jzz1"; sha256 = "062jn47sm1ifwswcd3lx47nff62rgcwp84964q0v983issnrfax4";
}; };
subtitleSupport = config.ffmpeg.subtitle or true; subtitleSupport = config.ffmpeg.subtitle or true;

6
pkgs/development/python-modules/pygtk/default.nix
View File

@ -2,11 +2,11 @@
, buildPythonPackage, libglade ? null }: , buildPythonPackage, libglade ? null }:
buildPythonPackage rec { buildPythonPackage rec {
name = "pygtk-2.22.0"; name = "pygtk-2.24.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/pygtk/2.22/${name}.tar.bz2"; url = "mirror://gnome/sources/pygtk/2.24/${name}.tar.bz2";
sha256 = "4acf0ef2bde8574913c40ee4a43d9c4f43bb77b577b67147271b534501a54cc8"; sha256 = "04k942gn8vl95kwf0qskkv6npclfm31d78ljkrkgyqxxcni1w76d";
}; };
buildInputs = [ pkgconfig ] buildInputs = [ pkgconfig ]

2
pkgs/tools/X11/xpra/default.nix
View File

@ -4,7 +4,7 @@
, ffmpeg, x264, libvpx, pil, libwebp }: , ffmpeg, x264, libvpx, pil, libwebp }:
buildPythonPackage rec { buildPythonPackage rec {
name = "xpra-0.9.5"; name = "xpra-0.12.5";
namePrefix = ""; namePrefix = "";
src = fetchurl { src = fetchurl {