diff options
Diffstat (limited to 'pkgs/development')
233 files changed, 1341 insertions, 534 deletions
diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix index e77c2251b36..89501f11269 100644 --- a/pkgs/development/arduino/ino/default.nix +++ b/pkgs/development/arduino/ino/default.nix @@ -29,11 +29,12 @@ buildPythonPackage rec { --replace "self.e['avrdude']" "'${avrdude}/bin/avrdude'" \ --replace "'-C', self.e['avrdude.conf']," "" ''; - + meta = { description = "Command line toolkit for working with Arduino hardware"; homepage = http://inotool.org/; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ antono the-kenny ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/aldor/default.nix b/pkgs/development/compilers/aldor/default.nix index fcd0c9fd453..57d1bf74154 100644 --- a/pkgs/development/compilers/aldor/default.nix +++ b/pkgs/development/compilers/aldor/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.aldor.org/"; - description = "Aldor is a programming language with an expressive type system"; + description = "Programming language with an expressive type system"; license = stdenv.lib.licenses.asl20; longDescription = '' diff --git a/pkgs/development/compilers/clean/default.nix b/pkgs/development/compilers/clean/default.nix index bd051a95699..7f3e679e847 100644 --- a/pkgs/development/compilers/clean/default.nix +++ b/pkgs/development/compilers/clean/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Clean is a general purpose, state-of-the-art, pure and lazy functional programming language."; + description = "General purpose, state-of-the-art, pure and lazy functional programming language"; longDescription = '' Clean is a general purpose, state-of-the-art, pure and lazy functional programming language designed for making real-world applications. Some diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 949324ba8b1..3c2a4f779fd 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, libuuid, pythonFull, iasl }: +{ stdenv, fetchgit, libuuid, pythonFull, iasl }: let @@ -10,12 +10,12 @@ else throw "Unsupported architecture"; edk2 = stdenv.mkDerivation { - name = "edk2-2013-03-19"; + name = "edk2-2013-10-09"; - src = fetchsvn { - url = https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2; - rev = "14211"; - sha256 = "1rhrv7cyazb1d4gw3s8fv0c245iankvb9pqx6nngbkkxkcswvnw7"; + src = fetchgit { + url = git://github.com/tianocore/edk2; + rev = "5bcb62a4098c9bde9be6af0833a025adc768e08d"; + sha256 = "3e2958877061bf6bbfb28b150743d7244486929c1c320bdb1ff2586774aa042a"; }; buildInputs = [ libuuid pythonFull ]; diff --git a/pkgs/development/compilers/gwt/2.4.0.nix b/pkgs/development/compilers/gwt/2.4.0.nix index c5c7841d72a..65208b062c2 100644 --- a/pkgs/development/compilers/gwt/2.4.0.nix +++ b/pkgs/development/compilers/gwt/2.4.0.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { meta = { homepage = http://code.google.com/webtoolkit/; - description = "Google Web Toolkit (GWT) is a development toolkit for building and optimizing complex browser-based applications."; + description = "Google Web Toolkit (GWT) is a development toolkit for building and optimizing complex browser-based applications"; }; } diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index 7252343aa55..30ef18a1ef9 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -1,20 +1,21 @@ -{ cabal, ansiTerminal, binary, boehmgc, Cabal, filepath, gmp, happy -, haskeline, languageJava, libffi, llvmGeneral, llvmGeneralPure -, mtl, parsec, parsers, split, text, time, transformers, trifecta -, unorderedContainers, utf8String, vector, vectorBinaryInstances +{ cabal, ansiTerminal, ansiWlPprint, binary, boehmgc, Cabal +, filepath, gmp, happy, haskeline, languageJava, libffi +, llvmGeneral, llvmGeneralPure, mtl, parsec, parsers, split, text +, time, transformers, trifecta, unorderedContainers, utf8String +, vector, vectorBinaryInstances }: cabal.mkDerivation (self: { pname = "idris"; - version = "0.9.9.2"; - sha256 = "0xfwnlf3jca64i4piyx9scmk4z8f6rak2cvrcjwji505a9vaa0rw"; + version = "0.9.9.3"; + sha256 = "1l19xx0xbcwlnnh2w0rmri7wwixffzfrafpbji64nwyx1awz4iab"; isLibrary = false; isExecutable = true; buildDepends = [ - ansiTerminal binary Cabal filepath haskeline languageJava libffi - llvmGeneral llvmGeneralPure mtl parsec parsers split text time - transformers trifecta unorderedContainers utf8String vector - vectorBinaryInstances + ansiTerminal ansiWlPprint binary Cabal filepath haskeline + languageJava libffi llvmGeneral llvmGeneralPure mtl parsec parsers + split text time transformers trifecta unorderedContainers + utf8String vector vectorBinaryInstances ]; buildTools = [ happy ]; extraLibraries = [ boehmgc gmp ]; diff --git a/pkgs/development/compilers/jdk/dlj-bundle-builder.sh b/pkgs/development/compilers/jdk/dlj-bundle-builder.sh index cf59a28164b..028164ac395 100644 --- a/pkgs/development/compilers/jdk/dlj-bundle-builder.sh +++ b/pkgs/development/compilers/jdk/dlj-bundle-builder.sh @@ -37,6 +37,11 @@ else jrePath=$out/jre fi +if test -n "$jce"; then + unzip $jce + cp -v jce/*.jar $jrePath/lib/security +fi + rpath=$rpath${rpath:+:}$jrePath/lib/$architecture/jli # set all the dynamic linkers diff --git a/pkgs/development/compilers/jdk/jdk6-linux.nix b/pkgs/development/compilers/jdk/jdk6-linux.nix index 340bbdf91ac..97ec6b56305 100644 --- a/pkgs/development/compilers/jdk/jdk6-linux.nix +++ b/pkgs/development/compilers/jdk/jdk6-linux.nix @@ -6,6 +6,7 @@ , xlibs ? null , installjdk ? true , pluginSupport ? true +, installjce ? false }: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; @@ -24,6 +25,15 @@ let else abort "jdk requires i686-linux or x86_64 linux"; + jce = + if installjce then + requireFile { + name = "jce_policy-6.zip"; + url = http://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html; + sha256 = "0qljzfxbikm8br5k7rkamibp1vkyjrf6blbxpx6hn4k46f62bhnh"; + } + else + null; in stdenv.mkDerivation { @@ -65,7 +75,7 @@ stdenv.mkDerivation { [stdenv.gcc.libc] ++ (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt] else []); - inherit swingSupport pluginSupport architecture; + inherit swingSupport pluginSupport architecture jce; inherit (xlibs) libX11; mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins"; diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 3e45fc6d5e3..ae550f5692d 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -8,7 +8,7 @@ let in stdenv.mkDerivation rec { pname = "julia"; - date = "20130611"; + date = "20131013"; name = "${pname}-git-${date}"; grisu_ver = "1.1.1"; @@ -65,8 +65,8 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://github.com/JuliaLang/julia.git"; - rev = "60cc4e44bf415dcda90f2bbe22300f842fe44098"; - sha256 = "018s0zyvdkxjldbvcdv40q3v2gcjznyyql5pv3zhhy1iq11jddfz"; + rev = "76d2b87a45fff637473c4c342c9f5f9387675fda"; + sha256 = "079g44r27lv0wsfbg84ihrmgzl73djjjr41xjiaqdph55zqfbn4f"; }; buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib @@ -131,7 +131,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "High-level performance-oriented dynamical language for technical computing."; + description = "High-level performance-oriented dynamical language for technical computing"; homepage = "http://julialang.org/"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.raskin ]; diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix index 770a6b17b15..a5ff613a9b4 100644 --- a/pkgs/development/compilers/mlton/default.nix +++ b/pkgs/development/compilers/mlton/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "MLton is an open-source, whole-program, optimizing Standard ML compiler."; + description = "Open-source, whole-program, optimizing Standard ML compiler"; longDescription = '' MLton is an open source, whole-program optimizing compiler for the Standard ML programming language. MLton aims to produce fast executables, and to encourage rapid prototyping and modular programming diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 1e4feff1107..288fdb33454 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -4,11 +4,11 @@ let s= # Generated upstream information rec { baseName="sbcl"; - version="1.1.8"; + version="1.1.12"; name="${baseName}-${version}"; - hash="1fmcpsi2bddfpz3impm9i62y9p15r3mc4xgm1dg0k77l33859jip"; - url="mirror://sourceforge/project/sbcl/sbcl/1.1.8/sbcl-1.1.8-source.tar.bz2"; - sha256="1fmcpsi2bddfpz3impm9i62y9p15r3mc4xgm1dg0k77l33859jip"; + hash="0mvl6lpi44yv6jv3xhyyzvf9g7bdlj691iz3ydpn66v0vg5i554c"; + url="mirror://sourceforge/project/sbcl/sbcl/1.1.12/sbcl-1.1.12-source.tar.bz2"; + sha256="0mvl6lpi44yv6jv3xhyyzvf9g7bdlj691iz3ydpn66v0vg5i554c"; }; buildInputs = with a; [ clisp makeWrapper diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 66b15e3499d..a2423bee9b9 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { dontDisableStatic = true; meta = { - description = "Ur/Web supports construction of dynamic web applications backed by SQL databases."; + description = "Construct dynamic web applications backed by SQL databases"; longDescription = '' Ur is a programming language in the tradition of ML and Haskell, but featuring a significantly richer type system. Ur is functional, pure, diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix index 44e40710569..a29c0de65b8 100644 --- a/pkgs/development/compilers/yap/default.nix +++ b/pkgs/development/compilers/yap/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [ readline gmp zlib ]; + configureFlags = "--enable-tabling=yes"; + meta = { homepage = "http://www.dcc.fc.up.pt/~vsc/Yap/"; description = "Yap Prolog System is a ISO-compatible high-performance Prolog compiler"; diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix index a092172c8ca..22f92f40183 100644 --- a/pkgs/development/interpreters/angelscript/default.nix +++ b/pkgs/development/interpreters/angelscript/default.nix @@ -47,7 +47,7 @@ rec { '' ["defEnsureDir" "prepareBuild"]; meta = { - description = "A light-weight scripting library"; + description = "Light-weight scripting library"; maintainers = with a.lib.maintainers; [ raskin diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index bd19d738860..b8af3f6d747 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -48,6 +48,11 @@ stdenv.mkDerivation rec { cd builddir ''; + postInstall = '' + ./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full \ + clx/new-clx bindings/glibc pcre rawsock wildcard zlib + ''; + NIX_CFLAGS_COMPILE="-O0"; # TODO : make mod-check fails diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/development/interpreters/falcon/default.nix index 9800e895400..0b4bfacb6de 100644 --- a/pkgs/development/interpreters/falcon/default.nix +++ b/pkgs/development/interpreters/falcon/default.nix @@ -29,6 +29,6 @@ rec { name = "falcon-" + version; meta = { - description = "A programming language. Has macros and syntax at once."; + description = "Programming language with macros and syntax at once"; }; } diff --git a/pkgs/development/interpreters/hiphopvm/default.nix b/pkgs/development/interpreters/hiphopvm/default.nix index 57e3e93c646..c18c81caff0 100644 --- a/pkgs/development/interpreters/hiphopvm/default.nix +++ b/pkgs/development/interpreters/hiphopvm/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { patches = [./tbb.patch]; meta = { - description = "HipHop is a high performance PHP toolchain."; + description = "High performance PHP toolchain"; homepage = https://github.com/facebook/hiphop-php; platforms = ["x86_64-linux"]; }; diff --git a/pkgs/development/interpreters/lua-4/default.nix b/pkgs/development/interpreters/lua-4/default.nix index a95e4e4c35e..13f7964769c 100644 --- a/pkgs/development/interpreters/lua-4/default.nix +++ b/pkgs/development/interpreters/lua-4/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.lua.org"; - description = "Lua is a powerful, fast, lightweight, embeddable scripting language."; + description = "Powerful, fast, lightweight, embeddable scripting language"; longDescription = '' Lua combines simple procedural syntax with powerful data description constructs based on associative arrays and extensible diff --git a/pkgs/development/interpreters/lua-5/5.0.3.nix b/pkgs/development/interpreters/lua-5/5.0.3.nix index ff2a8140191..eae2d82d5d0 100644 --- a/pkgs/development/interpreters/lua-5/5.0.3.nix +++ b/pkgs/development/interpreters/lua-5/5.0.3.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.lua.org"; - description = "Lua is a powerful, fast, lightweight, embeddable scripting language."; + description = "Powerful, fast, lightweight, embeddable scripting language"; longDescription = '' Lua combines simple procedural syntax with powerful data description constructs based on associative arrays and extensible diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix index a6caf0023e3..2923a8f960d 100644 --- a/pkgs/development/interpreters/lua-5/5.1.nix +++ b/pkgs/development/interpreters/lua-5/5.1.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p "$out/share/doc/lua" "$out/lib/pkgconfig" - mv "etc/lua.pc" "$out/lib/pkgconfig/" + sed <"etc/lua.pc" >"$out/lib/pkgconfig/lua.pc" -e "s|^prefix=.*|prefix=$out|" mv "doc/"*.{gif,png,css,html} "$out/share/doc/lua/" rmdir $out/{share,lib}/lua/5.1 $out/{share,lib}/lua ''; meta = { homepage = "http://www.lua.org"; - description = "Lua is a powerful, fast, lightweight, embeddable scripting language."; + description = "Powerful, fast, lightweight, embeddable scripting language"; longDescription = '' Lua combines simple procedural syntax with powerful data description constructs based on associative arrays and extensible diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix index bd5a868c2d5..5b4c2459872 100644 --- a/pkgs/development/interpreters/lua-5/5.2.nix +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.lua.org"; - description = "Lua is a powerful, fast, lightweight, embeddable scripting language."; + description = "Powerful, fast, lightweight, embeddable scripting language"; longDescription = '' Lua combines simple procedural syntax with powerful data description constructs based on associative arrays and extensible diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 394278dea74..eb3d796f229 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -9,7 +9,7 @@ in composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - version = "5.4.18"; + version = "5.4.20"; name = "php-${version}"; @@ -230,7 +230,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) "http://nl1.php.net/get/php-${version}.tar.bz2/from/this/mirror" "http://se1.php.net/get/php-${version}.tar.bz2/from/this/mirror" ]; - sha256 = "1ncizy992nfy3i3lzns7qcinj5376d840hchaqs5jlfn2nz0k50x"; + sha256 = "1qarcxj46rzkmql3w2dln0hxzs349ph31fxcslizxch1ig7l43nd"; name = "php-${version}.tar.bz2"; }; diff --git a/pkgs/development/interpreters/pure/default.nix b/pkgs/development/interpreters/pure/default.nix index 83a1c0ac500..84ae789150d 100644 --- a/pkgs/development/interpreters/pure/default.nix +++ b/pkgs/development/interpreters/pure/default.nix @@ -1,5 +1,5 @@ x@{builderDefsPackage - , llvm, gmp, mpfr, readline, bison, flex + , llvm, gmp, mpfr, readline, bison, flex, makeWrapper , ...}: builderDefsPackage (a : @@ -12,11 +12,11 @@ let sourceInfo = rec { baseName="pure"; project="pure-lang"; - version="0.56"; + version="0.58"; name="${baseName}-${version}"; extension="tar.gz"; - url="http://${project}.googlecode.com/files/${name}.${extension}"; - hash="1ll29j31lp7ymp1kq57328q8md7pkp8jmwsadp67j4cdlzc3zdhj"; + url="https://bitbucket.org/purelang/${project}/downloads/${name}.${extension}"; + hash="180ygv8nmfy8v4696km8jdahn5cnr454sc8i1av7s6z4ss7mrxmi"; }; in rec { @@ -29,9 +29,9 @@ rec { inherit buildInputs; /* doConfigure should be removed if not needed */ - phaseNames = ["doPatch" "doConfigure" "doMakeInstall"]; + phaseNames = ["doConfigure" "doMakeInstall" "doWrap"]; - patches = [ ./new-gcc.patch ]; + doWrap = a.makeManyWrappers ''$out/bin/pure'' ''--prefix LD_LIBRARY_PATH : "${llvm}/lib"''; meta = { description = "A purely functional programming language based on term rewriting"; @@ -45,7 +45,7 @@ rec { }; passthru = { updateInfo = { - downloadPage = "http://code.google.com/p/pure-lang/downloads/list"; + downloadPage = "https://bitbucket.org/purelang/pure-lang/downloads"; }; }; }) x diff --git a/pkgs/development/interpreters/pure/new-gcc.patch b/pkgs/development/interpreters/pure/new-gcc.patch deleted file mode 100644 index ea2cd845059..00000000000 --- a/pkgs/development/interpreters/pure/new-gcc.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/runtime.cc b/runtime.cc -index 04cbc40..54a0b43 100644 ---- a/runtime.cc -+++ b/runtime.cc -@@ -13121,39 +13121,6 @@ unsigned int sleep(unsigned int secs) - } - #endif - --/* Horrible kludge to get round, trunc and the inverse hyperbolic functions -- from libmingwex.a (these are in C99, but not in the Windows system -- libraries, and LLVM doesn't know how to get them either). */ -- --extern "C" --double __round(double x) --{ -- return round(x); --} -- --extern "C" --double __trunc(double x) --{ -- return trunc(x); --} -- --extern "C" --double __asinh(double x) --{ -- return asinh(x); --} -- --extern "C" --double __acosh(double x) --{ -- return acosh(x); --} -- --extern "C" --double __atanh(double x) --{ -- return atanh(x); --} - - /* File type bits. */ - -diff --git a/util.hh b/util.hh -index ae95b79..eab3330 100644 ---- a/util.hh -+++ b/util.hh -@@ -58,13 +58,6 @@ char *default_encoding(); - double my_strtod(const char *nptr, char **endptr); - char *my_formatd(char *buffer, const char *format, double d); - --/* Windows doesn't have strptime, so we provide a suitable replacement from -- GNU libc (see strptime.c). */ -- --#ifndef HAVE_STRPTIME --extern "C" --char *strptime(const char *s, const char *format, struct tm *tm); --#endif - - /* Windows doesn't have mkstemp, so we provide a suitable replacement. */ - diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index b99beca3892..6b746185b6c 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -160,6 +160,11 @@ let deps = [ ncurses ]; }; + curses_panel = buildInternalPythonModule { + moduleName = "curses_panel"; + deps = [ ncurses modules.curses ]; + }; + gdbm = buildInternalPythonModule { moduleName = "gdbm"; internalName = "gdbm"; diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index ce061348675..043094c0303 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -164,6 +164,11 @@ let deps = [ ncurses ]; }; + curses_panel = buildInternalPythonModule { + moduleName = "curses_panel"; + deps = [ ncurses modules.curses ]; + }; + crypt = buildInternalPythonModule { moduleName = "crypt"; internalName = "crypt"; diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index d2783ffb085..1699690749f 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -1,23 +1,26 @@ -# Create a python that knows about additional python packages via -# PYTHONPATH +{ stdenv, python, buildEnv, makeWrapper, recursivePthLoader, extraLibs ? [] }: -{ stdenv, python, makeWrapper, recursivePthLoader, extraLibs ? [] }: +# Create a python executable that knows about additional packages. -stdenv.mkDerivation { +(buildEnv { name = "python-${python.version}-wrapper"; + paths = extraLibs ++ [ python makeWrapper recursivePthLoader ]; + ignoreCollisions = false; - propagatedBuildInputs = extraLibs ++ [ python makeWrapper recursivePthLoader ]; - - unpackPhase = "true"; - installPhase = '' + postBuild = '' + . "${makeWrapper}/nix-support/setup-hook" + if [ -L "$out/bin" ]; then + unlink "$out/bin" + fi mkdir -p "$out/bin" - for prg in 2to3 idle pdb pdb${python.majorVersion} pydoc python python-config python${python.majorVersion} python${python.majorVersion}-config smtpd.py; do - makeWrapper "$python/bin/$prg" "$out/bin/$prg" --suffix PYTHONPATH : "$PYTHONPATH" + cd "${python}/bin" + for prg in *; do + echo "$prg --> $out/bin/$prg" + rm -f "$out/bin/$prg" + makeWrapper "${python}/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" done - ensureDir "$out/share" - ln -s "$python/share/man" "$out/share/man" ''; - +}) // { inherit python; inherit (python) meta; } diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index ddcf2634039..f45c96d2805 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A programming language derived from Scheme (formerly called PLT Scheme)."; + description = "Programming language derived from Scheme (formerly called PLT Scheme)"; longDescription = '' Racket (formerly called PLT Scheme) is a programming language derived from Scheme. The Racket project has four primary components: the diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix new file mode 100644 index 00000000000..7bc27362a29 --- /dev/null +++ b/pkgs/development/libraries/SDL2/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchurl, pkgconfig, audiofile +, openglSupport ? false, mesa ? null +, alsaSupport ? true, alsaLib ? null +, x11Support ? true, x11 ? null, libXrandr ? null +, pulseaudioSupport ? true, pulseaudio ? null +}: + +# OSS is no longer supported, for it's much crappier than ALSA and +# PulseAudio. +assert alsaSupport || pulseaudioSupport; + +assert openglSupport -> (mesa != null && x11Support); +assert x11Support -> (x11 != null && libXrandr != null); +assert alsaSupport -> alsaLib != null; +assert pulseaudioSupport -> pulseaudio != null; + +let + configureFlagsFun = attrs: '' + --disable-oss --disable-video-x11-xme + --disable-x11-shared --disable-alsa-shared --enable-rpath --disable-pulseaudio-shared + --disable-osmesa-shared --enable-static + ${if alsaSupport then "--with-alsa-prefix=${attrs.alsaLib}/lib" else ""} + ''; +in +stdenv.mkDerivation rec { + name = "SDL2-2.0.0"; + + src = fetchurl { + url = "http://www.libsdl.org/release/${name}.tar.gz"; + sha256 = "0y3in99brki7vc2mb4c0w39v70mf4h341mblhh8nmq4h7lawhskg"; + }; + + # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. + propagatedBuildInputs = stdenv.lib.optionals x11Support [ x11 libXrandr ] ++ + stdenv.lib.optional pulseaudioSupport pulseaudio; + + buildInputs = [ pkgconfig audiofile ] ++ + stdenv.lib.optional openglSupport [ mesa ] ++ + stdenv.lib.optional alsaSupport alsaLib; + + # XXX: By default, SDL wants to dlopen() PulseAudio, in which case + # we must arrange to add it to its RPATH; however, `patchelf' seems + # to fail at doing this, hence `--disable-pulseaudio-shared'. + configureFlags = configureFlagsFun { inherit alsaLib; }; + + crossAttrs = { + configureFlags = configureFlagsFun { alsaLib = alsaLib.crossDrv; }; + }; + + passthru = {inherit openglSupport;}; + + meta = { + description = "A cross-platform multimedia library"; + homepage = http://www.libsdl.org/; + }; +} diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix new file mode 100644 index 00000000000..693b7bf8fe1 --- /dev/null +++ b/pkgs/development/libraries/SDL2_gfx/default.nix @@ -0,0 +1,54 @@ +{stdenv, fetchsvn, SDL2} : + +let rev = 5; in +stdenv.mkDerivation rec { + name = "SDL2_gfx-${toString rev}"; + + src = fetchsvn { + url = http://svn.code.sf.net/p/sdl2gfx/code/trunk; + inherit rev; + sha256 = "1hzilbn1412m2b44mygrbdfh1gvks4v5p0kmafz248jf9ifsvmzp"; + }; + + buildInputs = [ SDL2 ] ; + + configureFlags = "--disable-mmx"; + + postInstall = '' + sed -i -e 's,"SDL.h",<SDL2/SDL.h>,' \ + $out/include/SDL2/*.h + + ln -s $out/include/SDL2/SDL2_framerate.h $out/include/SDL2/SDL_framerate.h; + ln -s $out/include/SDL2/SDL2_gfxPrimitives.h $out/include/SDL2/SDL_gfxPrimitives.h; + ln -s $out/include/SDL2/SDL2_rotozoom.h $out/include/SDL2/SDL_rotozoom.h; + ln -s $out/include/SDL2/*.h $out/include/; + ''; + + meta = { + description = "SDL graphics drawing primitives and support functions"; + + longDescription = + '' The SDL_gfx library evolved out of the SDL_gfxPrimitives code + which provided basic drawing routines such as lines, circles or + polygons and SDL_rotozoom which implemented a interpolating + rotozoomer for SDL surfaces. + + The current components of the SDL_gfx library are: + + * Graphic Primitives (SDL_gfxPrimitves.h) + * Rotozoomer (SDL_rotozoom.h) + * Framerate control (SDL_framerate.h) + * MMX image filters (SDL_imageFilter.h) + * Custom Blit functions (SDL_gfxBlitFunc.h) + + The library is backwards compatible to the above mentioned + code. Its is written in plain C and can be used in C++ code. + ''; + + homepage = https://sourceforge.net/projects/sdlgfx/; + license = "LGPLv2+"; + + maintainers = [ stdenv.lib.maintainers.bjg ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix new file mode 100644 index 00000000000..73b5ba8d929 --- /dev/null +++ b/pkgs/development/libraries/SDL2_image/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, SDL2, libpng, libjpeg, libtiff, libungif, libXpm, zlib }: + +stdenv.mkDerivation rec { + name = "SDL2_image-2.0.0"; + + src = fetchurl { + url = "http://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz"; + sha256 = "0d3jlhkmr0j5a2dd5h6y29jfcsj7mkl16wghm6n3nqqp7g3ib65j"; + }; + + buildInputs = [SDL2 libpng libjpeg libtiff libungif libXpm zlib]; + + postInstall = '' + sed -i -e 's,"SDL.h",<SDL2/SDL.h>,' \ + -e 's,"SDL_version.h",<SDL2/SDL_version.h>,' \ + -e 's,"begin_code.h",<SDL2/begin_code.h>,' \ + -e 's,"close_code.h",<SDL2/close_code.h>,' \ + $out/include/SDL2/SDL_image.h + ln -sv SDL2/SDL_image.h $out/include/SDL_image.h + ''; + + meta = { + description = "SDL image library"; + homepage = "http://www.libsdl.org/projects/SDL_image/"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix new file mode 100644 index 00000000000..6d29ddf6eea --- /dev/null +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, SDL2, libogg, libvorbis, enableNativeMidi ? false }: + +stdenv.mkDerivation rec { + name = "SDL2_mixer-2.0.0"; + + src = fetchurl { + url = "http://www.libsdl.org/projects/SDL_mixer/release/${name}.tar.gz"; + sha256 = "0nvjdxjchrajrn0jag877hdx9zb788hsd315zzg1lyck2wb0xkm8"; + }; + + buildInputs = [SDL2 libogg libvorbis]; + + configureFlags = "--disable-music-ogg-shared" + stdenv.lib.optionalString enableNativeMidi "--enable-music-native-midi-gpl"; + + postInstall = "ln -s $out/include/SDL2/SDL_mixer.h $out/include/"; + + meta = { + description = "SDL multi-channel audio mixer library"; + }; +} diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index a0603b546cf..454c4e882f5 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -10,4 +10,8 @@ stdenv.mkDerivation { patches = [./config.patch ./laylex.patch]; buildInputs = [x11 imake gccmakedep libXmu libXpm libXp bison flex]; propagatedBuildInputs = [x11 libXmu]; + + meta = { + description = "3D widget set based on the Athena Widget set"; + }; } diff --git a/pkgs/development/libraries/a52dec/default.nix b/pkgs/development/libraries/a52dec/default.nix index 82fef49cfc1..84a87df03e4 100644 --- a/pkgs/development/libraries/a52dec/default.nix +++ b/pkgs/development/libraries/a52dec/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fpic"; meta = { + description = "ATSC A/52 stream decoder"; homepage = http://liba52.sourceforge.net/; }; } diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix index 2da006a6ceb..897fc9db8de 100644 --- a/pkgs/development/libraries/aalib/default.nix +++ b/pkgs/development/libraries/aalib/default.nix @@ -15,4 +15,8 @@ stdenv.mkDerivation { buildInputs = [ncurses]; inherit ncurses; + + meta = { + description = "ASCII art graphics library"; + }; } diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix index 8c24ae6fdbe..59124f011dd 100644 --- a/pkgs/development/libraries/agg/default.nix +++ b/pkgs/development/libraries/agg/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { configureFlags = "--x-includes=${libX11}/include --x-libraries=${libX11}/lib"; meta = { - description = "The Anti-Grain Geometry (AGG) library, a high quality rendering engine for C++"; + description = "High quality rendering engine for C++"; longDescription = '' Anti-Grain Geometry (AGG) is an Open Source, free of charge diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix index 90d0dafdd95..d55ff9049ed 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/development/libraries/apache-activemq/default.nix @@ -22,9 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://activemq.apache.org/; - description = '' - Messaging and Integration Patterns server written in Java. - ''; + description = "Messaging and Integration Patterns server written in Java"; license = stdenv.lib.licenses.asl20; }; diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix index dd8b68717aa..a69cee99b2b 100644 --- a/pkgs/development/libraries/aspell/default.nix +++ b/pkgs/development/libraries/aspell/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # doesn't expand environment variables such as `$HOME'. meta = { - description = "GNU Aspell, A spell checker for many languages"; + description = "Spell checker for many languages"; homepage = http://aspell.net/; license = "LGPLv2+"; maintainers = [ ]; diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index f4c33c86911..0c9e998ed2e 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/share/gtk-doc"; meta = { - description = "ATK, the accessibility toolkit"; + description = "Accessibility toolkit"; longDescription = '' ATK is the Accessibility Toolkit. It provides a set of generic diff --git a/pkgs/development/libraries/attica/default.nix b/pkgs/development/libraries/attica/default.nix index 87f6c019fb7..3174dc57667 100644 --- a/pkgs/development/libraries/attica/default.nix +++ b/pkgs/development/libraries/attica/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { - description = "A library to access Open Collaboration Service providers"; + description = "Library to access Open Collaboration Service providers"; license = "LGPL"; maintainers = [ maintainers.sander maintainers.urkud maintainers.phreedom ]; inherit (qt4.meta) platforms; diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index 91d27254aed..abfb3985f26 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; meta = { - description = "A library for audio labelling"; + description = "Library for audio labelling"; homepage = http://aubio.org/; license = "GPLv2"; maintainers = [ stdenv.lib.maintainers.marcweber ]; diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index 2f4de88c94c..73f38f02814 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - description = "A library for reading and writing audio files in various formats"; + description = "Library for reading and writing audio files in various formats"; homepage = http://www.68k.org/~michael/audiofile/; license = licenses.lgpl21Plus; maintainers = with maintainers; [ lovek323 shlevy ]; diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index f62dc200447..f4795286e09 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Avahi, an mDNS/DNS-SD implementation"; + description = "mDNS/DNS-SD implementation"; homepage = http://avahi.org; license = licenses.lgpl2Plus; platforms = platforms.unix; diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index 31dc885bc43..17f2b545168 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://tcl.activestate.com/software/tcllib/"; - description = "The BWidget toolkit is a high-level widget set for Tcl/Tk."; + description = "High-level widget set for Tcl/Tk"; license = stdenv.lib.licenses.tcltk; }; } diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix index 5739690e59a..080e854315d 100644 --- a/pkgs/development/libraries/classads/default.nix +++ b/pkgs/development/libraries/classads/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.cs.wisc.edu/condor/classad/; - description = "The Classified Advertisements library provides a generic means for matching resources."; + description = "The Classified Advertisements library provides a generic means for matching resources"; license = "Apache-2.0"; }; } diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/pkgs/development/libraries/clucene-core/2.x.nix index 97c7a4c9f53..60e8da9c3fc 100644 --- a/pkgs/development/libraries/clucene-core/2.x.nix +++ b/pkgs/development/libraries/clucene-core/2.x.nix @@ -21,7 +21,17 @@ stdenv.mkDerivation rec { ]; meta = { - description = "CLucene is a port of the very popular Java Lucene text search engine API. Core package, 2.x branch."; + description = "Core library for full-featured text search engine"; + longDescription = '' + CLucene is a high-performance, scalable, cross platform, full-featured, + open-source indexing and searching API. Specifically, CLucene is the guts + of a search engine, the hard stuff. You write the easy stuff: the UI and + the process of selecting and parsing your data files to pump them into + the search engine yourself, and any specialized queries to pull it back + for display or further processing. + + CLucene is a port of the very popular Java Lucene text search engine API. + ''; homepage = http://clucene.sourceforge.net; }; } diff --git a/pkgs/development/libraries/clucene-core/default.nix b/pkgs/development/libraries/clucene-core/default.nix index abd6712736f..33a789266d4 100644 --- a/pkgs/development/libraries/clucene-core/default.nix +++ b/pkgs/development/libraries/clucene-core/default.nix @@ -9,7 +9,17 @@ stdenv.mkDerivation rec { }; meta = { - description = "CLucene is a port of the very popular Java Lucene text search engine API. Core package."; + description = "Core library for full-featured text search engine"; + longDescription = '' + CLucene is a high-performance, scalable, cross platform, full-featured, + open-source indexing and searching API. Specifically, CLucene is the guts + of a search engine, the hard stuff. You write the easy stuff: the UI and + the process of selecting and parsing your data files to pump them into + the search engine yourself, and any specialized queries to pull it back + for display or further processing. + + CLucene is a port of the very popular Java Lucene text search engine API. + ''; homepage = http://clucene.sourceforge.net; }; } diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 9c3a1a4d674..abb92f7b08b 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { render without stepping on each other's toes. ''; - inherit (glib.meta) platforms; + platforms = stdenv.lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/development/libraries/coin3d/default.nix index 5eb93621f41..f866b2299c1 100644 --- a/pkgs/development/libraries/coin3d/default.nix +++ b/pkgs/development/libraries/coin3d/default.nix @@ -23,8 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.coin3d.org/; license = "GPLv2+"; - description = "High-level, retained-mode toolkit for effective 3D graphics development."; - + description = "High-level, retained-mode toolkit for effective 3D graphics development"; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/eventlog/default.nix b/pkgs/development/libraries/eventlog/default.nix index b1239d6f4cf..7a8ab8e464b 100644 --- a/pkgs/development/libraries/eventlog/default.nix +++ b/pkgs/development/libraries/eventlog/default.nix @@ -9,7 +9,15 @@ stdenv.mkDerivation { }; meta = { - description = "A new API to format and send structured log messages."; + description = "Syslog event logger library"; + longDescription = '' + The EventLog library aims to be a replacement of the simple syslog() API + provided on UNIX systems. The major difference between EventLog and + syslog is that EventLog tries to add structure to messages. + + Where you had a simple non-structrured string in syslog() you have a + combination of description and tag/value pairs. + ''; homepage = "http://www.balabit.com/support/community/products/"; license = "BSD"; }; diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index 540c2c61d94..2a7bb1dc31a 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "http://fox-toolkit.org"; license = "LGPLv3"; maintainers = [ stdenv.lib.maintainers.bbenoist ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index ca24db94cd0..f741a0b4f34 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -2,13 +2,13 @@ , fetchurl }: -let version = "3.0s"; in stdenv.mkDerivation { +let version = "3.0u"; in stdenv.mkDerivation { name = "gnu-efi-${version}"; src = fetchurl { url = "mirror://sourceforge/gnu-efi/gnu-efi_${version}.orig.tar.gz"; - sha256 = "18bpswzkj81dadq1b7n2s9g0cz60l34ggzxlq21mb8va10j9zmhh"; + sha256 = "0klkdxh1aqwwfm393q67nxww6liffyp2lfybbnh4q819b06la39w"; }; meta = { @@ -34,7 +34,7 @@ let version = "3.0s"; in stdenv.mkDerivation { ''; installPhase = '' - make INSTALLROOT="$out" install + make PREFIX="$out" install mkdir -pv $out/share/gnu-efi install -D -m644 apps/*.efi $out/share/gnu-efi ''; diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix new file mode 100644 index 00000000000..5a5b6aa94e2 --- /dev/null +++ b/pkgs/development/libraries/gnutls/3.2.nix @@ -0,0 +1,73 @@ +{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip +, guileBindings, guile, perl, gmp }: + +assert guileBindings -> guile != null; + +stdenv.mkDerivation (rec { + + name = "gnutls-3.2.4"; + + src = fetchurl { + url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${name}.tar.lz"; + sha256 = "0zl4h37g51xyaalv3qp2hvn1m6z7xzfw4yvpvi6mby4x5sqrrp8i"; + }; + + # Note: GMP is a dependency of Nettle, whose public headers include + # GMP headers, hence the hack. + configurePhase = '' + ./configure --prefix="$out" \ + --disable-dependency-tracking --enable-fast-install \ + --without-p11-kit \ + --with-lzo --with-libtasn1-prefix="${libtasn1}" \ + --with-libnettle-prefix="${nettle}" \ + CPPFLAGS="-I${gmp}/include" \ + ${if guileBindings + then "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\"" + else ""} + ''; + + # Build of the Guile bindings is not parallel-safe. See + # <http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=330995a920037b6030ec0282b51dde3f8b493cad> + # for the actual fix. + enableParallelBuilding = false; + + buildInputs = [ zlib lzo lzip ] + ++ stdenv.lib.optional guileBindings guile; + + nativeBuildInputs = [ perl pkgconfig ]; + + propagatedBuildInputs = [ nettle libtasn1 ]; + + # XXX: Gnulib's `test-select' fails on FreeBSD: + # http://hydra.nixos.org/build/2962084/nixlog/1/raw . + doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin); + + meta = with stdenv.lib; { + description = "The GNU Transport Layer Security Library"; + + longDescription = '' + GnuTLS is a project that aims to develop a library which + provides a secure layer, over a reliable transport + layer. Currently the GnuTLS library implements the proposed + standards by the IETF's TLS working group. + + Quoting from the TLS protocol specification: + + "The TLS protocol provides communications privacy over the + Internet. The protocol allows client/server applications to + communicate in a way that is designed to prevent eavesdropping, + tampering, or message forgery." + ''; + + homepage = http://www.gnu.org/software/gnutls/; + license = "LGPLv2.1+"; + maintainers = [ ]; + }; +} + +// + +(stdenv.lib.optionalAttrs stdenv.isFreeBSD { + # FreeBSD doesn't have <alloca.h>, and Gnulib's `alloca' module isn't used. + patches = [ ./guile-gnulib-includes.patch ]; +})) diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index 28bad546084..c33457544f5 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [pkgconfig libsoup glib libxml2]; meta = { - description = "A GObject-based API for handling resource discovery and announcement over SSDP."; + description = "GObject-based API for handling resource discovery and announcement over SSDP"; homepage = http://www.gupnp.org/; license = "LGPL v2"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/gurobi/default.nix b/pkgs/development/libraries/gurobi/default.nix new file mode 100644 index 00000000000..4bdee56ae99 --- /dev/null +++ b/pkgs/development/libraries/gurobi/default.nix @@ -0,0 +1,25 @@ +{ stdenv, requireFile }: + +stdenv.mkDerivation { + name = "gurobi-5.6.0"; + + src = requireFile { + name = "gurobi5.6.0_linux64.tar.gz"; + sha256 = "1qwfjyx5y71x97gkndqnl9h4xc8hl48zwcwss7jagqfj3gxwvnky"; + url = "http://www.gurobi.com/download/gurobi-optimizer"; + }; + + installPhase = "mv linux64 $out"; + + fixupPhase = '' + interp=`cat $NIX_GCC/nix-support/dynamic-linker` + find $out/bin -type f -executable -exec patchelf --interpreter "$interp" --set-rpath $out/lib {} \; + ''; + + meta = { + description = "State-of-the-art mathematical programming solver"; + homepage = http://www.gurobi.com/; + license = "unfree"; + maintainers = [ stdenv.lib.maintainers.shlevy ]; + }; +} diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 4fb024db0e1..1202ab5825d 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, glib, freetype, libintlOrEmpty }: +{ stdenv, fetchurl, pkgconfig, glib, freetype, + icu ? null, graphite2 ? null, libintlOrEmpty }: stdenv.mkDerivation rec { name = "harfbuzz-0.9.12"; @@ -8,7 +9,12 @@ stdenv.mkDerivation rec { sha256 = "19cx5y2m20rp7z5j7mwqfb4ph2g8lrri69zim44x362y4w5gfly6"; }; - buildInputs = [ pkgconfig glib freetype ] ++ libintlOrEmpty; + buildInputs = [ pkgconfig glib freetype ] + ++ libintlOrEmpty; + propagatedBuildInputs = [] + ++ (stdenv.lib.optionals (icu != null) [icu]) + ++ (stdenv.lib.optionals (graphite2 != null) [graphite2]) + ; meta = { description = "An OpenType text shaping engine"; diff --git a/pkgs/development/libraries/haskell/Cabal/1.18.1.nix b/pkgs/development/libraries/haskell/Cabal/1.18.1.1.nix index f0792be6ec9..431c62b85e0 100644 --- a/pkgs/development/libraries/haskell/Cabal/1.18.1.nix +++ b/pkgs/development/libraries/haskell/Cabal/1.18.1.1.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "Cabal"; - version = "1.18.1"; - sha256 = "041m3xr8v0bbw0016lnzmnv9xpj15z5pd272j3sbsrwpmcyds3a0"; + version = "1.18.1.1"; + sha256 = "1qa6z9kb46hmix15fdjw80jqd69v4rxr52mfq25m8c60l3kxbiny"; buildDepends = [ deepseq filepath time ]; testDepends = [ extensibleExceptions filepath HUnit QuickCheck regexPosix diff --git a/pkgs/development/libraries/haskell/ChasingBottoms/default.nix b/pkgs/development/libraries/haskell/ChasingBottoms/default.nix index 719e5eb2cee..b22272a7703 100644 --- a/pkgs/development/libraries/haskell/ChasingBottoms/default.nix +++ b/pkgs/development/libraries/haskell/ChasingBottoms/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ChasingBottoms"; - version = "1.3.0.6"; - sha256 = "1l40n1ylzrbp0lhm80q9djl8mf39zvmw7zzlg0gzxsqbzwbsggx8"; + version = "1.3.0.7"; + sha256 = "0g1bx6d2mi27qsb4bxvby50g39fm56gyi2658fyjiq1gamy50ypa"; isLibrary = true; isExecutable = true; buildDepends = [ mtl QuickCheck random syb ]; diff --git a/pkgs/development/libraries/haskell/GLFW/default.nix b/pkgs/development/libraries/haskell/GLFW/default.nix index f204bcdf655..26a132ae028 100644 --- a/pkgs/development/libraries/haskell/GLFW/default.nix +++ b/pkgs/development/libraries/haskell/GLFW/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "GLFW"; - version = "0.5.1.0"; - sha256 = "190d75w84y9gayxvdz13dnzpyflc5qy4vdg5iv9p2dpcamcih3km"; + version = "0.5.2.0"; + sha256 = "06vps929dmk9yimfv7jj12m0p0bf4ih0ssf6rbcq2j6i9wbhpxq3"; buildDepends = [ OpenGL ]; extraLibraries = [ libX11 mesa ]; meta = { diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix index 1b52261dea0..09f0b25910b 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl network pureMD5 split testFramework testFrameworkHunit wai warp ]; + jailbreak = true; doCheck = false; meta = { homepage = "https://github.com/haskell/HTTP"; diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix index 2a7bc888c48..b2947318a1f 100644 --- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix +++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix @@ -1,13 +1,13 @@ -{ cabal, binary, deepseq, mmap, mtl, primitive, transformers -, vector, zlib +{ cabal, binary, deepseq, mtl, primitive, transformers, vector +, zlib }: cabal.mkDerivation (self: { pname = "JuicyPixels"; - version = "3.1"; - sha256 = "1z3adva85qgdyx85hldqi99lnb3pg7a42q44zxil4gxwi62pw4xr"; + version = "3.1.1.1"; + sha256 = "0lvhaa8pqknkcsfps5gcbwiqx0y1rhasiw9hwy7975vgpsh58dph"; buildDepends = [ - binary deepseq mmap mtl primitive transformers vector zlib + binary deepseq mtl primitive transformers vector zlib ]; meta = { homepage = "https://github.com/Twinside/Juicy.Pixels"; diff --git a/pkgs/development/libraries/haskell/accelerate-fft/default.nix b/pkgs/development/libraries/haskell/accelerate-fft/default.nix index 523e5ae1504..4e9a75f64ee 100644 --- a/pkgs/development/libraries/haskell/accelerate-fft/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-fft/default.nix @@ -9,6 +9,6 @@ cabal.mkDerivation (self: { homepage = "https://github.com/AccelerateHS/accelerate-fft"; description = "FFT using the Accelerate library"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; + platforms = self.stdenv.lib.platforms.linux; }; }) diff --git a/pkgs/development/libraries/haskell/accelerate/default.nix b/pkgs/development/libraries/haskell/accelerate/default.nix index c2484116f46..b7979f6f5f2 100644 --- a/pkgs/development/libraries/haskell/accelerate/default.nix +++ b/pkgs/development/libraries/haskell/accelerate/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.13.0.5"; sha256 = "1vqkv3k0w1zy0111a786npf3hypbcg675lbdkv2cf3zx5hqcnn6j"; buildDepends = [ fclabels hashable hashtables ]; + jailbreak = true; meta = { homepage = "https://github.com/AccelerateHS/accelerate/"; description = "An embedded language for accelerated array processing"; diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix index bcb202c64d0..edd2a21040e 100644 --- a/pkgs/development/libraries/haskell/aeson/default.nix +++ b/pkgs/development/libraries/haskell/aeson/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "aeson"; - version = "0.6.2.0"; - sha256 = "1f7bzgwl9pm5a79gr3a8wxh7dyz4k2508d0bw4l0mbjgv6r7s4an"; + version = "0.6.2.1"; + sha256 = "00fa13qr38s4c0fwfvpks3x3sb21kh71cv1v0x2zqg0adnaydknb"; buildDepends = [ attoparsec blazeBuilder deepseq dlist hashable mtl syb text time unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/bifunctors/default.nix b/pkgs/development/libraries/haskell/bifunctors/default.nix index c659c3bc3be..d7c8fa6debb 100644 --- a/pkgs/development/libraries/haskell/bifunctors/default.nix +++ b/pkgs/development/libraries/haskell/bifunctors/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "bifunctors"; - version = "3.2.0.1"; - sha256 = "1biicx0zi48wzzi7vkhzvrdyk59hmmm1bqbsga6x5nbrbf3qrkm6"; + version = "4.1.0.1"; + sha256 = "1mf1v64g5pr2k1jpc7i4994ki2fp5vkxg4n5v84lfbl2r3kr92yg"; buildDepends = [ semigroupoids semigroups tagged ]; meta = { homepage = "http://github.com/ekmett/bifunctors/"; - description = "Haskell 98 bifunctors"; + description = "Bifunctors"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; diff --git a/pkgs/development/libraries/haskell/bindings-DSL/default.nix b/pkgs/development/libraries/haskell/bindings-DSL/default.nix index 5e4e5d79379..ed2a631419a 100644 --- a/pkgs/development/libraries/haskell/bindings-DSL/default.nix +++ b/pkgs/development/libraries/haskell/bindings-DSL/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "bindings-DSL"; - version = "1.0.19"; - sha256 = "0mjlv2ld1qdd83pv7khrk3f0g4ypk8a8z79ykp3nwbvlhhi7bp2h"; + version = "1.0.20"; + sha256 = "11qc02fkmrpy6c1a85lwlz06m4fpvfpbpbxgv5rkyb1amg2cnklq"; meta = { homepage = "http://bitbucket.org/mauricio/bindings-dsl"; description = "FFI domain specific language, on top of hsc2hs"; diff --git a/pkgs/development/libraries/haskell/bindings-libusb/default.nix b/pkgs/development/libraries/haskell/bindings-libusb/default.nix new file mode 100644 index 00000000000..aeea654577a --- /dev/null +++ b/pkgs/development/libraries/haskell/bindings-libusb/default.nix @@ -0,0 +1,15 @@ +{ cabal, bindingsDSL, libusb }: + +cabal.mkDerivation (self: { + pname = "bindings-libusb"; + version = "1.4.4.1"; + sha256 = "1cip5a0n8svjkzawpx3wi9z7nywmn9bl3k2w559b3awy0wixybrx"; + buildDepends = [ bindingsDSL ]; + pkgconfigDepends = [ libusb ]; + meta = { + homepage = "https://github.com/basvandijk/bindings-libusb"; + description = "Low level bindings to libusb"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix index 0a284cd9ba5..95b990b464b 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "certificate"; - version = "1.3.8"; - sha256 = "1id3jfaisl04n1mjj9lbq3gyz8hyn3r9p9chzmfbra0pcj3vf1m0"; + version = "1.3.9"; + sha256 = "18g5rq7lpxmvmlnz610537w6mix6z6kxjrfj2ylbhkc81r5pn9g6"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/charset/default.nix b/pkgs/development/libraries/haskell/charset/default.nix index 9aee9b97afe..829c35b7563 100644 --- a/pkgs/development/libraries/haskell/charset/default.nix +++ b/pkgs/development/libraries/haskell/charset/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "charset"; - version = "0.3.5"; - sha256 = "0842jdqg7hipgkvax3p4cb2y3znsgcmbj9nfrg2448dg2nanlhsn"; + version = "0.3.5.1"; + sha256 = "0bf9s5r2j9bkwmjxzvj5c2c7bhnf5gyh2kkx67lmy8xqalfxgmwn"; buildDepends = [ semigroups unorderedContainers ]; meta = { homepage = "http://github.com/ekmett/charset"; diff --git a/pkgs/development/libraries/haskell/cipher-aes/default.nix b/pkgs/development/libraries/haskell/cipher-aes/default.nix index 5fc5905ebb9..d68d2389e0e 100644 --- a/pkgs/development/libraries/haskell/cipher-aes/default.nix +++ b/pkgs/development/libraries/haskell/cipher-aes/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cipher-aes"; - version = "0.2.5"; - sha256 = "1ayypdfn2nnxp595dpyivmzw2jc4iyjz2in3z7ldccx36gn5j6b3"; + version = "0.2.6"; + sha256 = "0ys5a1w5pwwr74k9wzcsh1flb2jdcvnp1zz7sjs14jpxclpd8x3i"; buildDepends = [ byteable cryptoCipherTypes securemem ]; testDepends = [ byteable cryptoCipherTests cryptoCipherTypes QuickCheck diff --git a/pkgs/development/libraries/haskell/cipher-blowfish/default.nix b/pkgs/development/libraries/haskell/cipher-blowfish/default.nix index 535a4b97fca..44a7d96907a 100644 --- a/pkgs/development/libraries/haskell/cipher-blowfish/default.nix +++ b/pkgs/development/libraries/haskell/cipher-blowfish/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cipher-blowfish"; - version = "0.0.2"; - sha256 = "08jc1qsvnyk7zm7bp0nibkc6lx3bkid79cn1r6fidmccf716r3sp"; + version = "0.0.3"; + sha256 = "0hb67gmiyqrknynz5am8nada1b1v47rqla87dw5nvfhxhl51fhcg"; buildDepends = [ byteable cryptoCipherTypes securemem vector ]; testDepends = [ byteable cryptoCipherTests cryptoCipherTypes QuickCheck diff --git a/pkgs/development/libraries/haskell/cipher-camellia/default.nix b/pkgs/development/libraries/haskell/cipher-camellia/default.nix index 6d29792ea33..52217751d27 100644 --- a/pkgs/development/libraries/haskell/cipher-camellia/default.nix +++ b/pkgs/development/libraries/haskell/cipher-camellia/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cipher-camellia"; - version = "0.0.1"; - sha256 = "11narl4h77v7317hdqy8zxhym3k7xrmw97yfwh0vr8k1y5dkiqh3"; + version = "0.0.2"; + sha256 = "19z2mi1rvp8fsqjdbmrm1hdlxmx61yr55fyknmmn945qrlvx234d"; buildDepends = [ byteable cryptoCipherTypes securemem vector ]; testDepends = [ byteable cryptoCipherTests cryptoCipherTypes QuickCheck diff --git a/pkgs/development/libraries/haskell/cipher-des/default.nix b/pkgs/development/libraries/haskell/cipher-des/default.nix index 0340372d54b..16b953c10bd 100644 --- a/pkgs/development/libraries/haskell/cipher-des/default.nix +++ b/pkgs/development/libraries/haskell/cipher-des/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cipher-des"; - version = "0.0.4"; - sha256 = "18xpc7v0xyh0qb7p03ail1lyh376h1vg000xn22b5shpgp5kxiqq"; + version = "0.0.5"; + sha256 = "1j4nbmxdc3nb5q9gqmwp40dj7pdy71135kvhvl7dfh6mb18bk22v"; buildDepends = [ byteable cryptoCipherTypes securemem ]; testDepends = [ byteable cryptoCipherTests cryptoCipherTypes QuickCheck diff --git a/pkgs/development/libraries/haskell/cipher-rc4/default.nix b/pkgs/development/libraries/haskell/cipher-rc4/default.nix index 038e0dd3292..6485487a0e5 100644 --- a/pkgs/development/libraries/haskell/cipher-rc4/default.nix +++ b/pkgs/development/libraries/haskell/cipher-rc4/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cipher-rc4"; - version = "0.1.3"; - sha256 = "1pdkm7m3v8c7wks7asvqixxjk9jixf78n489ckmw10p77wrqby78"; + version = "0.1.4"; + sha256 = "0k9qf0cn5yxc4qlqikcm5yyrnkkvr6g3v7306cp8iwz7r4dp6zn6"; buildDepends = [ byteable cryptoCipherTypes ]; testDepends = [ cryptoCipherTests cryptoCipherTypes QuickCheck testFramework diff --git a/pkgs/development/libraries/haskell/citeproc-hs/default.nix b/pkgs/development/libraries/haskell/citeproc-hs/default.nix index 573c5085b10..bdc78984c7b 100644 --- a/pkgs/development/libraries/haskell/citeproc-hs/default.nix +++ b/pkgs/development/libraries/haskell/citeproc-hs/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "citeproc-hs"; - version = "0.3.8"; - sha256 = "0wlfwjxg852qcgx54m99xm7hxsmcw8c8r7fyrsxyxl3054xnfwz8"; + version = "0.3.9"; + sha256 = "0f3l33a3rcp8lm8nkbda42lijjpaqa7cxszswhjryy1inywpsssg"; buildDepends = [ filepath hexpat hsBibutils HTTP json mtl network pandocTypes parsec syb time utf8String diff --git a/pkgs/development/libraries/haskell/comonad-transformers/default.nix b/pkgs/development/libraries/haskell/comonad-transformers/default.nix index ef0ffe06198..912b36057c0 100644 --- a/pkgs/development/libraries/haskell/comonad-transformers/default.nix +++ b/pkgs/development/libraries/haskell/comonad-transformers/default.nix @@ -1,18 +1,13 @@ -{ cabal, comonad, contravariant, distributive, semigroupoids -, semigroups, transformers -}: +{ cabal, comonad }: cabal.mkDerivation (self: { pname = "comonad-transformers"; - version = "3.1"; - sha256 = "024l437xfi0bkbn3121xi8slwsh9jby9a92qg1m5y0nmxzs9lxda"; - buildDepends = [ - comonad contravariant distributive semigroupoids semigroups - transformers - ]; + version = "4.0"; + sha256 = "13zzp6r6s6c80skniphwvzxhpazbyal5854m53139kgcw560rv6z"; + buildDepends = [ comonad ]; meta = { homepage = "http://github.com/ekmett/comonad-transformers/"; - description = "Comonad transformers"; + description = "This package has been merged into comonad 4.0"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/default.nix index 472e4e315c1..9457a2ad44d 100644 --- a/pkgs/development/libraries/haskell/comonad/default.nix +++ b/pkgs/development/libraries/haskell/comonad/default.nix @@ -1,14 +1,18 @@ -{ cabal, doctest, filepath, semigroups, tagged, transformers }: +{ cabal, contravariant, distributive, doctest, filepath, mtl +, semigroups, tagged, transformers +}: cabal.mkDerivation (self: { pname = "comonad"; - version = "3.1"; - sha256 = "0sl9b3f1vwpjdvnrxv7b8n512w05pv4in6qx3l4sbksdp1zjvcyv"; - buildDepends = [ semigroups tagged transformers ]; + version = "4.0"; + sha256 = "1f57wqxy1la59kippbj924prnj53a5hwc2ppg48n9xx2wfr63iha"; + buildDepends = [ + contravariant distributive mtl semigroups tagged transformers + ]; testDepends = [ doctest filepath ]; meta = { homepage = "http://github.com/ekmett/comonad/"; - description = "Haskell 98 compatible comonads"; + description = "Comonads"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; diff --git a/pkgs/development/libraries/haskell/comonads-fd/default.nix b/pkgs/development/libraries/haskell/comonads-fd/default.nix index aac28ff0871..f55123f8fe1 100644 --- a/pkgs/development/libraries/haskell/comonads-fd/default.nix +++ b/pkgs/development/libraries/haskell/comonads-fd/default.nix @@ -1,17 +1,14 @@ -{ cabal, comonad, comonadTransformers, mtl, semigroups -, transformers -}: +{ cabal, comonad }: cabal.mkDerivation (self: { pname = "comonads-fd"; - version = "3.0.3"; - sha256 = "06x545yq5xc3kphjipkgjrgrfvvkjpy0wji9d5fw44ca91nzglww"; - buildDepends = [ - comonad comonadTransformers mtl semigroups transformers - ]; + version = "4.0"; + sha256 = "19xpv0dsz7w3a1sq1gdxwzglfal45vj2s22zb12g9mpk5rp3hw1s"; + buildDepends = [ comonad ]; + noHaddock = true; meta = { homepage = "http://github.com/ekmett/comonads-fd/"; - description = "Comonad transformers using functional dependencies"; + description = "This package has been merged into comonad 4.0"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 0e1757f7b50..ab41f5a5621 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 = "1.0.7.4"; - sha256 = "1bvi9gw9sfi1fml339rn3cfq4i3yd9j9vw41p5cpz5pnv3gw225x"; + version = "1.0.8"; + sha256 = "0qsi9p7hwzaw1ridgydfmaagjjpkbgq755b1r9xm4apdy6fikcz5"; buildDepends = [ liftedBase mmorph monadControl mtl resourcet text transformers transformersBase void diff --git a/pkgs/development/libraries/haskell/connection/default.nix b/pkgs/development/libraries/haskell/connection/default.nix new file mode 100644 index 00000000000..a7930cab08b --- /dev/null +++ b/pkgs/development/libraries/haskell/connection/default.nix @@ -0,0 +1,18 @@ +{ cabal, certificate, cprngAes, dataDefault, network, socks, tls +, tlsExtra +}: + +cabal.mkDerivation (self: { + pname = "connection"; + version = "0.1.3"; + sha256 = "13bwlbga612kc7g3m3rrdzbdv4w0glp4af9r6crwgjsmxgimrgs9"; + buildDepends = [ + certificate cprngAes dataDefault network socks tls tlsExtra + ]; + meta = { + homepage = "http://github.com/vincenthz/hs-connection"; + description = "Simple and easy network connections API"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/constraints/default.nix b/pkgs/development/libraries/haskell/constraints/default.nix index 87ec5d82724..e57b4e6c085 100644 --- a/pkgs/development/libraries/haskell/constraints/default.nix +++ b/pkgs/development/libraries/haskell/constraints/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "constraints"; - version = "0.3.3"; - sha256 = "0mglqd6l6bc333i7gymbm8q037hj5fny6jzyg1zmw5kg6r3xcwdi"; + version = "0.3.4.1"; + sha256 = "13jxh2cgcfyiqhx7j5063k8k60wz9h4hd5lf2mw2skbcryg6csmb"; buildDepends = [ newtype ]; meta = { homepage = "http://github.com/ekmett/constraints/"; diff --git a/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix b/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix index 752ef8fdf9e..ed071bbc92a 100644 --- a/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix +++ b/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "crypto-cipher-tests"; - version = "0.0.8"; - sha256 = "0bprv2pj3acq97482wsz1pp76rrdvvy5scv4na8aqfsdsglbjq47"; + version = "0.0.10"; + sha256 = "1gmhpk1pdc9axkmpw9fyr1zgv6pskyzzlsq8icp2w4fc83l61smb"; buildDepends = [ byteable cryptoCipherTypes HUnit mtl QuickCheck securemem testFramework testFrameworkHunit testFrameworkQuickcheck2 diff --git a/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix b/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix index 2dc86360241..70e61054137 100644 --- a/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix +++ b/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "crypto-cipher-types"; - version = "0.0.6"; - sha256 = "1gw3nmf242fbmwhpwk1v1sxhvw1dcy9l06aj6ag0wqb12qn2bqmg"; + version = "0.0.7"; + sha256 = "1zvlc88c4w4rhj1imx3w3j3f4b6im9sj78fgwwyzwmn14mn1y6l8"; buildDepends = [ byteable securemem ]; meta = { homepage = "http://github.com/vincenthz/hs-crypto-cipher"; diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix index d598b363933..839bf4518a1 100644 --- a/pkgs/development/libraries/haskell/cryptohash/default.nix +++ b/pkgs/development/libraries/haskell/cryptohash/default.nix @@ -4,11 +4,11 @@ cabal.mkDerivation (self: { pname = "cryptohash"; - version = "0.10.0"; - sha256 = "0szvx1dxf16chlksmp08g9qxy7f87w6hspigwbw78aygc3q9mzaq"; + version = "0.11.1"; + sha256 = "0ww7bikl8i50m1pwkqp145bfsiy07npnjw48j3il4w2ia0b3axmy"; buildDepends = [ byteable ]; testDepends = [ - HUnit QuickCheck testFramework testFrameworkHunit + byteable HUnit QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 ]; meta = { diff --git a/pkgs/development/libraries/haskell/cufft/default.nix b/pkgs/development/libraries/haskell/cufft/default.nix index 76039f06548..213072b5cdf 100644 --- a/pkgs/development/libraries/haskell/cufft/default.nix +++ b/pkgs/development/libraries/haskell/cufft/default.nix @@ -10,6 +10,6 @@ cabal.mkDerivation (self: { homepage = "http://github.com/robeverest/cufft"; description = "Haskell bindings for the CUFFT library"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; + platforms = self.stdenv.lib.platforms.linux; }; }) diff --git a/pkgs/development/libraries/haskell/distributive/default.nix b/pkgs/development/libraries/haskell/distributive/default.nix index d40952024ef..d03257f54d3 100644 --- a/pkgs/development/libraries/haskell/distributive/default.nix +++ b/pkgs/development/libraries/haskell/distributive/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "distributive"; - version = "0.3.1"; - sha256 = "0zf3wq1xz9sbb0g6fg852jckrwkffsfkghq3zx03d2q9ginc6jbc"; + version = "0.3.2"; + sha256 = "1n2xnjffrbfw736qn9w5fxy4pjl2319yhimkglhbayq85pz51r1h"; buildDepends = [ transformers transformersCompat ]; testDepends = [ doctest filepath ]; meta = { diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix index 67c1962cbe9..93dfd043c90 100644 --- a/pkgs/development/libraries/haskell/either/default.nix +++ b/pkgs/development/libraries/haskell/either/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "either"; - version = "3.4.1"; - sha256 = "1cq4glqhxz9k8fxf0dc8b6hcxxfn4yci6h7wmfkmkfq5ca61ax1b"; + version = "4.0"; + sha256 = "07axaq43cqyglndr5az7ns4mvkjmybq6z8s32l1jxc5x7532scwr"; buildDepends = [ MonadRandom mtl semigroupoids semigroups transformers ]; diff --git a/pkgs/development/libraries/haskell/entropy/default.nix b/pkgs/development/libraries/haskell/entropy/default.nix index 17409f05eed..f2154ddddf7 100644 --- a/pkgs/development/libraries/haskell/entropy/default.nix +++ b/pkgs/development/libraries/haskell/entropy/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "entropy"; - version = "0.2.2.2"; - sha256 = "1xkpfi6njj5iqwn5wa6npyzxksj9hr0xqbxrslg646whxrkd8718"; + version = "0.2.2.4"; + sha256 = "1cjmpb0rh1ib4j9mwmf1irn401vmjawxkshxdmmb4643rmcgx1gm"; meta = { homepage = "https://github.com/TomMD/entropy"; description = "A platform independent entropy source"; diff --git a/pkgs/development/libraries/haskell/enumerator/default.nix b/pkgs/development/libraries/haskell/enumerator/default.nix index 5b44c9efc62..4dfa4e573dd 100644 --- a/pkgs/development/libraries/haskell/enumerator/default.nix +++ b/pkgs/development/libraries/haskell/enumerator/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "enumerator"; - version = "0.4.19"; - sha256 = "1avxy55vbvkz6yj512bkb2b986y3m0b28c9c5lfc3wd2na7w1s5g"; + version = "0.4.20"; + sha256 = "02a75dggj295zkhgjry5cb43s6y6ydpjb5w6vgl7kd9b6ma11qik"; buildDepends = [ text transformers ]; meta = { homepage = "https://john-millikin.com/software/enumerator/"; diff --git a/pkgs/development/libraries/haskell/errors/default.nix b/pkgs/development/libraries/haskell/errors/default.nix index d15ac59feba..be061cfb443 100644 --- a/pkgs/development/libraries/haskell/errors/default.nix +++ b/pkgs/development/libraries/haskell/errors/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "1.4.2"; sha256 = "1csry8bbz7r4gc7x3lf1ih10rvnig2i91nfij227p9744yndl2xw"; buildDepends = [ either safe transformers ]; + jailbreak = true; meta = { description = "Simplified error-handling"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix index 71a3fe8d0c2..cea3302cf58 100644 --- a/pkgs/development/libraries/haskell/fclabels/default.nix +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "fclabels"; - version = "1.1.7.1"; - sha256 = "1f34r3bzn1cbba8d5d1j3wxrlrrj5vf09hpgd6ppina91wyj4dyn"; + version = "2.0"; + sha256 = "1zh8hr0nq7vnp0q5yf0qd4sbxpaq67l15gs1rvssxfj6n738kngq"; buildDepends = [ mtl transformers ]; meta = { homepage = "https://github.com/sebastiaanvisser/fclabels"; - description = "First class accessor labels"; + description = "First class accessor labels implemented as lenses"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; diff --git a/pkgs/development/libraries/haskell/file-embed/default.nix b/pkgs/development/libraries/haskell/file-embed/default.nix index 2eb9ac94d8c..3d7015d7ec2 100644 --- a/pkgs/development/libraries/haskell/file-embed/default.nix +++ b/pkgs/development/libraries/haskell/file-embed/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "file-embed"; - version = "0.0.4.9"; - sha256 = "128z3jwxn6d13dkrfjx7maxgmax8bfgr8n2jfhqg3rvv4ryjnqv2"; + version = "0.0.5"; + sha256 = "0s77g7azw73f7d07hvwwps8sx79jpwj8ap9iqzcglyjw1sw4l1n1"; buildDepends = [ filepath ]; testDepends = [ filepath HUnit ]; meta = { diff --git a/pkgs/development/libraries/haskell/free/default.nix b/pkgs/development/libraries/haskell/free/default.nix index 56bf80d71af..64d9541f401 100644 --- a/pkgs/development/libraries/haskell/free/default.nix +++ b/pkgs/development/libraries/haskell/free/default.nix @@ -1,15 +1,14 @@ -{ cabal, bifunctors, comonad, comonadsFd, comonadTransformers -, distributive, mtl, profunctors, semigroupoids, semigroups -, transformers +{ cabal, bifunctors, comonad, distributive, mtl, profunctors +, semigroupoids, semigroups, transformers }: cabal.mkDerivation (self: { pname = "free"; - version = "3.4.2"; - sha256 = "1x6pdkcxk6z9ndph2yzz5n21afc2330m0ryv4w67jsss5aa69fwb"; + version = "4.1"; + sha256 = "16951r4f7ggvcw2qgjwdrmaxxnrmrm69c67nixs77lm1d31nks4w"; buildDepends = [ - bifunctors comonad comonadsFd comonadTransformers distributive mtl - profunctors semigroupoids semigroups transformers + bifunctors comonad distributive mtl profunctors semigroupoids + semigroups transformers ]; meta = { homepage = "http://github.com/ekmett/free/"; diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index 3504e79d54b..977a15d28e0 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "3.1.2"; - sha256 = "164ldbdvr2qrnb9sq0d9y35la4fzwn6x43xqdsi1s10dppckczlm"; + version = "3.1.3"; + sha256 = "0g12cj8yn2znhqi7wiz5jayzh4g5jdcj1qwy5g3pz456hcpb0jig"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/groupoids/default.nix b/pkgs/development/libraries/haskell/groupoids/default.nix index 4c085c0ae23..7697e8e369f 100644 --- a/pkgs/development/libraries/haskell/groupoids/default.nix +++ b/pkgs/development/libraries/haskell/groupoids/default.nix @@ -2,12 +2,13 @@ cabal.mkDerivation (self: { pname = "groupoids"; - version = "3.0.1.1"; - sha256 = "0r4xjyq7icd52nas27bhr5k8q7li6lba8mlkcipghhsgxsyjfp63"; + version = "4.0"; + sha256 = "08la44c19pz2clws5mb939zc1d17cb6qy9qlh2n1634pl0zrawb6"; buildDepends = [ semigroupoids ]; + noHaddock = true; meta = { homepage = "http://github.com/ekmett/groupoids/"; - description = "Haskell 98 Groupoids"; + description = "This package has been absorbed into semigroupoids 4.0"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 0197bc4d142..27f3d6629d5 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -1,38 +1,34 @@ -{ cabal, binary, blazeHtml, blazeMarkup, pandocCiteproc, cmdargs -, cryptohash, dataDefault, deepseq, filepath, fsnotify, httpConduit -, httpTypes, HUnit, lrucache, mtl, network, pandoc, parsec +{ cabal, binary, blazeHtml, blazeMarkup, cmdargs, cryptohash +, dataDefault, deepseq, filepath, fsnotify, httpConduit, httpTypes +, HUnit, lrucache, mtl, network, pandoc, pandocCiteproc, parsec , QuickCheck, random, regexBase, regexTdfa, snapCore, snapServer , systemFilepath, tagsoup, testFramework, testFrameworkHunit -, testFrameworkQuickcheck2, text, time, fetchurl +, testFrameworkQuickcheck2, text, time }: cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.3.3.0"; - sha256 = "11zfz55a7dr5l7xzknphqninyrb2pw2qmrs7v7ajq2gvbl0lf37n"; + version = "4.4.1.0"; + sha256 = "17bns61l5d0h8qyhbz5gnc4j9yjjajk57whp0j4gfshaq0s2aif9"; isLibrary = true; isExecutable = true; - patches = [ (fetchurl { url = "https://github.com/jaspervdj/hakyll/pull/183.patch"; - sha256 = "0vjrxvgyc05nnshapjhk65pcamj9rigqff5q6wjbssx3ggqggrz9"; - name = "hakyll-pandoc-fix.patch"; - }) ]; buildDepends = [ - binary blazeHtml blazeMarkup pandocCiteproc cmdargs cryptohash - dataDefault deepseq filepath fsnotify httpConduit httpTypes - lrucache mtl network pandoc parsec random regexBase regexTdfa - snapCore snapServer systemFilepath tagsoup text time + binary blazeHtml blazeMarkup cmdargs cryptohash dataDefault deepseq + filepath fsnotify httpConduit httpTypes lrucache mtl network pandoc + pandocCiteproc parsec random regexBase regexTdfa snapCore + snapServer systemFilepath tagsoup text time ]; testDepends = [ - binary blazeHtml blazeMarkup pandocCiteproc cmdargs cryptohash - dataDefault deepseq filepath fsnotify httpConduit httpTypes HUnit - lrucache mtl network pandoc parsec QuickCheck random regexBase - regexTdfa snapCore snapServer systemFilepath tagsoup testFramework + binary blazeHtml blazeMarkup cmdargs cryptohash dataDefault deepseq + filepath fsnotify httpConduit httpTypes HUnit lrucache mtl network + pandoc pandocCiteproc parsec QuickCheck random regexBase regexTdfa + snapCore snapServer systemFilepath tagsoup testFramework testFrameworkHunit testFrameworkQuickcheck2 text time ]; - doCheck = false; - postPatch = '' + patchPhase = '' sed -i -e 's|cryptohash.*,|cryptohash,|' -e 's|tagsoup.*,|tagsoup,|' hakyll.cabal ''; + doCheck = false; meta = { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index c29672767a6..b40025ff716 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hamlet"; - version = "1.1.7.2"; - sha256 = "1pfpygbabfmgx01vjkxhf3p9map2v7x8jys06jd6qgc4j90dnk1c"; + version = "1.1.7.3"; + sha256 = "0532gf4xdbjxjpv7gsfv0bapnnb4g81jcfzkn71nwizi8zls3qck"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text ]; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index f58e4ba2d3d..e12d848f00f 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "happstack-server"; - version = "7.3.0"; - sha256 = "094q6m6a4cxwmmw9hin2pphiq8gi0y4ma4vkvqv7rwqnn3mf9n0q"; + version = "7.3.1"; + sha256 = "0yk4ylyyc8pz7j5lxibah356f986w932ncxp4y612rqcd0abzrq4"; buildDepends = [ base64Bytestring blazeHtml extensibleExceptions filepath hslogger html monadControl mtl network parsec sendfile syb systemFilepath diff --git a/pkgs/development/libraries/haskell/hashtables/default.nix b/pkgs/development/libraries/haskell/hashtables/default.nix index ae62c051ec5..ca0e2e529c5 100644 --- a/pkgs/development/libraries/haskell/hashtables/default.nix +++ b/pkgs/development/libraries/haskell/hashtables/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hashtables"; - version = "1.1.0.2"; - sha256 = "0d103cvr168hgyghm6fp67r4lz1p592x45igwld6xq3nyxjxnbp9"; + version = "1.1.2.1"; + sha256 = "1166baqalpp9v735821drjvyasr44p4znbcs7njyr09fx87r23f5"; buildDepends = [ hashable primitive vector ]; meta = { homepage = "http://github.com/gregorycollins/hashtables"; diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix index 7c9e7694046..6ce8f9e72ba 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.6.0.3"; - sha256 = "1ag26pzppvqw9ch6jz1p0bhsld7fz0b01k7h9516hnmy215h7xai"; + version = "0.6.0.4"; + sha256 = "10dixf2abk0canwikf3wdp1ahc51400wxa7x4g59pygv8a3c1c1x"; buildDepends = [ haskellSrcExts syb thOrphans uniplate ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/haxr/default.nix b/pkgs/development/libraries/haskell/haxr/default.nix index a5aaf44c392..26ebbb9f8b0 100644 --- a/pkgs/development/libraries/haskell/haxr/default.nix +++ b/pkgs/development/libraries/haskell/haxr/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "haxr"; - version = "3000.9.3"; - sha256 = "1jg7abgbykxjjpmakmfm6zcwxn0hf9q53430ibr4m9n6alh7nglq"; + version = "3000.10.1.1"; + sha256 = "0qvbl3bms2mf650w9j3r0pnl151vzkggy2if3f4rj34qwb2sxmvp"; buildDepends = [ base64Bytestring blazeBuilder HaXml HTTP mtl network time utf8String diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix index c39a1fc24a8..b8f709a402c 100644 --- a/pkgs/development/libraries/haskell/heist/default.nix +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "heist"; - version = "0.13.0.1"; - sha256 = "1hxf131xhvsqbvmrm8wbjpndy41pz1lq65gqlk3lxr57dhi59s4w"; + version = "0.13.0.2"; + sha256 = "0rbzizgrvwj505dk7qyc9ky5vwyaxyj91xz1dsv0mv7cjl9pp17n"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors filepath hashable MonadCatchIOTransformers mtl random text time diff --git a/pkgs/development/libraries/haskell/hflags/default.nix b/pkgs/development/libraries/haskell/hflags/default.nix index f65520da532..04e70183781 100644 --- a/pkgs/development/libraries/haskell/hflags/default.nix +++ b/pkgs/development/libraries/haskell/hflags/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hflags"; - version = "0.3"; - sha256 = "113pqdjnxfhkk95969ia393n1jvbbnfljsz42vfapgzvd8f1fci2"; + version = "0.4"; + sha256 = "17zzx273kmnwwazmmns78cllz3l7wad1gi7hizgcxi68j04blhd4"; buildDepends = [ text ]; meta = { homepage = "http://github.com/errge/hflags"; diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix index 9551581dadf..5980141526b 100644 --- a/pkgs/development/libraries/haskell/hjsmin/default.nix +++ b/pkgs/development/libraries/haskell/hjsmin/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hjsmin"; - version = "0.1.4.1"; - sha256 = "0r73hd6kn37mdbm2i3g6v3qqm696kyflqs6ajq68qr5sr62sjb1a"; + version = "0.1.4.3"; + sha256 = "1jhpqfvwvzik41i4mi9fr9w1jlrlc1lj2illlbbwg7r3fwr5hnnl"; buildDepends = [ blazeBuilder languageJavascript text ]; testDepends = [ blazeBuilder Cabal HUnit languageJavascript QuickCheck diff --git a/pkgs/development/libraries/haskell/hslua/default.nix b/pkgs/development/libraries/haskell/hslua/default.nix index e953eb74711..ebccbf963fe 100644 --- a/pkgs/development/libraries/haskell/hslua/default.nix +++ b/pkgs/development/libraries/haskell/hslua/default.nix @@ -1,10 +1,12 @@ -{ cabal, mtl }: +{ cabal, lua, mtl }: cabal.mkDerivation (self: { pname = "hslua"; - version = "0.3.6.1"; - sha256 = "0c60gnf0mp6kx2z2149icl7hdwvigibvxd091a3vc6zkl5c5r41p"; + version = "0.3.7"; + sha256 = "1q5s2b7x9idvdvp31yl86mmy476gfq6rg8f0r8faqxrm45jwgv2q"; buildDepends = [ mtl ]; + pkgconfigDepends = [ lua ]; + configureFlags = "-fsystem-lua"; meta = { description = "A Lua language interpreter embedding in Haskell"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/intervals/default.nix b/pkgs/development/libraries/haskell/intervals/default.nix index 3cc44b05dbb..9a270574570 100644 --- a/pkgs/development/libraries/haskell/intervals/default.nix +++ b/pkgs/development/libraries/haskell/intervals/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "intervals"; - version = "0.2.2"; - sha256 = "059xmk373xz6nwk61iyhx4d7xd328jxb694qmq9plry3k77mdh5q"; + version = "0.2.2.1"; + sha256 = "0kbsms3742ppmzbmrfp94aq4wvwrayx5ppsyk7pd1mj7y47aay0f"; buildDepends = [ numericExtras ]; meta = { homepage = "http://github.com/ekmett/intervals"; diff --git a/pkgs/development/libraries/haskell/keys/default.nix b/pkgs/development/libraries/haskell/keys/default.nix index 80a61b5b5be..b657f3dd6b9 100644 --- a/pkgs/development/libraries/haskell/keys/default.nix +++ b/pkgs/development/libraries/haskell/keys/default.nix @@ -1,14 +1,11 @@ -{ cabal, comonadsFd, comonadTransformers, free, semigroupoids -, semigroups, transformers -}: +{ cabal, comonad, free, semigroupoids, semigroups, transformers }: cabal.mkDerivation (self: { pname = "keys"; - version = "3.0.3"; - sha256 = "1fqw0745pj8pzjjlrbg85gdr3acm7gpip5052m9wcz997949ca3r"; + version = "3.10"; + sha256 = "1s2xkzvaqk507wrgabpxli8g8n83arflmdhxq40f7qkvyflhhmyh"; buildDepends = [ - comonadsFd comonadTransformers free semigroupoids semigroups - transformers + comonad free semigroupoids semigroups transformers ]; meta = { homepage = "http://github.com/ekmett/keys/"; diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index cdccc4768e0..60aa29ac089 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -1,23 +1,21 @@ -{ cabal, bifunctors, comonad, comonadsFd, comonadTransformers -, contravariant, deepseq, distributive, doctest, filepath -, genericDeriving, hashable, HUnit, MonadCatchIOTransformers, mtl -, nats, parallel, profunctorExtras, profunctors, QuickCheck -, reflection, semigroupoids, semigroups, simpleReflect, split -, tagged, testFramework, testFrameworkHunit +{ cabal, bifunctors, comonad, contravariant, deepseq, distributive +, doctest, filepath, genericDeriving, hashable, HUnit +, MonadCatchIOTransformers, mtl, nats, parallel, profunctors +, QuickCheck, reflection, semigroupoids, semigroups, simpleReflect +, split, tagged, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, testFrameworkTh, text, transformers , transformersCompat, unorderedContainers, vector, void }: cabal.mkDerivation (self: { pname = "lens"; - version = "3.9.2"; - sha256 = "17pc0waf3g6dxvmvyxkgh8kz22iscd9z00s67rcn0p604swprj2k"; + version = "3.10"; + sha256 = "086kbd59zlx3ldrxilssxd0gr9izwhcfhg5k6bqzm6gwvysrzq3y"; buildDepends = [ - bifunctors comonad comonadsFd comonadTransformers contravariant - distributive filepath genericDeriving hashable - MonadCatchIOTransformers mtl parallel profunctorExtras profunctors - reflection semigroupoids semigroups split tagged text transformers - transformersCompat unorderedContainers vector void + bifunctors comonad contravariant distributive filepath + genericDeriving hashable MonadCatchIOTransformers mtl parallel + profunctors reflection semigroupoids semigroups split tagged text + transformers transformersCompat unorderedContainers vector void ]; testDepends = [ deepseq doctest filepath genericDeriving HUnit mtl nats parallel diff --git a/pkgs/development/libraries/haskell/llvm-general/3.3.5.nix b/pkgs/development/libraries/haskell/llvm-general/3.3.5.nix deleted file mode 100644 index 16d9859aae2..00000000000 --- a/pkgs/development/libraries/haskell/llvm-general/3.3.5.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ cabal, HUnit, llvmConfig, mtl, parsec, QuickCheck, setenv -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text -, transformers -}: - -cabal.mkDerivation (self: { - pname = "llvm-general"; - version = "3.3.5.0"; - sha256 = "15zrav7339jn6p75g1d7h3qkr1wyal1jzfs8xy73kckw2fzn4nlf"; - buildDepends = [ mtl parsec setenv text transformers ]; - testDepends = [ - HUnit mtl QuickCheck testFramework testFrameworkHunit - testFrameworkQuickcheck2 - ]; - buildTools = [ llvmConfig ]; - meta = { - description = "General purpose LLVM bindings"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix b/pkgs/development/libraries/haskell/llvm-general/default.nix index 2eb0a2c5d20..2eb0a2c5d20 100644 --- a/pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix +++ b/pkgs/development/libraries/haskell/llvm-general/default.nix diff --git a/pkgs/development/libraries/haskell/math-functions/default.nix b/pkgs/development/libraries/haskell/math-functions/default.nix index 2e29269a9fd..8180c8bce75 100644 --- a/pkgs/development/libraries/haskell/math-functions/default.nix +++ b/pkgs/development/libraries/haskell/math-functions/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "math-functions"; - version = "0.1.3.0"; - sha256 = "06wxr8fbhmsgkpyx2vimx9l6apk0p27mwrxrvbjk0b7m9vsg3ay5"; + version = "0.1.4.0"; + sha256 = "1cijm224gfvd7rvrrndcks8d7aj89c9qv0m4wx2qqngr7rk78kav"; buildDepends = [ erf vector ]; testDepends = [ HUnit ieee754 QuickCheck testFramework testFrameworkHunit diff --git a/pkgs/development/libraries/haskell/mwc-random/default.nix b/pkgs/development/libraries/haskell/mwc-random/default.nix index 2d6b846e706..d26980994e7 100644 --- a/pkgs/development/libraries/haskell/mwc-random/default.nix +++ b/pkgs/development/libraries/haskell/mwc-random/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "mwc-random"; - version = "0.13.0.0"; - sha256 = "16f8dd81wj81h0jcqnrlr2d6mjc7q2r436qf8z320d6wpzih2djy"; + version = "0.13.1.0"; + sha256 = "16g6b1pphr4p36nn5qjj62iwf47rq8kfmpjgfvd35r3cz9qqb8cb"; buildDepends = [ primitive time vector ]; testDepends = [ HUnit QuickCheck statistics testFramework testFrameworkHunit diff --git a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix index bfb96e30480..415c047a2f5 100644 --- a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix +++ b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix @@ -1,16 +1,17 @@ -{ cabal, aeson, certificate, conduit, cprngAes, cryptoApi -, cryptoRandomApi, network, networkConduit, pem, systemFileio -, systemFilepath, tls, tlsExtra, transformers +{ cabal, aeson, certificate, conduit, connection, cprngAes +, cryptoApi, cryptoRandomApi, dataDefault, monadControl, network +, networkConduit, pem, systemFileio, systemFilepath, tls, tlsExtra +, transformers }: cabal.mkDerivation (self: { pname = "network-conduit-tls"; - version = "1.0.1.1"; - sha256 = "0v5rspcjhd2vid5i74dy1sdcvci7dlr88sgr0v9vjp4gcyb29qlj"; + version = "1.0.2"; + sha256 = "0m3sbb4vpsjf568zaaxri8x7x46wngf5y2s5chgjzfmbj0amkl51"; buildDepends = [ - aeson certificate conduit cprngAes cryptoApi cryptoRandomApi - network networkConduit pem systemFileio systemFilepath tls tlsExtra - transformers + aeson certificate conduit connection cprngAes cryptoApi + cryptoRandomApi dataDefault monadControl network networkConduit pem + systemFileio systemFilepath tls tlsExtra transformers ]; meta = { homepage = "https://github.com/snoyberg/conduit"; diff --git a/pkgs/development/libraries/haskell/network/2.4.2.0.nix b/pkgs/development/libraries/haskell/network/2.4.2.0.nix new file mode 100644 index 00000000000..2912138daf7 --- /dev/null +++ b/pkgs/development/libraries/haskell/network/2.4.2.0.nix @@ -0,0 +1,20 @@ +{ cabal, HUnit, parsec, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2 +}: + +cabal.mkDerivation (self: { + pname = "network"; + version = "2.4.2.0"; + sha256 = "1v6iwww8xym0sr2593ri0aa6gcs6n2975fi9gaz9n7rizbqm88qs"; + buildDepends = [ parsec ]; + testDepends = [ + HUnit testFramework testFrameworkHunit testFrameworkQuickcheck2 + ]; + meta = { + homepage = "https://github.com/haskell/network"; + description = "Low-level networking interface"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/numbers/default.nix b/pkgs/development/libraries/haskell/numbers/default.nix index 81a3e866dc0..26ed2d77bd0 100644 --- a/pkgs/development/libraries/haskell/numbers/default.nix +++ b/pkgs/development/libraries/haskell/numbers/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "numbers"; - version = "3000.1.0.3"; - sha256 = "0w2m2m3vp3lpvnc7wkw6pqfz741a68dma4s0asl7cryykwf94xgz"; + version = "3000.2.0.0"; + sha256 = "035qc7dgh4nd661z4mm742v8y7xqdyyp0r0vkinxiifciqb1fkbm"; testDepends = [ QuickCheck testFramework testFrameworkQuickcheck2 ]; diff --git a/pkgs/development/libraries/haskell/optparse-applicative/default.nix b/pkgs/development/libraries/haskell/optparse-applicative/default.nix index a3ab241b28c..44917d01c00 100644 --- a/pkgs/development/libraries/haskell/optparse-applicative/default.nix +++ b/pkgs/development/libraries/haskell/optparse-applicative/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "optparse-applicative"; - version = "0.5.2.1"; - sha256 = "0w4mk851mx8dch8lnck0g82asmzrsc47xrf34jygh0f6v4kbj40i"; + version = "0.6.0"; + sha256 = "07wzsgwym0g6qd39jvgp6ndpqdn2w0c4sn9mcz19rqlb2am24ip8"; buildDepends = [ transformers ]; testDepends = [ HUnit testFramework testFrameworkHunit testFrameworkThPrime diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix index 2c477687096..4960e16202e 100644 --- a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix @@ -1,21 +1,21 @@ { cabal, aeson, aesonPretty, attoparsec, Diff, filepath, hexpat -, hsBibutils, HTTP, json, mtl, network, pandocTypes, parsec -, rfc5051, syb, tagsoup, texmath, text, time, utf8String, vector -, yaml +, hsBibutils, HTTP, json, mtl, network, pandoc, pandocTypes, parsec +, rfc5051, split, syb, tagsoup, texmath, text, time, utf8String +, vector, yaml }: cabal.mkDerivation (self: { pname = "pandoc-citeproc"; - version = "0.1.1.1"; - sha256 = "07h277cz5wzc2dsfqfh9lasz7ypb4pspvqljs9maj6lx5rkk5fq1"; + version = "0.1.2"; + sha256 = "055msvrcqjkijkhzws48scpc4z90g0qjjsdcd0fhy309da6vax57"; isLibrary = true; isExecutable = true; buildDepends = [ aeson attoparsec filepath hexpat hsBibutils HTTP json mtl network - pandocTypes parsec rfc5051 syb tagsoup texmath text time utf8String - vector yaml + pandoc pandocTypes parsec rfc5051 split syb tagsoup texmath text + time utf8String vector yaml ]; - testDepends = [ aeson aesonPretty Diff pandocTypes utf8String ]; + testDepends = [ aeson aesonPretty Diff pandoc pandocTypes ]; doCheck = false; meta = { description = "Supports using pandoc with citeproc"; diff --git a/pkgs/development/libraries/haskell/pandoc-types/default.nix b/pkgs/development/libraries/haskell/pandoc-types/default.nix index 686c07949be..e1e7ac54d4c 100644 --- a/pkgs/development/libraries/haskell/pandoc-types/default.nix +++ b/pkgs/development/libraries/haskell/pandoc-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pandoc-types"; - version = "1.12.2.2"; - sha256 = "1ax92rxynrp42032d0i4wnv700cszm6qsvna8f9hqcfxvc2cbp36"; + version = "1.12.2.3"; + sha256 = "05xbpsx44sys0rkf2aqs4fcv4bg02ffhicp49jgnjyw9jiynhzzj"; buildDepends = [ aeson syb ]; meta = { homepage = "http://johnmacfarlane.net/pandoc"; diff --git a/pkgs/development/libraries/haskell/parsers/default.nix b/pkgs/development/libraries/haskell/parsers/default.nix index dc42228df66..529fdf47124 100644 --- a/pkgs/development/libraries/haskell/parsers/default.nix +++ b/pkgs/development/libraries/haskell/parsers/default.nix @@ -1,12 +1,14 @@ -{ cabal, charset, doctest, filepath, text, transformers +{ cabal, charset, doctest, filepath, parsec, text, transformers , unorderedContainers }: cabal.mkDerivation (self: { pname = "parsers"; - version = "0.9"; - sha256 = "04lbayvdv2hax4s9sqlnia7jpzv1sgls41ylql0xbi2zhz5rvyyi"; - buildDepends = [ charset text transformers unorderedContainers ]; + version = "0.10"; + sha256 = "090dvmdb1kmnc3k2x170y9fdifxi16hzkij1gzc51flx3bpx40i1"; + buildDepends = [ + charset parsec text transformers unorderedContainers + ]; testDepends = [ doctest filepath ]; meta = { homepage = "http://github.com/ekmett/parsers/"; diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index 2afc416cb52..c3bb228933d 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "persistent-template"; - version = "1.2.0.2"; - sha256 = "0zj35mg7fzyk4b98s3s8m5i064s0wznz9aixgxa4kzm4xps7hj4z"; + version = "1.2.0.4"; + sha256 = "0lhqv4mcai9r5mzj5h6fsd1hd8mv1458id0rb6q157192gywxhzf"; buildDepends = [ aeson monadControl monadLogger persistent text transformers ]; diff --git a/pkgs/development/libraries/haskell/pointed/default.nix b/pkgs/development/libraries/haskell/pointed/default.nix index e3a8d66be4c..15f4ba59aaa 100644 --- a/pkgs/development/libraries/haskell/pointed/default.nix +++ b/pkgs/development/libraries/haskell/pointed/default.nix @@ -1,18 +1,18 @@ -{ cabal, comonad, comonadTransformers, dataDefault, semigroupoids -, semigroups, stm, tagged, transformers +{ cabal, comonad, dataDefaultClass, semigroupoids, semigroups, stm +, tagged, transformers }: cabal.mkDerivation (self: { pname = "pointed"; - version = "3.1"; - sha256 = "13vx1vy3qfa23145fdfdivdmw01qyl2k6g8ynqxl8pzbj9cbb08n"; + version = "4.0"; + sha256 = "02y7ba1pcpmwcp762516p4x75y3ma2kml9mbiv1y8gcnn4ylvir4"; buildDepends = [ - comonad comonadTransformers dataDefault semigroupoids semigroups - stm tagged transformers + comonad dataDefaultClass semigroupoids semigroups stm tagged + transformers ]; meta = { homepage = "http://github.com/ekmett/pointed/"; - description = "Haskell 98 pointed and copointed data"; + description = "Pointed and copointed data"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index 9f89ae83ec6..a6412006e8f 100644 --- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "postgresql-simple"; - version = "0.3.7.1"; - sha256 = "1xrgwpg58srmzv1d0jdknyh5vwdq2c40fyqy0wvgppisxzq469wh"; + version = "0.3.8.0"; + sha256 = "1p1cxp7mjrxyxxqrq2skm3kqrnmb3k6fb8kwr2aj9cnbqfhwl1qf"; buildDepends = [ aeson attoparsec blazeBuilder blazeTextual postgresqlLibpq text time transformers vector diff --git a/pkgs/development/libraries/haskell/profunctor-extras/default.nix b/pkgs/development/libraries/haskell/profunctor-extras/default.nix index 6844bcc369a..bf7e6ab7121 100644 --- a/pkgs/development/libraries/haskell/profunctor-extras/default.nix +++ b/pkgs/development/libraries/haskell/profunctor-extras/default.nix @@ -1,18 +1,13 @@ -{ cabal, comonad, profunctors, semigroupoidExtras, semigroupoids -, tagged, transformers -}: +{ cabal, profunctors }: cabal.mkDerivation (self: { pname = "profunctor-extras"; - version = "3.3.3.1"; - sha256 = "16naa6ksgwy6fh8vwflcc9s0rpamn886as8qhjqrkpjlc8s83h7g"; - buildDepends = [ - comonad profunctors semigroupoidExtras semigroupoids tagged - transformers - ]; + version = "4.0"; + sha256 = "10j458liqlyz5s9gkg95c6aq7ap5fa7d8pc7hygy71nn87pm2g4a"; + buildDepends = [ profunctors ]; meta = { homepage = "http://github.com/ekmett/profunctor-extras/"; - description = "Profunctor extras"; + description = "This package has been absorbed into profunctors 4.0"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; diff --git a/pkgs/development/libraries/haskell/profunctors/default.nix b/pkgs/development/libraries/haskell/profunctors/default.nix index 83398295108..83d06b10ca6 100644 --- a/pkgs/development/libraries/haskell/profunctors/default.nix +++ b/pkgs/development/libraries/haskell/profunctors/default.nix @@ -1,13 +1,13 @@ -{ cabal, comonad, tagged }: +{ cabal, comonad, semigroupoids, tagged, transformers }: cabal.mkDerivation (self: { pname = "profunctors"; - version = "3.3.0.1"; - sha256 = "16d7xg929r4smmmcgi54bz7rsjxs6psksrdvzl4336sjpp3dw5h2"; - buildDepends = [ comonad tagged ]; + version = "4.0.1"; + sha256 = "13yr3n7jkhxbk4gk6nd1j8p1a7g5ir8g9xprcy3s1x39cqf4m986"; + buildDepends = [ comonad semigroupoids tagged transformers ]; meta = { homepage = "http://github.com/ekmett/profunctors/"; - description = "Haskell 98 Profunctors"; + description = "Profunctors"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; diff --git a/pkgs/development/libraries/haskell/reducers/default.nix b/pkgs/development/libraries/haskell/reducers/default.nix index 319cd138cce..ea1049d2b40 100644 --- a/pkgs/development/libraries/haskell/reducers/default.nix +++ b/pkgs/development/libraries/haskell/reducers/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "reducers"; - version = "3.0.2"; - sha256 = "0inw5gz3bdrfc6hprjfxssyqjwmclgf09gms14blj24qr027gdqq"; + version = "3.10.1"; + sha256 = "0pgywdgq0rqir95n4z3nzmyx5n54a1df9abyanz4qfv0g080fjkz"; buildDepends = [ comonad fingertree hashable keys pointed semigroupoids semigroups text transformers unorderedContainers diff --git a/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix b/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix index c7ed906b908..6a45c87d9a6 100644 --- a/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix +++ b/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "regex-compat-tdfa"; - version = "0.95.1.3"; - sha256 = "0wl5sqbb3rl5dai3qni8w09wlipc4n1mn9kh5zgb9xl0lcd59pjx"; + version = "0.95.1.4"; + sha256 = "1p90fn90yhp7fvljjdqjp41cszidcfz4pw7fwvzyx4739b98x8sg"; buildDepends = [ regexBase regexTdfa ]; meta = { homepage = "http://hub.darcs.net/shelarcy/regex-compat-tdfa"; diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index b0953cf9f7c..b4d0fccd8a0 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "resourcet"; - version = "0.4.8"; - sha256 = "10pp4hm5c2k2fqzqpagy03gmr526ac2ji8h7k0mcypf4v0ga620m"; + version = "0.4.9"; + sha256 = "1jpaphmwvykjshjqwmmyfx64w1j99f6dphy9ygrzc32fjffk5laz"; buildDepends = [ liftedBase mmorph monadControl mtl transformers transformersBase ]; diff --git a/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix b/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix index 263adb42f25..cb8ed865da3 100644 --- a/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix +++ b/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix @@ -1,13 +1,13 @@ -{ cabal, comonad, distributive, groupoids, semigroupoids }: +{ cabal, semigroupoids }: cabal.mkDerivation (self: { pname = "semigroupoid-extras"; - version = "3.0.1"; - sha256 = "1b6ix9myjav1h4bbq3jxlan8sn2pjw8x0zhazv3anxfab5n2sxpd"; - buildDepends = [ comonad distributive groupoids semigroupoids ]; + version = "4.0"; + sha256 = "07aa7z4nywcrp9msq83b1pcmryl25yxha89sn5vwlgq40cibcm3g"; + buildDepends = [ semigroupoids ]; meta = { homepage = "http://github.com/ekmett/semigroupoid-extras"; - description = "Semigroupoids requiring Haskell extensions"; + description = "This package has been absorbed into semigroupoids 4.0"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix index aa7176f7e16..e0dbf456804 100644 --- a/pkgs/development/libraries/haskell/semigroupoids/default.nix +++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix @@ -1,13 +1,17 @@ -{ cabal, comonad, contravariant, semigroups, transformers }: +{ cabal, comonad, contravariant, distributive, semigroups +, transformers +}: cabal.mkDerivation (self: { pname = "semigroupoids"; - version = "3.1"; - sha256 = "02147y0nnvyc9ykvjbbxa9gzmkk9kgpsmx40ahwnjk9igjkbyp9g"; - buildDepends = [ comonad contravariant semigroups transformers ]; + version = "4.0"; + sha256 = "12h2b9pisy21xca3x9ilj0aix9clni0za35d2dmv55gb8y8df54l"; + buildDepends = [ + comonad contravariant distributive semigroups transformers + ]; meta = { homepage = "http://github.com/ekmett/semigroupoids"; - description = "Haskell 98 semigroupoids: Category sans id"; + description = "Semigroupoids: Category sans id"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; diff --git a/pkgs/development/libraries/haskell/setenv/default.nix b/pkgs/development/libraries/haskell/setenv/default.nix index b19728820aa..b00480279e1 100644 --- a/pkgs/development/libraries/haskell/setenv/default.nix +++ b/pkgs/development/libraries/haskell/setenv/default.nix @@ -1,10 +1,9 @@ -{ cabal, hspec, QuickCheck }: +{ cabal }: cabal.mkDerivation (self: { pname = "setenv"; - version = "0.1.0"; - sha256 = "04w42bpfbrs5crjp19zzi9dg61xpz4wvmjs2vc7q7qxblyhdfdsy"; - testDepends = [ hspec QuickCheck ]; + version = "0.1.1"; + sha256 = "1j0fj8nrx9z90kghasxjx5jycz9y9xdi7mrxmgnsc14csa65rhb8"; doCheck = false; meta = { description = "A cross-platform library for setting environment variables"; diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix index 2588b11ae78..ef7a6d69905 100644 --- a/pkgs/development/libraries/haskell/shake/default.nix +++ b/pkgs/development/libraries/haskell/shake/default.nix @@ -4,14 +4,19 @@ cabal.mkDerivation (self: { pname = "shake"; - version = "0.10.7"; - sha256 = "0r48kzldbgixr1c83sd7frvygqyjx32n67nri1nnamcwpvlv8hgv"; + version = "0.10.8"; + sha256 = "15r392b18nis9p0ys95kbj79hki19wid2gyrpy0z9zm2l5d1m3ya"; isLibrary = true; isExecutable = true; buildDepends = [ binary deepseq filepath hashable random time transformers unorderedContainers utf8String ]; + testDepends = [ + binary deepseq filepath hashable random time transformers + unorderedContainers utf8String + ]; + doCheck = false; meta = { homepage = "http://community.haskell.org/~ndm/shake/"; description = "Build system library, like Make, but more accurate dependencies"; diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index f24d60612d6..03b6b057cd1 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "1.0.6.3"; - sha256 = "1zwvrdb8kgknp2ri3ws6m0jg41d8kdprvjdimwxh98san7vmk744"; + version = "1.0.6.4"; + sha256 = "12f2b69grxpwk56b2d7idlg8axqfgzn0rn3m56r1hcpvkjbynlc4"; buildDepends = [ parsec shakespeare text transformers ]; testDepends = [ hspec HUnit shakespeare text ]; meta = { diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index 6aa34026ce8..ed743d87832 100644 --- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-js"; - version = "1.2.0"; - sha256 = "1g37m7shqxfv7i2dk5qhvxldfzh1xipd91vcyqhks1jwa5byarzj"; + version = "1.2.0.2"; + sha256 = "1d7fmw2295ycjipaj9fjgw02y1088h2gxxk1d6sy4c165x95r6vx"; buildDepends = [ aeson shakespeare text ]; testDepends = [ aeson hspec HUnit shakespeare text ]; meta = { diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix index d05e2247710..d5e91da61b1 100644 --- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-text"; - version = "1.0.0.7"; - sha256 = "0vl8884a0x927svvkza5xzjn4g1rip8dak1zh9wkm4d0q7lhv2px"; + version = "1.0.0.8"; + sha256 = "0gf4gsdfjz9c15wvxz886gjzzifgzanfhblgab15inl2rblirv7l"; buildDepends = [ shakespeare text ]; testDepends = [ hspec HUnit text ]; meta = { diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index 231470dca5a..a5428b0ee3c 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare"; - version = "1.2.0"; - sha256 = "0lzzdkry3sm5i5hhdygsikpnaps66k1sfdxi2mp0ly5aqi1n1blz"; + version = "1.2.0.1"; + sha256 = "07qfbqvq8fqbf7y43h0qq2gk9brpf4g0k7gghrjzyjrd57v5zygp"; buildDepends = [ parsec systemFileio systemFilepath text time ]; testDepends = [ hspec parsec systemFileio systemFilepath text time diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix index b8c527daf1a..806feee295f 100644 --- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix +++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "simple-sendfile"; - version = "0.2.12"; - sha256 = "019n82700fbhsqxgn1cwfqii27r436gljis7yl02zjnzy7xlvrha"; + version = "0.2.13"; + sha256 = "03cgbzfhkih1ln1xb78r1hfh6zzjjj6763n9nzr9cj6bxs0fiqd3"; buildDepends = [ network ]; testDepends = [ conduit hspec HUnit network networkConduit ]; doCheck = false; diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 94f452f69b8..15fe497b88d 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -20,6 +20,7 @@ cabal.mkDerivation (self: { unorderedContainers vector vectorAlgorithms xmlhtml ]; jailbreak = true; + patchPhase = "sed -i -e 's|lens .*|lens|' snap.cabal"; meta = { homepage = "http://snapframework.com/"; description = "Top-level package for the Snap Web Framework"; diff --git a/pkgs/development/libraries/haskell/socks/default.nix b/pkgs/development/libraries/haskell/socks/default.nix index 22b9a415123..f939708c16a 100644 --- a/pkgs/development/libraries/haskell/socks/default.nix +++ b/pkgs/development/libraries/haskell/socks/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "socks"; - version = "0.5.2"; - sha256 = "1bvvrc0lzjspab7jn31d45za8g6n9jr52mcf7rs5zci99f5jgpsv"; + version = "0.5.3"; + sha256 = "0cajbl7vrljawaxl3vbbf0sq92ry3cj925sww4nw70lhpz96ay4x"; buildDepends = [ cereal network ]; meta = { homepage = "http://github.com/vincenthz/hs-socks"; diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix index 54876a879fc..5db264d3c7b 100644 --- a/pkgs/development/libraries/haskell/statistics/default.nix +++ b/pkgs/development/libraries/haskell/statistics/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "statistics"; - version = "0.10.4.1"; - sha256 = "0kd3zn8ckz3h9dnighmfviacw5cy6czsj90ryn8c0h6yb2s3gqi1"; + version = "0.10.5.0"; + sha256 = "0yn0bqvh922zi0cg2nyb9vn5jk9k4j4vz96fl0h3ayxhfds08m6v"; buildDepends = [ binary deepseq erf mathFunctions monadPar mwcRandom primitive vector vectorAlgorithms vectorBinaryInstances diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix index 851b28baafe..84ca453c6c1 100644 --- a/pkgs/development/libraries/haskell/system-filepath/default.nix +++ b/pkgs/development/libraries/haskell/system-filepath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "system-filepath"; - version = "0.4.7"; - sha256 = "108bmgz6rynkyabr4pws07smdh31syqvzry9cshrw3zd07c3mn89"; + version = "0.4.8"; + sha256 = "15x0yxakqqrdqvghr0l4pzvy5a68xxdv1c75d3qwx604665j3xkw"; buildDepends = [ deepseq text ]; meta = { homepage = "https://john-millikin.com/software/haskell-filesystem/"; diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index 37030681e34..df14857f9ab 100644 --- a/pkgs/development/libraries/haskell/tasty/default.nix +++ b/pkgs/development/libraries/haskell/tasty/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty"; - version = "0.3"; - sha256 = "0sgc0529sqhj0b75a4mkdw0bkx56ynyl4msmi8hd20jvv5wnzyi6"; + version = "0.3.1"; + sha256 = "0ipndrpywzg40s5hiwyyly29mcppcfqbbpwqqp4apma57m8cdpb0"; buildDepends = [ ansiTerminal mtl optparseApplicative regexPosix stm tagged ]; diff --git a/pkgs/development/libraries/haskell/test-framework-hunit/default.nix b/pkgs/development/libraries/haskell/test-framework-hunit/default.nix index 011d791643c..9efcff9a6d1 100644 --- a/pkgs/development/libraries/haskell/test-framework-hunit/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-hunit/default.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "test-framework-hunit"; - version = "0.3.0"; - sha256 = "1jwbpbf9q3g936gk71632h830l2wsiic8h6ms1jlmw209mpm7c84"; + version = "0.3.0.1"; + sha256 = "1h0h55kf6ff25nbfx1mhliwyknc0glwv3zi78wpzllbjbs7gvyfk"; buildDepends = [ extensibleExceptions HUnit testFramework ]; meta = { - homepage = "http://batterseapower.github.com/test-framework/"; + homepage = "https://batterseapower.github.io/test-framework/"; description = "HUnit support for the test-framework package"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix index b944c1e104c..627c9f6347a 100644 --- a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix @@ -2,14 +2,14 @@ cabal.mkDerivation (self: { pname = "test-framework-quickcheck2"; - version = "0.3.0.1"; - sha256 = "1177cvlb4qsa5x2k12dd60y7b14dyd3jr1ygb49aackhjx52c41s"; + version = "0.3.0.2"; + sha256 = "0zgsbmxidyv735jbgajczn25pnhwq66haaadhh6lxj2jsq5fnqpy"; buildDepends = [ extensibleExceptions QuickCheck random testFramework ]; jailbreak = true; meta = { - homepage = "http://batterseapower.github.com/test-framework/"; + homepage = "https://batterseapower.github.io/test-framework/"; description = "QuickCheck2 support for the test-framework package"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/test-framework/default.nix b/pkgs/development/libraries/haskell/test-framework/default.nix index b9f335e1a5a..735666734e3 100644 --- a/pkgs/development/libraries/haskell/test-framework/default.nix +++ b/pkgs/development/libraries/haskell/test-framework/default.nix @@ -1,19 +1,18 @@ -{ cabal, ansiTerminal, ansiWlPprint, extensibleExceptions, hostname -, random, regexPosix, time, xml +{ cabal, ansiTerminal, ansiWlPprint, hostname, random, regexPosix +, time, xml }: cabal.mkDerivation (self: { pname = "test-framework"; - version = "0.8"; - sha256 = "1w895nq357zpc4v6vr5nbszyrw7cpsjq5bj38vdd10bfpjjmijcl"; + version = "0.8.0.3"; + sha256 = "136nw5dapsz3jrnw1pdfkjgplxigpr2mrf6i85154vx342zvw5ar"; isLibrary = true; isExecutable = true; buildDepends = [ - ansiTerminal ansiWlPprint extensibleExceptions hostname random - regexPosix time xml + ansiTerminal ansiWlPprint hostname random regexPosix time xml ]; meta = { - homepage = "http://batterseapower.github.com/test-framework/"; + homepage = "https://batterseapower.github.io/test-framework/"; description = "Framework for running and organising tests, with HUnit and QuickCheck support"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/th-lift/default.nix b/pkgs/development/libraries/haskell/th-lift/default.nix index b8a118b56a6..c479955db64 100644 --- a/pkgs/development/libraries/haskell/th-lift/default.nix +++ b/pkgs/development/libraries/haskell/th-lift/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "th-lift"; - version = "0.5.5"; - sha256 = "1zp9alv3nbvra1rscddak3i33c2jnv6g6806h94qbfkq3zbimfi0"; + version = "0.5.6"; + sha256 = "128rbpqbm4fgn1glbv8bvlqnvn2wvca7wj08xri25w3bikmfy2z4"; meta = { description = "Derive Template Haskell's Lift class for datatypes"; license = "unknown"; diff --git a/pkgs/development/libraries/haskell/th-orphans/default.nix b/pkgs/development/libraries/haskell/th-orphans/default.nix index 8fb51c77dbf..9196e9ef76b 100644 --- a/pkgs/development/libraries/haskell/th-orphans/default.nix +++ b/pkgs/development/libraries/haskell/th-orphans/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "th-orphans"; - version = "0.7.0.1"; - sha256 = "19lfq2m7c6n2z8gz4n57wc92x5x5rkgv4chbfq7w4n531qya4bgr"; + version = "0.8"; + sha256 = "0kzzcicn6pggvvblhbrs3vh0bf71izlb99lb0f5qww7ymi4smldr"; buildDepends = [ thLift ]; meta = { description = "Orphan instances for TH datatypes"; diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix index 8c2a50255b1..6d63c267c61 100644 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ b/pkgs/development/libraries/haskell/tls-extra/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tls-extra"; - version = "0.6.5"; - sha256 = "09b8wxg4k88gdzpbxhd2apf0x5y51zh2zbw2cvraffjnnfkgvzqc"; + version = "0.6.6"; + sha256 = "0k0sj3nq1lrvbmd582mjj8cxbxigivz1hm8hhij1ncl2pgnq5xyv"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/trifecta/default.nix b/pkgs/development/libraries/haskell/trifecta/default.nix index 417b6102e7e..f7b9a7aea81 100644 --- a/pkgs/development/libraries/haskell/trifecta/default.nix +++ b/pkgs/development/libraries/haskell/trifecta/default.nix @@ -6,14 +6,20 @@ cabal.mkDerivation (self: { pname = "trifecta"; - version = "1.1"; - sha256 = "19wnblpn31hvdi5dc8ir24s0hfjj4vvzr43gg9ydl2qdjq6s166w"; + version = "1.2.1.1"; + sha256 = "1bv35ip7g0h7r2w0s8pkcbvm0b9hx91vblf5w57q3jr843v9314c"; buildDepends = [ ansiTerminal ansiWlPprint blazeBuilder blazeHtml blazeMarkup charset comonad deepseq fingertree hashable lens mtl parsers reducers semigroups transformers unorderedContainers utf8String ]; testDepends = [ doctest filepath ]; + postPatch = '' + substituteInPlace trifecta.cabal \ + --replace "blaze-html >= 0.5 && < 0.6," "blaze-html >= 0.5 && < 0.7," \ + --replace "hashable >= 1.2 && < 1.3," "hashable >= 1.1 && < 1.3," \ + --replace "fingertree >= 0.0.1 && < 0.1," "fingertree >= 0.0.1 && < 0.2," + ''; meta = { homepage = "http://github.com/ekmett/trifecta/"; description = "A modern parser combinator library with convenient diagnostics"; diff --git a/pkgs/development/libraries/haskell/usb/default.nix b/pkgs/development/libraries/haskell/usb/default.nix new file mode 100644 index 00000000000..41a71618546 --- /dev/null +++ b/pkgs/development/libraries/haskell/usb/default.nix @@ -0,0 +1,14 @@ +{ cabal, baseUnicodeSymbols, bindingsLibusb, text, vector }: + +cabal.mkDerivation (self: { + pname = "usb"; + version = "1.2"; + sha256 = "1k73avkmpbmg6iq2kmwhg2ifibni5c1yp202afdb6v7w5akvmc0b"; + buildDepends = [ baseUnicodeSymbols bindingsLibusb text vector ]; + meta = { + homepage = "http://basvandijk.github.com/usb"; + description = "Communicate with USB devices"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/utf8-light/default.nix b/pkgs/development/libraries/haskell/utf8-light/default.nix index 42591158cd7..1c2e1f5c116 100644 --- a/pkgs/development/libraries/haskell/utf8-light/default.nix +++ b/pkgs/development/libraries/haskell/utf8-light/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "utf8-light"; - version = "0.4.0.1"; - sha256 = "1y2vfxjgq8r90bpaxhha0s837vklpwdj4cj3h61bimc0lcx22905"; + version = "0.4.2"; + sha256 = "0rwyc5z331yfnm4hpx0sph6i1zvkd1z10vvglhnp0vc9wy644k0q"; meta = { description = "Unicode"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/uuid/default.nix b/pkgs/development/libraries/haskell/uuid/default.nix index 65115ef9a98..37ef38da4e2 100644 --- a/pkgs/development/libraries/haskell/uuid/default.nix +++ b/pkgs/development/libraries/haskell/uuid/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { criterion deepseq HUnit mersenneRandomPure64 QuickCheck random testFramework testFrameworkHunit testFrameworkQuickcheck2 ]; + jailbreak = true; doCheck = false; meta = { homepage = "http://projects.haskell.org/uuid/"; diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 2d0dd397a08..d88eb2df0bc 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "1.3.2.1"; - sha256 = "1iw2b53p08c38fdh3d0js9j8lyy0i8qszp3jd736kzxxiig6ah79"; + version = "1.3.3"; + sha256 = "0lsqfvlh65rggp9z6m5gyx8gv0wk3b44jrk57s8yj2bh74pbr64f"; buildDepends = [ base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal cryptoApi cryptoConduit cryptohashCryptoapi fileEmbed httpDate diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index c96e7bfd738..100dbbd7024 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -1,13 +1,13 @@ { cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive -, conduit, hashable, hspec, httpAttoparsec, httpTypes, HUnit +, conduit, hashable, hspec, HTTP, httpAttoparsec, httpTypes, HUnit , liftedBase, network, networkConduit, QuickCheck, simpleSendfile , transformers, unixCompat, void, wai }: cabal.mkDerivation (self: { pname = "warp"; - version = "1.3.9.2"; - sha256 = "0l4iq7dl7iv9sf0bj52g577x9i84miscfr27b2vm8g8n6306jr77"; + version = "1.3.10.1"; + sha256 = "1pi2x0gi4r6qy151a9gmfq223yiy53j7prj2pyn00cprr0m4mk2v"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpAttoparsec httpTypes liftedBase network networkConduit @@ -15,7 +15,7 @@ cabal.mkDerivation (self: { ]; testDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable - hspec httpAttoparsec httpTypes HUnit liftedBase network + hspec HTTP httpAttoparsec httpTypes HUnit liftedBase network networkConduit QuickCheck simpleSendfile transformers unixCompat void wai ]; diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index 7e2bd368c7e..8d06099b77e 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "yaml"; - version = "0.8.5"; - sha256 = "12jj785gzcnrif460cx2k69pc2h9h956g0w1gp8pcr5hawrvd6rg"; + version = "0.8.5.1"; + sha256 = "0vbampykc5a027q5fh5w6i1bxblyxx7s3nzhpzaa4c1yz8nz3k57"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index b260a6e4188..a86417f6b39 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.2.3.3"; - sha256 = "13cbahj7kjxvw0p92sza72fyh47by5qna6ym9lsvka0y8fk7jf6w"; + version = "1.2.3.4"; + sha256 = "0xwav5ghik0vzg706rcqlzk64gnvr4nn4iikx1bzymzz2p5zyg0z"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 14c8259cddb..0bd73c2ade4 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.2.4.4"; - sha256 = "0awz5ijhmd7z292irzz8sp2j3vp3lp57k9rcp4bmgqmxkf826hkj"; + version = "1.2.4.5"; + sha256 = "091f89bwjsf2qimivbz74rykjjgzghfvs66sv9cz305pgw6kpjc7"; buildDepends = [ aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie dataDefault diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 878e3c9ebce..5c0220f1f2a 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.3.2.2"; - sha256 = "1dqhpzkhg9wcdd9djynrjixpp28rj8iy9pfipx250bry7yq77rv2"; + version = "1.3.3"; + sha256 = "1maf8yczijx8rdjy4abr2jq1ds4g61jg3zbqxjzaaxsbs77gna4a"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault emailValidate hamlet network persistent resourcet diff --git a/pkgs/development/libraries/haskell/yesod-platform/default.nix b/pkgs/development/libraries/haskell/yesod-platform/default.nix index 9fe24ca4a74..f75b5706f6a 100644 --- a/pkgs/development/libraries/haskell/yesod-platform/default.nix +++ b/pkgs/development/libraries/haskell/yesod-platform/default.nix @@ -30,8 +30,8 @@ cabal.mkDerivation (self: { pname = "yesod-platform"; - version = "1.2.4.2"; - sha256 = "1hmzdwjqi3cxdmyvcr48kprrsa8h548z272mif07114d0qh48x4w"; + version = "1.2.4.3"; + sha256 = "1ilkfmg4sdrz45hc2m8b8rqz242phgxzgizrnd41d5g04jib3hl3"; buildDepends = [ aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit authenticate base64Bytestring baseUnicodeSymbols blazeBuilder diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index 04be58eb50a..95516dadacf 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -13,9 +13,15 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://hunspell.sourceforge.net; - description = "The spell checker of OpenOffice.org and Mozilla Firefox 3 & Thunderbird, Google Chrome etc."; + description = "Spell checker"; longDescription = '' + Hunspell is the spell checker of LibreOffice, OpenOffice.org, Mozilla + Firefox 3 & Thunderbird, Google Chrome, and it is also used by + proprietary software packages, like Mac OS X, InDesign, memoQ, Opera and + SDL Trados. + Main features: + * Extended support for language peculiarities; Unicode character encoding, compounding and complex morphology. * Improved suggestion using n-gram similarity, rule and dictionary based pronounciation data. * Morphological analysis, stemming and generation. diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix index a1f9983abe2..4908c737ece 100644 --- a/pkgs/development/libraries/jansson/default.nix +++ b/pkgs/development/libraries/jansson/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.digip.org/jansson/"; - description = "Jansson is a C library for encoding, decoding and manipulating JSON data."; + description = "C library for encoding, decoding and manipulating JSON data"; license = "MIT"; }; } diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix index 12846dfbe8b..7c990e99c33 100644 --- a/pkgs/development/libraries/leveldb/default.nix +++ b/pkgs/development/libraries/leveldb/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://code.google.com/p/leveldb/"; - description = "A fast and lightweight key/value database library by Google."; + description = "Fast and lightweight key/value database library by Google"; license = "BSD"; }; } diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index ea45902b749..287ac32fff5 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -26,7 +26,7 @@ with { inherit (stdenv.lib) optional optionals; }; let result = { - libav_9 = libavFun "9.9" "1rwphyqb2c4zyp20y4ywxjiddmd46vd4dbpdm1lxqm3q63rmmdk9"; + libav_9 = libavFun "9.10" "039hx7z8lmsiljy4wj87hk8lkxspbxbrjv43v3lc38cxfx0fdnw3"; libav_0_8 = libavFun "0.8.8" "1wnbmbs0z4f55y8r9bwb63l04zn383l1avy4c9x1ffb2xccgcp79"; }; diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index 6efb785b657..d3053b4d2a5 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = http://openil.sourceforge.net/; description = "An image library which can can load, save, convert, manipulate, filter and display a wide variety of image formats"; license = licenses.lgpl2; - platforms = platforms.all; + platforms = platforms.mesaPlatforms; maintainers = [ maintainers.phreedom maintainers.urkud ]; }; } diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix index e137c939771..3b701b703c1 100644 --- a/pkgs/development/libraries/libid3tag/default.nix +++ b/pkgs/development/libraries/libid3tag/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [zlib]; meta = { - description = "An ID3 tag manipulation library."; + description = "ID3 tag manipulation library"; homepage = http://mad.sourceforge.net/; license = "GPL"; }; diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix new file mode 100644 index 00000000000..3dca6a04af7 --- /dev/null +++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, cmake, curl }: + +let + name = "libjson-rpc-cpp"; + version = "0.2.1"; +in + +stdenv.mkDerivation { + name = "${name}-${version}"; + + src = fetchurl { + url = "https://github.com/cinemast/${name}/archive/${version}.tar.gz"; + sha256 = "1pc9nn4968qkda8vr4f9dijn2fcldm8i0ymwmql29h4cl5ghdnpw"; + }; + + buildInputs = [ cmake curl ]; + + NIX_LDFLAGS = "-lpthread"; + enableParallelBuilding = true; + doCheck = true; + + checkPhase = "LD_LIBRARY_PATH=out/ ctest"; + + meta = { + description = "C++ framework for json-rpc (json remote procedure call)"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/liblockfile/default.nix b/pkgs/development/libraries/liblockfile/default.nix index 2db90845f69..f991fdc2f29 100644 --- a/pkgs/development/libraries/liblockfile/default.nix +++ b/pkgs/development/libraries/liblockfile/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { - description = "Liblockfile is a shared library with NFS-safe locking functions."; + description = "Shared library with NFS-safe locking functions"; homepage = http://packages.debian.org/unstable/libs/liblockfile1; license = "GPLv2+"; diff --git a/pkgs/development/libraries/libmcrypt/default.nix b/pkgs/development/libraries/libmcrypt/default.nix index 79019cbc489..afa66161731 100644 --- a/pkgs/development/libraries/libmcrypt/default.nix +++ b/pkgs/development/libraries/libmcrypt/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { [ "--disable-posix-threads" ]; meta = { - description = "MCrypt is a replacement for the old crypt() package and crypt(1) command, with extensions."; + description = "Replacement for the old crypt() package and crypt(1) command, with extensions"; homepage = http://mcrypt.sourceforge.net; license = "GPL"; }; diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix index 487b4de6cb7..b724f915150 100644 --- a/pkgs/development/libraries/libmemcached/default.nix +++ b/pkgs/development/libraries/libmemcached/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://libmemcached.org; - description = "libMemcached is an open source C/C++ client library and tools for the memcached server."; + description = "Open source C/C++ client library and tools for the memcached server"; license = "BSD"; }; } diff --git a/pkgs/development/libraries/libnet/default.nix b/pkgs/development/libraries/libnet/default.nix new file mode 100644 index 00000000000..783739dda71 --- /dev/null +++ b/pkgs/development/libraries/libnet/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libnet-${version}"; + version = "1.2-rc2"; + + src = fetchurl { + url = "mirror://sourceforge/libnet-dev/${name}.tar.gz"; + sha256 = "1pc74p839a7wvhjdgy0scj7c4yarr6mqdqvj56k6sp8pkc763az7"; + }; + + meta = { + homepage = http://github.com/sam-github/libnet; + description = "Portable framework for low-level network packet construction"; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix index 99624911077..8e689ed2568 100644 --- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libnfnetlink libmnl ]; meta = { - description = "userspace library providing an API to the in-kernel connection tracking state table."; + description = "Userspace library providing an API to the in-kernel connection tracking state table"; longDescription = '' libnetfilter_conntrack is a userspace library providing a programming interface (API) to the in-kernel connection tracking state table. The library libnetfilter_conntrack has been diff --git a/pkgs/development/libraries/libnfnetlink/default.nix b/pkgs/development/libraries/libnfnetlink/default.nix index 07a182dff10..3bb698e9bf6 100644 --- a/pkgs/development/libraries/libnfnetlink/default.nix +++ b/pkgs/development/libraries/libnfnetlink/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "low-level library for netfilter related kernel/userspace communication."; + description = "Low-level library for netfilter related kernel/userspace communication"; longDescription = '' libnfnetlink is the low-level library for netfilter related kernel/userspace communication. It provides a generic messaging infrastructure for in-kernel netfilter subsystems diff --git a/pkgs/development/libraries/liboop/default.nix b/pkgs/development/libraries/liboop/default.nix index 20793eb3140..a963288e869 100644 --- a/pkgs/development/libraries/liboop/default.nix +++ b/pkgs/development/libraries/liboop/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; meta = { - description = "`liboop', an event loop library."; + description = "Event loop library"; homepage = http://liboop.ofb.net/; license = "LGPL"; }; diff --git a/pkgs/development/libraries/librdf/default.nix b/pkgs/development/libraries/librdf/default.nix index 21c952b7fb8..9b51f694ab3 100644 --- a/pkgs/development/libraries/librdf/default.nix +++ b/pkgs/development/libraries/librdf/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { #doCheck = true; # would need swh_lv2 and some path patching meta = { - description = "A lightweight RDF library with special support for LADSPA plugins."; + description = "Lightweight RDF library with special support for LADSPA plugins"; homepage = http://sourceforge.net/projects/lrdf/; license = "GPLv2"; maintainers = [ stdenv.lib.maintainers.marcweber ]; diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix new file mode 100644 index 00000000000..e8124c2643a --- /dev/null +++ b/pkgs/development/libraries/libsodium/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libsodium-0.4.3"; + + src = fetchurl { + url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz"; + sha256 = "0hk0zca1kpj6xlc2j2qx9qy7287pi0896frmxq5d7qmcwsdf372r"; + }; + + NIX_LDFLAGS = "-lssp"; + + doCheck = true; + + meta = { + description = "Version of NaCl with harwdare tests at runtime, not build time"; + license = "ISC"; + maintainers = with stdenv.lib.maintainers; [ viric ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix new file mode 100644 index 00000000000..0098ddb9d77 --- /dev/null +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, autoconf, libtool, automake, libsodium, ncurses +, libconfig, pkgconfig }: + +let + version = "31f5d7a8ab"; + date = "20131011"; +in +stdenv.mkDerivation rec { + name = "tox-core-${date}-${version}"; + + src = fetchurl { + url = "https://github.com/irungentoo/ProjectTox-Core/tarball/${version}"; + name = "${name}.tar.gz"; + sha256 = "0frz8ylvi33i7zkiz3hp28ylqg4c3ffrbc2m3ibb4zv9rwfzf77r"; + }; + + preConfigure = '' + autoreconf -i + ''; + + configureFlags = [ "--with-libsodium-headers=${libsodium}/include" + "--with-libsodium-libs=${libsodium}/lib" + "--enable-ntox" ]; + + buildInputs = [ autoconf libtool automake libsodium ncurses libconfig + pkgconfig ]; + + doCheck = true; + + meta = { + description = "P2P FOSS instant messaging application aimed to replace Skype with crypto"; + license = "GPLv3+"; + maintainers = with stdenv.lib.maintainers; [ viric ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index c01baa2fd0f..d4504a26b7f 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig ]; propagatedBuildInputs = stdenv.lib.optional (stdenv.isLinux) udev; + NIX_LDFLAGS = "-lgcc_s"; + meta = { homepage = http://www.libusb.org; description = "User-space USB library"; diff --git a/pkgs/development/libraries/libyaml-cpp/0.3.x.nix b/pkgs/development/libraries/libyaml-cpp/0.3.x.nix new file mode 100644 index 00000000000..4b0acd83fc3 --- /dev/null +++ b/pkgs/development/libraries/libyaml-cpp/0.3.x.nix @@ -0,0 +1,18 @@ +{stdenv, fetchurl, cmake, boostHeaders}: + +stdenv.mkDerivation { + name = "libyaml-cpp-0.3.0"; + + src = fetchurl { + url = http://yaml-cpp.googlecode.com/files/yaml-cpp-0.3.0.tar.gz; + sha256 = "10kv25zgq96ybxc6c19lzpax1xi5lpxrdqa9x52nffsql6skil1c"; + }; + + buildInputs = [ cmake boostHeaders ]; + + meta = { + homepage = http://code.google.com/p/yaml-cpp/; + description = "A YAML parser and emitter for C++"; + license = "MIT"; + }; +} diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix new file mode 100644 index 00000000000..09860522ef4 --- /dev/null +++ b/pkgs/development/libraries/libyaml-cpp/default.nix @@ -0,0 +1,18 @@ +{stdenv, fetchurl, cmake, boostHeaders}: + +stdenv.mkDerivation { + name = "libyaml-cpp-0.5.1"; + + src = fetchurl { + url = http://yaml-cpp.googlecode.com/files/yaml-cpp-0.5.1.tar.gz; + sha256 = "01kg0h8ksp162kdhyzn67vnlxpj5zjbks84sh50pv61xni990z1y"; + }; + + buildInputs = [ cmake boostHeaders ]; + + meta = { + homepage = http://code.google.com/p/yaml-cpp/; + description = "A YAML parser and emitter for C++"; + license = "MIT"; + }; +} diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 1aef55c9b2c..80368031349 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: -let version = "4.10"; in +let version = "4.10.1"; in stdenv.mkDerivation { name = "nspr-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha1 = "10dbf68c07497dab30be09db526931c885d5a7e9"; + sha1 = "bd1cdf5e7e107846ffe431c5c62b81a560e8c3f7"; }; preConfigure = "cd nspr"; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index de980d718f3..49f3754bc14 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -17,11 +17,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.15.1"; + version = "3.15.2"; src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_15_1_RTM/src/${name}.tar.gz"; - sha1 = "1aa7c0ff8af7fb2c8b6e4886ae2291f4bfe0d5c0"; + url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_15_2_RTM/src/${name}.tar.gz"; + sha1 = "2d900c296bf11deabbf833ebd6ecdea549c97a5f"; }; buildInputs = [ nspr perl zlib sqlite ]; diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index 984b84085fe..684d6475c63 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.geocities.jp/kosako3/oniguruma/; - description = "Oniguruma is a regular expressions library."; + description = "Oniguruma regular expressions library"; license = "BSD"; }; } diff --git a/pkgs/development/libraries/phonon-backend-vlc/default.nix b/pkgs/development/libraries/phonon-backend-vlc/default.nix index 97e778cc1f5..257c80f0b11 100644 --- a/pkgs/development/libraries/phonon-backend-vlc/default.nix +++ b/pkgs/development/libraries/phonon-backend-vlc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "VideoLAN backend for Phonon multimedia framework"; - inherit (qt4.meta) platforms; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.urkud ]; }; } diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 788b6d6d32b..9d1f0d18c1a 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, gettext , gobjectIntrospection -, useSystemd ? true, systemd }: +, useSystemd ? stdenv.isLinux, systemd }: let diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix index b81dbda1586..a82acd2745d 100644 --- a/pkgs/development/libraries/qhull/default.nix +++ b/pkgs/development/libraries/qhull/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.qhull.org/; - description = "Computes the convex hull, Delaunay triangulation, ..."; + description = "Computes the convex hull, Delaunay triangulation, Voronoi diagram and more"; license = "free"; }; } diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index 99b0f2e725c..844505cb359 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -16,7 +16,12 @@ stdenv.mkDerivation rec { "; meta = with stdenv.lib; { homepage = http://www.sfml-dev.org/; - description = "A multimedia C++ API that provides access to graphics, input, audio, etc."; + description = "Simple and fast multimedia library"; + longDescription = '' + SFML provides a simple interface to the various components of your PC, to + ease the development of games and multimedia applications. It is composed + of five modules: system, window, graphics, audio and network. + ''; license = licenses.zlib; maintainers = [ maintainers.astsmtl ]; }; diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix new file mode 100644 index 00000000000..0a36efbc982 --- /dev/null +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, freetype, libXft, pango, fontconfig, cmake }: + +stdenv.mkDerivation rec { + version = "1.2.3"; + name = "graphite2-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/silgraphite/graphite2/${name}.tgz"; + sha256 = "1xgwnd81gm6p293x8paxb3yisnvpj5qnv1dzr7bjdi7b7h00ls7g"; + }; + + buildInputs = [pkgconfig freetype libXft pango fontconfig cmake]; + + NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2"; + + meta = { + description = "An advanced font engine"; + maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix index e281b1fcf9d..162a832c93a 100644 --- a/pkgs/development/libraries/spice-protocol/default.nix +++ b/pkgs/development/libraries/spice-protocol/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "Protocol headers for the SPICE protocol."; + description = "Protocol headers for the SPICE protocol"; homepage = http://www.spice-space.org; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix index fde30a98fe9..e1cc1f27c1d 100644 --- a/pkgs/development/libraries/tinyxml/2.6.2.nix +++ b/pkgs/development/libraries/tinyxml/2.6.2.nix @@ -58,7 +58,7 @@ in stdenv.mkDerivation { ''; meta = { - description = "TinyXML is a simple, small, C++ XML parser that can be easily integrating into other programs."; + description = "Simple, small, C++ XML parser that can be easily integrating into other programs"; homepage = "http://www.grinninglizard.com/tinyxml/index.html"; license = "free-non-copyleft"; }; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 13c2990c73d..0564e688795 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "V8 is Google's open source JavaScript engine"; - platforms = platforms.unix; + platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd3; }; } diff --git a/pkgs/development/libraries/vcdimager/default.nix b/pkgs/development/libraries/vcdimager/default.nix index 58b9d2f2573..e93f071aefa 100644 --- a/pkgs/development/libraries/vcdimager/default.nix +++ b/pkgs/development/libraries/vcdimager/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.gnu.org/software/vcdimager/; - description = "GNU VCDImager is a full-featured mastering suite for authoring, disassembling and analyzing Video CDs and Super Video CDs."; + description = "Full-featured mastering suite for authoring, disassembling and analyzing Video CDs and Super Video CDs"; platforms = stdenv.lib.platforms.gnu; # random choice }; } diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix new file mode 100644 index 00000000000..c615573ae3e --- /dev/null +++ b/pkgs/development/lisp-modules/asdf/default.nix @@ -0,0 +1,40 @@ +{stdenv, fetchurl, texinfo, texLive}: +let + s = # Generated upstream information + rec { + baseName="asdf"; + version="3.0.2.1"; + name="${baseName}-${version}"; + hash="1npd4dxsgk06ayhln56mwwky0vdpf7i77mkxfh105pld8w5xs4r4"; + url="http://common-lisp.net/project/asdf/archives/asdf-3.0.2.1.tar.gz"; + sha256="1npd4dxsgk06ayhln56mwwky0vdpf7i77mkxfh105pld8w5xs4r4"; + }; + buildInputs = [ + texinfo texLive + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + buildPhase = '' + make build/asdf.lisp + make -C doc asdf.info asdf.html + ''; + installPhase = '' + mkdir -p "$out"/lib/common-lisp/asdf/ + mkdir -p "$out"/share/doc/asdf/ + cp -r ./* "$out"/lib/common-lisp/asdf/ + cp -r doc/* "$out"/share/doc/asdf/ + ''; + sourceRoot="."; + meta = { + inherit (s) version; + description = ''Standard software-system definition library for Common Lisp''; + license = stdenv.lib.licenses.mit ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/lisp-modules/asdf/default.upstream b/pkgs/development/lisp-modules/asdf/default.upstream new file mode 100644 index 00000000000..d8625182352 --- /dev/null +++ b/pkgs/development/lisp-modules/asdf/default.upstream @@ -0,0 +1,2 @@ +url http://common-lisp.net/project/asdf/archives/ +version_link asdf-[0-9].*[.]tar[.].* diff --git a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh new file mode 100755 index 00000000000..91b8a0c2bb0 --- /dev/null +++ b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh @@ -0,0 +1,44 @@ +#! /bin/sh +# Part of NixPkgs package collection +# This script can be used at your option under the same license as NixPkgs or +# under MIT/X11 license + +eval "$NIX_LISP_PREHOOK" + +NIX_LISP_COMMAND="$1" +shift + +[ -z "$NIX_LISP" ] && NIX_LISP="${NIX_LISP_COMMAND##*/}" + +export NIX_LISP NIX_LISP_LOAD_FILE NIX_LISP_EXEC_CODE NIX_LISP_COMMAND NIX_LISP_FINAL_PARAMETERS + +case "$NIX_LISP" in + sbcl) + NIX_LISP_LOAD_FILE="--load" + NIX_LISP_EXEC_CODE="--eval" + NIX_LISP_FINAL_PARAMETERS= + ;; + ecl) + NIX_LISP_LOAD_FILE="-load" + NIX_LISP_EXEC_CODE="-eval" + NIX_LISP_FINAL_PARAMETERS= + ;; + clisp) + NIX_LISP_LOAD_FILE="-c -l" + NIX_LISP_EXEC_CODE="-x" + NIX_LISP_FINAL_PARAMETERS="-repl" + ;; +esac + +NIX_LISP_ASDF_REGISTRY_CODE=" + (progn + (setf asdf:*default-source-registries* '(asdf/source-registry:environment-source-registry)) + (asdf:initialize-source-registry) + ) +" + +[ -z "$NIX_LISP_SKIP_CODE" ] && "$NIX_LISP_COMMAND" $NIX_LISP_EARLY_OPTIONS \ + $NIX_LISP_EXEC_CODE "(load \"$NIX_LISP_ASDF/lib/common-lisp/asdf/build/asdf.lisp\")" \ + $NIX_LISP_EXEC_CODE "$NIX_LISP_ASDF_REGISTRY_CODE" \ + $NIX_LISP_FINAL_PARAMETERS \ + "$@" diff --git a/pkgs/development/lisp-modules/clwrapper/common-lisp.sh b/pkgs/development/lisp-modules/clwrapper/common-lisp.sh new file mode 100755 index 00000000000..b22ca016128 --- /dev/null +++ b/pkgs/development/lisp-modules/clwrapper/common-lisp.sh @@ -0,0 +1,3 @@ +#! /bin/sh + +"$(dirname "$0")"/cl-wrapper.sh "${NIX_LISP_COMMAND:-sbcl}" "$@" diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix new file mode 100644 index 00000000000..0ae4ce13064 --- /dev/null +++ b/pkgs/development/lisp-modules/clwrapper/default.nix @@ -0,0 +1,28 @@ +{stdenv, fetchurl, asdf, lisp ? null}: +stdenv.mkDerivation { + name = "cl-wrapper-script"; + + buildPhase=""; + + installPhase='' + mkdir -p "$out"/bin + cp ${./cl-wrapper.sh} "$out"/bin/cl-wrapper.sh + cp ${./common-lisp.sh} "$out"/bin/common-lisp.sh + chmod a+x "$out"/bin/* + ''; + + inherit asdf lisp; + + setupHook = ./setup-hook.sh; + + phases="installPhase fixupPhase"; + + passthru = { + inherit lisp; + }; + + meta = { + description = ''Script used to wrap Common Lisp implementations''; + maintainers = [stdenv.lib.maintainers.raskin]; + }; +} diff --git a/pkgs/development/lisp-modules/clwrapper/setup-hook.sh b/pkgs/development/lisp-modules/clwrapper/setup-hook.sh new file mode 100644 index 00000000000..5de43dc0e9a --- /dev/null +++ b/pkgs/development/lisp-modules/clwrapper/setup-hook.sh @@ -0,0 +1,33 @@ +NIX_LISP_ASDF="@asdf@" + +CL_SOURCE_REGISTRY="@asdf@/lib/common-lisp/asdf/:@asdf@/lib/common-lisp/asdf/uiop/" + +addASDFPaths () { + for j in "$1"/lib/common-lisp/*; do + if [ -d "$j" ]; then + CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$j/" + fi + done +} + +setLisp () { + if [ -z "$NIX_LISP_COMMAND" ]; then + for j in "$1"/bin/*; do + case "$(basename "$j")" in + sbcl) NIX_LISP_COMMAND="$j" ;; + ecl) NIX_LISP_COMMAND="$j" ;; + clisp) NIX_LISP_COMMAND="$j" ;; + esac + done + fi + if [ -z "$NIX_LISP" ]; then + NIX_LISP="${NIX_LISP_COMMAND##*/}" + fi +} + +export NIX_LISP_COMMAND NIX_LISP CL_SOURCE_REGISTRY NIX_LISP_ASDF + +envHooks=(envHooks[@] addASDFPaths setLisp) + +mkdir -p "$HOME"/.cache/common-lisp || HOME="$TMP/.temp-$USER-home" +mkdir -p "$HOME"/.cache/common-lisp diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix new file mode 100644 index 00000000000..4fe3bb68373 --- /dev/null +++ b/pkgs/development/lisp-modules/define-package.nix @@ -0,0 +1,45 @@ +args @ {stdenv, clwrapper, baseName, version ? "latest", src, description, deps, + buildInputs ? [], meta ? {}, overrides?(x: {})}: +let + deployConfigScript = '' + config_script="$out"/lib/common-lisp-settings/${args.baseName}-shell-config.sh + mkdir -p "$(dirname "$config_script")" + touch "$config_script" + chmod a+x "$config_script" + echo "export NIX_LISP_COMMAND='$NIX_LISP_COMMAND'" >> "$config_script" + echo "export NIX_LISP_ASDF='$NIX_LISP_ASDF'" >> "$config_script" + echo "export CL_SOURCE_REGISTRY="\$CL_SOURCE_REGISTRY\''${CL_SOURCE_REGISTRY:+:}"'$CL_SOURCE_REGISTRY:$out/lib/common-lisp/${args.baseName}/'" >> "$config_script" + ''; + deployLaunchScript = '' + launch_script="$out"/bin/${args.baseName}-lisp-launcher.sh + mkdir -p "$(dirname "$launch_script")" + touch "$launch_script" + chmod a+x "$launch_script" + echo "#! /bin/sh" >> "$launch_script" + echo "source '$config_script'" >> "$launch_script" + echo '"${clwrapper}/bin/common-lisp.sh" "$@"' >> "$launch_script" + ''; +basePackage = { + name = "lisp-${baseName}-${version}"; + inherit src; + + inherit deployConfigScript deployLaunchScript; + installPhase = '' + mkdir -p "$out"/share/doc/${args.baseName}; + mkdir -p "$out"/lib/common-lisp/${args.baseName}; + cp -r . "$out"/lib/common-lisp/${args.baseName}; + cp -rf doc/* LICENCE LICENSE COPYING README README.html README.md readme.html "$out"/share/doc/${args.baseName} || true + + ${deployConfigScript} + ${deployLaunchScript} + ''; + propagatedBuildInputs = args.deps ++ [clwrapper clwrapper.lisp]; + buildInputs = buildInputs; + dontStrip=true; + meta = { + inherit description version; + } // meta; +}; +package = basePackage // (overrides basePackage); +in +stdenv.mkDerivation package diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix new file mode 100644 index 00000000000..8eaaf151fa7 --- /dev/null +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -0,0 +1,49 @@ +{stdenv, clwrapper, pkgs}: +let lispPackages = rec { + inherit pkgs clwrapper stdenv; + nixLib = pkgs.lib; + callPackage = nixLib.callPackageWith lispPackages; + + buildLispPackage = callPackage ./define-package.nix; + + cl-ppcre = buildLispPackage rec { + baseName = "cl-ppcre"; + version = "2.0.4"; + description = "Regular expression library for Common Lisp"; + deps = []; + src = pkgs.fetchurl { + url = "https://github.com/edicl/cl-ppcre/archive/v${version}.tar.gz"; + sha256 = "16nkfg6j7nn8qkzxn462kqpdlbajpz2p55pdl12sia6yqkj3lh97"; + }; + }; + + clx = buildLispPackage rec { + baseName = "clx"; + version = "2013-09"; + description = "X11 bindings for Common Lisp"; + deps = []; + src = pkgs.fetchgit { + url = "https://github.com/sharplispers/clx/"; + rev = "e2b762ac93d78d6eeca4f36698c8dfd1537ce998"; + sha256 = "0jcrmlaayz7m8ixgriq7id3pdklyk785qvpcxdpcp4aqnfiiqhij"; + }; + }; + + iterate = buildLispPackage rec { + baseName = "iterate"; + version = "1.4.3"; + description = "Iteration package for Common Lisp"; + deps = []; + src = pkgs.fetchdarcs { + url = "http://common-lisp.net/project/iterate/darcs/iterate"; + sha256 = "0m3q0s7h5s8varwx584m2akgdslj14df7kg4w1bj1fbgzsag5m1w"; + tag=version; + }; + overrides = x: { + configurePhase="buildPhase(){ true; }"; + }; + }; + + stumpwm = callPackage ./stumpwm {}; +}; +in lispPackages diff --git a/pkgs/development/lisp-modules/stumpwm/default.nix b/pkgs/development/lisp-modules/stumpwm/default.nix new file mode 100644 index 00000000000..a41ee799d8a --- /dev/null +++ b/pkgs/development/lisp-modules/stumpwm/default.nix @@ -0,0 +1,33 @@ +{pkgs, nixLib, clwrapper, cl-ppcre, clx, buildLispPackage}: +buildLispPackage rec { + baseName = "stumpwm"; + version = "2013-09"; + src = pkgs.fetchgit { + url = "https://github.com/sabetts/stumpwm"; + sha256 = "0dd69myssfn2bsdx3xdp65mjrvs9x81dl3y3659pyf1avnjlir7h"; + rev = "565ef58f04f59e1667ec1da4087f1a43a32cd67f"; + }; + description = "Tiling window manager for X11"; + deps = [cl-ppcre clx]; + buildInputs = with pkgs; [texinfo4 autoconf which makeWrapper]; + meta = { + maintainers = [nixLib.maintainers.raskin]; + platforms = nixLib.platforms.linux; + }; + overrides = x: { + preConfigure = '' + ${x.deployConfigScript} + export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$PWD/" + ./autogen.sh + configureFlags=" --with-lisp=$NIX_LISP --with-$NIX_LISP=$(which common-lisp.sh) " + ''; + installPhase=x.installPhase + '' + make install + + if [ "$NIX_LISP" = "sbcl" ]; then + wrapProgram "$out"/bin/stumpwm --set SBCL_HOME "${clwrapper.lisp}/lib/sbcl" + fi; + ''; + postInstall = ''false''; + }; +} diff --git a/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix b/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix index 3c28ed04dba..5218f5b7744 100644 --- a/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix +++ b/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation { }; meta = { - description = "avr gcc developement environment including binutils, avr-gcc and avr-libc"; + description = "AVR developement environment including binutils, avr-gcc and avr-libc"; # I've tried compiling the packages separately.. too much hassle. This just works. Fine. license = ["GPL" "LGPL"]; # see single packages .. homepage = []; # dito diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix index 2792d364f15..db7067c989c 100644 --- a/pkgs/development/mobile/androidenv/build-app.nix +++ b/pkgs/development/mobile/androidenv/build-app.nix @@ -1,6 +1,7 @@ { stdenv, androidsdk, jdk, ant }: -{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false, antFlags ? "" +args@{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false, antFlags ? "" , release ? false, keyStore ? null, keyAlias ? null, keyStorePassword ? null, keyAliasPassword ? null +, ... }: assert release -> keyStore != null && keyAlias != null && keyStorePassword != null && keyAliasPassword != null; @@ -15,9 +16,8 @@ let abiVersions = []; }; in -stdenv.mkDerivation { +stdenv.mkDerivation ({ name = stdenv.lib.replaceChars [" "] [""] name; - inherit src; ANDROID_HOME = "${androidsdkComposition}/libexec/android-sdk-${platformName}"; @@ -45,4 +45,5 @@ stdenv.mkDerivation { mkdir -p $out/nix-support echo "file binary-dist \"$(echo $out/*.apk)\"" > $out/nix-support/hydra-build-products ''; -} +} // +builtins.removeAttrs args ["name"]) diff --git a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix index 1cbab99e365..7515fcdd121 100644 --- a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix +++ b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix @@ -1,4 +1,4 @@ -{stdenv, version ? "4.6"}: +{stdenv, version ? "5.0"}: stdenv.mkDerivation { name = "xcode-wrapper-"+version; @@ -9,6 +9,7 @@ stdenv.mkDerivation { ln -s /usr/bin/xcodebuild ln -s /usr/bin/xcrun ln -s /usr/bin/security + ln -s /usr/bin/codesign ln -s "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone Simulator.app/Contents/MacOS/iPhone Simulator" cd .. diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix index 2e109f1d621..997ca220610 100644 --- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix +++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = { homepage = http://ocamlgraph.lri.fr/; - description = "ocamlgraph is a graph library for Objective Caml."; + description = "Graph library for Objective Caml"; license = "GNU Library General Public License version 2, with the special exception on linking described in file LICENSE"; platforms = ocaml.meta.platforms; maintainers = [ diff --git a/pkgs/development/ocaml-modules/sexplib/default.nix b/pkgs/development/ocaml-modules/sexplib/default.nix index 32d5c842dc8..7c40b5e6cfb 100644 --- a/pkgs/development/ocaml-modules/sexplib/default.nix +++ b/pkgs/development/ocaml-modules/sexplib/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { homepage = "http://forge.ocamlcore.org/projects/sexplib/"; - description = "Library for serializing OCaml values to and from S-expressions."; + description = "Library for serializing OCaml values to and from S-expressions"; license = "LGPL"; platforms = ocaml.meta.platforms; }; diff --git a/pkgs/development/perl-modules/maatkit/default.nix b/pkgs/development/perl-modules/maatkit/default.nix index d560a5d8e41..d9a1f777f3a 100644 --- a/pkgs/development/perl-modules/maatkit/default.nix +++ b/pkgs/development/perl-modules/maatkit/default.nix @@ -25,7 +25,15 @@ buildPerlPackage rec { '' ; meta = { - description = "Maatkit makes MySQL easier and safer to manage. It provides simple, predictable ways to do things you cannot otherwise do."; + description = "Database toolkit"; + longDescription = '' + You can use Maatkit to prove replication is working correctly, fix + corrupted data, automate repetitive tasks, speed up your servers, and + much more. + + In addition to MySQL, there is support for PostgreSQL, Memcached, and a + growing variety of other databases and technologies. + ''; license = "GPLv2+"; homepage = http://www.maatkit.org/; }; diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index 922594bc3dc..c1b36bf909d 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -53,5 +53,6 @@ in buildPythonPackage rec { homepage = "https://fedoraproject.org/wiki/Blivet"; description = "Module for management of a system's storage configuration"; license = [ "GPLv2+" "LGPLv2.1+" ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/python-modules/buildout-nix/nix.patch b/pkgs/development/python-modules/buildout-nix/nix.patch index a09163518a9..dd3b8e12aa8 100644 --- a/pkgs/development/python-modules/buildout-nix/nix.patch +++ b/pkgs/development/python-modules/buildout-nix/nix.patch @@ -1,21 +1,36 @@ --- a/src/zc/buildout/easy_install.py 2013-08-27 22:28:40.233718116 +0200 -+++ b/src/zc/buildout/easy_install.py 2013-08-27 22:31:07.967871186 +0200 -@@ -508,16 +508,15 @@ ++++ b/src/zc/buildout/easy_install.py 2013-10-07 00:29:31.077413935 +0200 +@@ -508,16 +508,31 @@ self._dest, os.path.basename(dist.location)) if os.path.isdir(dist.location): - # we got a directory. It must have been - # obtained locally. Just copy it. - shutil.copytree(dist.location, newloc) -+ # Symlink to dists in /nix/store -+ if not os.path.exists(newloc): ++ # Replace links to garbage collected eggs in ++ # /nix/store ++ if os.path.islink(newloc): ++ # It seems necessary to jump through these ++ # hoops, otherwise we end up in an ++ # infinite loop because ++ # self._env.best_match fails to find the dist ++ os.remove(newloc) ++ dist = self._fetch(avail, tmp, self._download_cache) + os.symlink(dist.location, newloc) ++ newdist = pkg_resources.Distribution.from_filename( ++ newloc) ++ self._env.add(newdist) ++ logger.info("Updated link to %s" %dist.location) ++ # Symlink to the egg in /nix/store ++ elif not os.path.exists(newloc): ++ os.symlink(dist.location, newloc) ++ logger.info("Created link to %s" %dist.location) else: setuptools.archive_util.unpack_archive( dist.location, newloc) -- + - redo_pyc(newloc) + redo_pyc(newloc) diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix index 791d5e83d3c..dc4f733a4cf 100644 --- a/pkgs/development/python-modules/pyside/default.nix +++ b/pkgs/development/python-modules/pyside/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { makeFlags = "QT_PLUGIN_PATH=" + pysideShiboken + "/lib/generatorrunner"; meta = { - description = "LGPL-licensed Python bindings for the Qt cross-platform application and UI framework."; + description = "LGPL-licensed Python bindings for the Qt cross-platform application and UI framework"; license = stdenv.lib.licenses.lgpl21; homepage = "http://www.pyside.org"; maintainers = [ stdenv.lib.maintainers.chaoflow ]; diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix index 0b5e6851761..a3153bed217 100644 --- a/pkgs/development/python-modules/pyside/tools.nix +++ b/pkgs/development/python-modules/pyside/tools.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ cmake pyside python27 qt4 pysideShiboken ]; meta = { - description = "Tools for pyside, the LGPL-licensed Python bindings for the Qt cross-platform application and UI framework."; + description = "Tools for pyside, the LGPL-licensed Python bindings for the Qt cross-platform application and UI framework"; license = stdenv.lib.licenses.gpl2; homepage = "http://www.pyside.org"; maintainers = [ stdenv.lib.maintainers.chaoflow ]; diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index 97f238302ec..55e33c45ca9 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -30,14 +30,14 @@ stdenv.mkDerivation rec { installFlags = "INSTALL_ROOT=$(out)"; meta = { - description = "Qt Creator is a cross-platform IDE tailored to the needs of Qt developers."; + description = "Cross-platform IDE tailored to the needs of Qt developers"; longDescription = '' - Qt Creator is a cross-platform IDE (integrated development environment) tailored to the needs of Qt developers. - It includes features such as an advanced code editor, a visual debugger and a GUI designer. - ''; + Qt Creator is a cross-platform IDE (integrated development environment) + tailored to the needs of Qt developers. It includes features such as an + advanced code editor, a visual debugger and a GUI designer. + ''; homepage = "http://qt-project.org/wiki/Category:Tools::QtCreator"; license = "LGPL"; - maintainers = [ stdenv.lib.maintainers.bbenoist ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 09656dc520a..1dfaa5cf875 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -15,7 +15,12 @@ stdenv.mkDerivation { ''; meta = { - description = "A development tool to help programmers write Java code that adheres to a coding standard. By default it supports the Sun Code Conventions, but is highly configurable." ; + description = "Checks Java source against a coding standard"; + longDescription = '' + checkstyle is a development tool to help programmers write Java code that + adheres to a coding standard. By default it supports the Sun Code + Conventions, but is highly configurable. + ''; homepage = http://checkstyle.sourceforge.net/; }; } diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index b152f0537e3..8aea7bc8aa8 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { configurePhase = "makeFlags=PREFIX=$out"; meta = { - description = "check C/C++ code for memory leaks, mismatching allocation-deallocation, buffer overrun, etc."; + description = "Check C/C++ code for memory leaks, mismatching allocation-deallocation, buffer overrun and more"; homepage = "http://sourceforge.net/apps/mediawiki/cppcheck/"; license = "GPL"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix index 7498d3b652a..586e9d5cd5d 100644 --- a/pkgs/development/tools/analysis/jdepend/default.nix +++ b/pkgs/development/tools/analysis/jdepend/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; meta = { - description = "Depend traverses Java class file directories and generates design quality metrics for each Java package." ; + description = "Traverses Java class file directories and generates design quality metrics for each Java package"; homepage = http://www.clarkware.com/software/JDepend.html ; }; } diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index b830ee00838..14007d80b0f 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; meta = { - description = "PMD scans Java source code and looks for potential problems." ; + description = "Scans Java source code and looks for potential problems"; homepage = http://pmd.sourceforge.net/; }; } diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix index 03428552229..c14e09e25b7 100644 --- a/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -23,4 +23,8 @@ stdenv.mkDerivation { url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2"; sha1 = "d9e3e83dd9664cfe1dcd4841c082db3f559af922"; }; + + meta = { + description = "Java-based build tool"; + }; } diff --git a/pkgs/development/tools/build-managers/apache-ant/from-source.nix b/pkgs/development/tools/build-managers/apache-ant/from-source.nix index 01fdd5541ec..14213415ff8 100644 --- a/pkgs/development/tools/build-managers/apache-ant/from-source.nix +++ b/pkgs/development/tools/build-managers/apache-ant/from-source.nix @@ -57,7 +57,7 @@ EOF ''; meta = { - description = "Apache Ant, a Java-based build tool"; + description = "Java-based build tool"; longDescription = '' Apache Ant is a Java-based build tool. In theory, it is kind of like diff --git a/pkgs/development/tools/build-managers/colormake/default.nix b/pkgs/development/tools/build-managers/colormake/default.nix index 9d62b4e187b..25ef7ef0b24 100644 --- a/pkgs/development/tools/build-managers/colormake/default.nix +++ b/pkgs/development/tools/build-managers/colormake/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A simple wrapper around make to colorize the output."; + description = "Simple wrapper around make to colorize the output"; license = "GPLv2"; }; } diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 779b84d0ca8..b1664010550 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = http://leiningen.org/; description = "Project automation for Clojure"; license = "EPL"; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; maintainer = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/development/tools/casperjs/default.nix b/pkgs/development/tools/casperjs/default.nix index f140f0d7862..bd63a0e68ee 100644 --- a/pkgs/development/tools/casperjs/default.nix +++ b/pkgs/development/tools/casperjs/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Navigation scripting & testing utility for PhantomJS."; + description = "Navigation scripting & testing utility for PhantomJS"; longDescription = '' CasperJS is a navigation scripting & testing utility for PhantomJS. It eases the process of defining a full navigation scenario and provides useful high-level @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/haskell/packunused/default.nix b/pkgs/development/tools/haskell/packunused/default.nix index 814c2774cb2..35d318d36ba 100644 --- a/pkgs/development/tools/haskell/packunused/default.nix +++ b/pkgs/development/tools/haskell/packunused/default.nix @@ -2,11 +2,12 @@ cabal.mkDerivation (self: { pname = "packunused"; - version = "0.1.0.0"; - sha256 = "131x99id3jcxglj24p5sjb6mnhphj925pp4jdjy09y6ai7wss3rs"; + version = "0.1.0.1"; + sha256 = "130717k4rknj5jl904cmb4h09msp4xjj84w6iwzc10lz736dk3jd"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal cmdargs filepath haskellSrcExts ]; + jailbreak = true; meta = { homepage = "https://github.com/hvr/packunused"; description = "Tool for detecting redundant Cabal package dependencies"; diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix index 9b1e9955732..6128406bbe5 100644 --- a/pkgs/development/tools/misc/astyle/default.nix +++ b/pkgs/development/tools/misc/astyle/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { homepage = "http://astyle.sourceforge.net/"; - description = "source code reformatter"; + description = "Source code indenter, formatter, and beautifier for C, C++, C# and Java"; license = "LGPL"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/tools/misc/autobuild/default.nix b/pkgs/development/tools/misc/autobuild/default.nix index f8497b5dece..88246e4bb6e 100644 --- a/pkgs/development/tools/misc/autobuild/default.nix +++ b/pkgs/development/tools/misc/autobuild/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Simon Josefsson's Autobuild, a continuous integration tool"; + description = "Continuous integration tool"; longDescription = '' Autobuild is a package that process output from building diff --git a/pkgs/development/tools/misc/autoconf/2.13.nix b/pkgs/development/tools/misc/autoconf/2.13.nix index 1dfe4d4a0a7..2d8169d408f 100644 --- a/pkgs/development/tools/misc/autoconf/2.13.nix +++ b/pkgs/development/tools/misc/autoconf/2.13.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/autoconf/; - description = "GNU Autoconf, a part of the GNU Build System"; + description = "Part of the GNU Build System"; longDescription = '' GNU Autoconf is an extensible package of M4 macros that produce diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index b4de66d9baf..08fcd95afb5 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/autoconf/; - description = "GNU Autoconf, a part of the GNU Build System"; + description = "Part of the GNU Build System"; longDescription = '' GNU Autoconf is an extensible package of M4 macros that produce diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index 25fa29526c9..cd4f19694b2 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -25,7 +25,7 @@ let version = "5.17"; in #doCheck = true; # 2 tests fail because of missing /dev/tty meta = { - description = "GNU AutoGen, an automated text and program generation tool"; + description = "Automated text and program generation tool"; longDescription = '' AutoGen is a tool designed to simplify the creation and maintenance diff --git a/pkgs/development/tools/misc/automake/automake-1.10.x.nix b/pkgs/development/tools/misc/automake/automake-1.10.x.nix index c015c0115fe..80b033425a1 100644 --- a/pkgs/development/tools/misc/automake/automake-1.10.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.10.x.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/automake/; - description = "GNU Automake, a GNU standard-compliant makefile generator"; + description = "GNU standard-compliant makefile generator"; longDescription = '' GNU Automake is a tool for automatically generating diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix index 91c27deb8b8..0af9877c935 100644 --- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/automake/; - description = "GNU Automake, a GNU standard-compliant makefile generator"; + description = "GNU standard-compliant makefile generator"; longDescription = '' GNU Automake is a tool for automatically generating diff --git a/pkgs/development/tools/misc/automake/automake-1.12.x.nix b/pkgs/development/tools/misc/automake/automake-1.12.x.nix index bd609c4a40d..8bee4790bcb 100644 --- a/pkgs/development/tools/misc/automake/automake-1.12.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.12.x.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/automake/; - description = "GNU Automake, a GNU standard-compliant makefile generator"; + description = "GNU standard-compliant makefile generator"; longDescription = '' GNU Automake is a tool for automatically generating diff --git a/pkgs/development/tools/misc/automake/automake-1.13.x.nix b/pkgs/development/tools/misc/automake/automake-1.13.x.nix index 400d554b65e..96a93e8d60b 100644 --- a/pkgs/development/tools/misc/automake/automake-1.13.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.13.x.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/automake/"; - description = "GNU Automake, a GNU standard-compliant makefile generator"; + description = "GNU standard-compliant makefile generator"; license = "GPLv2+"; longDescription = '' diff --git a/pkgs/development/tools/misc/avarice/default.nix b/pkgs/development/tools/misc/avarice/default.nix index bc3785181a8..e2c4c89e998 100644 --- a/pkgs/development/tools/misc/avarice/default.nix +++ b/pkgs/development/tools/misc/avarice/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { license = stdenv.lib.licenses.gpl2; - description = "AVaRICE translates between GDB's remote debug protocol and the AVR JTAG ICE protocol"; + description = "Translator between GDB's remote debug protocol and the AVR JTAG ICE protocol"; homepage = http://sourceforge.net/projects/avarice/files/avarice/; maintainers = [ stdenv.lib.maintainers.smironov ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 2cd00f51d9d..05a0d9bbeb5 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { }; meta = { - description = "ccache, a tool that caches compilation results."; + description = "Compiler cache for fast recompilation of C/C++ code"; homepage = http://ccache.samba.org/; license = "GPL"; }; diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index f09ab2af7d1..e3acf620c73 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "SysBench is a modular, cross-platform and multi-threaded benchmark tool."; + description = "Modular, cross-platform and multi-threaded benchmark tool"; license = "GPLv2"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index b7ed4fb8934..e603768b8cc 100644 --- a/pkgs/development/tools/parsing/re2c/default.nix +++ b/pkgs/development/tools/parsing/re2c/default.nix @@ -8,6 +8,6 @@ stdenv.mkDerivation { }; meta = { - description = "Re2c is a tool for writing very fast and very flexible scanners."; + description = "Tool for writing very fast and very flexible scanners"; }; } |