diff options
45 files changed, 226 insertions, 213 deletions
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 19a2346802c..9ef5382eaf9 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gtk, libXft , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool -, gsl, python, pyxml, lxml, poppler }: +, gsl, python, pyxml, lxml, poppler, imagemagick, libwpg }: stdenv.mkDerivation rec { name = "inkscape-0.48.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "10v7ixdz7f8vgk2wv0m81zli9p0f446cm1f4aqlvni1ndsx44fi2"; }; - patches = [ ./configure-python-libs.patch ]; + patches = [ ./configure-python-libs.patch ./libpng-1.5.patch ]; propagatedBuildInputs = [ # Python is used at run-time to execute scripts, e.g., those from @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig perl perlXMLParser gtk libXft libpng zlib popt boehmgc libxml2 libxslt glib gtkmm glibmm libsigcxx lcms boost gettext - makeWrapper intltool gsl poppler + makeWrapper intltool gsl poppler imagemagick libwpg ]; configureFlags = "--with-python"; diff --git a/pkgs/applications/graphics/inkscape/libpng-1.5.patch b/pkgs/applications/graphics/inkscape/libpng-1.5.patch new file mode 100644 index 00000000000..4c8a7ee5f9b --- /dev/null +++ b/pkgs/applications/graphics/inkscape/libpng-1.5.patch @@ -0,0 +1,47 @@ +Source: upstream revisions 10061 and 10707 + +--- a/src/sp-image.cpp 2011-02-21 07:59:34 +0000 ++++ b/src/sp-image.cpp 2011-02-21 08:57:28 +0000 +@@ -387,9 +387,13 @@ + + #if defined(PNG_iCCP_SUPPORTED) + { +- char* name = 0; ++ png_charp name = 0; + int compression_type = 0; +- char* profile = 0; ++#if (PNG_LIBPNG_VER < 10500) ++ png_charp profile = 0; ++#else ++ png_bytep profile = 0; ++#endif + png_uint_32 proflen = 0; + if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) { + // g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type); + +--- a/src/extension/internal/pdfinput/svg-builder.cpp 2011-10-27 04:55:51 +0000 ++++ b/src/extension/internal/pdfinput/svg-builder.cpp 2011-10-29 20:34:00 +0000 +@@ -1481,7 +1481,7 @@ + return NULL; + } + // Set error handler +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr, &info_ptr); + return NULL; + } + +--- a/src/helper/png-write.cpp 2011-08-07 10:53:12 +0000 ++++ b/src/helper/png-write.cpp 2011-10-29 20:34:00 +0000 +@@ -166,8 +166,8 @@ + /* Set error handling. REQUIRED if you aren't supplying your own + * error hadnling functions in the png_create_write_struct() call. + */ +- if (setjmp(png_ptr->jmpbuf)) { +- /* If we get here, we had a problem reading the file */ ++ if (setjmp(png_jmpbuf(png_ptr))) { ++ // If we get here, we had a problem reading the file + fclose(fp); + png_destroy_write_struct(&png_ptr, &info_ptr); + return false; + diff --git a/pkgs/applications/networking/irc/chatzilla/default.nix b/pkgs/applications/networking/irc/chatzilla/default.nix index 8ce73c69f3d..5d16c979f6a 100644 --- a/pkgs/applications/networking/irc/chatzilla/default.nix +++ b/pkgs/applications/networking/irc/chatzilla/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, unzip, xulrunner, makeWrapper }: stdenv.mkDerivation rec { - name = "chatzilla-0.9.87"; + name = "chatzilla-0.9.88"; src = fetchurl { # Obtained from http://chatzilla.rdmsoft.com/xulrunner/. - url = http://chatzilla.rdmsoft.com/xulrunner/download/chatzilla-0.9.87-xr.zip; - sha256 = "1qwbqngrxyip3k2b71adg271sifvrrxcixkyrsy4vmgl5bwdsl4d"; + url = "http://chatzilla.rdmsoft.com/xulrunner/download/${name}-xr.zip"; + sha256 = "041jpjl7wnbhqm2f8bf2pwp6igjapmy74swac94h54n644wl5nz0"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index a58c82e1b8b..a2c3ed5d6ba 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -8,15 +8,12 @@ * for a possible solution. */ -let - name = "gnucash-2.4.8"; -in -stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + name = "gnucash-2.4.10"; src = fetchurl { url = "mirror://sourceforge/gnucash/${name}.tar.bz2"; - sha256 = "06gfgw4sq1b8c9qzinyd3wmcy3i0jyprngr259l0aldv8rvix8aa"; + sha256 = "1k76b6hnsmljggxsq5l9w94krfmhx58ij8jcxf72p0ddnlimdrjj"; }; buildInputs = [ @@ -44,7 +41,7 @@ stdenv.mkDerivation { ''; # The following settings fix failures in the test suite. It's not required otherwise. - NIX_LDFLAGS = "-rpath=${guile}/lib"; + NIX_LDFLAGS = "-rpath=${guile}/lib -rpath=${glib}/lib"; preCheck = "export GNC_DOT_DIR=$PWD/dot-gnucash"; doCheck = true; diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/applications/science/astronomy/xplanet/default.nix index 15e04c3835c..816119a3b92 100644 --- a/pkgs/applications/science/astronomy/xplanet/default.nix +++ b/pkgs/applications/science/astronomy/xplanet/default.nix @@ -1,27 +1,21 @@ -{stdenv, fetchurl, lib, pkgconfig, freetype, pango, libpng, libtiff, giflib, libjpeg}: +{stdenv, fetchurl, pkgconfig, freetype, pango, libpng, libtiff, giflib +, libjpeg, netpbm}: -stdenv.mkDerivation { - name = "xplanet-1.2.1"; +stdenv.mkDerivation rec { + name = "xplanet-1.2.2"; src = fetchurl { - url = mirror://sourceforge/xplanet/xplanet-1.2.1.tar.gz; - sha256 = "1pp55a1rgjkfcrwc00y3l48fhpqcp3qagd1zbym6zg27fzi5fbgm"; + url = "mirror://sourceforge/xplanet/${name}.tar.gz"; + sha256 = "1jnkrly9njkibxqbg5im4pq9cqjzwmki6jzd318dvlfmnicqr3vg"; }; - patches = - [ # Build on GCC 4.4. - (fetchurl { - url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/x11-misc/xplanet/files/xplanet-1.2.1-gentoo.patch?rev=1.1"; - sha256 = "0mmagjizj4hj057qmpi45w95zlrqda32x96xy44f6126xzj02yd5"; - }) - ]; - - buildInputs = [ pkgconfig freetype pango libpng libtiff giflib libjpeg ]; + buildInputs = [ pkgconfig freetype pango libpng libtiff giflib libjpeg netpbm ]; meta = { description = "Renders an image of the earth or other planets into the X root window"; homepage = http://xplanet.sourceforge.net; license = "GPL"; - maintainers = [ lib.maintainers.sander ]; + maintainers = [ stdenv.lib.maintainers.sander stdenv.lib.maintainers.urkud ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 1376a92c134..2e732e1acdb 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "man-pages-3.32"; + name = "man-pages-3.35"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/Archive/${name}.tar.bz2"; - sha256 = "1qr1k6kgx7i4gni9w2h610k2aa2bqdk7p08bmqslfwrzpmkkiawn"; + sha256 = "186zn80k10jg1m4jp5x5x73f7cczydsjcw5zxc5d9lls5wvafp66"; }; preBuild = diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix index 3bdf825410c..428e1370635 100644 --- a/pkgs/desktops/kde-4.7/default.nix +++ b/pkgs/desktops/kde-4.7/default.nix @@ -1,4 +1,4 @@ -{ callPackage, callPackageOrig, stdenv, qt47 }: +{ callPackage, callPackageOrig, stdenv, qt48 }: let release = "4.7.4"; @@ -44,7 +44,7 @@ kde.modules // kde.individual // akonadi = callPackage ./support/akonadi { }; - qt4 = qt47; + qt4 = qt48; kdebase_workspace = kde.modules.kde_workspace; @@ -52,5 +52,8 @@ kde.modules // kde.individual // full = stdenv.lib.attrValues kde.modules; - l10n = callPackage ./l10n { inherit release; }; + l10n = callPackage ./l10n { + inherit release; + inherit (kde.manifest) stable; + }; } diff --git a/pkgs/desktops/kde-4.7/files/kde-wallpapers-buildsystem.patch b/pkgs/desktops/kde-4.7/files/kde-wallpapers-buildsystem.patch new file mode 100644 index 00000000000..378cdb64694 --- /dev/null +++ b/pkgs/desktops/kde-4.7/files/kde-wallpapers-buildsystem.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3d3e247..f78db67 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,10 @@ +-find_package(KDE4 REQUIRED) +-include(KDE4Defaults) ++project(kde-wallpapers NONE) ++if( WALLPAPER_INSTALL_DIR ) ++ message(STATUS "Installing wallpapers to user-supplied directory ${WALLPAPER_INSTALL_DIR}") ++else() ++ find_package(KDE4 REQUIRED) ++ include(KDE4Defaults) ++endif() + + install(DIRECTORY Air DESTINATION ${WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE) + diff --git a/pkgs/desktops/kde-4.7/kde-runtime.nix b/pkgs/desktops/kde-4.7/kde-runtime.nix index 003c4aceea9..9b25e77b083 100644 --- a/pkgs/desktops/kde-4.7/kde-runtime.nix +++ b/pkgs/desktops/kde-4.7/kde-runtime.nix @@ -1,11 +1,11 @@ { kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica -, libcanberra, virtuoso, samba, ntrack +, libcanberra, virtuoso, samba, ntrack, libjpeg }: kde { buildInputs = [ kdelibs shared_desktop_ontologies bzip2 libssh exiv2 attica - samba (libcanberra.override { gtk = null; }) ntrack + samba (libcanberra.override { gtk = null; }) ntrack libjpeg ]; passthru.propagatedUserEnvPackages = [ virtuoso ]; diff --git a/pkgs/desktops/kde-4.7/kde-wallpapers.nix b/pkgs/desktops/kde-4.7/kde-wallpapers.nix index 60298e567fb..97773ffadcd 100644 --- a/pkgs/desktops/kde-4.7/kde-wallpapers.nix +++ b/pkgs/desktops/kde-4.7/kde-wallpapers.nix @@ -1,8 +1,11 @@ -{ kde, kdelibs }: +{ kde, cmake }: kde { + buildNativeInputs = [ cmake ]; - buildInputs = [ kdelibs ]; + patches = [ ./files/kde-wallpapers-buildsystem.patch ]; + + cmakeFlags = "-DWALLPAPER_INSTALL_DIR=share/wallpapers"; outputHashAlgo = "sha256"; outputHashMode = "recursive"; diff --git a/pkgs/desktops/kde-4.7/kde-workspace.nix b/pkgs/desktops/kde-4.7/kde-workspace.nix index 277bdd62634..20fc5b56455 100644 --- a/pkgs/desktops/kde-4.7/kde-workspace.nix +++ b/pkgs/desktops/kde-4.7/kde-workspace.nix @@ -1,13 +1,13 @@ { kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies , lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate , consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi -, pykde4 +, pykde4, libjpeg, pkgconfig, libXft, libXxf86misc }: kde { buildInputs = - [ kdelibs qimageblitz libdbusmenu_qt pykde4 + [ kdelibs qimageblitz libdbusmenu_qt pykde4 libjpeg libXft libXxf86misc xorg.libxkbfile xorg.libXcomposite xorg.libXScrnSaver xorg.libXtst xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp xorg.libpthreadstubs @@ -15,6 +15,8 @@ kde { libusb python libqalculate consolekit kdepimlibs pam prison akonadi ]; + buildNativeInputs = [ pkgconfig ]; + preConfigure = '' # Fix incorrect path to kde4-config. diff --git a/pkgs/desktops/kde-4.7/kdegames.nix b/pkgs/desktops/kde-4.7/kdegames.nix index 3378a99d9e7..03ecfbd88b4 100644 --- a/pkgs/desktops/kde-4.7/kdegames.nix +++ b/pkgs/desktops/kde-4.7/kdegames.nix @@ -1,12 +1,14 @@ { kde, kdelibs, qca2, twisted, pythonPackages, sip, makeWrapper, pykde4, - openal, libsndfile, qhull }: + openal, libsndfile, qhull, sqlite, pkgconfig }: kde rec { buildInputs = [ kdelibs qca2 pythonPackages.python pythonPackages.wrapPython - openal libsndfile qhull ] ++ pythonPath; + openal libsndfile qhull sqlite ] ++ pythonPath; pythonPath = [ pythonPackages.twisted pykde4 ]; + buildNativeInputs = [ pkgconfig ]; + # TODO: ggz postInstall = "wrapPythonPrograms"; diff --git a/pkgs/desktops/kde-4.7/kdelibs.nix b/pkgs/desktops/kde-4.7/kdelibs.nix index 3a6ae7a4afb..bb6e9a84665 100644 --- a/pkgs/desktops/kde-4.7/kdelibs.nix +++ b/pkgs/desktops/kde-4.7/kdelibs.nix @@ -10,7 +10,7 @@ kde { buildInputs = [ acl attr attica avahi bzip2 enchant fam getopt giflib herqq jasper libdbusmenu_qt libXScrnSaver libxslt pcre polkit_qt_1 qca2 - shared_desktop_ontologies udev libxml2 libjpeg + shared_desktop_ontologies udev libxml2 libjpeg kerberos ]; propagatedBuildInputs = [ qt4 soprano strigi phonon ]; diff --git a/pkgs/desktops/kde-4.7/kdemultimedia.nix b/pkgs/desktops/kde-4.7/kdemultimedia.nix index b4ca7a8d2da..4c3182dd9fe 100644 --- a/pkgs/desktops/kde-4.7/kdemultimedia.nix +++ b/pkgs/desktops/kde-4.7/kdemultimedia.nix @@ -1,5 +1,5 @@ { kde, alsaLib, libvorbis, taglib, flac, cdparanoia, lame, kdelibs, ffmpeg, - libmusicbrainz3, libtunepimp }: + libmusicbrainz3, libtunepimp, pulseaudio }: kde { @@ -7,7 +7,8 @@ kde { # Note: kdemultimedia can use xine-lib, but it doesn't seem useful # without the Phonon Xine backend. [ kdelibs cdparanoia taglib libvorbis libmusicbrainz3 libtunepimp ffmpeg - flac lame ]; + flac lame pulseaudio + ]; meta = { description = "KDE multimedia programs such as a movie player and volume utility"; diff --git a/pkgs/desktops/kde-4.7/kdenetwork/kget.nix b/pkgs/desktops/kde-4.7/kdenetwork/kget.nix index 33d9ec1ca01..2381a2459e6 100644 --- a/pkgs/desktops/kde-4.7/kdenetwork/kget.nix +++ b/pkgs/desktops/kde-4.7/kdenetwork/kget.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs, libktorrent, kde_workspace, kdepimlibs, - shared_desktop_ontologies, kde_baseapps, gpgme, boost, libmms, qca2 }: +{ kde, kdelibs, libktorrent, kde_workspace, kdepimlibs, sqlite +, shared_desktop_ontologies, kde_baseapps, gpgme, boost, libmms, qca2 }: kde { buildInputs = [ kdelibs libktorrent kde_workspace shared_desktop_ontologies kdepimlibs - kde_baseapps gpgme boost libmms qca2 + kde_baseapps gpgme boost libmms qca2 sqlite ]; KDEDIRS = libktorrent; diff --git a/pkgs/desktops/kde-4.7/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.7/kdenetwork/kopete.nix index a4b01c5f9a6..704f6d04dfe 100644 --- a/pkgs/desktops/kde-4.7/kdenetwork/kopete.nix +++ b/pkgs/desktops/kde-4.7/kdenetwork/kopete.nix @@ -1,11 +1,11 @@ { kde, kdelibs, speex, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent, jasper, libidn, mediastreamer, msilbc, pkgconfig, libxml2, libxslt, giflib, - libgadu, boost, qca2, gpgme }: + libgadu, boost, qca2, gpgme, sqlite }: kde { buildInputs = [ kdelibs speex libmsn libotr kdepimlibs qimageblitz libktorrent jasper libidn mediastreamer msilbc libxml2 libxslt giflib libgadu boost qca2 - gpgme ]; + gpgme sqlite ]; buildNativeInputs = [ pkgconfig ]; diff --git a/pkgs/desktops/kde-4.7/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.7/kdenetwork/krdc.nix index 664b1bc45a7..40ef91d5433 100644 --- a/pkgs/desktops/kde-4.7/kdenetwork/krdc.nix +++ b/pkgs/desktops/kde-4.7/kdenetwork/krdc.nix @@ -1,7 +1,7 @@ -{ kde, kdelibs, libvncserver }: +{ kde, kdelibs, libvncserver, libjpeg }: kde { - buildInputs = [ kdelibs libvncserver ]; + buildInputs = [ kdelibs libvncserver libjpeg ]; patches = [ ./kdenetwork.patch ]; } diff --git a/pkgs/desktops/kde-4.7/l10n/default.nix b/pkgs/desktops/kde-4.7/l10n/default.nix index 144968f6672..69cfdcf8ab2 100644 --- a/pkgs/desktops/kde-4.7/l10n/default.nix +++ b/pkgs/desktops/kde-4.7/l10n/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kdelibs, gettext, release }: +{ stdenv, fetchurl, kdelibs, gettext, release, stable }: let @@ -11,7 +11,7 @@ let name = "kde-l10n-${saneName}-${release}"; src = fetchurl { - url = "mirror://kde/stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.bz2"; + url = "mirror://kde/${if stable then "" else "un"}stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.bz2"; name = "${name}.tar.bz2"; inherit sha256; }; diff --git a/pkgs/development/interpreters/ruby/gem.nix b/pkgs/development/interpreters/ruby/gem.nix index 289f840aa04..a64f10e268c 100644 --- a/pkgs/development/interpreters/ruby/gem.nix +++ b/pkgs/development/interpreters/ruby/gem.nix @@ -40,6 +40,15 @@ let runHook postInstall ''; + + propagatedUserEnvPkgs = requiredGems; + postFixup = '' + if [ -n "$propagatedUserEnvPkgs" ]; then + mkdir -p "$out/nix-support" + echo "$propagatedUserEnvPkgs" > "$out/nix-support/propagated-user-env-packages" + fi + ''; + }; mb = stdenv.lib.maybeAttr; patchedGem = a: stdenv.mkDerivation (removeAttrs (stdenv.lib.mergeAttrsByFuncDefaults diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index c518b46de78..921fc1b57d8 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -17,11 +17,8 @@ g: # Get dependencies from patched gems buildr = g.buildr_1_4_6; bundler = g.bundler_1_0_22; childprocess = g.childprocess_0_3_1; - coffee_script = g.coffee_script_2_2_0; - coffee_script_source = g.coffee_script_source_1_2_0; diff_lcs = g.diff_lcs_1_1_3; erubis = g.erubis_2_7_0; - execjs = g.execjs_1_3_0; ffi = g.ffi_1_0_11; highline = g.highline_1_5_1; hike = g.hike_1_2_1; @@ -63,7 +60,7 @@ g: # Get dependencies from patched gems tzinfo = g.tzinfo_0_3_31; xml_simple = g.xml_simple_1_0_12; }; - gem_nix_args = [ ''autotest-rails'' ''buildr'' ''coffee-script'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ]; + gem_nix_args = [ ''autotest-rails'' ''buildr'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ]; gems = { ZenTest_4_6_2 = { basename = ''ZenTest''; @@ -158,7 +155,7 @@ installed versions.''; longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.''; }; name = ''activesupport-3.2.1''; - requiredGems = [ g.i18n_0_6_0 ]; + requiredGems = [ g.i18n_0_6_0 g.multi_json_1_0_4 ]; sha256 = ''0ajkzsa7467jp7lxgjcsl94nqkvw9d0h492rypljs0f8f1fn744v''; }; arel_3_0_0 = { @@ -278,34 +275,6 @@ for those one-off tasks, with a language that's a joy to use. requiredGems = [ g.ffi_1_0_11 ]; sha256 = ''0phkpxvwz88kgbi4d2akiqbppf374kn2rwf64hfs99p1j1ksbw5l''; }; - coffee_script_2_2_0 = { - basename = ''coffee_script''; - meta = { - description = ''Ruby CoffeeScript Compiler''; - homepage = ''http://github.com/josh/ruby-coffee-script''; - longDescription = '' Ruby CoffeeScript is a bridge to the JS CoffeeScript compiler. -''; - }; - name = ''coffee-script-2.2.0''; - requiredGems = [ g.coffee_script_source_1_2_0 g.execjs_1_3_0 ]; - sha256 = ''133cp4znfp44wwnv12myw8s0z6qws74ilqmw88iwzkshg689zpdc''; - }; - coffee_script_source_1_2_0 = { - basename = ''coffee_script_source''; - meta = { - description = ''The CoffeeScript Compiler''; - homepage = ''http://jashkenas.github.com/coffee-script/''; - longDescription = '' CoffeeScript is a little language that compiles into JavaScript. - Underneath all of those embarrassing braces and semicolons, - JavaScript has always had a gorgeous object model at its heart. - CoffeeScript is an attempt to expose the good parts of JavaScript - in a simple way. -''; - }; - name = ''coffee-script-source-1.2.0''; - requiredGems = [ ]; - sha256 = ''13cpmlj2m5lyxipdxmnajy12bzwmgc6g2n090gpa0wd5am7xvhkp''; - }; diff_lcs_1_1_2 = { basename = ''diff_lcs''; meta = { @@ -365,18 +334,6 @@ is the MIT license.''; requiredGems = [ ]; sha256 = ''1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3''; }; - execjs_1_3_0 = { - basename = ''execjs''; - meta = { - description = ''Run JavaScript code from Ruby''; - homepage = ''https://github.com/sstephenson/execjs''; - longDescription = '' ExecJS lets you run JavaScript code from Ruby. -''; - }; - name = ''execjs-1.3.0''; - requiredGems = [ g.multi_json_1_0_4 ]; - sha256 = ''1sski14wdzfljx2f9j7r09li3rxqwvink8n5v489ykw1sicg6l2s''; - }; ffi_1_0_11 = { basename = ''ffi''; meta = { diff --git a/pkgs/development/interpreters/ruby/ruby-19.nix b/pkgs/development/interpreters/ruby/ruby-19.nix index f47d0e524f7..c5c12831c0a 100644 --- a/pkgs/development/interpreters/ruby/ruby-19.nix +++ b/pkgs/development/interpreters/ruby/ruby-19.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { name = "ruby-${version}"; src = fetchurl { - url = "ftp://ftp.ruby-lang.org/pub/ruby/1.9/${name}.tar.gz"; - sha256 = "0km3ryc0cs578982x6c3y3n3xr920grnpncmznb447snwd10149v"; + url = "ftp://ftp.ruby-lang.org/pub/ruby/1.9/${name}.tar.bz2"; + sha256 = "09jmxz3lqsi5097233hc1wjnzg6z5f4y7kmlkqhskdaj6125jyn6"; }; # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { passthru = rec { majorVersion = "1.9"; minorVersion = "3"; - patchLevel = "0"; + patchLevel = "125"; libPath = "lib/ruby/${majorVersion}"; gemPath = "lib/ruby/gems/${majorVersion}"; }; diff --git a/pkgs/development/interpreters/ruby/rubygems.nix b/pkgs/development/interpreters/ruby/rubygems.nix index 4311c6ad5d4..40a43e27453 100644 --- a/pkgs/development/interpreters/ruby/rubygems.nix +++ b/pkgs/development/interpreters/ruby/rubygems.nix @@ -1,10 +1,10 @@ args : with args; rec { - version = "1.8.15"; + version = "1.8.17"; src = fetchurl { url = "http://production.cf.rubygems.org/rubygems/${name}.tgz"; - sha256 = "0crfdaxpcv13x40mb0ccm5n0r3dknw7w7xl87icj99kyqmfx8k51"; + sha256 = "068sr55r8wiw55bpf93pp07871cbqhxk9cxma6arhd04j7n8ppph"; }; buildInputs = [ruby makeWrapper]; diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix new file mode 100644 index 00000000000..b725f6bbf9f --- /dev/null +++ b/pkgs/development/libraries/bullet/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl, unzip, cmake}: + +stdenv.mkDerivation { + name = "bullet-2.78"; + src = fetchurl { + url = "http://bullet.googlecode.com/files/bullet-2.78.zip"; + sha256 = "10l2dclvv0di9mi9qp6xfy9vybx182xp2dyygabacrpr3p75s77k"; + }; + buildInputs = [ unzip cmake ]; + configurePhase = '' + cmake -DBUILD_SHARED_LIBS=ON -DBUILD_EXTRAS=OFF -DBUILD_DEMOS=OFF . + ''; + + meta = { + description = "A professional free 3D Game Multiphysics Library"; + longDescription = '' + Bullet 3D Game Multiphysics Library provides state of the art collision + detection, soft body and rigid body dynamics. + ''; + homepage = http://code.google.com/p/bullet/; + license = stdenv.lib.licenses.zlib; + maintainers = [ "Alexander Foremny <alexanderforemny@googlemail.com>" ]; + }; +} diff --git a/pkgs/development/libraries/haskell/http-date/default.nix b/pkgs/development/libraries/haskell/http-date/default.nix index 1fbcc40a814..a12542e3846 100644 --- a/pkgs/development/libraries/haskell/http-date/default.nix +++ b/pkgs/development/libraries/haskell/http-date/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "http-date"; - version = "0.0.1"; - sha256 = "1dqnglz1l6h14339nd5q8sq90fak64ab8fs9fkhf8ipg5y0pzwbd"; + version = "0.0.2"; + sha256 = "18nijf3hswbvcd5amhbccqmgnanmslsmqpd2iixlvwz5hqb3ncvj"; buildDepends = [ attoparsec ]; meta = { description = "HTTP Date parser/formatter"; diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 57a325a7234..24b93221d11 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ruby, qt4, pkgconfig, libsamplerate, fftwSinglePrec }: +{ stdenv, fetchurl, ruby, qt4, pkgconfig, libsamplerate, fftwSinglePrec, which }: let version = "0.3.3"; in @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { prefixKey = "--prefix "; propagatedBuildInputs = [ qt4 libsamplerate fftwSinglePrec ]; - buildNativeInputs = [ ruby pkgconfig ]; + buildNativeInputs = [ ruby pkgconfig which ]; configureFlags = "--release"; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 85c2fa13a93..38eb344621e 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -4,11 +4,11 @@ assert zlib != null; # If you want to upgrade libpng, look at libpng15 branch stdenv.mkDerivation rec { - name = "libpng-1.2.46"; + name = "libpng-1.2.47"; src = fetchurl { url = "mirror://sourceforge/libpng/${name}.tar.xz"; - sha256 = "0rcx4v4khdkrvz7b02fmx7lab2pk1lal4dhx9widv36b7g2xvwzn"; + sha256 = "1lai3dnzw81y40jr17bdj1qh08hwv9mc1v74yybl7jdx2hiilsvx"; }; propagatedBuildInputs = [ zlib ]; diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 93ed2869d0e..83b921dd49b 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -11,10 +11,9 @@ stdenv.mkDerivation rec { buildInputs = [ cmake fftw fftwSinglePrec libtiff libpng libjpeg python boost numpy hdf5 ]; - cmakeFlags = if (stdenv.system == "x86_64-linux") then - "-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC" - else - ""; + preConfigure = "cmakeFlags+=\" -DVIGRANUMPY_INSTALL_DIR=$out/lib/${python.libPrefix}/site-packages\""; + cmakeFlags = stdenv.lib.optionals (stdenv.system == "x86_64-linux") + [ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ]; meta = { description = "Novel computer vision C++ library with customizable algorithms and data structures"; diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index 66e4870aa59..c611764cc01 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -3,7 +3,7 @@ , gtkmm, libglademm, boost, perl, sqlite }: stdenv.mkDerivation rec { - name = "systemtap-1.2"; + name = "systemtap-1.2-${linux.version}"; src = fetchurl { url = "http://sources.redhat.com/systemtap/ftp/releases/${name}.tar.gz"; diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix index 925e2e2e650..3fececf6c6d 100644 --- a/pkgs/os-specific/linux/acpi-call/default.nix +++ b/pkgs/os-specific/linux/acpi-call/default.nix @@ -1,13 +1,14 @@ -{stdenv, fetchgit, kernel, ...}: +{ stdenv, fetchgit, kernel }: stdenv.mkDerivation { + name = "acpi-call-${kernel.version}"; + src = fetchgit { - url="git://github.com/mkottman/acpi_call.git"; - rev="4f71ce83392bc52b3497"; - sha256="1f20516dc7d42bc7d9d71eaa54f48f38cd56b8683062f81d6f3857990056bdd3"; + url = "git://github.com/mkottman/acpi_call.git"; + rev = "4f71ce83392bc52b3497"; + sha256 = "1f20516dc7d42bc7d9d71eaa54f48f38cd56b8683062f81d6f3857990056bdd3"; }; - name = "acpi-call"; - + preBuild = '' kernelVersion=$(cd ${kernel}/lib/modules && ls) sed -e 's/break/true/' -i test_off.sh diff --git a/pkgs/os-specific/linux/atheros/0.9.4.nix b/pkgs/os-specific/linux/atheros/0.9.4.nix index b139867be60..87470da9649 100644 --- a/pkgs/os-specific/linux/atheros/0.9.4.nix +++ b/pkgs/os-specific/linux/atheros/0.9.4.nix @@ -17,7 +17,7 @@ postInstall = fullDepEntry ('' '') [minInit doMakeInstall]; in stdenv.mkDerivation rec { - name = "atheros-0.9.4"; + name = "atheros-0.9.4-${kernel.version}"; builder = writeScript (name + "-builder") (textClosure localDefs [doMakeInstall postInstall doForceShare doPropagate]); diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 248e24c90bd..703895b4f34 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl , kernel, xlibs, which, imake +{ stdenv, fetchurl, kernel, xlibs, which, imake , mesa # for fgl_glxgears , libXxf86vm, xf86vidmodeproto # for fglrx_gamma , xorg, makeWrapper, glibc, patchelf @@ -14,33 +14,32 @@ # The gentoo ebuild contains much more magic.. -let lib = stdenv.lib; - inherit (lib) concatStringsSep; -in # http://wiki.cchtml.com/index.php/Main_Page +assert stdenv.system == "x86_64-linux"; + stdenv.mkDerivation rec { - name = "ati-drivers-${version}"; + name = "ati-drivers-${version}-${kernel.version}"; version = "10-11-x86"; builder = ./builder.sh; inherit libXxf86vm xf86vidmodeproto; - src = - assert stdenv.system == "x86_64-linux"; - fetchurl { + src = fetchurl { url = https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-driver-installer-10-11-x86.x86_64.run; sha256 = "1z33w831ayx1j5lm9d1xv6whkmzsz9v8li3s8c96hwnwki6zpimr"; }; - buildInputs = [xlibs.libXext xlibs.libX11 - xlibs.libXrandr which imake makeWrapper - patchelf - ]; + buildInputs = + [ xlibs.libXext xlibs.libX11 + xlibs.libXrandr which imake makeWrapper + patchelf + ]; + inherit kernel glibc /* glibc only used for setting interpreter */; - LD_LIBRARY_PATH = concatStringsSep ":" + LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":" [ "${xorg.libXrandr}/lib" "${xorg.libXrender}/lib" "${xorg.libXext}/lib" diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index d64701a1d07..502d24d32d8 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -3,9 +3,11 @@ let version = "0.4.1"; - name = "bbswitch-${version}"; + name = "bbswitch-${version}-${kernel.version}"; -in stdenv.mkDerivation { +in + +stdenv.mkDerivation { inherit name; src = fetchurl { diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 96749dca2b7..1c557301729 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -6,7 +6,8 @@ let version = "5_100_82_112"; in stdenv.mkDerivation { - name = "broadcom-sta-${version}"; + name = "broadcom-sta-${version}-${kernel.version}"; + src = fetchurl { url = "http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_${bits}-v${version}.tar.gz"; sha256 = if bits == "32" diff --git a/pkgs/os-specific/linux/e1000e/default.nix b/pkgs/os-specific/linux/e1000e/default.nix index b4d92158054..709befd9dc5 100644 --- a/pkgs/os-specific/linux/e1000e/default.nix +++ b/pkgs/os-specific/linux/e1000e/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, kernel }: stdenv.mkDerivation { - name = "e1000e-1.5.1"; + name = "e1000e-1.5.1-${kernel.version}"; src = fetchurl { url = "http://downloads.sourceforge.net/e1000/e1000e-1.5.1.tar.gz"; diff --git a/pkgs/os-specific/linux/exmap/default.nix b/pkgs/os-specific/linux/exmap/default.nix index a7fb22f95e9..c39b2acf4e1 100644 --- a/pkgs/os-specific/linux/exmap/default.nix +++ b/pkgs/os-specific/linux/exmap/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, kernel, pkgconfig, gtkmm, boost, pcre }: stdenv.mkDerivation rec { - name = "exmap-0.10"; + name = "exmap-0.10-${kernel.version}"; src = fetchurl { url = "http://www.berthels.co.uk/exmap/download/${name}.tgz"; diff --git a/pkgs/os-specific/linux/frandom/default.nix b/pkgs/os-specific/linux/frandom/default.nix index 9f07e7c8eb0..fb2c50a778d 100644 --- a/pkgs/os-specific/linux/frandom/default.nix +++ b/pkgs/os-specific/linux/frandom/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, kernel }: stdenv.mkDerivation rec { - name = "frandom-1.1"; + name = "frandom-1.1-${kernel.version}"; src = fetchurl { url = "http://sourceforge.net/projects/frandom/files/${name}.tar.gz"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { buildInputs = []; meta = { - description = "A very fast random number generator kernel module."; + description = "A very fast random number generator kernel module"; homepage = http://frandom.sourceforge.net/; license = "GPLv2"; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; diff --git a/pkgs/os-specific/linux/iscsitarget/default.nix b/pkgs/os-specific/linux/iscsitarget/default.nix index 03d01db2785..214fae01cfc 100644 --- a/pkgs/os-specific/linux/iscsitarget/default.nix +++ b/pkgs/os-specific/linux/iscsitarget/default.nix @@ -1,14 +1,16 @@ { stdenv, fetchurl, kernel, module_init_tools}: stdenv.mkDerivation rec { - name = "iscsitarget-1.4.20.2"; + name = "iscsitarget-1.4.20.2-${kernel.version}"; + src = fetchurl { url = "mirror://sourceforge/iscsitarget/iscsitarget/1.4.20.2/${name}.tar.gz"; sha256 = "126kp0yc7vmvdbaw2xfav89340b0h91dvvyib5qbvyrq40n8wg0g"; }; KSRC = "${kernel}/lib/modules/*/build"; - DESTDIR="$(out)"; + + DESTDIR = "$(out)"; preConfigure = '' export PATH=$PATH:${module_init_tools}/sbin @@ -18,8 +20,8 @@ stdenv.mkDerivation rec { buildInputs = [ module_init_tools ]; meta = { - description = "iSCSI Enterprise Target (IET) software is for building an iSCSI storage system on Linux."; + description = "iSCSI Enterprise Target (IET), software for building an iSCSI storage system on Linux"; license = "GPLv2+"; - homepage = http://iscsitarget.sourceforge.net ; + homepage = http://iscsitarget.sourceforge.net; }; } diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index e1b8c0d2836..e1f347af23c 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -1,13 +1,4 @@ -{ - stdenv, - fetchurl, - perl, - bison, - mktemp, - linuxHeaders, - linuxHeadersCross, - kernel ? null -}: +{ stdenv, fetchurl, perl, bison, mktemp, linuxHeaders, linuxHeadersCross, kernel ? null }: assert stdenv.isLinux; @@ -17,7 +8,7 @@ let in stdenv.mkDerivation { - name = "klibc-${version}"; + name = "klibc-${version}${stdenv.lib.optionalString (kernel != null) "-${kernel.version}"}"; src = fetchurl { url = "http://ftp.eu.openbsd.org/pub/linux/libs/klibc/1.5/klibc-${version}.tar.bz2"; diff --git a/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix b/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix deleted file mode 100644 index d9dc076d92f..00000000000 --- a/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix +++ /dev/null @@ -1,38 +0,0 @@ -args : with args; -rec { - name = "kqemu-"+version; - src = fetchurl { - url = http://www.nongnu.org/qemu/kqemu-1.3.0pre11.tar.gz; - sha256 = "03svg2x52ziglf9r9irf6ziiz8iwa731fk1mdskwdip5jxbyy6jl"; - }; - - buildInputs = []; - configureFlags = [''--PREFIx=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)'']; - debugStep = fullDepEntry ('' - cat config-host.mak - '') ["minInit"]; - preConfigure = fullDepEntry ('' - sed -e 's/`uname -r`/'"$(basename ${kernel}/lib/modules/*)"'/' -i install.sh - sed -e '/kernel_path=/akernel_path=$out$kernel_path' -i install.sh - sed -e '/depmod/d' -i install.sh - cat install.sh - sed -e '/linux\/ioctl.h/a#include <linux\/sched.h>' -i kqemu-linux.c - '') ["minInit" "doUnpack"]; - fixInc = { - text = '' - sed -e '/#include/i#include <linux/sched.h>' -i kqemu-linux.c - ''; - deps = ["minInit" "doUnpack"]; - }; - fixMemFunc = { - text='' - sed -e 's/memset/mymemset/g; s/memcpy/mymemcpy/g; s/void [*]my/static void *my/g' -i common/kernel.c - ''; - deps = ["minInit" "doUnpack"]; - }; - phaseNames = ["fixInc" "fixMemFunc" "preConfigure" "doConfigure" "debugStep" "doMakeInstall"]; - - meta = { - description = "Kernel module for Qemu acceleration"; - }; -} diff --git a/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix b/pkgs/os-specific/linux/kqemu/default.nix index a24e65b378f..c703ca4e4a4 100644 --- a/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix +++ b/pkgs/os-specific/linux/kqemu/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, kernel, perl, fullDepEntry, ... }: +{ stdenv, fetchurl, kernel, perl }: stdenv.mkDerivation rec { - name = "kqemu-1.4.0pre1"; + name = "kqemu-1.4.0pre1-${kernel.version}"; src = fetchurl { url = "http://www.nongnu.org/qemu/${name}.tar.gz"; sha256 = "14dlmawn3gia1j401ag5si5k1a1vav7jpv86rl37p1hwmr7fihxs"; }; - buildInputs = [perl]; + buildInputs = [ perl ]; - configureFlags = [''--PREFIX=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)'']; + configureFlags = [ ''--PREFIX=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)'' ]; - preConfigure = fullDepEntry ('' + preConfigure = '' sed -e '/#include/i#include <linux/sched.h>' -i kqemu-linux.c sed -e 's/memset/mymemset/g; s/memcpy/mymemcpy/g; s/void [*]my/static void *my/g' -i common/kernel.c @@ -20,11 +20,9 @@ stdenv.mkDerivation rec { sed -e '/kernel_path=/akernel_path=$out$kernel_path' -i install.sh sed -e '/depmod/d' -i install.sh cat install.sh - '') ["minInit" "doUnpack"]; + ''; - phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"]; - meta = { - description = "Kernel module for Qemu acceleration"; + description = "Kernel module for QEMU acceleration"; }; } diff --git a/pkgs/os-specific/linux/ndiswrapper/default.nix b/pkgs/os-specific/linux/ndiswrapper/default.nix index 75ff3fba3c6..c41649e0285 100644 --- a/pkgs/os-specific/linux/ndiswrapper/default.nix +++ b/pkgs/os-specific/linux/ndiswrapper/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, kernel, perl }: stdenv.mkDerivation { - name = "ndiswrapper-1.56-stable"; + name = "ndiswrapper-1.56-${kernel.version}"; # need at least .config and include inherit kernel; diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index 80703990778..eccdde30b13 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/pkgs/os-specific/linux/open-iscsi/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchurl, kernel}: stdenv.mkDerivation rec { - name = "open-iscsi-2.0-871"; + name = "open-iscsi-2.0-871-${kernel.version}"; + src = fetchurl { url = "http://www.open-iscsi.org/bits/${name}.tar.gz"; sha256 = "1jvx1agybaj4czhz41bz37as076spicsmlh5pjksvwl2mr38gsmw"; }; KSRC = "${kernel}/lib/modules/*/build"; - DESTDIR="$(out)"; + DESTDIR = "$(out)"; preConfigure = '' sed -i 's|/usr/|/|' Makefile @@ -17,8 +18,8 @@ stdenv.mkDerivation rec { patches = [./kernel.patch]; meta = { - description = "Open-iSCSI project is a high performance, transport independent, multi-platform implementation of RFC3720."; + description = "A high performance, transport independent, multi-platform implementation of RFC3720"; license = "GPLv2+"; - homepage = http://www.open-iscsi.org ; + homepage = http://www.open-iscsi.org; }; } diff --git a/pkgs/os-specific/linux/v86d/default.nix b/pkgs/os-specific/linux/v86d/default.nix index c8924f91c57..aedfe9ac686 100644 --- a/pkgs/os-specific/linux/v86d/default.nix +++ b/pkgs/os-specific/linux/v86d/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, klibc, kernel, withKlibc ? true}: stdenv.mkDerivation rec { - name = "v86d-0.1.10"; + name = "v86d-0.1.10-${kernel.version}"; src = fetchurl { url = "http://dev.gentoo.org/~spock/projects/uvesafb/archive/${name}.tar.bz2"; diff --git a/pkgs/tools/networking/telnet/default.nix b/pkgs/tools/networking/telnet/default.nix index ba00bb6b598..c0dbf710ffb 100644 --- a/pkgs/tools/networking/telnet/default.nix +++ b/pkgs/tools/networking/telnet/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation { description = "A client and daemon for the Telnet protocol"; homepage = ftp://ftp.suse.com/pub/people/kukuk/ipv6/; license = "BSD"; + platforms = stdenv.lib.platforms.gnu; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b845d03c7f..d405b01bcc3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2766,7 +2766,7 @@ let rubygemsFun = ruby: builderDefsPackage (import ../development/interpreters/ruby/rubygems.nix) { inherit ruby makeWrapper; }; - rubygems = rubygemsFun ruby; + rubygems = hiPrio (rubygemsFun ruby); rq = callPackage ../applications/networking/cluster/rq { }; @@ -5744,9 +5744,7 @@ let wis_go7007 = callPackage ../os-specific/linux/wis-go7007 { }; - kqemu = builderDefsPackage ../os-specific/linux/kqemu/1.4.0pre1.nix { - inherit kernel perl; - }; + kqemu = callPackage ../os-specific/linux/kqemu { }; klibc = callPackage ../os-specific/linux/klibc { linuxHeaders = glibc.kernelHeaders; @@ -8620,4 +8618,6 @@ let misc = import ../misc/misc.nix { inherit pkgs stdenv; }; + bullet = callPackage ../development/libraries/bullet {}; + }; in pkgs |