diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix new file mode 100644 index 00000000000..c1579579d81 --- /dev/null +++ b/pkgs/applications/graphics/k3d/default.nix @@ -0,0 +1,42 @@ +{stdenv, fetchurl, gtkLibs, gnome + , cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype + , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff + , gettext, intltool, perl + }: + +stdenv.mkDerivation rec { + version = "0.8.0.2"; + name = "k3d-${version}"; + src = fetchurl { + url = "http://downloads.sourceforge.net/project/k3d/K-3D%20Source/K-3D%200.8.0.2/k3d-source-0.8.0.2.tar.bz2"; + sha256 = "01fd2qb0zddif3wz1a2wdmwyzn81cf73678qp2gjs8iikmdz6w7x"; + }; + + patches = [ (fetchurl { + url = "http://patch-tracker.debian.org/patch/series/dl/k3d/0.8.0.2-15/k3d_gtkmm224.patch"; + sha256 = "0a81fg96zby6kidqwj6n8mhbrh0j5fpnmfh7lr6havz5r2is9ks5"; + }) + ]; + + preConfigure = '' + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib" + ''; + + buildInputs = with gtkLibs; with gnome; [ + cmake mesa zlib python expat libxml2 libsigcxx libuuid freetype libpng + boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff gettext + intltool perl + gtkmm glibmm gtkglext + ]; + + doCheck = false; + + meta = { + description = "A 3D editor with support for procedural editing"; + homepage = "http://k-3d.org/"; + platforms = with stdenv.lib.platforms; + linux; + maintainers = with stdenv.lib.maintainers; + [raskin]; + }; +} diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix new file mode 100644 index 00000000000..b09a38dcaa4 --- /dev/null +++ b/pkgs/applications/graphics/openscad/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal + , mpfr, gmp + }: + +stdenv.mkDerivation rec { + version = "2011.12"; + name = "openscad-${version}"; + src = fetchurl { + url = "https://github.com/downloads/openscad/openscad/${name}.src.tar.gz"; + sha256 = "0gaqwzxbbzc21lhb4y26j8g0g28dhrwrgkndizp5ddab5axi4zjh"; + }; + + buildInputs = [qt4 bison flex eigen boost mesa glew opencsg cgal gmp mpfr]; + + configurePhase = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I ${eigen}/include/eigen2 " + qmake PREFIX="$out" + ''; + + doCheck = false; + + meta = { + description = "3D parametric model compiler"; + homepage = "http://openscad.org/"; + platforms = with stdenv.lib.platforms; + linux; + maintainers = with stdenv.lib.maintainers; + [raskin]; + }; +} diff --git a/pkgs/applications/networking/newsreaders/kwooty/default.nix b/pkgs/applications/networking/newsreaders/kwooty/default.nix index 4d68191c6f2..67254084d8e 100644 --- a/pkgs/applications/networking/newsreaders/kwooty/default.nix +++ b/pkgs/applications/networking/newsreaders/kwooty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gcc, cmake, qt4, gettext +{ stdenv, fetchurl, cmake, qt4, gettext , kdelibs, kdebase_workspace, perl , openssl, phonon, automoc4 , libX11, libXext, libXft @@ -27,7 +27,7 @@ in stdenv.mkDerivation { ''; buildInputs = - [ gcc perl cmake qt4 gettext automoc4 openssl + [ stdenv perl cmake qt4 gettext automoc4 openssl kdelibs kdebase_workspace phonon libX11 libXext libXft ]; diff --git a/pkgs/desktops/kde-4.8/default.nix b/pkgs/desktops/kde-4.8/default.nix index fd0cc516b13..30c0505135a 100644 --- a/pkgs/desktops/kde-4.8/default.nix +++ b/pkgs/desktops/kde-4.8/default.nix @@ -52,5 +52,8 @@ kde.modules // kde.individual // full = stdenv.lib.attrValues kde.modules; - l10n = callPackage ./l10n { inherit release; }; + l10n = callPackage ./l10n { + inherit release; + inherit (kde.manifest) stable; + }; } diff --git a/pkgs/desktops/kde-4.8/kdeedu/kalzium-find-libfacile.patch b/pkgs/desktops/kde-4.8/kdeedu/kalzium-find-libfacile.patch deleted file mode 100644 index 0324ee74eab..00000000000 --- a/pkgs/desktops/kde-4.8/kdeedu/kalzium-find-libfacile.patch +++ /dev/null @@ -1,88 +0,0 @@ -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 298aba06c8e..69ab5dfc473 100644 --- a/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix +++ b/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix @@ -2,8 +2,6 @@ kde { buildInputs = [ kdelibs facile ocaml eigen openbabel avogadro ]; - patches = [ ./kalzium-find-libfacile.patch ]; - meta = { description = "Periodic Table of Elements"; }; diff --git a/pkgs/desktops/kde-4.8/l10n/default.nix b/pkgs/desktops/kde-4.8/l10n/default.nix index 778879e6e7c..69cfdcf8ab2 100644 --- a/pkgs/desktops/kde-4.8/l10n/default.nix +++ b/pkgs/desktops/kde-4.8/l10n/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kdelibs, gettext, release }: +{ stdenv, fetchurl, kdelibs, gettext, release, stable }: let @@ -11,7 +11,7 @@ let name = "kde-l10n-${saneName}-${release}"; src = fetchurl { - url = "mirror://kde/unstable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.bz2"; + url = "mirror://kde/${if stable then "" else "un"}stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.bz2"; name = "${name}.tar.bz2"; inherit sha256; }; diff --git a/pkgs/desktops/kde-4.8/support/akonadi/default.nix b/pkgs/desktops/kde-4.8/support/akonadi/default.nix index 434a1446369..db0608ead3f 100644 --- a/pkgs/desktops/kde-4.8/support/akonadi/default.nix +++ b/pkgs/desktops/kde-4.8/support/akonadi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano }: stdenv.mkDerivation rec { - name = "akonadi-1.6.90"; + name = "akonadi-1.7.0"; src = fetchurl { url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2"; - sha256 = "0a35wkrrdk4k7kw1d4rvq4w4wwlmz9vk2nb4c2yibpn9rmc6ighn"; + sha256 = "105mjr6n1g6kl0djp2l8jr8b7j4s9gy2ls43g1wf3py1hf6j5fdz"; }; buildInputs = [ qt4 soprano libxslt boost ]; diff --git a/pkgs/development/compilers/sbcl/src-for-default.nix b/pkgs/development/compilers/sbcl/src-for-default.nix index bcdd3002fd6..beb4c61e377 100644 --- a/pkgs/development/compilers/sbcl/src-for-default.nix +++ b/pkgs/development/compilers/sbcl/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="1.0.54"; - name="sbcl-1.0.54"; - hash="1ip13hz5zsys3vy68y3x0fapxs87xk0gqi6bdp68vyznz2a0v1cd"; - url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.54/sbcl-1.0.54-source.tar.bz2"; - advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.54/sbcl-1.0.54-source.tar.bz2"; + version="1.0.55"; + name="sbcl-1.0.55"; + hash="1b87s99d000khjpg8i7bcp28mph8812axwfh64a6qarhkixnl8g3"; + url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.55/sbcl-1.0.55-source.tar.bz2"; + advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.55/sbcl-1.0.55-source.tar.bz2"; } diff --git a/pkgs/development/interpreters/ruby/rubygems.nix b/pkgs/development/interpreters/ruby/rubygems.nix index 0d93b330ca0..4311c6ad5d4 100644 --- a/pkgs/development/interpreters/ruby/rubygems.nix +++ b/pkgs/development/interpreters/ruby/rubygems.nix @@ -1,10 +1,10 @@ args : with args; rec { - version = "1.8.10"; + version = "1.8.15"; src = fetchurl { url = "http://production.cf.rubygems.org/rubygems/${name}.tgz"; - sha256 = "0ll5swf4mi4nbgnr5jcyzmnlwb1zr2md9kvsgy3d1f485bb1n59q"; + sha256 = "0crfdaxpcv13x40mb0ccm5n0r3dknw7w7xl87icj99kyqmfx8k51"; }; buildInputs = [ruby makeWrapper]; diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix new file mode 100644 index 00000000000..49cf0a6b94b --- /dev/null +++ b/pkgs/development/libraries/CGAL/default.nix @@ -0,0 +1,25 @@ +{stdenv, fetchurl, cmake, boost, gmp, mpfr + }: + +stdenv.mkDerivation rec { + version = "3.9"; + name = "cgal-${version}"; + src = fetchurl { + url = "https://gforge.inria.fr/frs/download.php/29125/CGAL-${version}.tar.gz"; + sha256 = "193vjhzlf7f2kw6dbg5yw8v0izdvmnrylqzqhw92vml7jjnr8494"; + }; + + buildInputs = [cmake boost gmp mpfr ]; + + doCheck = false; + + meta = { + description = "Computational Geometry Algorithms Library"; + homepage = "http://cgal.org/"; + platforms = with stdenv.lib.platforms; + linux; + maintainers = with stdenv.lib.maintainers; + [raskin]; + }; +} + diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 6c76dafd572..db36944dcb2 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -1,16 +1,20 @@ { stdenv, fetchurl, mesa, x11, libXmu, libXi }: -stdenv.mkDerivation { - name = "glew-1.5.2"; +stdenv.mkDerivation rec { + name = "glew-1.7.0"; src = fetchurl { - url = mirror://sourceforge/glew/glew-1.5.2.tgz; - sha256 = "0dh5wpfq7aaldkiwcqmm9w59c2qcglkjv8zazmnm8n5771n3caj8"; + url = "mirror://sourceforge/glew/${name}.tgz"; + sha256 = "02aw6sc4v1434m7awfcxqb0v987i2ykg3fncnp21i9g1n4zsclqn"; }; buildInputs = [ mesa x11 libXmu libXi ]; - installPhase = "GLEW_DEST=\$out make install"; + installPhase = " + GLEW_DEST=\$out make install + mkdir -pv \$out/share/doc/glew + cp -r README.txt LICENSE.txt doc \$out/share/doc/glew + "; meta = { description = "Cross-platform open-source C/C++ extension loading library"; diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix index ddd6905d314..f93da3ee549 100644 --- a/pkgs/development/libraries/haskell/fclabels/default.nix +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "fclabels"; - version = "1.1.0.1"; - sha256 = "0nzqx1d4hwailfkcb9g03hagws9j6valqd5yp7972kmhbq0c8h3s"; + version = "1.1.0.2"; + sha256 = "19p3ghjmc6jrgzifm5vrsd3cp5xmccw811zczcmsk1xjr4ady95r"; buildDepends = [ mtl transformers ]; meta = { description = "First class accessor labels"; diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index 3d4d8927a83..945e9ee35e0 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -1,4 +1,4 @@ -{ cabal, attoparsec, attoparsecEnumerator, ghcPaths, hlint, regexPosix, emacs, emacs23Packages }: +{ cabal, attoparsec, attoparsecEnumerator, ghcPaths, hlint, regexPosix, emacsPackages }: cabal.mkDerivation (self: { pname = "ghc-mod"; @@ -7,8 +7,7 @@ cabal.mkDerivation (self: { buildDepends = [ attoparsec attoparsecEnumerator ghcPaths hlint regexPosix ]; -# buildTools = [emacs emacs23]; - propagatedBuildInputs = [emacs emacs23Packages.haskellMode]; + propagatedBuildInputs = [emacsPackages.emacs emacsPackages.haskellMode]; isExecutable = true; postInstall = '' cd $out/share/$pname-$version @@ -20,11 +19,14 @@ cabal.mkDerivation (self: { ''; meta = { + homepage = "http://www.mew.org/~kazu/proj/ghc-mod/"; description = "Happy Haskell programming on Emacs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ + self.stdenv.lib.maintainers.andres self.stdenv.lib.maintainers.bluescreen303 + self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index d461f54e15a..654d50cdc95 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "3.2.4.1"; - sha256 = "0ijym3k8f9za6cd1dnf8qx0jk85r5kz4f8gy7bn50jclcslnfl0n"; + version = "3.2.5.0"; + sha256 = "1y1dqfbas7ym1jghq3i7zhqcny01paqfrszj0aakg6ys2jjx0m29"; buildDepends = [ binary blazeHtml citeprocHs cryptohash hamlet mtl pandoc parsec regexBase regexPcre snapCore snapServer tagsoup time diff --git a/pkgs/development/libraries/haskell/pool-conduit/default.nix b/pkgs/development/libraries/haskell/pool-conduit/default.nix new file mode 100644 index 00000000000..f7d1be2f7d0 --- /dev/null +++ b/pkgs/development/libraries/haskell/pool-conduit/default.nix @@ -0,0 +1,18 @@ +{ cabal, conduit, resourcePool, transformers }: + +cabal.mkDerivation (self: { + pname = "pool-conduit"; + version = "0.0.0"; + sha256 = "0cbs7swb1ay3l1hlbirys171ybqg887csnp6yiy9biq11q5mhsml"; + buildDepends = [ conduit resourcePool transformers ]; + meta = { + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Resource pool allocations via ResourceT"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/pool/default.nix b/pkgs/development/libraries/haskell/pool/default.nix index 09c871692ec..fb417a3faf2 100644 --- a/pkgs/development/libraries/haskell/pool/default.nix +++ b/pkgs/development/libraries/haskell/pool/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "pool"; - version = "0.1.2"; - sha256 = "05lrinyk9gxdf67vwdav93ral2y8qsb33i9y5k91vlcjfp7w516q"; + version = "0.1.2.1"; + sha256 = "1fwwnwxk3kprr2z9y7bwa1qwxfkzwcb2n5l6vkq1c5s8gjls581c"; buildDepends = [ monadControl transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; - description = "Thread-safe resource pools"; + description = "Thread-safe resource pools. (deprecated)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ diff --git a/pkgs/development/libraries/haskell/resource-pool/default.nix b/pkgs/development/libraries/haskell/resource-pool/default.nix new file mode 100644 index 00000000000..51952598f61 --- /dev/null +++ b/pkgs/development/libraries/haskell/resource-pool/default.nix @@ -0,0 +1,22 @@ +{ cabal, hashable, monadControl, stm, time, transformers +, transformersBase, vector +}: + +cabal.mkDerivation (self: { + pname = "resource-pool"; + version = "0.2.1.0"; + sha256 = "12akfi906l1nm7h3wvjkzl9bxn74dbv17xw2c1mqgl6sg470d587"; + buildDepends = [ + hashable monadControl stm time transformers transformersBase vector + ]; + meta = { + homepage = "http://github.com/bos/pool"; + description = "A high-performance striped resource pooling implementation"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 09de2e702e1..502e8b94bbd 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, cairo, expat, ncurses, libX11 }: stdenv.mkDerivation rec { - name = "hwloc-1.3"; + name = "hwloc-1.4"; src = fetchurl { - url = "http://www.open-mpi.org/software/hwloc/v1.3/downloads/${name}.tar.bz2"; - sha256 = "10zlz0hng7scjx1xn8jflx3gbga5djbhxhj94k5kszrivc8zh8xy"; + url = "http://www.open-mpi.org/software/hwloc/v1.4/downloads/${name}.tar.bz2"; + sha256 = "1qcii99vn65jwgqpq8d2k4sksk734kkg223p58ck7v76q27h288y"; }; # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo. diff --git a/pkgs/development/libraries/java/smack/default.nix b/pkgs/development/libraries/java/smack/default.nix index 828061fa796..14b8e1f5633 100644 --- a/pkgs/development/libraries/java/smack/default.nix +++ b/pkgs/development/libraries/java/smack/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "smack-3_0_4"; + name = "smack-3_2_1"; builder = ./builder.sh; src = fetchurl { - url = http://www.igniterealtime.org/downloadServlet?filename=smack/smack_3_0_4.tar.gz; - sha256 = "075nn7vwfjr2a9j6ycikkbssxhai82vpvll9123r83rar3ds3li6"; + url = http://www.igniterealtime.org/downloadServlet?filename=smack/smack_3_2_1.tar.gz; + sha256 = "0lljrxky66gc73caaflia2wgmlpry2cdj00bz1gd1vqrzd3pg3gd"; }; } diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix new file mode 100644 index 00000000000..4df3abcdd71 --- /dev/null +++ b/pkgs/development/libraries/opencsg/default.nix @@ -0,0 +1,34 @@ +{stdenv, fetchurl, mesa, freeglut, glew, libXmu, libXext, libX11 + }: + +stdenv.mkDerivation rec { + version = "1.3.2"; + name = "opencsg-${version}"; + src = fetchurl { + url = "http://www.opencsg.org/OpenCSG-${version}.tar.gz"; + sha256 = "09drnck27py8qg1l6gqaia85a9skqn0mz0nybjrkq4gpk0lwk467"; + }; + + buildInputs = [mesa freeglut glew libXmu libXext libX11]; + + doCheck = false; + + installPhase = '' + mkdir -pv "$out/"{bin,share/doc/opencsg} + + cp example/opencsgexample "$out/bin" + cp -r include lib "$out" + + cp license.txt "$out/share/doc/opencsg" + ''; + + meta = { + description = "Constructive Solid Geometry library"; + homepage = "http://www.opencsg.org/"; + platforms = with stdenv.lib.platforms; + linux; + maintainers = with stdenv.lib.maintainers; + [raskin]; + }; +} + diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index 1e4b04db04a..47034c6ebce 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hlint"; - version = "1.8.20"; - sha256 = "0nkvlvax2yv8lqq7axnghdw38fj6r44y78ss23yxqqav7q046vyh"; + version = "1.8.21"; + sha256 = "1vjl1qncxia9352469k9v28283f17xk0xhb28by6crchz596xln6"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index cd2eb6cc02d..e9c424ccf11 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -14,7 +14,7 @@ let basename = if bleedingEdgeVersion then "gdb-7.3.20110726" - else "gdb-7.3.1"; + else "gdb-7.4"; # Whether (cross-)building for GNU/Hurd. This is an approximation since # having `stdenv ? cross' doesn't tell us if we're building `hostDrv' and @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { url = "mirror://gnu/gdb/${basename}.tar.bz2"; # md5 is provided by the annoucement page # http://www.gnu.org/s/gdb/download/ANNOUNCEMENT - md5 = "b89a5fac359c618dda97b88645ceab47"; + md5 = "95a9a8305fed4d30a30a6dc28ff9d060"; }; # I think python is not a native input, but I leave it @@ -75,6 +75,8 @@ stdenv.mkDerivation rec { rm -v $out/share/info/{standards,configure,bfd}.info ''; + enableParallelBuilding = true; + # TODO: Investigate & fix the test failures. doCheck = false; diff --git a/pkgs/development/tools/parsing/ebnf2ps/default.nix b/pkgs/development/tools/parsing/ebnf2ps/default.nix new file mode 100644 index 00000000000..5abb52566fe --- /dev/null +++ b/pkgs/development/tools/parsing/ebnf2ps/default.nix @@ -0,0 +1,35 @@ +{ cabal, fetchurl, happy }: + +let + pname = "ebnf2ps"; + version = "1.0.8"; +in +cabal.mkDerivation (self: { + inherit pname version; + + src = fetchurl { + url = "http://www.informatik.uni-freiburg.de/~thiemann/haskell/ebnf2ps/${pname}-${version}.tar.gz"; + sha256 = "1yfgq4nf79g1nyfb0yxqi887kxc04dvwpm1fwrk50bs4xj1vg3wf"; + }; + + buildTools = [ happy ]; + + patches = [ ./modernize.patch ]; + + meta = { + homepage = "http://www.informatik.uni-freiburg.de/~thiemann/haskell/ebnf2ps/"; + description = "Syntax Diagram Drawing Tool"; + license = "BSD"; + + longDescription = '' + Ebnf2ps generates nice looking syntax diagrams in EPS and FIG + format from EBNF specifications and from yacc, bison, and Happy + input grammars. The diagrams can be immediatedly included in + TeX/LaTeX documents and in texts created with other popular + document preparation systems. + ''; + + platforms = self.stdenv.lib.platforms.linux; + maintainers = [ self.stdenv.lib.maintainers.simons ]; + }; +}) diff --git a/pkgs/development/tools/parsing/ebnf2ps/modernize.patch b/pkgs/development/tools/parsing/ebnf2ps/modernize.patch new file mode 100644 index 00000000000..edb5e366d48 --- /dev/null +++ b/pkgs/development/tools/parsing/ebnf2ps/modernize.patch @@ -0,0 +1,256 @@ +diff --git a/Ebnf2ps.cabal b/Ebnf2ps.cabal +index 483d34a..0a7b96e 100644 +--- a/Ebnf2ps.cabal ++++ b/Ebnf2ps.cabal +@@ -1,66 +1,30 @@ +--- Ebnf2ps.cabal auto-generated by cabal init. For additional options, +--- see +--- http://www.haskell.org/cabal/release/cabal-latest/doc/users-guide/authors.html#pkg-descr. +--- The name of the package. + Name: Ebnf2ps +- +--- The package version. See the Haskell package versioning policy +--- (http://www.haskell.org/haskellwiki/Package_versioning_policy) for +--- standards guiding when and how versions should be incremented. + Version: 1.0.8 +- +--- A short (one-line) description of the package. +-Synopsis: Ebnf2ps: Peter's Syntax Diagram Drawing Tool +- +--- A longer description of the package. +--- Description: +- +--- URL for the project homepage or repository. ++Synopsis: Peter's Syntax Diagram Drawing Tool + Homepage: http://www.informatik.uni-freiburg.de/~thiemann/haskell/ebnf2ps/ +- +--- The license under which the package is released. + License: BSD4 +- +--- The file containing the license text. + -- License-file: LICENSE +- +--- The package author(s). +-Author: Peter Thiemann +- +--- An email address to which users can send suggestions, bug reports, +--- and patches. +-Maintainer: thiemann@acm.org +- +--- A copyright notice. +--- Copyright: +- ++Author: Peter Thiemann ++Maintainer: Peter Thiemann + Category: Language +- + Build-type: Simple +- +--- Extra files to be distributed with the package, such as examples or +--- a README. +--- Extra-source-files: +- +--- Constraint on the version of Cabal needed to build this package. + Cabal-version: >=1.2 +- ++Tested-With: GHC == 6.10.4, GHC == 6.12.3, GHC == 7.0.4, GHC == 7.2.2 ++Description: Ebnf2ps generates nice looking syntax diagrams in EPS ++ and FIG format from EBNF specifications and from yacc, ++ bison, and Happy input grammars. The diagrams can be ++ immediatedly included in TeX/LaTeX documents and in ++ texts created with other popular document preparation ++ systems. + + Executable Ebnf2ps +- -- .hs or .lhs file containing the Main module. + Main-is: Ebnf2ps.hs + Hs-source-dirs: src +- +- -- Packages needed in order to build this package. +- Build-depends: base < 4.3 +- , containers < 0.4 +- , haskell98 +- , unix < 2.5 +- +- -- Modules not exported by this package. +- -- Other-modules: +- +- -- Extra tools (e.g. alex, hsc2hs, ...) needed to build the source. ++ Build-depends: base >= 2 && < 5, ++ containers, ++ old-time, ++ directory, ++ unix + Build-tools: happy + Cc-options: -DAFMPATH=/usr/share/texmf-texlive/fonts/afm + +diff --git a/src/Color.hs b/src/Color.hs +index 184e5e6..8786dac 100644 +--- a/src/Color.hs ++++ b/src/Color.hs +@@ -23,7 +23,7 @@ + module Color where + -- (Color (..), lookupColor, showsColor, showsAColor, prepareColors) + +-import Char ++import Data.Char + import Numeric + + type Color = (Int, Int, Int) +diff --git a/src/CommandLine.hs b/src/CommandLine.hs +index 50d6546..518b107 100644 +--- a/src/CommandLine.hs ++++ b/src/CommandLine.hs +@@ -1,6 +1,6 @@ + module CommandLine (parse_cmds) where +-import System +- ++import System.IO ++import System.Environment + + defaultArgs :: Args + defaultArgs = MkArgs "Times-Roman" 10 "black" "Times-Roman" 10 "black" "white" "black" "Times-Roman" 10 "black" "white" "black" "black" 500 500 30 100 200 "rgb.txt" False False False False True False False False False +diff --git a/src/Ebnf2ps.hs b/src/Ebnf2ps.hs +index 9dc2e4d..6f340cf 100644 +--- a/src/Ebnf2ps.hs ++++ b/src/Ebnf2ps.hs +@@ -25,11 +25,10 @@ import Defaults (afmPathDefault, ebnfInputDefault, rgbPathDefault) + import PathExpansion (expandPath) + import Color + import Info +-import IO +-import Monad ++import System.Time ++import System.Environment ++import Control.Monad + import Numeric +-import System +-import Time + + -------------------------------------------------------------------------------- + main :: IO () +diff --git a/src/Ebnf2psParser.hs b/src/Ebnf2psParser.hs +index 4cc7052..0fb4557 100644 +--- a/src/Ebnf2psParser.hs ++++ b/src/Ebnf2psParser.hs +@@ -4,7 +4,7 @@ + module Ebnf2psParser (theEbnfParser, theHappyParser, theYaccParser) where + import AbstractSyntax + import Lexer +-import List ++import Data.List + + data HappyAbsSyn + = HappyTerminal Token' +diff --git a/src/EbnfLayout.hs b/src/EbnfLayout.hs +index cd0b4d9..aecc0b4 100644 +--- a/src/EbnfLayout.hs ++++ b/src/EbnfLayout.hs +@@ -25,7 +25,7 @@ import AbstractSyntax + import Color + import Fonts (FONT, stringWidth, stringHeight, fontDescender) + import Info +-import List ++import Data.List + + -- all arithmetic is done in 1/100 pt + +diff --git a/src/Fonts.hs b/src/Fonts.hs +index c1639de..ed36a79 100644 +--- a/src/Fonts.hs ++++ b/src/Fonts.hs +@@ -17,7 +17,7 @@ + module Fonts (FONT, makeFont, fontDescender, stringWidth, stringHeight, fontName, fontScale, noFont) + where + +-import Char ++import Data.Char + import Numeric + + data FONT = FONT String Int Int (String -> Int) +diff --git a/src/GrammarTransform.hs b/src/GrammarTransform.hs +index 99c3840..65624ab 100644 +--- a/src/GrammarTransform.hs ++++ b/src/GrammarTransform.hs +@@ -13,7 +13,7 @@ module GrammarTransform + where + + import AbstractSyntax +-import List ++import Data.List + + + data RInfo +diff --git a/src/GrammarUnfold.hs b/src/GrammarUnfold.hs +index 056119a..d35a630 100644 +--- a/src/GrammarUnfold.hs ++++ b/src/GrammarUnfold.hs +@@ -17,7 +17,7 @@ module GrammarUnfold ( + import AbstractSyntax + import GrammarTransform + import StringMatch (stringMatch) +-import List ++import Data.List + + import qualified Data.Map (Map, keys, elems, findWithDefault, fromList) + +diff --git a/src/IOSupplement.hs b/src/IOSupplement.hs +index 3251365..ba666b1 100644 +--- a/src/IOSupplement.hs ++++ b/src/IOSupplement.hs +@@ -29,8 +29,9 @@ + module IOSupplement (getPath, readPathFile, readRGBPathFile) + where + +-import System +-import IO ++import System.IO ++import System.IO.Error ++import System.Environment + + #ifdef __HBC__ + ioError = fail +diff --git a/src/Lexer.hs b/src/Lexer.hs +index 52f2549..8bf9f82 100644 +--- a/src/Lexer.hs ++++ b/src/Lexer.hs +@@ -3,7 +3,7 @@ module Lexer where + -- Last Modified By: M. Walter + -- + +-import Char ++import Data.Char + + ------------------------------------------------------------------------------ + --NOW the lexer +diff --git a/src/PathExpansion.hs b/src/PathExpansion.hs +index 48e27d6..01807e5 100644 +--- a/src/PathExpansion.hs ++++ b/src/PathExpansion.hs +@@ -3,10 +3,11 @@ module PathExpansion (expandPath) + where + + #ifdef __GLASGOW_HASKELL__ +-import System +-import Directory +-import Monad +-import IO ++import System.Directory ++import System.Environment ++import Control.Monad ++import System.IO ++import System.IO.Error + import System.Posix.User (getUserEntryForName, homeDirectory) + #endif + +@@ -99,8 +100,8 @@ replaceEnv (x:xs) = do t <- replaceEnv xs + return (x:t) + + getEnv2 t +- |t == "HOME" = catch (getEnv t) (\e -> if IO.isDoesNotExistError e then return ['.'] else ioError e) +- |otherwise = catch (getEnv t) (\e -> if IO.isDoesNotExistError e then return [] else ioError e) ++ |t == "HOME" = catch (getEnv t) (\e -> if isDoesNotExistError e then return ['.'] else ioError e) ++ |otherwise = catch (getEnv t) (\e -> if isDoesNotExistError e then return [] else ioError e) + ------------------------------------------------------- + + ---------------- Teilen nach Doppelpunkt -------------- diff --git a/pkgs/misc/tex/texlive/moderncv.nix b/pkgs/misc/tex/texlive/moderncv.nix index 6d5de0764e3..9e3f68f36b1 100644 --- a/pkgs/misc/tex/texlive/moderncv.nix +++ b/pkgs/misc/tex/texlive/moderncv.nix @@ -3,7 +3,7 @@ rec { name = "moderncv-2012.01.16"; src = fetchurl { url = "http://mirror.ctan.org/macros/latex/contrib/moderncv.zip"; - sha256 = "a9d2de7fc03c35c4084915b2788c8d7acfb695f9e27f6cd81427a7dd1a64cb54"; + sha256 = "1sfpj76p0z128rvxw0svh7dfrvf3zhmi3v7bkzfkll4byij34ni0"; }; buildInputs = [texLive unzip]; diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 81d15a0aa0c..731a52fb1e5 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { - name = "bluez-4.96"; + name = "bluez-4.98"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.gz"; - sha256 = "16gshw7xgl0k3j3qgkdqmgvzqz6fdcna909ibvawl2brsw7xavy0"; + sha256 = "9a5b655bada7c7a1921cb3bac83b8a32bbe49893e4c7a1377cdc1b0d35f7d233"; }; buildInputs = diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 7870f2c0ca5..f0dbc1509bd 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -214,7 +214,7 @@ in import ./generic.nix ( rec { - version = "3.2.1"; + version = "3.2.2"; testing = false; modDirVersion = version; @@ -225,7 +225,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.bz2"; - sha256 = "0kplzd61zblbsqzhggwk5lca0diqd8crhrd7d7jd6gc8jcyiwavy"; + sha256 = "9f20bd2332db32e2d5b0fc346762d486faab19e0dd059c82964116421bb7cceb"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 1bccfef75a6..788fe0d6ccb 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, expat, erlang, zlib, openssl, pam, lib}: stdenv.mkDerivation rec { - version = "2.1.4"; - name = "ejabberd-2.1.4"; + version = "2.1.10"; + name = "ejabberd-2.1.10"; src = fetchurl { - url = http://www.process-one.net/downloads/ejabberd/2.1.4/ejabberd-2.1.4.tar.gz; - sha256 = "205ee09e38c57527cfa1a4be6ca664cec2e8c6b40eeffaac008735fcdc5e7527"; + url = http://www.process-one.net/downloads/ejabberd/2.1.10/ejabberd-2.1.10.tar.gz; + sha256 = "1gijv6d90w9fq0as2l0mp0fn65jihgd86nxry98pv6liks4fbhlx"; }; buildInputs = [ expat erlang zlib openssl pam ]; patchPhase = '' diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index de17381fec9..175ae069382 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.0pre31729"; + name = "nix-1.0pre31851"; src = fetchurl { - url = "http://hydra.nixos.org/build/1867511/download/4/${name}.tar.bz2"; - sha256 = "c2e33d5837a686c42deaab1cfcf8ec0e13b0c841d936086d773a2415e4141d2d"; + url = "http://hydra.nixos.org/build/1937677/download/4/${name}.tar.bz2"; + sha256 = "36f07b6b701da74f07d8c8cc43044306e570b6837555ad523701d86e5f567568"; }; buildNativeInputs = [ perl pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 39bc7b436ff..da97106a991 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3154,13 +3154,11 @@ let uisp = callPackage ../development/tools/misc/uisp { }; gdb = callPackage ../development/tools/misc/gdb { - readline = readline5; hurd = gnu.hurdCross; inherit (gnu) mig; }; gdbCross = callPackage ../development/tools/misc/gdb { - readline = readline5; target = crossSystem; }; @@ -3266,6 +3264,8 @@ let celt = callPackage ../development/libraries/celt {}; celt_0_7 = callPackage ../development/libraries/celt/0.7.nix {}; + cgal = callPackage ../development/libraries/CGAL {}; + cgui = callPackage ../development/libraries/cgui {}; check = callPackage ../development/libraries/check { }; @@ -4412,6 +4412,8 @@ let opencascade = callPackage ../development/libraries/opencascade { }; + opencsg = callPackage ../development/libraries/opencsg { }; + openct = callPackage ../development/libraries/openct { }; opencv = callPackage ../development/libraries/opencv { @@ -5041,9 +5043,7 @@ let dovecot_1_1_1 = callPackage ../servers/mail/dovecot/1.1.1.nix { }; dovecot_2_0 = callPackage ../servers/mail/dovecot/2.0.nix { }; - ejabberd = callPackage ../servers/xmpp/ejabberd { - erlang = erlangR13B ; - }; + ejabberd = callPackage ../servers/xmpp/ejabberd { }; couchdb = callPackage ../servers/http/couchdb { spidermonkey = spidermonkey_185; @@ -5956,7 +5956,7 @@ let linuxPackages_nanonote_jz_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_34 pkgs.linuxPackages_nanonote_jz_2_6_34); linuxPackages_nanonote_jz_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_35 pkgs.linuxPackages_nanonote_jz_2_6_35); linuxPackages_nanonote_jz_2_6_36 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_36 pkgs.linuxPackages_nanonote_jz_2_6_36); - linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor linux_3_2 pkgs.linuxPackages_3_2); + linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 pkgs.linuxPackages_3_2); linuxPackages_3_2_powertop = recurseIntoAttrs (linuxPackagesFor linux_3_2_powertop pkgs.linuxPackages_3_2_powertop); # The current default kernel / kernel modules. @@ -7100,6 +7100,8 @@ let jwm = callPackage ../applications/window-managers/jwm { }; + k3d = callPackage ../applications/graphics/k3d {}; + keepnote = callPackage ../applications/office/keepnote { pygtk = pyGtkGlade; }; @@ -7323,6 +7325,8 @@ let neon = neon029; }; + openscad = callPackage ../applications/graphics/openscad {}; + opera = callPackage ../applications/networking/browsers/opera { inherit (pkgs.gtkLibs) gdk_pixbuf atk; inherit (pkgs.kde4) kdelibs; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1e29fc0fffa..15cb3336262 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -683,7 +683,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ghcEvents = callPackage ../development/libraries/haskell/ghc-events {}; - ghcMod = callPackage ../development/libraries/haskell/ghc-mod {}; + ghcMod = callPackage ../development/libraries/haskell/ghc-mod { + emacsPackages = pkgs.emacs23Packages; + }; ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {}; @@ -1076,6 +1078,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); pool = callPackage ../development/libraries/haskell/pool {}; + poolConduit = callPackage ../development/libraries/haskell/pool-conduit {}; + ppm = callPackage ../development/libraries/haskell/ppm {}; prettyShow = callPackage ../development/libraries/haskell/pretty-show {}; @@ -1176,6 +1180,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); repr = callPackage ../development/libraries/haskell/repr {}; + resourcePool = callPackage ../development/libraries/haskell/resource-pool {}; + RSA = callPackage ../development/libraries/haskell/RSA {}; safe = callPackage ../development/libraries/haskell/safe {}; @@ -1521,6 +1527,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cpphs = callPackage ../development/tools/misc/cpphs {}; + ebnf2ps = callPackage ../development/tools/parsing/ebnf2ps { + inherit (pkgs) fetchurl; + }; + frown = callPackage ../development/tools/parsing/frown {}; haddock_2_4_2 = callPackage ../development/tools/documentation/haddock/2.4.2.nix {};