diff --git a/maintainers/scripts/eval-release.nix b/maintainers/scripts/eval-release.nix index 3d4458699c7..836e4312c44 100644 --- a/maintainers/scripts/eval-release.nix +++ b/maintainers/scripts/eval-release.nix @@ -2,23 +2,30 @@ # attribute with the expected `system' argument). Too bad # nix-instantiate can't to do this. -let +with import ../../pkgs/lib; - lib = (import ../.. {}).lib; +let rel = removeAttrs (import ../../pkgs/top-level/release.nix) [ "tarball" "xbursttools" ]; - seqList = xs: res: lib.fold (x: xs: lib.seq x xs) res xs; + seqList = xs: res: fold (x: xs: seq x xs) res xs; - strictAttrs = as: seqList (lib.attrValues as) as; + strictAttrs = as: seqList (attrValues as) as; maybe = as: let y = builtins.tryEval (strictAttrs as); in if y.success then y.value else builtins.trace "FAIL" null; - call = attrs: lib.flip lib.mapAttrs attrs - (n: v: builtins.trace n ( + call = attrs: flip mapAttrs attrs + (n: v: /* builtins.trace n */ ( if builtins.isFunction v then maybe (v { system = "i686-linux"; }) else if builtins.isAttrs v then call v else null )); -in call rel + # Add the ‘recurseForDerivations’ attribute to ensure that + # nix-instantiate recurses into nested attribute sets. + recurse = attrs: + if isDerivation attrs + then attrs + else { recurseForDerivations = true; } // mapAttrs (n: v: recurse v) attrs; + +in recurse (call rel) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 4b3f57d0dc8..fc800dc2222 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -13,14 +13,14 @@ assert monotoneSupport -> (monotone != null); let name = "ikiwiki"; - version = "3.20111229"; + version = "3.20120109"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz"; - sha256 = "6470d40c77ae055cfe8c5bbe2f64c765fc84f1ed2dcdd7dcc7577ae190414b89"; + sha256 = "0a47135c039f3dfd62162dd3b250397fcdab2dbb4bf4cf0433099f6e48d6f3e8"; }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 1ea41d64465..eae84d9c3a6 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { if stdenv.system == "x86_64-linux" then fetchurl { url = "http://dl.google.com/linux/direct/google-talkplugin_current_x86_64.rpm"; - sha256 = "14cf9bef6f70ff850b773dbb92833bbe45645db2636b7e17720fdc6b60e76d63"; + sha256 = "1jdcnz4iwnjmrr5xyqgam1yd0dc2vyd9iij5imnir4r88l5fc9wh"; } else throw "Google Talk does not support your platform."; diff --git a/pkgs/applications/networking/instant-messengers/centerim/default.nix b/pkgs/applications/networking/instant-messengers/centerim/default.nix new file mode 100644 index 00000000000..6a608e8d950 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/centerim/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, openssl, curl, ncurses, libjpeg +, withGpg ? true, gpgme ? null}: + +stdenv.mkDerivation rec { + name = "centerim-4.22.10"; + + src = fetchurl { + url = "http://centerim.org/download/releases/${name}.tar.gz"; + sha256 = "0viz86jflp684vfginhl6aaw4gh2qvalc25anlwljjl3kkmibklk"; + }; + + buildInputs = [ openssl curl ncurses libjpeg ] + ++ stdenv.lib.optional withGpg gpgme; + + configureFlags = [ "--with-openssl=${openssl}" ]; + + meta = { + homepage = http://www.centerim.org/; + description = "Fork of CenterICQ, a curses instant messaging program"; + license = "GPLv2+"; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/applications/networking/irc/xchat/default.nix b/pkgs/applications/networking/irc/xchat/default.nix index f7e4395e530..88ba5b9193e 100644 --- a/pkgs/applications/networking/irc/xchat/default.nix +++ b/pkgs/applications/networking/irc/xchat/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, pkgconfig, tcl, gtk}: stdenv.mkDerivation { - name = "xchat-2.8.4"; + name = "xchat-2.8.8"; src = fetchurl { - url = http://www.xchat.org/files/source/2.8/xchat-2.8.4.tar.bz2; - sha256 = "0qyx6rdvnjwy52amcmkjj134sysfkzbyv7b66vjsla3i8yg9lnpr"; + url = http://www.xchat.org/files/source/2.8/xchat-2.8.8.tar.bz2; + sha256 = "0d6d69437b5e1e45f3e66270fe369344943de8a1190e498fafa5296315a27db0"; }; buildInputs = [pkgconfig tcl gtk]; configureFlags = "--disable-nls"; diff --git a/pkgs/applications/networking/skype/default.nix b/pkgs/applications/networking/skype/default.nix index 98cbfdb7c57..8d3645e3819 100644 --- a/pkgs/applications/networking/skype/default.nix +++ b/pkgs/applications/networking/skype/default.nix @@ -53,6 +53,16 @@ stdenv.mkDerivation rec { EOF chmod +x $out/bin/skype + + # Desktop icon for Skype + patch skype.desktop << EOF + 5c5 + < Icon=skype.png + --- + > Icon=$out/opt/skype/icons/SkypeBlue_48x48.png + EOF + ensureDir $out/share/applications + mv skype.desktop $out/share/applications ''; meta = { diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix index 702f4c28912..b444783ba21 100644 --- a/pkgs/applications/science/chemistry/avogadro/default.nix +++ b/pkgs/applications/science/chemistry/avogadro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel }: +{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, mesa, libX11 }: stdenv.mkDerivation rec { name = "avogadro-1.0.3"; @@ -8,9 +8,11 @@ stdenv.mkDerivation rec { sha256 = "0s44r78vm7hf4cs13d2qki3gf178gjj1ihph6rs04g6s4figvdpg"; }; - buildInputs = [ qt4 eigen zlib openbabel ]; + buildInputs = [ qt4 eigen zlib openbabel mesa libX11 ]; - buildNativeInputs = [ cmake ]; + buildNativeInputs = [ cmake pkgconfig ]; + + NIX_CFLAGS_COMPILE = "-include ${mesa}/include/GL/glu.h"; meta = { maintainers = [ stdenv.lib.maintainers.urkud ]; diff --git a/pkgs/applications/science/electronics/archimedes/default.nix b/pkgs/applications/science/electronics/archimedes/default.nix new file mode 100644 index 00000000000..f22ef09a983 --- /dev/null +++ b/pkgs/applications/science/electronics/archimedes/default.nix @@ -0,0 +1,17 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "archimedes-2.0.0"; + + src = fetchurl { + url = "mirror://gnu/archimedes/${name}.tar.gz"; + sha256 = "1ajg4xvk5slv05fsbikrina9g4bmhx8gykk249yz21pir67sdk4x"; + }; + + meta = { + description = "GNU package for semiconductor device simulations"; + homepage = http://www.gnu.org/software/archimedes; + license = "GPLv2+"; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 793d5c9452a..4961bbeabfd 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-20111224"; + name = "hol_light-20120109"; src = fetchsvn { url = http://hol-light.googlecode.com/svn/trunk; - rev = "116"; - sha256 = "c840cc2dfeb2088484692cb0073e6a7bb85e3e44e95aee1e0f5a8e223f7ccae6"; + rev = "118"; + sha256 = "97e72dad731338328c031421512c26d440a989ea083f3ae34820eb8413aff495"; }; buildInputs = [ ocaml findlib camlp5 ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 905db2dc68b..32b30bc3242 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -4,14 +4,14 @@ }: let - version = "3.20111231"; + version = "3.20120106"; in stdenv.mkDerivation { name = "git-annex-${version}"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz"; - sha256 = "4f53e7fc9560838be7efd0c90543c93ce1c7d2ba36b7754200586d845ec114f5"; + sha256 = "60735d8b036aa8ac44e1838724d9b4da1fceb2f1547ce7f39b2069a8c3605438"; }; buildInputs = [ diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index a1a6a3fcd7f..9e31e9906c6 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -6,8 +6,10 @@ , pythonBindings ? false , perlBindings ? false , javahlBindings ? false +, saslSupport ? false , stdenv, fetchurl, apr, aprutil, neon, zlib, sqlite , httpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null +, sasl ? null }: assert bdbSupport -> aprutil.bdbSupport; @@ -31,7 +33,8 @@ stdenv.mkDerivation rec { buildInputs = [ zlib apr aprutil sqlite ] ++ stdenv.lib.optional httpSupport neon ++ stdenv.lib.optional pythonBindings python - ++ stdenv.lib.optional perlBindings perl; + ++ stdenv.lib.optional perlBindings perl + ++ stdenv.lib.optional saslSupport sasl; configureFlags = '' ${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"} @@ -39,6 +42,7 @@ stdenv.mkDerivation rec { ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"} ${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""} ${if stdenv.isDarwin then "--enable-keychain" else "--disable-keychain"} + ${if saslSupport then "--enable-sasl --with-sasl=${sasl}" else "--disable-sasl"} --with-zlib=${zlib} --with-sqlite=${sqlite} ''; diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix index 5424c87ded7..bc27516f46d 100644 --- a/pkgs/build-support/fetchhg/default.nix +++ b/pkgs/build-support/fetchhg/default.nix @@ -14,4 +14,5 @@ stdenv.mkDerivation { outputHash = if (md5 != null) then md5 else sha256; inherit url tag; + preferLocalBuild = true; } diff --git a/pkgs/data/misc/shared-desktop-ontologies/default.nix b/pkgs/data/misc/shared-desktop-ontologies/default.nix index 313f8a9b1c9..39fcc6d1a68 100644 --- a/pkgs/data/misc/shared-desktop-ontologies/default.nix +++ b/pkgs/data/misc/shared-desktop-ontologies/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake ]; meta = with stdenv.lib; { + homepage = http://oscaf.sourceforge.net/; description = "Ontologies necessary for the Nepomuk semantic desktop"; longDescription = '' The shared-desktop-ontologies package brings the semantic web to the diff --git a/pkgs/desktops/kde-4.8/kactivities.nix b/pkgs/desktops/kde-4.8/kactivities.nix index 67ff8cd8984..8f726577ef8 100644 --- a/pkgs/desktops/kde-4.8/kactivities.nix +++ b/pkgs/desktops/kde-4.8/kactivities.nix @@ -1,7 +1,7 @@ -{ kde, kdelibs }: +{ kde, kdelibs, shared_desktop_ontologies }: kde { - propagatedBuildInputs = [ kdelibs ]; + propagatedBuildInputs = [ kdelibs shared_desktop_ontologies ]; meta = { description = "KDE activities library and daemon"; diff --git a/pkgs/desktops/kde-4.8/kde-baseapps/konsole.nix b/pkgs/desktops/kde-4.8/kde-baseapps/konsole.nix index 87ac24972bd..0db47fb2d7c 100644 --- a/pkgs/desktops/kde-4.8/kde-baseapps/konsole.nix +++ b/pkgs/desktops/kde-4.8/kde-baseapps/konsole.nix @@ -1,8 +1,8 @@ -{ kde, kdelibs }: +{ kde, kdelibs, kde_baseapps }: kde { - buildInputs = [ kdelibs ]; + buildInputs = [ kdelibs kde_baseapps ]; meta = { description = "Konsole, the KDE terminal emulator"; diff --git a/pkgs/desktops/kde-4.8/kde-runtime.nix b/pkgs/desktops/kde-4.8/kde-runtime.nix index 96b6c3a1c78..d827802bb09 100644 --- a/pkgs/desktops/kde-4.8/kde-runtime.nix +++ b/pkgs/desktops/kde-4.8/kde-runtime.nix @@ -1,11 +1,11 @@ { kde, kdelibs, shared_desktop_ontologies, bzip2, xz, libssh, exiv2, attica -, libcanberra, virtuoso, samba, ntrack +, libcanberra, virtuoso, samba, ntrack, libjpeg }: kde { buildInputs = [ kdelibs shared_desktop_ontologies bzip2 xz libssh exiv2 attica - samba (libcanberra.override { gtk = null; }) ntrack + samba (libcanberra.override { gtk = null; }) ntrack libjpeg ]; passthru.propagatedUserEnvPackages = [ virtuoso ]; diff --git a/pkgs/desktops/kde-4.8/kde-wallpapers.nix b/pkgs/desktops/kde-4.8/kde-wallpapers.nix index 60298e567fb..97bfc1bfabf 100644 --- a/pkgs/desktops/kde-4.8/kde-wallpapers.nix +++ b/pkgs/desktops/kde-4.8/kde-wallpapers.nix @@ -6,7 +6,7 @@ kde { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "29f4e8b24435ee8c64affdc6250f59ed9f78445118fe0a4e216d89969dd2006b"; + outputHash = "101v30x8sw96mq43hs7wzppjc8xhh2wn4qpqbi3nxrb16fw6svad"; meta = { description = "Wallpapers for KDE"; diff --git a/pkgs/desktops/kde-4.8/kde-workspace.nix b/pkgs/desktops/kde-4.8/kde-workspace.nix index 55c243f60dd..31937d4f1d5 100644 --- a/pkgs/desktops/kde-4.8/kde-workspace.nix +++ b/pkgs/desktops/kde-4.8/kde-workspace.nix @@ -1,20 +1,23 @@ { kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies, lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate, consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi, - pykde4 + pykde4, libjpeg, pkgconfig, libXft, libXxf86misc, kactivities }: kde { buildInputs = - [ kdelibs qimageblitz libdbusmenu_qt pykde4 + [ kdelibs qimageblitz libdbusmenu_qt pykde4 libjpeg libXft libXxf86misc xorg.libxkbfile xorg.libXcomposite xorg.libXScrnSaver xorg.libXtst xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp xorg.libpthreadstubs boost gpsd shared_desktop_ontologies lm_sensors pciutils libraw1394 libusb python libqalculate consolekit kdepimlibs pam prison akonadi + kactivities ]; + buildNativeInputs = [ pkgconfig ]; + preConfigure = '' # Fix incorrect path to kde4-config. diff --git a/pkgs/desktops/kde-4.8/kdeaccessibility/kmousetool.nix b/pkgs/desktops/kde-4.8/kdeaccessibility/kmousetool.nix index 42306049c5d..8e0caa76ed9 100644 --- a/pkgs/desktops/kde-4.8/kdeaccessibility/kmousetool.nix +++ b/pkgs/desktops/kde-4.8/kdeaccessibility/kmousetool.nix @@ -1,7 +1,7 @@ -{ kde, kdelibs, libXtst }: +{ kde, kdelibs, libXtst, libXt }: kde { - buildInputs = [ kdelibs libXtst ]; + buildInputs = [ kdelibs libXtst libXt ]; meta = { description = "A program that clicks the mouse for you"; diff --git a/pkgs/desktops/kde-4.8/kdeartwork/kscreensaver.nix b/pkgs/desktops/kde-4.8/kdeartwork/kscreensaver.nix index cc195c8de90..72676e35f71 100644 --- a/pkgs/desktops/kde-4.8/kdeartwork/kscreensaver.nix +++ b/pkgs/desktops/kde-4.8/kdeartwork/kscreensaver.nix @@ -1,7 +1,9 @@ -{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2 }: +{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2, libXt, pkgconfig }: kde { - buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 ]; + buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 libXt ]; + + buildNativeInputs = [ pkgconfig ]; preConfigure = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake"; diff --git a/pkgs/desktops/kde-4.8/kdebindings/pykde-purity.patch b/pkgs/desktops/kde-4.8/kdebindings/pykde-purity.patch index dfc2c886bba..2f6e078f256 100644 --- a/pkgs/desktops/kde-4.8/kdebindings/pykde-purity.patch +++ b/pkgs/desktops/kde-4.8/kdebindings/pykde-purity.patch @@ -2,15 +2,6 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index c853e38..5df3253 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -73,7 +73,7 @@ INCLUDE_DIRECTORIES( - ${QT_QTWEBKIT_INCLUDE_DIR} - ${KDE4_INCLUDE_DIR} - ${KDE4_INCLUDE_DIR}/solid -- ${KDE4_INCLUDE_DIR}/phonon -+ ${PHONON_INCLUDE_DIR}/phonon - ${KDE4_INCLUDE_DIR}/kio - ${KDE4_INCLUDE_DIR}/kdeprint - ${KDE4_INCLUDE_DIR}/kdeprint/lpr @@ -232,7 +232,7 @@ _pkg_config = { 'pykde_kde_sip_flags': '${_SIP_TAGS} ${_SIP_X} ${SIP_EXTRA_OPTIONS}', 'pykde_mod_dir': '${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4', diff --git a/pkgs/desktops/kde-4.8/kdeedu/FindLibfacile.cmake b/pkgs/desktops/kde-4.8/kdeedu/FindLibfacile.cmake deleted file mode 100644 index 617eb4b2467..00000000000 --- a/pkgs/desktops/kde-4.8/kdeedu/FindLibfacile.cmake +++ /dev/null @@ -1,32 +0,0 @@ -# - Try to find Libfacile -# Once done this will define -# -# LIBFACILE_FOUND - system has Libfacile -# LIBFACILE_INCLUDE_DIR - the Libfacile include directory -# LIBFACILE_LIBRARIES - Link these to use Libfacile -# -# Copyright (c) 2006, Carsten Niehaus, -# Copyright (c) 2006, Montel Laurent, -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - - -find_package(OCaml) - -if( OCAML_FOUND ) - find_library(LIBFACILE_LIBRARIES NAMES facile.a - HINTS ${OCAMLC_DIR} - PATH_SUFFIXES facile ocaml/facile - ) - find_path(LIBFACILE_INCLUDE_DIR NAMES facile.cmi - HINTS ${OCAMLC_DIR} - PATH_SUFFIXES facile lib/ocaml/facile - ) -endif(OCAML_FOUND) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(Libfacile DEFAULT_MSG LIBFACILE_INCLUDE_DIR - LIBFACILE_LIBRARIES OCAML_FOUND) - -# show the LIBFACILE_INCLUDE_DIR and LIBFACILE_LIBRARIES variables only in the advanced view -mark_as_advanced(LIBFACILE_INCLUDE_DIR LIBFACILE_LIBRARIES ) diff --git a/pkgs/desktops/kde-4.8/kdeedu/kalgebra.nix b/pkgs/desktops/kde-4.8/kdeedu/kalgebra.nix index f1a190332cd..3675c3a225f 100644 --- a/pkgs/desktops/kde-4.8/kdeedu/kalgebra.nix +++ b/pkgs/desktops/kde-4.8/kdeedu/kalgebra.nix @@ -1,6 +1,6 @@ -{ kde, kdelibs, libkdeedu, readline }: +{ kde, kdelibs, libkdeedu, analitza }: kde { - buildInputs = [ kdelibs libkdeedu readline ]; + buildInputs = [ kdelibs libkdeedu analitza ]; meta = { description = "2D and 3D Graph Calculator"; diff --git a/pkgs/desktops/kde-4.8/kdeedu/kalzium-feature-log.patch b/pkgs/desktops/kde-4.8/kdeedu/kalzium-feature-log.patch deleted file mode 100644 index 3c054e8d60a..00000000000 --- a/pkgs/desktops/kde-4.8/kdeedu/kalzium-feature-log.patch +++ /dev/null @@ -1,15 +0,0 @@ -commit d96c6e70400dcd4e3514065e607388b80f96d6a1 -Author: Yury G. Kudryashov -Date: Mon Aug 15 00:53:16 2011 +0400 - - Display feature log - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 132934c..eec6942 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -47,3 +47,4 @@ add_subdirectory(src) - add_subdirectory(data) - add_subdirectory(plasmoid) - add_subdirectory(libscience) -+macro_display_feature_log() diff --git a/pkgs/desktops/kde-4.8/kdeedu/kalzium-find-libfacile.patch b/pkgs/desktops/kde-4.8/kdeedu/kalzium-find-libfacile.patch new file mode 100644 index 00000000000..0324ee74eab --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeedu/kalzium-find-libfacile.patch @@ -0,0 +1,88 @@ +diff --git a/cmake/modules/FindLibfacile.cmake b/cmake/modules/FindLibfacile.cmake +index bef726e..043c65f 100644 +--- a/cmake/modules/FindLibfacile.cmake ++++ b/cmake/modules/FindLibfacile.cmake +@@ -4,7 +4,6 @@ + # LIBFACILE_FOUND - system has Libfacile + # LIBFACILE_INCLUDE_DIR - the Libfacile include directory + # LIBFACILE_LIBRARIES - Link these to use Libfacile +-# LIBFACILE_DEFINITIONS - Compiler switches required for using Libfacile + # + # Copyright (c) 2006, Carsten Niehaus, + # Copyright (c) 2006, Montel Laurent, +@@ -14,35 +13,20 @@ + + find_package(OCaml) + +-set(LIBFACILE_FOUND FALSE) +- + if( OCAML_FOUND ) +- find_file(LIBFACILE_LIBRARIES NAMES facile.a +- PATHS +- ${OCAMLC_DIR}/facile/ ++ find_library(LIBFACILE_LIBRARIES NAMES facile.a ++ HINTS ${OCAMLC_DIR} ++ PATH_SUFFIXES facile ocaml/facile + ) +- #message(STATUS "LIBFACILE_LIBRARIES :<${LIBFACILE_LIBRARIES}>") +- find_path(LIBFACILE_INCLUDE_DIR NAMES facile.a +- PATHS +- ${OCAMLC_DIR}/ +- PATH_SUFFIXES facile ++ find_path(LIBFACILE_INCLUDE_DIR NAMES facile.cmi ++ HINTS ${OCAMLC_DIR} ++ PATH_SUFFIXES facile lib/ocaml/facile + ) +- #message(STATUS "LIBFACILE_INCLUDE_DIR <${LIBFACILE_INCLUDE_DIR}>") +- if(LIBFACILE_INCLUDE_DIR AND LIBFACILE_LIBRARIES) +- set(LIBFACILE_FOUND TRUE) +- endif(LIBFACILE_INCLUDE_DIR AND LIBFACILE_LIBRARIES) + endif(OCAML_FOUND) + +- +-if(LIBFACILE_FOUND) +- if(NOT Libfacile_FIND_QUIETLY) +- message(STATUS "Found Libfacile: ${LIBFACILE_LIBRARIES}") +- endif(NOT Libfacile_FIND_QUIETLY) +-else(LIBFACILE_FOUND) +- if(Libfacile_FIND_REQUIRED) +- message(FATAL_ERROR "Could not find Libfacile") +- endif(Libfacile_FIND_REQUIRED) +-endif(LIBFACILE_FOUND) ++include(FindPackageHandleStandardArgs) ++find_package_handle_standard_args(Libfacile DEFAULT_MSG LIBFACILE_INCLUDE_DIR ++ LIBFACILE_LIBRARIES OCAML_FOUND) + + # show the LIBFACILE_INCLUDE_DIR and LIBFACILE_LIBRARIES variables only in the advanced view + mark_as_advanced(LIBFACILE_INCLUDE_DIR LIBFACILE_LIBRARIES ) +diff --git a/src/CMakeOCamlInstructions.cmake b/src/CMakeOCamlInstructions.cmake +index 40b6755..de89253 100644 +--- a/src/CMakeOCamlInstructions.cmake ++++ b/src/CMakeOCamlInstructions.cmake +@@ -2,7 +2,7 @@ link_directories (${OCAMLC_DIR}) + + macro(OCAML_MLI_TO_CMI _cmi _mli) + add_custom_command(OUTPUT ${_cmi} +- COMMAND ${OCAML_OCAMLC_EXECUTABLE} ARGS -o ${_cmi} -I +facile -c ${_mli} ++ COMMAND ${OCAML_OCAMLC_EXECUTABLE} ARGS -o ${_cmi} -I ${LIBFACILE_INCLUDE_DIR} -c ${_mli} + DEPENDS ${_mli} ${ARGN} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${_cmi}) +@@ -10,7 +10,7 @@ endmacro(OCAML_MLI_TO_CMI) + + macro(OCAML_ML_TO_CMX _cmx _ml) + add_custom_command(OUTPUT ${_cmx} +- COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} ARGS -o ${_cmx} -I +facile -c ${_ml} ++ COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} ARGS -o ${_cmx} -I ${LIBFACILE_INCLUDE_DIR} -c ${_ml} + DEPENDS ${_ml} ${ARGN} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${_cmx}) +@@ -58,7 +58,7 @@ ocaml_ml_to_cmx(${CMAKE_CURRENT_BINARY_DIR}/lexer.cmx ${CMAKE_CURRENT_SOURCE_DIR + # object files + + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o +- COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} -I +facile -c ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c -o ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o ++ COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} -I ${LIBFACILE_INCLUDE_DIR} -c ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c -o ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c ${CMAKE_CURRENT_BINARY_DIR}/solver.o + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o) diff --git a/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix b/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix index d7d9b403b1a..298aba06c8e 100644 --- a/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix +++ b/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix @@ -2,12 +2,7 @@ kde { buildInputs = [ kdelibs facile ocaml eigen openbabel avogadro ]; - prePatch = '' - cp -v ${./FindLibfacile.cmake} cmake/modules/FindLibfacile.cmake - sed -e 's/\+facile/''${LIBFACILE_INCLUDE_DIR}/' -i src/CMakeOCamlInstructions.cmake - ''; - - patches = [ ./kalzium-feature-log.patch ]; + patches = [ ./kalzium-find-libfacile.patch ]; meta = { description = "Periodic Table of Elements"; diff --git a/pkgs/desktops/kde-4.8/kdegames.nix b/pkgs/desktops/kde-4.8/kdegames.nix index 3378a99d9e7..03ecfbd88b4 100644 --- a/pkgs/desktops/kde-4.8/kdegames.nix +++ b/pkgs/desktops/kde-4.8/kdegames.nix @@ -1,12 +1,14 @@ { kde, kdelibs, qca2, twisted, pythonPackages, sip, makeWrapper, pykde4, - openal, libsndfile, qhull }: + openal, libsndfile, qhull, sqlite, pkgconfig }: kde rec { buildInputs = [ kdelibs qca2 pythonPackages.python pythonPackages.wrapPython - openal libsndfile qhull ] ++ pythonPath; + openal libsndfile qhull sqlite ] ++ pythonPath; pythonPath = [ pythonPackages.twisted pykde4 ]; + buildNativeInputs = [ pkgconfig ]; + # TODO: ggz postInstall = "wrapPythonPrograms"; diff --git a/pkgs/desktops/kde-4.8/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.8/kdegraphics/gwenview.nix index efc2707e7d6..b6b659c3947 100644 --- a/pkgs/desktops/kde-4.8/kdegraphics/gwenview.nix +++ b/pkgs/desktops/kde-4.8/kdegraphics/gwenview.nix @@ -1,9 +1,12 @@ -{ kde, kdelibs, exiv2, shared_desktop_ontologies, kde_baseapps, libkipi }: +{ kde, kdelibs, exiv2, shared_desktop_ontologies, kde_baseapps, libkipi +, libjpeg, pkgconfig }: kde { buildInputs = - [ kdelibs exiv2 shared_desktop_ontologies kde_baseapps libkipi ]; + [ kdelibs exiv2 shared_desktop_ontologies kde_baseapps libkipi libjpeg ]; + + buildNativeInputs = [ pkgconfig ]; meta = { description = "Gwenview, the KDE image viewer"; diff --git a/pkgs/desktops/kde-4.8/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.8/kdegraphics/libkdcraw.nix index 9d31cc763f2..9810a98551e 100644 --- a/pkgs/desktops/kde-4.8/kdegraphics/libkdcraw.nix +++ b/pkgs/desktops/kde-4.8/kdegraphics/libkdcraw.nix @@ -1,7 +1,7 @@ -{ kde, kdelibs }: +{ kde, kdelibs, libjpeg, lcms1 }: kde { - buildInputs = [ kdelibs ]; + buildInputs = [ kdelibs libjpeg lcms1 ]; meta = { description = "Library for decoding RAW images"; diff --git a/pkgs/desktops/kde-4.8/kdelibs.nix b/pkgs/desktops/kde-4.8/kdelibs.nix index d4383b3e93a..106909ac3db 100644 --- a/pkgs/desktops/kde-4.8/kdelibs.nix +++ b/pkgs/desktops/kde-4.8/kdelibs.nix @@ -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 libjpeg + shared_desktop_ontologies udev xz libxml2 libjpeg kerberos ]; propagatedBuildInputs = [ qt4 soprano strigi phonon ]; diff --git a/pkgs/desktops/kde-4.8/kdemultimedia.nix b/pkgs/desktops/kde-4.8/kdemultimedia.nix index b4ca7a8d2da..09efeb336dc 100644 --- a/pkgs/desktops/kde-4.8/kdemultimedia.nix +++ b/pkgs/desktops/kde-4.8/kdemultimedia.nix @@ -1,13 +1,12 @@ { kde, alsaLib, libvorbis, taglib, flac, cdparanoia, lame, kdelibs, ffmpeg, - libmusicbrainz3, libtunepimp }: + libmusicbrainz3, libtunepimp, pulseaudio }: kde { buildInputs = - # Note: kdemultimedia can use xine-lib, but it doesn't seem useful - # without the Phonon Xine backend. [ kdelibs cdparanoia taglib libvorbis libmusicbrainz3 libtunepimp ffmpeg - flac lame ]; + flac lame pulseaudio + ]; meta = { description = "KDE multimedia programs such as a movie player and volume utility"; diff --git a/pkgs/desktops/kde-4.8/kdenetwork/FindJasper.cmake b/pkgs/desktops/kde-4.8/kdenetwork/FindJasper.cmake new file mode 100644 index 00000000000..bb06a7bd8d3 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdenetwork/FindJasper.cmake @@ -0,0 +1,35 @@ +# - Try to find the Jasper JPEG2000 library +# Once done this will define +# +# JASPER_FOUND - system has Jasper +# JASPER_INCLUDE_DIR - the Jasper include directory +# JASPER_LIBRARIES - The libraries needed to use Jasper + +#============================================================================= +# Copyright 2006-2009 Kitware, Inc. +# Copyright 2006 Alexander Neundorf +# +# Distributed under the OSI-approved BSD License (the "License"); +# see accompanying file Copyright.txt for details. +# +# This software is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the License for more information. +#============================================================================= +# (To distribute this file outside of CMake, substitute the full +# License text for the above reference.) + +FIND_PACKAGE(JPEG) + +FIND_PATH(JASPER_INCLUDE_DIR jasper/jasper.h) + +FIND_LIBRARY(JASPER_LIBRARY NAMES jasper libjasper) + +SET(JASPER_LIBRARIES ${JASPER_LIBRARY}) + +# handle the QUIETLY and REQUIRED arguments and set JASPER_FOUND to TRUE if +# all listed variables are TRUE +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jasper DEFAULT_MSG JASPER_LIBRARIES JASPER_INCLUDE_DIR) + +MARK_AS_ADVANCED(JASPER_INCLUDE_DIR JASPER_LIBRARY) diff --git a/pkgs/desktops/kde-4.8/kdenetwork/kget.nix b/pkgs/desktops/kde-4.8/kdenetwork/kget.nix index 33d9ec1ca01..2381a2459e6 100644 --- a/pkgs/desktops/kde-4.8/kdenetwork/kget.nix +++ b/pkgs/desktops/kde-4.8/kdenetwork/kget.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs, libktorrent, kde_workspace, kdepimlibs, - shared_desktop_ontologies, kde_baseapps, gpgme, boost, libmms, qca2 }: +{ kde, kdelibs, libktorrent, kde_workspace, kdepimlibs, sqlite +, shared_desktop_ontologies, kde_baseapps, gpgme, boost, libmms, qca2 }: kde { buildInputs = [ kdelibs libktorrent kde_workspace shared_desktop_ontologies kdepimlibs - kde_baseapps gpgme boost libmms qca2 + kde_baseapps gpgme boost libmms qca2 sqlite ]; KDEDIRS = libktorrent; diff --git a/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix index a4b01c5f9a6..27b36ba6d1b 100644 --- a/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix +++ b/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix @@ -1,17 +1,21 @@ { kde, kdelibs, speex, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent, jasper, libidn, mediastreamer, msilbc, pkgconfig, libxml2, libxslt, giflib, - libgadu, boost, qca2, gpgme }: + libgadu, boost, qca2, gpgme, sqlite }: kde { buildInputs = [ kdelibs speex libmsn libotr kdepimlibs qimageblitz libktorrent jasper libidn mediastreamer msilbc libxml2 libxslt giflib libgadu boost qca2 - gpgme ]; + gpgme sqlite ]; buildNativeInputs = [ pkgconfig ]; KDEDIRS = libktorrent; - patchPhase = "cp -v ${./FindmsiLBC.cmake} kopete/cmake/modules/FindmsiLBC.cmake"; + patchPhase = + '' + cp -v ${./FindmsiLBC.cmake} kopete/cmake/modules/FindmsiLBC.cmake + cp -v ${./FindJasper.cmake} kopete/cmake/modules/FindJasper.cmake + ''; cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ]; diff --git a/pkgs/desktops/kde-4.8/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.8/kdenetwork/krdc.nix index 664b1bc45a7..40ef91d5433 100644 --- a/pkgs/desktops/kde-4.8/kdenetwork/krdc.nix +++ b/pkgs/desktops/kde-4.8/kdenetwork/krdc.nix @@ -1,7 +1,7 @@ -{ kde, kdelibs, libvncserver }: +{ kde, kdelibs, libvncserver, libjpeg }: kde { - buildInputs = [ kdelibs libvncserver ]; + buildInputs = [ kdelibs libvncserver libjpeg ]; patches = [ ./kdenetwork.patch ]; } diff --git a/pkgs/desktops/kde-4.8/kdepim.nix b/pkgs/desktops/kde-4.8/kdepim.nix index 9b95d491a44..6d99a801d1c 100644 --- a/pkgs/desktops/kde-4.8/kdepim.nix +++ b/pkgs/desktops/kde-4.8/kdepim.nix @@ -1,11 +1,11 @@ { kde, boost, gpgme, libassuan, libxml2, libxslt, kdepimlibs, kdepim_runtime -, akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee }: +, akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee, prison }: kde { buildInputs = [ kdepimlibs boost akonadi shared_desktop_ontologies libxml2 - libxslt cyrus_sasl gpgme libassuan grantlee + libxslt cyrus_sasl gpgme libassuan grantlee prison ]; passthru.propagatedUserEnvPackages = [ akonadi kdepimlibs kdepim_runtime ]; diff --git a/pkgs/desktops/kde-4.8/kdeutils/ksecrets-ftbfs.patch b/pkgs/desktops/kde-4.8/kdeutils/ksecrets-ftbfs.patch new file mode 100644 index 00000000000..24a68e11440 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeutils/ksecrets-ftbfs.patch @@ -0,0 +1,43 @@ +diff --git a/ksecrets/CMakeLists.txt b/ksecrets/CMakeLists.txt +index 040b55f..a1e04c3 100644 +--- a/ksecrets/CMakeLists.txt ++++ b/ksecrets/CMakeLists.txt +@@ -5,7 +5,6 @@ PROJECT (ksecrets) + + include(MacroLibrary) + include(KDE4Defaults) +-include(PkgConfigGetVar) + + INCLUDE_DIRECTORIES ( + ${KDE4_INCLUDES} +diff --git a/ksecretsserviced/CMakeLists.txt b/ksecretsserviced/CMakeLists.txt +index d2feb41..339225b 100644 +--- a/ksecretsserviced/CMakeLists.txt ++++ b/ksecretsserviced/CMakeLists.txt +@@ -2,7 +2,6 @@ PROJECT (ksecretsserviced) + + include(MacroLibrary) + include(KDE4Defaults) +-include(PkgConfigGetVar) + + INCLUDE_DIRECTORIES ( + ${KDE4_INCLUDES} +@@ -38,4 +37,5 @@ TARGET_LINK_LIBRARIES (ksecretsserviced + + install( TARGETS ksecretsserviced ${INSTALL_TARGETS_DEFAULT_ARGS}) + install( FILES ksecretsserviced.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +-dbus_add_activation_service(org.kde.ksecretsserviced.service.in) ++configure_file(org.kde.ksecretsserviced.service.in org.kde.ksecretsserviced.service) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.ksecretsserviced.service DESTINATION ${DBUS_SERVICES_INSTALL_DIR} ) +diff --git a/kwl2kss/CMakeLists.txt b/kwl2kss/CMakeLists.txt +index 41d8ec0..4cedb0e 100644 +--- a/kwl2kss/CMakeLists.txt ++++ b/kwl2kss/CMakeLists.txt +@@ -3,7 +3,6 @@ project(kwl2kss) + + include(MacroLibrary) + include(KDE4Defaults) +-include(PkgConfigGetVar) + + ########### Configure checks for kwalletbackend ############### + diff --git a/pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix b/pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix index be562db9277..da9b7f0861c 100644 --- a/pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix +++ b/pkgs/desktops/kde-4.8/kdeutils/ksecrets.nix @@ -3,6 +3,8 @@ kde { buildInputs = [ kdelibs qca2 ]; + patches = [ ./ksecrets-ftbfs.patch ]; + meta = { description = "KDE implementation of SecretsService"; }; diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 2c197a1be57..7dbbe375283 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "urweb"; - version = "20111127"; + version = "20120110"; name = "${pname}-${version}"; src = fetchurl { url = "http://www.impredicative.com/ur/${name}.tgz"; - sha256 = "1mhicigbi434fdr4gim4dswnmff9dldszh93g2w2542nlxvn9lbj"; + sha256 = "1f67nj2akji9dh3n2hwmcrrwd61zlrnb0xh841fpb3n20ycjzg6j"; }; buildInputs = [ stdenv.gcc file openssl mlton mysql postgresql sqlite ]; diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 1c286aa2ce4..f2c32cda877 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -10,18 +10,27 @@ g: # Get dependencies from patched gems activeresource = g.activeresource_3_1_3; activesupport = g.activesupport_3_1_3; arel = g.arel_2_2_1; + atoulme_Antwrap = g.atoulme_Antwrap_0_7_1; builder = g.builder_3_0_0; + buildr = g.buildr_1_4_6; bundler = g.bundler_1_0_21; + diff_lcs = g.diff_lcs_1_1_3; erubis = g.erubis_2_7_0; + highline = g.highline_1_5_1; hike = g.hike_1_2_1; + hoe = g.hoe_2_3_3; i18n = g.i18n_0_6_0; - json = g.json_1_6_3; + json = g.json_1_6_4; + json_pure = g.json_pure_1_6_4; mail = g.mail_2_3_0; mime_types = g.mime_types_1_17_2; + minitar = g.minitar_0_5_3; multi_json = g.multi_json_1_0_4; + net_sftp = g.net_sftp_2_0_4; + net_ssh = g.net_ssh_2_2_2; nix = g.nix_0_1_1; polyglot = g.polyglot_0_3_3; - rack = g.rack_1_3_5; + rack = g.rack_1_4_0; rack_cache = g.rack_cache_1_1; rack_mount = g.rack_mount_0_8_3; rack_ssl = g.rack_ssl_1_3_2; @@ -30,15 +39,23 @@ g: # Get dependencies from patched gems railties = g.railties_3_1_3; rake = g.rake_0_9_2_2; rb_fsevent = g.rb_fsevent_0_4_3_1; - rdoc = g.rdoc_3_11; - sass = g.sass_3_1_11; + rdoc = g.rdoc_3_12; + rjb = g.rjb_1_3_8; + rspec = g.rspec_2_1_0; + rspec_core = g.rspec_core_2_1_0; + rspec_expectations = g.rspec_expectations_2_1_0; + rspec_mocks = g.rspec_mocks_2_1_0; + rubyforge = g.rubyforge_2_0_4; + rubyzip = g.rubyzip_0_9_4; + sass = g.sass_3_1_12; sprockets = g.sprockets_2_0_3; thor = g.thor_0_14_6; tilt = g.tilt_1_3_3; treetop = g.treetop_1_4_10; tzinfo = g.tzinfo_0_3_31; + xml_simple = g.xml_simple_1_0_12; }; - gem_nix_args = [ ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ]; + gem_nix_args = [ ''buildr'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ]; gems = { actionmailer_3_1_3 = { basename = ''actionmailer''; @@ -59,7 +76,7 @@ g: # Get dependencies from patched gems longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.''; }; name = ''actionpack-3.1.3''; - requiredGems = [ g.activemodel_3_1_3 g.rack_cache_1_1 g.rack_test_0_6_1 g.rack_mount_0_8_3 g.sprockets_2_0_3 g.erubis_2_7_0 ]; + requiredGems = [ g.activemodel_3_1_3 g.rack_cache_1_1 g.rack_1_3_6 g.rack_test_0_6_1 g.rack_mount_0_8_3 g.sprockets_2_0_3 g.erubis_2_7_0 ]; sha256 = ''1awhqxdfg2zcb0b34jwq3sm2favay94n4glqywqzrn85wkf47a2q''; }; activemodel_3_1_3 = { @@ -124,6 +141,39 @@ database compatibility and query generation.''; requiredGems = [ ]; sha256 = ''19pz68pr9l8h2j2v3vqzhjvs94s0hwqwpb6m9sd6ncj18gaci8jy''; }; + atoulme_Antwrap_0_7_1 = { + basename = ''atoulme_Antwrap''; + meta = { + description = ''A Ruby module that wraps the Apache Ant build tool. Antwrap can be used to invoke Ant Tasks from a Ruby or a JRuby script.''; + homepage = ''http://rubyforge.org/projects/antwrap/''; + longDescription = '' A Ruby module that wraps the Apache Ant build tool. Antwrap can be used to invoke Ant Tasks from a Ruby or a JRuby script. + +== FEATURES/PROBLEMS: + + Antwrap runs on the native Ruby interpreter via the RJB (Ruby Java Bridge gem) and on the JRuby interpreter. Antwrap is compatible with Ant versions 1.5.4, + 1.6.5 and 1.7.0. For more information, see the Project Info (http://rubyforge.org/projects/antwrap/) page. + +== SYNOPSIS: + + Antwrap is a Ruby library that can be used to invoke Ant tasks. It is being used in the Buildr (http://incubator.apache.org/buildr/) project to execute + Ant (http://ant.apache.org/) tasks in a Java project. If you are tired of fighting with Ant or Maven XML files in your Java project, take some time to + check out Buildr!''; + }; + name = ''atoulme-Antwrap-0.7.1''; + requiredGems = [ g.rjb_1_3_8 ]; + sha256 = ''0r9jy2asyma8h0878nhjfbi00qvb4yapc8glngvmkkj21zbx2mfy''; + }; + builder_2_1_2 = { + basename = ''builder''; + meta = { + description = ''Builders for MarkUp.''; + homepage = ''http://onestepback.org''; + longDescription = ''Builder provides a number of builder objects that make creating structured data simple to do. Currently the following builder objects are supported: * XML Markup * XML Events''; + }; + name = ''builder-2.1.2''; + requiredGems = [ ]; + sha256 = ''0hp5gsvp63mqqvi7dl95zwci916vj6l1slgz4crip1rijk3v2806''; + }; builder_3_0_0 = { basename = ''builder''; meta = { @@ -140,6 +190,22 @@ simple to do. Currently the following builder objects are supported: requiredGems = [ ]; sha256 = ''13k12jii9z1hma4xxk2dl74wsx985idl3cs9svvla8p0bmgf3lzv''; }; + buildr_1_4_6 = { + basename = ''buildr''; + meta = { + description = ''Build like you code''; + homepage = ''http://buildr.apache.org/''; + longDescription = ''Apache Buildr is a build system for Java-based applications, including support +for Scala, Groovy and a growing number of JVM languages and tools. We wanted +something that's simple and intuitive to use, so we only need to tell it what +to do, and it takes care of the rest. But also something we can easily extend +for those one-off tasks, with a language that's a joy to use. +''; + }; + name = ''buildr-1.4.6''; + requiredGems = [ g.rake_0_8_7 g.builder_2_1_2 g.net_ssh_2_0_23 g.net_sftp_2_0_4 g.rubyzip_0_9_4 g.highline_1_5_1 g.json_pure_1_4_3 g.rubyforge_2_0_3 g.hoe_2_3_3 g.rjb_1_3_3 g.atoulme_Antwrap_0_7_1 g.diff_lcs_1_1_2 g.rspec_expectations_2_1_0 g.rspec_mocks_2_1_0 g.rspec_core_2_1_0 g.rspec_2_1_0 g.xml_simple_1_0_12 g.minitar_0_5_3 ]; + sha256 = ''11qwqrdnmzzi4zhgajfq1f1ckvd4kpfm9gyqrfjfalphs4gi0vxz''; + }; bundler_1_0_21 = { basename = ''bundler''; meta = { @@ -151,6 +217,42 @@ simple to do. Currently the following builder objects are supported: requiredGems = [ ]; sha256 = ''0lcxz75vvgqib43wxzv6021qs5d7bxhnds4j4q27hzqs982cn0s6''; }; + diff_lcs_1_1_2 = { + basename = ''diff_lcs''; + meta = { + description = ''Provides a list of changes that represent the difference between two sequenced collections.''; + homepage = ''http://rubyforge.org/projects/ruwiki/''; + longDescription = ''Diff::LCS is a port of Algorithm::Diff that uses the McIlroy-Hunt longest common subsequence (LCS) algorithm to compute intelligent differences between two sequenced enumerable containers. The implementation is based on Mario I. Wolczko's Smalltalk version (1.2, 1993) and Ned Konz's Perl version (Algorithm::Diff).''; + }; + name = ''diff-lcs-1.1.2''; + requiredGems = [ ]; + sha256 = ''1i5bfxh77whaasajhzd2qkm5zwy7ryb7pfc96m1fv9afwn6cg3yp''; + }; + diff_lcs_1_1_3 = { + basename = ''diff_lcs''; + meta = { + description = ''Diff::LCS is a port of Perl's Algorithm::Diff that uses the McIlroy-Hunt longest common subsequence (LCS) algorithm to compute intelligent differences between two sequenced enumerable containers''; + longDescription = ''Diff::LCS is a port of Perl's Algorithm::Diff that uses the McIlroy-Hunt +longest common subsequence (LCS) algorithm to compute intelligent differences +between two sequenced enumerable containers. The implementation is based on +Mario I. Wolczko's {Smalltalk version 1.2}[ftp://st.cs.uiuc.edu/pub/Smalltalk/MANCHESTER/manchester/4.0/diff.st] +(1993) and Ned Konz's Perl version +{Algorithm::Diff 1.15}[http://search.cpan.org/~nedkonz/Algorithm-Diff-1.15/]. + +This is release 1.1.3, fixing several small bugs found over the years. Version +1.1.0 added new features, including the ability to #patch and #unpatch changes +as well as a new contextual diff callback, Diff::LCS::ContextDiffCallbacks, +that should improve the context sensitivity of patching. + +This library is called Diff::LCS because of an early version of Algorithm::Diff +which was restrictively licensed. This version has seen a minor license change: +instead of being under Ruby's license as an option, the third optional license +is the MIT license.''; + }; + name = ''diff-lcs-1.1.3''; + requiredGems = [ ]; + sha256 = ''15wqs3md9slif6ag43vp6gw63r3a2zdqiyfapnnzkb7amgg930pv''; + }; erubis_2_7_0 = { basename = ''erubis''; meta = { @@ -174,6 +276,17 @@ simple to do. Currently the following builder objects are supported: requiredGems = [ ]; sha256 = ''1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3''; }; + highline_1_5_1 = { + basename = ''highline''; + meta = { + description = ''HighLine is a high-level command-line IO library.''; + homepage = ''http://highline.rubyforge.org''; + longDescription = ''A high-level IO library that provides validation, type conversion, and more for command-line interfaces. HighLine also includes a complete menu system that can crank out anything from simple list selection to complete shells with just minutes of work.''; + }; + name = ''highline-1.5.1''; + requiredGems = [ ]; + sha256 = ''0sawb011sc1i5glr80a4iflr0vvn3s5c97a4jmrhj3palv4df19i''; + }; hike_1_2_1 = { basename = ''hike''; meta = { @@ -185,6 +298,36 @@ simple to do. Currently the following builder objects are supported: requiredGems = [ ]; sha256 = ''1c78gja9i9nj76gdj65czhvwam6550l0w9ilnn8vysj9cwv0rg7b''; }; + hoe_2_3_3 = { + basename = ''hoe''; + meta = { + description = ''Hoe is a rake/rubygems helper for project Rakefiles''; + homepage = ''http://rubyforge.org/projects/seattlerb/''; + longDescription = ''Hoe is a rake/rubygems helper for project Rakefiles. It helps generate +rubygems and includes a dynamic plug-in system allowing for easy +extensibility. Hoe ships with plug-ins for all your usual project +tasks including rdoc generation, testing, packaging, and deployment. + +Plug-ins Provided: + +* Hoe::Clean +* Hoe::Debug +* Hoe::Deps +* Hoe::Flay +* Hoe::Flog +* Hoe::Inline +* Hoe::Package +* Hoe::Publish +* Hoe::RCov +* Hoe::Signing +* Hoe::Test + +See class rdoc for help. Hint: ri Hoe''; + }; + name = ''hoe-2.3.3''; + requiredGems = [ g.rubyforge_2_0_4 g.rake_0_9_2_2 ]; + sha256 = ''06jlnbhimrn6znimaaxm7kh2269lapkbmnp3wssrjmw06ms7lq9m''; + }; i18n_0_6_0 = { basename = ''i18n''; meta = { @@ -196,16 +339,38 @@ simple to do. Currently the following builder objects are supported: requiredGems = [ ]; sha256 = ''1pgmfhmh2wv409g7kla30mkp8jpslvp25vcmmim1figl87wpn3j0''; }; - json_1_6_3 = { + json_1_6_4 = { basename = ''json''; meta = { description = ''JSON Implementation for Ruby''; homepage = ''http://flori.github.com/json''; longDescription = ''This is a JSON implementation as a Ruby extension in C.''; }; - name = ''json-1.6.3''; + name = ''json-1.6.4''; requiredGems = [ ]; - sha256 = ''0bcl6r04b0r5c0n1y47c7d29r50rl2rzd2hsc23832kgfrc1488m''; + sha256 = ''1adka4y7z9v4lmd2zqyap21ghqdnjaivr1ghnqcnw3dmsdrgf39l''; + }; + json_pure_1_4_3 = { + basename = ''json_pure''; + meta = { + description = ''JSON Implementation for Ruby''; + homepage = ''http://flori.github.com/json''; + longDescription = ''This is a JSON implementation in pure Ruby.''; + }; + name = ''json_pure-1.4.3''; + requiredGems = [ ]; + sha256 = ''1xw357gkmk6712c94lhpsrq8j9v91mgc2nxlr1m6n20yl6sz2g9r''; + }; + json_pure_1_6_4 = { + basename = ''json_pure''; + meta = { + description = ''JSON Implementation for Ruby''; + homepage = ''http://flori.github.com/json''; + longDescription = ''This is a JSON implementation in pure Ruby.''; + }; + name = ''json_pure-1.6.4''; + requiredGems = [ ]; + sha256 = ''12i95k265gx4vy2cpxrb3z4slc4czsh3srgky2a6d5h3q6c1kvbf''; }; mail_2_3_0 = { basename = ''mail''; @@ -243,6 +408,17 @@ Copyright:: 2002 - 2011, Austin Ziegler requiredGems = [ ]; sha256 = ''0i4pmx86xbnlrhbbm9znnyfglmb21vwjvh262c6qw3m19w6ifs6p''; }; + minitar_0_5_3 = { + basename = ''minitar''; + meta = { + description = ''Provides POSIX tarchive management from Ruby programs.''; + homepage = ''http://rubyforge.org/projects/ruwiki/''; + longDescription = ''Archive::Tar::Minitar is a pure-Ruby library and command-line utility that provides the ability to deal with POSIX tar(1) archive files. The implementation is based heavily on Mauricio Ferna'ndez's implementation in rpa-base, but has been reorganised to promote reuse in other projects.''; + }; + name = ''minitar-0.5.3''; + requiredGems = [ ]; + sha256 = ''035vs1knnnjsb8arfp8vx75warvwcdpiljjwv38lqljai9v8fq53''; + }; multi_json_1_0_4 = { basename = ''multi_json''; meta = { @@ -254,6 +430,39 @@ Copyright:: 2002 - 2011, Austin Ziegler requiredGems = [ ]; sha256 = ''0f2yrlxcdhdskkm4q11p2didwl26wikxycysb7i49ndp94rklvcr''; }; + net_sftp_2_0_4 = { + basename = ''net_sftp''; + meta = { + description = ''A pure Ruby implementation of the SFTP client protocol''; + homepage = ''http://net-ssh.rubyforge.org/sftp''; + longDescription = ''A pure Ruby implementation of the SFTP client protocol''; + }; + name = ''net-sftp-2.0.4''; + requiredGems = [ g.net_ssh_2_2_2 ]; + sha256 = ''1f0ml1z7kjnd79avn42fmys8j0w2995j5lk30ak5n40bq805yvky''; + }; + net_ssh_2_0_23 = { + basename = ''net_ssh''; + meta = { + description = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.''; + homepage = ''http://github.com/net-ssh/net-ssh''; + longDescription = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.''; + }; + name = ''net-ssh-2.0.23''; + requiredGems = [ ]; + sha256 = ''1fllf6mgwc213m5mn266qwhl65zc84wl8rq9m3lvbggw9mh5ynrr''; + }; + net_ssh_2_2_2 = { + basename = ''net_ssh''; + meta = { + description = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.''; + homepage = ''http://github.com/net-ssh/net-ssh''; + longDescription = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.''; + }; + name = ''net-ssh-2.2.2''; + requiredGems = [ ]; + sha256 = ''11rlcb6w534g21x1g1jz1v1lvyj3zv6s621pf9cwl1aqbl6zh711''; + }; nix_0_1_1 = { basename = ''nix''; meta = { @@ -279,7 +488,7 @@ augments 'require' to find and load matching files.''; requiredGems = [ ]; sha256 = ''082zmail2h3cxd9z1wnibhk6aj4sb1f3zzwra6kg9bp51kx2c00v''; }; - rack_1_3_5 = { + rack_1_3_6 = { basename = ''rack''; meta = { description = ''a modular Ruby webserver interface''; @@ -293,9 +502,27 @@ middleware) into a single method call. Also see http://rack.rubyforge.org. ''; }; - name = ''rack-1.3.5''; + name = ''rack-1.3.6''; requiredGems = [ ]; - sha256 = ''1qg5nqd3a8v52hfcr9885vyfc9sscykp72by1xb1c090l5pc68hp''; + sha256 = ''1qkhwsr1gz4k5rlf9d6ga4cwkw4lbxpcywxy0bkg92js413hy2fl''; + }; + rack_1_4_0 = { + basename = ''rack''; + meta = { + description = ''a modular Ruby webserver interface''; + homepage = ''http://rack.rubyforge.org''; + longDescription = ''Rack provides a minimal, modular and adaptable interface for developing +web applications in Ruby. By wrapping HTTP requests and responses in +the simplest way possible, it unifies and distills the API for web +servers, web frameworks, and software in between (the so-called +middleware) into a single method call. + +Also see http://rack.rubyforge.org. +''; + }; + name = ''rack-1.4.0''; + requiredGems = [ ]; + sha256 = ''15mqryky86fhx0h3kiab5x1lamq62hq6kc3knl6v10p1az4zpcq9''; }; rack_cache_1_1 = { basename = ''rack_cache''; @@ -305,7 +532,7 @@ Also see http://rack.rubyforge.org. longDescription = ''HTTP Caching for Rack''; }; name = ''rack-cache-1.1''; - requiredGems = [ g.rack_1_3_5 ]; + requiredGems = [ g.rack_1_4_0 ]; sha256 = ''08jlym48qwfj7wddv0vpjj3vlc03q8wvbya24zbrjj8grgfgrvrl''; }; rack_mount_0_8_3 = { @@ -365,9 +592,20 @@ request helpers feature.''; longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.''; }; name = ''railties-3.1.3''; - requiredGems = [ g.rake_0_9_2_2 g.thor_0_14_6 g.rack_ssl_1_3_2 g.rdoc_3_11 ]; + requiredGems = [ g.thor_0_14_6 g.rack_ssl_1_3_2 g.rdoc_3_12 ]; sha256 = ''07kgr9nzvgwpjqwssiknlqds1a9mj74g1hqpwsj6720x4pk9r13h''; }; + rake_0_8_7 = { + basename = ''rake''; + meta = { + description = ''Ruby based make-like utility.''; + homepage = ''http://rake.rubyforge.org''; + longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies are specified in standard Ruby syntax.''; + }; + name = ''rake-0.8.7''; + requiredGems = [ ]; + sha256 = ''03z1zm7xwl2r9v945ambwbd9sn2smbi34xldmac7qjcmsvd7pcqh''; + }; rake_0_9_2_2 = { basename = ''rake''; meta = { @@ -390,7 +628,7 @@ request helpers feature.''; requiredGems = [ ]; sha256 = ''043w4695j7f9n0hawy9y0yci36linivsbp23v52v2qg64ji7hsiw''; }; - rdoc_3_11 = { + rdoc_3_12 = { basename = ''rdoc''; meta = { description = ''RDoc produces HTML and command-line documentation for Ruby projects''; @@ -401,11 +639,125 @@ documentation. See RDoc for a description of RDoc's markup and basic use.''; }; - name = ''rdoc-3.11''; - requiredGems = [ g.json_1_6_3 ]; - sha256 = ''0wq8525v21pxcnwgn5ypblcsb0xasnicjnqqd7mrrfqm2g3k2frm''; + name = ''rdoc-3.12''; + requiredGems = [ g.json_1_6_4 ]; + sha256 = ''0cd4hrkba7zr675m62yb87l7hpf0sp2qw8ccc2s0y2fa2fxdxdkp''; }; - sass_3_1_11 = { + rjb_1_3_3 = { + basename = ''rjb''; + meta = { + description = ''Ruby Java bridge''; + homepage = ''http://rjb.rubyforge.org/''; + longDescription = ''RJB is a bridge program that connect between Ruby and Java with Java Native Interface. +''; + }; + name = ''rjb-1.3.3''; + requiredGems = [ ]; + sha256 = ''0jhj1y84yzdr11li784m255jvc191vs8d3zck21rfqv4z4zpifz6''; + }; + rjb_1_3_8 = { + basename = ''rjb''; + meta = { + description = ''Ruby Java bridge''; + homepage = ''http://rjb.rubyforge.org/''; + longDescription = ''RJB is a bridge program that connect between Ruby and Java with Java Native Interface. +''; + }; + name = ''rjb-1.3.8''; + requiredGems = [ ]; + sha256 = ''0cwc3zh9ydwzvc176vjin7jpf8riisyjdwbywrmvc426kjyrrwwr''; + }; + rspec_2_1_0 = { + basename = ''rspec''; + meta = { + description = ''rspec-2.1.0''; + homepage = ''http://github.com/rspec/rspec''; + longDescription = ''Meta-gem that depends on the other rspec gems''; + }; + name = ''rspec-2.1.0''; + requiredGems = [ ]; + sha256 = ''16h7s8wr969wiig4qahr03ln144pz39jindlc3z11d064zvzhiza''; + }; + rspec_core_2_1_0 = { + basename = ''rspec_core''; + meta = { + description = ''rspec-core-2.1.0''; + homepage = ''http://github.com/rspec/rspec-core''; + longDescription = ''RSpec runner and example groups''; + }; + name = ''rspec-core-2.1.0''; + requiredGems = [ ]; + sha256 = ''1fs9c8dafg7v948wzxjhhzf0djr1rjva7lymah32rlj3x5xm9zmh''; + }; + rspec_expectations_2_1_0 = { + basename = ''rspec_expectations''; + meta = { + description = ''rspec-expectations-2.1.0''; + homepage = ''http://github.com/rspec/rspec-expectations''; + longDescription = ''rspec expectations (should[_not] and matchers)''; + }; + name = ''rspec-expectations-2.1.0''; + requiredGems = [ g.diff_lcs_1_1_3 ]; + sha256 = ''0p7gs3zsj70fz30209961fzdgia1qyrpg54v0ywhqmvc5kl0q8lc''; + }; + rspec_mocks_2_1_0 = { + basename = ''rspec_mocks''; + meta = { + description = ''rspec-mocks-2.1.0''; + homepage = ''http://github.com/rspec/rspec-mocks''; + longDescription = ''RSpec's 'test double' framework, with support for stubbing and mocking''; + }; + name = ''rspec-mocks-2.1.0''; + requiredGems = [ ]; + sha256 = ''1qhznpj0wq08z31i1rcv99dwx2abl4rlx2338ly0dcql54s8mma4''; + }; + rubyforge_2_0_3 = { + basename = ''rubyforge''; + meta = { + description = ''A script which automates a limited set of rubyforge operations''; + homepage = ''http://codeforpeople.rubyforge.org/rubyforge/''; + longDescription = ''A script which automates a limited set of rubyforge operations. + +* Run 'rubyforge help' for complete usage. +* Setup: For first time users AND upgrades to 0.4.0: + * rubyforge setup (deletes your username and password, so run sparingly!) + * edit ~/.rubyforge/user-config.yml + * rubyforge config +* For all rubyforge upgrades, run 'rubyforge config' to ensure you have latest.''; + }; + name = ''rubyforge-2.0.3''; + requiredGems = [ g.json_pure_1_6_4 ]; + sha256 = ''1ck9hkad55dy25819v4gd1nmnpvcrb3i4np3hc03h1j6q8qpxg5p''; + }; + rubyforge_2_0_4 = { + basename = ''rubyforge''; + meta = { + description = ''A script which automates a limited set of rubyforge operations''; + homepage = ''http://codeforpeople.rubyforge.org/rubyforge/''; + longDescription = ''A script which automates a limited set of rubyforge operations. + +* Run 'rubyforge help' for complete usage. +* Setup: For first time users AND upgrades to 0.4.0: + * rubyforge setup (deletes your username and password, so run sparingly!) + * edit ~/.rubyforge/user-config.yml + * rubyforge config +* For all rubyforge upgrades, run 'rubyforge config' to ensure you have latest.''; + }; + name = ''rubyforge-2.0.4''; + requiredGems = [ ]; + sha256 = ''1wdaa4nzy39yzy848fa1rybi72qlyf9vhi1ra9wpx9rpi810fwh1''; + }; + rubyzip_0_9_4 = { + basename = ''rubyzip''; + meta = { + description = ''rubyzip is a ruby module for reading and writing zip files''; + homepage = ''http://rubyzip.sourceforge.net/''; + }; + name = ''rubyzip-0.9.4''; + requiredGems = [ ]; + sha256 = ''1lc67ssqyz49rm1jms5sdvy6x41h070razxlmvj4j5q6w3qixx41''; + }; + sass_3_1_12 = { basename = ''sass''; meta = { description = ''A powerful but elegant CSS compiler that makes CSS fun again.''; @@ -416,9 +768,9 @@ See RDoc for a description of RDoc's markup and basic use.''; command line tool or a web-framework plugin. ''; }; - name = ''sass-3.1.11''; + name = ''sass-3.1.12''; requiredGems = [ ]; - sha256 = ''0ksbvvc210yd3fjk7gzsj25qzcd5ahw5rsh3bx94w53ylq60af2g''; + sha256 = ''10n2aic53290xsa3y3d63523s8xc78w5q5gqpns6cbljkdwb0ndy''; }; sprockets_2_0_3 = { basename = ''sprockets''; @@ -474,5 +826,15 @@ See RDoc for a description of RDoc's markup and basic use.''; requiredGems = [ ]; sha256 = ''1kwc25c1x8cvryjhpp8sx20vrd8h9g9gsl7p5393a88544qy41hb''; }; + xml_simple_1_0_12 = { + basename = ''xml_simple''; + meta = { + description = ''A simple API for XML processing.''; + homepage = ''http://xml-simple.rubyforge.org''; + }; + name = ''xml-simple-1.0.12''; + requiredGems = [ ]; + sha256 = ''0m7z3l8ccm3zd22gyx40fnfl0nah61jaigb4bkmplq0hdazyj60y''; + }; }; } diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix index abcb1d0dfe4..37f103f7772 100644 --- a/pkgs/development/interpreters/ruby/patches.nix +++ b/pkgs/development/interpreters/ruby/patches.nix @@ -1,49 +1,64 @@ -{fetchurl, writeScript, ruby, ncurses, sqlite, libxml2, libxslt, libffi, zlib, - libuuid, gems}: +{ fetchurl, writeScript, ruby, ncurses, sqlite, libxml2, libxslt, libffi +, zlib, libuuid, gems, jdk }: let + patchUsrBinEnv = writeScript "path-usr-bin-env" '' #!/bin/sh - set -x echo "===================" find "$1" -type f -name "*.rb" | xargs sed -i "s@/usr/bin/env@$(type -p env)@g" find "$1" -type f -name "*.mk" | xargs sed -i "s@/usr/bin/env@$(type -p env)@g" ''; + in + { sup = { buildInputs = [ gems.ncursesw ]; }; + sqlite3 = { propagatedBuildInputs = [ sqlite ]; }; + rails = { gemFlags = "--no-ri --no-rdoc"; }; + ncurses = { propagatedBuildInputs = [ ncurses ]; }; + ncursesw = { propagatedBuildInputs = [ ncurses ]; }; + nokogiri = { - buildFlags=["--with-xml2-dir=${libxml2} --with-xml2-include=${libxml2}/include/libxml2" - "--with-xslt-dir=${libxslt}" ]; + buildFlags = + [ "--with-xml2-dir=${libxml2} --with-xml2-include=${libxml2}/include/libxml2" + "--with-xslt-dir=${libxslt}" + ]; }; ffi = { postUnpack = "onetuh"; - buildFlags=["--with-ffi-dir=${libffi}"]; + buildFlags = ["--with-ffi-dir=${libffi}"]; NIX_POST_EXTRACT_FILES_HOOK = patchUsrBinEnv; }; xrefresh_server = - let patch = fetchurl { - url = "http://mawercer.de/~nix/xrefresh.diff.gz"; - sha256 = "1f7bnmn1pgkmkml0ms15m5lx880hq2sxy7vsddb3sbzm7n1yyicq"; - }; - in { - propagatedBuildInputs = [ gems.rb_inotify ]; + let + patch = fetchurl { + url = "http://mawercer.de/~nix/xrefresh.diff.gz"; + sha256 = "1f7bnmn1pgkmkml0ms15m5lx880hq2sxy7vsddb3sbzm7n1yyicq"; + }; + in { + propagatedBuildInputs = [ gems.rb_inotify ]; - # monitor implementation for Linux - postInstall = '' - cd $out/${ruby.gemPath}/gems/* - zcat ${patch} | patch -p 1 - ''; - }; + # monitor implementation for Linux + postInstall = '' + cd $out/${ruby.gemPath}/gems/* + zcat ${patch} | patch -p 1 + ''; # */ + }; xapian_full = { buildInputs = [ gems.rake zlib libuuid ]; gemFlags = "--no-rdoc --no-ri"; }; + + rjb = { + buildInputs = [ jdk ]; + JAVA_HOME = jdk; + }; } diff --git a/pkgs/development/interpreters/ruby/ruby-19.nix b/pkgs/development/interpreters/ruby/ruby-19.nix index 5e406509a8c..f47d0e524f7 100644 --- a/pkgs/development/interpreters/ruby/ruby-19.nix +++ b/pkgs/development/interpreters/ruby/ruby-19.nix @@ -4,7 +4,7 @@ , gdbm, gdbmSupport ? true , ncurses, readline, cursesSupport ? false , groff, docSupport ? false -, libyaml, yamlSupport ? false +, libyaml, yamlSupport ? true }: let diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index ca3e53e64f4..fe3fe1e251c 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -21,15 +21,15 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig x11 fontconfig pixman xlibs.libXrender ] + [ pkgconfig x11 fontconfig xlibs.libXrender ] ++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ] - ++ stdenv.lib.optional gobjectSupport glib # On non-GNU systems we need GNU Gettext for libintl. ++ stdenv.lib.optional (!stdenv.isLinux) gettext; propagatedBuildInputs = - [ freetype ] ++ + [ freetype pixman ] ++ + stdenv.lib.optional gobjectSupport glib ++ stdenv.lib.optional postscriptSupport zlib ++ stdenv.lib.optional pngSupport libpng; diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix index 39170dd1ca7..47d3d22f043 100644 --- a/pkgs/development/libraries/grantlee/default.nix +++ b/pkgs/development/libraries/grantlee/default.nix @@ -1,16 +1,15 @@ { stdenv, fetchurl, qt4, cmake }: stdenv.mkDerivation rec { - name = "grantlee-0.1.9"; + name = "grantlee-0.2.0"; -# Upstream download server has country code firewall, so I made a mirror. The -# URL of the mirror may change in the future, so don't publish it yet. +# Upstream download server has country code firewall, so I made a mirror. src = fetchurl { urls = [ "http://downloads.grantlee.org/${name}.tar.gz" "http://www.loegria.net/grantlee/${name}.tar.gz" ]; - sha256 = "112rynnd10sxw5yqbv33g7yxs79d6clfbs2xbwflsrgkbyk5iw37"; + sha256 = "0x6lvn5i9025vdbs6sybs2mm5ay5y40f7nvb58mc2k518rmjb9j3"; }; buildInputs = [ cmake qt4 ]; diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix index fd11df19905..48f9ce492c2 100644 --- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "attoparsec-conduit"; - version = "0.0.0"; - sha256 = "1cwmi86faisg10l15w8mz3619phvrn2hl10blr6pziv1k8c3ncj7"; + version = "0.0.0.1"; + sha256 = "1z6v2j08j3fl329npiz9klbz5gbcl0q8vgz3drmrmyhn31a6cvsf"; buildDepends = [ attoparsec conduit text transformers ]; meta = { homepage = "http://github.com/snoyberg/conduit"; diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index fa210279ec0..40bef100607 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "0.0.1.1"; - sha256 = "1144l40x8xvr3dkkhbg33fnajn9ggavxqa094zan0bdqljh48ips"; + version = "0.0.3"; + sha256 = "149xj6i2whpjf6jqsgfgvpbwni5r0v3qrg7g42i78bd6n40xma72"; buildDepends = [ liftedBase monadControl text transformers transformersBase ]; diff --git a/pkgs/development/libraries/haskell/failure/default.nix b/pkgs/development/libraries/haskell/failure/default.nix index b481fb39e54..fc5c9488e59 100644 --- a/pkgs/development/libraries/haskell/failure/default.nix +++ b/pkgs/development/libraries/haskell/failure/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "failure"; - version = "0.1.0.1"; - sha256 = "15zkhnxkfsd3qf4wmcp6kcfip9ahb4s3ywnh14whmhicp9mkm3q0"; + version = "0.1.2"; + sha256 = "14pwj0zb5kk2wadpddanxv3kr0hzklxhzbprmkh40yn1dbwgdas4"; meta = { homepage = "http://www.haskell.org/haskellwiki/Failure"; description = "A simple type class for success/failure computations"; diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix index 5271176a5cf..fc377e554a6 100644 --- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix +++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "haskell-src-meta"; - version = "0.5.0.2"; - sha256 = "059zvr91bnajql19c76vwivvy6sbca83ky8ja91bf8xv1p3jfz3w"; + version = "0.5.0.3"; + sha256 = "0c270088b5p3drr3f75ln210py2h4dfkkfgvly3ry42yl6xkvm2j"; buildDepends = [ haskellSrcExts syb thLift ]; meta = { description = "Parse source to template-haskell abstract syntax"; diff --git a/pkgs/development/libraries/haskell/hxt-charproperties/default.nix b/pkgs/development/libraries/haskell/hxt-charproperties/default.nix index c466d877488..9e2b9a21bb3 100644 --- a/pkgs/development/libraries/haskell/hxt-charproperties/default.nix +++ b/pkgs/development/libraries/haskell/hxt-charproperties/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hxt-charproperties"; - version = "9.1.0"; - sha256 = "1a227czzbbw8pigc2dk5fyyc4x1rpx82mb5c4hpjjz97l0sdlc23"; + version = "9.1.1"; + sha256 = "14xv0q1hh0k8lgispc4fa49cvyg9s7936kp42vr9b0pyd1q4zid8"; meta = { homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html"; description = "Character properties and classes for XML and Unicode"; diff --git a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix index 94e14429966..c18bdea3875 100644 --- a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix +++ b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hxt-regex-xmlschema"; - version = "9.0.1"; - sha256 = "1mg22fa0f0cbj9gkl5zaq0xh94ljkmzrc019h3cxv728chpgby0c"; + version = "9.0.4"; + sha256 = "0jl89p9sb76zb6j2b9ssxaai6jq3jbnnpv4v05wfvlmk8apckwgf"; buildDepends = [ hxtCharproperties parsec ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema"; diff --git a/pkgs/development/libraries/haskell/hxt-unicode/default.nix b/pkgs/development/libraries/haskell/hxt-unicode/default.nix index 452a38c79c8..6584a69b4ba 100644 --- a/pkgs/development/libraries/haskell/hxt-unicode/default.nix +++ b/pkgs/development/libraries/haskell/hxt-unicode/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hxt-unicode"; - version = "9.0.1"; - sha256 = "0g8qz7waip7zsdi35idj9db6qd7lqbv88l0c4rz8q7nh85jsp6ym"; + version = "9.0.2"; + sha256 = "1ri3198j0bavgam861yiiisl43rh4pbkmji7g6v3jnnch7834hdd"; buildDepends = [ hxtCharproperties ]; meta = { homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html"; diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix index 979fa3c11e9..c8871f423c0 100644 --- a/pkgs/development/libraries/haskell/hxt/default.nix +++ b/pkgs/development/libraries/haskell/hxt/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hxt"; - version = "9.1.5"; - sha256 = "0w0l86y8q2391dvqn112f2s0infm1zzqnlp9hhwcx8jg2slsxbcm"; + version = "9.1.6"; + sha256 = "1ir1az8zpi9adkwpm3m4gjrwrn9cbmwd1dbqz4lrwi82i54c9bpb"; buildDepends = [ binary deepseq HUnit hxtCharproperties hxtRegexXmlschema hxtUnicode network parsec diff --git a/pkgs/development/libraries/haskell/irc/default.nix b/pkgs/development/libraries/haskell/irc/default.nix index be3818cb7d8..c7e222e1d14 100644 --- a/pkgs/development/libraries/haskell/irc/default.nix +++ b/pkgs/development/libraries/haskell/irc/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "irc"; - version = "0.4.4.2"; - sha256 = "1bbxlmb6jzz0zw18nr3d6lgd83vi9hrjahfcf1dswc946wi31s97"; + version = "0.5.0.0"; + sha256 = "0bid9iqgrppkl7hl1cd2m1pvvk5qva53fqfl0v5ld52j904c50sr"; buildDepends = [ parsec ]; meta = { description = "A small library for parsing IRC messages"; diff --git a/pkgs/development/libraries/haskell/primitive/default.nix b/pkgs/development/libraries/haskell/primitive/default.nix index 62693a6d096..ab8dc18ad0a 100644 --- a/pkgs/development/libraries/haskell/primitive/default.nix +++ b/pkgs/development/libraries/haskell/primitive/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "primitive"; - version = "0.4.0.1"; - sha256 = "08j7js5y2vk3ywfhs260fxngd725xkvhrp20dcwb67fk8qgxh4bz"; + version = "0.4.1"; + sha256 = "06999i59xhvjwfdbnr1n09zkvg7lnim64nqxqlvk0x6slkidb7f6"; meta = { homepage = "http://code.haskell.org/primitive"; description = "Wrappers for primitive operations"; diff --git a/pkgs/development/libraries/haskell/streamproc/default.nix b/pkgs/development/libraries/haskell/streamproc/default.nix index 5e327ac78a5..fef81d92212 100755 --- a/pkgs/development/libraries/haskell/streamproc/default.nix +++ b/pkgs/development/libraries/haskell/streamproc/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "streamproc"; - version = "1.4"; - sha256 = "fbff569d7b294850998e9a6b6a14bf81484b1adb312801ea15d1d890faff12cf"; + version = "1.6"; + sha256 = "0bb1rdzzpjggw7dk4q3hwa1j1bvkfqhz6vrd45shcp57ixqlp6ws"; meta = { homepage = "http://gitorious.org/streamproc"; description = "Stream Processer Arrow"; diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix index 85c3a32930d..368c29017ce 100644 --- a/pkgs/development/libraries/haskell/vty/default.nix +++ b/pkgs/development/libraries/haskell/vty/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "vty"; - version = "4.7.0.6"; - sha256 = "1jb7c4wh8pjb5salh725vxjbx29wy6ph5gvdp177piq40v3zvbg3"; + version = "4.7.0.8"; + sha256 = "1wh94m2i0ivdkf8hhl9qrsfs7z3mk0xrzgwdfgqw7lhq321i2bnm"; buildDepends = [ deepseq mtl parallel parsec terminfo utf8String vector ]; diff --git a/pkgs/development/libraries/haskell/wxHaskell/wx.nix b/pkgs/development/libraries/haskell/wxHaskell/wx.nix index ec4511ee481..9b7f94d1cbd 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wx.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wx.nix @@ -2,13 +2,13 @@ cabal.mkDerivation (self: { pname = "wx"; - version = "0.12.1.6"; - sha256 = "1p0gn46gk1abin095va22n9bycxhm2cq1vyvwiypcdq7jq541lhk"; + version = "0.13.2"; + sha256 = "19k0sa16dr63bgl9j37zrxnknlnq3c2927xccwc2vq19vl7n52nd"; buildDepends = [ stm wxcore ]; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell"; - license = "LGPL"; + license = "unknown"; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix index c2fbdaeffa6..647f715d3ce 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix @@ -2,14 +2,14 @@ cabal.mkDerivation (self: { pname = "wxcore"; - version = "0.12.1.7"; - sha256 = "12vs449xg2xjp503ywjwxadan3v7dq38ph66292szwj1vmhl07v4"; + version = "0.13.2"; + sha256 = "1kzgqmh0vjm1qcskkfdyjbbq276nhd76w7bgxgdq67zl48bfc09g"; buildDepends = [ parsec stm time wxdirect ]; extraLibraries = [ libX11 mesa wxGTK ]; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell core"; - license = "LGPL"; + license = "unknown"; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix index 3cbd616353b..8430c1fa59d 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix @@ -1,12 +1,12 @@ -{ cabal, parsec, time }: +{ cabal, parsec, strict, time }: cabal.mkDerivation (self: { pname = "wxdirect"; - version = "0.12.1.4"; - sha256 = "0v1blh3l02h58cvsngfax5knmg51lil1kj6pr5iqrbcrivp2nh7f"; + version = "0.13.1.1"; + sha256 = "00zij92hm7rbl8sx6f625cqzwgi72c8qn1dj6d1q4zg14dszarad"; isLibrary = true; isExecutable = true; - buildDepends = [ parsec time ]; + buildDepends = [ parsec strict time ]; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "helper tool for building wxHaskell"; diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index 79f10512b46..f406dcbb105 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "xml-conduit"; - version = "0.5.0"; - sha256 = "008rrqglxajihcf3yp9cwif67dnabyjjiymxvssznrl8ljz4yn8y"; + version = "0.5.0.1"; + sha256 = "0n30mk3dmdwxjw4vgfmlj7dzbiah9vj4hlg258qkvy5likzz1j5n"; buildDepends = [ attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit conduit dataDefault failure systemFilepath text transformers diff --git a/pkgs/development/libraries/libgadu/default.nix b/pkgs/development/libraries/libgadu/default.nix index ef8439b8b88..98324c184c6 100644 --- a/pkgs/development/libraries/libgadu/default.nix +++ b/pkgs/development/libraries/libgadu/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "045a0bd395k3ramdvlzyfx3878p42fv4r04rgasmdsm2n33wgm38"; }; - buildInputs = [ zlib ]; + propagatedBuildInputs = [ zlib ]; meta = { description = "A library to deal with gadu-gadu protocol (most popular polish IM protocol)"; diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 3774d0993c6..54dfc1aecc6 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, perl}: stdenv.mkDerivation rec { - name = "libical-0.47"; + name = "libical-0.48"; src = fetchurl { url = "mirror://sourceforge/freeassociation/${name}.tar.gz"; - sha256 = "1218vaaks9lvx31mrc8212kyngw2k68xm0914vrd77ixn55vnk5g"; + sha256 = "1w6znkh0xxhbcm717mbzfva9ycrqs2lajhng391i7pghaw3qprra"; }; buildNativeInputs = [ perl ]; } diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index bd1c97c3043..95bde495c0e 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -1,8 +1,7 @@ -{ stdenv, fetchurl, glib, qt4, pkgconfig, libnl, pygobject, python, automake -, autoconf }: +{ stdenv, fetchurl, glib, qt4, pkgconfig, libnl, pygobject, python }: let - version = "014"; + version = "016"; in stdenv.mkDerivation rec { @@ -10,32 +9,21 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://launchpad.net/ntrack/main/${version}/+download/${name}.tar.gz"; - sha256 = "1aqn3q0dj2kk0j9rf02qgbfghlykaas7q0g8wxyz7nd6zg4qhyj2"; + sha256 = "037ig5y0mp327m0hh4pnfr3vmsk3wrxgfjy3645q4ws9vdhx807w"; }; buildInputs = [ libnl qt4 ]; - buildNativeInputs = [ pkgconfig python automake autoconf ]; + buildNativeInputs = [ pkgconfig python ]; configureFlags = "--without-gobject CFLAGS=--std=gnu99"; - patchP0 = fetchurl { - url = http://bazaar.launchpad.net/~asac/ntrack/main/diff/312/309; - name = "ntrack-bzr-309-to-312.patch"; - sha256 = "1bpjpikln2i7nsmd2gl82g08yzaqac311sgsva7z7pqccxz0vsj5"; + patchPhase = ''sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c''; + + meta = { + description = "Network Connectivity Tracking library for Desktop Applications"; + homepage = https://launchpad.net/ntrack; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.urkud ]; }; - - patchP1 = fetchurl { - url = "https://bugs.launchpad.net/ntrack/+bug/750554/+attachment/2291609/+files/ntrack_libnl_link.diff"; - sha256 = "1al6wfjph7nmck1q2q2z98cnzcrwpln2wwh45xynsxr6wgczwck6"; - }; - - patchPhase = - '' - patch -p0 < ${patchP0} - patch -p1 < ${patchP1} - sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c - ''; - - preConfigure = "automake"; # The second patch changes Makefile.am files } diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix index d1fa607c734..455dbceff23 100644 --- a/pkgs/development/libraries/openbabel/default.nix +++ b/pkgs/development/libraries/openbabel/default.nix @@ -1,19 +1,19 @@ -{stdenv, fetchurl, cmake, zlib, libxml2, eigen, python }: +{stdenv, fetchurl, cmake, zlib, libxml2, eigen, python, cairo, pkgconfig }: stdenv.mkDerivation rec { - name = "openbabel-2.3.0"; - - src = fetchurl { + name = "openbabel-2.3.1"; + + src = fetchurl { url = "mirror://sourceforge/openbabel/${name}.tar.gz"; - sha256 = "1yv1z04il8q6nhcc3l9019aj7nzs3bfm667s2vkg5cc3dljwpbbd"; + sha256 = "18yprqsk0fi1ri4fmvpx2ym6gx9fp3by681pl3jffpjqmz4qnbly"; }; - + # TODO : perl & python bindings; # TODO : wxGTK: I have no time to compile # TODO : separate lib and apps - buildInputs = [ zlib libxml2 eigen python ]; + buildInputs = [ zlib libxml2 eigen python cairo ]; - buildNativeInputs = [ cmake ]; + buildNativeInputs = [ cmake pkgconfig ]; meta = { platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix index 0bfe4c2335c..824c3587655 100644 --- a/pkgs/development/libraries/wxGTK-2.8/default.nix +++ b/pkgs/development/libraries/wxGTK-2.8/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto +, gstreamer, gstPluginsBase, GConf , mesa, compat24 ? false, compat26 ? true, unicode ? true, }: @@ -10,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1gjs9vfga60mk4j4ngiwsk9h6c7j22pw26m3asxr1jwvqbr8kkqk"; }; - buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa ]; + buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa gstreamer gstPluginsBase GConf ]; buildNativeInputs = [ pkgconfig ]; @@ -21,6 +22,7 @@ stdenv.mkDerivation { "--disable-precomp-headers" (if unicode then "--enable-unicode" else "") "--with-opengl" + "--enable-mediactrl" ]; # This variable is used by configure to find some dependencies. @@ -39,11 +41,13 @@ stdenv.mkDerivation { "; postBuild = "(cd contrib/src && make)"; - + postInstall = " (cd contrib/src && make install) (cd $out/include && ln -s wx-*/* .) "; passthru = {inherit gtk compat24 compat26 unicode;}; + + enableParallelBuilding = true; } diff --git a/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix b/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix index 0520adef4dc..1a614fada90 100644 --- a/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix +++ b/pkgs/development/libraries/wxGTK-2.9/2.9.0.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto +, gstreamer, gstPluginsBase, GConf , mesa, compat24 ? false, compat26 ? true, unicode ? true, }: @@ -10,7 +11,7 @@ stdenv.mkDerivation { sha256 = "10n75mpypd9411b29gxmi0g2s7dgbfwkgiyhxwkjsyrmyvfc3xcc"; }; - buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa ]; + buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa gstreamer gstPluginsBase GConf ]; buildNativeInputs = [ pkgconfig ]; @@ -21,6 +22,7 @@ stdenv.mkDerivation { "--disable-precomp-headers" (if unicode then "--enable-unicode" else "") "--with-opengl" + "--enable-mediactrl" ]; SEARCH_LIB = "${mesa}/lib"; @@ -36,4 +38,6 @@ stdenv.mkDerivation { "; passthru = {inherit gtk compat24 compat26 unicode;}; + + enableParallelBuilding = true; } diff --git a/pkgs/development/libraries/wxGTK-2.9/default.nix b/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix similarity index 89% rename from pkgs/development/libraries/wxGTK-2.9/default.nix rename to pkgs/development/libraries/wxGTK-2.9/2.9.1.nix index 2f83d3cc03f..c1056bb9ef1 100644 --- a/pkgs/development/libraries/wxGTK-2.9/default.nix +++ b/pkgs/development/libraries/wxGTK-2.9/2.9.1.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto +, gstreamer, gstPluginsBase, GConf , mesa, compat24 ? false, compat26 ? true, unicode ? true, }: @@ -10,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1f6pdlzjawhhs17hmimk0l1n3g4g48n2iqrgl181xqfrbxyz75b8"; }; - buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa ]; + buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto mesa gstreamer gstPluginsBase GConf ]; buildNativeInputs = [ pkgconfig ]; @@ -21,6 +22,7 @@ stdenv.mkDerivation { "--disable-precomp-headers" (if unicode then "--enable-unicode" else "") "--with-opengl" + "--enable-mediactrl" ]; SEARCH_LIB = "${mesa}/lib"; @@ -36,4 +38,6 @@ stdenv.mkDerivation { "; passthru = {inherit gtk compat24 compat26 unicode;}; + + enableParallelBuilding = true; } diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index c29f7c4456f..af82a45c0fa 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -85,15 +85,15 @@ stdenv.mkDerivation rec { makeFlagsArray=(CUPSSERVERBIN=$out/lib/cups CUPSSERVERROOT=$out/etc/cups CUPSDATA=$out/share/cups) ''; - configureFlags = if x11Support then [ "--with-x" ] else [ "--without-x" ]; + configureFlags = + (if x11Support then [ "--with-x" ] else [ "--without-x" ]) ++ + (if cupsSupport then [ "--enable-cups" "--with-install-cups" ] else [ "--disable-cups" ]); doCheck = true; - preBuild = "make so"; + installTargets="install soinstall"; postInstall = '' - make soinstall - for i in $fonts; do (cd $out/share/ghostscript && tar xvfz $i) done diff --git a/pkgs/os-specific/linux/conky/curl-types-h.patch b/pkgs/os-specific/linux/conky/curl-types-h.patch new file mode 100644 index 00000000000..ba99da23b46 --- /dev/null +++ b/pkgs/os-specific/linux/conky/curl-types-h.patch @@ -0,0 +1,25 @@ +curl removed header +diff --git a/src/ccurl_thread.c b/src/ccurl_thread.c +index 10e73a6..9bea299 100644 +--- a/src/ccurl_thread.c ++++ b/src/ccurl_thread.c +@@ -33,7 +33,6 @@ + #endif /* DEBUG */ + + #include +-#include + #include + + /* +diff --git a/src/eve.c b/src/eve.c +index dc07264..f62a5f6 100644 +--- a/src/eve.c ++++ b/src/eve.c +@@ -37,7 +37,6 @@ + #include + + #include +-#include + #include + + #include diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 29a81592c14..fda361d6c74 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -1,15 +1,19 @@ {stdenv, fetchurl, pkgconfig, libxml2, curl, wirelesstools, glib, openssl}: -stdenv.mkDerivation { - name = "conky-1.7.2"; +stdenv.mkDerivation rec { + name = "conky-1.8.1"; src = fetchurl { - url = "mirror://sourceforge/conky/conky-1.7.2.tar.bz2"; - sha256 = "0p375id2saxm2bp6c33ddn9d6rxymmq60ajlvx49smwhzyqa3h5k"; + url = "mirror://sourceforge/conky/${name}.tar.bz2"; + sha256 = "0hsybra4qzaqzny6n66m7768vbwkikajcvcbsqgnnnb9527jfnpq"; }; buildInputs = [ pkgconfig libxml2 curl wirelesstools glib openssl ]; - configureFlags = "--disable-x11 --disable-xdamage --disable-own-window --disable-xft --disable-lua --enable-mpd --enable-double-buffer --enable-proc-uptime --enable-seti --enable-wlan --enable-rss"; + configureFlags = + (map (x: "--disable-${x}") [ "x11" "xdamage" "own-window" "xft" "lua" "ncurses" ]) + ++ (map (x: "--enable-${x}") [ "mpd" "double-buffer" "wlan" "rss" ]); + + patches = [ ./curl-types-h.patch ]; meta = { homepage = http://conky.sourceforge.net/; diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix new file mode 100644 index 00000000000..6ad2227ee69 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -0,0 +1,32 @@ +# TODO: some files are not at the right place. +# For now, we take the strategy of adding symlinks to fix this, +# however it is probably better to extract the files from +# the appropriate debian binary packages. + +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "firmware-linux-nonfree-0.34"; + + src = fetchurl { + url = "mirror://debian/pool/non-free/f/firmware-nonfree/firmware-nonfree_0.34.tar.gz"; + sha256 = "94fe856d00f63559486b7684c0fae9b30bee599c6d7dea8c7e00d2dcb548ee8a"; + }; + + phases = [ "unpackPhase" "patchPhase" "installPhase" "postInstall" ]; + + patchPhase = "rm -rf debian defines TODO"; + + installPhase = "ensureDir $out && cp -ra * $out/"; + + # repeat the same trick for radeon, 3com, etc. + postInstall = "ln -s $out/realtek/rtlwifi $out/rtlwifi"; + + meta = { + description = "Non-free kernel firmware (packaged by Debian)"; + homepage = "http://packages.debian.org/sid/firmware-linux-nonfree"; + license = "unfree-redistributable-firmware"; + priority = "10"; + }; +} + diff --git a/pkgs/os-specific/linux/firmware/rtl8168e-2/default.nix b/pkgs/os-specific/linux/firmware/rtl8168e-2/default.nix new file mode 100644 index 00000000000..a73ae978597 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/rtl8168e-2/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +let + src = fetchurl { + url = "http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=blob_plain;f=rtl_nic/rtl8168e-2.fw"; + sha256 = "11lkwc6r6f5pi8clxajp43j6dzapydgxaxaschribpvhn8lrjj0a"; + name = "rtl8168e-2.fw"; + }; +in +stdenv.mkDerivation { + name = "rtl8168e-2-firmware-2012.01.10"; + + unpackPhase = "true"; + + buildPhase = "true"; + + installPhase = "install -v -D ${src} $out/rtl_nic/${src.name}"; + + meta = { + description = "Firmware for the Realtek Gigabit Ethernet controllers"; + }; +} diff --git a/pkgs/os-specific/linux/firmware/rtl8192c/default.nix b/pkgs/os-specific/linux/firmware/rtl8192c/default.nix index 877784d4b58..85bbb27c67f 100644 --- a/pkgs/os-specific/linux/firmware/rtl8192c/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8192c/default.nix @@ -1,20 +1,11 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation rec { +{stdenv, firmwareLinuxNonfree}: +stdenv.mkDerivation { name = "rtl8192c-fw"; - src = fetchurl { - url = "ftp://WebUser:AxPL9s3k@202.134.71.21/cn/wlan/92ce_se_de_linux_mac80211_0004.0816.2011.tar.gz"; - sha256 = "1kg63h5rj4kja2csmqsrxjipb1wpznfbrvn9cla9d9byksy5fn64"; - }; + src = firmwareLinuxNonfree; - phases = [ "unpackPhase" "installPhase" ]; + phases = [ "installPhase" ]; + installPhase = "ensureDir $out/rtlwifi && cp $src/realtek/rtlwifi/rtl8192cfw.bin $out/rtlwifi/rtl8192cfw.bin"; - # Installation copies the firmware AND the license. The license - # says: "Your rights to redistribute the Software shall be - # contingent upon your installation of this Agreement in its - # entirety in the same directory as the Software." - installPhase = "ensureDir $out; cp -a firmware/* $out"; - meta = { description = "Firmware for the Realtek RTL8192c wireless cards"; homepage = "http://www.realtek.com"; diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index dd3d585c0dd..3f464dbd656 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { - name = "sysstat-9.0.6.1"; + name = "sysstat-10.0.3"; src = fetchurl { url = "http://perso.orange.fr/sebastien.godard/${name}.tar.bz2"; - sha256 = "061r616cc0wfjkrk5ywqcwh5gwvm3gw92phfkj9bhlzxhi9srkr7"; + sha256 = "0z7zr1b4xg9k8rbk2rnghjcycdfi0vb55f117d46ygcdym9ks0i2"; }; buildInputs = [ gettext ]; diff --git a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix index b8f88216dfa..f04297096d2 100644 --- a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix +++ b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { src = fetchgit { url = http://bitmath.org/git/multitouch.git; rev = "4d87c041f6a232aa30528d70d4b9946d1824b4ed"; - sha256 = "de705e34bc75654139dfcbedfe43a3d182d140b198fcd57ab190d549471305ca"; + sha256 = "79397c8f99deb2a415e8c9008a2847d973ad19ea004e732613baed707df46fc9"; }; # Configuration from http://bitmath.org/code/multitouch/ diff --git a/pkgs/servers/sql/mysql51/default.nix b/pkgs/servers/sql/mysql51/default.nix index ddf5c16bef1..71c9713e3bb 100644 --- a/pkgs/servers/sql/mysql51/default.nix +++ b/pkgs/servers/sql/mysql51/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "07xbnwk7h1xya8s6dw34nrv7ampzag8l0l1szd2pc9zyqkzhydw4"; }; - buildInputs = [ps ncurses zlib perl openssl]; + buildInputs = [ncurses zlib perl openssl] ++ stdenv.lib.optional stdenv.isLinux ps; configureFlags = "--enable-thread-safe-client --with-ssl=${openssl} --with-embedded-server --with-plugins=max-no-ndb" + (if stdenv.system == "x86_64-linux" then " --with-lib-ccflags=-fPIC" else ""); @@ -30,5 +30,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.mysql.com/; description = "The world's most popular open source database"; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 17f0afadef4..8342c4f7d22 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1468,11 +1468,11 @@ let })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoati = (stdenv.mkDerivation ((if overrides ? xf86videoati then overrides.xf86videoati else x: x) { - name = "xf86-video-ati-6.14.2"; + name = "xf86-video-ati-6.14.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ati-6.14.2.tar.bz2; - sha256 = "1p18lfw7ii8k1vam75wv9a2piwf6n2988dh56i4b98zf4av78y81"; + url = mirror://xorg/individual/driver/xf86-video-ati-6.14.3.tar.bz2; + sha256 = "1d1ph7xvgcr7rdf5sgibhas625aghvm3f61yzwmfk8znxx4jcjl4"; }; 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 ;}; diff --git a/pkgs/servers/x11/xorg/tarballs-7.6.list b/pkgs/servers/x11/xorg/tarballs-7.6.list index b90f4780cfa..250faabfa17 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.6.list +++ b/pkgs/servers/x11/xorg/tarballs-7.6.list @@ -127,7 +127,7 @@ mirror://xorg/X11R7.6/src/everything/xf86-input-void-1.3.1.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-apm-1.2.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-ark-0.7.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-ast-0.91.10.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-6.14.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-6.14.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-chips-1.2.3.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-cirrus-1.3.2.tar.bz2 mirror://xorg/X11R7.6/src/everything/xf86-video-dummy-0.3.4.tar.bz2 diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index b314da4a3ed..bdde709c2c2 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -20,7 +20,7 @@ rec { inherit (s) name; inherit buildInputs; - configureFlags = []; + configureFlags = "--enable-gc=${a.boehmgc} --enable-offscreen"; /* doConfigure should be removed if not needed */ phaseNames = ["setVars" "doUnpack" "fixPaths" "extractTexinfoTex" @@ -28,7 +28,6 @@ rec { "fixInfoDir"]; setVars = a.noDepEntry '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.boehmgc}/include/gc" export HOME="$PWD" ''; diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index da54c185410..2e26fb7ddba 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "tmux"; - version = "1.3"; + version = "1.5"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "72c2d6f1c30fb4ccbd29b530a7d8a08e67c9c2d87ac8d67e3806561670fc0362"; + sha256 = "eb8215b57c05b765d2446d9acb2bc5edcdb3eb4ea31af89ee127a27e90056306"; }; makeFlags = "PREFIX=\${out}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7b56ed67be..1b918cef6f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -177,7 +177,7 @@ let # Applying this to an attribute set will cause nix-env to look # inside the set for derivations. - recurseIntoAttrs = attrs: attrs // {recurseForDerivations = true;}; + recurseIntoAttrs = attrs: attrs // { recurseForDerivations = true; }; builderDefs = lib.composedArgsAndFun (import ../build-support/builder-defs/builder-defs.nix) { inherit stringsWithDeps lib stdenv writeScript @@ -4686,14 +4686,20 @@ let wxGTK28 = callPackage ../development/libraries/wxGTK-2.8 { inherit (gtkLibs) gtk; - }; - - wxGTK29 = callPackage ../development/libraries/wxGTK-2.9 { - inherit (gtkLibs) gtk; + inherit (gst_all) gstreamer gstPluginsBase; + inherit (gnome) GConf; }; wxGTK290 = callPackage ../development/libraries/wxGTK-2.9/2.9.0.nix { inherit (gtkLibs) gtk; + inherit (gst_all) gstreamer gstPluginsBase; + inherit (gnome) GConf; + }; + + wxGTK291 = callPackage ../development/libraries/wxGTK-2.9/2.9.1.nix { + inherit (gtkLibs) gtk; + inherit (gst_all) gstreamer gstPluginsBase; + inherit (gnome) GConf; }; wtk = callPackage ../development/libraries/wtk { }; @@ -6008,6 +6014,8 @@ let qemu_kvm = callPackage ../os-specific/linux/qemu-kvm { }; + firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { }; + radeontools = callPackage ../os-specific/linux/radeontools { }; radeonR700 = callPackage ../os-specific/linux/firmware/radeon-r700 { }; @@ -6030,6 +6038,8 @@ let rtl8192cfw = callPackage ../os-specific/linux/firmware/rtl8192c { }; + rtl8168e2fw = callPackage ../os-specific/linux/firmware/rtl8168e-2 { }; + sdparm = callPackage ../os-specific/linux/sdparm { }; shadow = callPackage ../os-specific/linux/shadow { }; @@ -6445,14 +6455,16 @@ let cdrtools = callPackage ../applications/misc/cdrtools { }; + centerim = callPackage ../applications/networking/instant-messengers/centerim { }; + chatzilla = callPackage ../applications/networking/irc/chatzilla { xulrunner = firefox36Pkgs.xulrunner; }; - chrome = callPackage ../applications/networking/browsers/chromium { + chrome = lowPrio (callPackage ../applications/networking/browsers/chromium { inherit (gnome) GConf; patchelf = patchelf06; - }; + }); chromeWrapper = wrapFirefox { browser = chrome; browserName = "chrome"; desktopName = "Chrome"; @@ -7408,8 +7420,10 @@ let pythonBindings = false; perlBindings = false; javahlBindings = false; + saslSupport = false; compressionSupport = true; httpd = apacheHttpd; + sasl = cyrus_sasl; }; subversionClient = lowPrio (appendToName "client" (subversion.override { @@ -8204,6 +8218,8 @@ let stdenv = overrideGCC stdenv gcc42; }; + archimedes = callPackage ../applications/science/electronics/archimedes { }; + biolib = callPackage ../development/libraries/science/biology/biolib { }; emboss = callPackage ../applications/science/biology/emboss { }; @@ -8562,11 +8578,12 @@ let texLive = builderDefsPackage (import ../misc/tex/texlive) { inherit builderDefs zlib bzip2 ncurses libpng ed - gd t1lib freetype icu perl ruby expat curl + gd t1lib freetype icu perl expat curl libjpeg bison python fontconfig flex; inherit (xlibs) libXaw libX11 xproto libXt libXpm libXmu libXext xextproto libSM libICE; ghostscript = ghostscriptX; + ruby = ruby18; }; /* Look in configurations/misc/raskin.nix for usage example (around revisions