diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix index 0746dd5b3be..1af31c2ba5c 100644 --- a/pkgs/applications/editors/emacs-modes/magit/default.nix +++ b/pkgs/applications/editors/emacs-modes/magit/default.nix @@ -1,22 +1,19 @@ { stdenv, fetchurl, emacs, texinfo }: let - version = "1.0.0"; + version = "1.1.0"; in stdenv.mkDerivation { name = "magit-${version}"; src = fetchurl { url = "http://github.com/downloads/magit/magit/magit-${version}.tar.gz"; - sha256 = "1hfdl90d96zin31v8x4p8zx5f0x0i5i9hccysx6q3prdgw9r6wzq"; + sha256 = "8e147e1f2e69938232f859daf712515b46aa367d7b7d90b42538e083f52a72b4"; }; buildInputs = [emacs texinfo]; - configurePhase = - '' sed -i Makefile \ - -e "s|^PREFIX=.*$|PREFIX=$out|g ; s|/etc/emacs/|$out/etc/emacs/|" - ''; + configurePhase = "makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc )"; meta = { description = "Magit, an Emacs interface to Git"; @@ -34,7 +31,7 @@ stdenv.mkDerivation { ''; license = "GPLv3+"; - homepage = "http://github.com/philjackson/magit"; + homepage = "https://github.com/magit/magit"; platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ simons ludo ]; }; diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 6d4431516f8..895453aae44 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,22 +1,28 @@ { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen, kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu, -liblqr1, lensfun, pkgconfig }: +liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost, +shared_desktop_ontologies, marble }: stdenv.mkDerivation rec { - name = "digikam-1.5.0"; + name = "digikam-2.4.1"; src = fetchurl { url = "mirror://sourceforge/digikam/${name}.tar.bz2"; - sha256 = "1vvzw132aw2c1z2v1zc3aqa99kvg501krr2law35ri12zkqjsvaz"; + sha256 = "0fyyhc26syd1d1m8jqyg2i66hwd523mh419ln8y944jkrjj6gadc"; }; buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu liblqr1 lensfun - pkgconfig ]; + pkgconfig qjson libkdcraw opencv libkexiv2 libkipi boost shared_desktop_ontologies + marble ]; KDEDIRS=kdeedu; - patches = [ ./include.diff ]; + # Make digikam find some FindXXXX.cmake + preConfigure = '' + cp ${qjson}/share/apps/cmake/modules/FindQJSON.cmake cmake/modules; + cp ${marble}/share/apps/cmake/modules/FindMarble.cmake cmake/modules; + ''; meta = { description = "Photo Management Program"; diff --git a/pkgs/applications/graphics/digikam/include.diff b/pkgs/applications/graphics/digikam/include.diff deleted file mode 100644 index 0762ce04d26..00000000000 --- a/pkgs/applications/graphics/digikam/include.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt b/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt -index 9ee36cc..c6e5c00 100644 ---- a/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt -+++ b/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt -@@ -18,6 +18,7 @@ IF(MARBLEWIDGET_SUPPORTS_PLUGINS) - - INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/libs/imageproperties/markerclusterholderplugin/ - ${CMAKE_BINARY_DIR}/libs/imageproperties/markerclusterholderplugin/ -+ ${LIBMARBLEWIDGET_INCLUDE_DIR}/.. - ${QT_INCLUDE_DIR} - ) - diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index b38a6cb5644..b8100fbd709 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng -, imagemagick, libjpeg, fontconfig, podofo, qt4, icu +, imagemagick, libjpeg, fontconfig, podofo, qt4, icu, sqlite , pil, makeWrapper, unrar, chmlib, pythonPackages, xz }: stdenv.mkDerivation rec { - name = "calibre-0.8.30"; + name = "calibre-0.8.32"; src = fetchurl { url = "http://calibre-ebook.googlecode.com/files/${name}.tar.xz"; - sha256 = "1w94kaynxiksjfi6wqlvwnryl08f8m0ylqwgzwkz1hjznqiji282"; + sha256 = "0d0zq4sr0qm8jarg0ps24lfizb4hyb57pjsp81y1sb5nzjki7jml"; }; inherit python; @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { [ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg fontconfig podofo qt4 pil chmlib icu pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil - pythonPackages.cssutils pythonPackages.beautifulsoap pythonPackages.sqlite3 + pythonPackages.cssutils pythonPackages.beautifulsoap + pythonPackages.sqlite3 sqlite ]; installPhase = '' @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { $out/lib/calibre/calibre/ebooks/metadata/*.py $out/lib/calibre/calibre/ebooks/rtf2xml/*.py" - sed -i "s/env python/python/" $PYFILES + sed -i "s/env python[0-9.]*/python/" $PYFILES for a in $out/bin/*; do wrapProgram $a --prefix PYTHONPATH : $PYTHONPATH --prefix LD_LIBRARY_PATH : ${unrar}/lib done diff --git a/pkgs/applications/misc/kde-wacomtablet/default.nix b/pkgs/applications/misc/kde-wacomtablet/default.nix index 6da0b8410a0..46730848024 100644 --- a/pkgs/applications/misc/kde-wacomtablet/default.nix +++ b/pkgs/applications/misc/kde-wacomtablet/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchurl, automoc4, cmake, kdelibs }: +{ stdenv, fetchurl, kdelibs, gettext }: stdenv.mkDerivation rec { - name = "wacomtablet-1.2.5"; + name = "wacomtablet-1.3.5"; src = fetchurl { - url = "http://kde-apps.org/CONTENT/content-files/114856-${name}.tar.gz"; - sha256 = "11hfab6sqmhvd0m1grc9m9yfi0p7rk0bycj9wqgkgbc8cwgps6sf"; + url = "http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-v1.3.5.tar.bz2"; + sha256 = "0dgsp3izx2v44f6j8mhxc6zybjn5sj9038w6b4v2fgix47fri0ja"; }; - buildInputs = [ automoc4 cmake kdelibs ]; + buildInputs = [ kdelibs ]; + + buildNativeInputs = [ gettext ]; meta = with stdenv.lib; { description = "KDE Wacom graphic tablet configuration tool"; - license = "GPLv2"; + license = licenses.gpl2Plus; homepage = http://kde-apps.org/content/show.php/wacom+tablet?content=114856; platforms = platforms.linux; maintainers = [ maintainers.goibhniu maintainers.urkud ]; diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix index f395e64ddb5..05e62ba3844 100644 --- a/pkgs/applications/misc/krusader/default.nix +++ b/pkgs/applications/misc/krusader/default.nix @@ -1,12 +1,12 @@ -{stdenv, fetchurl, cmake, qt4, perl, gettext, kdelibs, kde_baseapps, automoc4, phonon}: +{stdenv, fetchurl, gettext, kdelibs, kde_baseapps}: stdenv.mkDerivation rec { - name = "krusader-2.2.0-beta1"; + name = "krusader-2.4.0-beta1"; src = fetchurl { url = "mirror://sourceforge/krusader/${name}.tar.bz2"; - sha256 = "0rbk0hw8p1bb03w74gspljbzhvpbs3dcr6ckp38gh5r80mcmqfbs"; + sha256 = "1q1m4cjzz2m41pdpxnwrsiczc7990785b700lv64midjjgjnr7j6"; }; - buildInputs = [ cmake qt4 perl gettext kdelibs automoc4 phonon kde_baseapps ]; + buildInputs = [ gettext kdelibs kde_baseapps ]; meta = { description = "Norton/Total Commander clone for KDE"; license = "GPL"; diff --git a/pkgs/applications/misc/rsibreak/default.nix b/pkgs/applications/misc/rsibreak/default.nix index 939797d9dc5..8aab11beec3 100644 --- a/pkgs/applications/misc/rsibreak/default.nix +++ b/pkgs/applications/misc/rsibreak/default.nix @@ -1,12 +1,20 @@ -{ stdenv, fetchurl, cmake, kdelibs, kdebase_workspace }: +{ stdenv, fetchurl, kdelibs, kdebase_workspace, gettext }: stdenv.mkDerivation rec { - name = "rsibreak-0.10"; + name = "rsibreak-0.11"; src = fetchurl { - url = "http://www.rsibreak.org/files/${name}.tar.bz2"; - sha256 = "02vvwmzhvc9jfrzmnfn3cygx63yx7g360lcslwj1vikzkg834ik0"; + url = "${meta.homepage}/files/${name}.tar.bz2"; + sha256 = "1yrf73r8mixskh8b531wb8dfs9z7rrw010xsrflhjhjmqh94h8mw"; }; - buildInputs = [ cmake kdelibs kdebase_workspace ]; + buildNativeInputs = [ gettext ]; + + buildInputs = [ kdelibs kdebase_workspace ]; + + meta = { + homepage = http://www.rsibreak.org/; + description = "Repetitive Strain Injury prevention"; + inherit (kdelibs.meta) platforms maintainers; + }; } diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix new file mode 100644 index 00000000000..1202c4327bb --- /dev/null +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "task-warrior-1.9.4"; + + src = fetchurl { + url = http://www.taskwarrior.org/download/task-1.9.4.tar.gz; + sha256 = "0jnk30k1b2j3nx39il70jmj6p49wxp6cl4awd8hw71gqkcf6480h"; + }; + + meta = { + description = "Command-line todo list manager"; + homepage = http://taskwarrior.org/; + license = "GPLv2+"; + }; +} diff --git a/pkgs/applications/misc/taskwarrior/unstable.nix b/pkgs/applications/misc/taskwarrior/unstable.nix new file mode 100644 index 00000000000..057ebbe57c5 --- /dev/null +++ b/pkgs/applications/misc/taskwarrior/unstable.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, cmake, lua5 }: + +stdenv.mkDerivation { + name = "task-warrior-2.0.0.beta4"; + + src = fetchurl { + url = http://www.taskwarrior.org/download/task-2.0.0.beta4.tar.gz; + sha256 = "1c9n6b5ly3m5kminnsvqgmjxdkb68w4av9kdnh47dw4sj3gwrn1w"; + }; + + NIX_LDFLAGS = "-ldl"; + + buildInputs = [ cmake lua5 ]; + + meta = { + description = "Command-line todo list manager"; + homepage = http://taskwarrior.org/; + license = "MIT"; + }; +} diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix index 263bc09ff32..e06f812a18a 100644 --- a/pkgs/applications/misc/yakuake/default.nix +++ b/pkgs/applications/misc/yakuake/default.nix @@ -1,14 +1,20 @@ -{ stdenv, fetchurl, kdelibs, cmake, gettext, perl, automoc4, qt4, phonon }: +{ stdenv, fetchurl, kdelibs, gettext }: -stdenv.mkDerivation rec { - name = "yakuake-2.9.7"; +let + pname = "yakuake"; + version = "2.9.8"; +in +stdenv.mkDerivation { + name = "${pname}-${version}"; src = fetchurl { - url = "http://download.berlios.de/yakuake/${name}.tar.bz2"; - sha256 = "0azzvbh3jwz8yhn6gqd46ya7589sadfjyysw230vlf0zlfipdlvd"; + url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.bz2"; + sha256 = "0a9x3nmala8nl4xl3h7rcd76f5j7b7r74jc5cfbayc6jgkjdynd3"; }; - buildInputs = [ kdelibs cmake gettext perl automoc4 qt4 phonon ]; + buildInputs = [ kdelibs ]; + + buildNativeInputs = [ gettext ]; meta = { homepage = http://yakuake.kde.org; diff --git a/pkgs/applications/networking/browsers/firefox/5.0.nix b/pkgs/applications/networking/browsers/firefox/5.0.nix deleted file mode 100644 index f59d50fb6de..00000000000 --- a/pkgs/applications/networking/browsers/firefox/5.0.nix +++ /dev/null @@ -1,165 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs -, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, yasm, mesa, sqlite - -, # If you want the resulting program to call itself "Firefox" instead - # of "Shiretoko" or whatever, enable this option. However, those - # binaries may not be distributed without permission from the - # Mozilla Foundation, see - # http://www.mozilla.org/foundation/trademarks/. - enableOfficialBranding ? false -}: - -assert stdenv.gcc ? libc && stdenv.gcc.libc != null; - -rec { - - firefoxVersion = "5.0.1"; - - xulVersion = "5.0.1"; # this attribute is used by other packages - - - src = fetchurl { - url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "c93b3513e160d87535a9d61c5e06a6a701e9cd3e"; - }; - - - commonConfigureFlags = - [ "--enable-optimize" - "--disable-debug" - "--enable-strip" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - "--with-system-nspr" - # "--with-system-nss" - # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" - "--enable-system-cairo" - "--enable-system-sqlite" - "--disable-crashreporter" - "--disable-tests" - "--disable-necko-wifi" # maybe we want to enable this at some point - "--disable-installer" - "--disable-updater" - ]; - - - xulrunner = stdenv.mkDerivation rec { - name = "xulrunner-${xulVersion}"; - - inherit src; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 - python dbus dbus_glib pango freetype fontconfig xlibs.libXi - xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa - xlibs.libXScrnSaver xlibs.scrnsaverproto - xlibs.libXext xlibs.xextproto sqlite - ]; - - configureFlags = - [ "--enable-application=xulrunner" - "--disable-javaxpcom" - ] ++ commonConfigureFlags; - - enableParallelBuilding = true; - - # Hack to work around make's idea of -lbz2 dependency - preConfigure = - '' - find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ - stdenv.lib.concatStringsSep ":" - (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) - }' ';' - ''; - - # !!! Temporary hack. - preBuild = - '' - export NIX_ENFORCE_PURITY= - ''; - - installFlags = "SKIP_GRE_REGISTRATION=1"; - - postInstall = '' - # Fix some references to /bin paths in the Xulrunner shell script. - substituteInPlace $out/bin/xulrunner \ - --replace /bin/pwd "$(type -tP pwd)" \ - --replace /bin/ls "$(type -tP ls)" - - # Fix run-mozilla.sh search - libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) - echo libDir: $libDir - test -n "$libDir" - cd $out/bin - mv xulrunner ../lib/$libDir/ - - for i in $out/lib/$libDir/*; do - file $i; - if file $i | grep executable &>/dev/null; then - ln -s $i $out/bin - fi; - done; - rm -f $out/bin/run-mozilla.sh - ''; # */ - - meta = { - description = "Mozilla Firefox XUL runner"; - homepage = http://www.mozilla.org/firefox/; - }; - - passthru = { inherit gtk; version = xulVersion; }; - }; - - - firefox = stdenv.mkDerivation rec { - name = "firefox-${firefoxVersion}"; - - inherit src; - - enableParallelBuilding = true; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python - dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify - xlibs.pixman yasm mesa sqlite - ]; - - propagatedBuildInputs = [xulrunner]; - - configureFlags = - [ "--enable-application=browser" - "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" - "--enable-chrome-format=jar" - ] - ++ commonConfigureFlags - ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; - - # Hack to work around make's idea of -lbz2 dependency - preConfigure = - '' - find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ - stdenv.lib.concatStringsSep ":" - (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) - }' ';' - ''; - - postInstall = - '' - ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner - ''; # */ - - meta = { - description = "Mozilla Firefox - the browser, reloaded"; - homepage = http://www.mozilla.org/firefox/; - }; - - passthru = { - inherit gtk xulrunner nspr; - isFirefox3Like = true; - }; - }; -} diff --git a/pkgs/applications/networking/browsers/firefox/7.0.nix b/pkgs/applications/networking/browsers/firefox/7.0.nix deleted file mode 100644 index c4fef3dfaf2..00000000000 --- a/pkgs/applications/networking/browsers/firefox/7.0.nix +++ /dev/null @@ -1,184 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs -, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, yasm, mesa, sqlite - -, # If you want the resulting program to call itself "Firefox" instead - # of "Shiretoko" or whatever, enable this option. However, those - # binaries may not be distributed without permission from the - # Mozilla Foundation, see - # http://www.mozilla.org/foundation/trademarks/. - enableOfficialBranding ? false -}: - -assert stdenv.gcc ? libc && stdenv.gcc.libc != null; - -rec { - - firefoxVersion = "7.0.1"; - - xulVersion = "7.0.1"; # this attribute is used by other packages - - - src = fetchurl { - url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "94bbc7152832371dc0be82f411730df043c5c6ac"; - }; - - commonConfigureFlags = - [ "--enable-optimize" - "--disable-debug" - "--enable-strip" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - "--with-system-nspr" - # "--with-system-nss" - # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" - "--enable-system-cairo" - "--enable-system-sqlite" - "--disable-crashreporter" - "--disable-tests" - "--disable-necko-wifi" # maybe we want to enable this at some point - "--disable-installer" - "--disable-updater" - ]; - - - xulrunner = stdenv.mkDerivation rec { - name = "xulrunner-${xulVersion}"; - - inherit src; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 - python dbus dbus_glib pango freetype fontconfig xlibs.libXi - xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa - xlibs.libXScrnSaver xlibs.scrnsaverproto - xlibs.libXext xlibs.xextproto sqlite - ]; - - configureFlags = - [ "--enable-application=xulrunner" - "--disable-javaxpcom" - ] ++ commonConfigureFlags; - - enableParallelBuilding = true; - - # Hack to work around make's idea of -lbz2 dependency - preConfigure = - '' - find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ - stdenv.lib.concatStringsSep ":" - (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) - }' ';' - cp -i security/coreconf/Linux{2.6,3.0}.mk - cp -i security/coreconf/Linux{2.6,3.1}.mk - cp -i security/coreconf/Linux{2.6,3.2}.mk - cp -i security/coreconf/Linux{2.6,3.3}.mk - - export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}" - ''; - - # !!! Temporary hack. - preBuild = - '' - export NIX_ENFORCE_PURITY= - ''; - - installFlags = "SKIP_GRE_REGISTRATION=1"; - - postInstall = '' - # Fix some references to /bin paths in the Xulrunner shell script. - substituteInPlace $out/bin/xulrunner \ - --replace /bin/pwd "$(type -tP pwd)" \ - --replace /bin/ls "$(type -tP ls)" - - # Fix run-mozilla.sh search - libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) - echo libDir: $libDir - test -n "$libDir" - cd $out/bin - mv xulrunner ../lib/$libDir/ - - for i in $out/lib/$libDir/*; do - file $i; - if file $i | grep executable &>/dev/null; then - echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")"; - chmod a+x "$out/bin/$(basename "$i")"; - fi; - done; - for i in $out/lib/$libDir/{xpcshell,plugin-container,*.so}; do - patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true - done; - rm -f $out/bin/run-mozilla.sh - ''; # */ - - meta = { - description = "Mozilla Firefox XUL runner"; - homepage = http://www.mozilla.com/en-US/firefox/; - }; - - passthru = { inherit gtk; version = xulVersion; }; - }; - - - firefox = stdenv.mkDerivation rec { - name = "firefox-${firefoxVersion}"; - - inherit src; - - enableParallelBuilding = true; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python - dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify - xlibs.pixman yasm mesa sqlite file - ]; - - propagatedBuildInputs = [xulrunner]; - - configureFlags = - [ "--enable-application=browser" - "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" - "--enable-chrome-format=jar" - "--disable-elf-hack" - ] - ++ commonConfigureFlags - ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; - - # Hack to work around make's idea of -lbz2 dependency - preConfigure = - '' - find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ - stdenv.lib.concatStringsSep ":" - (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) - }' ';' - ''; - - postInstall = - '' - ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner - for j in $out/bin/*; do - i="$(readlink "$j")"; - file $i; - if file $i | grep executable &>/dev/null; then - rm "$out/bin/$(basename "$i")" - echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")" - chmod a+x "$out/bin/$(basename "$i")" - fi; - done; - ''; # */ - - meta = { - description = "Mozilla Firefox - the browser, reloaded"; - homepage = http://www.mozilla.com/en-US/firefox/; - }; - - passthru = { - inherit gtk xulrunner nspr; - isFirefox3Like = true; - }; - }; -} diff --git a/pkgs/applications/networking/browsers/firefox/9.0.nix b/pkgs/applications/networking/browsers/firefox/9.0.nix index f14eb05899d..32d785e7692 100644 --- a/pkgs/applications/networking/browsers/firefox/9.0.nix +++ b/pkgs/applications/networking/browsers/firefox/9.0.nix @@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "9.0b1"; + firefoxVersion = "9.0"; xulVersion = "9.0"; # this attribute is used by other packages src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${firefoxVersion}-candidates/build1/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha256 = "0mvm0bjzghqywh54fnk5qhz7fjm5d8y952sf59ypq64bhs5dh009"; + url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; + sha1 = "f79324ec6205e4c23d51d8ab2e790de1b2541657"; }; commonConfigureFlags = diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index c2200841ee1..9da45184978 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -1,28 +1,26 @@ -{stdenv, fetchsvn, unzip, cmake, mesa, wxGTK, zlib, libX11, gettext}: +{stdenv, fetchurl, fetchbzr, unzip, cmake, mesa, wxGTK, zlib, libX11, +gettext}: stdenv.mkDerivation rec { - name = "kicad-svn-2518"; + name = "kicad-20110708"; - src = fetchsvn { - url = https://kicad.svn.sourceforge.net/svnroot/kicad/trunk/kicad; - rev = 2518; - sha256 = "05z4fnkvvy91d0krf72q8xyislwh3zg8k0gy9w18caizbla5sih5"; + src = fetchurl { + url = ftp://iut-tice.ujf-grenoble.fr/cao/sources/kicad_sources-2011-07-08-BZR3044.zip; + sha256 = "1gr75zcf55p3xpbg1gdkdpbh5x11bawc9rcff4fskwjyc3vfiv6a"; }; - srcLibrary = fetchsvn { - url = https://kicad.svn.sourceforge.net/svnroot/kicad/trunk/kicad-library; - rev = 2518; - sha256 = "05sfmbp1z3hjxzcspj4vpprww5bxc6hq4alcjlc1vg6cvx2qgb9s"; + srcLibrary = fetchbzr { + url = "http://bazaar.launchpad.net/~kicad-lib-committers/kicad/library"; + revision = 112; + sha256 = "49fa9ad90759cfaf522c2a62665f033688b9d84d02f31c6b2505c08a217ad312"; }; + cmakeFlags = "-DKICAD_TESTING_VERSION=ON"; + # They say they only support installs to /usr or /usr/local, # so we have to handle this. patchPhase = '' sed -i -e 's,/usr/local/kicad,'$out,g common/gestfich.cpp - pushd internat/ca - sed -i -e s/iso-8859-1/utf-8/ kicad.po - msgfmt -o kicad.mo kicad.po - popd ''; enableParallelBuilding = true; diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 209ba934b9e..793d5c9452a 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation { - name = "hol_light-20111204"; + name = "hol_light-20111224"; src = fetchsvn { url = http://hol-light.googlecode.com/svn/trunk; - rev = "114"; - sha256 = "a9203a0118caf5d0ca7621abafab4af6245e1c1ae6ba628ead7c6f69aa86d9d3"; + rev = "116"; + sha256 = "c840cc2dfeb2088484692cb0073e6a7bb85e3e44e95aee1e0f5a8e223f7ccae6"; }; buildInputs = [ ocaml findlib camlp5 ]; diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index b7949909760..02b7017d295 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -2,7 +2,7 @@ let name = "maxima"; - version = "5.25.1"; + version = "5.26.0"; searchPath = stdenv.lib.makeSearchPath "bin" @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "8e98ad742151e52edb56337bd62c8a9749f7b598cb6ed4e991980e0e6f89706a"; + sha256 = "887105c99a91122f3e622472aa39bdd1ca8ed6198cf09b49917f63f8396dced9"; }; buildInputs = [sbcl texinfo perl makeWrapper]; @@ -29,8 +29,9 @@ stdenv.mkDerivation { ln -s ../maxima/${version}/doc $out/share/doc/maxima ''; - # The regression test suite has minor failures, but curiously enough - # this doesn't seem to abort the build process: + # Failures in the regression test suite are not going to abort the + # build process. We run the suite mostly so that potential errors show + # up in the build log. See also: # . doCheck = true; diff --git a/pkgs/applications/version-management/veracity/src-for-default.nix b/pkgs/applications/version-management/veracity/src-for-default.nix index 85bc00db713..b074c3ec507 100644 --- a/pkgs/applications/version-management/veracity/src-for-default.nix +++ b/pkgs/applications/version-management/veracity/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="1.1.0.10565"; - name="veracity-1.1.0.10565"; - hash="0sx12zzc60pdvzhf8ax2lisnw0rsrvnrk2500y1vfqhwxh2r04id"; - url="http://download.sourcegear.com/Veracity/release/1.1.0.10565/veracity-source-${version}.tar.gz"; - advertisedUrl="http://download.sourcegear.com/Veracity/release/1.1.0.10565/veracity-source-1.1.0.10565.tar.gz"; + version="1.5.0.10647"; + name="veracity-1.5.0.10647"; + hash="1b10npyxxg9592wigfpv66h17bzbsg2hqcfm7imyn941a34qrkd3"; + url="http://download.sourcegear.com/Veracity/nightly/1.5.0.10647/veracity-source-${version}.tar.gz"; + advertisedUrl="http://download.sourcegear.com/Veracity/nightly/1.5.0.10647/veracity-source-1.5.0.10647.tar.gz"; } diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index b94b350a848..b44f6d9f3aa 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,10 +1,12 @@ {stdenv, fetchurl, xz, cmake, gperf, imagemagick, pkgconfig, lua , glib, cairo, pango, imlib2, libxcb, libxdg_basedir, xcbutil +, xcbutilimage, xcbutilkeysyms, xcbutilwm, libpthreadstubs, libXau +, libXdmcp, pixman, doxygen , libstartup_notification, libev, asciidoc, xmlto, dbus, docbook_xsl , docbook_xml_dtd_45, libxslt, coreutils}: let - version = "3.4.9"; + version = "3.4.11"; in stdenv.mkDerivation rec { @@ -12,11 +14,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz"; - sha256 = "0382v482904xv295l0gvhwzc64b7631miiv8wyq7jxmwqf2vfbp7"; + sha256 = "576b4f6d2c3f56dfbe52ad92f2eecece111f0f05816e32126cd03d4b4387761d"; }; buildInputs = [ xz cmake gperf imagemagick pkgconfig lua glib cairo pango - imlib2 libxcb libxdg_basedir xcbutil libstartup_notification libev + imlib2 libxcb libxdg_basedir xcbutil xcbutilimage xcbutilkeysyms xcbutilwm + libstartup_notification libev libpthreadstubs libXau libXdmcp pixman doxygen asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt ]; # We use coreutils for 'env', that will allow then finding 'bash' or 'zsh' in @@ -27,10 +30,17 @@ stdenv.mkDerivation rec { sed s,/usr/bin/env,${coreutils}/bin/env, -i lib/awful/completion.lua.in # Remove the 'root' PATH override (I don't know why they have that) sed /WHOAMI/d -i utils/awsetbg + # Russian manpages fail to be generated: + # [ 56%] Generating manpages/ru/man1/awesome.1.xml + # asciidoc: ERROR: : line 3: name section expected + # asciidoc: FAILED: : line 3: section title expected + # make[2]: *** [manpages/ru/man1/awesome.1.xml] Error 1 + substituteInPlace CMakeLists.txt \ + --replace "set(AWE_MAN_LANGS es fr de ru)" \ + "set(AWE_MAN_LANGS es fr de)" ''; - patches = [ ./cmake284.patch ]; - + # XXX: maybe not needed anymore # Somehow libev does not get into the rpath, although it should. # Something may be wrong in the gcc wrapper. preBuild = '' diff --git a/pkgs/build-support/vm/rpm/rpm-closure.pl b/pkgs/build-support/vm/rpm/rpm-closure.pl index 5efc162784a..2ef59dcbdef 100644 --- a/pkgs/build-support/vm/rpm/rpm-closure.pl +++ b/pkgs/build-support/vm/rpm/rpm-closure.pl @@ -1,5 +1,6 @@ use strict; use XML::Simple; +use List::Util qw(min); my @packagesFiles = (); my @urlPrefixes = (); @@ -13,6 +14,44 @@ while(-f $ARGV[0]) { push(@urlPrefixes, $urlPrefix); } + +sub rpmvercmp { + my ($version1, $version2) = @_; + my @vercmps1 = split /\./, $version1; + my @vercmps2 = split /\./, $version2; + my $l1 = scalar(@vercmps1); + my $l2 = scalar(@vercmps2); + my $l = min($l1, $l2); + + for(my $i=0; $i<$l; $i++) { + my $v1 = $vercmps1[$i]; + my $v2 = $vercmps2[$i]; + + if($v1 =~ /^[0-9]*$/ && $v2 =~ /^[0-9]*$/) { + if ( int($v1) > int($v2) ) { + return 1; + } + elsif ( int($v1) < int($v2) ) { + return -1; + } + } else { + if ( $v1 gt $v2 ) { + return 1; + } + elsif ( $v1 lt $v2 ) { + return -1; + } + } + } + if($l1 == $l2) { + return 0; + } elsif ($l1 > $l2) { + return 1; + } elsif ($l1 < $l2) { + return -1; + } +} + my @toplevelPkgs = @ARGV; my @archs = split ' ', ($ENV{'archs'} or ""); @@ -36,7 +75,8 @@ for (my $i = 0; $i < scalar(@packagesFiles); $i++) { if (defined $pkgs{$pkg->{name}}) { my $earlierPkg = $pkgs{$pkg->{name}}; print STDERR "WARNING: duplicate occurrence of package $pkg->{name}\n"; - if ($earlierPkg->{'time'}->{file} <= $pkg->{'time'}->{file}) { + # + if (rpmvercmp($pkg->{'version'}->{ver}, $earlierPkg->{'version'}->{ver}) >= 0) { print STDERR "WARNING: replaced package $pkg->{name} with newer one\n"; $pkg->{urlPrefix} = $urlPrefixes[$i]; $pkgs{$pkg->{name}} = $pkg; diff --git a/pkgs/desktops/kde-4.7/kdelibs.nix b/pkgs/desktops/kde-4.7/kdelibs.nix index cad1988723c..d4383b3e93a 100644 --- a/pkgs/desktops/kde-4.7/kdelibs.nix +++ b/pkgs/desktops/kde-4.7/kdelibs.nix @@ -3,7 +3,7 @@ , xz, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver , automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt , docbook_xml_dtd_42, docbook_xsl, polkit_qt_1 -, getopt, udev, herqq, phonon, gettext +, getopt, udev, herqq, phonon, libjpeg }: kde { @@ -11,7 +11,7 @@ kde { [ acl attr attica avahi bzip2 enchant fam getopt giflib herqq jasper libdbusmenu_qt libXScrnSaver libxslt pcre polkit_qt_1 qca2 - shared_desktop_ontologies udev xz libxml2 + shared_desktop_ontologies udev xz libxml2 libjpeg ]; propagatedBuildInputs = [ qt4 soprano strigi phonon ]; diff --git a/pkgs/development/compilers/clean/default.nix b/pkgs/development/compilers/clean/default.nix index fa61f8bfc75..bd051a95699 100644 --- a/pkgs/development/compilers/clean/default.nix +++ b/pkgs/development/compilers/clean/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "clean-2.3"; + name = "clean-2.4"; src = if stdenv.system == "i686-linux" then (fetchurl { - url = "http://clean.cs.ru.nl/download/Clean23/linux/clean2.3_boot.tar.gz"; - sha256 = "0rrjpqdbqwbx7n8v35wi3wpm6lpv9zd1n5q50byb2h0ljqw31j9h"; + url = "http://clean.cs.ru.nl/download/Clean24/linux/clean2.4_boot.tar.gz"; + sha256 = "1w8vvmkwzq8g51639r62apcy75sj69nm08082a34xvqm9ymfgkq5"; }) else if stdenv.system == "x86_64-linux" then (fetchurl { - url = "http://clean.cs.ru.nl/download/Clean23/linux/clean2.3_64_boot.tar.gz"; - sha256 = "0bvkaiwcaa1p6h1bl4bgnia1yd0j8nq6sb1yiwar74y2m1wwmjqj"; + url = "http://clean.cs.ru.nl/download/Clean24/linux/clean2.4_64_boot.tar.gz"; + sha256 = "08gsa1pjl5wyzh4ah8ccfx8a7mdcn6ycsn1lzkrr9adygv1gmm7r"; }) else throw "Architecture not supported"; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 8e60b4f2fc1..0d3301df60a 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,19 +1,17 @@ -{stdenv, fetchurl, ghc, perl, gmp, ncurses}: +{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}: stdenv.mkDerivation rec { - version = "7.3.20110910"; + version = "7.4.0.20111219"; name = "ghc-${version}"; - # TODO: Does this have to be here, or can it go to meta? - homepage = "http://haskell.org/ghc"; - src = fetchurl { - url = "${homepage}/dist/current/dist/${name}-src.tar.bz2"; - sha256 = "1y8ixh6vcbqxqddc872kjfzxj94q4dhyaprdv7kv2yzwgp49qza5"; + url = "http://haskell.org/ghc/dist/7.4.1-rc1/${name}-src.tar.bz2"; + sha256 = "11imfag07wr9s5vf12yh6bz4hjfbw20i1c7n8py9fa4vx7va676n"; }; - buildInputs = [ghc perl gmp ncurses]; + buildInputs = [ghc perl gmp ncurses] ++ + (if stdenv.isDarwin then [darwinInstallNameToolUtility] else []); buildMK = '' libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" @@ -22,6 +20,7 @@ stdenv.mkDerivation rec { preConfigure = '' echo "${buildMK}" > mk/build.mk + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure ''; configureFlags=[ @@ -33,11 +32,12 @@ stdenv.mkDerivation rec { stripDebugFlags=["-S" "--keep-file-symbols"]; meta = { - inherit homepage; + homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.andres + stdenv.lib.maintainers.simons ]; platforms = ghc.meta.platforms; }; diff --git a/pkgs/development/compilers/llvm/clang-include-paths.patch b/pkgs/development/compilers/llvm/clang-include-paths.patch index aaa9a5fc4b5..828c554175e 100644 --- a/pkgs/development/compilers/llvm/clang-include-paths.patch +++ b/pkgs/development/compilers/llvm/clang-include-paths.patch @@ -1,39 +1,49 @@ -diff -ru -x '*~' a/tools/clang/lib/Frontend/InitHeaderSearch.cpp b/tools/clang/lib/Frontend/InitHeaderSearch.cpp ---- a/tools/clang/lib/Frontend/InitHeaderSearch.cpp 2011-03-21 20:24:04.000000000 -0400 -+++ b/tools/clang/lib/Frontend/InitHeaderSearch.cpp 2011-10-18 12:09:50.624355551 -0400 -@@ -438,6 +438,7 @@ - - void InitHeaderSearch::AddDefaultCIncludePaths(const llvm::Triple &triple, - const HeaderSearchOptions &HSOpts) { -+#if 0 - llvm::Triple::OSType os = triple.getOS(); - - switch (os) { -@@ -559,6 +560,8 @@ - } - - AddPath("/usr/include", System, false, false, false); -+#endif -+ AddPath(C_INCLUDE_PATH, System, false, false, false); - } - - void InitHeaderSearch:: -@@ -577,6 +580,7 @@ - triple); +diff -Naur clang-3.0.src-orig/lib/Driver/ToolChains.cpp clang-3.0.src/lib/Driver/ToolChains.cpp +--- clang-3.0.src-orig/lib/Driver/ToolChains.cpp 2011-11-17 02:40:32.000000000 -0500 ++++ clang-3.0.src/lib/Driver/ToolChains.cpp 2011-12-19 06:29:27.562428830 -0500 +@@ -1926,14 +1926,17 @@ + if (DriverArgs.hasArg(options::OPT_nostdinc)) return; - } -+#if 0 - // FIXME: temporary hack: hard-coded paths. - switch (os) { - case llvm::Triple::Cygwin: -@@ -847,6 +851,10 @@ - default: - break; - } + ++#if 0 + if (!DriverArgs.hasArg(options::OPT_nostdlibinc)) + addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/local/include"); + +#endif -+ AddGnuCPlusPlusIncludePaths( -+ CPP_INCLUDE_PATH, -+ CPP_HOST, "", "", triple); + if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) { + llvm::sys::Path P(D.ResourceDir); + P.appendComponent("include"); + addSystemInclude(DriverArgs, CC1Args, P.str()); + } ++#if 0 + + if (DriverArgs.hasArg(options::OPT_nostdlibinc)) + return; +@@ -1998,6 +2001,8 @@ + return; + + addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/include"); ++#endif ++ addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + C_INCLUDE_PATH); } - void InitHeaderSearch::AddDefaultSystemIncludePaths(const LangOptions &Lang, + static bool addLibStdCXXIncludePaths(Twine Base, Twine TargetArchDir, +@@ -2030,6 +2035,7 @@ + bool IsTarget64Bit = (TargetArch == llvm::Triple::x86_64 || + TargetArch == llvm::Triple::ppc64); + ++#if 0 + StringRef CxxIncludeRoot(CXX_INCLUDE_ROOT); + if (!CxxIncludeRoot.empty()) { + StringRef CxxIncludeArch(CXX_INCLUDE_ARCH); +@@ -2072,6 +2078,10 @@ + GCCInstallation.getTriple() + Suffix, + DriverArgs, CC1Args); + } ++#endif ++ addLibStdCXXIncludePaths(CPP_INCLUDE_PATH, ++ CPP_HOST, ++ DriverArgs, CC1Args); + } + + /// DragonFly - DragonFly tool chain which can call as(1) and ld(1) directly. diff --git a/pkgs/development/compilers/llvm/clang-ld-flags.patch b/pkgs/development/compilers/llvm/clang-ld-flags.patch index fc625a0e0b7..62b8bc763f9 100644 --- a/pkgs/development/compilers/llvm/clang-ld-flags.patch +++ b/pkgs/development/compilers/llvm/clang-ld-flags.patch @@ -1,33 +1,26 @@ -diff -Naur a/tools/clang/lib/Driver/ToolChains.cpp b/tools/clang/lib/Driver/ToolChains.cpp ---- a/tools/clang/lib/Driver/ToolChains.cpp 2011-03-21 17:29:27.000000000 -0400 -+++ b/tools/clang/lib/Driver/ToolChains.cpp 2011-10-18 19:43:48.999590771 -0400 -@@ -1482,12 +1482,9 @@ - Lib = Lib64; - } +diff -Naur clang-3.0.src-orig/lib/Driver/ToolChains.cpp clang-3.0.src/lib/Driver/ToolChains.cpp +--- clang-3.0.src-orig/lib/Driver/ToolChains.cpp 2011-11-17 02:40:32.000000000 -0500 ++++ clang-3.0.src/lib/Driver/ToolChains.cpp 2011-12-19 05:32:38.695513475 -0500 +@@ -1800,6 +1800,7 @@ -- llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld"); -- if (!llvm::sys::fs::exists(LinkerPath.str(), Exists) && Exists) -- Linker = LinkerPath.str(); -- else -- Linker = GetProgramPath("ld"); -+ Linker = GetProgramPath("ld"); + Linker = GetProgramPath("ld"); +#if 0 LinuxDistro Distro = DetectLinuxDistro(Arch); - if (IsUbuntu(Distro)) { -@@ -1531,6 +1528,7 @@ - Paths.push_back(Base + "/../../.."); - if (Arch == getArch() && IsUbuntu(Distro)) - Paths.push_back("/usr/lib/" + GccTriple); + if (IsOpenSuse(Distro) || IsUbuntu(Distro)) { +@@ -1882,6 +1883,7 @@ + addPathIfExists(SysRoot + "/lib", Paths); + addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths); + addPathIfExists(SysRoot + "/usr/lib", Paths); +#endif } bool Linux::HasNativeLLVMSupport() const { -diff -Naur a/tools/clang/lib/Driver/Tools.cpp b/tools/clang/lib/Driver/Tools.cpp ---- a/tools/clang/lib/Driver/Tools.cpp 2011-03-06 18:31:01.000000000 -0500 -+++ b/tools/clang/lib/Driver/Tools.cpp 2011-10-18 18:44:00.799604267 -0400 -@@ -3619,6 +3619,7 @@ +diff -Naur clang-3.0.src-orig/lib/Driver/Tools.cpp clang-3.0.src/lib/Driver/Tools.cpp +--- clang-3.0.src-orig/lib/Driver/Tools.cpp 2011-11-07 05:27:39.000000000 -0500 ++++ clang-3.0.src/lib/Driver/Tools.cpp 2011-12-19 05:34:44.075325534 -0500 +@@ -4306,6 +4306,7 @@ ToolChain.getArch() == llvm::Triple::thumb || (!Args.hasArg(options::OPT_static) && !Args.hasArg(options::OPT_shared))) { @@ -35,8 +28,8 @@ diff -Naur a/tools/clang/lib/Driver/Tools.cpp b/tools/clang/lib/Driver/Tools.cpp CmdArgs.push_back("-dynamic-linker"); if (ToolChain.getArch() == llvm::Triple::x86) CmdArgs.push_back("/lib/ld-linux.so.2"); -@@ -3627,6 +3628,7 @@ - CmdArgs.push_back("/lib/ld-linux.so.3"); +@@ -4318,6 +4319,7 @@ + CmdArgs.push_back("/lib64/ld64.so.1"); else CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); +#endif diff --git a/pkgs/development/compilers/llvm/clang-system-llvm-libs.patch b/pkgs/development/compilers/llvm/clang-system-llvm-libs.patch deleted file mode 100644 index 0d82cf4017a..00000000000 --- a/pkgs/development/compilers/llvm/clang-system-llvm-libs.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naur llvm-2.9-orig/Makefile.rules llvm-2.9/Makefile.rules ---- llvm-2.9-orig/Makefile.rules 2011-03-25 02:26:58.000000000 -0400 -+++ llvm-2.9/Makefile.rules 2011-10-19 15:31:38.538674143 -0400 -@@ -941,7 +941,7 @@ - @echo "*** llvm-config doesn't exist - rebuilding it." - @$(MAKE) -C $(PROJ_OBJ_ROOT)/tools/llvm-config - --$(ToolDir)/$(strip $(TOOLNAME))$(EXEEXT): $(LLVM_CONFIG) -+$(ToolDir)/$(strip $(TOOLNAME))$(EXEEXT): - - ifeq ($(ENABLE_SHARED), 1) - # We can take the "auto-import" feature to get rid of using dllimport. -@@ -1137,7 +1137,7 @@ - else - SharedLibKindMessage := "Shared Library" - endif --$(LibName.SO): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) $(SharedLibDir)/.dir -+$(LibName.SO): $(ObjectsO) $(ProjLibsPaths) $(SharedLibDir)/.dir - $(Echo) Linking $(BuildMode) $(SharedLibKindMessage) \ - $(notdir $@) - $(Verb) $(Link) $(SharedLinkOptions) -o $@ $(ObjectsO) \ -@@ -1411,7 +1411,7 @@ - $(ToolBuildPath): $(ToolDir)/.dir - endif - --$(ToolBuildPath): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) -+$(ToolBuildPath): $(ObjectsO) $(ProjLibsPaths) - $(Echo) Linking $(BuildMode) executable $(TOOLNAME) $(StripWarnMsg) - $(Verb) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \ - $(LLVMLibsOptions) $(ExtraLibs) $(TOOLLINKOPTSB) $(LIBS) -diff -Naur llvm-2.9-orig/unittests/Makefile.unittest llvm-2.9/unittests/Makefile.unittest ---- llvm-2.9-orig/unittests/Makefile.unittest 2011-02-04 12:12:18.000000000 -0500 -+++ llvm-2.9/unittests/Makefile.unittest 2011-10-19 15:47:27.100035616 -0400 -@@ -47,7 +47,7 @@ - Run.Shared := $(SHLIBPATH_VAR)="$(SharedLibDir)$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)" - endif - --$(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) -+$(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths) - $(Echo) Linking $(BuildMode) unit test $(TESTNAME) $(StripWarnMsg) - $(Verb) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \ - $(TESTLIBS) $(LLVMLibsOptions) $(ExtraLibs) $(TOOLLINKOPTSB) $(LIBS) diff --git a/pkgs/development/compilers/llvm/clang-tblgen.patch b/pkgs/development/compilers/llvm/clang-tblgen.patch deleted file mode 100644 index 9533529555d..00000000000 --- a/pkgs/development/compilers/llvm/clang-tblgen.patch +++ /dev/null @@ -1,134 +0,0 @@ -diff -Naur a/tools/clang/include/clang/AST/Makefile b/tools/clang/include/clang/AST/Makefile ---- a/tools/clang/include/clang/AST/Makefile 2010-08-18 19:23:40.000000000 -0400 -+++ b/tools/clang/include/clang/AST/Makefile 2011-10-19 14:19:21.420750346 -0400 -@@ -6,24 +6,24 @@ - - include $(CLANG_LEVEL)/Makefile - --$(ObjDir)/Attrs.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \ -+$(ObjDir)/Attrs.inc.tmp : $(TD_SRC_DIR)/Attr.td \ - $(ObjDir)/.dir - $(Echo) "Building Clang attribute classes with tblgen" - $(Verb) $(TableGen) -gen-clang-attr-classes -o $(call SYSPATH, $@) \ - -I $(PROJ_SRC_DIR)/../../ $< - --$(ObjDir)/AttrImpl.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \ -+$(ObjDir)/AttrImpl.inc.tmp : $(TD_SRC_DIR)/Attr.td \ - $(ObjDir)/.dir - $(Echo) "Building Clang attribute implementations with tblgen" - $(Verb) $(TableGen) -gen-clang-attr-impl -o $(call SYSPATH, $@) \ - -I $(PROJ_SRC_DIR)/../../ $< - --$(ObjDir)/StmtNodes.inc.tmp : $(TD_SRC_DIR)/StmtNodes.td $(TBLGEN) \ -+$(ObjDir)/StmtNodes.inc.tmp : $(TD_SRC_DIR)/StmtNodes.td \ - $(ObjDir)/.dir - $(Echo) "Building Clang statement node tables with tblgen" - $(Verb) $(TableGen) -gen-clang-stmt-nodes -o $(call SYSPATH, $@) $< - --$(ObjDir)/DeclNodes.inc.tmp : $(TD_SRC_DIR)/DeclNodes.td $(TBLGEN) \ -+$(ObjDir)/DeclNodes.inc.tmp : $(TD_SRC_DIR)/DeclNodes.td \ - $(ObjDir)/.dir - $(Echo) "Building Clang declaration node tables with tblgen" - $(Verb) $(TableGen) -gen-clang-decl-nodes -o $(call SYSPATH, $@) $< -diff -Naur a/tools/clang/include/clang/Basic/Makefile b/tools/clang/include/clang/Basic/Makefile ---- a/tools/clang/include/clang/Basic/Makefile 2010-09-09 16:27:36.000000000 -0400 -+++ b/tools/clang/include/clang/Basic/Makefile 2011-10-19 14:17:54.950837324 -0400 -@@ -29,20 +29,20 @@ - CLANG_HAS_VERSION_PATCHLEVEL := 1 - endif - --$(ObjDir)/Diagnostic%Kinds.inc.tmp : Diagnostic.td Diagnostic%Kinds.td $(TBLGEN) $(ObjDir)/.dir -+$(ObjDir)/Diagnostic%Kinds.inc.tmp : Diagnostic.td Diagnostic%Kinds.td $(ObjDir)/.dir - $(Echo) "Building Clang $(patsubst Diagnostic%Kinds.inc.tmp,%,$(@F)) diagnostic tables with tblgen" - $(Verb) $(TableGen) -gen-clang-diags-defs -clang-component=$(patsubst Diagnostic%Kinds.inc.tmp,%,$(@F)) -o $(call SYSPATH, $@) $< - --$(ObjDir)/DiagnosticGroups.inc.tmp : Diagnostic.td DiagnosticGroups.td $(INPUT_TDS) $(TBLGEN) $(ObjDir)/.dir -+$(ObjDir)/DiagnosticGroups.inc.tmp : Diagnostic.td DiagnosticGroups.td $(INPUT_TDS) $(ObjDir)/.dir - $(Echo) "Building Clang diagnostic groups with tblgen" - $(Verb) $(TableGen) -gen-clang-diag-groups -o $(call SYSPATH, $@) $< - --$(ObjDir)/AttrList.inc.tmp : Attr.td $(TBLGEN) $(ObjDir)/.dir -+$(ObjDir)/AttrList.inc.tmp : Attr.td $(ObjDir)/.dir - $(Echo) "Building Clang attribute list with tblgen" - $(Verb) $(TableGen) -gen-clang-attr-list -o $(call SYSPATH, $@) \ - -I $(PROJ_SRC_DIR)/../.. $< - --$(ObjDir)/arm_neon.inc.tmp : arm_neon.td $(TBLGEN) $(ObjDir)/.dir -+$(ObjDir)/arm_neon.inc.tmp : arm_neon.td $(ObjDir)/.dir - $(Echo) "Building Clang arm_neon.inc with tblgen" - $(Verb) $(TableGen) -gen-arm-neon-sema -o $(call SYSPATH, $@) $< - -diff -Naur a/tools/clang/include/clang/Driver/Makefile b/tools/clang/include/clang/Driver/Makefile ---- a/tools/clang/include/clang/Driver/Makefile 2010-06-08 16:34:18.000000000 -0400 -+++ b/tools/clang/include/clang/Driver/Makefile 2011-10-19 14:25:33.739369159 -0400 -@@ -5,14 +5,14 @@ - - include $(CLANG_LEVEL)/Makefile - --$(ObjDir)/Options.inc.tmp : Options.td OptParser.td $(TBLGEN) $(ObjDir)/.dir -+$(ObjDir)/Options.inc.tmp : Options.td OptParser.td $(ObjDir)/.dir - $(Echo) "Building Clang Driver Option tables with tblgen" - $(Verb) $(TableGen) -gen-opt-parser-defs -o $(call SYSPATH, $@) $< - --$(ObjDir)/CC1Options.inc.tmp : CC1Options.td OptParser.td $(TBLGEN) $(ObjDir)/.dir -+$(ObjDir)/CC1Options.inc.tmp : CC1Options.td OptParser.td $(ObjDir)/.dir - $(Echo) "Building Clang CC1 Option tables with tblgen" - $(Verb) $(TableGen) -gen-opt-parser-defs -o $(call SYSPATH, $@) $< - --$(ObjDir)/CC1AsOptions.inc.tmp : CC1AsOptions.td OptParser.td $(TBLGEN) $(ObjDir)/.dir -+$(ObjDir)/CC1AsOptions.inc.tmp : CC1AsOptions.td OptParser.td $(ObjDir)/.dir - $(Echo) "Building Clang CC1 Assembler Option tables with tblgen" - $(Verb) $(TableGen) -gen-opt-parser-defs -o $(call SYSPATH, $@) $< -diff -Naur a/tools/clang/include/clang/Lex/Makefile b/tools/clang/include/clang/Lex/Makefile ---- a/tools/clang/include/clang/Lex/Makefile 2010-10-19 22:31:43.000000000 -0400 -+++ b/tools/clang/include/clang/Lex/Makefile 2011-10-19 14:18:25.082807086 -0400 -@@ -6,7 +6,7 @@ - - include $(CLANG_LEVEL)/Makefile - --$(ObjDir)/AttrSpellings.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \ -+$(ObjDir)/AttrSpellings.inc.tmp : $(TD_SRC_DIR)/Attr.td \ - $(ObjDir)/.dir - $(Echo) "Building Clang attribute spellings with tblgen" - $(Verb) $(TableGen) -gen-clang-attr-spelling-list -o $(call SYSPATH, $@) \ -diff -Naur a/tools/clang/include/clang/Serialization/Makefile b/tools/clang/include/clang/Serialization/Makefile ---- a/tools/clang/include/clang/Serialization/Makefile 2010-08-18 19:23:40.000000000 -0400 -+++ b/tools/clang/include/clang/Serialization/Makefile 2011-10-19 14:25:05.764398164 -0400 -@@ -6,13 +6,13 @@ - - include $(CLANG_LEVEL)/Makefile - --$(ObjDir)/AttrPCHRead.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \ -+$(ObjDir)/AttrPCHRead.inc.tmp : $(TD_SRC_DIR)/Attr.td \ - $(ObjDir)/.dir - $(Echo) "Building Clang PCH reader with tblgen" - $(Verb) $(TableGen) -gen-clang-attr-pch-read -o $(call SYSPATH, $@) \ - -I $(PROJ_SRC_DIR)/../../ $< - --$(ObjDir)/AttrPCHWrite.inc.tmp : $(TD_SRC_DIR)/Attr.td $(TBLGEN) \ -+$(ObjDir)/AttrPCHWrite.inc.tmp : $(TD_SRC_DIR)/Attr.td \ - $(ObjDir)/.dir - $(Echo) "Building Clang PCH writer with tblgen" - $(Verb) $(TableGen) -gen-clang-attr-pch-write -o $(call SYSPATH, $@) \ -diff -Naur a/tools/clang/lib/Headers/Makefile b/tools/clang/lib/Headers/Makefile ---- a/tools/clang/lib/Headers/Makefile 2010-07-21 21:19:36.000000000 -0400 -+++ b/tools/clang/lib/Headers/Makefile 2011-10-19 14:15:18.520993127 -0400 -@@ -49,6 +49,6 @@ - - install-local:: $(INSTHEADERS) - --$(ObjDir)/arm_neon.h.inc.tmp : $(CLANG_LEVEL)/include/clang/Basic/arm_neon.td $(TBLGEN) $(ObjDir)/.dir -+$(ObjDir)/arm_neon.h.inc.tmp : $(CLANG_LEVEL)/include/clang/Basic/arm_neon.td $(ObjDir)/.dir - $(Echo) "Building Clang arm_neon.h.inc with tblgen" - $(Verb) $(TableGen) -gen-arm-neon -o $(call SYSPATH, $@) $< -diff -Naur a/tools/clang/lib/StaticAnalyzer/Checkers/Makefile b/tools/clang/lib/StaticAnalyzer/Checkers/Makefile ---- a/tools/clang/lib/StaticAnalyzer/Checkers/Makefile 2011-02-15 02:42:38.000000000 -0500 -+++ b/tools/clang/lib/StaticAnalyzer/Checkers/Makefile 2011-10-19 14:15:58.240953760 -0400 -@@ -19,6 +19,6 @@ - - include $(CLANG_LEVEL)/Makefile - --$(ObjDir)/Checkers.inc.tmp : Checkers.td $(PROJ_SRC_DIR)/$(CLANG_LEVEL)/include/clang/StaticAnalyzer/Checkers/CheckerBase.td $(TBLGEN) $(ObjDir)/.dir -+$(ObjDir)/Checkers.inc.tmp : Checkers.td $(PROJ_SRC_DIR)/$(CLANG_LEVEL)/include/clang/StaticAnalyzer/Checkers/CheckerBase.td $(ObjDir)/.dir - $(Echo) "Building Clang SA Checkers tables with tblgen" - $(Verb) $(TableGen) -gen-clang-sa-checkers -I $(PROJ_SRC_DIR)/$(CLANG_LEVEL)/include -o $(call SYSPATH, $@) $< diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix index 1763e1e9e16..4d8bb3fe834 100644 --- a/pkgs/development/compilers/llvm/clang.nix +++ b/pkgs/development/compilers/llvm/clang.nix @@ -1,51 +1,31 @@ -{ stdenv, fetchurl, perl, groff, llvm }: +{ stdenv, fetchurl, perl, groff, llvm, cmake, darwinInstallNameToolUtility }: -assert stdenv.isLinux && stdenv.gcc.gcc != null; - -let version = "2.9"; in +let version = "3.0"; in stdenv.mkDerivation { name = "clang-${version}"; - src = llvm.src; + buildInputs = [ perl llvm groff cmake ] ++ stdenv.lib.optional stdenv.isDarwin darwinInstallNameToolUtility; - buildInputs = [ perl llvm groff ]; + patches = stdenv.lib.optionals (stdenv.gcc.libc != null) + [ ./clang-include-paths.patch ./clang-ld-flags.patch ]; - configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ] - ++ stdenv.lib.optionals (stdenv.gcc ? clang) [ - "--with-built-clang=yes" - "CXX=clang++" - ]; - - srcClang = fetchurl { - url = "http://llvm.org/releases/${version}/clang-${version}.tgz"; - sha256 = "1pq9g7qxw761dp6gx3amx39kl9p4zhlymmn8gfmcnw9ag0zizi3h"; - }; - - prePatch = '' - pushd tools - unpackFile $srcClang - mv clang-${version} clang - popd - find - ''; - - patches = [ ./clang-include-paths.patch ./clang-ld-flags.patch ./clang-tblgen.patch ./clang-system-llvm-libs.patch ]; - - buildFlags = [ "TableGen=tblgen" "LLVM_CONFIG=llvm-config" ]; - - preBuild = '' + postPatch = stdenv.lib.optionalString (stdenv.gcc.libc != null) '' sed -i -e 's,C_INCLUDE_PATH,"${stdenv.gcc.libc}/include/",' \ - -e 's,CPP_HOST,"'$(${stdenv.gcc.gcc}/bin/gcc -dumpmachine)'",' \ + -e 's,CPP_HOST,"'$(${stdenv.gcc}/bin/cc -dumpmachine)'",' \ -e 's,CPP_INCLUDE_PATH,"${stdenv.gcc.gcc}/include/c++/${stdenv.gcc.gcc.version}",' \ - tools/clang/lib/Frontend/InitHeaderSearch.cpp - - pushd utils/unittest - make - popd - cd tools/clang + lib/Driver/ToolChains.cpp ''; + cmakeFlags = [ "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" "-DCMAKE_BUILD_TYPE=Release" ]; + + enableParallelBuilding = true; + + src = fetchurl { + url = "http://llvm.org/releases/${version}/clang-${version}.tar.gz"; + sha256 = "0v8j9rgmb7w74ihc44zfxa22q17c946n5b6prwl38z3d6pd74kmn"; + }; + passthru = { gcc = stdenv.gcc.gcc; }; meta = { @@ -53,6 +33,7 @@ stdenv.mkDerivation { description = "A C language family frontend for LLVM"; license = "BSD"; maintainers = with stdenv.lib.maintainers; [viric shlevy]; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; all; }; } + diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index afc1a55b093..01b16fcda8d 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, groff, darwinSwVersUtility }: +{ stdenv, fetchurl, perl, groff, darwinSwVersUtility, darwinInstallNameToolUtility, cmake }: let version = "3.0"; in @@ -10,14 +10,10 @@ stdenv.mkDerivation { sha256 = "0xq4gi7lflv8ilfckslhfvnja5693xjii1yvzz39kklr6hfv37ji"; }; - buildInputs = [ perl groff ] ++ - stdenv.lib.optional stdenv.isDarwin darwinSwVersUtility; + buildInputs = [ perl groff cmake ] ++ + stdenv.lib.optionals stdenv.isDarwin [ darwinSwVersUtility darwinInstallNameToolUtility ]; - configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ] - ++ stdenv.lib.optionals (stdenv.gcc ? clang) [ - "--with-built-clang=yes" - "CXX=clang++" - ]; + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix new file mode 100644 index 00000000000..5b3052b544a --- /dev/null +++ b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchurl, ncurses, x11 }: + +let + useX11 = stdenv.isi686 || stdenv.isx86_64; + useNativeCompilers = stdenv.isi686 || stdenv.isx86_64 || stdenv.isMips; + inherit (stdenv.lib) optionals optionalString; +in + +stdenv.mkDerivation rec { + + name = "ber-metaocaml-003"; + + src = fetchurl { + url = "http://caml.inria.fr/pub/distrib/ocaml-3.11/ocaml-3.11.2.tar.bz2"; + sha256 = "0hw1yp1mmfyn1pmda232d0ry69m7ln1z0fn5lgi8nz3y1mx3iww6"; + }; + + metaocaml = fetchurl { + url = "http://okmij.org/ftp/ML/ber-metaocaml.tar.gz"; + sha256 = "1kq1if25c1wvcdiy4g46xk05dkc1am2gc4qvmg4x19wvvaz09gzf"; + }; + + # Needed to avoid a SIGBUS on the final executable on mips + NIX_CFLAGS_COMPILE = if stdenv.isMips then "-fPIC" else ""; + + patches = optionals stdenv.isDarwin [ ./gnused-on-osx-fix.patch ]; + + prefixKey = "-prefix "; + configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ]; + buildFlags = "core coreboot all"; # "world" + optionalString useNativeCompilers " bootstrap world.opt"; + buildInputs = [ncurses] ++ optionals useX11 [ x11 ]; + installFlags = "-i"; + installTargets = "install"; # + optionalString useNativeCompilers " installopt"; + prePatch = '' + CAT=$(type -tp cat) + sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang + patch -p0 < ${./mips64.patch} + ''; + postConfigure = '' + tar -xvzf $metaocaml + cd ${name} + make patch + cd .. + ''; + postBuild = '' + ensureDir $out/include + ln -sv $out/lib/ocaml/caml $out/include/caml + ''; + postInstall = '' + cd ${name} + make all + make install + make test + make test-compile + cd .. + ''; + + meta = { + homepage = "http://okmij.org/ftp/ML/index.html#ber-metaocaml"; + licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; + description = "a conservative extension of OCaml with the primitive type of code values, and three basic multi-stage expression forms: Brackets, Escape, and Run"; + }; +} diff --git a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix new file mode 100644 index 00000000000..b115a8fedcf --- /dev/null +++ b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, x11, ncurses }: + +stdenv.mkDerivation (rec { + + name = "metaocaml-3.09-alpha-30"; + + src = fetchurl { + url = "http://www.metaocaml.org/dist/old/MetaOCaml_309_alpha_030.tar.gz"; + sha256 = "0migbn0zwfb7yb24dy7qfqi19sv3drqcv4369xi7xzpds2cs35fd"; + }; + + prefixKey = "-prefix "; + configureFlags = ["-no-tk" "-x11lib" x11]; + buildFlags = "world bootstrap world.opt"; + buildInputs = [x11 ncurses]; + installTargets = "install installopt"; + patchPhase = '' + CAT=$(type -tp cat) + sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang + ''; + postBuild = '' + ensureDir $out/include + ln -sv $out/lib/ocaml/caml $out/include/caml + ''; + + meta = { + homepage = http://www.metaocaml.org/; + license = "QPL, LGPL2 (library part)"; + desctiption = "A compiled, type-safe, multi-stage programming language"; + }; + +}) diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix index 0baba9c603e..390fa28f6f7 100644 --- a/pkgs/development/compilers/uhc/default.nix +++ b/pkgs/development/compilers/uhc/default.nix @@ -3,7 +3,7 @@ }: let - revision = "2375"; + revision = "2381"; in stdenv.mkDerivation { name = "uhc-svn-${revision}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchsvn { url = "https://subversion.cs.uu.nl/repos/project.UHC.pub/trunk/EHC"; rev = revision; - sha256 = "bde79664b7d04337ce668eab63291702687e6d572a302111425e5ff870c57619"; + sha256 = "37598f49cda8ff67b0b4d1c75b0bf50bfcd29a92b08ea427c5071080e368c4bc"; }; propagatedBuildInputs = [mtl network binary fgl syb]; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix new file mode 100644 index 00000000000..5dcb4cbe618 --- /dev/null +++ b/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix @@ -0,0 +1,18 @@ +{ cabal, mtl, network, parsec }: + +cabal.mkDerivation (self: { + pname = "HTTP"; + version = "4000.1.2"; + sha256 = "19vcy8xinrvn01caly6sg1p1yvbbf7nwq10kxmnwqssnl4h5cwn8"; + buildDepends = [ mtl network parsec ]; + meta = { + homepage = "http://projects.haskell.org/http/"; + description = "A library for client-side HTTP"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix new file mode 100644 index 00000000000..082c3ddc3ac --- /dev/null +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix @@ -0,0 +1,18 @@ +{ cabal, mtl, network, parsec }: + +cabal.mkDerivation (self: { + pname = "HTTP"; + version = "4000.2.2"; + sha256 = "0qrr9wdj25sdfxifppmw0w14g8skpgf42ic4iqcqylxxzfa8v7vh"; + buildDepends = [ mtl network parsec ]; + meta = { + homepage = "https://github.com/haskell/HTTP"; + description = "A library for client-side HTTP"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix index 1d89afe5968..523f59de5e9 100644 --- a/pkgs/development/libraries/haskell/ListLike/default.nix +++ b/pkgs/development/libraries/haskell/ListLike/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ListLike"; - version = "3.1.2"; - sha256 = "1fa2y8yc0ppmh37alc20a75gpb90i8s3pgnh3kg8n0577gvhjhzz"; + version = "3.1.4"; + sha256 = "0cpj7vqlazs2yzh0ffhlg69kdb18xyicybfw614nlqfhhrp53lj9"; isLibrary = true; isExecutable = true; meta = { diff --git a/pkgs/development/libraries/haskell/NanoProlog/default.nix b/pkgs/development/libraries/haskell/NanoProlog/default.nix index 85f5a1d9e6e..4bf301bd66d 100644 --- a/pkgs/development/libraries/haskell/NanoProlog/default.nix +++ b/pkgs/development/libraries/haskell/NanoProlog/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "NanoProlog"; - version = "0.2.3.3"; - sha256 = "0008xpahqbs2djchlw1bslhqqhbc0n7ql7pqm4g7lh8xd3ampxba"; + version = "0.3"; + sha256 = "0wjjwzzc78sj7nsaq1hgxiwv0pc069mxns425lhmrlxcm0vf8fmn"; isLibrary = true; isExecutable = true; buildDepends = [ ListLike uuParsinglib ]; diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.1.0.3.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix similarity index 56% rename from pkgs/development/libraries/haskell/QuickCheck/2.1.0.3.nix rename to pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix index df686f71c5b..69a1c1dc417 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.1.0.3.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix @@ -1,12 +1,12 @@ -{ cabal, extensibleExceptions, mtl, random }: +{ cabal, extensibleExceptions, random }: cabal.mkDerivation (self: { pname = "QuickCheck"; - version = "2.1.0.3"; - sha256 = "91a861233fe0a37a032d092dd5e8ec40c2c99fbbf0701081394eb244f23757b1"; - buildDepends = [ extensibleExceptions mtl random ]; + version = "2.4.2"; + sha256 = "17qp73sdp780lha3i6xdsrvgshqz47qwldqknadc0w3vmscw61bg"; + buildDepends = [ extensibleExceptions random ]; meta = { - homepage = "http://www.cs.chalmers.se/~koen"; + homepage = "http://code.haskell.org/QuickCheck"; description = "Automatic testing of Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix index 0bd68b6b92e..b8ead39671e 100644 --- a/pkgs/development/libraries/haskell/aeson/default.nix +++ b/pkgs/development/libraries/haskell/aeson/default.nix @@ -1,14 +1,14 @@ -{ cabal, attoparsec, blazeBuilder, blazeTextual, deepseq, dlist -, hashable, mtl, syb, text, time, unorderedContainers, vector +{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, mtl +, syb, text, time, unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "aeson"; - version = "0.4.0.0"; - sha256 = "1j0m7hh82ab7lg757wq75k28llfd1igawmg4g2qdia5gimm652pa"; + version = "0.5.0.0"; + sha256 = "1n7c0kf6rdf5p76mjcxlqrzhnfz4b1zkkbxk9w94hibb0s4kwxv6"; buildDepends = [ - attoparsec blazeBuilder blazeTextual deepseq dlist hashable mtl syb - text time unorderedContainers vector + attoparsec blazeBuilder deepseq dlist hashable mtl syb text time + unorderedContainers vector ]; meta = { homepage = "https://github.com/bos/aeson"; diff --git a/pkgs/development/libraries/haskell/asn1-data/default.nix b/pkgs/development/libraries/haskell/asn1-data/default.nix index 7ba67e5ce79..73601f462e9 100644 --- a/pkgs/development/libraries/haskell/asn1-data/default.nix +++ b/pkgs/development/libraries/haskell/asn1-data/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "asn1-data"; - version = "0.6.1.1"; - sha256 = "13l7gcrgngr2bdr7hxh1wbsh21q7nc5bdknz0gpzjf65297g44an"; + version = "0.6.1.2"; + sha256 = "1655fp71l8qjif4p6c1y2xk8r0gj58djg7np5zwwm6jlj780773r"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix new file mode 100644 index 00000000000..fd11df19905 --- /dev/null +++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix @@ -0,0 +1,18 @@ +{ cabal, attoparsec, conduit, text, transformers }: + +cabal.mkDerivation (self: { + pname = "attoparsec-conduit"; + version = "0.0.0"; + sha256 = "1cwmi86faisg10l15w8mz3619phvrn2hl10blr6pziv1k8c3ncj7"; + buildDepends = [ attoparsec conduit text transformers ]; + meta = { + homepage = "http://github.com/snoyberg/conduit"; + description = "Turn attoparsec parsers into sinks"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix index 3a55192b76a..0c41a350103 100644 --- a/pkgs/development/libraries/haskell/authenticate/default.nix +++ b/pkgs/development/libraries/haskell/authenticate/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "authenticate"; - version = "0.10.3.1"; - sha256 = "01xqqnvy2xjcgnp5qq5xiqm1whxywa31cgd79mm290i2r4baiq8s"; + version = "0.10.4"; + sha256 = "0bjxlnc2qf1900ch9cnab26qz6a0vdz5nz1dwrjby1n5xqqzjd7x"; buildDepends = [ aeson attoparsec base64Bytestring blazeBuilder caseInsensitive enumerator failure httpEnumerator httpTypes network random RSA SHA @@ -15,7 +15,7 @@ cabal.mkDerivation (self: { xmlEnumerator ]; meta = { - homepage = "http://github.com/snoyberg/authenticate/tree/master"; + homepage = "http://github.com/yesodweb/authenticate"; description = "Authentication methods for Haskell web applications"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix index ab0233e1956..ae9d23f57d4 100644 --- a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix +++ b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "base-unicode-symbols"; - version = "0.2.2.2"; - sha256 = "13bn580r3wk7g5bq8ry04i2lvrcf576wjzlr0imli8rklkx8k3b8"; + version = "0.2.2.3"; + sha256 = "0803ncdydkxivn4kcjfn9v0lm43xg47y5iws7lajhhyg6v4zq08j"; meta = { homepage = "http://haskell.org/haskellwiki/Unicode-symbols"; description = "Unicode alternatives for common functions and operators"; diff --git a/pkgs/development/libraries/haskell/base16-bytestring/default.nix b/pkgs/development/libraries/haskell/base16-bytestring/default.nix index b95052d02d9..b09024851de 100644 --- a/pkgs/development/libraries/haskell/base16-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/base16-bytestring/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "base16-bytestring"; - version = "0.1.1.3"; - sha256 = "0v08fnkykvd6y6in6f9a808vk2gfd9pf0wd7rr28z6wwxm5d2x6l"; + version = "0.1.1.4"; + sha256 = "061rxlw5kjwj0s08kml46qpw602xwwp05285gpad8c7baw5mzxlr"; meta = { homepage = "http://github.com/bos/base16-bytestring"; description = "Fast base16 (hex) encoding and decoding for ByteStrings"; diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix new file mode 100644 index 00000000000..40e4ec9a121 --- /dev/null +++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix @@ -0,0 +1,18 @@ +{ cabal, blazeBuilder, conduit, text, transformers }: + +cabal.mkDerivation (self: { + pname = "blaze-builder-conduit"; + version = "0.0.0"; + sha256 = "022j78sj9cs4xcbvxz0f2lga0rhxcwaj1mkxn0019rbx3lix1nh3"; + buildDepends = [ blazeBuilder conduit text transformers ]; + meta = { + homepage = "http://github.com/snoyberg/conduit"; + description = "Convert streams of builders to streams of bytestrings"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix index 2e8a5868d12..0231b9e8e00 100644 --- a/pkgs/development/libraries/haskell/blaze-html/default.nix +++ b/pkgs/development/libraries/haskell/blaze-html/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-html"; - version = "0.4.2.2"; - sha256 = "1fg0qgqml7ar3m0as9sk9zc260j2jvdsf5cdfrsify5l62ip060f"; + version = "0.4.3.1"; + sha256 = "0yhwlwmjy3jagxscz2i0yjfy6akqpamn9c35ffxcgpr0kj6qlpfp"; buildDepends = [ blazeBuilder text ]; meta = { homepage = "http://jaspervdj.be/blaze"; diff --git a/pkgs/development/libraries/haskell/blaze-textual/default.nix b/pkgs/development/libraries/haskell/blaze-textual/default.nix index b5924d7c73b..67d87905143 100644 --- a/pkgs/development/libraries/haskell/blaze-textual/default.nix +++ b/pkgs/development/libraries/haskell/blaze-textual/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-textual"; - version = "0.2.0.5"; - sha256 = "0rl41idjmrw227yi2x6nk2rlm93rgzz2y7jvz2yvmya2ihrppzjf"; + version = "0.2.0.6"; + sha256 = "1699fj9zig6ids9bdjn5v0gqhnyx5dkzi542gkx1gs8943c94737"; buildDepends = [ blazeBuilder text time vector ]; meta = { homepage = "http://github.com/bos/blaze-textual"; diff --git a/pkgs/development/libraries/haskell/bmp/default.nix b/pkgs/development/libraries/haskell/bmp/default.nix index 2c08676d9c4..19f69ede610 100644 --- a/pkgs/development/libraries/haskell/bmp/default.nix +++ b/pkgs/development/libraries/haskell/bmp/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "bmp"; - version = "1.1.2.1"; - sha256 = "01w0fbfzdmrfnmnkjkg9paagfkzsjn57rx7lf2npzp95rmljplkb"; + version = "1.2.0.2"; + sha256 = "0y1fjbhk73dj260wd1jhcf12fkh4maba4iwkzdg2087s9saxvljk"; buildDepends = [ binary ]; meta = { homepage = "http://code.ouroborus.net/bmp"; diff --git a/pkgs/development/libraries/haskell/byteorder/default.nix b/pkgs/development/libraries/haskell/byteorder/default.nix new file mode 100644 index 00000000000..d3af223418b --- /dev/null +++ b/pkgs/development/libraries/haskell/byteorder/default.nix @@ -0,0 +1,17 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "byteorder"; + version = "1.0.3"; + sha256 = "056jb47r4pkimi6z2z49prnsmjnhnijk57zm0divl1k55igi5way"; + meta = { + homepage = "http://community.haskell.org/~aslatter/code/byteorder"; + description = "Exposes the native endianness or byte ordering of the system"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/colour/default.nix b/pkgs/development/libraries/haskell/colour/default.nix index 51c93043e8b..d31f8546d4c 100644 --- a/pkgs/development/libraries/haskell/colour/default.nix +++ b/pkgs/development/libraries/haskell/colour/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "colour"; - version = "2.3.1"; - sha256 = "58cf12b8abf7d01a752b1b778b64cc406903874702e3475d65c2aa35689fa49b"; + version = "2.3.2"; + sha256 = "1j0y8cfdzhzjid1hg50qvh5nsa6kfnxcwxaizxyk73z60dn8g9b6"; meta = { homepage = "http://www.haskell.org/haskellwiki/Colour"; description = "A model for human colour/color perception"; - license = "unknown"; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix new file mode 100644 index 00000000000..76a7130ecb1 --- /dev/null +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -0,0 +1,22 @@ +{ cabal, liftedBase, monadControl, text, transformers +, transformersBase +}: + +cabal.mkDerivation (self: { + pname = "conduit"; + version = "0.0.0.1"; + sha256 = "0l3q9jj0dpbn2ixjx6d9m6ss92dmfgd5xc7wgfpb9d0kfk2li0sv"; + buildDepends = [ + liftedBase monadControl text transformers transformersBase + ]; + meta = { + homepage = "http://github.com/snoyberg/conduit"; + description = "A pull-based approach to streaming data"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix index f6b48befd5d..76bee6c05a8 100644 --- a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix +++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "data-accessor"; - version = "0.2.2"; - sha256 = "1jqd0qlv1yab83d5pdbzjw6q4a2kvbsar6kgczq0f0xn9gxm0qci"; + version = "0.2.2.1"; + sha256 = "1zb7z9fnlnxxlvjd655vadfscanzq9msvjv21cjmdric0ja24hxb"; buildDepends = [ transformers ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Record_access"; diff --git a/pkgs/development/libraries/haskell/data-object-yaml/default.nix b/pkgs/development/libraries/haskell/data-object-yaml/default.nix index a29ba40b823..1669f4be73e 100644 --- a/pkgs/development/libraries/haskell/data-object-yaml/default.nix +++ b/pkgs/development/libraries/haskell/data-object-yaml/default.nix @@ -1,20 +1,19 @@ -{ cabal, convertibleText, dataObject, enumerator, failure, text +{ cabal, conduit, convertibleText, dataObject, failure, text , transformers, yaml }: cabal.mkDerivation (self: { pname = "data-object-yaml"; - version = "0.3.3.6"; - sha256 = "0hha52nrxb539bvdz6ksn9sxmksfwmjhh7h8mp223s340vxrlpk3"; + version = "0.3.4"; + sha256 = "1wx6m7mjmdks8ym6dh117bhkdks4d1jlfchqif0svcwg04qnfczd"; isLibrary = true; isExecutable = true; buildDepends = [ - convertibleText dataObject enumerator failure text transformers - yaml + conduit convertibleText dataObject failure text transformers yaml ]; meta = { homepage = "http://github.com/snoyberg/data-object-yaml"; - description = "Serialize data to and from Yaml files"; + description = "Serialize data to and from Yaml files (deprecated)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ diff --git a/pkgs/development/libraries/haskell/dataenc/default.nix b/pkgs/development/libraries/haskell/dataenc/default.nix index 88d1b6ed067..7f7b65702b0 100644 --- a/pkgs/development/libraries/haskell/dataenc/default.nix +++ b/pkgs/development/libraries/haskell/dataenc/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "dataenc"; - version = "0.14.0.2"; - sha256 = "1zym24259d053b7vbxir2l7229gilkg81vvc0wf9605873j6gw5b"; + version = "0.14.0.3"; + sha256 = "1k6k9cpx5ma32gvzf2mdbz4kfiblwfah9875qr13zkl4has9y0pd"; isLibrary = true; isExecutable = true; meta = { diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix index 7f28ad8b10d..c98ddb04cd5 100644 --- a/pkgs/development/libraries/haskell/derive/default.nix +++ b/pkgs/development/libraries/haskell/derive/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "derive"; - version = "2.5.4"; - sha256 = "0gmj24qzh3vyvp0a44v4mf1qpkrg4d9q0m15d0yfbyzrimyjx1c7"; + version = "2.5.5"; + sha256 = "1vv7y2jfyxq2abh4avyjwia309a6rylbyiqia1m0ka7zwv2rxd6y"; isLibrary = true; isExecutable = true; buildDepends = [ haskellSrcExts syb transformers uniplate ]; diff --git a/pkgs/development/libraries/haskell/double-conversion/default.nix b/pkgs/development/libraries/haskell/double-conversion/default.nix index ee84665ad63..7c810a29565 100644 --- a/pkgs/development/libraries/haskell/double-conversion/default.nix +++ b/pkgs/development/libraries/haskell/double-conversion/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "double-conversion"; - version = "0.2.0.3"; - sha256 = "17ny1gvd622rnqjvlrmcpgw3wlabrsc6d046d4ii6xv299z97qw9"; + version = "0.2.0.4"; + sha256 = "00rb8n2ky20ah9ry398jagi9gb0gz40yjfalh35cpckmg30z199x"; buildDepends = [ text ]; meta = { homepage = "https://github.com/bos/double-conversion"; diff --git a/pkgs/development/libraries/haskell/dstring/default.nix b/pkgs/development/libraries/haskell/dstring/default.nix new file mode 100644 index 00000000000..0b979e179f4 --- /dev/null +++ b/pkgs/development/libraries/haskell/dstring/default.nix @@ -0,0 +1,18 @@ +{ cabal, baseUnicodeSymbols, dlist }: + +cabal.mkDerivation (self: { + pname = "dstring"; + version = "0.4.0.3"; + sha256 = "0wzj1wzls7w79ac84sc5msblh2dmfmcxm77drpdqdirl1pwdlq9c"; + buildDepends = [ baseUnicodeSymbols dlist ]; + meta = { + homepage = "https://github.com/basvandijk/dstring"; + description = "Difference strings"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/enumerator/default.nix b/pkgs/development/libraries/haskell/enumerator/default.nix index 12e801516a6..58e5ab4b62d 100644 --- a/pkgs/development/libraries/haskell/enumerator/default.nix +++ b/pkgs/development/libraries/haskell/enumerator/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "enumerator"; - version = "0.4.16"; - sha256 = "16556x3km4si7gvprf7xmsiqw1ygjwavhbgh32fmzf7709bpqnhs"; + version = "0.4.17"; + sha256 = "009h9phdgnkbvz5fri81b895y2hbmw5x7z67rnn31j87khbhnfz9"; buildDepends = [ text transformers ]; meta = { homepage = "https://john-millikin.com/software/enumerator/"; diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix new file mode 100644 index 00000000000..68bc8ca6005 --- /dev/null +++ b/pkgs/development/libraries/haskell/fast-logger/default.nix @@ -0,0 +1,17 @@ +{ cabal, blazeBuilder }: + +cabal.mkDerivation (self: { + pname = "fast-logger"; + version = "0.0.1"; + sha256 = "19ff2dhkh62i1ljsl90wnsblzk30dz0yx4kw5gk1hb22md7hakim"; + buildDepends = [ blazeBuilder ]; + meta = { + description = "A fast logging system"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix index b2a6142bbaf..ddd6905d314 100644 --- a/pkgs/development/libraries/haskell/fclabels/default.nix +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "fclabels"; - version = "1.0.4"; - sha256 = "051ryqjzc74lnlbdd1ngxgqj56p43ls5xhafmldnyhkv75x59svw"; + version = "1.1.0.1"; + sha256 = "0nzqx1d4hwailfkcb9g03hagws9j6valqd5yp7972kmhbq0c8h3s"; buildDepends = [ mtl transformers ]; meta = { description = "First class accessor labels"; diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index 1b9fbb03da4..47425ae2536 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gloss"; - version = "1.5.2.1"; - sha256 = "1mwk9gnkbjr76f9g79ixxlwzpsvmhflp5c8a0584fyypjg2r33n3"; + version = "1.6.0.1"; + sha256 = "0yy8yl2s3n0kyr14bcxp1hjzh3wlrhc0xp2ngl3wbz1hbzyrsdlf"; buildDepends = [ bmp GLUT OpenGL ]; meta = { homepage = "http://gloss.ouroborus.net"; diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index 15d219830a4..98132edfdb2 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hamlet"; - version = "0.10.5"; - sha256 = "0kizy0qij6zbayrbb3gr4iqys1551ax5c8w5lvh6chg3ypl1i1m3"; + version = "0.10.6"; + sha256 = "0ai00jwbq5nnrgcfhz3sxm2jm2jvz7qbj56lr0wlc3z818a22ams"; buildDepends = [ blazeBuilder blazeHtml failure parsec shakespeare text ]; diff --git a/pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix new file mode 100644 index 00000000000..8dd833a7bf0 --- /dev/null +++ b/pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix @@ -0,0 +1,42 @@ +{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, + haskellSrc, html, network, parallel, parsec, regexBase, regexCompat, regexPosix, + stm, syb, deepseq, text, transformers, mtl, xhtml, zlib, + cabalInstall, alex, happy, haddock, ghc}: + +# This is just a meta-package. Because upstream fails to provide proper versioned +# release tarballs that can be used for the purpose of verifying this package, we +# just create it on the fly from a simple Setup.hs file and a .cabal file that we +# store directly in the nixpkgs repository. + +cabal.mkDerivation (self : { + pname = "haskell-platform"; + version = "2011.4.0.0"; + cabalFile = ./haskell-platform-2011.4.0.0.cabal; + setupFile = ./Setup.hs; + src = null; + propagatedBuildInputs = [ + GLUT HTTP HUnit OpenGL QuickCheck cgi fgl + haskellSrc html network parallel parsec regexBase regexCompat regexPosix + stm syb deepseq text transformers mtl xhtml zlib + cabalInstall alex happy ghc haddock + ]; + unpackPhase = '' + sourceRoot=haskell-platform + mkdir $sourceRoot + cp ${self.cabalFile} $sourceRoot/${self.pname}.cabal + cp ${self.setupFile} $sourceRoot/Setup.hs + touch $sourceRoot/LICENSE + ''; + noHaddock = true; + meta = { + homepage = "http://haskell.org/platform"; + description = "Haskell Platform meta package"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.4.0.0.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.4.0.0.cabal new file mode 100644 index 00000000000..56414de90c5 --- /dev/null +++ b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.4.0.0.cabal @@ -0,0 +1,90 @@ +name: haskell-platform +version: 2011.4.0.0 +homepage: http://haskell.org/platform +license: BSD3 +license-file: LICENSE +author: libraries@haskell.org +maintainer: haskell-platform@projects.haskell.org +category: System +synopsis: The Haskell Platform +description: + The Haskell Platform (HP) is the blessed set of libraries and tools on + which to build further Haskell libraries and applications. It is + intended to provide a comprehensive, stable, and quality tested base for + Haskell projects to work from. + . + This version specifies the following additional developer tools be + installed, for a system to be in full compliance: + . + * cabal-install + * alex + * happy + * haddock + +cabal-version: >= 1.8 +build-type: Custom +tested-with: GHC ==7.0.4 + +library + build-depends: + -- ghc 7.x + -- Core libraries: provided by every ghc installation + -- We don't include "non-API" packages here. + -- array ==0.3.0.2 + -- base ==4.3.1.0 + -- bytestring ==0.9.1.10 + -- Cabal ==1.10.2.0 + -- containers ==0.4.0.0 + -- directory ==1.1.0.0 + -- extensible-exceptions ==0.1.1.2 + -- filepath ==1.2.0.0 + -- haskell2010 ==1.0.0.0 + -- haskell98 ==1.1.0.1 + -- hpc ==0.5.0.6 + -- old-locale ==1.0.0.2 + -- old-time ==1.0.0.6 + -- pretty ==1.0.1.2 + -- process ==1.0.1.5 + -- random ==1.0.0.3 + -- template-haskell ==2.5.0.0 + -- time ==1.2.0.3 + -- unix ==XXX 2.4.2.0 + -- Win32 ==XXX 2.2.0.1 + + -- Libraries in addition to what GHC provides: + -- Note: newer versions of cgi need monad-catchio. + cgi ==3001.1.7.4, + fgl ==5.4.2.4, + GLUT ==2.1.2.1, + haskell-src ==1.0.1.4, + html ==1.0.1.2, + HUnit ==1.2.4.2, + network ==2.3.0.5, + OpenGL ==2.2.3.0, + parallel ==3.1.0.1, + parsec ==3.1.1, + QuickCheck ==2.4.1.1, + regex-base ==0.93.2, + regex-compat ==0.95.1, + regex-posix ==0.95.1, + stm ==2.2.0.1, + syb ==0.3.3, + xhtml ==3000.2.0.4, + zlib ==0.5.3.1, + HTTP ==4000.1.2, + deepseq ==1.1.0.2, + + -- 2011.1 proposals: + text ==0.11.1.5, + transformers ==0.2.2.0, + mtl ==2.0.1.0 + + -- Depending on programs does not work, they are not registered + -- We list them to help distro packaging. + build-tools: + cabal-install ==0.10.2, + alex ==2.3.5, + happy ==1.18.6 + -- hscolour ==1.17 + -- haddock ==2.9.2 -- need to use the one shipped with ghc + diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix index 84866e026fd..c60c7dc1591 100644 --- a/pkgs/development/libraries/haskell/hmatrix/default.nix +++ b/pkgs/development/libraries/haskell/hmatrix/default.nix @@ -1,14 +1,10 @@ -{ cabal, binary, blas, gsl, HUnit, liblapack, QuickCheck, random -, storableComplex, vector -}: +{ cabal, binary, blas, gsl, liblapack, storableComplex, vector }: cabal.mkDerivation (self: { pname = "hmatrix"; - version = "0.12.0.2"; - sha256 = "08i3vi0vs6wpyvjsjpqrxp8lw0f89cgzwv1j27y7i2yfp4xmrw8d"; - buildDepends = [ - binary HUnit QuickCheck random storableComplex vector - ]; + version = "0.13.0.0"; + sha256 = "1jlibgg2nrgajw2ny0dq88f5mhrffi7kda9bb8sp9szf4a0kd4wd"; + buildDepends = [ binary storableComplex vector ]; extraLibraries = [ blas gsl liblapack ]; configureFlags = "-fvector"; meta = { diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix new file mode 100644 index 00000000000..ab011d5c87b --- /dev/null +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -0,0 +1,31 @@ +{ cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring +, blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate +, conduit, cprngAes, dataDefault, failure, httpTypes, liftedBase +, monadControl, network, text, tls, tlsExtra, transformers +, transformersBase, utf8String, zlibConduit, zlibEnum +}: + +cabal.mkDerivation (self: { + pname = "http-conduit"; + version = "1.0.0"; + sha256 = "1ix2qx6zqp8g7hjg2ygwivzg4hhz2ac22rbybh9adzvzw0q2yvgk"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder + blazeBuilderConduit caseInsensitive certificate conduit cprngAes + dataDefault failure httpTypes liftedBase monadControl network text + tls tlsExtra transformers transformersBase utf8String zlibConduit + zlibEnum + ]; + meta = { + homepage = "http://github.com/snoyberg/http-enumerator"; + description = "HTTP client package with conduit interface and HTTPS support"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix index 14109cd1c11..2a285965f9c 100644 --- a/pkgs/development/libraries/haskell/http-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "http-enumerator"; - version = "0.7.2"; - sha256 = "096rwnfm8bqn0pq9cs4i2kr1ljmawk2l17afw301zqfg79q97crc"; + version = "0.7.2.1"; + sha256 = "1qbarxi9268yzb3phnfgvnszbkzs6r63gqzy63h69kpi0k0wl84i"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix index 1006d2fd2c3..890d5100147 100644 --- a/pkgs/development/libraries/haskell/http-types/default.nix +++ b/pkgs/development/libraries/haskell/http-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "http-types"; - version = "0.6.7"; - sha256 = "04bmw5k9gvlh7x4ggmwz7pdc1ik3va0v4icg7nv47ab2w2pn88pb"; + version = "0.6.8"; + sha256 = "0amjpn93wc7jhfy1n69mhiryi2yy40k5388ap3iwqi79mblkjf31"; isLibrary = true; isExecutable = true; buildDepends = [ blazeBuilder caseInsensitive text ]; diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix new file mode 100644 index 00000000000..48822d777bc --- /dev/null +++ b/pkgs/development/libraries/haskell/lifted-base/default.nix @@ -0,0 +1,20 @@ +{ cabal, baseUnicodeSymbols, monadControl, transformersBase }: + +cabal.mkDerivation (self: { + pname = "lifted-base"; + version = "0.1.0.2"; + sha256 = "1j810pdkhl6kpc368081ar1k9342k3bl4cmx294zdyd0j00n23zx"; + buildDepends = [ + baseUnicodeSymbols monadControl transformersBase + ]; + meta = { + homepage = "https://github.com/basvandijk/lifted-base"; + description = "lifted IO operations from the base library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/monad-control/default.nix b/pkgs/development/libraries/haskell/monad-control/default.nix index 52e3d001f48..bf4ca6d0042 100644 --- a/pkgs/development/libraries/haskell/monad-control/default.nix +++ b/pkgs/development/libraries/haskell/monad-control/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monad-control"; - version = "0.3.0.1"; - sha256 = "0aa73cw82yssias0a9y237h9r4v4abvs0lv2lmhxaa4a4mdrj3ms"; + version = "0.3.1"; + sha256 = "0laqvbnj1dfcdxrybxdnzw5g95drv34ys0cbwkcw47nl9w801p45"; buildDepends = [ baseUnicodeSymbols transformers transformersBase ]; diff --git a/pkgs/development/libraries/haskell/monad-par/default.nix b/pkgs/development/libraries/haskell/monad-par/default.nix index 8b6850ea08d..e8a2e298c98 100644 --- a/pkgs/development/libraries/haskell/monad-par/default.nix +++ b/pkgs/development/libraries/haskell/monad-par/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monad-par"; - version = "0.1.0.2"; - sha256 = "0ca5fbc92bmghg8pk40rwcf58jk3y7xcr0nwfhyhi67riqnwqrl8"; + version = "0.1.0.3"; + sha256 = "1c0yclil152hv06c2sbgam9amd63nnzh7a4xsnxb05wgy93qs2mg"; buildDepends = [ deepseq HUnit ]; meta = { homepage = "https://github.com/simonmar/monad-par"; diff --git a/pkgs/development/libraries/haskell/multirec/0.6.nix b/pkgs/development/libraries/haskell/multirec/0.6.nix deleted file mode 100644 index 6fb6acd58ed..00000000000 --- a/pkgs/development/libraries/haskell/multirec/0.6.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "multirec"; - version = "0.6"; - sha256 = "1k0icyz9i4hc5vfpwrv42l3q4lrnsb1bswhyyv63d9azffn5flys"; - noHaddock = true; - meta = { - homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; - description = "Generic programming for families of recursive datatypes"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/multirec/0.5.1.nix b/pkgs/development/libraries/haskell/multirec/default.nix similarity index 84% rename from pkgs/development/libraries/haskell/multirec/0.5.1.nix rename to pkgs/development/libraries/haskell/multirec/default.nix index 3e994f878cc..c001783a13b 100644 --- a/pkgs/development/libraries/haskell/multirec/0.5.1.nix +++ b/pkgs/development/libraries/haskell/multirec/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "multirec"; - version = "0.5.1"; - sha256 = "0y62gb2ml0799a3f1ny5ydjc4rjwj1dgs48f5fj6hf2fpl4hk02l"; + version = "0.7.1"; + sha256 = "1a3snlv6lr9mi4nrl4cyc5ilk6flbdn0ck2sqla6dyb2zdlgf5ph"; noHaddock = true; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; diff --git a/pkgs/development/libraries/haskell/network/2.3.0.5.nix b/pkgs/development/libraries/haskell/network/2.3.0.5.nix new file mode 100644 index 00000000000..bf9330eb256 --- /dev/null +++ b/pkgs/development/libraries/haskell/network/2.3.0.5.nix @@ -0,0 +1,18 @@ +{ cabal, parsec }: + +cabal.mkDerivation (self: { + pname = "network"; + version = "2.3.0.5"; + sha256 = "0y1sbgsffzr0skm6xl8907iclgw9vmf395zvpwgakp69i3snh1z0"; + buildDepends = [ parsec ]; + meta = { + homepage = "http://github.com/haskell/network"; + description = "Low-level networking interface"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.0.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix similarity index 80% rename from pkgs/development/libraries/haskell/parallel/3.2.0.0.nix rename to pkgs/development/libraries/haskell/parallel/3.2.0.2.nix index 9c260d06566..81d37e3a2b0 100644 --- a/pkgs/development/libraries/haskell/parallel/3.2.0.0.nix +++ b/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "parallel"; - version = "3.2.0.0"; - sha256 = "1wqdy9p7xqq84ffgzdakvqydxq9668r9xq3wyay9wlgrk83wd1sq"; + version = "3.2.0.2"; + sha256 = "0sy67cdbwh17wng6b77h9hnkg59mgnyilwvirihmq9535jm9yml2"; buildDepends = [ deepseq ]; meta = { description = "Parallel programming library"; diff --git a/pkgs/development/libraries/haskell/path-pieces/default.nix b/pkgs/development/libraries/haskell/path-pieces/0.0.0.nix similarity index 100% rename from pkgs/development/libraries/haskell/path-pieces/default.nix rename to pkgs/development/libraries/haskell/path-pieces/0.0.0.nix diff --git a/pkgs/development/libraries/haskell/path-pieces/0.1.0.nix b/pkgs/development/libraries/haskell/path-pieces/0.1.0.nix new file mode 100755 index 00000000000..9c3c8dbc79a --- /dev/null +++ b/pkgs/development/libraries/haskell/path-pieces/0.1.0.nix @@ -0,0 +1,18 @@ +{ cabal, text }: + +cabal.mkDerivation (self: { + pname = "path-pieces"; + version = "0.1.0"; + sha256 = "12dgiq2pz94pwa5v5wv96ps0nl5w23r44nnp4lm4cdhl063c9w8d"; + buildDepends = [ text ]; + meta = { + homepage = "http://github.com/snoyberg/path-pieces"; + description = "Components of paths"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 527bbf9f2ae..59fe42ff65e 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "persistent"; - version = "0.6.4.3"; - sha256 = "0j4agwm8hcphrmzmc7d7al57cwp3i5iy7d8yhqw9m8pcx61sqkg4"; + version = "0.6.4.4"; + sha256 = "0n4zl0r8nmp3pwsgc0kiy7fgk2dfvdvagv1gvjxrs8545c5ycggv"; buildDepends = [ blazeHtml dataObject enumerator monadControl mtl pathPieces pool text time transformers transformersBase diff --git a/pkgs/development/libraries/haskell/regular/default.nix b/pkgs/development/libraries/haskell/regular/default.nix index 4b4e5458df2..0085d866567 100644 --- a/pkgs/development/libraries/haskell/regular/default.nix +++ b/pkgs/development/libraries/haskell/regular/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "regular"; - version = "0.3.3"; - sha256 = "1xlpp60nvdiqkcn66dnpww72hcawyc1w7cd9zk9kk88x574kqzf7"; + version = "0.3.4"; + sha256 = "10gfid99xcqv3i9rp4x8hykk91qq3h7b7lxzsl7ii58vmifa4kgq"; meta = { description = "Generic programming library for regular datatypes"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/repr/default.nix b/pkgs/development/libraries/haskell/repr/default.nix new file mode 100644 index 00000000000..bad1e93d6b9 --- /dev/null +++ b/pkgs/development/libraries/haskell/repr/default.nix @@ -0,0 +1,20 @@ +{ cabal, baseUnicodeSymbols, dstring, random, stringCombinators }: + +cabal.mkDerivation (self: { + pname = "repr"; + version = "0.4.1.2"; + sha256 = "09rv23p1hvvfw5wnhiawgrpqgqa4i0d00skyj9z1jj6bfxk5avjs"; + buildDepends = [ + baseUnicodeSymbols dstring random stringCombinators + ]; + meta = { + homepage = "https://github.com/basvandijk/repr"; + description = "Render overloaded expressions to their textual representation"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 1cef979c01e..b0d70a8fbfd 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "0.10.4"; - sha256 = "006ndbhzxkr2zw6gs13bm5pfq7i301bbg6nhagm3h9nnzp155snz"; + version = "0.10.5"; + sha256 = "1cnv9qgp1llrrvcqp64mq207wdsxpqza9yq5nzlsgrh6qlzvm4hs"; buildDepends = [ parsec shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/templates"; diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix new file mode 100644 index 00000000000..1a1e4f1d20b --- /dev/null +++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix @@ -0,0 +1,18 @@ +{ cabal, parsec, shakespeare, text }: + +cabal.mkDerivation (self: { + pname = "shakespeare-i18n"; + version = "0.0.0"; + sha256 = "1zyr63ncd92c30afh0sf4lq7p253jd3gjvcv65f7i0njqpc1lg9y"; + buildDepends = [ parsec shakespeare text ]; + meta = { + homepage = "http://www.yesodweb.com/book/i18n"; + description = "A type-based approach to internationalization"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index a4a20c98b19..d127725a73e 100644 --- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-js"; - version = "0.10.3"; - sha256 = "1xz4jf91dfz60dji31d3hyy1k01hk0v41pb8qmi598jylk9iz1r2"; + version = "0.10.4"; + sha256 = "15mh93d38qpqnrgxvaq659zwl2mks9xhkynhlpjrf8zb234knxjw"; buildDepends = [ shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/templates"; diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix index f66eb3bb591..d4f814b2111 100644 --- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix +++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "simple-sendfile"; - version = "0.1.3"; - sha256 = "0n78d6bn2hsm3p6r2kc2cr5nf9v1vqs6v5i9x71f910r3kk2grm8"; + version = "0.2.0"; + sha256 = "1rsbmlnks4q8gsfzwqwcj901b8hzcrfb85z7wy3szj4h0axw4264"; buildDepends = [ network ]; meta = { description = "Cross platform library for the sendfile system call"; diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index c0639515bf5..c6be9f80258 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "snap-core"; - version = "0.7"; - sha256 = "1rplv1pg531jfmvxlhl7lz9hdhbxllk59daik013i172wglggivp"; + version = "0.7.0.1"; + sha256 = "010w3ycwalz48288342rmwg87pdml7ixg9drw38k206q9s9a9cp9"; buildDepends = [ attoparsec attoparsecEnumerator base16Bytestring blazeBuilder blazeBuilderEnumerator bytestringMmap bytestringNums diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index da786f8a7c6..e6eafd47eab 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "snap-server"; - version = "0.7"; - sha256 = "1zvijghk7597xbmxv2x3qk92jlckwpz73c57cmfl63as5x6psxhr"; + version = "0.7.0.1"; + sha256 = "149jgd9mcndw9sc051020y7yiai1fipjnqk4s3sbw4lmaysap673"; buildDepends = [ attoparsec attoparsecEnumerator binary blazeBuilder blazeBuilderEnumerator bytestringNums caseInsensitive directoryTree diff --git a/pkgs/development/libraries/haskell/split/default.nix b/pkgs/development/libraries/haskell/split/default.nix index 8463200e387..604c4a0a0f2 100644 --- a/pkgs/development/libraries/haskell/split/default.nix +++ b/pkgs/development/libraries/haskell/split/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "split"; - version = "0.1.4.1"; - sha256 = "0cdn2sb3m62bnxdz59diwwaxysh3kj4kk1srn4m80p03fj60s0q5"; + version = "0.1.4.2"; + sha256 = "09vi7vw4i4r78gyp3bbvhvvyiqi8rgf678ppmq99qrfqm34c2fl9"; meta = { homepage = "http://code.haskell.org/~byorgey/code/split"; description = "Combinator library for splitting lists"; diff --git a/pkgs/development/libraries/haskell/string-combinators/default.nix b/pkgs/development/libraries/haskell/string-combinators/default.nix new file mode 100644 index 00000000000..3371c56ceb2 --- /dev/null +++ b/pkgs/development/libraries/haskell/string-combinators/default.nix @@ -0,0 +1,18 @@ +{ cabal, baseUnicodeSymbols }: + +cabal.mkDerivation (self: { + pname = "string-combinators"; + version = "0.6.0.2"; + sha256 = "1bsnli6376nq5dmcx8da2fakj7h73plqz6v1myzhkz1f6r3qcjfi"; + buildDepends = [ baseUnicodeSymbols ]; + meta = { + homepage = "https://github.com/basvandijk/string-combinators"; + description = "Polymorphic functions to build and combine stringlike values"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/syb/0.3.3.nix b/pkgs/development/libraries/haskell/syb/0.3.3.nix new file mode 100644 index 00000000000..01cc80c883d --- /dev/null +++ b/pkgs/development/libraries/haskell/syb/0.3.3.nix @@ -0,0 +1,17 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "syb"; + version = "0.3.3"; + sha256 = "0jskxbnzariq2ahcymvjrp4bhl9cpflc1nh51whdl9axcrd5c901"; + meta = { + homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; + description = "Scrap Your Boilerplate"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class.nix b/pkgs/development/libraries/haskell/syb/syb-with-class.nix index 980c24b2d45..79b90feaa85 100644 --- a/pkgs/development/libraries/haskell/syb/syb-with-class.nix +++ b/pkgs/development/libraries/haskell/syb/syb-with-class.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "syb-with-class"; - version = "0.6.1.2"; - sha256 = "1hzwhfpl4w5nblkr2l4l4i7xxkvv7n5adr3i9miqmw1krlxs852d"; + version = "0.6.1.3"; + sha256 = "0dmj9ah7az5lckamvm46pff0595p6v4pvzdv0lqq97gjs5i59y9d"; meta = { description = "Scrap Your Boilerplate With Class"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix index 75f13c948e9..ee42d3415f2 100644 --- a/pkgs/development/libraries/haskell/system-filepath/default.nix +++ b/pkgs/development/libraries/haskell/system-filepath/default.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "system-filepath"; - version = "0.4.3"; - sha256 = "16a57dipz3aid5n22gzyd9yqmsxm98c3s6vb7minj82q9rbl5z67"; + version = "0.4.4"; + sha256 = "16904xwbcy82ghf1bckw8h63pfj9jfbdlqrr8jf91jzl27lqlwxf"; buildDepends = [ deepseq text ]; meta = { - homepage = "https://john-millikin.com/software/hs-filepath/"; + homepage = "https://john-millikin.com/software/haskell-filesystem/"; description = "High-level, byte-based file and directory path manipulations"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index d25c80a1810..032f79ce077 100644 --- a/pkgs/development/libraries/haskell/texmath/default.nix +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "texmath"; - version = "0.5.0.3"; - sha256 = "0pw3b5qvsngy0wdny8y3widkaphvjksg7mnpa8yzqfsw0rl36s0p"; + version = "0.5.0.4"; + sha256 = "0wi7zix10p73hb8aiyq47d27k5hi0l0ba5p6h7kdbhia9xm5w5w5"; isLibrary = true; isExecutable = true; buildDepends = [ parsec syb xml ]; diff --git a/pkgs/development/libraries/haskell/text/0.11.1.9.nix b/pkgs/development/libraries/haskell/text/0.11.1.12.nix similarity index 82% rename from pkgs/development/libraries/haskell/text/0.11.1.9.nix rename to pkgs/development/libraries/haskell/text/0.11.1.12.nix index 5b095c97e67..805c96d2af0 100644 --- a/pkgs/development/libraries/haskell/text/0.11.1.9.nix +++ b/pkgs/development/libraries/haskell/text/0.11.1.12.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "text"; - version = "0.11.1.9"; - sha256 = "12lq9v1byrsan7rp7kywkbwp15qyganpkanmln43yylxdzdc8a2k"; + version = "0.11.1.12"; + sha256 = "0j2044whj3xckmxqmgdjbc2mpwdan481qzjslwplqbqwml2jvkml"; buildDepends = [ deepseq ]; meta = { homepage = "https://github.com/bos/text"; diff --git a/pkgs/development/libraries/haskell/text/0.11.1.5.nix b/pkgs/development/libraries/haskell/text/0.11.1.5.nix new file mode 100644 index 00000000000..db438a54bc2 --- /dev/null +++ b/pkgs/development/libraries/haskell/text/0.11.1.5.nix @@ -0,0 +1,18 @@ +{ cabal, deepseq }: + +cabal.mkDerivation (self: { + pname = "text"; + version = "0.11.1.5"; + sha256 = "0fxxhw932gdvaqafsbw7dfzccc43hv92yhxppzp6jrg0npbyz04l"; + buildDepends = [ deepseq ]; + meta = { + homepage = "https://bitbucket.org/bos/text"; + description = "An efficient packed Unicode text type"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix index 52cdfc5ffe4..d9d5c8c11d6 100644 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ b/pkgs/development/libraries/haskell/tls-extra/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tls-extra"; - version = "0.4.1"; - sha256 = "0yimnq5p89jfbnk5cpa9w30zvfqs9dxxjxy2a86l8jvba5xb8068"; + version = "0.4.2"; + sha256 = "14zi5xzdyzdzw9qv6775li635x8i9rkp2z655ygzcwz5v3spjz9z"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index ef0f1bb4dd0..c5e56ec6b80 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tls"; - version = "0.8.3.2"; - sha256 = "1g30viz94qhwv3v16d9njrwyqmv0p1hs0r11xmzx0adp806w54z9"; + version = "0.8.4"; + sha256 = "1xd6cax4ldvahjjs5kdhcjmy4rx1ywp6r3alaifxbk2397zi7p1v"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/transformers-base/default.nix b/pkgs/development/libraries/haskell/transformers-base/default.nix index 6571b082281..951458eb4eb 100644 --- a/pkgs/development/libraries/haskell/transformers-base/default.nix +++ b/pkgs/development/libraries/haskell/transformers-base/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "transformers-base"; - version = "0.4.0.1"; - sha256 = "0avnnxbxh59xgxzb8vldysrbw37sim9iaiiscgjhdlscxy6yasbb"; + version = "0.4.1"; + sha256 = "1d3w7k7smvdnnn4q6xpdhsj9zvj6372ihyhz4lrhdvgh72pfiaag"; buildDepends = [ transformers ]; meta = { homepage = "https://github.com/mvv/transformers-base"; diff --git a/pkgs/development/libraries/haskell/unordered-containers/default.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix index df50bacd522..da4616a1367 100644 --- a/pkgs/development/libraries/haskell/unordered-containers/default.nix +++ b/pkgs/development/libraries/haskell/unordered-containers/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unordered-containers"; - version = "0.1.4.4"; - sha256 = "1fvicb2a8fnfg7579x6v4fpyz3dhjij8vmny4fa8x5g8ih608kb8"; + version = "0.1.4.6"; + sha256 = "1azwxbrzlzaw54idp3z2xx1xlywzsf1r893blbz51nnwcj9v550d"; buildDepends = [ deepseq hashable ]; meta = { description = "Efficient hashing-based container types"; diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix index 124d08aabc0..ed6701976dd 100644 --- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix +++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uu-parsinglib"; - version = "2.7.3.1"; - sha256 = "11lwf2b4l4sll6xvscv3c2n3kl6hs0s8rplw66cwskcck3mvs7ms"; + version = "2.7.3.2"; + sha256 = "0z53s9wvk57g3d9x3iswjydwm7nw5vfrj7k08v75fw6rwldkal60"; buildDepends = [ ListLike time ]; meta = { homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators"; diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index a0a736deeef..a2840ad66ce 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -1,15 +1,15 @@ { cabal, blazeBuilder, blazeBuilderEnumerator, caseInsensitive -, dataDefault, enumerator, httpTypes, network, text, time -, transformers, wai, zlibBindings, zlibEnum +, dataDefault, enumerator, fastLogger, httpTypes, network, text +, time, transformers, wai, zlibBindings, zlibEnum }: cabal.mkDerivation (self: { pname = "wai-extra"; - version = "0.4.5.2"; - sha256 = "05gq22il1jnvw5rcqr6gassxj29f8l4536zm6bpgk1kff8cxa3g1"; + version = "0.4.6"; + sha256 = "1wpdfzw5qzbd33iypgppp4822vn7vhja6y26dnkb17n08r83vvhv"; buildDepends = [ blazeBuilder blazeBuilderEnumerator caseInsensitive dataDefault - enumerator httpTypes network text time transformers wai + enumerator fastLogger httpTypes network text time transformers wai zlibBindings zlibEnum ]; meta = { diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix new file mode 100644 index 00000000000..d99bd1a0442 --- /dev/null +++ b/pkgs/development/libraries/haskell/wai-logger/default.nix @@ -0,0 +1,22 @@ +{ cabal, blazeBuilder, byteorder, caseInsensitive, fastLogger +, httpTypes, network, time, wai +}: + +cabal.mkDerivation (self: { + pname = "wai-logger"; + version = "0.1.2"; + sha256 = "0pzbdjy0xkjqkzc5w1v0hh18jgbxlkllsjwxabswkh8gl73mp7d9"; + buildDepends = [ + blazeBuilder byteorder caseInsensitive fastLogger httpTypes network + time wai + ]; + meta = { + description = "A logging system for WAI"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 5ff96051307..95caf840ad0 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "0.4.6.2"; - sha256 = "1ja9w3440j69w7638wrjd6067svqcsaqdl1zklr6jx20zyadww94"; + version = "0.4.6.3"; + sha256 = "1gfjhp1s42ynpi3kh8fr6fp5nwirxz0gasr7zs7q2qwwvlq9pzm6"; buildDepends = [ blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator httpTypes network simpleSendfile transformers unixCompat wai diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix new file mode 100644 index 00000000000..79f10512b46 --- /dev/null +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -0,0 +1,25 @@ +{ cabal, attoparsec, attoparsecConduit, blazeBuilder +, blazeBuilderConduit, conduit, dataDefault, failure +, systemFilepath, text, transformers, xmlTypes +}: + +cabal.mkDerivation (self: { + pname = "xml-conduit"; + version = "0.5.0"; + sha256 = "008rrqglxajihcf3yp9cwif67dnabyjjiymxvssznrl8ljz4yn8y"; + buildDepends = [ + attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit + conduit dataDefault failure systemFilepath text transformers + xmlTypes + ]; + meta = { + homepage = "http://github.com/snoyberg/xml"; + description = "Pure-Haskell utilities for dealing with XML with the conduit package"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index 76010bb4f86..2b25768aa69 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -1,12 +1,15 @@ -{ cabal, enumerator, transformers }: +{ cabal, aeson, attoparsec, conduit, text, transformers +, unorderedContainers, vector +}: cabal.mkDerivation (self: { pname = "yaml"; - version = "0.4.1.2"; - sha256 = "1c7ffs5gkwk0l0vg7amsflra1j8ifd9cvvbqx9jzkqsay8hbr4vb"; - isLibrary = true; - isExecutable = true; - buildDepends = [ enumerator transformers ]; + version = "0.5.1.1"; + sha256 = "1l3f1rbdajdf9944kwbf90a1wxv00g2jcgjkg54k6c3iqbx956w2"; + buildDepends = [ + aeson attoparsec conduit text transformers unorderedContainers + vector + ]; meta = { homepage = "http://github.com/snoyberg/yaml/"; description = "Low-level binding to the libyaml C library"; diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index 19ba48b58cc..2ed7486eff4 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "0.7.7.2"; - sha256 = "1zqxg13hpd45i2nyhh1bvaly1cwaygmjpz46cm7knp553bdhy8c8"; + version = "0.7.9"; + sha256 = "08vlj61y3czv0v8dnfdkyfww5sccia6j0fxnn1hxk44zghwhy214"; buildDepends = [ aeson authenticate blazeHtml controlMonadAttempt hamlet httpEnumerator mimeMail persistent persistentTemplate pureMD5 diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index c894a5138e6..4e81d54979b 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -1,21 +1,21 @@ { cabal, aeson, blazeBuilder, blazeHtml, caseInsensitive, cereal , clientsession, cookie, dataObject, dataObjectYaml, enumerator -, failure, hamlet, httpTypes, monadControl, parsec, pathPieces -, random, shakespeare, shakespeareCss, shakespeareJs -, strictConcurrency, text, time, transformers, transformersBase -, vector, wai, waiExtra +, failure, fastLogger, hamlet, httpTypes, monadControl, parsec +, pathPieces, random, shakespeare, shakespeareCss, shakespeareI18n +, shakespeareJs, text, time, transformers, transformersBase, vector +, wai, waiExtra, waiLogger }: cabal.mkDerivation (self: { pname = "yesod-core"; - version = "0.9.3.6"; - sha256 = "00h1ylrr5wrid9vn3jhspibprx0175j9rcwdb1hd7ya5gwmzlhjs"; + version = "0.9.4"; + sha256 = "1m9cxm3pngg4pq7j3p1sh7lrjp5gslnn6zcimc5ln8yldxx01c6g"; buildDepends = [ aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession - cookie dataObject dataObjectYaml enumerator failure hamlet - httpTypes monadControl parsec pathPieces random shakespeare - shakespeareCss shakespeareJs strictConcurrency text time - transformers transformersBase vector wai waiExtra + cookie dataObject dataObjectYaml enumerator failure fastLogger + hamlet httpTypes monadControl parsec pathPieces random shakespeare + shakespeareCss shakespeareI18n shakespeareJs text time transformers + transformersBase vector wai waiExtra waiLogger ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 7ed924fb07b..2f384e2e878 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "0.3.4"; - sha256 = "05hvffzhwb6x6cmpvpf60hbzm4lvn7gp47rvspm5k6y6d999az3l"; + version = "0.3.4.2"; + sha256 = "1ahkbycxvjh1yvxfbf8wg6mlklmwm8hmy15x0b07g2xq7h1jmc5i"; buildDepends = [ blazeBuilder blazeHtml dataDefault emailValidate hamlet network persistent shakespeareCss shakespeareJs text time transformers wai diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix index 167ead39dd5..379d7319b12 100644 --- a/pkgs/development/libraries/haskell/yesod-json/default.nix +++ b/pkgs/development/libraries/haskell/yesod-json/default.nix @@ -1,13 +1,14 @@ -{ cabal, aeson, shakespeareJs, text, unorderedContainers, vector -, yesodCore +{ cabal, aeson, attoparsecEnumerator, blazeBuilder, shakespeareJs +, text, transformers, unorderedContainers, vector, yesodCore }: cabal.mkDerivation (self: { pname = "yesod-json"; - version = "0.2.2.1"; - sha256 = "16l5ygj9xsg2lzw3mkn1kmq543n9w5z1g6lyl8nw5bblp66lfxq3"; + version = "0.2.3"; + sha256 = "0bd75zzxqrarqk8b2v515jv0zbi5x27fmb9cbj3g57l9ig57lqy5"; buildDepends = [ - aeson shakespeareJs text unorderedContainers vector yesodCore + aeson attoparsecEnumerator blazeBuilder shakespeareJs text + transformers unorderedContainers vector yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index 65cb5493181..46f989c53a5 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-static"; - version = "0.3.2"; - sha256 = "0m0fws0bwhf1cyw1a3cg85mhdjr9pv35a39671jsqkkvmmxiixlf"; + version = "0.3.2.1"; + sha256 = "0gggavj5bxb12axlfl8kmqizgg55nmcrr6z5za60n3bp70sq4vn4"; buildDepends = [ base64Bytestring cereal enumerator fileEmbed httpTypes pureMD5 text transformers unixCompat wai waiAppStatic yesodCore diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index ecd7dc012aa..ab0bc9f89dd 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "0.9.3.4"; - sha256 = "1iw6qf1dywss8w4ig3dr04cyi01jq9frvmkbqgj5jq8v11y55x6v"; + version = "0.9.4.1"; + sha256 = "0dcd4m91liash046i0qaq51s447sl4fn55gsg7mi807lffik436q"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix index b456c1d81a0..f7c6a81d188 100644 --- a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix +++ b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "zeromq-haskell"; - version = "0.8.1"; - sha256 = "19fl3nd548yj6d6c3jqr6lxk6y033qa68jgnc5aq5w8kmlpn70mc"; + version = "0.8.2"; + sha256 = "0wi3s3ygxd15jbj5bpq6xvrsjsm94hhj6na8r45j241j0cgr322x"; extraLibraries = [ zeromq ]; meta = { homepage = "http://github.com/twittner/zeromq-haskell/"; - description = "bindings to zeromq"; + description = "Bindings to ZeroMQ 2.1.x"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ diff --git a/pkgs/development/libraries/haskell/zipper/default.nix b/pkgs/development/libraries/haskell/zipper/default.nix index 4cfca3bf1a3..c36def2683c 100644 --- a/pkgs/development/libraries/haskell/zipper/default.nix +++ b/pkgs/development/libraries/haskell/zipper/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "zipper"; - version = "0.3.1"; - sha256 = "170qjc3mbk6i96z5js745ix57i0xkgpa5h9xjiiirq9x6bfbbqyp"; + version = "0.4.1"; + sha256 = "19xgvqznf200akzf19mp40fg75c0gzpp38wq3n671nm90r08lgvi"; buildDepends = [ multirec ]; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix new file mode 100644 index 00000000000..306475a81b4 --- /dev/null +++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix @@ -0,0 +1,18 @@ +{ cabal, conduit, transformers, zlibBindings }: + +cabal.mkDerivation (self: { + pname = "zlib-conduit"; + version = "0.0.0"; + sha256 = "1nqcw809xqlycggn4nqys205gv3kjwws16910xlx2b8b9f8ayxjg"; + buildDepends = [ conduit transformers zlibBindings ]; + meta = { + homepage = "http://github.com/snoyberg/conduit"; + description = "Streaming compression/decompression via conduits"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix index 3c138cca416..4c12880f557 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/default.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, qt4, cmake, doxygen }: +{ stdenv, fetchurl, qt4, cmake }: let baseName = "libdbusmenu-qt"; - v = "0.8.3"; + v = "0.9.0"; in stdenv.mkDerivation rec { @@ -10,10 +10,13 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://launchpad.net/${baseName}/trunk/${v}/+download/${name}.tar.bz2"; - sha256 = "1fkw6wpxjmmx4p8779z662qphip3pgdcsn6cyb0frryfj4sa32ka"; + sha256 = "0xdicb3fmwgbyhc6cpcmdkwysdg18m5rcqc3izpwv6brq4aq4787"; }; - buildInputs = [ cmake qt4 doxygen ]; + buildInputs = [ qt4 ]; + buildNativeInputs = [ cmake ]; + + cmakeFlags = "-DWITH_DOC=OFF"; meta = with stdenv.lib; { description = "Provides a Qt implementation of the DBusMenu spec"; diff --git a/pkgs/development/libraries/libev/src-for-default.nix b/pkgs/development/libraries/libev/src-for-default.nix index c7b37ce1891..52c8e65bc4f 100644 --- a/pkgs/development/libraries/libev/src-for-default.nix +++ b/pkgs/development/libraries/libev/src-for-default.nix @@ -1,8 +1,8 @@ rec { - advertisedUrl="http://dist.schmorp.de/libev/Attic/libev-3.8.tar.gz"; - version = "3.8"; - url="http://dist.schmorp.de/libev/Attic/libev-3.8.tar.gz"; - hash = "1512n6c5q9ykqmk5zbwyb1na9qb9shd900kf4xhl5g07aypm7qr5"; - name = "libev-3.8"; + advertisedUrl="http://dist.schmorp.de/libev/Attic/libev-4.04.tar.gz"; + version = "4.04"; + url="http://dist.schmorp.de/libev/Attic/libev-4.04.tar.gz"; + hash = "ab3a09e967e3b868055cd9363fd236aa093f8643d19cc7042e90e0dfe905b012"; + name = "libev-4.04"; } diff --git a/pkgs/development/libraries/polkit-qt-1/default.nix b/pkgs/development/libraries/polkit-qt-1/default.nix index 008a75cff67..0c1a0a79584 100644 --- a/pkgs/development/libraries/polkit-qt-1/default.nix +++ b/pkgs/development/libraries/polkit-qt-1/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, cmake, qt4, pkgconfig, polkit, automoc4, glib }: stdenv.mkDerivation rec { - name = "polkit-qt-1-0.99.0"; + name = "polkit-qt-1-0.103.0"; src = fetchurl { url = "mirror://kde/stable/apps/KDE4.x/admin/${name}.tar.bz2"; - sha256 = "02m710q34aapbmnz1p6qwgkk5xjmm239zdl3lvjg77dh3j0w5i3r"; + sha256 = "0k17sb70ywk94dmncnkyig03sg1hcfbhi5wlc77xf3rxirmmccif"; }; patches = [ ./polkit-install.patch ]; - buildInputs = [ cmake qt4 automoc4 ]; - - propagatedBuildInputs = [ polkit glib ]; + buildNativeInputs = [ cmake automoc4 ]; + + propagatedBuildInputs = [ polkit glib qt4 ]; meta = { description = "A Qt wrapper around PolKit"; diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix index 82fa564fa01..03f917daa23 100644 --- a/pkgs/development/libraries/popt/default.nix +++ b/pkgs/development/libraries/popt/default.nix @@ -1,10 +1,14 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "popt-1.15"; +stdenv.mkDerivation rec { + name = "popt-1.16"; src = fetchurl { - url = http://rpm5.org/files/popt/popt-1.15.tar.gz; - sha256 = "1wqbcimg4zlfp7261i89s1918a46fjfbvq1a4ij4a6prk27576q6"; + url = "http://rpm5.org/files/popt/${name}.tar.gz"; + sha256 = "1j2c61nn2n351nhj4d25mnf3vpiddcykq005w2h6kw79dwlysa77"; + }; + + meta = { + description = "command line option parsing library"; }; } diff --git a/pkgs/development/libraries/protobuf/2.2.0.nix b/pkgs/development/libraries/protobuf/2.2.0.nix deleted file mode 100644 index c9419367fd6..00000000000 --- a/pkgs/development/libraries/protobuf/2.2.0.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ fetchurl, stdenv, zlib }: - -stdenv.mkDerivation rec { - name = "protobuf-2.2.0"; - - src = fetchurl { - url = "http://protobuf.googlecode.com/files/${name}.tar.bz2"; - sha256 = "0jvj7i0fifl4fqjf84f67chb9b6q2z1jqkfc1zic9fz035mzn7bk"; - }; - - buildInputs = [ zlib ]; - - doCheck = true; - - meta = { - description = "Protocol Buffers - Google's data interchange format"; - - longDescription = - '' Protocol Buffers are a way of encoding structured data in an - efficient yet extensible format. Google uses Protocol Buffers for - almost all of its internal RPC protocols and file formats. - ''; - - license = "mBSD"; - - homepage = http://code.google.com/p/protobuf/; - }; -} diff --git a/pkgs/development/libraries/protobuf/default.nix b/pkgs/development/libraries/protobuf/default.nix index 05dabd23773..57dc58bdfa1 100644 --- a/pkgs/development/libraries/protobuf/default.nix +++ b/pkgs/development/libraries/protobuf/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, zlib }: stdenv.mkDerivation rec { - name = "protobuf-2.3.0"; + name = "protobuf-2.4.1"; src = fetchurl { url = "http://protobuf.googlecode.com/files/${name}.tar.bz2"; - sha256 = "1b40cb7ij4bnw78k46y0a2jkm8qisxkk1gbbj40yi77yqc3pf33n"; + sha256 = "1gxhfhk37jyjq1z4y3d4bz4i1fk2an5ydhk5kjzlp0rhfcs5516g"; }; buildInputs = [ zlib ]; diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix new file mode 100644 index 00000000000..dfaf63e6725 --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -0,0 +1,110 @@ +{ stdenv, fetchurl, substituteAll +, alsaLib, gstreamer, gstPluginsBase +, libXrender, libXinerama, libXcursor, libXmu , libXv, libXext +, libXfixes, libXrandr, libSM, freetype, fontconfig +, zlib, libjpeg, libpng, libmng, which, mesa, openssl, dbus, cups, pkgconfig +, libtiff, glib, icu +, mysql, postgresql, sqlite +, perl, coreutils, libXi +, flashplayerFix ? true, gdk_pixbuf +, gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs +}: + +let + v = "4.8.0"; +in + +# TODO: +# * move some plugins (e.g., SQL plugins) to dedicated derivations to avoid +# false build-time dependencies + +stdenv.mkDerivation rec { + name = "qt-${v}"; + + src = fetchurl { + url = "ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${v}.tar.gz"; + sha256 = "0vhb6bysjqz8l0dygg2yypm4frsggma2g9877rdgf5ay917bg4lk"; + }; + + patches = [ ( substituteAll { + src = ./dlopen-absolute-paths.diff; + inherit cups icu libXfixes; + glibc = stdenv.gcc.libc; + }) + ] ++ stdenv.lib.optional gtkStyle ( + substituteAll { + src = ./dlopen-gtkstyle.diff; + # substituteAll ignores env vars starting with capital letter + gconf = GConf; + inherit gnome_vfs libgnomeui gtk; + } + ) ++ stdenv.lib.optional flashplayerFix ( + substituteAll { + src = ./dlopen-webkit-nsplugin.diff; + inherit gtk gdk_pixbuf; + } + ); + + preConfigure = + '' + export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH" + configureFlags+=" + -docdir $out/share/doc/${name} + -plugindir $out/lib/qt4/plugins + -importdir $out/lib/qt4/imports + -examplesdir $out/share/doc/${name}/examples + -demosdir $out/share/doc/${name}/demos + -datadir $out/share/${name} + -translationdir $out/share/${name}/translations + " + ''; + + configureFlags = + '' + -v -no-separate-debug-info -release -no-fast -confirm-license -opensource + + -opengl -xrender -xrandr -xinerama -xcursor -xinput -xfixes -fontconfig + -qdbus -cups -glib -dbus-linked -openssl-linked + + -plugin-sql-mysql -system-sqlite + + -exceptions -xmlpatterns + + -make libs -make tools -make translations + -nomake demos -nomake examples -nomake docs + + -no-phonon -webkit -multimedia -audio-backend + ''; + + propagatedBuildInputs = + [ libXrender libXrandr libXinerama libXcursor libXext libXfixes + libXv libXi libSM mesa + alsaLib zlib libpng openssl dbus.libs freetype fontconfig glib + gstreamer gstPluginsBase + ]; + + # The following libraries are only used in plugins + buildInputs = [ cups # Qt dlopen's libcups instead of linking to it + mysql postgresql sqlite libjpeg libmng libtiff icu ] + ++ stdenv.lib.optionals gtkStyle [ gtk gdk_pixbuf ]; + + buildNativeInputs = [ perl pkgconfig which ]; + + prefixKey = "-prefix "; + + prePatch = '' + substituteInPlace configure --replace /bin/pwd pwd + substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls + sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i mkspecs/*/*.conf + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://qt.nokia.com/products; + description = "A cross-platform application framework for C++"; + license = "GPL/LGPL"; + maintainers = with maintainers; [ urkud sander ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff b/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff new file mode 100644 index 00000000000..9823d649365 --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff @@ -0,0 +1,64 @@ +--- a/src/gui/painting/qcups.cpp 2011-12-08 09:06:02.000000000 +0400 ++++ b/src/gui/painting/qcups.cpp 2011-12-18 12:17:07.000000000 +0400 +@@ -87,7 +87,7 @@ + + static void resolveCups() + { +- QLibrary cupsLib(QLatin1String("cups"), 2); ++ QLibrary cupsLib(QLatin1String("@cups@/lib/libcups"), 2); + if(cupsLib.load()) { + _cupsGetDests = (CupsGetDests) cupsLib.resolve("cupsGetDests"); + _cupsFreeDests = (CupsFreeDests) cupsLib.resolve("cupsFreeDests"); +--- a/src/gui/painting/qprinterinfo_unix.cpp 2011-12-08 09:06:02.000000000 +0400 ++++ b/src/gui/painting/qprinterinfo_unix.cpp 2011-12-23 16:22:15.000000000 +0400 +@@ -454,7 +454,7 @@ + char *domain; + int err; + +- QLibrary lib(QLatin1String("nsl")); ++ QLibrary lib(QLatin1String("@glibc@/lib/libnsl")); + typedef int (*ypGetDefaultDomain)(char **); + ypGetDefaultDomain _ypGetDefaultDomain = (ypGetDefaultDomain)lib.resolve("yp_get_default_domain"); + typedef int (*ypAll)(const char *, const char *, const struct ypall_callback *); +--- a/src/network/kernel/qhostinfo_unix.cpp 2011-12-23 16:26:07.000000000 +0400 ++++ b/src/network/kernel/qhostinfo_unix.cpp 2011-12-23 16:25:55.000000000 +0400 +@@ -95,7 +95,7 @@ + static void resolveLibrary() + { + #ifndef QT_NO_LIBRARY +- QLibrary lib(QLatin1String("resolv")); ++ QLibrary lib(QLatin1String("@glibc@/lib/libresolv")); + if (!lib.load()) + return; + +--- a/src/corelib/tools/qlocale_icu.cpp 2011-12-08 09:06:03.000000000 +0400 ++++ b/src/corelib/tools/qlocale_icu.cpp 2011-12-23 16:29:15.000000000 +0400 +@@ -81,7 +81,7 @@ + if (status == NotLoaded) { + + // resolve libicui18n +- QLibrary lib(QLatin1String("icui18n"), QLatin1String(U_ICU_VERSION_SHORT)); ++ QLibrary lib(QLatin1String("@icu@/lib/libicui18n"), QLatin1String(U_ICU_VERSION_SHORT)); + if (!lib.load()) { + qWarning() << "Unable to load library icui18n" << lib.errorString(); + status = ErrorLoading; +@@ -110,7 +110,7 @@ + } + + // resolve libicuuc +- QLibrary ucLib(QLatin1String("icuuc"), QLatin1String(U_ICU_VERSION_SHORT)); ++ QLibrary ucLib(QLatin1String("@icu@/lib/libicuuc"), QLatin1String(U_ICU_VERSION_SHORT)); + if (!ucLib.load()) { + qWarning() << "Unable to load library icuuc" << ucLib.errorString(); + status = ErrorLoading; +--- a/src/plugins/platforms/xlib/qxlibstatic.cpp 2011-12-08 09:06:02.000000000 +0400 ++++ b/src/plugins/platforms/xlib/qxlibstatic.cpp 2011-12-23 20:38:49.000000000 +0400 +@@ -242,7 +242,7 @@ + } + + # define XFIXES_LOAD_RUNTIME(vernum, symbol, symbol_type) \ +- (symbol_type)qt_load_library_runtime("libXfixes", vernum, 4, #symbol); ++ (symbol_type)qt_load_library_runtime("@libXfixes@/lib/libXfixes", vernum, 4, #symbol); + # define XFIXES_LOAD_V1(symbol) \ + XFIXES_LOAD_RUNTIME(1, symbol, Ptr##symbol) + # define XFIXES_LOAD_V2(symbol) \ diff --git a/pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff b/pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff new file mode 100644 index 00000000000..522676a2b31 --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff @@ -0,0 +1,35 @@ +--- a/src/gui/styles/qgtkstyle_p.cpp 2011-12-08 09:06:02.000000000 +0400 ++++ b/src/gui/styles/qgtkstyle_p.cpp 2011-12-24 17:56:46.000000000 +0400 +@@ -312,7 +312,7 @@ + void QGtkStylePrivate::resolveGtk() const + { + // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0 +- QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0); ++ QLibrary libgtk(QLS("@gtk@/lib/libgtk-x11-2.0"), 0, 0); + + gtk_init = (Ptr_gtk_init)libgtk.resolve("gtk_init"); + gtk_window_new = (Ptr_gtk_window_new)libgtk.resolve("gtk_window_new"); +@@ -434,8 +434,8 @@ + pango_font_description_get_family = (Ptr_pango_font_description_get_family)libgtk.resolve("pango_font_description_get_family"); + pango_font_description_get_style = (Ptr_pango_font_description_get_style)libgtk.resolve("pango_font_description_get_style"); + +- gnome_icon_lookup_sync = (Ptr_gnome_icon_lookup_sync)QLibrary::resolve(QLS("gnomeui-2"), 0, "gnome_icon_lookup_sync"); +- gnome_vfs_init= (Ptr_gnome_vfs_init)QLibrary::resolve(QLS("gnomevfs-2"), 0, "gnome_vfs_init"); ++ gnome_icon_lookup_sync = (Ptr_gnome_icon_lookup_sync)QLibrary::resolve(QLS("@libgnomeui@/lib/libgnomeui-2"), 0, "gnome_icon_lookup_sync"); ++ gnome_vfs_init= (Ptr_gnome_vfs_init)QLibrary::resolve(QLS("@gnome_vfs@/lib/libgnomevfs-2"), 0, "gnome_vfs_init"); + } + + /* \internal +@@ -607,9 +607,9 @@ + static bool resolveGConf() + { + if (!QGtkStylePrivate::gconf_client_get_default) { +- QGtkStylePrivate::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_default"); +- QGtkStylePrivate::gconf_client_get_string = (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_string"); +- QGtkStylePrivate::gconf_client_get_bool = (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_bool"); ++ QGtkStylePrivate::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_default"); ++ QGtkStylePrivate::gconf_client_get_string = (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_string"); ++ QGtkStylePrivate::gconf_client_get_bool = (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_bool"); + } + return (QGtkStylePrivate::gconf_client_get_default !=0); + } diff --git a/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff b/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff new file mode 100644 index 00000000000..14199d40503 --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/dlopen-webkit-nsplugin.diff @@ -0,0 +1,52 @@ +diff --git a/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp +index 19941d6..0ec15e2 100644 +--- a/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp ++++ b/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp +@@ -121,7 +121,7 @@ static void initializeGtk(QLibrary* module = 0) + } + } + +- QLibrary library(QLatin1String("libgtk-x11-2.0.so.0")); ++ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); + if (library.load()) { + typedef void *(*gtk_init_check_ptr)(int*, char***); + gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check"); +diff --git a/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp b/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp +index 2fe69d1..b658e4a 100644 +--- a/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp ++++ b/src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp +@@ -857,7 +857,7 @@ static Display *getPluginDisplay() + // support gdk based plugins (like flash) that use a different X connection. + // The code below has the same effect as this one: + // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); +- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); ++ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0); + if (!library.load()) + return 0; + +diff --git a/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp b/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp +index 2c9b465..56b3074 100644 +--- a/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp ++++ b/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp +@@ -42,7 +42,7 @@ namespace WebKit { + #if PLATFORM(QT) + static void initializeGTK() + { +- QLibrary library(QLatin1String("libgtk-x11-2.0.so.0")); ++ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); + if (library.load()) { + typedef void *(*gtk_init_check_ptr)(int*, char***); + gtk_init_check_ptr gtkInitCheck = reinterpret_cast(library.resolve("gtk_init_check")); +diff --git a/src/3rdparty/webkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/src/3rdparty/webkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp +index b8c8f2a..e7f4dc5 100644 +--- a/src/3rdparty/webkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp ++++ b/src/3rdparty/webkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp +@@ -54,7 +54,7 @@ static Display *getPluginDisplay() + // The code below has the same effect as this one: + // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); + +- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); ++ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0); + if (!library.load()) + return 0; + diff --git a/pkgs/development/libraries/soprano/default.nix b/pkgs/development/libraries/soprano/default.nix index 49e6e6b96df..40fd36840fd 100644 --- a/pkgs/development/libraries/soprano/default.nix +++ b/pkgs/development/libraries/soprano/default.nix @@ -1,26 +1,20 @@ -{ stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc }: +{ stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc +, pkgconfig }: stdenv.mkDerivation rec { - name = "soprano-2.7.0"; + name = "soprano-2.7.4"; src = fetchurl { url = "mirror://sourceforge/soprano/${name}.tar.bz2"; - sha256 = "1ki92wg0i9nhn1fh5mdcls5h9h3lf2k5r66snsags4x7zw0dmv2z"; + sha256 = "0f6kg39bi4h4iblfs9ny88cs951sigm50yr6w50afc3f1nqzdmhp"; }; - patches = - [ (fetchurl { # Applied upstream, remove if upgrading - url = https://git.reviewboard.kde.org/r/102466/diff/raw/; - name = "soprano-virtuoso-restart.patch"; - sha256 = "0jk038fp7ii6847mbxdajhhc7f6ap6lriaklxcqqxf6ddj37gf3y"; - }) - ./find-virtuoso.patch - ]; + patches = [ ./find-virtuoso.patch ]; # We disable the Java backend, since we do not need them and they make the closure size much bigger buildInputs = [ qt4 clucene_core librdf_redland libiodbc ]; - buildNativeInputs = [ cmake ]; + buildNativeInputs = [ cmake pkgconfig ]; meta = { homepage = http://soprano.sourceforge.net/; diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix index d989c4059e6..2683a01a290 100644 --- a/pkgs/development/libraries/startup-notification/default.nix +++ b/pkgs/development/libraries/startup-notification/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, libX11, libxcb, pkgconfig, xcbutil}: let - version = "0.10"; + version = "0.12"; in stdenv.mkDerivation { name = "libstartup-notification-${version}"; src = fetchurl { url = "http://www.freedesktop.org/software/startup-notification/releases/startup-notification-${version}.tar.gz"; - sha256 = "0nalaay0yj3gq85insp9l31hsv5zp390m4nn37y235v151ffpfv4"; + sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a"; }; buildInputs = [ libX11 libxcb pkgconfig xcbutil ]; diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix index 1888ef2aab6..6d7212f5c5c 100644 --- a/pkgs/development/libraries/strigi/default.nix +++ b/pkgs/development/libraries/strigi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, qt4, perl, bzip2, libxml2, exiv2 -, clucene_core, fam, zlib, dbus_tools +, clucene_core, fam, zlib, dbus_tools, pkgconfig }: stdenv.mkDerivation rec { @@ -16,7 +16,9 @@ stdenv.mkDerivation rec { CLUCENE_HOME = clucene_core; buildInputs = - [ cmake perl zlib bzip2 stdenv.gcc.libc libxml2 qt4 exiv2 clucene_core fam dbus_tools ]; + [ zlib bzip2 stdenv.gcc.libc libxml2 qt4 exiv2 clucene_core fam dbus_tools ]; + + buildNativeInputs = [ cmake pkgconfig perl ]; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/pil/default.nix b/pkgs/development/python-modules/pil/default.nix index e4586762527..4cf4576c0ce 100644 --- a/pkgs/development/python-modules/pil/default.nix +++ b/pkgs/development/python-modules/pil/default.nix @@ -1,41 +1,41 @@ -{ fetchurl, stdenv, python -, libjpeg, zlib, freetype }: +{ fetchurl, stdenv, python, libjpeg, zlib, freetype }: -let version = "1.1.6"; -in - stdenv.mkDerivation { - name = "python-imaging-${version}"; - src = fetchurl { - url = "http://effbot.org/downloads/Imaging-${version}.tar.gz"; - sha256 = "141zidl3s9v4vfi3nsbg42iq1lc2a932gprqr1kij5hrnn53bmvx"; - }; +let version = "1.1.7"; in - buildInputs = [ python libjpeg zlib freetype ]; +stdenv.mkDerivation { + name = "python-imaging-${version}"; + + src = fetchurl { + url = "http://effbot.org/downloads/Imaging-${version}.tar.gz"; + sha256 = "04aj80jhfbmxqzvmq40zfi4z3cw6vi01m3wkk6diz3lc971cfnw9"; + }; - doCheck = true; + buildInputs = [ python libjpeg zlib freetype ]; - configurePhase = '' - sed -i "setup.py" \ - -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = libinclude("${freetype}")|g ; - s|^JPEG_ROOT =.*$|JPEG_ROOT = libinclude("${libjpeg}")|g ; - s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${zlib}")|g ;' + doCheck = true; + + configurePhase = '' + sed -i "setup.py" \ + -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = libinclude("${freetype}")|g ; + s|^JPEG_ROOT =.*$|JPEG_ROOT = libinclude("${libjpeg}")|g ; + s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${zlib}")|g ;' + ''; + + buildPhase = "python setup.py build_ext -i"; + checkPhase = "python selftest.py"; + installPhase = "python setup.py install --prefix=$out"; + + meta = { + homepage = http://www.pythonware.com/products/pil/; + description = "The Python Imaging Library (PIL)"; + + longDescription = '' + The Python Imaging Library (PIL) adds image processing + capabilities to your Python interpreter. This library + supports many file formats, and provides powerful image + processing and graphics capabilities. ''; - buildPhase = "python setup.py build_ext -i"; - checkPhase = "python selftest.py"; - installPhase = "python setup.py install --prefix=$out"; - - meta = { - homepage = http://www.pythonware.com/products/pil/; - description = "The Python Imaging Library (PIL)"; - - longDescription = '' - The Python Imaging Library (PIL) adds image processing - capabilities to your Python interpreter. This library - supports many file formats, and provides powerful image - processing and graphics capabilities. - ''; - - license = "http://www.pythonware.com/products/pil/license.htm"; - }; - } + license = "http://www.pythonware.com/products/pil/license.htm"; + }; +} diff --git a/pkgs/development/python-modules/pyside/apiextractor.nix b/pkgs/development/python-modules/pyside/apiextractor.nix new file mode 100644 index 00000000000..107bb08759f --- /dev/null +++ b/pkgs/development/python-modules/pyside/apiextractor.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchgit, cmake, libxml2, libxslt, python27Packages, qt4 }: + +stdenv.mkDerivation { + name = "pyside-apiextractor-0.10.7-6-gdcb1195"; + + src = fetchgit { + url = "git://github.com/PySide/Apiextractor.git"; + rev = "dcb11958cabe518630f9f2d2bebd9f8711c2b15b"; + sha256 = "d7b6cb16d11b6134de17a15635d0b5ad7460d31d7870cafe23a690141b9a2274"; + }; + + enableParallelBuilding = true; + + buildInputs = [ cmake libxml2 libxslt python27Packages.sphinx qt4 ]; + + meta = { + description = "Eases the development of bindings of Qt-based libraries for high level languages by automating most of the process"; + license = stdenv.lib.licenses.gpl2; + homepage = "http://www.pyside.org/docs/apiextractor/"; + maintainers = [ stdenv.lib.maintainers.chaoflow ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix new file mode 100644 index 00000000000..791d5e83d3c --- /dev/null +++ b/pkgs/development/python-modules/pyside/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchgit, cmake, pysideGeneratorrunner, pysideShiboken, qt4 }: + +stdenv.mkDerivation { + name = "pyside-1.0.9"; + + src = fetchgit { + url = "git://github.com/PySide/PySide.git"; + rev = "4e47b3284fd8715b68342e755cd06ba02b1df0de"; + sha256 = "1fd302e78c5dea8a9c312bd493c04240f2383517ee745d9df2b070f15f0ab515"; + }; + + enableParallelBuilding = true; + + buildInputs = [ cmake pysideGeneratorrunner pysideShiboken qt4 ]; + + makeFlags = "QT_PLUGIN_PATH=" + pysideShiboken + "/lib/generatorrunner"; + + meta = { + description = "LGPL-licensed Python bindings for the Qt cross-platform application and UI framework."; + license = stdenv.lib.licenses.lgpl21; + homepage = "http://www.pyside.org"; + maintainers = [ stdenv.lib.maintainers.chaoflow ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix new file mode 100644 index 00000000000..afb258cec70 --- /dev/null +++ b/pkgs/development/python-modules/pyside/generatorrunner.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchgit, cmake, pysideApiextractor, python27Packages, qt4 }: + +stdenv.mkDerivation { + name = "pyside-generatorrunner-0.6.13-9-g567ca6e"; + + src = fetchgit { + url = "git://github.com/PySide/Generatorrunner.git"; + rev = "567ca6effaecdf97b33d1d13eada23bafe0f7535"; + sha256 = "182aba79af9fc865337f4befc96faf3eaca1ab9bcb902a57e0a68af49f071c74"; + }; + + enableParallelBuilding = true; + + buildInputs = [ cmake pysideApiextractor python27Packages.sphinx qt4 ]; + + meta = { + description = "Eases the development of binding generators for C++ and Qt-based libraries by providing a framework to help automating most of the process"; + license = stdenv.lib.licenses.gpl2; + homepage = "http://www.pyside.org/docs/generatorrunner/"; + maintainers = [ stdenv.lib.maintainers.chaoflow ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix new file mode 100644 index 00000000000..d8ef2d7b52f --- /dev/null +++ b/pkgs/development/python-modules/pyside/shiboken.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchgit, cmake, pysideApiextractor, pysideGeneratorrunner, python27, python27Packages, qt4 }: + +stdenv.mkDerivation { + name = "pyside-shiboken-1.0.7-73-g9f110f8"; + + src = fetchgit { + url = "git://github.com/PySide/Shiboken.git"; + rev = "9f110f83c213867e15b0141a802ebbf74f2ed9f7"; + sha256 = "4618ed113fb20840fd9acb7d08460eb257f630cbca6d61113c16549a6bb651cd"; + }; + + enableParallelBuilding = true; + + buildInputs = [ cmake pysideApiextractor pysideGeneratorrunner python27 python27Packages.sphinx qt4 ]; + + preConfigure = '' + echo "preConfigure: Fixing shiboken_generator install target." + substituteInPlace generator/CMakeLists.txt --replace \ + \"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/ + ''; + + meta = { + description = "Plugin (front-end) for pyside-generatorrunner, that generates bindings for C++ libraries using CPython source code"; + license = stdenv.lib.licenses.gpl2; + homepage = "http://www.pyside.org/docs/shiboken/"; + maintainers = [ stdenv.lib.maintainers.chaoflow ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix new file mode 100644 index 00000000000..0b5e6851761 --- /dev/null +++ b/pkgs/development/python-modules/pyside/tools.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchgit, cmake, pyside, python27, qt4, pysideShiboken }: + +stdenv.mkDerivation { + name = "pyside-tools-0.2.13"; + + src = fetchgit { + url = "git://github.com/PySide/Tools.git"; + rev = "23e0712360442e50f34be0d6e4651b8c4c806d47"; + sha256 = "68f059e4936fb8dfae6aa3a463db8c28adcb7bd050b29e8b6fef82431f72da07"; + }; + + enableParallelBuilding = true; + + buildInputs = [ cmake pyside python27 qt4 pysideShiboken ]; + + meta = { + description = "Tools for pyside, the LGPL-licensed Python bindings for the Qt cross-platform application and UI framework."; + license = stdenv.lib.licenses.gpl2; + homepage = "http://www.pyside.org"; + maintainers = [ stdenv.lib.maintainers.chaoflow ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index c8753ea367b..1b98d7821e5 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.21"; - sha256 = "00gsayb7axxm8z9jrngckb7c666x1kibvln67g2rpchi6djg6wn7"; + version = "1.23"; + sha256 = "1rnvnzwb4n89hq4wpyq1h6x773r7y23clqj5slsfnas7j3alzz8c"; isLibrary = false; isExecutable = true; buildDepends = [ hackageDb HTTP mtl nixosTypes regexPosix ]; diff --git a/pkgs/development/tools/haskell/uuagc/bootstrap.nix b/pkgs/development/tools/haskell/uuagc/bootstrap.nix index 2110f258229..c50391efd4e 100644 --- a/pkgs/development/tools/haskell/uuagc/bootstrap.nix +++ b/pkgs/development/tools/haskell/uuagc/bootstrap.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uuagc-bootstrap"; - version = "0.9.39.1.0"; - sha256 = "06w330j0nds5piv1rr3m6m1idnf0c5swfk9qwdqzi0pmpws6lpkj"; + version = "0.9.40.2"; + sha256 = "0zsb8pz2zx7y8sjp392hpdk30dzzmppjizcnlgd1wvq2csacnfxq"; isLibrary = true; isExecutable = true; buildDepends = [ haskellSrcExts mtl uulib ]; diff --git a/pkgs/development/tools/haskell/uuagc/cabal.nix b/pkgs/development/tools/haskell/uuagc/cabal.nix index 70c0a8e9931..9a0ae50fc9a 100644 --- a/pkgs/development/tools/haskell/uuagc/cabal.nix +++ b/pkgs/development/tools/haskell/uuagc/cabal.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uuagc-cabal"; - version = "1.0.0.10"; - sha256 = "0dqj5nqq8qpylbxyv8cpy3rrnna9yqb4dnxxk7sgyhw6yvz48l56"; + version = "1.0.2.0"; + sha256 = "0nvnyc6c1611rziglpp0ywqkgg9sgfi9ph33ya33k5zv3jxxh1q0"; buildDepends = [ mtl uulib ]; meta = { homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; diff --git a/pkgs/development/tools/haskell/uuagc/default.nix b/pkgs/development/tools/haskell/uuagc/default.nix index 417f430ba9b..6a662055df4 100644 --- a/pkgs/development/tools/haskell/uuagc/default.nix +++ b/pkgs/development/tools/haskell/uuagc/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uuagc"; - version = "0.9.39.1"; - sha256 = "0zqhwpafq51czy97z0f93cbxd8k6hllnmb24a6yzr4y6kzzv65hd"; + version = "0.9.40.2"; + sha256 = "1qc5sqm2lqysm5rplzc229rfw5750w4z8b7cgxaid7jjv4csrbf8"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/games/beret/default.nix b/pkgs/games/beret/default.nix new file mode 100644 index 00000000000..e41e88fc1b0 --- /dev/null +++ b/pkgs/games/beret/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, SDL, SDL_image, SDL_ttf, SDL_mixer }: + +stdenv.mkDerivation { + name = "beret-1.2.0"; + + buildInputs = [ SDL SDL_image SDL_ttf SDL_mixer ]; + + NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL"; + + NIX_CFLAGS_LINK = "-lgcc_s"; + + patches = [ ./use-home-dir.patch ]; + + postPatch = '' + sed -i 's@RESOURCE_PATH ""@RESOURCE_PATH "'$out'/share/"@' game.c + ''; + + src = fetchurl { + url = https://gitorious.org/beret/beret/archive-tarball/ae029777; + name = "beret-1.2.0.tar.gz"; + sha256 = "0md00ipacvz5mq8q83h7xbzycnwympr06pc1n5c351swjvyw0ysx"; + }; + + installPhase = '' + ensureDir $out/bin + install -v -m755 beret $out/bin + ensureDir $out/share + cp -av tahoma.ttf images music rooms sfx $out/share + ''; + + meta = { + description = "A 2D puzzle-platformer game about a scientist with telekinetic abilities"; + homepage = http://kiwisauce.com/beret/; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.lgpl2; + }; +} + diff --git a/pkgs/games/beret/use-home-dir.patch b/pkgs/games/beret/use-home-dir.patch new file mode 100644 index 00000000000..c8597a0303b --- /dev/null +++ b/pkgs/games/beret/use-home-dir.patch @@ -0,0 +1,48 @@ +diff -Naur beret-beret-orig/game.c beret-beret/game.c +--- beret-beret-orig/game.c 2011-12-17 18:51:32.000000000 -0500 ++++ beret-beret/game.c 2011-12-21 13:16:37.047511020 -0500 +@@ -10,12 +10,10 @@ + #include + #include + #include +-#ifdef __APPLE__ + #include + #include + #include + #include +-#endif + + #define CAMSCROLL 15 + #define SCR_WIDTH 780 +@@ -88,12 +86,8 @@ + #define DIRSEP "/" + #endif + +-#ifdef __APPLE__ +-#define SUPPORT_PATH "Library/Application Support/Beret/" +-#define RESOURCE_PATH "Beret.app/Contents/Resources/" +-#else ++#define SUPPORT_PATH ".beret" + #define RESOURCE_PATH "" +-#endif + + #define QUITMOD_WIN KMOD_ALT + #define QUITKEY_WIN SDLK_F4 +@@ -812,7 +806,6 @@ + + int init() { + +- #ifdef __APPLE__ + char filestr[512]; + // Get the home directory of the user. + struct passwd *pwd = getpwuid(getuid()); +@@ -827,9 +820,6 @@ + sprintf(filestr, "%s/saves", support_path); + mkdir(filestr, S_IRWXU); + } +- #else +- sprintf(support_path, ""); +- #endif + + if (SDL_Init(SDL_INIT_EVERYTHING) == -1) { + printf("Error: couldn't initialize SDL\n"); diff --git a/pkgs/misc/busybox/default.nix b/pkgs/misc/busybox/default.nix index f3a73514ed8..6ca30ddd96b 100644 --- a/pkgs/misc/busybox/default.nix +++ b/pkgs/misc/busybox/default.nix @@ -29,7 +29,7 @@ let nixConfig = '' CONFIG_PREFIX "$out" - CONFIG_INSTALL_NO_USR n + CONFIG_INSTALL_NO_USR y ''; staticConfig = (if enableStatic then '' @@ -58,12 +58,6 @@ stdenv.mkDerivation rec { make oldconfig ''; - postInstall = '' - mv -v $out/usr/bin/* $out/bin - mv -v $out/usr/sbin/* $out/sbin - rm -fRv $out/usr/ - ''; - crossAttrs = { extraCrossConfig = '' CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cross.config}-" diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix index 74db3a0d890..35bf57c269e 100644 --- a/pkgs/os-specific/linux/cpufrequtils/default.nix +++ b/pkgs/os-specific/linux/cpufrequtils/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, linuxHeaders, glibc, libtool, gettext}: +{ stdenv, fetchurl, libtool, gettext }: assert stdenv.isLinux && stdenv.system != "powerpc-linux"; @@ -16,5 +16,10 @@ stdenv.mkDerivation { -i Makefile ''; - buildInputs = [ linuxHeaders glibc libtool gettext ]; + buildInputs = [ stdenv.gcc.libc.kernelHeaders libtool gettext ]; + + meta = { + description = "Tools to display or change the CPU governor settings"; + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 765a49c6446..2b23dbe904f 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -1,25 +1,19 @@ -{stdenv, fetchurl, libuuid, popt, devicemapper, udev }: +{stdenv, fetchurl, devicemapper, libgcrypt, libuuid, pkgconfig, popt, udev }: -stdenv.mkDerivation { - name = "cryptsetup-1.0.6"; +stdenv.mkDerivation rec { + name = "cryptsetup-1.4.1"; src = fetchurl { - url = http://cryptsetup.googlecode.com/files/cryptsetup-1.0.6.tar.bz2; - sha256 = "df7fda80cfa01f063caf39140287a47d018dfe056fc71a3ba605e690ff0183fd"; + url = "http://cryptsetup.googlecode.com/files/${name}.tar.bz2"; + sha256 = "82b143328c2b427ef2b89fb76c701d311c95b54093c21bbf22342f7b393bddcb"; }; - configureFlags = [ "--enable-libdevmapper" ]; - - patchPhase = '' - sed -i -e 's@/sbin/udevsettle@${udev}/sbin/udevadm settle@' lib/libdevmapper.c - ''; - - buildInputs = [ libuuid popt devicemapper ]; + buildInputs = [ devicemapper libgcrypt libuuid pkgconfig popt ]; meta = { homepage = http://code.google.com/p/cryptsetup/; description = "LUKS for dm-crypt"; license = "GPLv2"; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with stdenv.lib.maintainers; [ viric chaoflow ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 0e3ace5c384..8a4fa9648b1 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -214,17 +214,18 @@ in import ./generic.nix ( rec { - version = "3.2-rc1"; + version = "3.2-rc7"; - modDirVersion = "3.2.0-rc1"; + modDirVersion = "3.2.0-rc7"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" ''; src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2"; - sha256 = "0pp79njklvjzzr4wpyymqhkiq0xgz1sgil5sjms2xj583jg8c4wm"; + #url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2"; + url = "mirror://kernel/linux/kernel/v3.0/testing/linux-${version}.tar.bz2"; + sha256 = "0phakj1c97n2fdz9lh5gmpg6c5g45z2xpgrz3q2z2y9w9dgk3mqd"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix new file mode 100644 index 00000000000..4cfbdd6e691 --- /dev/null +++ b/pkgs/os-specific/linux/lm-sensors/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, bison, flex, which, perl }: + +let version = "3.3.1"; in + +stdenv.mkDerivation rec { + name = "lm-sensors-3.3.1"; + + src = fetchurl { + url = "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${version}.tar.bz2"; + sha256 = "13v2gszagmx8hwjyzh2k47rdpc2kyg9zky3kdqhdbgzp8lwpik6g"; + }; + + buildInputs = [ bison flex which perl ]; + + preBuild = '' + makeFlagsArray=(PREFIX=$out ETCDIR=$out/etc) + ''; + + meta = { + homepage = http://www.lm-sensors.org/; + description = "Tools for reading hardware sensors"; + }; +} diff --git a/pkgs/os-specific/linux/lm_sensors/default.nix b/pkgs/os-specific/linux/lm_sensors/default.nix deleted file mode 100644 index f3957f41ead..00000000000 --- a/pkgs/os-specific/linux/lm_sensors/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{stdenv, fetchurl, bison, flex, perl}: - -stdenv.mkDerivation rec { - name = "lm_sensors-3.1.1"; - - src = fetchurl { - url = "http://dl.lm-sensors.org/lm-sensors/releases/${name}.tar.bz2"; - sha256 = "1vsrs2cl35h2gry03lp0pwbzpw0nbpsbpds5w4mdmx16clm3ynnr"; - }; - - buildInputs = [bison flex perl]; - - preBuild = '' - makeFlagsArray=(PREFIX=$out ETCDIR=$out/etc) - ''; - - meta = { - homepage = http://www.lm-sensors.org/; - description = "Tools for reading hardware sensors"; - }; -} diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy96.nix b/pkgs/os-specific/linux/nvidia-x11/legacy96.nix index 0d36013ffd2..a7ba4d5ca95 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy96.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy96.nix @@ -2,7 +2,7 @@ let - versionNumber = "96.43.19"; + versionNumber = "96.43.20"; in @@ -15,12 +15,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg0.run"; - sha256 = "1j7im9ra7nmm1hn11c1brvf895xibs49xrxkxcrsnmpa17l10n72"; + sha256 = "05vm36jnydp4cfdkfvrvxczd64i3f0pp0yp7dn8y8pklrxi80xxw"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-pkg0.run"; - sha256 = "1g8z36wz3ww1q6vjbypzwl0973vy0miz6rw2fd7v3a36yxl2gvn5"; + sha256 = "0a8ninp4wyql3xh6z93dzhbacvz7g0h8gs4pg5279a0i6h05wb1w"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; diff --git a/pkgs/os-specific/linux/procps/default.nix b/pkgs/os-specific/linux/procps/default.nix index dce0e36edb4..9c894256413 100644 --- a/pkgs/os-specific/linux/procps/default.nix +++ b/pkgs/os-specific/linux/procps/default.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation { makeFlags = "DESTDIR=$(out)"; + crossAttrs = { + CC = stdenv.cross.config + "-gcc"; + }; + meta = { homepage = http://procps.sourceforge.net/; description = "Utilities that give information about processes using the /proc filesystem"; diff --git a/pkgs/os-specific/linux/udisks/default.nix b/pkgs/os-specific/linux/udisks/default.nix index 17482f69899..191f34489a7 100644 --- a/pkgs/os-specific/linux/udisks/default.nix +++ b/pkgs/os-specific/linux/udisks/default.nix @@ -3,11 +3,11 @@ , libxslt, docbook_xsl, utillinux, automake, autoconf }: stdenv.mkDerivation rec { - name = "udisks-1.0.3"; + name = "udisks-1.0.4"; src = fetchurl { url = "http://hal.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "0jwavs2ag0cv46517j17943s16a8fw2lqk4k3cljgivh5aswwnyr"; + sha256 = "1xgqifddwaavmjc8c30i0mdffyirsld7c6qhfyjw7f9khwv8jjw5"; }; # Move 80-udisks.rules manually to make the patch smaller @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { patches = [ ./purity.patch ]; - buildInputs = [ sg3_utils udev glib dbus dbus_glib polkit parted lvm2 libatasmart intltool libuuid libxslt docbook_xsl @@ -26,7 +25,7 @@ stdenv.mkDerivation rec { buildNativeInputs = [ automake autoconf pkgconfig ]; - configureFlags = "--localstatedir=/var"; + configureFlags = "--localstatedir=/var --enable-lvm2"; preConfigure = '' diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 963a4f48d7a..32698ac4efb 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -4,11 +4,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "upower-0.9.13"; + name = "upower-0.9.15"; src = fetchurl { url = "http://upower.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "08jasjkp44ydvsnk020xghrshi0jspp5078id26n5nhidp1d4z9c"; + sha256 = "1313lr404hb29fzkf9frn1z0xxvibi451xmk05sf9kidyf01956m"; }; buildInputs = [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { --replace /usr/sbin/pm- ${pmutils}/sbin/pm- ''; - installFlags = "localstatedir=$(TMPDIR)/var"; + installFlags = "historydir=$(TMPDIR)/foo"; meta = { homepage = http://upower.freedesktop.org/; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index f25289a683a..17f0afadef4 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1148,11 +1148,51 @@ let })) // {inherit python ;}; xcbutil = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) { - name = "xcb-util-0.3.6"; + name = "xcb-util-0.3.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xcb/xcb-util-0.3.6.tar.bz2; - sha256 = "0mqfyq6skm19hhfmd5kmcn0v4di4pmbdszmbf2lmhn01mc8yxf7z"; + url = mirror://xorg/individual/xcb/xcb-util-0.3.8.tar.bz2; + sha256 = "1fa7njhg7dsqbrkwrzbkfszdp1dmggvlsrb05qshkg2h8wldkvn1"; + }; + buildInputs = [pkgconfig gperf m4 libxcb xproto ]; + })) // {inherit gperf m4 libxcb xproto ;}; + + xcbutilimage = (stdenv.mkDerivation ((if overrides ? xcbutilimage then overrides.xcbutilimage else x: x) { + name = "xcb-util-image-0.3.8"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/xcb/xcb-util-image-0.3.8.tar.bz2; + sha256 = "1nd67105lb8qfa7r2lli5sxnipi1p1wnbwa04l9k30kfq8l0afa0"; + }; + buildInputs = [pkgconfig gperf m4 libxcb xcbutil xproto ]; + })) // {inherit gperf m4 libxcb xcbutil xproto ;}; + + xcbutilkeysyms = (stdenv.mkDerivation ((if overrides ? xcbutilkeysyms then overrides.xcbutilkeysyms else x: x) { + name = "xcb-util-keysyms-0.3.8"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.8.tar.bz2; + sha256 = "08b1d19gaqv3agpkvh5mgcir11vjy89ywdknva0cb073mzvk4gci"; + }; + buildInputs = [pkgconfig gperf m4 libxcb xproto ]; + })) // {inherit gperf m4 libxcb xproto ;}; + + xcbutilrenderutil = (stdenv.mkDerivation ((if overrides ? xcbutilrenderutil then overrides.xcbutilrenderutil else x: x) { + name = "xcb-util-renderutil-0.3.8"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.8.tar.bz2; + sha256 = "0lkl9ij9b447c0br2qc5qsynjn09c4fdz7sd6yp7pyi8az2sb2cp"; + }; + buildInputs = [pkgconfig gperf m4 libxcb xproto ]; + })) // {inherit gperf m4 libxcb xproto ;}; + + xcbutilwm = (stdenv.mkDerivation ((if overrides ? xcbutilwm then overrides.xcbutilwm else x: x) { + name = "xcb-util-wm-0.3.8"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/xcb/xcb-util-wm-0.3.8.tar.bz2; + sha256 = "01shwv13rfcxycrsla6c5xlrk1qska7kvvj10n7jcibx9jzanmy5"; }; buildInputs = [pkgconfig gperf m4 libxcb xproto ]; })) // {inherit gperf m4 libxcb xproto ;}; @@ -1432,7 +1472,7 @@ let builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-ati-6.14.2.tar.bz2; - sha256 = "017974b622eea3b4483405368492b0c6f178854a9b9753d50e13c578b8a328dc"; + sha256 = "1p18lfw7ii8k1vam75wv9a2piwf6n2988dh56i4b98zf4av78y81"; }; buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; })) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -1537,7 +1577,7 @@ let buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ]; })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ;}; - xf86videointel_2_14_901 = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) { + xf86videointel_2_14_901 = (stdenv.mkDerivation ((if overrides ? xf86videointel_2_14_901 then overrides.xf86videointel_2_14_901 else x: x) { name = "xf86-video-intel-2.14.901"; builder = ./builder.sh; src = fetchurl { @@ -1547,6 +1587,16 @@ let buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ]; })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ;}; + xf86videointel_2_17_0 = (stdenv.mkDerivation ((if overrides ? xf86videointel_2_17_0 then overrides.xf86videointel_2_17_0 else x: x) { + name = "xf86-video-intel-2.17.0"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/driver/xf86-video-intel-2.17.0.tar.bz2; + sha256 = "11s3vjp0lrfmb4bv848fd5bajj77j3rf451lm0qyylnclbr5114b"; + }; + buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ]; + })) // {inherit dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ;}; + xf86videomach64 = (stdenv.mkDerivation ((if overrides ? xf86videomach64 then overrides.xf86videomach64 else x: x) { name = "xf86-video-mach64-6.8.2"; builder = ./builder.sh; @@ -1978,14 +2028,14 @@ let })) // {inherit libxcb ;}; xlsclients = (stdenv.mkDerivation ((if overrides ? xlsclients then overrides.xlsclients else x: x) { - name = "xlsclients-1.1.1"; + name = "xlsclients-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xlsclients-1.1.1.tar.bz2; - sha256 = "0ng81cm40881gddzwrfdbsvbnqfpqllxaxdsa8m2ljqxlq9mwfs5"; + url = mirror://xorg/individual/app/xlsclients-1.1.2.tar.bz2; + sha256 = "1l97j15mg4wfzpm81wlpzagfjff7v4fwn7s2z2rpksk3gfcg7r8w"; }; - buildInputs = [pkgconfig libxcb xcbutil ]; - })) // {inherit libxcb xcbutil ;}; + buildInputs = [pkgconfig libxcb ]; + })) // {inherit libxcb ;}; xmessage = (stdenv.mkDerivation ((if overrides ? xmessage then overrides.xmessage else x: x) { name = "xmessage-1.0.3"; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index 6dd80a89978..744eb66d84c 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -1,2 +1,8 @@ -mirror://xorg/individual/xcb/xcb-util-0.3.6.tar.bz2 +mirror://xorg/individual/driver/xf86-video-intel-2.14.901.tar.bz2:xf86videointel_2_14_901 +mirror://xorg/individual/driver/xf86-video-intel-2.17.0.tar.bz2:xf86videointel_2_17_0 mirror://xorg/individual/lib/pixman-0.20.2.tar.bz2 +mirror://xorg/individual/xcb/xcb-util-0.3.8.tar.bz2 +mirror://xorg/individual/xcb/xcb-util-image-0.3.8.tar.bz2 +mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.8.tar.bz2 +mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.8.tar.bz2 +mirror://xorg/individual/xcb/xcb-util-wm-0.3.8.tar.bz2 diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 444a0637906..89edb571e0f 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -2,9 +2,13 @@ # Typical command to generate the list of tarballs: -# export i="mirror://xorg/X11R7.4/src/everything/"; cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' | sort > tarballs-7.4.list +# export i="mirror://xorg/X11R7.6/src/everything/"; cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' | sort > tarballs-7.6.list # manually update extra.list -# then run: cat tarballs-7.4.list extra.list old.list | perl ./generate-expr-from-tarballs.pl +# then run: cat tarballs-7.6.list extra.list old.list | perl ./generate-expr-from-tarballs.pl +# tarballs-x.y.list is generated + changes for individual packages +# extra.list are packages not contained in the tarballs +# old.list are packages that used to be part of the tarballs + use strict; @@ -44,11 +48,16 @@ while (<>) { my $tarball = "$_"; print "\nDOING TARBALL $tarball\n"; - $tarball =~ /\/((?:(?:[A-Za-z0-9]|(?:-[^0-9])|(?:-[0-9]*[a-z]))+))[^\/]*$/; - die unless defined $1; - my $pkg = $1; - $pkg =~ s/-//g; - #next unless $pkg eq "xcbutil"; + my $pkg; + if ($tarball =~ s/:([a-zA-Z0-9_]+)$//) { + $pkg = $1; + } else { + $tarball =~ /\/((?:(?:[A-Za-z0-9]|(?:-[^0-9])|(?:-[0-9]*[a-z]))+))[^\/]*$/; + die unless defined $1; + $pkg = $1; + $pkg =~ s/-//g; + #next unless $pkg eq "xcbutil"; + } $tarball =~ /\/([^\/]*)\.tar\.bz2$/; my $pkgName = $1; diff --git a/pkgs/servers/x11/xorg/tarballs-7.6.list b/pkgs/servers/x11/xorg/tarballs-7.6.list index c8039d24671..b90f4780cfa 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.6.list +++ b/pkgs/servers/x11/xorg/tarballs-7.6.list @@ -3,8 +3,8 @@ mirror://xorg/X11R7.6/src/everything/bdftopcf-1.0.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/bigreqsproto-1.1.1.tar.bz2 mirror://xorg/X11R7.6/src/everything/compositeproto-0.4.2.tar.bz2 mirror://xorg/X11R7.6/src/everything/damageproto-1.2.1.tar.bz2 -mirror://xorg/individual/proto/dmxproto-2.3.1.tar.bz2 mirror://xorg/X11R7.6/src/everything/dri2proto-2.3.tar.bz2 +mirror://xorg/individual/proto/dmxproto-2.3.1.tar.bz2 mirror://xorg/X11R7.6/src/everything/encodings-1.0.4.tar.bz2 mirror://xorg/X11R7.6/src/everything/fixesproto-4.1.2.tar.bz2 mirror://xorg/X11R7.6/src/everything/font-adobe-100dpi-1.0.3.tar.bz2 @@ -179,7 +179,7 @@ mirror://xorg/X11R7.6/src/everything/xkbevd-1.1.2.tar.bz2 mirror://xorg/X11R7.6/src/everything/xkbutils-1.0.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/xkill-1.0.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/xlsatoms-1.1.0.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xlsclients-1.1.1.tar.bz2 +mirror://xorg/individual/app/xlsclients-1.1.2.tar.bz2 mirror://xorg/X11R7.6/src/everything/xmodmap-1.0.5.tar.bz2 mirror://xorg/X11R7.6/src/everything/xorg-docs-1.6.tar.bz2 mirror://xorg/individual/xserver/xorg-server-1.9.5.tar.bz2 diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 037ceddfd01..6b199e165d0 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -2,11 +2,11 @@ let - version = "4.3.10"; + version = "4.3.15"; documentation = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.bz2"; - sha256 = "f53d5c434fdb26fc79755279175514507eb1d11cf793ac57270d053ee61f37f9"; + sha256 = "73b7ee1a737fbaf9be77cf6b55b27cca96bac39bc5ef25efa9ceb427cd1b5ad4"; }; in @@ -16,15 +16,53 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.bz2"; - sha256 = "63fdc0273eadbb42d164f38b0b79922c0b3df0e97084e746a318276d935a4f7c"; + sha256 = "8708f485823fb7e51aa696776d0dfac7d3558485182672cf9311c12a50a95486"; }; - configureFlags = "--with-tcsetpgrp --enable-maildir-support --enable-multibyte"; + buildInputs = [ ncurses coreutils ]; + preConfigure = '' + configureFlags="--enable-maildir-support --enable-multibyte --enable-zprofile=$out/etc/zprofile --with-tcsetpgrp" + ''; + + # XXX: think/discuss about this, also with respect to nixos vs nix-on-X postInstall = '' ensureDir $out/share/ tar xf ${documentation} -C $out/share + ensureDir $out/etc/ + cat > $out/etc/zprofile <