diff options
Diffstat (limited to 'pkgs/development')
118 files changed, 975 insertions, 441 deletions
diff --git a/pkgs/development/compilers/elm/elm.nix b/pkgs/development/compilers/elm/elm.nix index c9e9fb9e14b..6fc65bf368b 100644 --- a/pkgs/development/compilers/elm/elm.nix +++ b/pkgs/development/compilers/elm/elm.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "Elm"; - version = "0.10.0.1"; - sha256 = "1r7z2fw9v6ngr9w4lmj1l6sc78rmxvqkqlxv4a9yc5jm80k3ar0i"; + version = "0.10.0.2"; + sha256 = "08aqz9lf754ygdwvjf4bs5ivnjyjx9rd43vrbzp0p4d3if6w6avz"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index 6713dd12b3c..d7d9325ca4f 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -462,7 +462,10 @@ stdenv.mkDerivation ({ # Volunteers needed for the {Cyg,Dar}win ports of *PPL. # gnatboot is not available out of linux platforms, so we disable the darwin build # for the gnat (ada compiler). - platforms = stdenv.lib.platforms.linux ++ optionals (langAda == false && libelf == null) [ "i686-darwin" ]; + platforms = + stdenv.lib.platforms.linux ++ + stdenv.lib.platforms.freebsd ++ + optionals (langAda == false) stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/compilers/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix index b32b12d5b95..9909c49e143 100644 --- a/pkgs/development/compilers/ghc/with-packages.nix +++ b/pkgs/development/compilers/ghc/with-packages.nix @@ -1,16 +1,42 @@ -{ stdenv, ghc, packages, buildEnv, makeWrapper }: +{ stdenv, ghc, packages, buildEnv, makeWrapper, ignoreCollisions ? false }: -assert packages != []; +# This wrapper works only with GHC 6.12 or later. +assert stdenv.lib.versionOlder "6.12" ghc.version; + +# It's probably a good idea to include the library "ghc-paths" in the +# compiler environment, because we have a specially patched version of +# that package in Nix that honors these environment variables +# +# NIX_GHC +# NIX_GHCPKG +# NIX_GHC_DOCDIR +# NIX_GHC_LIBDIR +# +# instead of hard-coding the paths. The wrapper sets these variables +# appropriately to configure ghc-paths to point back to the wrapper +# instead of to the pristine GHC package, which doesn't know any of the +# additional libraries. +# +# A good way to import the environment set by the wrapper below into +# your shell is to add the following snippet to your ~/.bashrc: +# +# if [ -e ~/.nix-profile/bin/ghc ]; then +# eval $(grep export ~/.nix-profile/bin/ghc) +# fi let ghc761OrLater = stdenv.lib.versionOlder "7.6.1" ghc.version; - packageDBFlag = if ghc761OrLater then "--package-db" else "--package-conf"; + packageDBFlag = if ghc761OrLater then "--global-package-db" else "--global-conf"; libDir = "$out/lib/ghc-${ghc.version}"; + docDir = "$out/share/doc/ghc/html"; packageCfgDir = "${libDir}/package.conf.d"; + isHaskellPkg = x: (x ? pname) && (x ? version); in +if packages == [] then ghc else buildEnv { name = "haskell-env-${ghc.name}"; - paths = stdenv.lib.filter (x: x ? ghc) (stdenv.lib.closePropagation packages) ++ [ghc]; + paths = stdenv.lib.filter isHaskellPkg (stdenv.lib.closePropagation packages) ++ [ghc]; + inherit ignoreCollisions; postBuild = '' . ${makeWrapper}/nix-support/setup-hook @@ -20,6 +46,7 @@ buildEnv { --add-flags '"-B$NIX_GHC_LIBDIR"' \ --set "NIX_GHC" "$out/bin/ghc" \ --set "NIX_GHCPKG" "$out/bin/ghc-pkg" \ + --set "NIX_GHC_DOCDIR" "${docDir}" \ --set "NIX_GHC_LIBDIR" "${libDir}" done @@ -29,12 +56,13 @@ buildEnv { --add-flags "-f $out/bin/ghc" \ --set "NIX_GHC" "$out/bin/ghc" \ --set "NIX_GHCPKG" "$out/bin/ghc-pkg" \ + --set "NIX_GHC_DOCDIR" "${docDir}" \ --set "NIX_GHC_LIBDIR" "${libDir}" done for prg in ghc-pkg ghc-pkg-${ghc.version}; do rm -f $out/bin/$prg - makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag} ${packageCfgDir}" + makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag}=${packageCfgDir}" done $out/bin/ghc-pkg recache diff --git a/pkgs/development/compilers/llvm/clang-tablegen-dir.patch b/pkgs/development/compilers/llvm/clang-tablegen-dir.patch new file mode 100644 index 00000000000..de6a468b239 --- /dev/null +++ b/pkgs/development/compilers/llvm/clang-tablegen-dir.patch @@ -0,0 +1,9 @@ +--- a/utils/TableGen/CMakeLists.txt (revision 190146) ++++ b/utils/TableGen/CMakeLists.txt (working copy) +@@ -1,4 +1,5 @@ + set(LLVM_LINK_COMPONENTS Support) ++set(LLVM_TOOLS_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) + + add_tablegen(clang-tblgen CLANG + ClangASTNodesEmitter.cpp + diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix index df58591973e..8c178c9ce03 100644 --- a/pkgs/development/compilers/llvm/clang.nix +++ b/pkgs/development/compilers/llvm/clang.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { buildInputs = [ perl llvm groff cmake libxml2 python ]; - patches = stdenv.lib.optional (stdenv.gcc.libc != null) ./clang-purity.patch; + patches = [ ./clang-tablegen-dir.patch ] ++ + stdenv.lib.optional (stdenv.gcc.libc != null) ./clang-purity.patch; cmakeFlags = [ "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" diff --git a/pkgs/development/compilers/scala/2.9.nix b/pkgs/development/compilers/scala/2.9.nix new file mode 100644 index 00000000000..a7c9dbc9073 --- /dev/null +++ b/pkgs/development/compilers/scala/2.9.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl }: + +# at runtime, need jre or jdk + +stdenv.mkDerivation rec { + name = "scala-2.9.2"; + + src = fetchurl { + url = "http://www.scala-lang.org/downloads/distrib/files/${name}.tgz"; + sha256 = "0s1shpzw2hyz7bwxdqq19rcrzbpq4d7b0kvdvjvhy7h05x496b46"; + }; + + installPhase = '' + mkdir -p $out + rm bin/*.bat + rm lib/scalacheck.jar + mv * $out + ''; + + meta = { + description = "Scala is a general purpose programming language"; + longDescription = '' + Scala is a general purpose programming language designed to express + common programming patterns in a concise, elegant, and type-safe way. + It smoothly integrates features of object-oriented and functional + languages, enabling Java and other programmers to be more productive. + Code sizes are typically reduced by a factor of two to three when + compared to an equivalent Java application. + ''; + homepage = http://www.scala-lang.org/; + license = "BSD"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index a7c9dbc9073..c128baf5100 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -1,20 +1,23 @@ -{ stdenv, fetchurl }: - -# at runtime, need jre or jdk +{ stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "scala-2.9.2"; + name = "scala-2.10.3"; src = fetchurl { - url = "http://www.scala-lang.org/downloads/distrib/files/${name}.tgz"; - sha256 = "0s1shpzw2hyz7bwxdqq19rcrzbpq4d7b0kvdvjvhy7h05x496b46"; + url = "http://www.scala-lang.org/files/archive/${name}.tgz"; + sha256 = "16ac935wydrxrvijv4ldnz4vl2xk8yb3yzb9bsi3nb9sic7fxl95"; }; + buildInputs = [ jre makeWrapper ] ; + installPhase = '' mkdir -p $out rm bin/*.bat - rm lib/scalacheck.jar mv * $out + + for p in $(ls $out/bin/) ; do + wrapProgram $out/bin/$p --prefix PATH ":" ${jre}/bin ; + done ''; meta = { diff --git a/pkgs/development/interpreters/erlang/R16B01.nix b/pkgs/development/interpreters/erlang/default.nix index 168db4484b1..9562a0dc452 100644 --- a/pkgs/development/interpreters/erlang/R16B01.nix +++ b/pkgs/development/interpreters/erlang/default.nix @@ -4,14 +4,13 @@ assert wxSupport -> mesa != null && wxGTK != null && xlibs != null; -let version = "16B01"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "erlang-" + version; + version = "R16B02"; src = fetchurl { - url = "http://www.erlang.org/download/otp_src_R16B01.tar.gz"; - sha256 = "1h5b2mil79z307mc7ammi38qnd8f50n3sv5vyl4d1gcfgg08nf6s"; + url = "http://www.erlang.org/download/otp_src_${version}.tar.gz"; + sha256 = "119gnf3jfd98hpxxqs8vnzrc81myv07y302b99alalqqz0fsvf3a"; }; buildInputs = diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix new file mode 100644 index 00000000000..e5e3aed8d12 --- /dev/null +++ b/pkgs/development/interpreters/luajit/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl} : + +stdenv.mkDerivation rec{ + version = "2.0.2"; + name = "LuaJIT-${version}"; + + src = fetchurl { + url="http://luajit.org/download/${name}.tar.gz"; + sha256="0f3cykihfdn3gi6na9p0xjd4jnv26z18m441n5vyg42q9abh4ln0"; + }; + + installPhase = '' + mkdir -p $out + make install PREFIX=$out + ''; + + meta = { + description= "Just-in-time compiler and interpreter for lua 5.1."; + homepage = http://luajit.org; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 3edf25b0cd9..1e3d73fa884 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.20"; + version = "5.4.21"; name = "php-${version}"; @@ -235,7 +235,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 = "1qarcxj46rzkmql3w2dln0hxzs349ph31fxcslizxch1ig7l43nd"; + sha256 = "1v2nqvgb0lvja4as5361ja3ry8ja7ib38wzia34g7inw3bp7r3za"; name = "php-${version}.tar.bz2"; }; diff --git a/pkgs/development/interpreters/pypy/2.1/default.nix b/pkgs/development/interpreters/pypy/2.2/default.nix index f80a1dc7242..b418b50c089 100644 --- a/pkgs/development/interpreters/pypy/2.1/default.nix +++ b/pkgs/development/interpreters/pypy/2.2/default.nix @@ -5,7 +5,7 @@ assert zlibSupport -> zlib != null; let - majorVersion = "2.1"; + majorVersion = "2.2"; version = "${majorVersion}"; pythonVersion = "2.7"; libPrefix = "pypy${majorVersion}"; @@ -17,7 +17,7 @@ let src = fetchurl { url = "https://bitbucket.org/pypy/pypy/downloads/pypy-${version}-src.tar.bz2"; - sha256 = "05vz7ya6jh5pw5yl607cf1rvdhwxj5d4ip0vpgb1gc9rjxn0dcri"; + sha256 = "0kp0922d1739v3fqnxhrbwz1fg651dc5dmk3199ikq1rc2wgrzsh"; }; buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite ] diff --git a/pkgs/development/interpreters/pypy/2.1/setup-hook.sh b/pkgs/development/interpreters/pypy/2.2/setup-hook.sh index 87874f0370b..35f4915569e 100644 --- a/pkgs/development/interpreters/pypy/2.1/setup-hook.sh +++ b/pkgs/development/interpreters/pypy/2.2/setup-hook.sh @@ -1,12 +1,12 @@ addPythonPath() { - addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.1/site-packages + addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.2/site-packages } toPythonPath() { local paths="$1" local result= for i in $paths; do - p="$i/lib/pypy2.1/site-packages" + p="$i/lib/pypy2.2/site-packages" result="${result}${result:+:}$p" done echo $result diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index 1699690749f..34af23740d5 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -1,25 +1,28 @@ -{ stdenv, python, buildEnv, makeWrapper, recursivePthLoader, extraLibs ? [] }: +{ stdenv, python, buildEnv, makeWrapper, recursivePthLoader, extraLibs ? [], postBuild ? "" +, stdLibs ? stdenv.lib.attrValues python.modules +}: # Create a python executable that knows about additional packages. (buildEnv { name = "python-${python.version}-wrapper"; - paths = extraLibs ++ [ python makeWrapper recursivePthLoader ]; + paths = stdenv.lib.filter (x : x ? pythonPath) (stdenv.lib.closePropagation extraLibs) ++ stdLibs ++ [ python recursivePthLoader ]; ignoreCollisions = false; postBuild = '' . "${makeWrapper}/nix-support/setup-hook" + if [ -L "$out/bin" ]; then unlink "$out/bin" fi mkdir -p "$out/bin" + 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 - ''; + '' + postBuild; }) // { inherit python; inherit (python) meta; diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index f0cfa7b0152..761aeb921cc 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -12,7 +12,7 @@ g: # Get dependencies from patched gems activesupport = g.activesupport_4_0_0; addressable = g.addressable_2_3_5; arel = g.arel_4_0_0; - atomic = g.atomic_1_1_13; + atomic = g.atomic_1_1_14; atoulme_Antwrap = g.atoulme_Antwrap_0_7_4; autotest_rails = g.autotest_rails_4_1_2; aws_sdk = g.aws_sdk_1_16_1; @@ -24,6 +24,9 @@ g: # Get dependencies from patched gems childprocess = g.childprocess_0_3_9; chronic = g.chronic_0_10_1; coderay = g.coderay_1_0_9; + coffee_rails = g.coffee_rails_4_0_1; + coffee_script = g.coffee_script_2_2_0; + coffee_script_source = g.coffee_script_source_1_6_3; cucumber = g.cucumber_1_3_8; daemons = g.daemons_1_1_9; diff_lcs = g.diff_lcs_1_1_3; @@ -35,6 +38,7 @@ g: # Get dependencies from patched gems ethon = g.ethon_0_6_1; eventmachine = g.eventmachine_1_0_3; eventmachine_tail = g.eventmachine_tail_0_6_4; + execjs = g.execjs_2_0_2; fakes3 = g.fakes3_0_1_5; faraday = g.faraday_0_8_8; faraday_middleware = g.faraday_middleware_0_9_0; @@ -50,6 +54,7 @@ g: # Get dependencies from patched gems http_cookie = g.http_cookie_1_0_1; i18n = g.i18n_0_6_5; iconv = g.iconv_1_0_3; + jquery_rails = g.jquery_rails_3_0_4; jruby_pageant = g.jruby_pageant_1_1_1; jsduck = g.jsduck_5_1_0; json = g.json_1_8_0; @@ -65,7 +70,8 @@ g: # Get dependencies from patched gems mini_portile = g.mini_portile_0_5_1; minitar = g.minitar_0_5_3; minitest = g.minitest_4_7_5; - multi_json = g.multi_json_1_7_9; + mono_logger = g.mono_logger_1_1_0; + multi_json = g.multi_json_1_8_2; multi_test = g.multi_test_0_0_2; multipart_post = g.multipart_post_1_2_0; net_http_digest_auth = g.net_http_digest_auth_1_4; @@ -84,14 +90,17 @@ g: # Get dependencies from patched gems pry = g.pry_0_9_12_2; pusher_client = g.pusher_client_0_3_1; rack = g.rack_1_5_2; - rack_protection = g.rack_protection_1_5_0; - rack_test = g.rack_test_0_6_2; + rack_protection = g.rack_protection_1_5_1; rails = g.rails_4_0_0; railties = g.railties_4_0_0; rake = g.rake_10_1_0; rb_fsevent = g.rb_fsevent_0_9_3; rdiscount = g.rdiscount_2_1_6; + redis = g.redis_3_0_5; + redis_namespace = g.redis_namespace_1_3_1; remote_syslog = g.remote_syslog_1_6_14; + resque = g.resque_1_25_1; + resque_web = g.resque_web_0_0_3; right_aws = g.right_aws_3_1_0; right_http_connection = g.right_http_connection_1_4_0; rjb = g.rjb_1_4_8; @@ -105,13 +114,14 @@ g: # Get dependencies from patched gems ruby_hmac = g.ruby_hmac_0_4_0; rubyforge = g.rubyforge_2_0_4; rubyzip = g.rubyzip_0_9_9; - sass = g.sass_3_2_10; + sass = g.sass_3_2_12; + sass_rails = g.sass_rails_4_0_1; selenium_webdriver = g.selenium_webdriver_2_35_1; servolux = g.servolux_0_10_0; - sinatra = g.sinatra_1_3_2; + sinatra = g.sinatra_1_4_4; slop = g.slop_3_4_6; sprockets = g.sprockets_2_10_0; - sprockets_rails = g.sprockets_rails_2_0_0; + sprockets_rails = g.sprockets_rails_2_0_1; syslog_protocol = g.syslog_protocol_0_9_2; systemu = g.systemu_2_5_2; taskjuggler = g.taskjuggler_3_5_0; @@ -120,19 +130,21 @@ g: # Get dependencies from patched gems text = g.text_1_2_3; thin = g.thin_1_5_1; thor = g.thor_0_18_1; - thread_safe = g.thread_safe_0_1_2; + thread_safe = g.thread_safe_0_1_3; tilt = g.tilt_1_4_1; tins = g.tins_0_9_0; travis = g.travis_1_5_3; treetop = g.treetop_1_4_15; trollop = g.trollop_2_0; + twitter_bootstrap_rails = g.twitter_bootstrap_rails_2_2_8; typhoeus = g.typhoeus_0_6_5; - tzinfo = g.tzinfo_0_3_37; + tzinfo = g.tzinfo_0_3_38; unf = g.unf_0_1_2; unf_ext = g.unf_ext_0_0_6; unicode = g.unicode_0_4_4; uuid = g.uuid_2_3_7; uuidtools = g.uuidtools_2_1_4; + vegas = g.vegas_0_1_11; webrobots = g.webrobots_0_1_1; websocket = g.websocket_1_0_7; xapian_full = g.xapian_full_1_2_3; @@ -282,6 +294,17 @@ database compatibility and query generation.''; requiredGems = [ ]; sha256 = ''0sdy8fcncm6p2cba3p8v7dnbsa4z41f4cs1dd0myf4fq7axrrh0s''; }; + atomic_1_1_14 = { + basename = ''atomic''; + meta = { + description = ''An atomic reference implementation for JRuby, Rubinius, and MRI''; + homepage = ''http://github.com/headius/ruby-atomic''; + longDescription = ''An atomic reference implementation for JRuby, Rubinius, and MRI''; + }; + name = ''atomic-1.1.14''; + requiredGems = [ ]; + sha256 = ''09dzi1gxr5yj273s6s6ss7l2sq4ayavpg95561kib3n4kzvxrhk4''; + }; atoulme_Antwrap_0_7_4 = { basename = ''atoulme_Antwrap''; meta = { @@ -468,6 +491,45 @@ for those one-off tasks, with a language that's a joy to use. requiredGems = [ ]; sha256 = ''1pbjsvd6r2daxd6aicp19fnb1j5z7fxadflsm1h0r33cy3vi7iy8''; }; + coffee_rails_4_0_1 = { + basename = ''coffee_rails''; + meta = { + description = ''CoffeeScript adapter for the Rails asset pipeline.''; + homepage = ''https://github.com/rails/coffee-rails''; + longDescription = ''CoffeeScript adapter for the Rails asset pipeline.''; + }; + name = ''coffee-rails-4.0.1''; + requiredGems = [ g.coffee_script_2_2_0 g.railties_4_0_0 ]; + sha256 = ''12nqw61xfs43qap4bxp123q4fgj41gvxirdal95ymdd2qzr3cvig''; + }; + coffee_script_2_2_0 = { + basename = ''coffee_script''; + meta = { + description = ''Ruby CoffeeScript Compiler''; + homepage = ''http://github.com/josh/ruby-coffee-script''; + longDescription = '' Ruby CoffeeScript is a bridge to the JS CoffeeScript compiler. +''; + }; + name = ''coffee-script-2.2.0''; + requiredGems = [ g.coffee_script_source_1_6_3 g.execjs_2_0_2 ]; + sha256 = ''133cp4znfp44wwnv12myw8s0z6qws74ilqmw88iwzkshg689zpdc''; + }; + coffee_script_source_1_6_3 = { + basename = ''coffee_script_source''; + meta = { + description = ''The CoffeeScript Compiler''; + homepage = ''http://jashkenas.github.com/coffee-script/''; + longDescription = '' CoffeeScript is a little language that compiles into JavaScript. + Underneath all of those embarrassing braces and semicolons, + JavaScript has always had a gorgeous object model at its heart. + CoffeeScript is an attempt to expose the good parts of JavaScript + in a simple way. +''; + }; + name = ''coffee-script-source-1.6.3''; + requiredGems = [ ]; + sha256 = ''0p33h0rdj1n8xhm2d5hzqbb8br6wn4rx0gk4hyhc6rxkaxsy79b4''; + }; cucumber_1_3_8 = { basename = ''cucumber''; meta = { @@ -649,6 +711,17 @@ using TCP/IP, especially if custom protocols are required.''; requiredGems = [ g.eventmachine_1_0_3 ]; sha256 = ''1pvlb34vdzd81kf9f3xyibb4f55xjqm7lqqy28dgyci5cyv50y61''; }; + execjs_2_0_2 = { + basename = ''execjs''; + meta = { + description = ''Run JavaScript code from Ruby''; + homepage = ''https://github.com/sstephenson/execjs''; + longDescription = ''ExecJS lets you run JavaScript code from Ruby.''; + }; + name = ''execjs-2.0.2''; + requiredGems = [ ]; + sha256 = ''167kbkyql7nvvwjsgdw5z8j66ngq7kc59gxfwsxhqi5fl1z0jbjs''; + }; fakes3_0_1_5 = { basename = ''fakes3''; meta = { @@ -854,6 +927,17 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ ]; sha256 = ''1nhjn07h2fqivdj6xqzi2x2kzh28vigx8z3q5fv2cqn9aqmbdacl''; }; + jquery_rails_3_0_4 = { + basename = ''jquery_rails''; + meta = { + description = ''Use jQuery with Rails 3''; + homepage = ''http://rubygems.org/gems/jquery-rails''; + longDescription = ''This gem provides jQuery and the jQuery-ujs driver for your Rails 3 application.''; + }; + name = ''jquery-rails-3.0.4''; + requiredGems = [ g.railties_4_0_0 g.thor_0_18_1 ]; + sha256 = ''0k13mcl9d0zxa2azml0d06y14ggk5yl2xvzsc9l2qv2cwc9xxajm''; + }; jruby_pageant_1_1_1 = { basename = ''jruby_pageant''; meta = { @@ -1133,6 +1217,17 @@ extract-method refactorings still apply.''; requiredGems = [ ]; sha256 = ''03p6iban9gcpcflzp4z901s1hgj9369p6515h967ny6hlqhcf2iy''; }; + mono_logger_1_1_0 = { + basename = ''mono_logger''; + meta = { + description = ''A lock-free logger compatible with Ruby 2.0.''; + homepage = ''http://github.com/steveklabnik/mono_logger''; + longDescription = ''A lock-free logger compatible with Ruby 2.0. Ruby does not allow you to request a lock in a trap handler because that could deadlock, so Logger is not sufficient.''; + }; + name = ''mono_logger-1.1.0''; + requiredGems = [ ]; + sha256 = ''18yplq3xxv5crwpfwbw2sb6brqd3g51si7x9fbh9bcimg4ipzayp''; + }; multi_json_1_7_9 = { basename = ''multi_json''; meta = { @@ -1144,6 +1239,17 @@ extract-method refactorings still apply.''; requiredGems = [ ]; sha256 = ''1q13ldcc8shlfisy90k19zrar87208gs3za6jmr78p11ip21picx''; }; + multi_json_1_8_2 = { + basename = ''multi_json''; + meta = { + description = ''A common interface to multiple JSON libraries.''; + homepage = ''http://github.com/intridea/multi_json''; + longDescription = ''A common interface to multiple JSON libraries, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, NSJSONSerialization, gson.rb, JrJackson, and OkJson.''; + }; + name = ''multi_json-1.8.2''; + requiredGems = [ ]; + sha256 = ''1ffmnwsfwdgspk86x1g98cq2ivqlgqpqngyrvs07zsnvgdimahdb''; + }; multi_test_0_0_2 = { basename = ''multi_test''; meta = { @@ -1409,6 +1515,17 @@ Also see http://rack.github.com/. requiredGems = [ g.rack_1_5_2 ]; sha256 = ''10wm67f2mp9pryg0s8qapbyxd2lcrpb8ywsbicg29cv2xprhbl4j''; }; + rack_protection_1_5_1 = { + basename = ''rack_protection''; + meta = { + description = ''You should use protection!''; + homepage = ''http://github.com/rkh/rack-protection''; + longDescription = ''You should use protection!''; + }; + name = ''rack-protection-1.5.1''; + requiredGems = [ g.rack_1_5_2 ]; + sha256 = ''0qxq5ld15nljxzdcx2wmbc3chw8nb6la1ap838vf263lnjcpx3dd''; + }; rack_test_0_6_2 = { basename = ''rack_test''; meta = { @@ -1499,6 +1616,34 @@ request helpers feature.''; requiredGems = [ ]; sha256 = ''180ln9gwxn0cyflg0i1viv7jyalmjqvqr34cb65xsmmsz1nz55q2''; }; + redis_3_0_5 = { + basename = ''redis''; + meta = { + description = ''A Ruby client library for Redis''; + homepage = ''https://github.com/redis/redis-rb''; + longDescription = '' A Ruby client that tries to match Redis' API one-to-one, while still + providing an idiomatic interface. It features thread-safety, + client-side sharding, pipelining, and an obsession for performance. +''; + }; + name = ''redis-3.0.5''; + requiredGems = [ ]; + sha256 = ''01gg3mgh3yznfhxschcka593a3ivsyw5g5vr0g5apiz4lfh6dlkn''; + }; + redis_namespace_1_3_1 = { + basename = ''redis_namespace''; + meta = { + description = ''Namespaces Redis commands.''; + homepage = ''http://github.com/resque/redis-namespace''; + longDescription = ''Adds a Redis::Namespace class which can be used to namespace calls +to Redis. This is useful when using a single instance of Redis with +multiple, different applications. +''; + }; + name = ''redis-namespace-1.3.1''; + requiredGems = [ g.redis_3_0_5 ]; + sha256 = ''1l6a64z09ni5pi6mbgvsph0lp14cnp180aj7mxnq2nb38sig4iw5''; + }; remote_syslog_1_6_14 = { basename = ''remote_syslog''; meta = { @@ -1510,6 +1655,42 @@ request helpers feature.''; requiredGems = [ g.servolux_0_10_0 g.file_tail_1_0_12 g.eventmachine_1_0_3 g.eventmachine_tail_0_6_4 g.syslog_protocol_0_9_2 g.em_resolv_replace_1_1_3 ]; sha256 = ''1f2yjyqhbdc4vlx52zli1b33f6yn8qc1kd4n0dpv27zswj9qfdkr''; }; + resque_1_25_1 = { + basename = ''resque''; + meta = { + description = ''Resque is a Redis-backed queueing system.''; + homepage = ''http://github.com/defunkt/resque''; + longDescription = '' Resque is a Redis-backed Ruby library for creating background jobs, + placing those jobs on multiple queues, and processing them later. + + Background jobs can be any Ruby class or module that responds to + perform. Your existing classes can easily be converted to background + jobs or you can create new classes specifically to do work. Or, you + can do both. + + Resque is heavily inspired by DelayedJob (which rocks) and is + comprised of three parts: + + * A Ruby library for creating, querying, and processing jobs + * A Rake task for starting a worker which processes jobs + * A Sinatra app for monitoring queues, jobs, and workers. +''; + }; + name = ''resque-1.25.1''; + requiredGems = [ g.redis_namespace_1_3_1 g.vegas_0_1_11 g.sinatra_1_4_4 g.multi_json_1_8_2 g.mono_logger_1_1_0 ]; + sha256 = ''0p9kpj900cyb888wmpqx6ms9b0hza09glr4cvrwqwp1vqya25lpy''; + }; + resque_web_0_0_3 = { + basename = ''resque_web''; + meta = { + description = ''Rails-based Resque web interface''; + homepage = ''https://github.com/resque/resque-web''; + longDescription = ''A Rails-based frontend to the Resque job queue system.''; + }; + name = ''resque-web-0.0.3''; + requiredGems = [ g.resque_1_25_1 g.twitter_bootstrap_rails_2_2_8 g.jquery_rails_3_0_4 g.sass_rails_4_0_1 g.coffee_rails_4_0_1 ]; + sha256 = ''1v4g0zrlq9n0pkhdiwxqcmis5p8hpxm475vchldk63mi1vy4fvr2''; + }; right_aws_3_1_0 = { basename = ''right_aws''; meta = { @@ -1739,6 +1920,32 @@ Originally written by Daiki Ueno. Converted to a RubyGem by Geoffrey Grosenbach' requiredGems = [ ]; sha256 = ''0anfff4hz8fz1wbimmp9vv4mjfl1swg7ww74j549788x41l4x283''; }; + sass_3_2_12 = { + basename = ''sass''; + meta = { + description = ''A powerful but elegant CSS compiler that makes CSS fun again.''; + homepage = ''http://sass-lang.com/''; + longDescription = '' Sass makes CSS fun again. Sass is an extension of CSS3, adding + nested rules, variables, mixins, selector inheritance, and more. + It's translated to well-formatted, standard CSS using the + command line tool or a web-framework plugin. +''; + }; + name = ''sass-3.2.12''; + requiredGems = [ ]; + sha256 = ''074118ia17nx68i97mbkly2f08y57j52b2yfhdc3s02s4s5593f8''; + }; + sass_rails_4_0_1 = { + basename = ''sass_rails''; + meta = { + description = ''Sass adapter for the Rails asset pipeline.''; + homepage = ''https://github.com/rails/sass-rails''; + longDescription = ''Sass adapter for the Rails asset pipeline.''; + }; + name = ''sass-rails-4.0.1''; + requiredGems = [ g.sass_3_2_12 g.railties_4_0_0 g.sprockets_rails_2_0_1 ]; + sha256 = ''01sacnipgvl7ad39zzbr6iip6jja7blxfbpjg2dnm6w8gi6smxh1''; + }; selenium_webdriver_2_35_1 = { basename = ''selenium_webdriver''; meta = { @@ -1775,6 +1982,17 @@ interpreters.''; requiredGems = [ g.rack_1_5_2 g.rack_protection_1_5_0 g.tilt_1_4_1 ]; sha256 = ''05blf915zpiwyz7agcn9rwdmddwxz0z4l3gd4qlqmrgd2vkw4sxc''; }; + sinatra_1_4_4 = { + basename = ''sinatra''; + meta = { + description = ''Classy web-development dressed in a DSL''; + homepage = ''http://www.sinatrarb.com/''; + longDescription = ''Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort.''; + }; + name = ''sinatra-1.4.4''; + requiredGems = [ g.rack_1_5_2 g.tilt_1_4_1 g.rack_protection_1_5_1 ]; + sha256 = ''12iy0f92d3zyk4759flgcracrbzc3x6cilpgdkzhzgjrsm9aa5hs''; + }; slop_3_4_6 = { basename = ''slop''; meta = { @@ -1807,6 +2025,16 @@ interpreters.''; requiredGems = [ g.sprockets_2_10_0 g.actionpack_4_0_0 g.activesupport_4_0_0 ]; sha256 = ''068w0ly7x1vciy4j6mwgsnz6a983pld4rzk1fpvfsmkdqcizb20x''; }; + sprockets_rails_2_0_1 = { + basename = ''sprockets_rails''; + meta = { + description = ''Sprockets Rails integration''; + homepage = ''https://github.com/rails/sprockets-rails''; + }; + name = ''sprockets-rails-2.0.1''; + requiredGems = [ g.sprockets_2_10_0 g.actionpack_4_0_0 g.activesupport_4_0_0 ]; + sha256 = ''170llk1qsvzhhslmasqk4hp5lrv9ibwy44q32yg6kn9s7sh0c1wy''; + }; syslog_protocol_0_9_2 = { basename = ''syslog_protocol''; meta = { @@ -1914,6 +2142,17 @@ management. requiredGems = [ g.atomic_1_1_13 ]; sha256 = ''1bxyh5l11inadbk7pjyz5s98g24qj8xavh55bc56nrzj51y9aavy''; }; + thread_safe_0_1_3 = { + basename = ''thread_safe''; + meta = { + description = ''A collection of data structures and utilities to make thread-safe programming in Ruby easier''; + homepage = ''https://github.com/headius/thread_safe''; + longDescription = ''Thread-safe collections and utilities for Ruby''; + }; + name = ''thread_safe-0.1.3''; + requiredGems = [ g.atomic_1_1_14 ]; + sha256 = ''0f2w62x5nx95d2c2lrn9v4g60xhykf8zw7jaddkrgal913dzifgq''; + }; tilt_1_4_1 = { basename = ''tilt''; meta = { @@ -1972,6 +2211,17 @@ specify.''; requiredGems = [ ]; sha256 = ''0iz5k7ax7a5jm9x6p81k6f4mgp48wxxb0j55ypnwxnznih8fsghz''; }; + twitter_bootstrap_rails_2_2_8 = { + basename = ''twitter_bootstrap_rails''; + meta = { + description = ''Bootstrap CSS toolkit for Rails 3.1 Asset Pipeline''; + homepage = ''https://github.com/seyhunak/twitter-bootstrap-rails''; + longDescription = ''twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for Rails 3.1 Asset Pipeline''; + }; + name = ''twitter-bootstrap-rails-2.2.8''; + requiredGems = [ g.railties_4_0_0 g.actionpack_4_0_0 g.execjs_2_0_2 g.rails_4_0_0 ]; + sha256 = ''06n836l2kj5ld7w6b1pb5q423mhqnahf4phk5ai5vl927p4g3bgy''; + }; typhoeus_0_6_5 = { basename = ''typhoeus''; meta = { @@ -1994,6 +2244,17 @@ specify.''; requiredGems = [ ]; sha256 = ''0pi2vabsg73h6z4wfwyd27k63issp2qp1nh0vd74rdk740gmb3kc''; }; + tzinfo_0_3_38 = { + basename = ''tzinfo''; + meta = { + description = ''Daylight-savings aware timezone library''; + homepage = ''http://tzinfo.github.io''; + longDescription = ''TZInfo is a Ruby library that uses the standard tz (Olson) database to provide daylight savings aware transformations between times in different time zones.''; + }; + name = ''tzinfo-0.3.38''; + requiredGems = [ ]; + sha256 = ''1s339ravgk0rqm5dhv1l0yi81sczjvdiryn8ihi2czkb0md55j68''; + }; unf_0_1_2 = { basename = ''unf''; meta = { @@ -2054,6 +2315,17 @@ to Ruby/JRuby. requiredGems = [ ]; sha256 = ''1w0bhnkp5515f3yx5fakfrfkawxjpb4fjm1r2c6lk691xlr696s3''; }; + vegas_0_1_11 = { + basename = ''vegas''; + meta = { + description = ''Vegas aims to solve the simple problem of creating executable versions of Sinatra/Rack apps.''; + homepage = ''http://code.quirkey.com/vegas''; + longDescription = ''Vegas aims to solve the simple problem of creating executable versions of Sinatra/Rack apps. It includes a class Vegas::Runner that wraps Rack/Sinatra applications and provides a simple command line interface and launching mechanism.''; + }; + name = ''vegas-0.1.11''; + requiredGems = [ g.rack_1_5_2 ]; + sha256 = ''0kzv0v1zb8vvm188q4pqwahb6468bmiamn6wpsbiq6r5i69s1bs5''; + }; webrobots_0_1_1 = { basename = ''webrobots''; meta = { diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 7bc27362a29..c3b33dfaf62 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -16,18 +16,17 @@ 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 + --disable-oss --disable-x11-shared + --disable-pulseaudio-shared --disable-alsa-shared ${if alsaSupport then "--with-alsa-prefix=${attrs.alsaLib}/lib" else ""} ''; in stdenv.mkDerivation rec { - name = "SDL2-2.0.0"; + name = "SDL2-2.0.1"; src = fetchurl { url = "http://www.libsdl.org/release/${name}.tar.gz"; - sha256 = "0y3in99brki7vc2mb4c0w39v70mf4h341mblhh8nmq4h7lawhskg"; + sha256 = "1w1jcz7hilk4fl8wlhiwvd1licg8lwy0brqz05562xv7l81fkrqa"; }; # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. @@ -38,6 +37,9 @@ stdenv.mkDerivation rec { stdenv.lib.optional openglSupport [ mesa ] ++ stdenv.lib.optional alsaSupport alsaLib; + # https://bugzilla.libsdl.org/show_bug.cgi?id=1431 + dontDisableStatic = true; + # 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'. @@ -47,10 +49,17 @@ stdenv.mkDerivation rec { configureFlags = configureFlagsFun { alsaLib = alsaLib.crossDrv; }; }; + postInstall = '' + rm $out/lib/*.a + ''; + passthru = {inherit openglSupport;}; meta = { description = "A cross-platform multimedia library"; homepage = http://www.libsdl.org/; + license = stdenv.lib.licenses.zlib; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.page ]; }; } diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix index 0ddb1aaa749..7dfc6a60a99 100644 --- a/pkgs/development/libraries/aqbanking/default.nix +++ b/pkgs/development/libraries/aqbanking/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { maintainers = [ stdenv.lib.maintainers.urkud ]; # Tries to install gwenhywfar plugin, thus `make install` fails - platforms = []; + hydraPlatforms = []; }; } diff --git a/pkgs/development/libraries/aterm/2.5.nix b/pkgs/development/libraries/aterm/2.5.nix index f116da12643..df509943ba2 100644 --- a/pkgs/development/libraries/aterm/2.5.nix +++ b/pkgs/development/libraries/aterm/2.5.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation { homepage = http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATerm; license = "LGPL"; description = "Library for manipulation of term data structures in C"; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + maintainers = stdenv.lib.maintainers.eelco; }; } diff --git a/pkgs/development/libraries/aterm/2.8.nix b/pkgs/development/libraries/aterm/2.8.nix index 498b0244b87..6d4b13f165a 100644 --- a/pkgs/development/libraries/aterm/2.8.nix +++ b/pkgs/development/libraries/aterm/2.8.nix @@ -1,9 +1,9 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: let isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ; in -stdenv.mkDerivation ( { +stdenv.mkDerivation { name = "aterm-2.8"; src = fetchurl { @@ -23,9 +23,13 @@ stdenv.mkDerivation ( { # feel too serious to just ignore. doCheck = true; + dontStrip = isMingw; + meta = { homepage = http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATerm; license = "LGPL"; description = "Library for manipulation of term data structures in C"; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + maintainers = stdenv.lib.maintainers.eelco; }; -} // ( if isMingw then { dontStrip = true; } else {}) ) +} diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index b023ed68904..a93aaa5a43f 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { license = "LGPLv2+"; maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/boost/1.55.nix b/pkgs/development/libraries/boost/1.55.nix new file mode 100644 index 00000000000..3ae54c22be3 --- /dev/null +++ b/pkgs/development/libraries/boost/1.55.nix @@ -0,0 +1,91 @@ +{ stdenv, fetchurl, icu, expat, zlib, bzip2, python +, enableRelease ? true +, enableDebug ? false +, enableSingleThreaded ? false +, enableMultiThreaded ? true +, enableShared ? true +, enableStatic ? false +, enablePIC ? false +, enableExceptions ? false +, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) +}: + +let + + variant = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableRelease "release" ++ + stdenv.lib.optional enableDebug "debug"); + + threading = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableSingleThreaded "single" ++ + stdenv.lib.optional enableMultiThreaded "multi"); + + link = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableShared "shared" ++ + stdenv.lib.optional enableStatic "static"); + + # To avoid library name collisions + layout = if taggedLayout then "tagged" else "system"; + + cflags = if enablePIC && enableExceptions then + "cflags=\"-fPIC -fexceptions\" cxxflags=-fPIC linkflags=-fPIC" + else if enablePIC then + "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" + else if enableExceptions then + "cflags=-fexceptions" + else + ""; +in + +stdenv.mkDerivation { + name = "boost-1.55.0"; + + meta = { + homepage = "http://boost.org/"; + description = "Boost C++ Library Collection"; + license = "boost-license"; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_55_0.tar.bz2"; + sha256 = "0lkv5dzssbl5fmh2nkaszi8x9qbj80pr4acf9i26sj3rvlih1w7z"; + }; + + enableParallelBuilding = true; + + buildInputs = [icu expat zlib bzip2 python]; + + configureScript = "./bootstrap.sh"; + configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python"; + + buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install"; + + # normal install does not install bjam, this is a separate step + installPhase = '' + cd tools/build/v2 + sh bootstrap.sh + ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install + ''; + + crossAttrs = rec { + buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ]; + # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to + # override them. + propagatedBuildInputs = buildInputs; + # We want to substitute the contents of configureFlags, removing thus the + # usual --build and --host added on cross building. + preConfigure = '' + export configureFlags="--prefix=$out --without-icu" + ''; + buildPhase = '' + set -x + cat << EOF > user-config.jam + using gcc : cross : $crossConfig-g++ ; + EOF + ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.crossDrv}/include -sEXPAT_LIBPATH=${expat.crossDrv}/lib --layout=${layout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install + ''; + }; +} diff --git a/pkgs/development/libraries/boost/header-only-wrapper.nix b/pkgs/development/libraries/boost/header-only-wrapper.nix index d32462d3720..6027ea5c393 100644 --- a/pkgs/development/libraries/boost/header-only-wrapper.nix +++ b/pkgs/development/libraries/boost/header-only-wrapper.nix @@ -8,10 +8,7 @@ in stdenv.mkDerivation { name = "boost-headers-${version}"; - src = fetchurl { - url = "mirror://sourceforge/boost/${pkgid}.tar.bz2"; - sha256 = "07df925k56pbz3gvhxpx54aij34qd40a7sxw4im11brnwdyr4zh4"; - }; + src = boost.src; phases = [ "installPhase" ]; diff --git a/pkgs/development/libraries/caelum/default.nix b/pkgs/development/libraries/caelum/default.nix index e48ed5a7692..808310e326f 100644 --- a/pkgs/development/libraries/caelum/default.nix +++ b/pkgs/development/libraries/caelum/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { description = "Add-on for the OGRE, aimed to render atmospheric effects"; homepage = http://code.google.com/p/caelum/; license = "LGPLv2.1+"; + broken = true; }; } diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index f37195021fa..91af939db43 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -30,10 +30,8 @@ stdenv.mkDerivation rec { meta = { description = "A library for image loading and manipulation"; - homepage = http://library.gnome.org/devel/gdk-pixbuf/; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix new file mode 100644 index 00000000000..1e030d4d7ce --- /dev/null +++ b/pkgs/development/libraries/gtest/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, unzip, cmake}: + +stdenv.mkDerivation rec { + version = "1.7.0"; + name = "gtest-${version}"; + + src = fetchurl { + url = "https://googletest.googlecode.com/files/${name}.zip"; + sha256="03fnw3bizw9bcx7l5qy1vz7185g33d5pxqcb6aqxwlrzv26s2z14"; + }; + + buildInputs = [ unzip cmake ]; + + configurePhase = '' + mkdir build + cd build + cmake ../ -DCMAKE_INSTALL_PREFIX=$out + ''; + + installPhase = '' + mkdir -p $out/lib + cp -v libgtest.a libgtest_main.a $out/lib + cp -v -r ../include $out + ''; + + meta = { + description = "Google test: Google's framework for writing C++ tests."; + homepage = https://code.google.com/p/googletest/; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.zoomulator ]; + }; +} + diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix index 7eb519a045c..7724bc5cc3a 100644 --- a/pkgs/development/libraries/gts/default.nix +++ b/pkgs/development/libraries/gts/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { ''; maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/gurobi/default.nix b/pkgs/development/libraries/gurobi/default.nix deleted file mode 100644 index 4bdee56ae99..00000000000 --- a/pkgs/development/libraries/gurobi/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ 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 1202ab5825d..78e016c1582 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "An OpenType text shaping engine"; homepage = http://www.freedesktop.org/wiki/Software/HarfBuzz; maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/haskell/Chart-cairo/default.nix b/pkgs/development/libraries/haskell/Chart-cairo/default.nix index 99ab741be49..e28ff279083 100644 --- a/pkgs/development/libraries/haskell/Chart-cairo/default.nix +++ b/pkgs/development/libraries/haskell/Chart-cairo/default.nix @@ -1,13 +1,13 @@ -{ cabal, cairo, Chart, colour, dataDefaultClass, mtl, operational -, time +{ cabal, cairo, Chart, colour, dataDefaultClass, lens, mtl +, operational, time }: cabal.mkDerivation (self: { pname = "Chart-cairo"; - version = "1.0"; - sha256 = "0z5qhsq9v5sd32d18gl09svxic8n6s65v4nyq04zcp76219mhp55"; + version = "1.1"; + sha256 = "0pm8iwd83pn5ba0g3231zs7f39cdjr7n7k76cm642n4b0hf93fmb"; buildDepends = [ - cairo Chart colour dataDefaultClass mtl operational time + cairo Chart colour dataDefaultClass lens mtl operational time ]; meta = { homepage = "https://github.com/timbod7/haskell-chart/wiki"; diff --git a/pkgs/development/libraries/haskell/Chart-gtk/default.nix b/pkgs/development/libraries/haskell/Chart-gtk/default.nix index d97fdc21f03..0c2534c4c3b 100644 --- a/pkgs/development/libraries/haskell/Chart-gtk/default.nix +++ b/pkgs/development/libraries/haskell/Chart-gtk/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Chart-gtk"; - version = "1.0"; - sha256 = "06i53922hdc7dvh2a76ccvwrwfhvhji0ya8j4f2lddg5zckvp3yj"; + version = "1.1"; + sha256 = "1394h7jd8pk55396nz1xjisz4v7brqcf9fwdnw9g4q3x1b7dcgs8"; buildDepends = [ cairo Chart ChartCairo colour gtk mtl time ]; meta = { homepage = "https://github.com/timbod7/haskell-chart/wiki"; diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix index 0d9dd690758..50459dfa007 100644 --- a/pkgs/development/libraries/haskell/Chart/default.nix +++ b/pkgs/development/libraries/haskell/Chart/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Chart"; - version = "1.0"; - sha256 = "137njda84vxrj3pk12bmkf11wh8fj89nxpz067wrycrgw9xy5rd3"; + version = "1.1"; + sha256 = "136s44mbhf3wmg85rr9qr0kv59lq1lfd3l58a5aijpv9vz1isf7p"; buildDepends = [ colour dataDefaultClass lens mtl operational time ]; diff --git a/pkgs/development/libraries/haskell/HList/default.nix b/pkgs/development/libraries/haskell/HList/default.nix index 35b03f77dde..df2bfcf1f79 100644 --- a/pkgs/development/libraries/haskell/HList/default.nix +++ b/pkgs/development/libraries/haskell/HList/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, diffutils }: cabal.mkDerivation (self: { pname = "HList"; version = "0.2.3"; sha256 = "1efbe0c2cb361ab0a9d864a09f9c58075132cb50094207260cb1363fe73c2908"; + buildTools = [ diffutils ]; meta = { description = "Heterogeneous lists"; license = self.stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix index 8df2209ffbf..eb7c406e81e 100644 --- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix +++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HsOpenSSL"; - version = "0.10.3.4"; - sha256 = "1xgnzivphnzb4yf31406yg5fjycrfypwrlxi2s8lfzgja8m1l7h5"; + version = "0.10.3.5"; + sha256 = "1yvpvc9ylfqskdv0dqg6cl43w3wg7rggz0lwlrv04a45mrxygh80"; buildDepends = [ network time ]; extraLibraries = [ openssl ]; meta = { diff --git a/pkgs/development/libraries/haskell/HsSyck/default.nix b/pkgs/development/libraries/haskell/HsSyck/default.nix index 56e999d7b83..1c10075d13c 100644 --- a/pkgs/development/libraries/haskell/HsSyck/default.nix +++ b/pkgs/development/libraries/haskell/HsSyck/default.nix @@ -1,10 +1,10 @@ -{ cabal, syb, utf8String }: +{ cabal, hashtables, syb, utf8String }: cabal.mkDerivation (self: { pname = "HsSyck"; - version = "0.50"; - sha256 = "0ap675i2fngvd1nw1dk8p2fz4nbd2aq5ci8dsvpcjbp28y9j2blm"; - buildDepends = [ syb utf8String ]; + version = "0.51"; + sha256 = "13y5vbzrix33dzwhdrvng2ds2dnipkxn1h22jvbf47rwnkyh2g49"; + buildDepends = [ hashtables syb utf8String ]; meta = { description = "Fast, lightweight YAML loader and dumper"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/abstract-par/default.nix b/pkgs/development/libraries/haskell/abstract-par/default.nix index 033fc242321..537df70390c 100644 --- a/pkgs/development/libraries/haskell/abstract-par/default.nix +++ b/pkgs/development/libraries/haskell/abstract-par/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "abstract-par"; - version = "0.3.1"; - sha256 = "0qzv520823b07hrr49rnpzayh96m6cjrmb1cn9l0dn80j6k9xayk"; + version = "0.3.3"; + sha256 = "0q6qsniw4wks2pw6wzncb1p1j3k6al5njnvm2v5n494hplwqg2i4"; buildDepends = [ deepseq ]; meta = { homepage = "https://github.com/simonmar/monad-par"; diff --git a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix index cabfccc0266..d7e11f11ef0 100644 --- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix @@ -17,7 +17,7 @@ cabal.mkDerivation (self: { homepage = "https://github.com/AccelerateHS/accelerate-cuda/"; description = "Accelerate backend for NVIDIA GPUs"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.stdenv.lib.platforms.none; + platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/accelerate-examples/default.nix b/pkgs/development/libraries/haskell/accelerate-examples/default.nix index b9536052dd2..e48abc543f8 100644 --- a/pkgs/development/libraries/haskell/accelerate-examples/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-examples/default.nix @@ -23,7 +23,7 @@ cabal.mkDerivation (self: { homepage = "https://github.com/AccelerateHS/accelerate-examples"; description = "Examples using the Accelerate library"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.stdenv.lib.platforms.none; + platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/accelerate-fft/default.nix b/pkgs/development/libraries/haskell/accelerate-fft/default.nix index b3c1cb90b29..523e5ae1504 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.stdenv.lib.platforms.none; + platforms = self.ghc.meta.platforms; }; }) diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix index 1d6df75e5fa..322e411db8e 100644 --- a/pkgs/development/libraries/haskell/active/default.nix +++ b/pkgs/development/libraries/haskell/active/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "active"; - version = "0.1.0.8"; - sha256 = "1q2zrx1i5j04c9bss7c19nm6lqasmwxyfzkh49my7yaik95k7bw9"; + version = "0.1.0.9"; + sha256 = "0639qp4yc3dfvc9xcjk9k7qagvbcjwdgz3lklqsak9h551ccl7bv"; buildDepends = [ newtype semigroupoids semigroups vectorSpace ]; testDepends = [ newtype QuickCheck semigroupoids semigroups vectorSpace diff --git a/pkgs/development/libraries/haskell/bifunctors/default.nix b/pkgs/development/libraries/haskell/bifunctors/default.nix index d7c8fa6debb..5d13f3a384e 100644 --- a/pkgs/development/libraries/haskell/bifunctors/default.nix +++ b/pkgs/development/libraries/haskell/bifunctors/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "bifunctors"; - version = "4.1.0.1"; - sha256 = "1mf1v64g5pr2k1jpc7i4994ki2fp5vkxg4n5v84lfbl2r3kr92yg"; + version = "4.1.1"; + sha256 = "0apdnhfqn3xyi99d5ybc51y2i0gpxix5hlaqxgpbzr4b0zkk7c4w"; buildDepends = [ semigroupoids semigroups tagged ]; meta = { homepage = "http://github.com/ekmett/bifunctors/"; diff --git a/pkgs/development/libraries/haskell/cereal/default.nix b/pkgs/development/libraries/haskell/cereal/default.nix index 4770d5216e2..94b5033e7ef 100644 --- a/pkgs/development/libraries/haskell/cereal/default.nix +++ b/pkgs/development/libraries/haskell/cereal/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cereal"; - version = "0.4.0.0"; - sha256 = "0q6lrfa2p70mh3d08mbj89anc3p9ycy6wyyiycj5pm62kcimv7rj"; + version = "0.4.0.1"; + sha256 = "12g23cbjxxgh3xzv6hvs093zpycl29h8fmc7kv6jx43ws4cxy2jv"; meta = { description = "A binary serialization library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index ab41f5a5621..ffe52d0f9c7 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.8"; - sha256 = "0qsi9p7hwzaw1ridgydfmaagjjpkbgq755b1r9xm4apdy6fikcz5"; + version = "1.0.9"; + sha256 = "00xzy6iq98p0b8bqncj2xl1gzba1kr58xmfbc3s29bqg1sisvjsz"; buildDepends = [ liftedBase mmorph monadControl mtl resourcet text transformers transformersBase void diff --git a/pkgs/development/libraries/haskell/control-monad-loop/default.nix b/pkgs/development/libraries/haskell/control-monad-loop/default.nix new file mode 100644 index 00000000000..561564093b9 --- /dev/null +++ b/pkgs/development/libraries/haskell/control-monad-loop/default.nix @@ -0,0 +1,14 @@ +{ cabal, transformers, transformersBase }: + +cabal.mkDerivation (self: { + pname = "control-monad-loop"; + version = "0.1"; + sha256 = "003k4pp6wgn30m9ksbh8680f0klzsvd90wsl9jpqs9lpg14hi6zj"; + buildDepends = [ transformers transformersBase ]; + meta = { + homepage = "https://github.com/joeyadams/haskell-control-monad-loop"; + description = "Simple monad transformer for imperative-style loops"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/cpu/default.nix b/pkgs/development/libraries/haskell/cpu/default.nix index dc27553c2a3..3d8ba2784f5 100644 --- a/pkgs/development/libraries/haskell/cpu/default.nix +++ b/pkgs/development/libraries/haskell/cpu/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cpu"; - version = "0.1.1"; - sha256 = "0ygkxx8ksa0rh63569d3g0w8pzgwg6062sd4yyi3q646zcmryhj6"; + version = "0.1.2"; + sha256 = "0x19mlanmkg96h6h1i04w2i631z84y4rbk22ki4zhgsajysgw9sn"; isLibrary = true; isExecutable = true; meta = { diff --git a/pkgs/development/libraries/haskell/crypto-numbers/default.nix b/pkgs/development/libraries/haskell/crypto-numbers/default.nix index 68deb8e3472..7633c479e7c 100644 --- a/pkgs/development/libraries/haskell/crypto-numbers/default.nix +++ b/pkgs/development/libraries/haskell/crypto-numbers/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "crypto-numbers"; - version = "0.2.1"; - sha256 = "1bc24xk101x7npv083gzh3vjzwjh65ql85h4z0vxk3lnd0pmdmnq"; + version = "0.2.3"; + sha256 = "0nx2mlf40127j7vas7liqy2yzfg4alfaxcjilcxk99kavpaanzgp"; buildDepends = [ cryptoRandom vector ]; testDepends = [ byteable cryptoRandom HUnit QuickCheck testFramework diff --git a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix index a4f98e5a2a1..aa400c736cb 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "crypto-pubkey"; - version = "0.2.1"; - sha256 = "06cb2h9c3r1ycgcw7scc191gbr86qi8pxil07207n5fccq3vpjys"; + version = "0.2.2"; + sha256 = "084758n5fyh2aigd6055a75pnqjhx42sbjg36hhp2a40vhl7xr2f"; buildDepends = [ byteable cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandom ]; diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix index ac9e41fd628..fbe0ec0a20c 100644 --- a/pkgs/development/libraries/haskell/cuda/default.nix +++ b/pkgs/development/libraries/haskell/cuda/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cuda"; - version = "0.5.0.2"; - sha256 = "1if730wcww5qx5qki1ir0d576wwpwrh00krp1svgdlx2j50rmgq5"; + version = "0.5.1.0"; + sha256 = "1zsfsz8i05iq54wxj1maj6qqzv4ibr459h47knc7ds1qv4giwzhl"; buildTools = [ c2hs ]; extraLibraries = [ cudatoolkit nvidia_x11 self.stdenv.gcc ]; doCheck = false; @@ -31,9 +31,10 @@ cabal.mkDerivation (self: { ./Setup configure --verbose --prefix="$out" $libraryProfiling $extraLibDirs $configureFlags ''; meta = { + homepage = "https://github.com/tmcdonell/cuda"; description = "FFI binding to the CUDA interface for programming NVIDIA GPUs"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.stdenv.lib.platforms.none; + platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cufft/default.nix b/pkgs/development/libraries/haskell/cufft/default.nix index e9f1fe166bd..76039f06548 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.stdenv.lib.platforms.none; + platforms = self.ghc.meta.platforms; }; }) diff --git a/pkgs/development/libraries/haskell/dbus/default.nix b/pkgs/development/libraries/haskell/dbus/default.nix index e0072bd8446..a96f1499f97 100644 --- a/pkgs/development/libraries/haskell/dbus/default.nix +++ b/pkgs/development/libraries/haskell/dbus/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "dbus"; - version = "0.10.4"; - sha256 = "0cv4sgk1mdxc81jlky21k0y3zg7qii585xiapr1m589r5528gj2f"; + version = "0.10.5"; + sha256 = "1wblqkwlwv3bxhz2n4qm0w0npawng86y2hyacjxmx8cw25gkw41x"; buildDepends = [ cereal libxmlSax network parsec random text transformers vector xmlTypes diff --git a/pkgs/development/libraries/haskell/deepseq/1.3.0.1.nix b/pkgs/development/libraries/haskell/deepseq/1.3.0.2.nix index 78f9273e46a..3c6ce781dc2 100644 --- a/pkgs/development/libraries/haskell/deepseq/1.3.0.1.nix +++ b/pkgs/development/libraries/haskell/deepseq/1.3.0.2.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "deepseq"; - version = "1.3.0.1"; - sha256 = "068zka6rwprbzpx7yisi1ajsxdly23zaf2vjklx1wp66yypx54lp"; + version = "1.3.0.2"; + sha256 = "09jnfz5158s4fvlfjbz44vb5jsvflagmsrgbk846arymwym6b7bp"; meta = { description = "Deep evaluation of data structures"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/direct-sqlite/default.nix b/pkgs/development/libraries/haskell/direct-sqlite/default.nix new file mode 100644 index 00000000000..7dc259cef93 --- /dev/null +++ b/pkgs/development/libraries/haskell/direct-sqlite/default.nix @@ -0,0 +1,15 @@ +{ cabal, base16Bytestring, HUnit, text }: + +cabal.mkDerivation (self: { + pname = "direct-sqlite"; + version = "2.3.8"; + sha256 = "0qvqacjymrm6yy093p8biq3swdinh3lx75m27iz1p3ckdkw10lva"; + buildDepends = [ text ]; + testDepends = [ base16Bytestring HUnit text ]; + meta = { + homepage = "http://ireneknapp.com/software/"; + description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/dual-tree/default.nix b/pkgs/development/libraries/haskell/dual-tree/default.nix index c0896557e33..218855f322e 100644 --- a/pkgs/development/libraries/haskell/dual-tree/default.nix +++ b/pkgs/development/libraries/haskell/dual-tree/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "dual-tree"; - version = "0.1.0.4"; - sha256 = "0xrpb7kz6aazqy9w0b7hcbxgmy4ddy0zh7gdpv2w140vvyx5qjrn"; + version = "0.2"; + sha256 = "0wasnjkixl6zkskjp18qj3jym3yv3a85i3w5qphgjr3xifbzwnjf"; buildDepends = [ monoidExtras newtype semigroups ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix index 162b83733b1..67276b77c1d 100644 --- a/pkgs/development/libraries/haskell/fclabels/default.nix +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "fclabels"; - version = "2.0.0.2"; - sha256 = "1c706v10g4av7jxiw3x4n1hg9h7sbwcnrj676b1q0rcb3pd32kz6"; + version = "2.0.0.5"; + sha256 = "1xg0bvk6m981v05j3jp35hyclfilnic1q83kla8zlbnmdpqljqdb"; buildDepends = [ mtl transformers ]; meta = { homepage = "https://github.com/sebastiaanvisser/fclabels"; diff --git a/pkgs/development/libraries/haskell/free/default.nix b/pkgs/development/libraries/haskell/free/default.nix index 64d9541f401..a481d451973 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.1"; - sha256 = "16951r4f7ggvcw2qgjwdrmaxxnrmrm69c67nixs77lm1d31nks4w"; + version = "4.2"; + sha256 = "0g2k36xqma8r6shrih40w5xv0pgs5ldr9lhc5hjpwmh4n3hgdhfb"; buildDepends = [ bifunctors comonad distributive mtl profunctors semigroupoids semigroups transformers diff --git a/pkgs/development/libraries/haskell/html-conduit/default.nix b/pkgs/development/libraries/haskell/html-conduit/default.nix index eaf1754b622..3f7b2ad507a 100644 --- a/pkgs/development/libraries/haskell/html-conduit/default.nix +++ b/pkgs/development/libraries/haskell/html-conduit/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "html-conduit"; - version = "1.1.0"; - sha256 = "11mkr7plhbn8kyki0h362habzhsnlb7yrg4ypy48d0l3i7p7vm53"; + version = "1.1.0.1"; + sha256 = "0v3zlassakc34i7kzajx63s1rxn516xv7lrib0a4kn4cdlqn7kxs"; buildDepends = [ conduit filesystemConduit resourcet systemFilepath tagstreamConduit text transformers xmlConduit xmlTypes diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix index 35783c7762e..071471d906e 100644 --- a/pkgs/development/libraries/haskell/hxt/default.nix +++ b/pkgs/development/libraries/haskell/hxt/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hxt"; - version = "9.3.1.1"; - sha256 = "1x0z85vx49s2b9bgjm14c2152cwr0vzf02rlxrla5dj5g565985y"; + version = "9.3.1.2"; + sha256 = "0v4j9z65sbjs44n1ijy14f0l2swva6jqz89x2ibf89q8bx36sj6n"; buildDepends = [ binary deepseq filepath HUnit hxtCharproperties hxtRegexXmlschema hxtUnicode mtl network parsec diff --git a/pkgs/development/libraries/haskell/intervals/default.nix b/pkgs/development/libraries/haskell/intervals/default.nix index 788962412d7..5623b73527c 100644 --- a/pkgs/development/libraries/haskell/intervals/default.nix +++ b/pkgs/development/libraries/haskell/intervals/default.nix @@ -1,9 +1,11 @@ -{ cabal }: +{ cabal, distributive, doctest, filepath }: cabal.mkDerivation (self: { pname = "intervals"; - version = "0.3"; - sha256 = "1k8dhhwa6y5hrkm9np9x953bdn3pgk5c2lkl3zgrrmrwmd075422"; + version = "0.4"; + sha256 = "0w33arfv1hd3a3l4rvn67nh5q6w05jj6hjlbjmbmrjyhwg35jnac"; + buildDepends = [ distributive ]; + testDepends = [ doctest filepath ]; meta = { homepage = "http://github.com/ekmett/intervals"; description = "Interval Arithmetic"; diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix index 35d15c0291a..f4774ecd14b 100644 --- a/pkgs/development/libraries/haskell/language-c-quote/default.nix +++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "language-c-quote"; - version = "0.7.2"; - sha256 = "01ki78qh39gbd9md3pq783vx2p86gyzhclci7pcppz2rd3man51m"; + version = "0.7.5"; + sha256 = "1ms6bjcqm0mfv0kqznn68svclbpvbwy5rlni0b8i0axhwfgq1l73"; buildDepends = [ exceptionMtl exceptionTransformers filepath haskellSrcMeta mainlandPretty mtl srcloc syb symbol @@ -17,7 +17,7 @@ cabal.mkDerivation (self: { buildTools = [ alex happy ]; jailbreak = true; meta = { - homepage = "http://www.eecs.harvard.edu/~mainland/"; + homepage = "http://www.cs.drexel.edu/~mainland/"; description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix index dc970925f98..cfa51bd39aa 100644 --- a/pkgs/development/libraries/haskell/lifted-base/default.nix +++ b/pkgs/development/libraries/haskell/lifted-base/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "lifted-base"; - version = "0.2.1.0"; - sha256 = "0c4vzyfyjvqv5q8mprgxf9ckibpp5k1zh9k5slmdsd9m1l3pwwqy"; + version = "0.2.1.1"; + sha256 = "062mdh364c4adnyc3l037zi1aaqvgm43g1x6vf3pjb75c3sayc5k"; buildDepends = [ baseUnicodeSymbols monadControl transformersBase ]; diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.4.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.4.nix new file mode 100644 index 00000000000..4f255e893af --- /dev/null +++ b/pkgs/development/libraries/haskell/parallel/3.2.0.4.nix @@ -0,0 +1,14 @@ +{ cabal, deepseq }: + +cabal.mkDerivation (self: { + pname = "parallel"; + version = "3.2.0.4"; + sha256 = "0v8l2rbczjadynbz4q4r00k8a1mqj70y63zbklpxckafq1zn7nwc"; + buildDepends = [ deepseq ]; + meta = { + description = "Parallel programming library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/parseargs/default.nix b/pkgs/development/libraries/haskell/parseargs/default.nix index 2a481246e88..a421338624c 100644 --- a/pkgs/development/libraries/haskell/parseargs/default.nix +++ b/pkgs/development/libraries/haskell/parseargs/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "parseargs"; - version = "0.1.3.5"; - sha256 = "1ig1n2nnicmy71qwcl5hkdk4mvwq0mz6zr5h9kw329lgvr9cyzyc"; + version = "0.1.5.2"; + sha256 = "0pzw7w1kr2rv6ffqgn93rypn37wy2r5k01p3y5256laaplm575am"; isLibrary = true; isExecutable = true; meta = { - homepage = "http://wiki.cs.pdx.edu/bartforge/parseargs"; + homepage = "http://github.com/BartMassey/parseargs"; description = "Command-line argument parsing library for Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/parsers/0.10.nix b/pkgs/development/libraries/haskell/parsers/0.10.1.1.nix index 529fdf47124..db79c81a62d 100644 --- a/pkgs/development/libraries/haskell/parsers/0.10.nix +++ b/pkgs/development/libraries/haskell/parsers/0.10.1.1.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "parsers"; - version = "0.10"; - sha256 = "090dvmdb1kmnc3k2x170y9fdifxi16hzkij1gzc51flx3bpx40i1"; + version = "0.10.1.1"; + sha256 = "1w3dj3r2l0w54rafngrp7r1spqznbj5yzilkprqxvbvvj3jxgn5a"; buildDepends = [ charset parsec text transformers unorderedContainers ]; diff --git a/pkgs/development/libraries/haskell/pem/default.nix b/pkgs/development/libraries/haskell/pem/default.nix index 473f15c4d1f..0c331e1bda5 100644 --- a/pkgs/development/libraries/haskell/pem/default.nix +++ b/pkgs/development/libraries/haskell/pem/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "pem"; - version = "0.2.0"; - sha256 = "1hmsyavqzjx1chbn4a8vf0r2wz2fg0xl9cxgja4ap04si3qr458v"; + version = "0.2.1"; + sha256 = "05ln372ad89993v07q108l9al8jgjpzardpl02pziwwacdcj1j17"; buildDepends = [ base64Bytestring mtl ]; testDepends = [ HUnit QuickCheck testFramework testFrameworkHunit diff --git a/pkgs/development/libraries/haskell/pipes-parse/default.nix b/pkgs/development/libraries/haskell/pipes-parse/default.nix index 33892ef8fc6..61c0f34a57e 100644 --- a/pkgs/development/libraries/haskell/pipes-parse/default.nix +++ b/pkgs/development/libraries/haskell/pipes-parse/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pipes-parse"; - version = "2.0.1"; - sha256 = "04sqjdmgkgk5qva0gyrblhdvmljgmci2yzzw7y17pmnwxwdja4f0"; + version = "2.0.2"; + sha256 = "1jcws5i9jhh4i6bh2j6m9pz1462qm05byibkkxfqvyx392sxy4wz"; buildDepends = [ free pipes transformers ]; meta = { description = "Parsing infrastructure for the pipes ecosystem"; diff --git a/pkgs/development/libraries/haskell/process-conduit/default.nix b/pkgs/development/libraries/haskell/process-conduit/default.nix new file mode 100644 index 00000000000..45ac4495166 --- /dev/null +++ b/pkgs/development/libraries/haskell/process-conduit/default.nix @@ -0,0 +1,19 @@ +{ cabal, conduit, controlMonadLoop, hspec, mtl, shakespeareText +, text +}: + +cabal.mkDerivation (self: { + pname = "process-conduit"; + version = "1.0.0.1"; + sha256 = "1b1bya316gxj3rgn7qpjmmcllgy9aac69rqw664sw1rnypnic780"; + buildDepends = [ + conduit controlMonadLoop mtl shakespeareText text + ]; + testDepends = [ conduit hspec ]; + meta = { + homepage = "http://github.com/tanakh/process-conduit"; + description = "Conduits for processes"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix index ef7a6d69905..5f7640320f6 100644 --- a/pkgs/development/libraries/haskell/shake/default.nix +++ b/pkgs/development/libraries/haskell/shake/default.nix @@ -1,11 +1,11 @@ -{ cabal, binary, deepseq, filepath, hashable, random, time -, transformers, unorderedContainers, utf8String +{ cabal, binary, deepseq, filepath, hashable, QuickCheck, random +, time, transformers, unorderedContainers, utf8String }: cabal.mkDerivation (self: { pname = "shake"; - version = "0.10.8"; - sha256 = "15r392b18nis9p0ys95kbj79hki19wid2gyrpy0z9zm2l5d1m3ya"; + version = "0.10.9"; + sha256 = "08czcf0pkchq558kjkfpz7vf5pn1dbqk8mb9fnivnphy963sf6sr"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -13,12 +13,11 @@ cabal.mkDerivation (self: { unorderedContainers utf8String ]; testDepends = [ - binary deepseq filepath hashable random time transformers - unorderedContainers utf8String + binary deepseq filepath hashable QuickCheck random time + transformers unorderedContainers utf8String ]; - doCheck = false; meta = { - homepage = "http://community.haskell.org/~ndm/shake/"; + homepage = "https://github.com/ndmitchell/shake"; description = "Build system library, like Make, but more accurate dependencies"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index 52da653da3e..e35241d46ec 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "snap-core"; - version = "0.9.4.1"; - sha256 = "0yacbpd20y49jw1qkrm5r4qick0fhimgb07883bg1lp3ai4ysrk5"; + version = "0.9.5.0"; + sha256 = "1i5xmgfy807rm6f47l7p7z99nw9bq8vldlfvzi1gxzz8ic80slm4"; buildDepends = [ attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator bytestringMmap caseInsensitive deepseq enumerator filepath hashable diff --git a/pkgs/development/libraries/haskell/system-posix-redirect/default.nix b/pkgs/development/libraries/haskell/system-posix-redirect/default.nix index b8a65e41fd8..b0ccd4b4d84 100644 --- a/pkgs/development/libraries/haskell/system-posix-redirect/default.nix +++ b/pkgs/development/libraries/haskell/system-posix-redirect/default.nix @@ -2,10 +2,10 @@ cabal.mkDerivation (self: { pname = "system-posix-redirect"; - version = "1.1"; - sha256 = "08l8n671ypmharmkm9s8wv5ipcznn7hv5zadf96liml3v16d8fcr"; + version = "1.1.0.1"; + sha256 = "1wkfz898d3607xnx779l1k1qc8i2k63ixg47542r45scwq8m0lsk"; meta = { - description = "A toy module that allows you to temporarily redirect a program's stdout"; + description = "A toy module to temporarily redirect a program's stdout"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index df14857f9ab..556ee2b65bf 100644 --- a/pkgs/development/libraries/haskell/tasty/default.nix +++ b/pkgs/development/libraries/haskell/tasty/default.nix @@ -1,13 +1,13 @@ -{ cabal, ansiTerminal, mtl, optparseApplicative, regexPosix, stm -, tagged +{ cabal, ansiTerminal, deepseq, mtl, optparseApplicative +, regexPosix, stm, tagged }: cabal.mkDerivation (self: { pname = "tasty"; - version = "0.3.1"; - sha256 = "0ipndrpywzg40s5hiwyyly29mcppcfqbbpwqqp4apma57m8cdpb0"; + version = "0.4.0.1"; + sha256 = "04nnjg04520lvjm8h2ma0ihm4bz6p0ppk445i8gmn82ixwan76h0"; buildDepends = [ - ansiTerminal mtl optparseApplicative regexPosix stm tagged + ansiTerminal deepseq mtl optparseApplicative regexPosix stm tagged ]; meta = { description = "Modern and extensible testing framework"; diff --git a/pkgs/development/libraries/haskell/terminfo/default.nix b/pkgs/development/libraries/haskell/terminfo/default.nix index 24221912025..f772de7c8a1 100644 --- a/pkgs/development/libraries/haskell/terminfo/default.nix +++ b/pkgs/development/libraries/haskell/terminfo/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "terminfo"; - version = "0.3.2.5"; - sha256 = "1hadb1gv28c43xq78scalb4zzvbs6im2s0hq7ycrbsdgm6iryhbg"; + version = "0.3.2.6"; + sha256 = "0ag81rwwwaanxdn9ccanvdi1qnh62vy8y2jbgp5bp95hhgqq887f"; extraLibraries = [ ncurses ]; meta = { homepage = "http://code.haskell.org/terminfo"; diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index cb346ac7d27..a129ae46a35 100644 --- a/pkgs/development/libraries/haskell/texmath/default.nix +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "texmath"; - version = "0.6.4"; - sha256 = "090xqs14ap3c6pljqzyva46phxb1lhqayi4g098f6d77d1ygvshf"; + version = "0.6.5.2"; + sha256 = "1pvaf40avjx43ydhi9n6vkkjw9gk5apws4bgqqq2g601kvmi163l"; isLibrary = true; isExecutable = true; buildDepends = [ pandocTypes parsec syb xml ]; diff --git a/pkgs/development/libraries/haskell/text-icu/default.nix b/pkgs/development/libraries/haskell/text-icu/default.nix index 16115809f5b..6dc42beee40 100644 --- a/pkgs/development/libraries/haskell/text-icu/default.nix +++ b/pkgs/development/libraries/haskell/text-icu/default.nix @@ -1,13 +1,19 @@ -{ cabal, icu, text }: +{ cabal, deepseq, HUnit, icu, QuickCheck, random, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, text +}: cabal.mkDerivation (self: { pname = "text-icu"; - version = "0.6.3.5"; - sha256 = "1blfw9377yl732ypbjhkvi3vfg6c1f1rkxcsvwmqyhkdzb2agg0a"; + version = "0.6.3.7"; + sha256 = "0mzzjamcxfrld9xwgdww3890zzkgmi1qb83v5z9zrixmdgwkvhf4"; buildDepends = [ text ]; + testDepends = [ + deepseq HUnit QuickCheck random testFramework testFrameworkHunit + testFrameworkQuickcheck2 text + ]; extraLibraries = [ icu ]; meta = { - homepage = "https://bitbucket.org/bos/text-icu"; + homepage = "https://github.com/bos/text-icu"; description = "Bindings to the ICU library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/threads/default.nix b/pkgs/development/libraries/haskell/threads/default.nix index d802790da9d..0683ba62d4b 100644 --- a/pkgs/development/libraries/haskell/threads/default.nix +++ b/pkgs/development/libraries/haskell/threads/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "threads"; - version = "0.5.0.2"; - sha256 = "14ccmjg56429a3mzx11ccv18bvkqg56ph9kbpmhdx2ajar80g6jm"; + version = "0.5.0.3"; + sha256 = "1da5p65qf1w746flqnl7pxd05pdh8psi6psi0zsqqxmiykw4zvrf"; buildDepends = [ baseUnicodeSymbols stm ]; testDepends = [ baseUnicodeSymbols concurrentExtra HUnit stm testFramework diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix index f40730b5e56..da8fd1e3ec8 100644 --- a/pkgs/development/libraries/haskell/thyme/default.nix +++ b/pkgs/development/libraries/haskell/thyme/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "thyme"; - version = "0.3.0.1"; - sha256 = "086i8cadq2s894157s1bh3zhd9zb9apr7w39gnydywzgkx47478h"; + version = "0.3.0.3"; + sha256 = "187q8ag6ypbvlikynanzyv8c3hskprcz6xf3p3fjraalp95p86ay"; buildDepends = [ attoparsec deepseq lens QuickCheck random text time transformers vector vectorSpace diff --git a/pkgs/development/libraries/haskell/trifecta/1.1.nix b/pkgs/development/libraries/haskell/trifecta/1.1.nix index ac6cfdd43ae..bf5f2f0d0a7 100644 --- a/pkgs/development/libraries/haskell/trifecta/1.1.nix +++ b/pkgs/development/libraries/haskell/trifecta/1.1.nix @@ -18,8 +18,7 @@ cabal.mkDerivation (self: { 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," \ - --replace "comonad == 3.*," "comonad >= 3 && < 5," + --replace "fingertree >= 0.0.1 && < 0.1," "fingertree >= 0.0.1 && < 0.2," ''; meta = { homepage = "http://github.com/ekmett/trifecta/"; diff --git a/pkgs/development/libraries/haskell/trifecta/1.2.nix b/pkgs/development/libraries/haskell/trifecta/1.2.nix index de876fa7f67..f7b9a7aea81 100644 --- a/pkgs/development/libraries/haskell/trifecta/1.2.nix +++ b/pkgs/development/libraries/haskell/trifecta/1.2.nix @@ -18,8 +18,7 @@ cabal.mkDerivation (self: { 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," \ - --replace "comonad >= 3 && < 4," "comonad >= 3 && < 5," + --replace "fingertree >= 0.0.1 && < 0.1," "fingertree >= 0.0.1 && < 0.2," ''; meta = { homepage = "http://github.com/ekmett/trifecta/"; diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix index 8d0b0bda23d..2a115b8b217 100644 --- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix +++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uu-parsinglib"; - version = "2.8.1"; - sha256 = "10phjwm8dm45rms2vfpx9vzm56v7b9wp0308xkfbalh5zbvxmv35"; + version = "2.8.1.1"; + sha256 = "1mz8sni7mj85b0ih0y1ld7lcj74iq5z2xi1lbwwndpqra9ahc5s6"; buildDepends = [ ListLike time uuInterleaved ]; meta = { homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators"; diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 9789c80e8c1..7e3424713e0 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 = "1.3.4.5"; - sha256 = "062d7f8p2xgzn94fllgfc2bhbjv4vgp9j1adjaw9f0s1asnsdmnj"; + version = "1.3.4.6"; + sha256 = "09rk9i2fkk4haiq1c6rhcp1p72zw34j9cxsmqnm4jzh6fdsrkq2k"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault dateCache fastLogger httpTypes diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix index b89b39acb50..d95b07121af 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { cp -v dist/build/libwxc.so.${self.version} $out/lib/libwxc.so ''; patches = [ ./fix-bogus-pointer-assignment.patch ]; + noHaddock = true; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell C++ wrapper"; diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index a86417f6b39..54dcf4dd19d 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.4"; - sha256 = "0xwav5ghik0vzg706rcqlzk64gnvr4nn4iikx1bzymzz2p5zyg0z"; + version = "1.2.4"; + sha256 = "1n4lkhwy9kvllvfma951lwx6k731jfm4ajkpjim37k38swmmcb70"; 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 0bd73c2ade4..789d158fa6c 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.5"; - sha256 = "091f89bwjsf2qimivbz74rykjjgzghfvs66sv9cz305pgw6kpjc7"; + version = "1.2.5"; + sha256 = "0ia5j6vnxy32y6776wlsfcv9d6s7slqpmkhxw3pipcqd5sjn4kf9"; 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 5c0220f1f2a..c26d88b5080 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.3"; - sha256 = "1maf8yczijx8rdjy4abr2jq1ds4g61jg3zbqxjzaaxsbs77gna4a"; + version = "1.3.4"; + sha256 = "1ajdbr7lz6jxh5r0iapc7c70pmyrac8rw8qzv4vh8lbvmx0z4ck4"; 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 f75b5706f6a..7d56ca1142c 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.3"; - sha256 = "1ilkfmg4sdrz45hc2m8b8rqz242phgxzgizrnd41d5g04jib3hl3"; + version = "1.2.4.4"; + sha256 = "0avqaqx81rald37j4qxp75ixgq5q4a3b8fnlmfsp9d54nfp3hxji"; buildDepends = [ aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit authenticate base64Bytestring baseUnicodeSymbols blazeBuilder diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index c4aba1ddfeb..f9193ee971d 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -1,25 +1,30 @@ { cabal, base64Bytestring, cereal, conduit, cryptoConduit -, cryptohashCryptoapi, dataDefault, fileEmbed, hspec, httpTypes +, cryptohashCryptoapi, dataDefault, fileEmbed, filepath, hjsmin +, hspec, httpTypes, HUnit, mimeTypes, processConduit, resourcet , shakespeareCss, systemFileio, systemFilepath, text, transformers -, unixCompat, wai, waiAppStatic, yesodCore +, unixCompat, unorderedContainers, wai, waiAppStatic, waiTest +, yesodCore, yesodTest }: cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.2.0.1"; - sha256 = "1ij0j1m9j6l63rl4zdfik36a3sb3k0zpqjg85sgis6wdqr18gsi5"; + version = "1.2.1"; + sha256 = "0vsmsdyi0nx111mkyf1wkkl2i07l40gcjzrm9dbks7k4pfajxqjx"; buildDepends = [ base64Bytestring cereal conduit cryptoConduit cryptohashCryptoapi - dataDefault fileEmbed httpTypes shakespeareCss systemFileio - systemFilepath text transformers unixCompat wai waiAppStatic + dataDefault fileEmbed filepath hjsmin httpTypes mimeTypes + processConduit resourcet shakespeareCss systemFileio systemFilepath + text transformers unixCompat unorderedContainers wai waiAppStatic yesodCore ]; testDepends = [ base64Bytestring cereal conduit cryptoConduit cryptohashCryptoapi - dataDefault fileEmbed hspec httpTypes shakespeareCss systemFileio - systemFilepath text transformers unixCompat wai waiAppStatic - yesodCore + dataDefault fileEmbed filepath hjsmin hspec httpTypes HUnit + mimeTypes processConduit resourcet shakespeareCss systemFileio + systemFilepath text transformers unixCompat unorderedContainers wai + waiAppStatic waiTest yesodCore yesodTest ]; + doCheck = false; meta = { homepage = "http://www.yesodweb.com/"; description = "Static file serving subsite for Yesod Web Framework"; diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 556b210b91b..9f416ad27f9 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.2.2.1"; - sha256 = "0xhpsqfshnay7kaz0czr7ass84cbjlgz2n13jk08hs8g8dw72as4"; + version = "1.2.3"; + sha256 = "0y1jwz7azk078kf14hsylgpwljdmrainhwflgxwyf0gcc5l7jhz3"; buildDepends = [ aeson blazeHtml blazeMarkup dataDefault hamlet monadControl networkConduit safe shakespeareCss shakespeareJs text transformers diff --git a/pkgs/development/libraries/java/icedtea/default.nix b/pkgs/development/libraries/java/icedtea/default.nix index 51f375a36f9..094e2a10f95 100644 --- a/pkgs/development/libraries/java/icedtea/default.nix +++ b/pkgs/development/libraries/java/icedtea/default.nix @@ -108,5 +108,7 @@ stdenv.mkDerivation rec { # Restrict to GNU systems for now. platforms = stdenv.lib.platforms.gnu; + + broken = true; }; } diff --git a/pkgs/development/libraries/libc++/default.nix b/pkgs/development/libraries/libc++/default.nix index bed95311915..1d4ef158113 100644 --- a/pkgs/development/libraries/libc++/default.nix +++ b/pkgs/development/libraries/libc++/default.nix @@ -1,19 +1,43 @@ -{ stdenv, fetchsvn, cmake }: +{ stdenv, fetchsvn, cmake, libunwind }: -let rev = "165151"; in +let rev = "190100"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "libc++-pre${rev}"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/libcxx/trunk"; inherit rev; - sha256 = "00l8xx5nc3cjlmln7c1sy1i4v844has9kbfxrsziwkalzbgwaslz"; + sha256 = "0hnfvzzrkj797kp9sk2yncvbmiyx0d72k8bys3z7l6i47d37xv03"; + }; + + cxxabi = fetchsvn { + url = "http://llvm.org/svn/llvm-project/libcxxabi/trunk"; + inherit rev; + sha256 = "1kdyvngwd229cgmcqpawaf0qizas8bqc0g8s08fmbgwsrh1qrryp"; }; buildInputs = [ cmake ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; + preConfigure = '' + sed -i 's/;cxa_demangle.h//' CMakeLists.txt + cp -R ${cxxabi} cxxabi + chmod u+w -R cxxabi # umm + (export NIX_CFLAGS_COMPILE="-I${libunwind}/include -I$PWD/include"; + export NIX_CFLAGS_LINK="-L${libunwind}/lib -lunwind"; + cd cxxabi/lib + sed -e s,-lstdc++,, -i buildit # do not link to libstdc++! + ./buildit + mkdir -p $out/lib && cp libc++abi.so.1.0 $out/lib + cd $out/lib + ln -s libc++abi.so.1.0 libc++abi.so + ln -s libc++abi.so.1.0 libc++abi.so.1) + ''; + + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" + "-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${cxxabi}/include" + "-DLIBCXX_CXX_ABI=libcxxabi" ]; + buildPhase = ''NIX_CFLAGS_LINK="-L$out/lib -lc++abi" make''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libdc1394avt/default.nix b/pkgs/development/libraries/libdc1394avt/default.nix index 1fcdeae0d11..69f66d7f5b7 100644 --- a/pkgs/development/libraries/libdc1394avt/default.nix +++ b/pkgs/development/libraries/libdc1394avt/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { license = "LGPLv2.1+"; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix index d85c205c68a..a2065111190 100644 --- a/pkgs/development/libraries/libebml/default.nix +++ b/pkgs/development/libraries/libebml/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libebml-1.2.2"; + name = "libebml-1.3.0"; src = fetchurl { url = "http://dl.matroska.org/downloads/libebml/${name}.tar.bz2"; - sha256 = "19dp8m97xaj46iv6ahb5v0fb9sawjiy8wy1ylljc15ka8g30hss7"; + sha256 = "1plnh2dv8k9s4d06c2blv2sl8bnz6d6shvj0h00al597nvb79c43"; }; configurePhase = "cd make/linux"; diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 7562765a3ac..b286dcfcd19 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { maintainers = [ ]; # This library is not needed on GNU platforms. - platforms = [ "i686-cygwin" ]; + hydraPlatforms = stdenv.lib.platforms.cygwin ++ stdenv.lib.platforms.darwin ++ stdenv.lib.platforms.freebsd; }; } diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index 0bbc095c380..67b9e728955 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libebml }: stdenv.mkDerivation rec { - name = "libmatroska-1.3.0"; + name = "libmatroska-1.4.1"; src = fetchurl { url = "http://dl.matroska.org/downloads/libmatroska/${name}.tar.bz2"; - sha256 = "0scfs5lc1nvdfv7ipgg02h7wzxks48hc5lvgk9qmwdkihnayqcaj"; + sha256 = "1dzglkl0hpimld1kahkrrp857hw5pg1r7xxbpnx7jmlj7s3j2vq8"; }; configurePhase = "cd make/linux"; diff --git a/pkgs/development/libraries/libmusclecard/default.nix b/pkgs/development/libraries/libmusclecard/default.nix index 5968c6d9a55..af235b83382 100644 --- a/pkgs/development/libraries/libmusclecard/default.nix +++ b/pkgs/development/libraries/libmusclecard/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation { license = "BSD"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + broken = true; }; } diff --git a/pkgs/development/libraries/libopensc-dnie/default.nix b/pkgs/development/libraries/libopensc-dnie/default.nix index d229933111e..c231682b621 100644 --- a/pkgs/development/libraries/libopensc-dnie/default.nix +++ b/pkgs/development/libraries/libopensc-dnie/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { license = "nonfree"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + broken = true; }; } diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 0098ddb9d77..a3de6f99418 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -2,8 +2,8 @@ , libconfig, pkgconfig }: let - version = "31f5d7a8ab"; - date = "20131011"; + version = "18c98eb"; + date = "20131112"; in stdenv.mkDerivation rec { name = "tox-core-${date}-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/irungentoo/ProjectTox-Core/tarball/${version}"; name = "${name}.tar.gz"; - sha256 = "0frz8ylvi33i7zkiz3hp28ylqg4c3ffrbc2m3ibb4zv9rwfzf77r"; + sha256 = "1g69fz9aspzsrlzlk6fpmjyyhb38v8mmp25nszlbra17n3f209yh"; }; preConfigure = '' diff --git a/pkgs/development/libraries/libunibreak/default.nix b/pkgs/development/libraries/libunibreak/default.nix index e5e7f5ff0ae..5fb8622d1e0 100644 --- a/pkgs/development/libraries/libunibreak/default.nix +++ b/pkgs/development/libraries/libunibreak/default.nix @@ -9,10 +9,11 @@ stdenv.mkDerivation rec { sha256 = "0rsivyxnp9nfngf83fiy4v58s5mgdhcjz75nv5nyhxwxnjq35d25"; }; - meta = { + meta = with stdenv.lib; { homepage = http://vimgadgets.sourceforge.net/libunibreak/; description = "A library implementing a line breaking algorithm as described in Unicode 6.0.0 Standard"; - license = "ZLIB"; - maintainer = [ stdenv.lib.maintainers.coroa ]; + license = licenses.zlib; + platforms = platforms.unix; + maintainer = [ maintainers.coroa ]; }; } diff --git a/pkgs/development/libraries/libusb1/1_0_9.nix b/pkgs/development/libraries/libusb1/1_0_9.nix deleted file mode 100644 index a2d628f9689..00000000000 --- a/pkgs/development/libraries/libusb1/1_0_9.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig }: - -stdenv.mkDerivation rec { - name = "libusb-1.0.9"; - - src = fetchurl { - url = "mirror://sourceforge/libusb/${name}.tar.bz2"; - sha256 = "16sz34ix6hw2wwl3kqx6rf26fg210iryr68wc439dc065pffw879"; - }; - - buildInputs = [ pkgconfig ]; - - meta = { - homepage = http://www.libusb.org; - description = "User-space USB library"; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.urkud ]; - }; -} - diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index ce81c1b2e8c..40fbbc94afd 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,16 +1,17 @@ { stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python , iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils, libcap_ng +, dnsmasq }: -let version = "1.1.2"; in +let version = "1.1.4"; in stdenv.mkDerivation { name = "libvirt-${version}"; src = fetchurl { url = "http://libvirt.org/sources/libvirt-${version}.tar.gz"; - md5 = "1835bbfa492099bce12e2934870e5611"; + sha256 = "13yr9g1dk1bzzlm9h93kmavncyg6svjv3rjrv43ccl3sc37za42r"; }; buildInputs = @@ -19,12 +20,9 @@ stdenv.mkDerivation { libcap_ng ]; - # see http://www.mail-archive.com/libvir-list@redhat.com/msg83693.html - patches = [ ./securtyfs_userns.patch ]; - preConfigure = '' - PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${udev}/sbin:$PATH + PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${udev}/sbin:${dnsmasq}/bin:$PATH patchShebangs . # fixes /usr/bin/python references ''; diff --git a/pkgs/development/libraries/libvirt/securtyfs_userns.patch b/pkgs/development/libraries/libvirt/securtyfs_userns.patch deleted file mode 100644 index 2723334f94a..00000000000 --- a/pkgs/development/libraries/libvirt/securtyfs_userns.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/src/lxc/lxc_container.c -+++ b/src/lxc/lxc_container.c -@@ -750,7 +750,7 @@ err: - } - - --static int lxcContainerMountBasicFS(void) -+static int lxcContainerMountBasicFS(bool userns_enabled) - { - const struct { - const char *src; -@@ -801,6 +801,9 @@ static int lxcContainerMountBasicFS(void) - continue; - #endif - -+ if (STREQ(mnts[i].src, "securityfs") && userns_enabled) -+ continue; -+ - if (virFileMakePath(mnts[i].dst) < 0) { - virReportSystemError(errno, - _("Failed to mkdir %s"), -@@ -1530,7 +1533,7 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, - goto cleanup; - - /* Mounts the core /proc, /sys, etc filesystems */ -- if (lxcContainerMountBasicFS() < 0) -+ if (lxcContainerMountBasicFS(vmDef->idmap.nuidmap) < 0) - goto cleanup; - - /* Mounts /proc/meminfo etc sysinfo */ diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index e25074f8d12..b86df4969c2 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -2,20 +2,17 @@ assert pythonSupport -> python != null; -stdenv.mkDerivation rec { - name = "libxml2-2.9.0"; +#TODO: share most stuff between python and non-python builds, perhaps via multiple-output + +stdenv.mkDerivation (rec { + name = "libxml2-2.9.1"; src = fetchurl { url = "ftp://xmlsoft.org/libxml2/${name}.tar.gz"; - sha256 = "10ib8bpar2pl68aqksfinvfmqknwnk7i35ibq6yjl8dpb0cxj9dd"; + sha256 = "1nqgd1qqmg0cg09mch78m2ac9klj9n87blilx4kymi7jcv5n8g7x"; }; - patches = [ ./pthread-once-init.patch ]; - - configureFlags = stdenv.lib.optionalString pythonSupport "--with-python=${python}"; - - buildInputs = (stdenv.lib.optional pythonSupport [ python ]) - + buildInputs = stdenv.lib.optional pythonSupport python # Libxml2 has an optional dependency on liblzma. However, on impure # platforms, it may end up using that from /usr/lib, and thus lack a # RUNPATH for that, leading to undefined references for its users. @@ -33,7 +30,18 @@ stdenv.mkDerivation rec { homepage = http://xmlsoft.org/; description = "An XML parsing library for C"; license = "bsd"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.eelco ]; }; -} + +} // stdenv.lib.optionalAttrs pythonSupport { + configureFlags = "--with-python=${python}"; + + # this is a pair of ugly hacks to make python stuff install into the right place + preInstall = ''substituteInPlace python/libxml2mod.la --replace "${python}" "$out"''; + installFlags = ''pythondir="$(out)/lib/${python.libPrefix}/site-packages"''; + +} // stdenv.lib.optionalAttrs (!pythonSupport && stdenv.isFreeBSD) { + configureFlags = "--with-python=no"; # otherwise build impurity bites us +}) + diff --git a/pkgs/development/libraries/libxml2/pthread-once-init.patch b/pkgs/development/libraries/libxml2/pthread-once-init.patch deleted file mode 100644 index fadfc27a911..00000000000 --- a/pkgs/development/libraries/libxml2/pthread-once-init.patch +++ /dev/null @@ -1,35 +0,0 @@ -http://git.gnome.org/browse/libxml2/commit/?id=3f6cfbd1d38d0634a2ddcb9a0a13e1b5a2195a5e - -From 3f6cfbd1d38d0634a2ddcb9a0a13e1b5a2195a5e Mon Sep 17 00:00:00 2001 -From: Friedrich Haubensak <hsk@fli-leibniz.de> -Date: Wed, 12 Sep 2012 15:34:53 +0000 -Subject: Fix a thread portability problem - -cannot compile libxml2-2.9.0 using studio 12.1 compiler on solaris 10 - -I.M.O. structure initializer (as PTHREAD_ONCE_INIT) cannot be used in -a structure assignment anyway ---- -diff --git a/threads.c b/threads.c -index f206149..7e85a26 100644 ---- a/threads.c -+++ b/threads.c -@@ -146,6 +146,7 @@ struct _xmlRMutex { - static pthread_key_t globalkey; - static pthread_t mainthread; - static pthread_once_t once_control = PTHREAD_ONCE_INIT; -+static pthread_once_t once_control_init = PTHREAD_ONCE_INIT; - static pthread_mutex_t global_init_lock = PTHREAD_MUTEX_INITIALIZER; - #elif defined HAVE_WIN32_THREADS - #if defined(HAVE_COMPILER_TLS) -@@ -915,7 +916,7 @@ xmlCleanupThreads(void) - #ifdef HAVE_PTHREAD_H - if ((libxml_is_threaded) && (pthread_key_delete != NULL)) - pthread_key_delete(globalkey); -- once_control = PTHREAD_ONCE_INIT; -+ once_control = once_control_init; - #elif defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) && (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL)) - if (globalkey != TLS_OUT_OF_INDEXES) { - xmlGlobalStateCleanupHelperParams *p; --- -cgit v0.9.0.2 diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index ed56ffaff73..e2568af6c9b 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (rec { homepage = http://xmlsoft.org/XSLT/; description = "A C library and tools to do XSL transformations"; license = "bsd"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.eelco ]; }; } // (if !stdenv.isFreeBSD then {} else { diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix new file mode 100644 index 00000000000..8bf7ccbfcfa --- /dev/null +++ b/pkgs/development/libraries/nanomsg/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "0.2-alpha"; + name = "nanomsg-${version}"; + + src = fetchurl { + url = "http://download.nanomsg.org/${name}.tar.gz"; + sha256 = "0bgjj1x1a991pckw4nm5bkmbibjsf74y0ns23fpk4jj5dwarhm3d"; + }; + + installPhase = '' + mkdir -p "$out" + make install PREFIX="$out" + ''; + + meta = with stdenv.lib; { + description= "Socket library that provides several common communication patterns"; + homepage = http://nanomsg.org/; + license = licenses.mit; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/opencv/2.1.nix b/pkgs/development/libraries/opencv/2.1.nix index ea5b1313dc7..4b0ccc0903f 100644 --- a/pkgs/development/libraries/opencv/2.1.nix +++ b/pkgs/development/libraries/opencv/2.1.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = "BSD"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + broken = true; }; } diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 99bf8f10fd8..ca1db137206 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { license = "LGPLv2+"; maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 9cd094855d2..c438849e0cd 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -4,8 +4,8 @@ }: let - version = "0.24.1"; # even major numbers are stable - sha256 = "1ipzirrh5ppkq99zb59xpfg5j2fgc8mr569r1cmxjjqql0dc1vsw"; + version = "0.24.3"; # even major numbers are stable + sha256 = "0kip6mxp4lscr3wvgfashqk7ymhx2w1hgdilfpgig0a5kr805kfj"; qtcairo_patches = let qtcairo = fetchgit { # the version for poppler-0.22 diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 72e08d608d1..79209017188 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -176,6 +176,6 @@ stdenv.mkDerivation rec { description = "A cross-platform application framework for C++"; license = "GPL/LGPL"; maintainers = with maintainers; [ lovek323 phreedom sander urkud ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 7521abc599b..de96ab58eae 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.sqlite.org/; description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/unicap/default.nix b/pkgs/development/libraries/unicap/default.nix index 7a64017ca8b..daec5a78566 100644 --- a/pkgs/development/libraries/unicap/default.nix +++ b/pkgs/development/libraries/unicap/default.nix @@ -45,6 +45,7 @@ rec { ]; platforms = with a.lib.platforms; linux; + broken = true; }; passthru = { updateInfo = { diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix index 332a3bd0e8f..06688ded22a 100644 --- a/pkgs/development/perl-modules/DBD-SQLite/default.nix +++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix @@ -35,5 +35,5 @@ buildPerlPackage rec { # (e.g. "database is locked(5) at dbdimp.c line 402 at t/07busy.t"). doCheck = false; - meta.platforms = stdenv.lib.platforms.linux; + meta.platforms = stdenv.lib.platforms.unix; } diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index b1664010550..a41cf69ad23 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "leiningen"; - version = "2.3.2"; + version = "2.3.3"; name = "${pname}-${version}"; src = fetchurl { url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; - sha256 = "1dpvs6b2n309ixglmdpw64k8fbz8n4rd61xp4jrih0z7dgvcql6h"; + sha256 = "0lc5ivgknkflk6k4a4q1r8bm3kq63p4cazfs1rdb02cfhdip52hc"; }; jarsrc = fetchurl { url = "https://leiningen.s3.amazonaws.com/downloads/${pname}-${version}-standalone.jar"; - sha256 = "0g6sgmgl0azawwchi86qxqsknk753ffwiszsxg4idqb713ac6cda"; + sha256 = "1a8i0940ww7xqhwlaaavsgw8s9rjqdnv46hfsla41ns789bappxf"; }; patches = ./lein_2.3.0.patch; diff --git a/pkgs/development/tools/build-managers/simple-build-tool/default.nix b/pkgs/development/tools/build-managers/simple-build-tool/default.nix index e446bf1c1eb..13a216799a2 100644 --- a/pkgs/development/tools/build-managers/simple-build-tool/default.nix +++ b/pkgs/development/tools/build-managers/simple-build-tool/default.nix @@ -1,93 +1,30 @@ -{ stdenv, versionedDerivation, fetchurl, version ? "xsbt-0.12.3" }: +{ stdenv, fetchurl, jre }: -let +stdenv.mkDerivation rec { + name = "sbt-${version}"; + version = "0.13.0"; - description = "A build tool for Scala"; - longDescription = name: '' - ${name} is a simple build tool for Scala projects that aims to do the - basics well. - - This package is the sbt launcher which automatically manages - and downloads dependencies, including the SBT package and the - Scala compiler. - ''; - - metaSBT = { - inherit description; - longDescription = longDescription "sbt"; - homepage = http://code.google.com/p/simple-build-tool/; - license = "bsd"; - }; - - metaXSBT = { - inherit description; - longDescription = longDescription "xsbt"; - homepage = https://github.com/harrah/xsbt; - license = "bsd"; - }; - -in - -# Depends on a JRE at runtime. - -versionedDerivation "simple-build-tool" version { - "0.7.3" = let version = "0.7.3"; in { - name = "simple-build-tool-${version}"; - src = fetchurl { - url = "http://simple-build-tool.googlecode.com/files/sbt-launch-${version}.jar"; - sha256 = "1nciifzf00cs54a4h57a7v1hyklm5vgln0sscmz5kzv96ggphs6k"; - }; - meta = metaSBT; - }; - - "0.7.7" = let version = "0.7.7"; in { - name = "simple-build-tool-${version}"; - src = fetchurl { - url = "http://simple-build-tool.googlecode.com/files/sbt-launch-${version}.jar"; - # sha256 = "1nciifzf00cs54a4h57a7v1hyklm5vgln0sscmz5kzv96ggphs6j"; - sha256 = "2720b033012a7509f7fbdfddfa69c07b105452a6f95bc410cb7dc34c1594ab3d"; - }; - meta = metaSBT; - }; - - "xsbt-0.11.2" = let version = "0.11.2"; in { # scala 2.9 - name = "xsbt-${version}"; - - # scala needs much more PermGen space - javaArgs = "-Xmx1024M"; - # from https://github.com/harrah/xsbt/wiki/Getting-Started-Setup - src = fetchurl { - url = http://typesafe.artifactoryonline.com/typesafe/ivy-releases/org.scala-tools.sbt/sbt-launch/0.11.2/sbt-launch.jar; - sha256 = "14fbzvb1s66wpbqznw65a7nn27qrq1i9pd7wlbydv8ffl49d262n"; - }; - meta = metaXSBT; + src = fetchurl { + url = "http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${version}/sbt-launch.jar"; + sha256 = "04s49v5mw4kwz1rmvbf07kq51i2m0lcv60c9i5y524gjj518pk1w"; }; - "xsbt-0.12.3" = let version = "0.12.3"; in { - name = "xsbt-${version}"; - - # Recommended java options from sbt Getting started guide - javaArgs = "-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=384M"; - # from https://github.com/harrah/xsbt/wiki/Getting-Started-Setup - src = fetchurl { - url = http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.12.3/sbt-launch.jar; - sha256 = "11r26abjzmnmpn65ndbq60qg31s3ichkvzpmxyrq941s1n1dbxgh"; - }; - meta = metaXSBT; - }; -} -{ + phases = [ "installPhase" ]; installPhase = '' - mkdir -pv "$out/lib/java" - cp $src "$out/lib/java/sbt-launch-${version}.jar" - mkdir -p "$out/bin" - cat > "$out/bin/sbt" <<EOF - #! /bin/sh - exec java $javaArgs -jar $out/lib/java/sbt-launch-${version}.jar "\$@" + mkdir -p $out/bin + cat > $out/bin/sbt << EOF + #!/bin/sh + SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=384M" + ${jre}/bin/java $SBT_OPTS -jar ${src} "\$@" EOF - chmod u+x "$out/bin/sbt" + chmod +x $out/bin/sbt ''; - phases = "installPhase"; + meta = { + homepage = http://www.scala-sbt.org/; + license = stdenv.lib.licenses.bsd3; + description = "A build tool for Scala, Java and more"; + maintainers = [ stdenv.lib.maintainers.rickynils ]; + }; } diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix index e6377a201fe..c3f242bc434 100644 --- a/pkgs/development/tools/haskell/keter/default.nix +++ b/pkgs/development/tools/haskell/keter/default.nix @@ -1,23 +1,23 @@ { cabal, aeson, async, attoparsec, blazeBuilder, caseInsensitive , conduit, dataDefault, filepath, fsnotify, httpConduit -, httpReverseProxy, httpTypes, mtl, network, networkConduit -, networkConduitTls, random, regexTdfa, stm, systemFileio -, systemFilepath, tar, text, time, transformers, unixCompat -, unixProcessConduit, unorderedContainers, vector, wai +, httpReverseProxy, httpTypes, liftedBase, mtl, network +, networkConduit, networkConduitTls, random, regexTdfa, stm +, systemFileio, systemFilepath, tar, text, time, transformers +, unixCompat, unixProcessConduit, unorderedContainers, vector, wai , waiAppStatic, waiExtra, warp, warpTls, yaml, zlib }: cabal.mkDerivation (self: { pname = "keter"; - version = "1.0.1.1"; - sha256 = "1bcp9yxmh5z7cvap4nrj8gxnndwws21w6y352yasf35bf432nxa9"; + version = "1.0.1.2"; + sha256 = "1rk0sf6riyb6r1sz0jkvwwj1yyxwjxgafpidp9rqwm8wnqyx6hh8"; isLibrary = true; isExecutable = true; buildDepends = [ aeson async attoparsec blazeBuilder caseInsensitive conduit dataDefault filepath fsnotify httpConduit httpReverseProxy - httpTypes mtl network networkConduit networkConduitTls random - regexTdfa stm systemFileio systemFilepath tar text time + httpTypes liftedBase mtl network networkConduit networkConduitTls + random regexTdfa stm systemFileio systemFilepath tar text time transformers unixCompat unixProcessConduit unorderedContainers vector wai waiAppStatic waiExtra warp warpTls yaml zlib ]; diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 4dd83f63c7d..8df9f71c181 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -8,7 +8,7 @@ let - basename = "gdb-7.6"; + basename = "gdb-7.6.1"; # Whether (cross-)building for GNU/Hurd. This is an approximation since # having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/gdb/${basename}.tar.bz2"; - md5 = "fda57170e4d11cdde74259ca575412a8"; + md5 = "fbc4dab4181e6e9937075b43a4ce2732"; }; # I think python is not a native input, but I leave it diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix index b2a400a6189..c9bb661935a 100644 --- a/pkgs/development/tools/misc/intltool/default.nix +++ b/pkgs/development/tools/misc/intltool/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { homepage = "http://launchpad.net/intltool/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; inherit (s) version; }; } diff --git a/pkgs/development/tools/misc/lttv/default.nix b/pkgs/development/tools/misc/lttv/default.nix index df9f81d02e6..5cf8b664941 100644 --- a/pkgs/development/tools/misc/lttv/default.nix +++ b/pkgs/development/tools/misc/lttv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, gtk2, popt, babeltrace }: stdenv.mkDerivation rec { - name = "lttv-1.5-beta1"; + name = "lttv-1.5"; src = fetchurl { url = "http://lttng.org/files/packages/${name}.tar.bz2"; - sha256 = "0cz69q189wndwpvic0l6wvzl1nsfqadbrigaaxgzij72r7n89sfc"; + sha256 = "1faldxnh9dld5k0vxckwpqw241ya1r2zv286l6rpgqr500zqw7r1"; }; buildInputs = [ pkgconfig glib gtk2 popt babeltrace ]; diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix index 675f8f7f2af..c4dfa99becd 100644 --- a/pkgs/development/tools/misc/stlink/default.nix +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -8,11 +8,12 @@ # SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3748", MODE:="0666", SYMLINK+="stlinkv2_%n" stdenv.mkDerivation { - name = "stlink-git20130306"; + name = "stlink-20130306"; src = fetchgit { url = git://github.com/texane/stlink.git; rev = "5be889e3feb75fc7f594012c4855b4dc16940050"; + sha256 = "1xbfr1kz4k6hhl0xpqn1vi83fdynjxx3ymn9gb7b0pb7h6ncjcyr"; }; buildInputs = [ autoconf automake libtool pkgconfig libusb1 ]; diff --git a/pkgs/development/tools/misc/uhd/default.nix b/pkgs/development/tools/misc/uhd/default.nix new file mode 100644 index 00000000000..d49077a5ef6 --- /dev/null +++ b/pkgs/development/tools/misc/uhd/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchurl, cmake, pkgconfig, python, cheetahTemplate, orc, libusb1, boost }: + +# You need these udev rules to not have to run as root (copied from +# ${uhd}/share/uhd/utils/uhd-usrp.rules): +# +# SUBSYSTEMS=="usb", ATTRS{idVendor}=="fffe", ATTRS{idProduct}=="0002", MODE:="0666" +# SUBSYSTEMS=="usb", ATTRS{idVendor}=="2500", ATTRS{idProduct}=="0002", MODE:="0666" + +stdenv.mkDerivation rec { + name = "uhd-${version}"; + version = "3.5.4"; + + # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz + # and xxx.yyy.zzz. Hrmpf... + + src = fetchurl { + name = "${name}.tar.gz"; + url = "https://github.com/EttusResearch/uhd/archive/release_003_005_004.tar.gz"; + sha256 = "1l11dv72r4ynfpw58aacq0kjylzw85yapv3kzc76lg6qgdb0pqrd"; + }; + + cmakeFlags = "-DLIBUSB_INCLUDE_DIRS=${libusb1}/include/libusb-1.0"; + + buildInputs = [ cmake pkgconfig python cheetahTemplate orc libusb1 boost ]; + + # Build only the host software + preConfigure = "cd host"; + + # Firmware images are downloaded (pre-built) + uhdImagesName = "uhd-images_003.005.004-release"; + uhdImagesSrc = fetchurl { + url = "http://files.ettus.com/binaries/maint_images/archive/${uhdImagesName}.tar.gz"; + sha256 = "0lgy9076vshlaq7l4n3q1hka3q4xxzdz7mqh7kawg4dziq7j8nl6"; + }; + + postPhases = [ "installFirmware" ]; + + installFirmware = '' + tar --strip-components=1 -xvf "${uhdImagesSrc}" -C "$out" + ''; + + meta = with stdenv.lib; { + description = "USRP Hardware Driver (for Software Defined Radio)"; + longDescription = '' + The USRP Hardware Driver (UHD) software is the hardware driver for all + USRP (Universal Software Radio Peripheral) devices. + + USRP devices are designed and sold by Ettus Research, LLC and its parent + company, National Instruments. + ''; + homepage = http://ettus-apps.sourcerepo.com/redmine/ettus/projects/uhd/wiki; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index 293ff66f29d..bdd11b88da5 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -69,5 +69,6 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = stdenv.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index 217c81d4317..716bda30f0d 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -11,6 +11,11 @@ let tar xf ${nodejs.src} mv *node* $out ''; + + peerDeps = listToAttrs (concatMap (dep: map (name: { + inherit name; + value = dep; + }) (filter (nm: !(elem nm (args.passthru.names or []))) dep.names)) (peerDependencies)); in stdenv.mkDerivation ({ unpackPhase = "true"; @@ -21,9 +26,9 @@ stdenv.mkDerivation ({ ${concatStrings (concatMap (dep: map (name: '' ln -sv ${dep}/lib/node_modules/${name} node_modules/ '') dep.names) deps)} - ${concatStrings (concatMap (dep: map (name: '' + ${concatStrings (mapAttrsToList (name: dep: '' ln -sv ${dep}/lib/node_modules/${name} node_modules/ - '') dep.names) peerDependencies)} + '') peerDeps)} export HOME=$(pwd) runHook postConfigure ''; @@ -51,9 +56,9 @@ stdenv.mkDerivation ({ done fi '') args.passthru.names)} - ${concatStrings (concatMap (dep: map (name: '' + ${concatStrings (mapAttrsToList (name: dep: '' mv node_modules/${name} $out/lib/node_modules - '') dep.names) peerDependencies)} + '') peerDeps)} mv node_modules/.bin $out/lib/node_modules 2>/dev/null || true mv node_modules $out/.dependent-node-modules if [ -d "$out/lib/node_modules/.bin" ]; then |