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

Updating from trunk to get a security fix on openssl.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24759
This commit is contained in:
Lluís Batlle i Rossell 2010-11-18 20:00:39 +00:00
parent d1f4ec332b
commit d7b494a2f4
3 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/openssl/default.nix
View File

@ -7,11 +7,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "openssl-1.0.0a"; name = "openssl-1.0.0b";
src = fetchurl { src = fetchurl {
url = "http://www.openssl.org/source/${name}.tar.gz"; url = "http://www.openssl.org/source/${name}.tar.gz";
sha256 = "0qqgyzfb0alwx329z8bqybzamfl9j2maykykvq6zk3ibq0gvva8q"; sha256 = "0cbk04cwmbf7l0bycqx8y04grfsx96mn2d8lbrydkqiyncplwysf";
}; };
patches = stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch; patches = stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch;

6
pkgs/misc/emulators/vice/default.nix
View File

@ -3,10 +3,10 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "vice-2.1"; name = "vice-2.2";
src = fetchurl { src = fetchurl {
url = http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.1.tar.gz; url = http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.2.tar.gz;
sha256 = "dc42df924bd4b4ab4af43e372d873a79ea035059f31f2f5c297c234b1c532c66"; sha256 = "0l8mp9ybx494fdqgr1ps4x3c3qzms4yyg4hzcn3ihzy92zw1nn2x";
}; };
buildInputs = [ perl gettext libpng giflib libjpeg alsaLib readline mesa buildInputs = [ perl gettext libpng giflib libjpeg alsaLib readline mesa
pkgconfig gtk SDL autoconf automake ]; pkgconfig gtk SDL autoconf automake ];

23
pkgs/top-level/python-packages.nix
View File

@ -886,6 +886,29 @@ rec {
}; };
}; };
magic = buildPythonPackage rec {
name = "magic-0.3.1";
src = fetchurl {
url = "http://pypi.python.org/packages/source/p/python-magic/python-${name}.tar.gz";
md5 = "397cff81d2502e81fd3830a61ca2ad2c";
};
preConfigure =
''
# Ensure that the module can find libmagic by hard-coding the
# path to libmagic.so. Maybe there is a nicer way.
substituteInPlace magic.py --replace \
"ctypes.util.find_library('magic')" \
"'${pkgs.file}/lib/libmagic.so'"
'';
meta = {
description = "A Python wrapper around libmagic";
homepage = https://github.com/ahupp/python-magic;
};
};
setuptoolsDarcs = buildPythonPackage { setuptoolsDarcs = buildPythonPackage {
name = "setuptools-darcs-1.2.9"; name = "setuptools-darcs-1.2.9";