From e5b9540053701d0f39404bb6ea1ad066779565f5 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 12 May 2009 04:28:30 +0000 Subject: [PATCH] All-packages changes for last commits svn path=/nixpkgs/trunk/; revision=15561 --- pkgs/top-level/all-packages.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3319c6bf0ec..f2856f10e6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3735,6 +3735,10 @@ let sslSupport = true; }; + nethack = builderDefsPackage (import ../games/nethack) { + inherit ncurses flex bison; + }; + nss = import ../development/libraries/nss { inherit fetchurl stdenv perl zip; }; @@ -4053,6 +4057,10 @@ let ]; }; + zangband = builderDefsPackage (import ../games/zangband) { + inherit ncurses flex bison autoconf automake m4; + }; + zlib = import ../development/libraries/zlib { fetchurl = fetchurlBoot; inherit stdenv; @@ -5023,7 +5031,7 @@ let inherit fetchurl stdenv kernel ncurses fxload; }; - kqemu = builderDefsPackage (selectVersion ../os-specific/linux/kqemu "1.3.0pre11") { + kqemu = builderDefsPackage (selectVersion ../os-specific/linux/kqemu "1.4.0pre1") { inherit kernel; }; @@ -5626,7 +5634,8 @@ let }; audacity = import ../applications/audio/audacity { - inherit fetchurl stdenv gettext pkgconfig zlib; + inherit fetchurl stdenv gettext pkgconfig zlib perl intltool libogg + libvorbis libmad; inherit (gtkLibs) gtk glib; wxGTK = wxGTK28; }; @@ -6625,7 +6634,7 @@ let inherit fetchurl stdenv pkgconfig imagemagick boost python; }; - qemu = import ../applications/virtualization/qemu/0.9.1.nix { + qemu = import ../applications/virtualization/qemu/0.10.3.nix { inherit fetchurl SDL zlib which; stdenv = overrideGCC stdenv gcc34; };