diff options
Diffstat (limited to 'pkgs/development')
68 files changed, 747 insertions, 314 deletions
diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index f68f918d585..af93cb13d37 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { } else throw "cudatoolkit does not support platform ${stdenv.system}"; + outputs = [ "out" "sdk" ]; + buildInputs = [ perl ]; runtimeDependencies = [ @@ -30,6 +32,7 @@ stdenv.mkDerivation rec { sh $src --keep --noexec cd pkg/run_files sh cuda-linux64-rel-5.5.22-16488124.run --keep --noexec + sh cuda-samples-linux-5.5.22-16488124.run --keep --noexec cd pkg ''; @@ -44,8 +47,9 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir $out + mkdir $out $sdk perl ./install-linux.pl --prefix="$out" + perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out" ''; meta = { diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix index c0933b2a961..1839c982e99 100644 --- a/pkgs/development/compilers/ghc/7.6.3.nix +++ b/pkgs/development/compilers/ghc/7.6.3.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { preConfigure = '' echo "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" ''; diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index df0bae3218d..1638a132718 100644 --- a/pkgs/development/compilers/llvm/3.4/llvm.nix +++ b/pkgs/development/compilers/llvm/3.4/llvm.nix @@ -52,6 +52,6 @@ in stdenv.mkDerivation rec { homepage = http://llvm.org/; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ shlevy lovek323 raskin viric ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/mcpp/default.nix b/pkgs/development/compilers/mcpp/default.nix new file mode 100644 index 00000000000..34cb63e783e --- /dev/null +++ b/pkgs/development/compilers/mcpp/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, mcpp }: + +stdenv.mkDerivation rec { + name = "mcpp-2.7.2"; + + src = fetchurl { + url = "mirror://sourceforge/mcpp/${name}.tar.gz"; + sha256 = "0r48rfghjm90pkdyr4khxg783g9v98rdx2n69xn8f6c5i0hl96rv"; + }; + + configureFlags = [ "--enable-mcpplib" ]; + + meta = with stdenv.lib; { + homepage = "http://mcpp.sourceforge.net/"; + description = "A portable c preprocessor"; + license = licenses.bsd2; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/interpreters/cython/default.nix b/pkgs/development/interpreters/cython/2/default.nix index 34bd63c29ab..5b3cfd588c9 100644 --- a/pkgs/development/interpreters/cython/default.nix +++ b/pkgs/development/interpreters/cython/2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python, pkgconfig }: stdenv.mkDerivation { - name = "cython-0.16"; + name = "cython-0.20"; src = fetchurl { - url = http://www.cython.org/release/Cython-0.16.tar.gz; - sha256 = "1yz6jwv25xx5mbr2nm4l7mi65gvpm63dzi3vrw73p51wbpy525lp"; + url = http://www.cython.org/release/Cython-0.20.tar.gz; + sha256 = "1a3m7zhw8mdyr95fwx7n1scrz82drr433i99dzm1n9dxi0cx2qah"; }; buildPhase = "python setup.py build --build-base $out"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ python pkgconfig ]; meta = { - description = "An interpreter to help writing C extensions for Python"; + description = "An interpreter to help writing C extensions for Python 2"; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/interpreters/cython/3/default.nix b/pkgs/development/interpreters/cython/3/default.nix new file mode 100644 index 00000000000..d977ea87b3e --- /dev/null +++ b/pkgs/development/interpreters/cython/3/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, python3, pkgconfig }: + +stdenv.mkDerivation { + name = "cython3-0.20"; + + src = fetchurl { + url = http://www.cython.org/release/Cython-0.20.tar.gz; + sha256 = "1a3m7zhw8mdyr95fwx7n1scrz82drr433i99dzm1n9dxi0cx2qah"; + }; + + buildPhase = "python3 setup.py build --build-base $out"; + + installPhase = "python3 setup.py install --prefix=$out"; + + buildInputs = [ python3 pkgconfig ]; + + meta = { + description = "An interpreter to help writing C extensions for Python3"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/interpreters/hiphopvm/default.nix b/pkgs/development/interpreters/hiphopvm/default.nix index c18c81caff0..ae30d169b50 100644 --- a/pkgs/development/interpreters/hiphopvm/default.nix +++ b/pkgs/development/interpreters/hiphopvm/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, fetchgit, cmake, boost, libunwind, mysql, libmemcached, pcre , libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php, re2c -, expat, libcap, oniguruma, libdwarf, libmcrypt, inteltbb, gperftools -, bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam +, expat, libcap, oniguruma, libdwarf, libmcrypt, inteltbb, gperftools, glog +, bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng }: assert stdenv.system == "x86_64-linux"; let src = fetchgit { url = "git://github.com/facebook/hiphop-php.git"; - rev = "73f1c0ebd9b313f6b3baecd8c8046e0b595b1157"; - sha256 = "104133c6054bc9ab0288eaa0cea168b6699e537b3ea76ecdc38ee833d93dca09"; + rev = "1e23dec9f0b1ce8aaa5833d0527a369c8e254ffd"; + sha256 = "0fblwgq8c3hmamw0m5d1mn8qhyqf14v2zf62cgrkvmbiz6jlrbr6"; }; libxml2_280 = stdenv.lib.overrideDerivation libxml2 (args: rec { @@ -21,37 +21,35 @@ let patches = []; }); - - curlFB = stdenv.lib.overrideDerivation curl (args: { patches = [ "${src}/src/third_party/libcurl-7.22.1.fb-changes.diff" ]; }); - fbPatch = "${src}/src/third_party/libevent-1.4.14.fb-changes.diff"; + fbPatch = "${src}/hphp/third_party/libevent-1.4.14.fb-changes.diff"; + libeventFB = stdenv.lib.overrideDerivation libevent (args: { patches = [fbPatch]; }); in stdenv.mkDerivation { - name = "hiphop-php-73f1c0ebd9"; + name = "hiphop-php-1e23dec9f0"; inherit src; dontUseCmakeBuildDir = true; dontUseCmakeConfigure = true; USE_HHVM=1; preConfigure = '' - export HPHP_HOME=$PWD export HPHP_LIB=$PWD/bin export TBB_INSTALL_DIR=${inteltbb} export TBB_ARCH_PLATFORM="intel64/cc4.1.0_libc2.4_kernel2.6.16.21" - sed -i 's| DEPRECATED | DEPRECATED_ |' src/runtime/base/runtime_error.h + sed 's=/bin/bash=/${stdenv.shell}=g' -i hphp/util/generate-buildinfo.sh ''; NIX_LDFLAGS = "-lpam -L${pam}/lib"; + MYSQL_INCLUDE_DIR="${mysql}/include/mysql"; MYSQL_DIR=mysql; buildInputs = [ - cmake boost libunwind mysql libmemcached pcre libeventFB gd curlFB + cmake boost libunwind mysql libmemcached pcre libeventFB gd curl libxml2_280 icu flex bison openssl zlib php expat libcap oniguruma libdwarf libmcrypt inteltbb gperftools bzip2 openldap readline - libelf uwimap binutils cyrus_sasl pam + libelf uwimap binutils cyrus_sasl pam glog libpng ]; installPhase = '' mkdir -p $out/bin - cp src/hhvm/hhvm $out/bin - cp bin/systemlib.php $out/bin + cp hphp/hhvm/hhvm $out/bin ''; patches = [./tbb.patch]; diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix index 2923a8f960d..27b1589d27f 100644 --- a/pkgs/development/interpreters/lua-5/5.1.nix +++ b/pkgs/development/interpreters/lua-5/5.1.nix @@ -9,6 +9,7 @@ let in stdenv.mkDerivation rec { name = "lua-5.1.5"; + luaversion = "5.1"; src = fetchurl { url = "http://www.lua.org/ftp/${name}.tar.gz"; diff --git a/pkgs/development/interpreters/lua-5/sockets.nix b/pkgs/development/interpreters/lua-5/sockets.nix new file mode 100644 index 00000000000..a3f9adb0901 --- /dev/null +++ b/pkgs/development/interpreters/lua-5/sockets.nix @@ -0,0 +1,25 @@ +{stdenv, fetchurl, lua5}: + +stdenv.mkDerivation rec { + name = "lua-sockets-${version}"; + version = "2.0.2"; + src = fetchurl { + url = "http://files.luaforge.net/releases/luasocket/luasocket/luasocket-${version}/luasocket-${version}.tar.gz"; + sha256 = "19ichkbc4rxv00ggz8gyf29jibvc2wq9pqjik0ll326rrxswgnag"; + }; + + luaver = "5.1"; # TODO + patchPhase = '' + sed -e "s,^INSTALL_TOP_SHARE.*,INSTALL_TOP_SHARE=$out/share/lua/${lua5.luaversion}," \ + -e "s,^INSTALL_TOP_LIB.*,INSTALL_TOP_LIB=$out/lib/lua/${lua5.luaversion}," \ + -i config + ''; + + buildInputs = [ lua5 ]; + + meta = { + homepage = "http://w3.impa.br/~diego/software/luasocket/"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.mornfall ]; + }; +} diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index 36cb8158506..84cb9dd141a 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/3.3/default.nix @@ -69,8 +69,8 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - homepage = "http://python.org"; - description = "a high-level dynamically-typed programming language"; + homepage = http://python.org; + description = "A high-level dynamically-typed programming language"; longDescription = '' Python is a remarkably powerful dynamic programming language that is used in a wide variety of application domains. Some of its key @@ -81,7 +81,7 @@ stdenv.mkDerivation { high level dynamic data types. ''; license = stdenv.lib.licenses.psfl; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ simons chaoflow ]; }; } diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix index c5ab0f5e5e2..10cbf1ecfe5 100644 --- a/pkgs/development/interpreters/ruby/patches.nix +++ b/pkgs/development/interpreters/ruby/patches.nix @@ -10,10 +10,29 @@ let find "$1" -type f -name "*.rb" | xargs sed -i "s@/usr/bin/env@$(type -p env)@g" find "$1" -type f -name "*.mk" | xargs sed -i "s@/usr/bin/env@$(type -p env)@g" ''; - + in { + buildr = { + # Many Buildfiles rely on RUBYLIB containing the current directory + # (as was the default in Ruby < 1.9.2). + extraWrapperFlags = "--prefix RUBYLIB : ."; + }; + + fakes3 = { + postInstall = '' + cd $out/${ruby.gemPath}/gems/* + patch -Np1 -i ${../../ruby-modules/fake-s3-list-bucket.patch} + ''; + }; + + ffi = { + postUnpack = "onetuh"; + buildFlags = ["--with-ffi-dir=${libffi}"]; + NIX_POST_EXTRACT_FILES_HOOK = patchUsrBinEnv; + }; + iconv = { buildInputs = [ libiconvOrEmpty ]; }; libv8 = { @@ -26,16 +45,16 @@ in # # Finally, we must set CC and AR explicitly to allow scons to find the # compiler and archiver - + preBuild = '' cat > $TMPDIR/g++ <<EOF #! ${stdenv.shell} $(export) - + g++ \$(echo \$@ | sed 's/-Werror//g') EOF chmod +x $TMPDIR/g++ - + export CXX=$TMPDIR/g++ export AR=$(type -p ar) ''; @@ -48,22 +67,18 @@ in done ''; }; - - sqlite3 = { propagatedBuildInputs = [ sqlite ]; }; - - rails = { gemFlags = "--no-ri --no-rdoc"; }; - + ncurses = { propagatedBuildInputs = [ ncurses ]; }; + ncursesw = { propagatedBuildInputs = [ ncurses ]; }; + nix = { postInstall = '' cd $out/${ruby.gemPath}/gems/nix* patch -Np1 -i ${./fix-gem-nix-versions.patch} ''; }; - - ncursesw = { propagatedBuildInputs = [ ncurses ]; }; - + nokogiri = { buildFlags = [ "--with-xml2-dir=${libxml2} --with-xml2-include=${libxml2}/include/libxml2" @@ -71,10 +86,13 @@ in ]; }; - ffi = { - postUnpack = "onetuh"; - buildFlags = ["--with-ffi-dir=${libffi}"]; - NIX_POST_EXTRACT_FILES_HOOK = patchUsrBinEnv; + pry = { gemFlags = "--no-ri --no-rdoc"; }; + + rails = { gemFlags = "--no-ri --no-rdoc"; }; + + rjb = { + buildInputs = [ jdk ]; + JAVA_HOME = jdk; }; rmagick = { @@ -83,21 +101,7 @@ in NIX_CFLAGS_COMPILE = "-I${imagemagick}/include/ImageMagick-6"; }; - xrefresh_server = - let - patch = fetchurl { - url = "http://mawercer.de/~nix/xrefresh.diff.gz"; - sha256 = "1f7bnmn1pgkmkml0ms15m5lx880hq2sxy7vsddb3sbzm7n1yyicq"; - }; - in { - propagatedBuildInputs = [ gems.rb_inotify ]; - - # monitor implementation for Linux - postInstall = '' - cd $out/${ruby.gemPath}/gems/* - zcat ${patch} | patch -p 1 - ''; # */ - }; + sqlite3 = { propagatedBuildInputs = [ sqlite ]; }; xapian_full = { buildInputs = [ gems.rake zlib libuuid ]; @@ -112,23 +116,19 @@ in buildInputs = [ zlib libuuid ]; }; - rjb = { - buildInputs = [ jdk ]; - JAVA_HOME = jdk; - }; - - buildr = { - # Many Buildfiles rely on RUBYLIB containing the current directory - # (as was the default in Ruby < 1.9.2). - extraWrapperFlags = "--prefix RUBYLIB : ."; - }; - - pry = { gemFlags = "--no-ri --no-rdoc"; }; + xrefresh_server = + let + patch = fetchurl { + url = "http://mawercer.de/~nix/xrefresh.diff.gz"; + sha256 = "1f7bnmn1pgkmkml0ms15m5lx880hq2sxy7vsddb3sbzm7n1yyicq"; + }; + in { + propagatedBuildInputs = [ gems.rb_inotify ]; - fakes3 = { - postInstall = '' - cd $out/${ruby.gemPath}/gems/* - patch -Np1 -i ${../../ruby-modules/fake-s3-list-bucket.patch} - ''; - }; + # monitor implementation for Linux + postInstall = '' + cd $out/${ruby.gemPath}/gems/* + zcat ${patch} | patch -p 1 + ''; # */ + }; } diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix new file mode 100644 index 00000000000..a59d28ba963 --- /dev/null +++ b/pkgs/development/libraries/db/db-5.3.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl +, cxxSupport ? true +}: + +stdenv.mkDerivation rec { + name = "db-5.3.28"; + + src = fetchurl { + url = "http://download.oracle.com/berkeley-db/${name}.tar.gz"; + sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"; + }; + + configureFlags = [ + (if cxxSupport then "--enable-cxx" else "--disable-cxx") + ]; + + preConfigure = '' + cd build_unix + configureScript=../dist/configure + ''; + + postInstall = '' + rm -rf $out/docs + ''; + + meta = with stdenv.lib; { + homepage = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/index.html"; + description = "Berkeley DB"; + license = "Berkeley Database License"; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix index cdc54ef6691..6326efe1adb 100644 --- a/pkgs/development/libraries/directfb/default.nix +++ b/pkgs/development/libraries/directfb/default.nix @@ -35,4 +35,22 @@ stdenv.mkDerivation { ] ++ stdenv.lib.optionals enableX11 [ "--enable-x11" ]; + + meta = with stdenv.lib; { + description = "Graphics and input library designed with embedded systems in mind"; + longDescription = '' + DirectFB is a thin library that provides hardware graphics acceleration, + input device handling and abstraction, integrated windowing system with + support for translucent windows and multiple display layers, not only on + top of the Linux Framebuffer Device. It is a complete hardware + abstraction layer with software fallbacks for every graphics operation + that is not supported by the underlying hardware. DirectFB adds graphical + power to embedded systems and sets a new standard for graphics under + Linux. + ''; + homepage = http://directfb.org/; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; } diff --git a/pkgs/development/libraries/directfb/src-for-default.nix b/pkgs/development/libraries/directfb/src-for-default.nix index a9c8c16a9d3..be583e08b6b 100644 --- a/pkgs/development/libraries/directfb/src-for-default.nix +++ b/pkgs/development/libraries/directfb/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="1.6.2"; - name="directfb-1.6.2"; - hash="0k9x8lnjvlyalsd07a8z4iv2rfmpiz6j7aj0y4m4sybxhc8c86xr"; + version="1.6.3"; + name="directfb-1.6.3"; + hash="0w2yyx6l2wn8jj9y14ymknqyc88wwrl314p9204frck91znsr5ks"; url="http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-${version}.tar.gz"; - advertisedUrl="http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-1.6.2.tar.gz"; + advertisedUrl="http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-1.6.3.tar.gz"; } diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix new file mode 100644 index 00000000000..098643ae70f --- /dev/null +++ b/pkgs/development/libraries/glog/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "glog-0.3.3"; + + src = fetchurl { + url = "http://google-glog.googlecode.com/files/${name}.tar.gz"; + sha1 = "ed40c26ecffc5ad47c618684415799ebaaa30d65"; + }; + + meta = { + homepage = http://code.google.com/p/google-glog/; + license = "BSD"; + description = "The glog library implements application-level logging."; + }; +} diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index 2c14451ba78..466406fbe79 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation { name = "gssdp-0.12.2.1"; src = fetchurl { - url = mirror://gnome/sources/gssdp/0.12/gssdp-0.12.2.1.tar.xz; - sha256 = "0544f9nv6dpnfd0qbmxm8xwqjh8dafcmf3vlzkdly12xh5bs52lj"; + url = mirror://gnome/sources/gssdp/0.14/gssdp-0.14.6.tar.xz; + sha256 = "1kgakr0rpdpm7nkp4ycka12nndga16wmzim79v1nbcc0j2wxxkws"; }; buildInputs = [pkgconfig libsoup glib libxml2]; diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix new file mode 100644 index 00000000000..3cbb13972d3 --- /dev/null +++ b/pkgs/development/libraries/gupnp-av/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, gupnp, pkgconfig }: + +stdenv.mkDerivation rec { + name = "gupnp-av-${version}"; + majorVersion = "0.12"; + version = "${majorVersion}.4"; + src = fetchurl { + url = "mirror://gnome/sources/gupnp-av/${majorVersion}/gupnp-av-${version}.tar.xz"; + sha256 = "0nvsvpiyfslz54j4hjh2gsdjkbi2qj2f4k0aw8s7f05kibprr2jl"; + }; + + buildInputs = [ gupnp pkgconfig ]; + + meta = { + homepage = http://gupnp.org/; + description = "GUPnP-AV is a collection of helpers for building AV (audio/video) applications using GUPnP."; + longDescription = "GUPnP implements the UPnP specification: resource announcement and discovery, description, control, event notification, and presentation (GUPnP includes basic web server functionality through libsoup). GUPnP does not include helpers for construction or control of specific standardized resources (e.g. MediaServer); this is left for higher level libraries utilizing the GUPnP framework."; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index ca92bb82a73..bae0639a61c 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, pkgconfig, glib, libxml2, gssdp, libsoup, libuuid }: -stdenv.mkDerivation { - name = "gupnp-0.18.4"; - +stdenv.mkDerivation rec { + name = "gupnp-${version}"; + majorVersion = "0.20"; + version = "${majorVersion}.9"; src = fetchurl { - url = mirror://gnome/sources/gupnp/0.18/gupnp-0.18.4.tar.xz; - sha256 = "18bqmy8r44fnga9wz9inlq6k2s0292bnnql0c0n2j4mj25bpshvb"; + url = "mirror://gnome/sources/gupnp/${majorVersion}/gupnp-${version}.tar.xz"; + sha256 = "0vicydn3f72x1rqql7857ans85mg7dfap7n7h8xrfyb9whxhlrb1"; }; propagatedBuildInputs = [ libxml2 libsoup gssdp ]; @@ -13,7 +14,16 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; + postInstall = '' + cp -r ${libsoup}/include/libsoup-2.4/libsoup $out/include + cp -r ${gssdp}/include/gssdp-1.0/libgssdp $out/include + cp -r ${libxml2}/include/libxml2/libxml $out/include + ''; + meta = { homepage = http://www.gupnp.org/; + description = "GUPnP is an implementation of the UPnP specification."; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/haskell/CouchDB/default.nix b/pkgs/development/libraries/haskell/CouchDB/default.nix index 4a413e2e7b8..ac8ab3d7728 100644 --- a/pkgs/development/libraries/haskell/CouchDB/default.nix +++ b/pkgs/development/libraries/haskell/CouchDB/default.nix @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0a9g0iblfyqppcy1ni3ac8f3yv5km95bfblhwqlsk6khydi5ka98"; buildDepends = [ HTTP json mtl network utf8String ]; testDepends = [ HTTP HUnit json mtl network utf8String ]; + doCheck = false; meta = { homepage = "http://github.com/arjunguha/haskell-couchdb/"; description = "CouchDB interface"; diff --git a/pkgs/development/libraries/haskell/HList/default.nix b/pkgs/development/libraries/haskell/HList/default.nix index 99cb73dcf1f..ae6f8e435f7 100644 --- a/pkgs/development/libraries/haskell/HList/default.nix +++ b/pkgs/development/libraries/haskell/HList/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "HList"; - version = "0.3.0.1"; - sha256 = "03mp99pb8whh3whyffyj8wbld8lv8i930dyjdpyfwiaj13x05iy4"; + version = "0.3.1.0"; + sha256 = "1cq7l7cv62jf47s75ycsgxg75kkrgnnrpb6y22cskc97hkfsnjmk"; buildDepends = [ mtl ]; testDepends = [ cmdargs doctest filepath hspec lens mtl syb ]; buildTools = [ diffutils ]; diff --git a/pkgs/development/libraries/haskell/adjunctions/default.nix b/pkgs/development/libraries/haskell/adjunctions/default.nix new file mode 100644 index 00000000000..bdfec2f01d4 --- /dev/null +++ b/pkgs/development/libraries/haskell/adjunctions/default.nix @@ -0,0 +1,19 @@ +{ cabal, comonad, contravariant, distributive, free, mtl +, semigroupoids, semigroups, tagged, transformers, void +}: + +cabal.mkDerivation (self: { + pname = "adjunctions"; + version = "4.0.1"; + sha256 = "0z13rmh9yp8jg2jzj3bmysqc4h2nblshx125h2sx51wllnvxzh5l"; + buildDepends = [ + comonad contravariant distributive free mtl semigroupoids + semigroups tagged transformers void + ]; + meta = { + homepage = "http://github.com/ekmett/adjunctions/"; + description = "Adjunctions and representable functors"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/annotated-wl-pprint/default.nix b/pkgs/development/libraries/haskell/annotated-wl-pprint/default.nix new file mode 100644 index 00000000000..f084fda35c5 --- /dev/null +++ b/pkgs/development/libraries/haskell/annotated-wl-pprint/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "annotated-wl-pprint"; + version = "0.5.3"; + sha256 = "0g8b4hmgh7jhiknfrlaqr9sxr7a6sikkpaws15dy8mg4r792bbis"; + meta = { + homepage = "https://github.com/david-christiansen/annotated-wl-pprint"; + description = "The Wadler/Leijen Pretty Printer, with annotation support"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/connection/default.nix b/pkgs/development/libraries/haskell/connection/default.nix index 186557d81b0..69083520c18 100644 --- a/pkgs/development/libraries/haskell/connection/default.nix +++ b/pkgs/development/libraries/haskell/connection/default.nix @@ -1,13 +1,14 @@ -{ cabal, certificate, cprngAes, dataDefault, network, socks, tls -, tlsExtra +{ cabal, cprngAes, dataDefaultClass, network, socks, tls, x509 +, x509Store, x509System, x509Validation }: cabal.mkDerivation (self: { pname = "connection"; - version = "0.1.3.1"; - sha256 = "1z9vb20466lg7l8z4abfbsdzpix18hswpqcl7s2gv838s2wvd16w"; + version = "0.2.0"; + sha256 = "17fzkgrjavmcxhdjj7agkx16jwpf6ql31nw1ni8gczkbp7azd0kp"; buildDepends = [ - certificate cprngAes dataDefault network socks tls tlsExtra + cprngAes dataDefaultClass network socks tls x509 x509Store + x509System x509Validation ]; meta = { homepage = "http://github.com/vincenthz/hs-connection"; diff --git a/pkgs/development/libraries/haskell/ekg/default.nix b/pkgs/development/libraries/haskell/ekg/default.nix index dd3c40a7d2c..28ef546163a 100644 --- a/pkgs/development/libraries/haskell/ekg/default.nix +++ b/pkgs/development/libraries/haskell/ekg/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ekg"; - version = "0.3.1.3"; - sha256 = "1d8ly1lc92gh26bdqg3ql6n2iai3nyvwic6sj8pani58iv0p4ppc"; + version = "0.3.1.4"; + sha256 = "0hr9962yx463rq53xfqfm7vlv9izn47v3css3m6n4v694qlyz95i"; buildDepends = [ aeson filepath network snapCore snapServer text time transformers unorderedContainers diff --git a/pkgs/development/libraries/haskell/fay-base/default.nix b/pkgs/development/libraries/haskell/fay-base/default.nix index 8e1212f5e5a..53f6fdce41c 100644 --- a/pkgs/development/libraries/haskell/fay-base/default.nix +++ b/pkgs/development/libraries/haskell/fay-base/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "fay-base"; - version = "0.18.0.0"; - sha256 = "010zjcs4y0zdb4gijrw10sjc56i271s35bkwg5c0lblyr62nml0s"; + version = "0.19"; + sha256 = "03jf1ig3s2dcdd26j3d3iwm9hbiq5f5q5hyg22jdvl7lmvigw36j"; buildDepends = [ fay ]; meta = { homepage = "https://github.com/faylang/fay-base"; diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix index d7c8ba5a447..adc29231d62 100644 --- a/pkgs/development/libraries/haskell/fay/default.nix +++ b/pkgs/development/libraries/haskell/fay/default.nix @@ -1,22 +1,22 @@ { cabal, aeson, attoparsec, Cabal, cpphs, dataDefault, filepath , ghcPaths, haskellNames, haskellPackages, haskellSrcExts, HUnit , languageEcmascript, mtl, optparseApplicative, prettyShow, safe -, sourcemap, split, syb, testFramework, testFrameworkHunit -, testFrameworkTh, text, time, uniplate, unorderedContainers -, utf8String, vector +, scientific, sourcemap, split, syb, testFramework +, testFrameworkHunit, testFrameworkTh, text, time, uniplate +, unorderedContainers, utf8String, vector }: cabal.mkDerivation (self: { pname = "fay"; - version = "0.18.1.3"; - sha256 = "1m747l2555w1jkdwh8b851mxvngiy7l7sbkwvm2il6k5ygcz5gbv"; + version = "0.19.0.1"; + sha256 = "036z4wz7vziaczhx1ysbm7d2302n2sb6l1z48py8spai5awkbvh0"; isLibrary = true; isExecutable = true; buildDepends = [ aeson attoparsec Cabal cpphs dataDefault filepath ghcPaths haskellNames haskellPackages haskellSrcExts HUnit languageEcmascript mtl optparseApplicative prettyShow safe - sourcemap split syb testFramework testFrameworkHunit + scientific sourcemap split syb testFramework testFrameworkHunit testFrameworkTh text time uniplate unorderedContainers utf8String vector ]; diff --git a/pkgs/development/libraries/haskell/free/default.nix b/pkgs/development/libraries/haskell/free/default.nix index a481d451973..4e679da1bdb 100644 --- a/pkgs/development/libraries/haskell/free/default.nix +++ b/pkgs/development/libraries/haskell/free/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "free"; - version = "4.2"; - sha256 = "0g2k36xqma8r6shrih40w5xv0pgs5ldr9lhc5hjpwmh4n3hgdhfb"; + version = "4.4"; + sha256 = "19c6zy7gxsd121g1kny9y8rv33gsxv3kfsi37iyn6q0p8r38wbcy"; buildDepends = [ bifunctors comonad distributive mtl profunctors semigroupoids semigroups transformers diff --git a/pkgs/development/libraries/haskell/hit/default.nix b/pkgs/development/libraries/haskell/hit/default.nix index 0c4020f746c..4dc73996cd1 100644 --- a/pkgs/development/libraries/haskell/hit/default.nix +++ b/pkgs/development/libraries/haskell/hit/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hit"; - version = "0.5.3"; - sha256 = "0s6nfjdasf62x28vzks809slnh0p6j3g101jzqlfh7nrnj5k6q1d"; + version = "0.5.4"; + sha256 = "1gr2f1bzncg8zlxk343p1ifnf2a2px000syzmr7hcf4yhhfavrhz"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/http-client-tls/default.nix b/pkgs/development/libraries/haskell/http-client-tls/default.nix index 82866abe9c3..201e1e11564 100644 --- a/pkgs/development/libraries/haskell/http-client-tls/default.nix +++ b/pkgs/development/libraries/haskell/http-client-tls/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "http-client-tls"; - version = "0.2.0.2"; - sha256 = "0v5730rssddc28f1q6ndkcjrfz8r5a1wmxk1azpmdxlq6nh4i9q9"; + version = "0.2.0.3"; + sha256 = "0v8zbwlvdmkap5qbw9aw75krvw8j4q90fn301al13azzgjp71gmb"; buildDepends = [ connection dataDefault httpClient network tls ]; testDepends = [ hspec httpClient httpTypes ]; doCheck = false; diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index 704ec8db48e..819902d6139 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "lens"; - version = "3.10.1"; - sha256 = "0xjjld1ra1a0a739ia8swgbpw7r72hv0bs9akbqr9wyw8qdzibnh"; + version = "3.10.2"; + sha256 = "0hdj75sg8r1m2jdpfh81zdcwbhp6mb7xipp6q57pv6n90xc6dnxw"; buildDepends = [ bifunctors comonad contravariant distributive filepath genericDeriving hashable MonadCatchIOTransformers mtl parallel @@ -23,6 +23,9 @@ cabal.mkDerivation (self: { testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh text transformers unorderedContainers vector ]; + patchPhase = '' + sed -i lens.cabal -e 's|MonadCatchIO-transformers >=.*,|MonadCatchIO-transformers,|' + ''; doCheck = false; meta = { homepage = "http://github.com/ekmett/lens/"; diff --git a/pkgs/development/libraries/haskell/linear/default.nix b/pkgs/development/libraries/haskell/linear/default.nix index a358528ee28..a0d1e67ee6f 100644 --- a/pkgs/development/libraries/haskell/linear/default.nix +++ b/pkgs/development/libraries/haskell/linear/default.nix @@ -1,16 +1,17 @@ -{ cabal, binary, distributive, doctest, filepath, hashable, HUnit -, lens, reflection, semigroupoids, semigroups, simpleReflect -, tagged, testFramework, testFrameworkHunit, transformers -, unorderedContainers, vector +{ cabal, adjunctions, binary, distributive, doctest, filepath +, hashable, HUnit, lens, reflection, semigroupoids, semigroups +, simpleReflect, tagged, testFramework, testFrameworkHunit +, transformers, unorderedContainers, vector, void }: cabal.mkDerivation (self: { pname = "linear"; - version = "1.4"; - sha256 = "1a2l68q0l2vlp4wpf5wqvpnag326s38k2ifh8hcfczjhsg9cq45a"; + version = "1.6"; + sha256 = "1aka0da4mwv9cdj76armlava0d4c5f8s2pv10fk6b5glyb0c1a7x"; buildDepends = [ - binary distributive hashable reflection semigroupoids semigroups - tagged transformers unorderedContainers vector + adjunctions binary distributive hashable lens reflection + semigroupoids semigroups tagged transformers unorderedContainers + vector void ]; testDepends = [ binary doctest filepath HUnit lens simpleReflect testFramework diff --git a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix index bd9261f901e..87bd36503e1 100644 --- a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix +++ b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monadcryptorandom"; - version = "0.6"; - sha256 = "0gms6xsnr6g5lk36z92yygwmyrl568y1h76ww676wb3qph42xx3x"; + version = "0.6.1"; + sha256 = "0j99j0f2qwhslimfgslsdlv0xihsddas3i69pfnjwnsd9zg5pgj2"; buildDepends = [ cryptoApi mtl tagged transformers ]; meta = { homepage = "https://github.com/TomMD/monadcryptorandom"; diff --git a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix index 2cb5e5a5cfc..28cf920cf28 100644 --- a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix +++ b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix @@ -1,17 +1,17 @@ { cabal, aeson, certificate, conduit, connection, cprngAes , cryptoApi, cryptoRandomApi, dataDefault, HUnit, monadControl, mtl , network, networkConduit, pem, systemFileio, systemFilepath, tls -, tlsExtra, transformers +, transformers }: cabal.mkDerivation (self: { pname = "network-conduit-tls"; - version = "1.0.3"; - sha256 = "0l8h9pfrrqzkf45cp5r8kxpzc2fi6m01s4zkrh0d226rbps3gmvc"; + version = "1.0.4.1"; + sha256 = "1l79v4ippyfw6pl4h3vqswh79vcif80phf6kq5fr4xmv3b6nbc06"; buildDepends = [ aeson certificate conduit connection cprngAes cryptoApi cryptoRandomApi dataDefault monadControl network networkConduit pem - systemFileio systemFilepath tls tlsExtra transformers + systemFileio systemFilepath tls transformers ]; testDepends = [ conduit connection HUnit mtl networkConduit ]; meta = { diff --git a/pkgs/development/libraries/haskell/pqueue/default.nix b/pkgs/development/libraries/haskell/pqueue/default.nix new file mode 100644 index 00000000000..8634c414318 --- /dev/null +++ b/pkgs/development/libraries/haskell/pqueue/default.nix @@ -0,0 +1,13 @@ +{ cabal, deepseq }: + +cabal.mkDerivation (self: { + pname = "pqueue"; + version = "1.2.1"; + sha256 = "1fily60f4njby7zknmik7a2wxsm3y77ckr69w9bb3fgq22gbzky6"; + buildDepends = [ deepseq ]; + meta = { + description = "Reliable, persistent, fast priority queues"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix index ee408fea480..c224da3a339 100644 --- a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix +++ b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "reactive-banana-wx"; - version = "0.7.1.0"; - sha256 = "06hkb8v6rjpw95vf16xh547igxxzddr6wpjiwhqwpwhz2alavk2v"; + version = "0.8.0.0"; + sha256 = "0qfd839nm2ppjhhhnn6s1hbx1mnrzjqx450p4jadsrs1y2403c9n"; isLibrary = true; isExecutable = true; buildDepends = [ cabalMacosx reactiveBanana wx wxcore ]; diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix index 0bf7747d46b..535b289a389 100644 --- a/pkgs/development/libraries/haskell/reactive-banana/default.nix +++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix @@ -1,19 +1,21 @@ -{ cabal, hashable, HUnit, testFramework, testFrameworkHunit +{ cabal, hashable, HUnit, pqueue, testFramework, testFrameworkHunit , transformers, unorderedContainers, vault }: cabal.mkDerivation (self: { pname = "reactive-banana"; - version = "0.7.1.3"; - sha256 = "117y1sk97kpiq0cippq0ydl2zqb99q49y2m2m6pgg2nh6gz6a3zb"; - buildDepends = [ hashable transformers unorderedContainers vault ]; + version = "0.8.0.0"; + sha256 = "15dzvn7cbs9kg410lyd1kj6kf2r7ap2n9bc59byzkb0r8wzn9ra1"; + buildDepends = [ + hashable pqueue transformers unorderedContainers vault + ]; testDepends = [ - hashable HUnit testFramework testFrameworkHunit transformers + hashable HUnit pqueue testFramework testFrameworkHunit transformers unorderedContainers vault ]; meta = { homepage = "http://haskell.org/haskellwiki/Reactive-banana"; - description = "Practical library for functional reactive programming (FRP)"; + description = "Library for functional reactive programming (FRP)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ diff --git a/pkgs/development/libraries/haskell/reflection/default.nix b/pkgs/development/libraries/haskell/reflection/default.nix index 5f227d60ca8..a02a7ec6907 100644 --- a/pkgs/development/libraries/haskell/reflection/default.nix +++ b/pkgs/development/libraries/haskell/reflection/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "reflection"; - version = "1.3.2"; - sha256 = "0jmdygvmvhw20aqjk7k0jah93ggfgf2bgq5zpwnz9bwgi9gs17x6"; + version = "1.4"; + sha256 = "0i6yb3fa9wizyaz8x9b7yzkw9jf7zahdrkr2y0iw7igdxqn4n0k7"; buildDepends = [ tagged ]; meta = { homepage = "http://github.com/ekmett/reflection"; diff --git a/pkgs/development/libraries/haskell/sourcemap/default.nix b/pkgs/development/libraries/haskell/sourcemap/default.nix index 602654b0a01..ce0c89d4596 100644 --- a/pkgs/development/libraries/haskell/sourcemap/default.nix +++ b/pkgs/development/libraries/haskell/sourcemap/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "sourcemap"; - version = "0.1.2.0"; - sha256 = "040j2k1cwzlq5pybs6cg7wmf0x5i22zdidv2xvzdvgi5v7gf6kp1"; + version = "0.1.3.0"; + sha256 = "1flfsjs2z2zjzqwvmc2vcibvxh19s89ah4s560xr2s5mhdqwbkk5"; buildDepends = [ aeson attoparsec text unorderedContainers utf8String ]; diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix deleted file mode 100644 index 6d63c267c61..00000000000 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ cabal, certificate, cipherAes, cipherRc4, cryptohash -, cryptoPubkey, cryptoRandom, mtl, network, pem, time, tls, vector -}: - -cabal.mkDerivation (self: { - pname = "tls-extra"; - version = "0.6.6"; - sha256 = "0k0sj3nq1lrvbmd582mjj8cxbxigivz1hm8hhij1ncl2pgnq5xyv"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - certificate cipherAes cipherRc4 cryptohash cryptoPubkey - cryptoRandom mtl network pem time tls vector - ]; - jailbreak = true; - meta = { - homepage = "http://github.com/vincenthz/hs-tls"; - description = "TLS extra default values and helpers"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index 0f354d8b77e..638299d4a42 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -1,18 +1,23 @@ -{ cabal, cereal, certificate, cprngAes, cryptohash, cryptoPubkey -, cryptoRandom, mtl, network, QuickCheck, testFramework -, testFrameworkQuickcheck2, time +{ cabal, asn1Encoding, asn1Types, cereal, cipherAes, cipherRc4 +, cprngAes, cryptohash, cryptoNumbers, cryptoPubkey +, cryptoPubkeyTypes, cryptoRandom, dataDefaultClass, mtl, network +, QuickCheck, testFramework, testFrameworkQuickcheck2, time, x509 +, x509Store, x509Validation }: cabal.mkDerivation (self: { pname = "tls"; - version = "1.1.5"; - sha256 = "1ja03x3i7dgjpy22h4shnni1xslph8i8q4accqq8njpqpz54c84c"; + version = "1.2.2"; + sha256 = "156l859mfpdax5rg1frwa5ms5bzggaja0mi795hh8i5c3ah7hfcp"; buildDepends = [ - cereal certificate cryptohash cryptoPubkey cryptoRandom mtl network + asn1Encoding asn1Types cereal cipherAes cipherRc4 cryptohash + cryptoNumbers cryptoPubkey cryptoPubkeyTypes cryptoRandom + dataDefaultClass mtl network x509 x509Store x509Validation ]; testDepends = [ - cereal certificate cprngAes cryptoPubkey cryptoRandom mtl - QuickCheck testFramework testFrameworkQuickcheck2 time + cereal cprngAes cryptoPubkey cryptoRandom dataDefaultClass mtl + QuickCheck testFramework testFrameworkQuickcheck2 time x509 + x509Validation ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/unbound/default.nix b/pkgs/development/libraries/haskell/unbound/default.nix index df57bbbdac7..4667ed956f0 100644 --- a/pkgs/development/libraries/haskell/unbound/default.nix +++ b/pkgs/development/libraries/haskell/unbound/default.nix @@ -1,10 +1,10 @@ -{ cabal, mtl, RepLib, transformers }: +{ cabal, binary, mtl, RepLib, transformers }: cabal.mkDerivation (self: { pname = "unbound"; - version = "0.4.2"; - sha256 = "1bnnnv4rmzb0pw7i56nzr7k7pahr9rcmlfi4xkpsjhrxmizcfml9"; - buildDepends = [ mtl RepLib transformers ]; + version = "0.4.3"; + sha256 = "1lv60zpsvjfp9qnckwbphkfv0x9pz2qvaab3p4kj38fnlq2y20i4"; + buildDepends = [ binary mtl RepLib transformers ]; meta = { homepage = "http://code.google.com/p/replib/"; description = "Generic support for programming with names and binders"; diff --git a/pkgs/development/libraries/haskell/vector-th-unbox/default.nix b/pkgs/development/libraries/haskell/vector-th-unbox/default.nix index 8f5ec4b52bf..db328836616 100644 --- a/pkgs/development/libraries/haskell/vector-th-unbox/default.nix +++ b/pkgs/development/libraries/haskell/vector-th-unbox/default.nix @@ -1,10 +1,11 @@ -{ cabal, vector }: +{ cabal, dataDefault, vector }: cabal.mkDerivation (self: { pname = "vector-th-unbox"; - version = "0.2.0.1"; - sha256 = "1q01yk6cyjxbdnmq31d5mfac09hbql43d7xiw1snc96nmkklfpjv"; + version = "0.2.0.2"; + sha256 = "1c8xy0rcl8il9ssclqshwi8dd2xx6bl1rfhrfm9h7wklw64db9xp"; buildDepends = [ vector ]; + testDepends = [ dataDefault vector ]; meta = { description = "Deriver for Data.Vector.Unboxed using Template Haskell"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 3022b0565de..f3d2dfbd0cd 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "2.0.3.2"; - sha256 = "0zhwk78ny7ak6sf974gqg3zjrrmivgb7dvxs5jbqghq0a6xs97zi"; + version = "2.0.3.3"; + sha256 = "11ma8pazvysvpiy8y7xfh7kpmsfiw94bd6vyyi3ji8q71rzjlf62"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase diff --git a/pkgs/development/libraries/haskell/warp-tls/default.nix b/pkgs/development/libraries/haskell/warp-tls/default.nix index 88e50b2488e..c93352cf65c 100644 --- a/pkgs/development/libraries/haskell/warp-tls/default.nix +++ b/pkgs/development/libraries/haskell/warp-tls/default.nix @@ -1,15 +1,14 @@ -{ cabal, certificate, conduit, cprngAes, cryptocipher -, cryptoRandomApi, network, networkConduit, pem, tls, tlsExtra -, transformers, wai, warp +{ cabal, conduit, cprngAes, dataDefaultClass, network +, networkConduit, tls, transformers, wai, warp }: cabal.mkDerivation (self: { pname = "warp-tls"; - version = "2.0.1"; - sha256 = "0qz02awxrfqmmckias21dh0irmf44vamv24jjjrbb6bjxbr4ldd0"; + version = "2.0.2"; + sha256 = "02wj9hwxd0x49g7kl68h3r4b9hc29yqfjagyybnr42xzwl6bdpyg"; buildDepends = [ - certificate conduit cprngAes cryptocipher cryptoRandomApi network - networkConduit pem tls tlsExtra transformers wai warp + conduit cprngAes dataDefaultClass network networkConduit tls + transformers wai warp ]; meta = { homepage = "http://github.com/yesodweb/wai"; diff --git a/pkgs/development/libraries/haskell/x509-store/default.nix b/pkgs/development/libraries/haskell/x509-store/default.nix index bc1c0c47dc9..100b5ca2835 100644 --- a/pkgs/development/libraries/haskell/x509-store/default.nix +++ b/pkgs/development/libraries/haskell/x509-store/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "x509-store"; - version = "1.4.3"; - sha256 = "1px5r5y4vaxx479d4av333g1sc03mz1aalpvwwkbi5bwnxydvf01"; + version = "1.4.4"; + sha256 = "0i3hfrddr0wpfl75a76a1j24az08z4x7ya8l5qcdk7c1lr2c2bw8"; buildDepends = [ asn1Encoding asn1Types cryptoPubkeyTypes filepath mtl pem time x509 ]; diff --git a/pkgs/development/libraries/haskell/yesod-platform/default.nix b/pkgs/development/libraries/haskell/yesod-platform/default.nix deleted file mode 100644 index ee9fa20c8de..00000000000 --- a/pkgs/development/libraries/haskell/yesod-platform/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ cabal, aeson, ansiTerminal, asn1Data, asn1Types, attoparsec -, attoparsecConduit, authenticate, base64Bytestring -, baseUnicodeSymbols, blazeBuilder, blazeBuilderConduit, blazeHtml -, blazeMarkup, byteable, byteorder, caseInsensitive, cereal -, certificate, cipherAes, cipherBlowfish, cipherCamellia, cipherDes -, cipherRc4, clientsession, conduit, connection, controlMonadLoop -, cookie, cprngAes, cryptoApi, cryptocipher, cryptoCipherTypes -, cryptoConduit, cryptohash, cryptohashCryptoapi, cryptoNumbers -, cryptoPubkey, cryptoPubkeyTypes, cryptoRandom, cryptoRandomApi -, cssText, dataDefault, dataDefaultClass, dataDefaultInstancesBase -, dataDefaultInstancesContainers, dataDefaultInstancesDlist -, dataDefaultInstancesOldLocale, dlist, emailValidate, entropy -, esqueleto, failure, fastLogger, fileEmbed, filesystemConduit -, hamlet, hjsmin, hspec, hspecExpectations, htmlConduit -, httpAttoparsec, httpClient, httpClientConduit, httpClientTls -, httpConduit, httpDate, httpTypes, languageJavascript, liftedBase -, mimeMail, mimeTypes, mmorph, monadControl, monadLogger -, monadLoops, networkConduit, pathPieces, pem, persistent -, persistentTemplate, poolConduit, primitive, processConduit -, publicsuffixlist, pureMD5, pwstoreFast, quickcheckIo -, resourcePool, resourcet, safe, scientific, securemem, semigroups -, setenv, SHA, shakespeare, shakespeareCss, shakespeareI18n -, shakespeareJs, shakespeareText, silently, simpleSendfile, skein -, socks, stmChans, stringsearch, systemFileio, systemFilepath -, tagged, tagsoup, tagstreamConduit, tls, tlsExtra -, transformersBase, unixCompat, unorderedContainers, utf8Light -, utf8String, vector, void, wai, waiAppStatic, waiExtra, waiLogger -, waiTest, warp, warpTls, word8, xmlConduit, xmlTypes, xssSanitize -, yaml, yesod, yesodAuth, yesodCore, yesodForm, yesodPersistent -, yesodRoutes, yesodStatic, yesodTest, zlibBindings, zlibConduit -}: - -cabal.mkDerivation (self: { - pname = "yesod-platform"; - version = "1.2.6.1"; - sha256 = "1hwvpyxwirv9maangw4q6nb2m2kqpqvvh1i095fr08f1a1qih77f"; - buildDepends = [ - aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit - authenticate base64Bytestring baseUnicodeSymbols blazeBuilder - blazeBuilderConduit blazeHtml blazeMarkup byteable byteorder - caseInsensitive cereal certificate cipherAes cipherBlowfish - cipherCamellia cipherDes cipherRc4 clientsession conduit connection - controlMonadLoop cookie cprngAes cryptoApi cryptocipher - cryptoCipherTypes cryptoConduit cryptohash cryptohashCryptoapi - cryptoNumbers cryptoPubkey cryptoPubkeyTypes cryptoRandom - cryptoRandomApi cssText dataDefault dataDefaultClass - dataDefaultInstancesBase dataDefaultInstancesContainers - dataDefaultInstancesDlist dataDefaultInstancesOldLocale dlist - emailValidate entropy esqueleto failure fastLogger fileEmbed - filesystemConduit hamlet hjsmin hspec hspecExpectations htmlConduit - httpAttoparsec httpClient httpClientConduit httpClientTls - httpConduit httpDate httpTypes languageJavascript liftedBase - mimeMail mimeTypes mmorph monadControl monadLogger monadLoops - networkConduit pathPieces pem persistent persistentTemplate - poolConduit primitive processConduit publicsuffixlist pureMD5 - pwstoreFast quickcheckIo resourcePool resourcet safe scientific - securemem semigroups setenv SHA shakespeare shakespeareCss - shakespeareI18n shakespeareJs shakespeareText silently - simpleSendfile skein socks stmChans stringsearch systemFileio - systemFilepath tagged tagsoup tagstreamConduit tls tlsExtra - transformersBase unixCompat unorderedContainers utf8Light - utf8String vector void wai waiAppStatic waiExtra waiLogger waiTest - warp warpTls word8 xmlConduit xmlTypes xssSanitize yaml yesod - yesodAuth yesodCore yesodForm yesodPersistent yesodRoutes - yesodStatic yesodTest zlibBindings zlibConduit - ]; - jailbreak = true; - meta = { - homepage = "http://www.yesodweb.com/"; - description = "Meta package for Yesod"; - license = self.stdenv.lib.licenses.mit; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/ilixi/default.nix b/pkgs/development/libraries/ilixi/default.nix new file mode 100644 index 00000000000..dd8ad8b3561 --- /dev/null +++ b/pkgs/development/libraries/ilixi/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pkgconfig, directfb, libsigcxx, libxml2, fontconfig }: + +# TODO: optional deps: baresip, FusionDale, FusionSound, SaWMan, doxygen, +# Reflex, Wnn, NLS + +stdenv.mkDerivation rec { + name = "ilixi-1.0.0"; + + src = fetchurl { + url = "http://www.directfb.org/downloads/Libs/${name}.tar.gz"; + sha256 = "1kmdmqf68jiv7y6as41bhbgdy70yy2i811a3l6kccbazlzpif34v"; + }; + + buildInputs = [ pkgconfig directfb libsigcxx libxml2 fontconfig ]; + + configureFlags = '' + --enable-log-debug --enable-debug --enable-trace --with-examples + ''; + + meta = with stdenv.lib; { + description = "Lightweight C++ GUI toolkit for embedded Linux systems"; + homepage = http://ilixi.org/; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index e0f2ba77de2..7abad2f2d08 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -5,7 +5,10 @@ stdenv.mkDerivation rec { name = "libarchive-3.1.2"; src = fetchurl { - url = "${meta.homepage}/downloads/${name}.tar.gz"; + urls = [ + "http://pkgs.fedoraproject.org/repo/pkgs/libarchive/libarchive-3.1.2.tar.gz/efad5a503f66329bb9d2f4308b5de98a/${name}.tar.gz" + "${meta.homepage}/downloads/${name}.tar.gz" + ]; sha256 = "0pixqnrcf35dnqgv0lp7qlcw7k13620qkhgxr288v7p4iz6ym1zb"; }; diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix new file mode 100644 index 00000000000..695c0fa1a32 --- /dev/null +++ b/pkgs/development/libraries/libcangjie/default.nix @@ -0,0 +1,32 @@ +{ stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkgconfig, sqlite }: + +stdenv.mkDerivation rec { + name = "libcangjie-1.0"; + + src = fetchurl { + url = "https://github.com/Cangjians/libcangjie/archive/v1.0.tar.gz"; + sha256 = "15la1pxa2fvhznlbkl32qp2cgd602bvrx2zmahybypbfik0cgqk1"; + }; + + buildInputs = [ automake autoconf libtool m4 pkgconfig sqlite ]; + + configureScript = "./autogen.sh"; + + preConfigure = '' + find . -name '*.sh' -exec sed -e 's@#!/bin/bash@${bash}/bin/bash@' -i '{}' ';' + ''; + + doCheck = true; + + meta = { + description = "A C library implementing the Cangjie input method"; + longDescription = '' + libcangjie is a library implementing the Cangjie input method. + ''; + homepage = http://cangjians.github.io/projects/libcangjie/; + license = "LGPLv3+"; + + maintainers = [ stdenv.lib.maintainers.linquize ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/libsoup/2.44.nix b/pkgs/development/libraries/libsoup/2.44.nix deleted file mode 100644 index 4bef93ff8cd..00000000000 --- a/pkgs/development/libraries/libsoup/2.44.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, python, gobjectIntrospection -, glib, libxml2, sqlite, glib_networking -, gnomeSupport ? true, libgnome_keyring -}: - -stdenv.mkDerivation { - name = "libsoup-2.44.2"; - - meta = { - description = "HTTP client/server library"; - license = stdenv.lib.licenses.lgpl2Plus; - }; - - src = fetchurl { - url = mirror://gnome/sources/libsoup/2.44/libsoup-2.44.2.tar.xz; - sha256 = "1wwqsmi1jvidiqwbdnjl66nmk1yja8w9dxf9cz10zh56fjmvbr77"; - }; - - preConfigure = '' - substituteInPlace libsoup/tld-parser.py \ - --replace "!/usr/bin/env python" "!${python}/bin/${python.executable}" - ''; - - nativeBuildInputs = [ pkgconfig intltool python gobjectIntrospection ]; - - propagatedBuildInputs = [ glib libxml2 sqlite ] - ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring ]; - - passthru.propagatedUserEnvPackages = [ glib_networking ]; - - # glib_networking is a runtime dependency, not a compile-time dependency - configureFlags = "--disable-tls-check"; - - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; -} diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index a5ce0fda270..049d6646ec8 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,19 +1,26 @@ { stdenv, fetchurl, glib, libxml2, pkgconfig -, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking -, libintlOrEmpty }: - +, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking, gobjectIntrospection +, libintlOrEmpty +, intltool, python }: +let + majorVersion = "2.45"; + version = "${majorVersion}.3"; +in stdenv.mkDerivation { - name = "libsoup-2.38.1"; + name = "libsoup-${version}"; src = fetchurl { - url = mirror://gnome/sources/libsoup/2.38/libsoup-2.38.1.tar.xz; - sha256 = "16iza4y8pmc4sn90iid88fgminvgcqypy3s2qnmzkzm5qwzr5f3i"; + url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz"; + sha256 = "04ma47hcrrbjp90r8jjn686cngnbgac24wgarpwwzlpg66wighva"; }; + patchPhase = '' + patchShebangs libsoup/ + ''; - buildInputs = libintlOrEmpty; + buildInputs = libintlOrEmpty ++ [ intltool python ]; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ glib libxml2 ] + propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ] ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ]; passthru.propagatedUserEnvPackages = [ glib_networking ]; diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 3833e5bffa1..8be17b289f7 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, udev }: let - version = "1.0.17"; + version = "1.0.18"; in stdenv.mkDerivation rec { - name = "libusbx-${version}"; # it's a fork of original libusb1; should be mostly compatible + name = "libusb-${version}"; # at 1.0.18 libusb joined with libusbx src = fetchurl { - url = "mirror://sourceforge/libusbx/libusbx-${version}.tar.bz2"; - sha256 = "1f25a773x9x5n48a0mcigyk77ay0hkiz6y6bi4588wzf7wn8svw7"; + url = "mirror://sourceforge/libusb/libusb-${version}.tar.bz2"; + sha256 = "081px0j98az0pjwwyjlq4qcmfn194fvm3qd4im0r9pm58pn5qgy7"; }; buildInputs = [ pkgconfig ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; meta = { - homepage = http://www.libusb.org; + homepage = http://www.libusb.info; description = "User-space USB library"; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.urkud ]; diff --git a/pkgs/development/libraries/libyaml/cve-2013-6393_a.patch b/pkgs/development/libraries/libyaml/cve-2013-6393_a.patch new file mode 100644 index 00000000000..130107341f7 --- /dev/null +++ b/pkgs/development/libraries/libyaml/cve-2013-6393_a.patch @@ -0,0 +1,11 @@ +--- a/src/scanner.c ++++ a/src/scanner.c +@@ -2574,7 +2574,7 @@ + + /* Resize the string to include the head. */ + +- while (string.end - string.start <= (int)length) { ++ while ((size_t)(string.end - string.start) <= length) { + if (!yaml_string_extend(&string.start, &string.pointer, &string.end)) { + parser->error = YAML_MEMORY_ERROR; + goto error; diff --git a/pkgs/development/libraries/libyaml/cve-2013-6393_b.patch b/pkgs/development/libraries/libyaml/cve-2013-6393_b.patch new file mode 100644 index 00000000000..db2b9ff2bba --- /dev/null +++ b/pkgs/development/libraries/libyaml/cve-2013-6393_b.patch @@ -0,0 +1,16 @@ +--- a/src/api.c ++++ a/src/api.c +@@ -117,7 +117,12 @@ + YAML_DECLARE(int) + yaml_stack_extend(void **start, void **top, void **end) + { +- void *new_start = yaml_realloc(*start, ((char *)*end - (char *)*start)*2); ++ void *new_start; ++ ++ if ((char *)*end - (char *)*start >= INT_MAX / 2) ++ return 0; ++ ++ new_start = yaml_realloc(*start, ((char *)*end - (char *)*start)*2); + + if (!new_start) return 0; + diff --git a/pkgs/development/libraries/libyaml/cve-2013-6393_c.patch b/pkgs/development/libraries/libyaml/cve-2013-6393_c.patch new file mode 100644 index 00000000000..dc1c50da4e8 --- /dev/null +++ b/pkgs/development/libraries/libyaml/cve-2013-6393_c.patch @@ -0,0 +1,131 @@ +--- a/src/scanner.c Mon Dec 24 03:51:32 2012 +0000 ++++ a/src/scanner.c Mon Jan 27 19:48:28 2014 -0500 +@@ -615,11 +615,14 @@ + */ + + static int +-yaml_parser_roll_indent(yaml_parser_t *parser, int column, ++yaml_parser_roll_indent(yaml_parser_t *parser, size_t column, + int number, yaml_token_type_t type, yaml_mark_t mark); + + static int +-yaml_parser_unroll_indent(yaml_parser_t *parser, int column); ++yaml_parser_unroll_indent(yaml_parser_t *parser, size_t column); ++ ++static int ++yaml_parser_reset_indent(yaml_parser_t *parser); + + /* + * Token fetchers. +@@ -1206,7 +1209,7 @@ + */ + + static int +-yaml_parser_roll_indent(yaml_parser_t *parser, int column, ++yaml_parser_roll_indent(yaml_parser_t *parser, size_t column, + int number, yaml_token_type_t type, yaml_mark_t mark) + { + yaml_token_t token; +@@ -1216,7 +1219,7 @@ + if (parser->flow_level) + return 1; + +- if (parser->indent < column) ++ if (parser->indent == -1 || parser->indent < column) + { + /* + * Push the current indentation level to the stack and set the new +@@ -1254,7 +1257,7 @@ + + + static int +-yaml_parser_unroll_indent(yaml_parser_t *parser, int column) ++yaml_parser_unroll_indent(yaml_parser_t *parser, size_t column) + { + yaml_token_t token; + +@@ -1263,6 +1266,15 @@ + if (parser->flow_level) + return 1; + ++ /* ++ * column is unsigned and parser->indent is signed, so if ++ * parser->indent is less than zero the conditional in the while ++ * loop below is incorrect. Guard against that. ++ */ ++ ++ if (parser->indent < 0) ++ return 1; ++ + /* Loop through the intendation levels in the stack. */ + + while (parser->indent > column) +@@ -1283,6 +1295,41 @@ + } + + /* ++ * Pop indentation levels from the indents stack until the current ++ * level resets to -1. For each intendation level, append the ++ * BLOCK-END token. ++ */ ++ ++static int ++yaml_parser_reset_indent(yaml_parser_t *parser) ++{ ++ yaml_token_t token; ++ ++ /* In the flow context, do nothing. */ ++ ++ if (parser->flow_level) ++ return 1; ++ ++ /* Loop through the intendation levels in the stack. */ ++ ++ while (parser->indent > -1) ++ { ++ /* Create a token and append it to the queue. */ ++ ++ TOKEN_INIT(token, YAML_BLOCK_END_TOKEN, parser->mark, parser->mark); ++ ++ if (!ENQUEUE(parser, parser->tokens, token)) ++ return 0; ++ ++ /* Pop the indentation level. */ ++ ++ parser->indent = POP(parser, parser->indents); ++ } ++ ++ return 1; ++} ++ ++/* + * Initialize the scanner and produce the STREAM-START token. + */ + +@@ -1338,7 +1385,7 @@ + + /* Reset the indentation level. */ + +- if (!yaml_parser_unroll_indent(parser, -1)) ++ if (!yaml_parser_reset_indent(parser)) + return 0; + + /* Reset simple keys. */ +@@ -1369,7 +1416,7 @@ + + /* Reset the indentation level. */ + +- if (!yaml_parser_unroll_indent(parser, -1)) ++ if (!yaml_parser_reset_indent(parser)) + return 0; + + /* Reset simple keys. */ +@@ -1407,7 +1454,7 @@ + + /* Reset the indentation level. */ + +- if (!yaml_parser_unroll_indent(parser, -1)) ++ if (!yaml_parser_reset_indent(parser)) + return 0; + + /* Reset simple keys. */ diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index cf687c97243..93f19165e88 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -8,6 +8,9 @@ stdenv.mkDerivation { sha256 = "0dvavrhxjrjfxgdgysxqfpdy08lpg3m9i8vxjyvdkcjsmra1by3v"; }; + # Downloaded on 2014-02-01 from https://bugzilla.redhat.com/show_bug.cgi?id=1033990 + patches = [ ./cve-2013-6393_a.patch ./cve-2013-6393_b.patch ./cve-2013-6393_c.patch ]; + meta = { homepage = http://pyyaml.org/; description = "A YAML 1.1 parser and emitter written in C"; diff --git a/pkgs/development/libraries/libyubikey/default.nix b/pkgs/development/libraries/libyubikey/default.nix new file mode 100644 index 00000000000..25c2117b059 --- /dev/null +++ b/pkgs/development/libraries/libyubikey/default.nix @@ -0,0 +1,21 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec +{ + version = "1.11"; + name = "libyubikey-${version}"; + + src = fetchurl + { + url = "http://opensource.yubico.com/yubico-c/releases/${name}.tar.gz"; + sha256 = "19pm4rqsnm9r0n5j26bqkxa1jpimdavzcvg5g7p416vkjhxc6lw9"; + }; + + meta = + { + homepage = "http://opensource.yubico.com/yubico-c/"; + description = "C library for manipulating Yubico YubiKey One-Time Passwords (OTPs)"; + license = "bsd"; + maintainers = [ stdenv.lib.maintainers.calrama ]; + }; +} diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 60b9c7738a0..1273146c342 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.openldap.org/"; description = "An open source implementation of the Lightweight Directory Access Protocol"; + maintainers = stdenv.lib.maintainers.mornfall; }; } diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 6e61b743a56..678a439fe0a 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation { homePage = http://www.open-mpi.org/; description = "Open source MPI-2 implementation"; longDescription = "The Open MPI Project is an open source MPI-2 implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers."; + maintainers = stdenv.lib.maintainers.mornfall; }; } diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix new file mode 100644 index 00000000000..48bbd3aa785 --- /dev/null +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, gfortran, openblas }: + +let version = "3.1.4"; +in +stdenv.mkDerivation { + name = "arpack-${version}"; + src = fetchurl { + url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/get/arpack-ng_${version}.tar.gz"; + sha256 = "0m4cqy3d7fpzx1nac3brhr298qj7vx3fchjdz5b7n0pp616cmcm1"; + }; + + buildInputs = [ gfortran ]; + propagatedBuildInputs = [ openblas ]; + + # Auto-detection fails because gfortran brings in BLAS by default + configureFlags="--with-blas=-lopenblas --with-lapack=-lopenblas"; + + meta = { + homepage = "http://forge.scilab.org/index.php/p/arpack-ng/"; + description = "A collection of Fortran77 subroutines to solve large scale eigenvalue problems"; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix new file mode 100644 index 00000000000..29e92d0b6ec --- /dev/null +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, mcpp, bzip2, expat, openssl, db5 }: + +stdenv.mkDerivation rec { + name = "zeroc-ice-3.5.1"; + + src = fetchurl { + url = "http://www.zeroc.com/download/Ice/3.5/Ice-3.5.1.tar.gz"; + sha256 = "14pk794p0fq3hcp50xmqnf9pp15dggiqhcnsav8xpnka9hcm37lq"; + }; + + buildInputs = [ mcpp bzip2 expat openssl db5 ]; + + buildPhase = '' + cd cpp + make OPTIMIZE=yes + ''; + + installPhase = '' + make prefix=$out install + ''; + + meta = with stdenv.lib; { + homepage = "http://www.zeroc.com/ice.html"; + description = "The internet communications engine"; + license = licenses.gpl2; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/misc/amdadl-sdk/default.nix b/pkgs/development/misc/amdadl-sdk/default.nix index a77e477f572..c177d8fe03f 100644 --- a/pkgs/development/misc/amdadl-sdk/default.nix +++ b/pkgs/development/misc/amdadl-sdk/default.nix @@ -42,8 +42,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "API to access display driver functionality for ATI graphics cards"; homepage = http://developer.amd.com/tools/graphics-development/display-library-adl-sdk/; - license = licenses.amdadl; + license = licenses.unfree; maintainers = [ maintainers.offline ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix index 9c843fa8c37..53687868102 100644 --- a/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/pkgs/development/mobile/androidenv/emulate-app.nix @@ -95,7 +95,15 @@ stdenv.mkDerivation { ${stdenv.lib.optionalString (app != null) '' # Install the App through the debugger - ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port install ${app}/*.apk + + if [ -d "${app}" ] + then + appPath="$(echo ${app}/*.apk)" + else + appPath="${app}" + fi + + ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port install "$appPath" # Start the application ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/.${activity} diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index a8d376ef23c..0a0974b886a 100644 --- a/pkgs/development/tools/analysis/lcov/default.nix +++ b/pkgs/development/tools/analysis/lcov/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { done ''; - meta = { + meta = with stdenv.lib; { description = "LCOV, a code coverage tool that enhances GNU gcov"; longDescription = @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { homepage = http://ltp.sourceforge.net/coverage/lcov.php; license = "GPLv2+"; - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + maintainers = [ maintainers.mornfall ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index b4fdd4c09d4..4be166f9768 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation { description = "Formal verification tool for distributed software systems"; homepage = http://spinroot.com/; license = "free"; + maintainers = stdenv.lib.maintainers.mornfall; }; } diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix index 92bb973b558..33e5339a5f0 100644 --- a/pkgs/development/tools/haskell/HaRe/default.nix +++ b/pkgs/development/tools/haskell/HaRe/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "HaRe"; - version = "0.7.1.1"; - sha256 = "1gh0md8gfchniclck5ddbkdwf9dl01mkcdmdx3n3f59rx9qi8g0h"; + version = "0.7.1.2"; + sha256 = "1bplcjh0rx6m8ja8vpb18cfky349gmi27rlpsg0pw5nr3l4gcwyl"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index bdf3a7d0561..732423da5cd 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { description = "A system call tracer for Linux"; license = licenses.bsd3; platforms = platforms.linux; + maintainers = maintainers.mornfall; }; } diff --git a/pkgs/development/web/xmlindent/default.nix b/pkgs/development/web/xmlindent/default.nix new file mode 100644 index 00000000000..f0966357d93 --- /dev/null +++ b/pkgs/development/web/xmlindent/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, flex }: + +stdenv.mkDerivation rec { + name = "xmlindent-${version}"; + version = "0.2.17"; + + src = fetchurl { + url = "mirror://sourceforge/project/xmlindent/xmlindent/${version}/${name}.tar.gz"; + sha256 = "0k15rxh51a5r4bvfm6c4syxls8al96cx60a9mn6pn24nns3nh3rs"; + }; + + buildInputs = [ flex ]; + + preConfigure = '' + substituteInPlace Makefile --replace "PREFIX=/usr/local" "PREFIX=$out" + ''; + + meta = { + description = "XML stream reformatter"; + homepage = http://xmlindent.sourceforge.net/; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.ocharles ]; + }; +} |