Author: viric
Date: Thu Nov 18 20:00:39 2010
New Revision: 24759
URL: https://svn.nixos.org/websvn/nix/?rev=24759&sc=1
Log:
Updating from trunk to get a security fix on openssl.
Modified:
nixpkgs/branches/stdenv-updates/ (props changed)
nixpkgs/branches/stdenv-updates/pkgs/applications/graphics/xscreensaver/default.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/applications/misc/xneur/0.8.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/build-support/gcc-wrapper/ (props
changed)
nixpkgs/branches/stdenv-updates/pkgs/build-support/release/debian-build.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/build-support/release/nix-build.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/build-support/release/rpm-build.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/build-support/release/source-tarball.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.10.1.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.10.2.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.8.2.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.8.3.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/aterm/2.8.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/fltk/fltk11.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.9/
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/goocanvas/
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/openssl/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/pcre/default.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/readline/readline6.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/tools/documentation/haddock/haddock-2.1.0.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/autoconf/2.13.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/gnum4/default.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/misc/emulators/vice/default.nix
nixpkgs/branches/stdenv-updates/pkgs/misc/tex/pgf/1.x.nix (props changed)
nixpkgs/branches/stdenv-updates/pkgs/misc/tex/pgf/2.x.nix (props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/atheros/r3867.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/generic.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.25.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.27.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.28.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.29.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.33.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/qemu-kvm/default.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/util-linux-ng/
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/servers/mail/dovecot/1.1.1.nix (props
changed)
nixpkgs/branches/stdenv-updates/pkgs/shells/bash/default.nix (props
changed)
nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh (props
changed)
nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/make-bootstrap-tools.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/tools/networking/wget/default.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/top-level/python-packages.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/openssl/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/openssl/default.nix
Thu Nov 18 16:58:18 2010 (r24758)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/openssl/default.nix
Thu Nov 18 20:00:39 2010 (r24759)
@@ -7,11 +7,11 @@
in
stdenv.mkDerivation rec {
- name = "openssl-1.0.0a";
+ name = "openssl-1.0.0b";
src = fetchurl {
url = "http://www.openssl.org/source/${name}.tar.gz";;
- sha256 = "0qqgyzfb0alwx329z8bqybzamfl9j2maykykvq6zk3ibq0gvva8q";
+ sha256 = "0cbk04cwmbf7l0bycqx8y04grfsx96mn2d8lbrydkqiyncplwysf";
};
patches = stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch;
Modified: nixpkgs/branches/stdenv-updates/pkgs/misc/emulators/vice/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/misc/emulators/vice/default.nix
Thu Nov 18 16:58:18 2010 (r24758)
+++ nixpkgs/branches/stdenv-updates/pkgs/misc/emulators/vice/default.nix
Thu Nov 18 20:00:39 2010 (r24759)
@@ -3,10 +3,10 @@
}:
stdenv.mkDerivation rec {
- name = "vice-2.1";
+ name = "vice-2.2";
src = fetchurl {
- url =
http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.1.tar.gz;
- sha256 =
"dc42df924bd4b4ab4af43e372d873a79ea035059f31f2f5c297c234b1c532c66";
+ url =
http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.2.tar.gz;
+ sha256 = "0l8mp9ybx494fdqgr1ps4x3c3qzms4yyg4hzcn3ihzy92zw1nn2x";
};
buildInputs = [ perl gettext libpng giflib libjpeg alsaLib readline mesa
pkgconfig gtk SDL autoconf automake ];
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/python-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/python-packages.nix Thu Nov
18 16:58:18 2010 (r24758)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/python-packages.nix Thu Nov
18 20:00:39 2010 (r24759)
@@ -886,6 +886,29 @@
};
};
+ 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 {
name = "setuptools-darcs-1.2.9";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
