From 475527adb7b7cf1f0063f54f299b71a0ee720b70 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 15 Jul 2015 19:14:18 +0200 Subject: [PATCH 001/175] compcert: 2.4 -> 2.5 Also installs the Coq library as a separate output. --- .../compilers/compcert/default.nix | 24 +++++++++++++++---- pkgs/top-level/all-packages.nix | 6 ++++- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index 00a0e7b9c2b..3b1ebca1796 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -1,23 +1,37 @@ -{ stdenv, fetchurl, coq, ocaml, ocamlPackages }: +{ stdenv, fetchurl, coq, ocamlPackages +, tools ? stdenv.cc +}: stdenv.mkDerivation rec { name = "compcert-${version}"; - version = "2.4"; + version = "2.5"; src = fetchurl { url = "http://compcert.inria.fr/release/${name}.tgz"; - sha256 = "1qrb1cplx3v5wxn1c46kx67v1j52yznvjm2hkrsdybphhki2pyia"; + sha256 = "15gxarl2a8mz33fdn8pycj0ccazgmllbg2940n7aqdjlz807p11n"; }; - buildInputs = [ coq ocaml ocamlPackages.menhir ]; + buildInputs = [ coq ] ++ (with ocamlPackages; [ ocaml menhir ]); enableParallelBuilding = true; configurePhase = '' substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc' - ./configure -prefix $out -toolprefix ${stdenv.cc}/bin/ '' + + ./configure -prefix $out -toolprefix ${tools}/bin/ '' + (if stdenv.isDarwin then "ia32-macosx" else "ia32-linux"); + installTargets = "documentation install"; + + postInstall = '' + mkdir -p $lib/share/doc/compcert + mv doc/html $lib/share/doc/compcert/ + mkdir -p $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/ + mv backend cfrontend common cparser driver flocq ia32 lib \ + $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/ + ''; + + outputs = [ "out" "lib" ]; + meta = with stdenv.lib; { description = "Formally verified C compiler"; homepage = "http://compcert.inria.fr"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f39c4dc040..7380f2d6cf1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3646,7 +3646,11 @@ let cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { }; - compcert = callPackage ../development/compilers/compcert {}; + compcert = callPackage ../development/compilers/compcert ( + if system == "x86_64-linux" + then { tools = pkgsi686Linux.stdenv.cc; } + else {} + ); cryptol = haskellPackages.cryptol; From 9109015990d0271a0bd00f552c800bc51aef5460 Mon Sep 17 00:00:00 2001 From: Rehno Lindeque Date: Thu, 13 Aug 2015 04:26:02 +0000 Subject: [PATCH 002/175] pgcli: github owner changed from amjith to dbcli The new location for pgcli is https://github.com/dbcli/pgcli (moved from https://github.com/amjith/pgcli) --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fa31cef3b70..e5216ed776c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9359,7 +9359,7 @@ let sha256 = "1r34bbqbd4h72cl0cxi9w6q2nwx806wpxq220mzyiy8g45xv0ghj"; rev = "v${version}"; repo = "pgcli"; - owner = "amjith"; + owner = "dbcli"; }; propagatedBuildInputs = with self; [ From 26939eee7954792f9c0713983f3d63c49164fe73 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 13 Aug 2015 18:29:49 +0200 Subject: [PATCH 003/175] Remove unreferenced files This commit removes files that are not referenced in nixpkgs anymore. I have created this list by finding potential candidates using find nixpkgs/pkgs -type d -links 2 | parallel -N 1 'out=`grep -L {} top-level/all-packages.nix`; test -n "$out" && echo {}' and have then searched for those candidates with grep in whole nixpkgs. --- pkgs/applications/misc/hello/ex-1/builder.sh | 9 --- pkgs/applications/misc/hello/ex-1/default.nix | 16 ----- pkgs/development/libraries/libgdata/0.6.nix | 51 --------------- .../libraries/libkolab/default.nix | 25 -------- .../libraries/libkolabxml/default.nix | 25 -------- .../development/libraries/libtidy/default.nix | 28 -------- .../libraries/openexr_ctl/default.nix | 21 ------ .../libraries/pdf2htmlex/pdf2xml.patch | 48 -------------- .../libraries/ruby_gpgme/default.nix | 64 ------------------- .../libraries/ruby_ncursesw_sup/default.nix | 48 -------------- 10 files changed, 335 deletions(-) delete mode 100644 pkgs/applications/misc/hello/ex-1/builder.sh delete mode 100644 pkgs/applications/misc/hello/ex-1/default.nix delete mode 100644 pkgs/development/libraries/libgdata/0.6.nix delete mode 100644 pkgs/development/libraries/libkolab/default.nix delete mode 100644 pkgs/development/libraries/libkolabxml/default.nix delete mode 100644 pkgs/development/libraries/libtidy/default.nix delete mode 100644 pkgs/development/libraries/openexr_ctl/default.nix delete mode 100644 pkgs/development/libraries/pdf2htmlex/pdf2xml.patch delete mode 100644 pkgs/development/libraries/ruby_gpgme/default.nix delete mode 100644 pkgs/development/libraries/ruby_ncursesw_sup/default.nix diff --git a/pkgs/applications/misc/hello/ex-1/builder.sh b/pkgs/applications/misc/hello/ex-1/builder.sh deleted file mode 100644 index 08bba946cce..00000000000 --- a/pkgs/applications/misc/hello/ex-1/builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -source $stdenv/setup - -PATH=$perl/bin:$PATH - -tar xvfz $src -cd hello-* -./configure --prefix=$out -make -make install diff --git a/pkgs/applications/misc/hello/ex-1/default.nix b/pkgs/applications/misc/hello/ex-1/default.nix deleted file mode 100644 index 51b2ccb58ed..00000000000 --- a/pkgs/applications/misc/hello/ex-1/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{stdenv, fetchurl, perl}: - -stdenv.mkDerivation { - name = "hello-2.1.1"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://gnu/hello/hello-2.1.1.tar.gz; - md5 = "70c9ccf9fac07f762c24f2df2290784d"; - }; - inherit perl; - - meta = { - description = "GNU Hello, a classic computer science tool"; - homepage = http://www.gnu.org/software/hello/; - }; -} diff --git a/pkgs/development/libraries/libgdata/0.6.nix b/pkgs/development/libraries/libgdata/0.6.nix deleted file mode 100644 index 4ce95505f8f..00000000000 --- a/pkgs/development/libraries/libgdata/0.6.nix +++ /dev/null @@ -1,51 +0,0 @@ -x@{builderDefsPackage - , glib, libsoup, libxml2, pkgconfig, intltool, perl - , libtasn1, nettle, gmp - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; - - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="libgdata"; - majorVersion="0.6"; - minorVersion="6"; - version="${majorVersion}.${minorVersion}"; - name="${baseName}-${version}"; - url="mirror://gnome/sources/${baseName}/${majorVersion}/${name}.tar.bz2"; - hash="cf6de3b60443faaf8e9c3b4c4b160c22a48df7925c1c793a7bb71d3d746f69f5"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; - - inherit (sourceInfo) name version; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; - - meta = { - description = "GData API library"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.lgpl21Plus; - }; - passthru = { - updateInfo = { - downloadPage = "http://ftp.gnome.org/pub/GNOME/sources/${sourceInfo.baseName}/${sourceInfo.majorVersion}"; - }; - }; -}) x - diff --git a/pkgs/development/libraries/libkolab/default.nix b/pkgs/development/libraries/libkolab/default.nix deleted file mode 100644 index 3475b22d26d..00000000000 --- a/pkgs/development/libraries/libkolab/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, - cmake, qt4, clucene_core, librdf_redland, libiodbc -, pkgconfig }: - -stdenv.mkDerivation rec { - name = "libkolab-0.4.2"; - - src = fetchurl { - url = "http://mirror.kolabsys.com/pub/releases/${name}.tar.gz"; - sha256 = "1wdbg42s14p472dn35n6z638i6n64f6mjjxmjam1r54pzsdykks6"; - }; - - # We disable the Java backend, since we do not need them and they make the closure size much bigger -# buildInputs = [ qt4 clucene_core librdf_redland libiodbc ]; - - nativeBuildInputs = [ cmake ]; - - meta = { - homepage = http://soprano.sourceforge.net/; - description = "An object-oriented C++/Qt4 framework for RDF data"; - license = "LGPL"; - maintainers = with stdenv.lib.maintainers; [ phreedo ]; - inherit (qt4.meta) platforms; - }; -} diff --git a/pkgs/development/libraries/libkolabxml/default.nix b/pkgs/development/libraries/libkolabxml/default.nix deleted file mode 100644 index c0217abd786..00000000000 --- a/pkgs/development/libraries/libkolabxml/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, boost, curl, cmake, xercesc, qt4 -#, qt4, clucene_core, librdf_redland, libiodbc -, pkgconfig }: - -stdenv.mkDerivation rec { - name = "libkolabxml-0.8.4"; - - src = fetchurl { - url = "http://mirror.kolabsys.com/pub/releases/${name}.tar.gz"; - sha256 = "08gdhimnrhizpbvddj7cyz4jwwxrx5a70vz29cy989qgym2vn72q"; - }; - - buildInputs = [ boost curl xercesc ]; -# buildInputs = [ qt4 clucene_core librdf_redland libiodbc ]; - - nativeBuildInputs = [ cmake ]; - - meta = { - homepage = http://soprano.sourceforge.net/; - description = "An object-oriented C++/Qt4 framework for RDF data"; - license = "LGPL"; - maintainers = with stdenv.lib.maintainers; [ phreedo ]; - inherit (qt4.meta) platforms; - }; -} diff --git a/pkgs/development/libraries/libtidy/default.nix b/pkgs/development/libraries/libtidy/default.nix deleted file mode 100644 index 412f34008f1..00000000000 --- a/pkgs/development/libraries/libtidy/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, lib, fetchcvs, cmake, libtool, automake, autoconf }: - -stdenv.mkDerivation rec { - name = "libtidy-${version}"; - - version = "1.46"; - - src = fetchcvs { - cvsRoot = ":pserver:anonymous@tidy.cvs.sourceforge.net:/cvsroot/tidy"; - module = "tidy"; - date = "2009-03-25"; - sha256 = "0bnxn1qgjx1pfyn2q4y24yj1gwqq5bxwf5ksjljqzqzrmjv3q46x"; - }; - - preConfigure = '' - source build/gnuauto/setup.sh - ''; - - buildInputs = [ libtool automake autoconf ]; - - meta = with lib; { - description = "Validate, correct, and pretty-print HTML files"; - homepage = http://tidy.sourceforge.net; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; - }; -} diff --git a/pkgs/development/libraries/openexr_ctl/default.nix b/pkgs/development/libraries/openexr_ctl/default.nix deleted file mode 100644 index cd26aae660c..00000000000 --- a/pkgs/development/libraries/openexr_ctl/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, openexr, ilmbase, ctl }: - -stdenv.mkDerivation { - name = "openexr_ctl-1.0.1"; - - src = fetchurl { - url = mirror://sourceforge/ampasctl/openexr_ctl-1.0.1.tar.gz; - sha256 = "1jg9smpaplal8l14djp184wzk11nwd3dvm4lhkp69kjgw8jdd21d"; - }; - - propagatedBuildInputs = [ ilmbase ]; - - buildInputs = [ openexr ctl ]; - - configureFlags = "--with-ilmbase-prefix=${ilmbase}"; - - meta = { - description = "Color Transformation Language"; - homepage = http://ampasctl.sourceforge.net; - }; -} diff --git a/pkgs/development/libraries/pdf2htmlex/pdf2xml.patch b/pkgs/development/libraries/pdf2htmlex/pdf2xml.patch deleted file mode 100644 index 596a3aea674..00000000000 --- a/pkgs/development/libraries/pdf2htmlex/pdf2xml.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -rc pdf2xml/pdf2xml/Makefile.linux pdf2xml-new/pdf2xml/Makefile.linux -*** pdf2xml/Makefile.linux 2008-02-07 17:43:10.000000000 +0100 ---- pdf2xml-new/Makefile.linux 2010-08-25 15:41:23.000000000 +0200 -*************** -*** 30,36 **** - - - # Executable name -! PDFTOXMLEXE=pdftoxml.exe - - # Main target - all: pdftoxmlEXE ---- 30,36 ---- - - - # Executable name -! PDFTOXMLEXE=pdftoxml - - # Main target - all: pdftoxmlEXE -diff -rc pdf2xml/pdf2xml/src/pdftoxml.cc pdf2xml-new/pdf2xml/src/pdftoxml.cc -*** pdf2xml/src/pdftoxml.cc 2010-04-26 10:58:01.000000000 +0200 ---- pdf2xml-new/src/pdftoxml.cc 2010-08-25 15:36:15.000000000 +0200 -*************** -*** 11,21 **** - // - //=========================================================================== - - #include -- #include - #include - #include -! #include - #include "parseargs.h" - #include "GString.h" - #include "gmem.h" ---- 11,21 ---- - // - //=========================================================================== - -+ #include - #include - #include - #include -! #include - #include "parseargs.h" - #include "GString.h" - #include "gmem.h" diff --git a/pkgs/development/libraries/ruby_gpgme/default.nix b/pkgs/development/libraries/ruby_gpgme/default.nix deleted file mode 100644 index c5f2366bfa1..00000000000 --- a/pkgs/development/libraries/ruby_gpgme/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ stdenv, fetchurl, gpgme, ruby, rubygems, hoe }: - -stdenv.mkDerivation { - name = "ruby-gpgme-1.0.8"; - - src = fetchurl { - url = "https://github.com/ueno/ruby-gpgme/archive/1.0.8.tar.gz"; - sha256 = "1j7jkl9s8iqcmxf3x6c9kljm19hw1jg6yvwbndmkw43qacdr9nxb"; - }; - - meta = { - description = '' - Ruby-GPGME is a Ruby language binding of GPGME (GnuPG Made - Easy) - ''; - homepage = "http://rubyforge.org/projects/ruby-gpgme/"; - longDescription = '' - Ruby-GPGME is a Ruby language binding of GPGME (GnuPG Made Easy). - - GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG - easier for applications. It provides a High-Level Crypto API for - encryption, decryption, signing, signature verification and key - management. - ''; - }; - - buildInputs = [ gpgme rubygems hoe ruby ]; - - buildPhase = '' - ${ruby}/bin/ruby extconf.rb - rake gem - ''; - - installPhase = '' - export HOME=$TMP/home; mkdir -pv "$HOME" - - # For some reason, the installation phase doesn't work with the default - # make install command run by gem (we'll fix it and do it ourselves later) - gem install --no-verbose --install-dir "$out/${ruby.gemPath}" \ - --bindir "$out/bin" --no-rdoc --no-ri pkg/gpgme-1.0.8.gem || true - - # Create a bare-bones gemspec file so that ruby will recognise the gem - cat <"$out/${ruby.gemPath}/specifications/gpgme.gemspec" - Gem::Specification.new do |s| - s.name = 'gpgme' - s.version = '1.0.8' - s.files = Dir['{lib,examples}/**/*'] - s.rubyforge_project = 'ruby-gpgme' - s.require_paths = ['lib'] - end - EOF - - cd "$out/${ruby.gemPath}/gems/gpgme-1.0.8" - mkdir src - mv lib src - sed -i "s/srcdir = ./srcdir = src/" Makefile - make install - - mv lib lib.bak - mv src/lib lib - rmdir src - ''; -} - diff --git a/pkgs/development/libraries/ruby_ncursesw_sup/default.nix b/pkgs/development/libraries/ruby_ncursesw_sup/default.nix deleted file mode 100644 index 8d55bafeb20..00000000000 --- a/pkgs/development/libraries/ruby_ncursesw_sup/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv, fetchurl, ncurses, ruby, rubygems }: - -stdenv.mkDerivation rec { - name = "ncursesw-sup-${version}"; - version = "1.4.6"; - - src = fetchurl { - url = "https://github.com/sup-heliotrope/ncursesw-ruby/archive/v${version}.tar.gz"; - sha256 = "1fzmj5kqh2aql7r7jys8cyf7mb78kz71yc4a6gh74h9s8pybyhh7"; - }; - - meta = { - description = '' - Hacked up version of ncurses gem that supports wide characters for - supmua.org - ''; - homepage = ''http://github.com/sup-heliotrope/ncursesw-ruby''; - longDescription = '' - This wrapper provides access to the functions, macros, global variables - and constants of the ncurses library. These are mapped to a Ruby Module - named "Ncurses": Functions and external variables are implemented as - singleton functions of the Module Ncurses. - ''; - }; - - buildInputs = [ ncurses rubygems ]; - - buildPhase = "gem build ncursesw.gemspec"; - - installPhase = '' - export HOME=$TMP/home; mkdir -pv "$HOME" - - # For some reason, the installation phase doesn't work with the default - # make install command run by gem (we'll fix it and do it ourselves later) - gem install --no-verbose --install-dir "$out/${ruby.gemPath}" \ - --bindir "$out/bin" --no-rdoc --no-ri ncursesw-${version}.gem || true - - # Needed for ruby to recognise the gem - cp ncursesw.gemspec "$out/${ruby.gemPath}/specifications" - - cd "$out/${ruby.gemPath}/gems/ncursesw-${version}" - mkdir src - mv lib src - sed -i "s/srcdir = ./srcdir = src/" Makefile - make install - ''; -} - From 85ec308f8b2f439466ff1f1cc24ee6b61188e113 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 14 Aug 2015 23:28:45 +0200 Subject: [PATCH 004/175] python-packages setuptools_scm: 1.5.4 -> 1.7.0 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dd91cd41c38..2117b185a97 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12101,11 +12101,11 @@ let setuptools_scm = buildPythonPackage rec { name = "setuptools_scm-${version}"; - version = "1.5.4"; + version = "1.7.0"; src = pkgs.fetchurl { - url = "https://bitbucket.org/pypa/setuptools_scm/get/v${version}.tar.bz2"; - sha256 = "0vd6xsl7r0vn5gpw87d31s195j33sqw5c26zdagimy9qzydgq6y6"; + url = "https://pypi.python.org/packages/source/s/setuptools_scm/${name}.tar.gz"; + sha256 = "f2f69c782b4f549003edf5b75b356b37f40a4e880b615996c5d9c117913d6f9c"; }; buildInputs = with self; [ pip ]; From 3f20baee5447cbbaa750283e16ee0641be79f950 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 14 Aug 2015 23:23:30 +0200 Subject: [PATCH 005/175] python-packages pexpect: 2.3 -> 3.3 Tests worked. --- pkgs/top-level/python-packages.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dd91cd41c38..6fee4ac68f3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9095,17 +9095,15 @@ let }; - pexpect = buildPythonPackage { - name = "pexpect-2.3"; + pexpect = buildPythonPackage rec { + version = "3.3"; + name = "pexpect-${version}"; src = pkgs.fetchurl { - url = "mirror://sourceforge/pexpect/pexpect-2.3.tar.gz"; - sha256 = "0x8bfjjqygriry1iyygm5048ykl5qpbpzqfp6i8dhkslm3ryf5fk"; + url = "https://pypi.python.org/packages/source/p/pexpect/${name}.tar.gz"; + sha256 = "dfea618d43e83cfff21504f18f98019ba520f330e4142e5185ef7c73527de5ba"; }; - # error: invalid command 'test' - doCheck = false; - meta = { homepage = http://www.noah.org/wiki/Pexpect; description = "Automate interactive console applications such as ssh, ftp, etc"; From 8a137ead51115cf9aa617795f7729b255a6a81ea Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 20 Aug 2015 14:32:45 +0200 Subject: [PATCH 006/175] edbrowse: 3.5.2 -> 3.5.4.1 --- .../applications/editors/edbrowse/default.nix | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix index 8fdc198f45c..d969552ecde 100644 --- a/pkgs/applications/editors/edbrowse/default.nix +++ b/pkgs/applications/editors/edbrowse/default.nix @@ -1,17 +1,24 @@ { stdenv, fetchurl, spidermonkey_24, unzip, curl, pcre, readline, openssl }: stdenv.mkDerivation rec { - name = "edbrowse-3.5.2"; - buildInputs = [ unzip curl pcre readline openssl spidermonkey_24 ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${spidermonkey_24}/include/mozjs-24" - ''; - installPhase = "installBin src/edbrowse"; + name = "edbrowse-${version}"; + version = "3.5.4.1"; + + nativeBuildInputs = [ unzip ]; + buildInputs = [ curl pcre readline openssl spidermonkey_24 ]; + + patchPhase = '' + substituteInPlace src/ebjs.c --replace \"edbrowse-js\" \"$out/bin/edbrowse-js\" + ''; + + NIX_CFLAGS_COMPILE = "-I${spidermonkey_24}/include/mozjs-24"; + makeFlags = "-C src prefix=$(out)"; + src = fetchurl { - url = "http://the-brannons.com/edbrowse/${name}.zip"; - sha256 = "5f1ac927d126b8c8fd411231cffa9eba5405013e64994e55e1864b2f85d52714"; + url = "http://edbrowse.org/${name}.zip"; + sha256 = "0fpzaalwvgwbns7yxq4a4i6hpdljmcjfyvx19r1dlb3vdfw0vx5l"; }; meta = { - description = "Edbrowse, a Command Line Editor Browser"; + description = "Command Line Editor Browser"; longDescription = '' Edbrowse is a combination editor, browser, and mail client that is 100% text based. The interface is similar to /bin/ed, though there are many more features, such as editing multiple files simultaneously, and rendering html. @@ -20,7 +27,7 @@ stdenv.mkDerivation rec { edbrowse can also tap into databases through odbc. It was primarily written by Karl Dahlke. ''; license = stdenv.lib.licenses.gpl1Plus; - homepage = http://the-brannons.com/edbrowse/; + homepage = http://edbrowse.org/; maintainers = [ stdenv.lib.maintainers.schmitthenner ]; }; } From efd34824eb4c23a135bf2b08b2b53b7777ad350a Mon Sep 17 00:00:00 2001 From: Wei-Ming Yang Date: Wed, 19 Aug 2015 15:37:20 +0800 Subject: [PATCH 007/175] softether: support SoftEther VPN 4.18 --- lib/maintainers.nix | 1 + nixos/modules/module-list.nix | 1 + .../modules/services/networking/softether.nix | 150 ++++++++++++++++++ pkgs/servers/softether/4.18.nix | 53 +++++++ pkgs/top-level/all-packages.nix | 3 + 5 files changed, 208 insertions(+) create mode 100644 nixos/modules/services/networking/softether.nix create mode 100644 pkgs/servers/softether/4.18.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index d42d81399cf..ea37c41af92 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -210,6 +210,7 @@ refnil = "Martin Lavoie "; relrod = "Ricky Elrod "; renzo = "Renzo Carbonara "; + rick68 = "Wei-Ming Yang "; rickynils = "Rickard Nilsson "; rob = "Rob Vermaas "; robberer = "Longrin Wischnewski "; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 733f3c5d853..b21bccc2e90 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -330,6 +330,7 @@ ./services/networking/seeks.nix ./services/networking/skydns.nix ./services/networking/shout.nix + ./services/networking/softether.nix ./services/networking/spiped.nix ./services/networking/sslh.nix ./services/networking/ssh/lshd.nix diff --git a/nixos/modules/services/networking/softether.nix b/nixos/modules/services/networking/softether.nix new file mode 100644 index 00000000000..49538af7d35 --- /dev/null +++ b/nixos/modules/services/networking/softether.nix @@ -0,0 +1,150 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + pkg = pkgs.softether; + cfg = config.services.softether; + +in +{ + + ###### interface + + options = { + + services.softether = { + + enable = mkEnableOption "SoftEther VPN services"; + + vpnserver.enable = mkEnableOption "SoftEther VPN Server"; + + vpnbridge.enable = mkEnableOption "SoftEther VPN Bridge"; + + vpnclient = { + enable = mkEnableOption "SoftEther VPN Client"; + up = mkOption { + type = types.lines; + default = ""; + description = '' + Shell commands executed when the Virtual Network Adapter(s) is/are starting. + ''; + }; + down = mkOption { + type = types.lines; + default = ""; + description = '' + Shell commands executed when the Virtual Network Adapter(s) is/are shutting down. + ''; + }; + }; + + dataDir = mkOption { + type = types.string; + default = "${pkg.dataDir}"; + description = '' + Data directory for SoftEther VPN. + ''; + }; + + }; + + }; + + ###### implementation + + config = mkIf cfg.enable ( + + mkMerge [{ + environment.systemPackages = [ + (pkgs.lib.overrideDerivation pkg (attrs: { + dataDir = cfg.dataDir; + })) + ]; + jobs.softether = { + description = "SoftEther VPN services initial job"; + startOn = "started network-interfaces"; + preStart = '' + for d in vpnserver vpnbridge vpnclient vpncmd; do + if ! test -e ${cfg.dataDir}/$d; then + ${pkgs.coreutils}/bin/mkdir -m0700 -p ${cfg.dataDir}/$d + install -m0600 ${pkg}${cfg.dataDir}/$d/hamcore.se2 ${cfg.dataDir}/$d/hamcore.se2 + fi + done + rm -rf ${cfg.dataDir}/vpncmd/vpncmd + ln -s ${pkg}${cfg.dataDir}/vpncmd/vpncmd ${cfg.dataDir}/vpncmd/vpncmd + ''; + exec = "true"; + }; + } + + (mkIf (cfg.vpnserver.enable) { + systemd.services.vpnserver = { + description = "SoftEther VPN Server"; + after = [ "network-interfaces.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${pkg}/bin/vpnserver start"; + ExecStop = "${pkg}/bin/vpnserver stop"; + Type = "forking"; + }; + preStart = '' + rm -rf ${cfg.dataDir}/vpnserver/vpnserver + ln -s ${pkg}${cfg.dataDir}/vpnserver/vpnserver ${cfg.dataDir}/vpnserver/vpnserver + ''; + postStop = '' + rm -rf ${cfg.dataDir}/vpnserver/vpnserver + ''; + }; + }) + + (mkIf (cfg.vpnbridge.enable) { + systemd.services.vpnbridge = { + description = "SoftEther VPN Bridge"; + after = [ "network-interfaces.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${pkg}/bin/vpnbridge start"; + ExecStop = "${pkg}/bin/vpnbridge stop"; + Type = "forking"; + }; + preStart = '' + rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge + ln -s ${pkg}${cfg.dataDir}/vpnbridge/vpnbridge ${cfg.dataDir}/vpnbridge/vpnbridge + ''; + postStop = '' + rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge + ''; + }; + }) + + (mkIf (cfg.vpnclient.enable) { + systemd.services.vpnclient = { + description = "SoftEther VPN Client"; + after = [ "network-interfaces.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${pkg}/bin/vpnclient start"; + ExecStop = "${pkg}/bin/vpnclient stop"; + Type = "forking"; + }; + preStart = '' + rm -rf ${cfg.dataDir}/vpnclient/vpnclient + ln -s ${pkg}${cfg.dataDir}/vpnclient/vpnclient ${cfg.dataDir}/vpnclient/vpnclient + ''; + postStart = '' + sleep 1 + ${cfg.vpnclient.up} + ''; + postStop = '' + rm -rf ${cfg.dataDir}/vpnclient/vpnclient + sleep 1 + ${cfg.vpnclient.down} + ''; + }; + boot.kernelModules = [ "tun" ]; + }) + + ]); + +} diff --git a/pkgs/servers/softether/4.18.nix b/pkgs/servers/softether/4.18.nix new file mode 100644 index 00000000000..4b5b67cf85b --- /dev/null +++ b/pkgs/servers/softether/4.18.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchurl +, openssl, readline, ncurses, zlib }: + +let + os = if stdenv.isLinux then "1" + else if stdenv.isFreeBSD then "2" + else if stdenv.isSunOS then "3" + else if stdenv.isDarwin then "4" + else if stdenv.isOpenBSD then "5" + else ""; + cpuBits = if stdenv.is64bit then "2" else "1"; + +in + +stdenv.mkDerivation rec { + name = "softether-${version}"; + version = "4.18"; + build = "9570"; + compiledDate = "2015.07.26"; + dataDir = "/var/lib/softether"; + + src = fetchurl { + url = "http://www.softether-download.com/files/softether/v${version}-${build}-rtm-${compiledDate}-tree/Source_Code/softether-src-v${version}-${build}-rtm.tar.gz"; + sha256 = "585d61e524d3cad90806cbeb52ebe54b5144359e6c44676e8e7fb5683ffd4574"; + }; + + buildInputs = [ openssl readline ncurses zlib ]; + + preConfigure = '' + echo "${os} + ${cpuBits} + " | ./configure + rm configure + ''; + + buildPhase = '' + mkdir -p $out/bin + sed -i \ + -e "/INSTALL_BINDIR=/s|/usr/bin|/bin|g" \ + -e "/_DIR=/s|/usr|${dataDir}|g" \ + -e "s|\$(INSTALL|$out/\$(INSTALL|g" \ + -e "/echo/s|echo $out/|echo |g" \ + Makefile + ''; + + meta = with stdenv.lib; { + description = "An Open-Source Free Cross-platform Multi-protocol VPN Program"; + homepage = https://www.softether.org/; + license = licenses.gpl2; + maintainers = [ maintainers.rick68 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47bc0bb85b8..05180d0412d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3031,6 +3031,9 @@ let socat2pre = lowPrio (callPackage ../tools/networking/socat/2.x.nix { }); + softether_4_18 = callPackage ../servers/softether/4.18.nix { }; + softether = softether_4_18; + sourceHighlight = callPackage ../tools/text/source-highlight { }; spaceFM = callPackage ../applications/misc/spacefm { }; From 57f7798b51b9bf775f22428d70b1dca0b01cf032 Mon Sep 17 00:00:00 2001 From: Anders Papitto Date: Thu, 20 Aug 2015 23:45:13 -0700 Subject: [PATCH 008/175] also generate startAt timers for systemd user units --- nixos/modules/system/boot/systemd.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 1314b727772..05369da4f16 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -713,6 +713,14 @@ in }) (filterAttrs (name: service: service.startAt != "") cfg.services); + # Generate timer units for all services that have a ‘startAt’ value. + systemd.user.timers = + mapAttrs (name: service: + { wantedBy = [ "timers.target" ]; + timerConfig.OnCalendar = service.startAt; + }) + (filterAttrs (name: service: service.startAt != "") cfg.user.services); + systemd.sockets.systemd-journal-gatewayd.wantedBy = optional config.services.journald.enableHttpGateway "sockets.target"; From e23ee274b62937ff926807aca9371bc12b574dbe Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Fri, 21 Aug 2015 23:06:50 +0000 Subject: [PATCH 009/175] zerotierone: 1.0.2 -> 1.0.4 and fix for hardcoded path --- pkgs/tools/networking/zerotierone/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index b08edaa0fc6..c6a456e202a 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, openssl, lzo, zlib, gcc }: +{ stdenv, fetchurl, openssl, lzo, zlib, gcc, iproute }: with stdenv.lib; stdenv.mkDerivation rec { - version = "1.0.2"; + version = "1.0.4"; name = "zerotierone"; src = fetchurl { url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz"; - sha256 = "002ay4f6l9h79j1708klwjvinsv6asv24a0hql85jq27587sv6mq"; + sha256 = "1klnsjajlas71flbf6w2q3iqhhqrmzqpd2g4qw9my66l7kcsbxfd"; }; preConfigure = '' @@ -16,12 +16,16 @@ stdenv.mkDerivation rec { --replace 'CC=$(shell which clang gcc cc 2>/dev/null | head -n 1)' "CC=${gcc}/bin/gcc"; substituteInPlace ./make-linux.mk \ --replace 'CXX=$(shell which clang++ g++ c++ 2>/dev/null | head -n 1)' "CC=${gcc}/bin/g++"; + substituteInPlace ./osdep/LinuxEthernetTap.cpp \ + --replace '/sbin/ip' "${iproute}/bin/ip" ''; - buildInputs = [ openssl lzo zlib gcc ]; + buildInputs = [ openssl lzo zlib gcc iproute ]; installPhase = '' installBin zerotier-one + ln -s $out/bin/zerotier-one $out/bin/zerotier-idtool + ln -s $out/bin/zerotier-one $out/bin/zerotier-cli ''; meta = { From 77c49d933380126bdc25948807a94ac5b50be577 Mon Sep 17 00:00:00 2001 From: Boris Sukholitko Date: Sat, 22 Aug 2015 13:01:09 +0300 Subject: [PATCH 010/175] containers: add interfaces config option. It uses systemd-nspawn's --network-interface to move existing interfaces into the container. --- nixos/modules/virtualisation/containers.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index da39dda8535..d819d99e09c 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -120,6 +120,15 @@ in ''; }; + interfaces = mkOption { + type = types.listOf types.string; + default = null; + example = [ "eth1" "eth2" ]; + description = '' + The list of interfaces to be moved into the container. + ''; + }; + autoStart = mkOption { type = types.bool; default = false; @@ -218,6 +227,10 @@ in extraFlags+=" --network-veth" fi + for iface in $INTERFACES; do + extraFlags+=" --network-interface=$iface" + done + for iface in $MACVLANS; do extraFlags+=" --network-macvlan=$iface" done @@ -331,6 +344,9 @@ in LOCAL_ADDRESS=${cfg.localAddress} ''} ''} + ${optionalString (cfg.interfaces != null) '' + INTERFACES="${toString cfg.interfaces}" + ''} ${optionalString cfg.autoStart '' AUTO_START=1 ''} From 23d155fb6fc35b3306dbd1c485da404a88fb1bf9 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 23 Aug 2015 15:03:10 +0100 Subject: [PATCH 011/175] npm2nix: use the current node version --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f515868a7bd..0d5d0930236 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2079,7 +2079,7 @@ let iojsPackages = callPackage ./node-packages.nix { self = iojsPackages; nodejs = iojs; }; - npm2nix = nodePackages_0_10.npm2nix; + npm2nix = nodePackages.npm2nix; ldapvi = callPackage ../tools/misc/ldapvi { }; From 66cf9fd257618c54f82bf3617b990cd78a805b91 Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Sun, 23 Aug 2015 20:42:15 +0200 Subject: [PATCH 012/175] glide: 0.4.1 -> 0.5.0 --- pkgs/top-level/go-packages.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index fa1d71621a3..12ed213d7c3 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -341,10 +341,10 @@ let }; cli-go = buildFromGitHub { - rev = "v1.2.0"; + rev = "142e6cd241a4dfbf7f07a018f1f8225180018da4"; owner = "codegangsta"; repo = "cli"; - sha256 = "1axcpc8wgs0b66dpl36pz97pqbxkgvvbwz1b6rf7gl103jqpii40"; + sha256 = "1w8naax4gvkkxw5h31a2c2dwniw5hj92nv0hn6ybdlavffyax9h5"; }; columnize = buildFromGitHub { @@ -665,11 +665,11 @@ let }; glide = buildFromGitHub { - rev = "0.4.1"; + rev = "0.5.0"; owner = "Masterminds"; repo = "glide"; - sha256 = "0237l8s7z1ysfkv3kmw4788fg4kjcq2sh6073bjcwynz3hldkrlr"; - buildInputs = [ cookoo cli-go go-gypsy ]; + sha256 = "10jg3h1zprx2ylmmcvmy94k4pw7lc9a6xfgr2ld8rih642sqg9wh"; + buildInputs = [ cookoo cli-go go-gypsy vcs ]; }; gls = buildFromGitHub { @@ -2340,6 +2340,13 @@ let ]; }; + vcs = buildFromGitHub { + rev = "c709a4244b817af98a8ecb495ca4ab0b11f27ecd"; + owner = "Masterminds"; + repo = "vcs"; + sha256 = "04gw4pp1f9wp36nvp9y234bmp267c4ajwcc39wa975cd89zhlhn4"; + }; + vulcand = buildGoPackage rec { rev = "v0.8.0-beta.3"; name = "vulcand-${rev}"; From c99c0dd1ed3fea730934878d08c9493f0db69b32 Mon Sep 17 00:00:00 2001 From: "Rommel M. Martinez" Date: Tue, 25 Aug 2015 01:19:14 +0800 Subject: [PATCH 013/175] conkeror: 20150319 -> 20150730 --- pkgs/applications/networking/browsers/conkeror/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix index 9715b46ed50..007c49b2733 100644 --- a/pkgs/applications/networking/browsers/conkeror/default.nix +++ b/pkgs/applications/networking/browsers/conkeror/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, unzip, firefox, makeWrapper }: stdenv.mkDerivation { - name = "conkeror-1.0pre-20150319"; + name = "conkeror-1.0pre-20150730"; src = fetchgit { url = git://repo.or.cz/conkeror.git; - rev = "6450632b3f0c315f79e7a9856658083fe8fc9c29"; - sha256 = "18cqz1n2n6aimmgd69mdrgmkjf4207k7yz11wihka6b5z1hfiv64"; + rev = "a1f7e879b129df5cf14ea4ce80a9c1407380ed58"; + sha256 = "12d8949a81a670037664dd930f7efe3d54b321aad48deea68343eba9aaea8785"; }; buildInputs = [ unzip makeWrapper ]; From 195671aa700e3dc2b65c699201a4ade30846204b Mon Sep 17 00:00:00 2001 From: "Kovacsics Robert (NixOS-SSD2)" Date: Sun, 23 Aug 2015 18:17:01 +0100 Subject: [PATCH 014/175] plan9port: 20140306 -> 2015-06-29 We were already using snapshots, but development moved to github. Also add "9" to $out/bin as it is the recommended practice, see install.txt --- pkgs/tools/system/plan9port/builder.sh | 47 +++++++++++++++---------- pkgs/tools/system/plan9port/default.nix | 20 +++++------ 2 files changed, 39 insertions(+), 28 deletions(-) diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh index 2131a5bad86..023ceef40f2 100644 --- a/pkgs/tools/system/plan9port/builder.sh +++ b/pkgs/tools/system/plan9port/builder.sh @@ -1,23 +1,34 @@ source $stdenv/setup -tar xvfz $src - -cd plan9port - -echo CFLAGS=\"-I${fontconfig}/include -I${libXt}/include\" > LOCAL.config -echo X11=\"${libXt}/include\" >> LOCAL.config - -for p in $patches; do - echo "applying patch $p" - patch -p1 < $p -done - export PLAN9=$out/plan9 -mkdir -p $PLAN9 -for f in `grep -l -r /usr/local/plan9`; do - sed "s,/usr/local/plan9,${PLAN9},g" -i $f -done +configurePhase() +{ + echo CFLAGS=\"-I${fontconfig}/include -I${libXt}/include\" > LOCAL.config + echo X11=\"${libXt}/include\" >> LOCAL.config -./INSTALL -r $PLAN9 -cp -R * $PLAN9 + for f in `grep -l -r /usr/local/plan9`; do + sed "s,/usr/local/plan9,${PLAN9},g" -i $f + done +} + +buildPhase() +{ + mkdir -p $PLAN9 + ./INSTALL -b $PLAN9 +} + +installPhase() +{ + ./INSTALL -c -r $PLAN9 + # Copy sources + cp -R * $PLAN9 + + # Copy the `9' utility. This way you can use + # $ 9 awk + # to use the plan 9 awk + mkdir $out/bin + ln -s $PLAN9/bin/9 $out/bin +} + +genericBuild diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index ca248da56cf..86ce1f14a8c 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -1,10 +1,17 @@ -{stdenv, fetchurl, which, libX11, libXt, fontconfig +{stdenv, fetchgit, which, libX11, libXt, fontconfig , xproto ? null , xextproto ? null , libXext ? null }: stdenv.mkDerivation rec { - name = "plan9port-20140306"; + name = "plan9port-2015-06-29"; + + src = fetchgit { + # Latest, same as on github, google code is old + url = "https://plan9port.googlesource.com/plan9"; + rev = "71de840"; + sha256 = "1ffece7c0a5775a8bde6a0618c7ae3da4048449008a19e6623e8e5553f133b4c"; + }; patches = [ ./fontsrv.patch ]; postPatch = @@ -15,13 +22,6 @@ stdenv.mkDerivation rec { builder = ./builder.sh; - src = fetchurl { - url = "https://plan9port.googlecode.com/files/${name}.tgz"; - # Google code is much faster than swtch - # url = "http://swtch.com/plan9port/${name}.tgz"; - sha256 = "1sza12j3db7i54r3pzli8wmby6aiyzmyfj8w0nidmawkwv6jdf6b"; - }; - NIX_LDFLAGS="-lgcc_s"; buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ which libX11 fontconfig xproto libXt xextproto libXext ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = "http://swtch.com/plan9port/"; description = "Plan 9 from User Space"; license = licenses.lpl-102; - maintainers = [ stdenv.lib.maintainers.ftrvxmtrx ]; + maintainers = with stdenv.lib.maintainers; [ ftrvxmtrx kovirobi ]; platforms = platforms.unix; }; From 44048385bdaa15e4c64e7206cc4ef9357de2cb6e Mon Sep 17 00:00:00 2001 From: Philip Potter Date: Mon, 24 Aug 2015 22:38:01 +0100 Subject: [PATCH 015/175] html-xml-utils: fix and bump to 6.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.4 had a compile error: ``` scan.l:136:7: error: expected identifier or ‘(’ before ‘__extension__’ char *strndup(const char *s, size_t n); ^ ``` This is caused by the standard library strndup() now living in string.h and conflicting with another strndup() declared in scan.l. Version 6.9 fixes this. This also removes the need for the boolean patch that we previously had. --- .../tools/text/xml/html-xml-utils/default.nix | 6 ++---- .../xml/html-xml-utils/no-Boolean-type.patch | 20 ------------------- 2 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 pkgs/tools/text/xml/html-xml-utils/no-Boolean-type.patch diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix index cabb931c447..944b4221844 100644 --- a/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -1,16 +1,14 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "html-xml-utils-6.4"; + name = "html-xml-utils-6.9"; src = fetchurl { url = "http://www.w3.org/Tools/HTML-XML-utils/${name}.tar.gz"; - sha256 = "0dqa8vjk5my728hmb7dhl6nbg7946fh905j0yzlwx7p7rg2zrxcp"; + sha256 = "1cpshwz60h7xsw1rvv84jl4bn9zjqii9hb8zvwm7a0fahkf03x4w"; }; - patches = [ ./no-Boolean-type.patch ]; - meta = { description = "Utilities for manipulating HTML and XML files"; homepage = http://www.w3.org/Tools/HTML-XML-utils/; diff --git a/pkgs/tools/text/xml/html-xml-utils/no-Boolean-type.patch b/pkgs/tools/text/xml/html-xml-utils/no-Boolean-type.patch deleted file mode 100644 index f675c4280e7..00000000000 --- a/pkgs/tools/text/xml/html-xml-utils/no-Boolean-type.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Naur html-xml-utils-6.4-orig/openurl.c html-xml-utils-6.4/openurl.c ---- html-xml-utils-6.4-orig/openurl.c 2012-10-23 09:55:12.000000000 -0400 -+++ html-xml-utils-6.4/openurl.c 2013-10-17 14:05:11.424077842 -0400 -@@ -66,6 +66,7 @@ - #include - #include - #include -+#include - #include "export.h" - #if HAVE_LIBCURL && !HAVE_FOPENCOOKIE - # include "fopencookie.e" /* Use our own fopencookie() */ -@@ -505,7 +506,7 @@ - const conststring path, Dictionary request, - Dictionary response, int maxredirs, int *status) - { -- Boolean delete_response = !response; -+ bool delete_response = !response; - conststring h, v; - char buf[BUFLEN]; - int fd, n, i; From 6ee8cad09154c83d767d20d17e599c7216ca2e76 Mon Sep 17 00:00:00 2001 From: Christian Theune Date: Tue, 25 Aug 2015 07:59:50 +0200 Subject: [PATCH 016/175] syncthing: 0.11.20 -> 0.11.21 --- pkgs/applications/networking/syncthing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 57e9cbe7e8a..1ee9e71e782 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,12 +4,12 @@ with goPackages; buildGoPackage rec { name = "syncthing-${version}"; - version = "0.11.20"; + version = "0.11.21"; goPackagePath = "github.com/syncthing/syncthing"; src = fetchgit { url = "git://github.com/syncthing/syncthing.git"; rev = "refs/tags/v${version}"; - sha256 = "72092f2bfaaeb8c7c9264200f7d08c5e78f670f80a018dd70477c23c0fd88619"; + sha256 = "2e7faf1002570a64ef76c6bbdde781c550db6c45b30f4fa1c394102809cad977"; }; subPackages = [ "cmd/syncthing" ]; From 66c3dff47c86c7288f6801fc4bab907b351da96c Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Thu, 20 Aug 2015 23:32:07 +0200 Subject: [PATCH 017/175] gnome3: Depend on defaultIconTheme instead of hicolor- or adwaita --- pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix | 4 ++-- pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix | 7 +++---- pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix | 5 ++--- pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix | 6 +++--- pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix | 5 ++--- pkgs/desktops/gnome-3/3.16/apps/glade/default.nix | 5 ++--- pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix | 6 +++--- pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix | 6 +++--- .../gnome-3/3.16/apps/gnome-documents/default.nix | 4 ++-- pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix | 4 ++-- pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix | 7 +++---- pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix | 5 ++--- pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix | 4 ++-- pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix | 4 ++-- pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix | 6 +++--- pkgs/desktops/gnome-3/3.16/core/baobab/default.nix | 5 ++--- pkgs/desktops/gnome-3/3.16/core/empathy/default.nix | 6 +++--- pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix | 4 ++-- .../gnome-3/3.16/core/gnome-calculator/default.nix | 5 ++--- .../desktops/gnome-3/3.16/core/gnome-contacts/default.nix | 5 ++--- .../gnome-3/3.16/core/gnome-control-center/default.nix | 2 +- .../gnome-3/3.16/core/gnome-dictionary/default.nix | 5 ++--- .../gnome-3/3.16/core/gnome-disk-utility/default.nix | 5 ++--- .../gnome-3/3.16/core/gnome-font-viewer/default.nix | 5 ++--- .../gnome-3/3.16/core/gnome-online-accounts/default.nix | 4 ++-- .../gnome-3/3.16/core/gnome-screenshot/default.nix | 5 ++--- pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix | 4 ++-- .../gnome-3/3.16/core/gnome-shell-extensions/default.nix | 6 ++---- .../gnome-3/3.16/core/gnome-system-log/default.nix | 5 ++--- .../gnome-3/3.16/core/gnome-system-monitor/default.nix | 5 ++--- .../gnome-3/3.16/core/gnome-themes-standard/default.nix | 4 ++-- .../gnome-3/3.16/core/gnome-user-share/default.nix | 5 ++--- pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix | 6 +++--- pkgs/desktops/gnome-3/3.16/core/sushi/default.nix | 8 ++++---- pkgs/desktops/gnome-3/3.16/core/totem/default.nix | 5 ++--- pkgs/desktops/gnome-3/3.16/core/tracker/default.nix | 7 +++---- pkgs/desktops/gnome-3/3.16/core/vino/default.nix | 7 +++---- pkgs/desktops/gnome-3/3.16/core/yelp/default.nix | 5 ++--- pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix | 4 ++-- pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix | 4 ++-- .../desktops/gnome-3/3.16/games/four-in-a-row/default.nix | 5 ++--- pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix | 4 ++-- .../desktops/gnome-3/3.16/games/gnome-klotski/default.nix | 4 ++-- .../gnome-3/3.16/games/gnome-mahjongg/default.nix | 4 ++-- pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix | 4 ++-- .../desktops/gnome-3/3.16/games/gnome-nibbles/default.nix | 4 ++-- pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix | 5 ++--- pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix | 5 ++--- .../gnome-3/3.16/games/gnome-tetravex/default.nix | 4 ++-- pkgs/desktops/gnome-3/3.16/games/hitori/default.nix | 4 ++-- pkgs/desktops/gnome-3/3.16/misc/geary/default.nix | 6 +++--- .../gnome-3/3.16/misc/gnome-tweak-tool/default.nix | 5 ++--- pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix | 6 +++--- 53 files changed, 119 insertions(+), 145 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix index 294793d6af7..c8d33c24156 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook , itstool, libxml2, python3, python3Packages, pyatspi, at_spi2_core -, dbus, intltool, libwnck3, hicolor_icon_theme }: +, dbus, intltool, libwnck3 }: stdenv.mkDerivation rec { name = "accerciser-3.14.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 wrapGAppsHook itstool libxml2 python3 pyatspi python3Packages.pygobject3 python3Packages.ipythonLight - at_spi2_core dbus intltool libwnck3 hicolor_icon_theme + at_spi2_core dbus intltool libwnck3 gnome3.defaultIconTheme ]; wrapPrefixVariables = [ "PYTHONPATH" ]; diff --git a/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix index 5eb922994ee..99ea481307e 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl, pkgconfig, glib , evolution_data_server, evolution, sqlite -, hicolor_icon_theme, makeWrapper, itstool, desktop_file_utils +, makeWrapper, itstool, desktop_file_utils , clutter_gtk, libuuid, webkitgtk, zeitgeist , gnome3, librsvg, gdk_pixbuf, libxml2 }: @@ -20,9 +20,8 @@ stdenv.mkDerivation rec { clutter_gtk libuuid webkitgtk gnome3.tracker gnome3.gnome_online_accounts zeitgeist desktop_file_utils gnome3.gsettings_desktop_schemas makeWrapper - gdk_pixbuf gnome3.adwaita-icon-theme librsvg - evolution_data_server evolution sqlite - hicolor_icon_theme gnome3.adwaita-icon-theme ]; + gdk_pixbuf gnome3.defaultIconTheme librsvg + evolution_data_server evolution sqlite ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix index a77fe574709..d77740d3507 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight -, pkgconfig, gtk3, glib, hicolor_icon_theme, libnotify, gtkspell3 +, pkgconfig, gtk3, glib, libnotify, gtkspell3 , makeWrapper, itstool, shared_mime_info, libical, db, gcr, sqlite , gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool , libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit }: @@ -21,12 +21,11 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ gnome3.gtkhtml ]; buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool - gdk_pixbuf gnome3.adwaita-icon-theme librsvg db icu + gdk_pixbuf gnome3.defaultIconTheme librsvg db icu gnome3.evolution_data_server libsecret libical gcr webkitgtk shared_mime_info gnome3.gnome_desktop gtkspell3 libcanberra_gtk3 bogofilter gnome3.libgdata sqlite gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit - hicolor_icon_theme gnome3.adwaita-icon-theme nss nspr libnotify procps highlight gnome3.libgweather gnome3.gsettings_desktop_schemas makeWrapper ]; diff --git a/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix index 122449eb4f5..88ced2b2b06 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive -, attr, bzip2, acl, makeWrapper, librsvg, gdk_pixbuf, hicolor_icon_theme }: +, attr, bzip2, acl, makeWrapper, librsvg, gdk_pixbuf }: stdenv.mkDerivation rec { name = "file-roller-${version}"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { # it tries to create {nautilus}/lib/nautilus/extensions-3.0/libnautilus-fileroller.so buildInputs = [ glib pkgconfig gnome3.gtk intltool itstool libxml2 libarchive - hicolor_icon_theme gnome3.adwaita-icon-theme - attr bzip2 acl gdk_pixbuf librsvg makeWrapper ]; + gnome3.defaultIconTheme attr bzip2 acl gdk_pixbuf librsvg + makeWrapper ]; preFixup = '' wrapProgram "$out/bin/file-roller" \ diff --git a/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix index 9263fd42476..c046dd7dc9b 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, enchant, isocodes -, pkgconfig, gtk3, glib, hicolor_icon_theme +, pkgconfig, gtk3, glib , bash, makeWrapper, itstool, libsoup, libxml2 , gnome3, librsvg, gdk_pixbuf, file }: @@ -14,9 +14,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; buildInputs = [ pkgconfig gtk3 glib intltool itstool enchant isocodes - gdk_pixbuf gnome3.adwaita-icon-theme librsvg libsoup + gdk_pixbuf gnome3.defaultIconTheme librsvg libsoup gnome3.libpeas gnome3.gtksourceview libxml2 - hicolor_icon_theme gnome3.adwaita-icon-theme gnome3.gsettings_desktop_schemas makeWrapper file ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix index 24d7688e4de..3ead4de8bc4 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, python -, pkgconfig, gtk3, glib, hicolor_icon_theme +, pkgconfig, gtk3, glib , makeWrapper, itstool, libxml2, docbook_xsl , gnome3, librsvg, gdk_pixbuf, libxslt }: @@ -15,8 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 python gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl - gdk_pixbuf gnome3.adwaita-icon-theme librsvg libxslt - hicolor_icon_theme gnome3.adwaita-icon-theme ]; + gdk_pixbuf gnome3.defaultIconTheme librsvg libxslt ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix index cc3640fd09f..10eaa34a8a2 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix @@ -2,7 +2,7 @@ , glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk , spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala , libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg -, hicolor_icon_theme, desktop_file_utils, mtools, cdrkit, libcdio +, desktop_file_utils, mtools, cdrkit, libcdio , libusb, libarchive, acl }: @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { makeWrapper pkgconfig intltool itstool libvirt-glib glib gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol libuuid libsoup libosinfo systemd tracker vala libcap_ng libcap yajl gmp - gdbm cyrus_sasl gnome3.adwaita-icon-theme libusb libarchive - librsvg hicolor_icon_theme desktop_file_utils acl + gdbm cyrus_sasl gnome3.defaultIconTheme libusb libarchive + librsvg desktop_file_utils acl ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix index 469581deef4..2308dd90434 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, libgweather, libnotify -, pkgconfig, gtk3, glib, hicolor_icon_theme, gsound +, pkgconfig, gtk3, glib, gsound , makeWrapper, itstool, libcanberra_gtk3, libtool , gnome3, librsvg, gdk_pixbuf, geoclue2, wrapGAppsHook }: @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 glib intltool itstool libcanberra_gtk3 gnome3.gsettings_desktop_schemas makeWrapper - gdk_pixbuf gnome3.adwaita-icon-theme librsvg + gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gnome_desktop gnome3.geocode_glib geoclue2 libgweather libnotify libtool gsound - hicolor_icon_theme wrapGAppsHook ]; + wrapGAppsHook ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix index 98059d3ed13..fe6be2e8d4e 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, evince, gjs -, pkgconfig, gtk3, glib, hicolor_icon_theme +, pkgconfig, gtk3, glib , makeWrapper, itstool, libxslt, webkitgtk , gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl , gobjectIntrospection, json_glib, inkscape, poppler_utils @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 glib intltool itstool libxslt docbook_xsl desktop_file_utils inkscape poppler_utils gnome3.gsettings_desktop_schemas makeWrapper gmp - gdk_pixbuf gnome3.adwaita-icon-theme librsvg evince + gdk_pixbuf gnome3.defaultIconTheme librsvg evince libsoup webkitgtk gjs gobjectIntrospection gnome3.rest gnome3.tracker gnome3.libgdata gnome3.gnome_online_accounts gnome3.gnome_desktop gnome3.libzapojit json_glib diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix index 23c77395a82..dbef0526b80 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, itstool, libxml2, systemd, hicolor_icon_theme }: +, intltool, itstool, libxml2, systemd }: stdenv.mkDerivation rec { name = "gnome-logs-${gnome3.version}.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 - systemd hicolor_icon_theme + systemd gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix index 0193f00da4f..3a6de4bcf6f 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl, gdk_pixbuf, tracker , python3, libxml2, python3Packages, libnotify, wrapGAppsHook -, pkgconfig, gtk3, glib, hicolor_icon_theme, cairo +, pkgconfig, gtk3, glib, cairo , makeWrapper, itstool, gnome3, librsvg, gst_all_1 }: stdenv.mkDerivation rec { @@ -14,12 +14,11 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart - gdk_pixbuf gnome3.adwaita-icon-theme librsvg python3 + gdk_pixbuf gnome3.defaultIconTheme librsvg python3 gnome3.grilo gnome3.grilo-plugins libxml2 python3Packages.pygobject3 libnotify python3Packages.pycairo python3Packages.dbus gnome3.totem-pl-parser - gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gstreamer gst_all_1.gst-plugins-base wrapGAppsHook gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - hicolor_icon_theme gnome3.adwaita-icon-theme wrapGAppsHook gnome3.gsettings_desktop_schemas makeWrapper tracker ]; wrapPrefixVariables = [ "PYTHONPATH" ]; diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix index 2b262c263ac..4c152777f2c 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, libgtop, intltool, itstool, libxml2, hicolor_icon_theme -, nmap, inetutils }: +, libgtop, intltool, itstool, libxml2, nmap, inetutils }: stdenv.mkDerivation rec { name = "gnome-nettool-3.8.1"; @@ -12,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 wrapGAppsHook libgtop intltool itstool libxml2 - hicolor_icon_theme + gnome3.defaultIconTheme ]; propagatedUserEnvPkgs = [ nmap inetutils ]; diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix index 83a732a01d5..a89cde7a111 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, exempi, libxml2 -, pkgconfig, gtk3, glib, hicolor_icon_theme +, pkgconfig, gtk3, glib , makeWrapper, itstool, gegl, babl, lcms2 , desktop_file_utils, gmp, libmediaart, wrapGAppsHook , gnome3, librsvg, gdk_pixbuf, libexif }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl gnome3.libgdata gnome3.gsettings_desktop_schemas makeWrapper gmp libmediaart - gdk_pixbuf gnome3.adwaita-icon-theme librsvg exempi + gdk_pixbuf gnome3.defaultIconTheme librsvg exempi gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo gnome3.gnome_online_accounts gnome3.gnome_desktop lcms2 libexif gnome3.tracker libxml2 desktop_file_utils diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix index fff9ea5c08b..5fff782a2e8 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs -, libgweather, intltool, itstool, hicolor_icon_theme }: +, libgweather, intltool, itstool }: stdenv.mkDerivation rec { name = "gnome-weather-${gnome3.version}.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 wrapGAppsHook gjs intltool itstool - libgweather hicolor_icon_theme + libgweather gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix index 3e7b7237313..3a28507fac1 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, vala -, pkgconfig, gtk3, glib, hicolor_icon_theme +, pkgconfig, gtk3, glib , makeWrapper, itstool, gnupg, libsoup , gnome3, librsvg, gdk_pixbuf, gpgme , libsecret, avahi, p11_kit, openssh }: @@ -22,9 +22,9 @@ in stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr gnome3.gsettings_desktop_schemas makeWrapper gnupg - gdk_pixbuf gnome3.adwaita-icon-theme librsvg gpgme + gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme libsecret avahi libsoup p11_kit vala gnome3.gcr - hicolor_icon_theme gnome3.adwaita-icon-theme openssh ]; + openssh ]; preFixup = '' wrapProgram "$out/bin/seahorse" \ diff --git a/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix index eb93458ece5..54d2c065d94 100644 --- a/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, vala, libgtop -, pkgconfig, gtk3, glib, hicolor_icon_theme +, pkgconfig, gtk3, glib , bash, makeWrapper, itstool, libxml2 , gnome3, librsvg, gdk_pixbuf, file }: @@ -19,8 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2 gnome3.gsettings_desktop_schemas makeWrapper file - gdk_pixbuf gnome3.adwaita-icon-theme librsvg - hicolor_icon_theme gnome3.adwaita-icon-theme ]; + gdk_pixbuf gnome3.defaultIconTheme librsvg ]; preFixup = '' wrapProgram "$out/bin/baobab" \ diff --git a/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix index 10e52fe9265..4c42c6c026d 100644 --- a/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib -, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf +, file, librsvg, gnome3, gdk_pixbuf , dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream , clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts , gcr, libsecret, folks, libpulseaudio, telepathy_mission_control @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { gcr libsecret libpulseaudio gnome3.yelp_xsl gdk_pixbuf libnotify clutter libsoup gnutls libgee p11_kit libcanberra_gtk3 telepathy_farstream farstream - gnome3.adwaita-icon-theme hicolor_icon_theme - gnome3.gsettings_desktop_schemas file libtool librsvg ]; + gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas + file libtool librsvg ]; NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0" diff --git a/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix index 72663122a54..5ec07d01b2e 100644 --- a/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix @@ -2,7 +2,7 @@ , bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool , webkitgtk, libsoup, libsecret, gnome_desktop, libnotify, p11_kit , sqlite, gcr, avahi, nss, isocodes, itstool, file, which -, hicolor_icon_theme, gdk_pixbuf, librsvg, gnome_common }: +, gdk_pixbuf, librsvg, gnome_common }: stdenv.mkDerivation rec { name = "epiphany-${gnome3.version}.0"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file webkitgtk libsoup libsecret gnome_desktop libnotify libtool sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools - gdk_pixbuf gnome3.adwaita-icon-theme librsvg which gnome_common + gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ]; NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0"; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix index 5ec87f1f879..a13ca33fc81 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, pkgconfig, libxml2 -, bash, gtk3, glib, hicolor_icon_theme, makeWrapper +, bash, gtk3, glib, makeWrapper , itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp }: stdenv.mkDerivation rec { @@ -16,8 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2 gnome3.gtksourceview mpfr gmp - gdk_pixbuf gnome3.adwaita-icon-theme librsvg - hicolor_icon_theme gnome3.adwaita-icon-theme + gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gsettings_desktop_schemas makeWrapper ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix index ea5a4243389..56491331684 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, evolution_data_server, db -, pkgconfig, gtk3, glib, hicolor_icon_theme, libsecret +, pkgconfig, gtk3, glib, libsecret , libchamplain, clutter_gtk, geocode_glib , bash, makeWrapper, itstool, folks, libnotify, libxml2 , gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss @@ -26,9 +26,8 @@ stdenv.mkDerivation rec { gnome3.gsettings_desktop_schemas makeWrapper file libnotify folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib libxml2 libsoup gnome3.gnome_online_accounts nspr nss - gdk_pixbuf gnome3.adwaita-icon-theme librsvg + gdk_pixbuf gnome3.defaulticontheme librsvg libchamplain clutter_gtk geocode_glib - hicolor_icon_theme gnome3.adwaita-icon-theme vala automake115x autoconf db ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix index 0f95f322d13..1dfc76a2dd5 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper , libcanberra, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio -, gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify +, gdk_pixbuf, librsvg, libxkbfile, libnotify , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk , cracklib, python, libkrb5, networkmanagerapplet, networkmanager , libwacom, samba, shared_mime_info, tzdata, icu, libtool, udev diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix index 9917fd4d15c..9e3906dbed1 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl -, pkgconfig, gtk3, glib, hicolor_icon_theme +, pkgconfig, gtk3, glib , bash, makeWrapper, itstool, libxml2 , gnome3, librsvg, gdk_pixbuf, file }: @@ -16,8 +16,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.adwaita-icon-theme librsvg - hicolor_icon_theme gnome3.adwaita-icon-theme ]; + propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 file gnome3.gsettings_desktop_schemas makeWrapper ]; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix index b5261c214ad..ea29cda2961 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread -, bash, gtk3, glib, hicolor_icon_theme, makeWrapper, cracklib, libnotify +, bash, gtk3, glib, makeWrapper, cracklib, libnotify , itstool, gnome3, librsvg, gdk_pixbuf, libxml2, python , libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }: @@ -20,9 +20,8 @@ stdenv.mkDerivation rec { buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxslt libtool libsecret libpwquality cracklib libnotify libdvdread libcanberra_gtk3 docbook_xsl - gdk_pixbuf gnome3.adwaita-icon-theme + gdk_pixbuf gnome3.defaultIconTheme librsvg udisks2 gnome3.gnome_settings_daemon - hicolor_icon_theme gnome3.adwaita-icon-theme gnome3.gsettings_desktop_schemas makeWrapper libxml2 ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix index 1523cf14d2e..39d5e71a5a3 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl -, pkgconfig, gtk3, glib, hicolor_icon_theme +, pkgconfig, gtk3, glib , bash, makeWrapper, itstool , gnome3, librsvg, gdk_pixbuf }: @@ -18,8 +18,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop - gdk_pixbuf gnome3.adwaita-icon-theme librsvg - hicolor_icon_theme gnome3.adwaita-icon-theme + gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gsettings_desktop_schemas makeWrapper ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix index a8e877039b2..ac285819e8f 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, makeWrapper , webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common , telepathy_glib, intltool, dbus_libs, icu, autoreconfHook -, libsoup, docbook_xsl_ns, docbook_xsl, gnome3, hicolor_icon_theme +, libsoup, docbook_xsl_ns, docbook_xsl, gnome3 }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common makeWrapper libsecret dbus_glib telepathy_glib intltool icu libsoup autoreconfHook - docbook_xsl_ns docbook_xsl hicolor_icon_theme ]; + docbook_xsl_ns docbook_xsl gnome3.defaultIconTheme ]; preFixup = '' for f in "$out/libexec/"*; do diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix index 559d084add1..c36e1b87d66 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3 -, bash, gtk3, glib, hicolor_icon_theme, makeWrapper +, bash, gtk3, glib, makeWrapper , itstool, gnome3, librsvg, gdk_pixbuf }: stdenv.mkDerivation rec { @@ -15,8 +15,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.adwaita-icon-theme librsvg - hicolor_icon_theme gnome3.adwaita-icon-theme ]; + propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libcanberra_gtk3 gnome3.gsettings_desktop_schemas makeWrapper ]; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix index be1b4c0d2cd..bce31242dac 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower -, libxslt, intltool, makeWrapper, systemd, xorg, hicolor_icon_theme }: +, libxslt, intltool, makeWrapper, systemd, xorg }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = with gnome3; [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt - gnome3.gnome_settings_daemon xorg.xtrans hicolor_icon_theme + gnome3.gnome_settings_daemon xorg.xtrans gnome3.defaultIconTheme gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix index 1b17d1f1f53..d4e5d807e48 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix @@ -1,7 +1,5 @@ -{ stdenv, intltool, fetchurl, libgtop -, pkgconfig, gtk3, glib, hicolor_icon_theme -, bash, makeWrapper, itstool -, gnome3, file }: +{ stdenv, intltool, fetchurl, libgtop, pkgconfig, gtk3, glib +, bash, makeWrapper, itstool, gnome3, file }: stdenv.mkDerivation rec { name = "gnome-shell-extensions-${gnome3.version}.1"; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix index 44af987dfe4..716f92a072d 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, pkgconfig -, bash, gtk3, glib, hicolor_icon_theme, makeWrapper +, bash, gtk3, glib, makeWrapper , itstool, gnome3, librsvg, gdk_pixbuf, libxml2 }: stdenv.mkDerivation rec { @@ -15,8 +15,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.adwaita-icon-theme librsvg - hicolor_icon_theme gnome3.adwaita-icon-theme ]; + propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; buildInputs = [ bash pkgconfig gtk3 glib intltool itstool gnome3.gsettings_desktop_schemas makeWrapper libxml2 ]; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix index 94c7af904dd..353c8fcf4db 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2 -, bash, gtk3, glib, hicolor_icon_theme, makeWrapper +, bash, gtk3, glib, makeWrapper , itstool, gnome3, librsvg, gdk_pixbuf, libgtop }: stdenv.mkDerivation rec { @@ -16,8 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2 gtkmm3 libgtop makeWrapper - gdk_pixbuf gnome3.adwaita-icon-theme librsvg - hicolor_icon_theme gnome3.adwaita-icon-theme + gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gsettings_desktop_schemas ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix index ff12622d28f..7bd689511d5 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2 -, gdk_pixbuf, hicolor_icon_theme }: +, gdk_pixbuf }: stdenv.mkDerivation rec { name = "gnome-themes-standard-${gnome3.version}.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf - hicolor_icon_theme ]; + gnome3.defaultIconTheme ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix index 3d2011c01c6..381f7d7c416 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, apacheHttpd_2_2, nautilus -, pkgconfig, gtk3, glib, hicolor_icon_theme, libxml2, gnused +, pkgconfig, gtk3, glib, libxml2, gnused , bash, makeWrapper, itstool, libnotify, libtool, mod_dnssd , gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }: @@ -27,8 +27,7 @@ in stdenv.mkDerivation rec { "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool - makeWrapper file gdk_pixbuf gnome3.adwaita-icon-theme librsvg - hicolor_icon_theme gnome3.adwaita-icon-theme + makeWrapper file gdk_pixbuf gnome3.defaultIconTheme librsvg nautilus libnotify libcanberra_gtk3 ]; postInstall = '' diff --git a/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix index 1787734939d..cf3f06fef58 100644 --- a/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, gnome3 -, glib, gtk3, gobjectIntrospection, python, pygobject3, hicolor_icon_theme +, glib, gtk3, gobjectIntrospection, python, pygobject3 }: let @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { version = "${majorVersion}.1"; buildInputs = [ - intltool pkgconfig - glib gtk3 gobjectIntrospection python pygobject3 hicolor_icon_theme + intltool pkgconfig glib gtk3 gobjectIntrospection python pygobject3 + gnome3.defaultIconTheme ]; src = fetchurl { diff --git a/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix index 8f7c5675cc2..8e5a1e21f52 100644 --- a/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib , clutter_gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz , webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1 -, gdk_pixbuf, librsvg, hicolor_icon_theme, gtk3 }: +, gdk_pixbuf, librsvg, gtk3 }: stdenv.mkDerivation rec { name = "sushi-3.12.0"; @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; buildInputs = [ pkgconfig file intltool gobjectIntrospection glib gtk3 - clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf librsvg - gnome3.adwaita-icon-theme hicolor_icon_theme - libmusicbrainz5 webkitgtk gnome3.evince icu makeWrapper ]; + clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf + librsvg gnome3.defaultIconTheme libmusicbrainz5 webkitgtk + gnome3.evince icu makeWrapper ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.16/core/totem/default.nix b/pkgs/desktops/gnome-3/3.16/core/totem/default.nix index d99a24bbfa2..41f220ec38b 100644 --- a/pkgs/desktops/gnome-3/3.16/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/totem/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl, gst_all_1 , clutter_gtk, clutter-gst, pygobject3, shared_mime_info -, pkgconfig, gtk3, glib, hicolor_icon_theme +, pkgconfig, gtk3, glib , bash, makeWrapper, itstool, libxml2, dbus_glib , gnome3, librsvg, gdk_pixbuf, file }: @@ -25,8 +25,7 @@ stdenv.mkDerivation rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gnome3.libpeas pygobject3 shared_mime_info dbus_glib - gdk_pixbuf gnome3.adwaita-icon-theme librsvg gnome3.gnome_desktop - hicolor_icon_theme gnome3.adwaita-icon-theme + gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gnome_desktop gnome3.gsettings_desktop_schemas makeWrapper file ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix index 4265d70a4f9..88e6da2ad2d 100644 --- a/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, libxml2, upower -, pkgconfig, gtk3, glib, hicolor_icon_theme +, pkgconfig, gtk3, glib , bash, makeWrapper, itstool, vala, sqlite, libxslt , gnome3, librsvg, gdk_pixbuf, file, libnotify , evolution_data_server, gst_all_1, poppler @@ -27,12 +27,11 @@ stdenv.mkDerivation rec { buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2 bzip2 gnome3.totem-pl-parser libxslt gnome3.gsettings_desktop_schemas makeWrapper file - gdk_pixbuf gnome3.adwaita-icon-theme librsvg sqlite + gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite upower libnotify evolution_data_server gnome3.libgee gst_all_1.gstreamer gst_all_1.gst-plugins-base flac poppler icu taglib libjpeg libtiff giflib libvorbis - exempi networkmanager libpng libexif libgsf libuuid - hicolor_icon_theme gnome3.adwaita-icon-theme ]; + exempi networkmanager libpng libexif libgsf libuuid ]; preConfigure = '' substituteInPlace src/libtracker-sparql/Makefile.in --replace "--shared-library=libtracker-sparql" "--shared-library=$out/lib/libtracker-sparql" diff --git a/pkgs/desktops/gnome-3/3.16/core/vino/default.nix b/pkgs/desktops/gnome-3/3.16/core/vino/default.nix index c4082095918..dcfd7b08b08 100644 --- a/pkgs/desktops/gnome-3/3.16/core/vino/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/vino/default.nix @@ -1,6 +1,5 @@ { stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper -, hicolor_icon_theme, gnome3 -, libnotify, file, telepathy_glib, dbus_glib }: +, gnome3, libnotify, file, telepathy_glib, dbus_glib }: stdenv.mkDerivation rec { name = "vino-${versionMajor}.${versionMinor}"; @@ -15,8 +14,8 @@ stdenv.mkDerivation rec { doCheck = true; buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify - hicolor_icon_theme gnome3.adwaita-icon-theme - dbus_glib telepathy_glib file makeWrapper ]; + gnome3.defaultIconTheme dbus_glib telepathy_glib file + makeWrapper ]; preFixup = '' wrapProgram "$out/libexec/vino-server" \ diff --git a/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix index 7f405707231..e48dcafb3cf 100644 --- a/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib -, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf, sqlite +, file, librsvg, gnome3, gdk_pixbuf, sqlite , bash, makeWrapper, itstool, libxml2, libxslt, icu, gst_all_1 , wrapGAppsHook }: @@ -17,8 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool sqlite libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl - librsvg gdk_pixbuf gnome3.adwaita-icon-theme - hicolor_icon_theme gnome3.adwaita-icon-theme + librsvg gdk_pixbuf gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas wrapGAppsHook gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; diff --git a/pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix index bc352101383..d4dfb7f0a8c 100644 --- a/pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, webkitgtk, intltool, hicolor_icon_theme }: +, webkitgtk, intltool }: stdenv.mkDerivation rec { name = "devhelp-${gnome3.version}.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook webkitgtk intltool hicolor_icon_theme + pkgconfig gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix index 26af4d7286a..70e7184b338 100644 --- a/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix +++ b/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, intltool, itstool, libxml2, hicolor_icon_theme }: +, librsvg, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { name = "five-or-more-${gnome3.version}.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2 - hicolor_icon_theme + gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix index bf15f9f2bbb..292a54bf193 100644 --- a/pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, itstool, libcanberra_gtk3, librsvg, libxml2 -, hicolor_icon_theme }: +, intltool, itstool, libcanberra_gtk3, librsvg, libxml2 }: stdenv.mkDerivation rec { name = "four-in-a-row-${gnome3.version}.2"; @@ -12,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 wrapGAppsHook intltool itstool libcanberra_gtk3 librsvg - libxml2 hicolor_icon_theme + libxml2 gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix index 7161eb5cdaf..e80c6691e20 100644 --- a/pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, itstool, librsvg, libxml2, hicolor_icon_theme }: +, intltool, itstool, librsvg, libxml2 }: stdenv.mkDerivation rec { name = "gnome-chess-${gnome3.version}.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2 - hicolor_icon_theme + gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix index 6afcc63e97f..cab2f194d49 100644 --- a/pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libxml2, intltool, itstool, hicolor_icon_theme }: +, librsvg, libxml2, intltool, itstool }: stdenv.mkDerivation rec { name = "gnome-klotski-${gnome3.version}.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2 - hicolor_icon_theme + gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix index 5b5bdae87c0..73cb0cf6ceb 100644 --- a/pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, intltool, itstool, libxml2, hicolor_icon_theme }: +, librsvg, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { name = "gnome-mahjongg-${gnome3.version}.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2 - hicolor_icon_theme + gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix index e9af6c0fe4d..92aa5bd7219 100644 --- a/pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, intltool, itstool, libxml2, hicolor_icon_theme }: +, librsvg, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { name = "gnome-mines-${gnome3.version}.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2 - hicolor_icon_theme + gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix index 8fde848fe1f..673edff645d 100644 --- a/pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook , librsvg, libcanberra_gtk3, clutter_gtk, intltool, itstool -, libxml2, hicolor_icon_theme }: +, libxml2 }: stdenv.mkDerivation rec { name = "gnome-nibbles-${gnome3.version}.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 - librsvg libcanberra_gtk3 hicolor_icon_theme clutter_gtk + librsvg libcanberra_gtk3 clutter_gtk gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix index a4f94518425..306a9e40852 100644 --- a/pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix +++ b/pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra_gtk3, intltool, itstool, libxml2 -, hicolor_icon_theme }: +, librsvg, libcanberra_gtk3, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { name = "gnome-robots-${gnome3.version}.1"; @@ -12,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libcanberra_gtk3 - libxml2 hicolor_icon_theme + libxml2 gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix index 31b74cd285e..2a2f97d1e49 100644 --- a/pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra_gtk3, intltool, itstool, libxml2 -, hicolor_icon_theme }: +, librsvg, libcanberra_gtk3, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { name = "gnome-taquin-${gnome3.version}.1"; @@ -12,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 wrapGAppsHook librsvg libcanberra_gtk3 - intltool itstool libxml2 hicolor_icon_theme + intltool itstool libxml2 gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix index 37654f8fa33..2b577799307 100644 --- a/pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, libxml2, intltool, itstool, hicolor_icon_theme }: +, libxml2, intltool, itstool }: stdenv.mkDerivation rec { name = "gnome-tetravex-${gnome3.version}.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 hicolor_icon_theme + pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.16/games/hitori/default.nix b/pkgs/desktops/gnome-3/3.16/games/hitori/default.nix index d409ac1b3c3..bd6be7d43c5 100644 --- a/pkgs/desktops/gnome-3/3.16/games/hitori/default.nix +++ b/pkgs/desktops/gnome-3/3.16/games/hitori/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, libxml2, intltool, itstool, hicolor_icon_theme }: +, libxml2, intltool, itstool }: stdenv.mkDerivation rec { name = "hitori-${gnome3.version}.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 - hicolor_icon_theme + gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix index 1cf656fe7dc..11655edded0 100644 --- a/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk3, vala , makeWrapper, gdk_pixbuf, cmake, desktop_file_utils , libnotify, libcanberra, libsecret, gmime -, libpthreadstubs, hicolor_icon_theme, sqlite +, libpthreadstubs, sqlite , gnome3, librsvg, gnome_doc_utils, webkitgtk }: let @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils vala webkitgtk libnotify libcanberra gnome3.libgee libsecret gmime sqlite - libpthreadstubs gnome3.gsettings_desktop_schemas hicolor_icon_theme gnome3.gcr - gdk_pixbuf librsvg gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme ]; + libpthreadstubs gnome3.gsettings_desktop_schemas gnome3.gcr + gdk_pixbuf librsvg gnome3.defaultIconTheme ]; preConfigure = '' substituteInPlace src/CMakeLists.txt --replace '`pkg-config --variable=girdir gobject-introspection-1.0`' '${webkitgtk}/share/gir-1.0' diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix index c078297c803..6600345060f 100644 --- a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix +++ b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, python, pygobject3, atk -, pkgconfig, gtk3, glib, hicolor_icon_theme, libsoup +, pkgconfig, gtk3, glib, libsoup , bash, makeWrapper, itstool, libxml2, python3Packages , gnome3, librsvg, gdk_pixbuf, file, libnotify }: @@ -19,8 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 gnome3.gsettings_desktop_schemas makeWrapper file - gdk_pixbuf gnome3.adwaita-icon-theme librsvg - hicolor_icon_theme gnome3.adwaita-icon-theme + gdk_pixbuf gnome3.defaultIconTheme librsvg python pygobject3 libnotify gnome3.gnome_shell libsoup gnome3.gnome_settings_daemon gnome3.nautilus gnome3.gnome_desktop ]; diff --git a/pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix index 650d978277b..0440af440fe 100644 --- a/pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper, dbus_glib, libcanberra, gst_all_1, vala, gnome3, gtk3, gst_plugins_base, - glib, gobjectIntrospection, hicolor_icon_theme, telepathy_glib + glib, gobjectIntrospection, telepathy_glib }: stdenv.mkDerivation rec { @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { makeWrapper dbus_glib libcanberra vala gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome3.gsettings_desktop_schemas gnome3.gnome_desktop - gnome3.gnome_common gnome3.gnome_shell hicolor_icon_theme gtk3 - telepathy_glib + gnome3.gnome_common gnome3.gnome_shell gtk3 telepathy_glib + gnome3.defaultIconTheme ]; preBuild = '' From 97dada000580870dc18adb6a6ec7cd20a33f1eb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 25 Aug 2015 14:21:56 +0200 Subject: [PATCH 018/175] Make hydra build proxychains. (cherry picked from commit 8f11a84c9145c4a1cf5fe182db31921070565efa) --- pkgs/tools/networking/proxychains/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/proxychains/default.nix b/pkgs/tools/networking/proxychains/default.nix index 2835c9016ab..0181f1891c6 100644 --- a/pkgs/tools/networking/proxychains/default.nix +++ b/pkgs/tools/networking/proxychains/default.nix @@ -11,5 +11,6 @@ stdenv.mkDerivation { description = "Proxifier for SOCKS proxies"; homepage = http://proxychains.sourceforge.net; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } From d43496300e0064afa940c8fe822762983051793c Mon Sep 17 00:00:00 2001 From: Florian Baumann Date: Tue, 25 Aug 2015 15:27:58 +0200 Subject: [PATCH 019/175] fixed: mlmmj-recieve: No such file or directory --- nixos/modules/services/mail/mlmmj.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/mlmmj.nix b/nixos/modules/services/mail/mlmmj.nix index db3a266d011..5843a6745f5 100644 --- a/nixos/modules/services/mail/mlmmj.nix +++ b/nixos/modules/services/mail/mlmmj.nix @@ -11,7 +11,7 @@ let listCtl = domain: list: "${listDir domain list}/control"; transport = domain: list: "${domain}--${list}@local.list.mlmmj mlmmj:${domain}/${list}"; virtual = domain: list: "${list}@${domain} ${domain}--${list}@local.list.mlmmj"; - alias = domain: list: "${list}: \"|${pkgs.mlmmj}/mlmmj-receive -L ${listDir domain list}/\""; + alias = domain: list: "${list}: \"|${pkgs.mlmmj}/bin/mlmmj-receive -L ${listDir domain list}/\""; subjectPrefix = list: "[${list}]"; listAddress = domain: list: "${list}@${domain}"; customHeaders = list: domain: [ "List-Id: ${list}" "Reply-To: ${list}@${domain}" ]; From 012515ef2fecbd7e3b4028aa21dfcbd073a68801 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 25 Aug 2015 16:35:40 +0200 Subject: [PATCH 020/175] pecita: 5.0 -> 5.1 --- pkgs/data/fonts/pecita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix index 3e5ad1655be..4156fb69069 100644 --- a/pkgs/data/fonts/pecita/default.nix +++ b/pkgs/data/fonts/pecita/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pecita-${version}"; - version = "5.0"; + version = "5.1"; src = fetchurl { url = "http://pecita.eu/b/Pecita.otf"; - sha256 = "0agml1886jvb0j6jar8hjx4hfbz3n0msszyp625b96ilv09qrcyz"; + sha256 = "0v2k6vvzl1f809h3lfld6zy5m56w1dn27xmdy3hjniv6j9xbhbs4"; }; phases = ["installPhase"]; From 2e1a49b35a6fe683b9ec452fa505690ceade9d60 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Aug 2015 22:05:53 +0200 Subject: [PATCH 021/175] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-hashes/commit/6e3963284cd7ae1baa801fcc1a9534aeceef5562 with hackage2nix v20150807-65-g1cc6394 --- .../haskell-modules/hackage-packages.nix | 1718 +++++++++++------ 1 file changed, 1150 insertions(+), 568 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7e1975ba55c..1f04d3a3355 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2402,13 +2402,12 @@ self: { }: mkDerivation { pname = "Chart"; - version = "1.5.1"; - sha256 = "2f954bc60615fa0da39087e5f88e0726684b99ad9698c270cf28876545e6a14a"; + version = "1.5.3"; + sha256 = "85ea6abc853f497209268cc9ab06b13722a1fcfa95b59fc62cd517533ac3c55d"; libraryHaskellDepends = [ array base colour data-default-class lens mtl old-locale operational time vector ]; - jailbreak = true; homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "A library for generating 2D Charts and Plots"; license = stdenv.lib.licenses.bsd3; @@ -3341,8 +3340,8 @@ self: { }: mkDerivation { pname = "DSA"; - version = "1"; - sha256 = "94bb45c840e9f1579f37e14667f7223403ce02eb1b06def68e47d376643b464b"; + version = "1.0.0"; + sha256 = "1ab314a3912cbe7e45d966bf1bb6650f950bb36bd2711770197d225db5852173"; libraryHaskellDepends = [ base binary bytestring crypto-api crypto-pubkey-types ghc-prim integer-gmp SHA tagged @@ -3352,6 +3351,7 @@ self: { HUnit integer-gmp QuickCheck SHA tagged test-framework test-framework-hunit test-framework-quickcheck2 ]; + jailbreak = true; description = "Implementation of DSA, based on the description of FIPS 186-4"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -4168,8 +4168,8 @@ self: { }: mkDerivation { pname = "Earley"; - version = "0.9.0"; - sha256 = "5ec955f00c872cc585bc2dd82fec137f53b095fde73a498e2a0ca7e0eb8140aa"; + version = "0.10.0"; + sha256 = "6e018d7465cc3c2f9b34a3dd53502e5bffdb62aaf1e70da71065d175f7cf3e09"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ListLike ]; @@ -5384,8 +5384,8 @@ self: { }: mkDerivation { pname = "GLUT"; - version = "2.7.0.1"; - sha256 = "fb1ed80beed6dbf1b373839224d11932c20d1c1b571bef81101483099c459c4d"; + version = "2.7.0.2"; + sha256 = "f48d9b1f5a00df06490ad669b1615b6c966ca3f09dd7a193f2bc22730c70c363"; libraryHaskellDepends = [ array base containers OpenGL OpenGLRaw StateVar transformers ]; @@ -5409,6 +5409,7 @@ self: { linear OpenGL OpenGLRaw transformers vector ]; libraryToolDepends = [ cpphs ]; + jailbreak = true; description = "Miscellaneous OpenGL utilities"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -7125,8 +7126,8 @@ self: { }: mkDerivation { pname = "HMap"; - version = "1.2.6"; - sha256 = "8424dcbcb903c49d369230e2c10421daf3a2e35f3ffb5ec4058f769213769b8a"; + version = "1.2.7"; + sha256 = "806cbac1e1571c814af76ccf4058c5d9577b99018fd0c7ee5de993b343c60577"; libraryHaskellDepends = [ base data-default hashable mtl unordered-containers ]; @@ -7573,8 +7574,8 @@ self: { }: mkDerivation { pname = "HTF"; - version = "0.13.0.0"; - sha256 = "a4b066e8589ee0f2574af6d592d6906c85cc2cf75846dff2f83f6adc3c302c53"; + version = "0.13.1.0"; + sha256 = "1cb469ee21766fb7ad56fb42469709fac06214f7a33c39880134dfc2ea0de847"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -7682,6 +7683,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "HUnit_1_3_0_0" = callPackage + ({ mkDerivation, base, deepseq, filepath }: + mkDerivation { + pname = "HUnit"; + version = "1.3.0.0"; + sha256 = "e130db953a2310d2c256a3923af0250be6ea19317f7d369b56d48f84cf96a55c"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base deepseq filepath ]; + homepage = "http://hunit.sourceforge.net/"; + description = "A unit testing framework for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "HUnit-Diff" = callPackage ({ mkDerivation, ansi-terminal, base, Diff, groom, HUnit }: mkDerivation { @@ -9407,8 +9421,8 @@ self: { }: mkDerivation { pname = "JuicyPixels"; - version = "3.2.6"; - sha256 = "f99e82c84d8eeff23ba57332ed4b89530bc1a739c3a8f4b670b07ac33bfc9a46"; + version = "3.2.6.1"; + sha256 = "8ca8a8ba99c3edc0d565dd2f5974888c79823e38f8e5a7a8ebf1fd32aa35d213"; libraryHaskellDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib @@ -10565,6 +10579,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "MicrosoftTranslator" = callPackage + ({ mkDerivation, aeson, base, bytestring, datetime, exceptions + , http-client, lens, text, transformers, url, wreq, xml + }: + mkDerivation { + pname = "MicrosoftTranslator"; + version = "0.1.0.1"; + sha256 = "0855cf30d5a70c5cc908c8c84e17e2c325cbc669fe678d074ae88253d23d3120"; + libraryHaskellDepends = [ + aeson base bytestring datetime exceptions http-client lens text + transformers url wreq xml + ]; + jailbreak = true; + description = "Interface for Microsoft Translator"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "MiniAgda" = callPackage ({ mkDerivation, alex, array, base, containers, happy , haskell-src-exts, mtl, pretty @@ -11804,8 +11835,8 @@ self: { }: mkDerivation { pname = "OpenAL"; - version = "1.7.0.0"; - sha256 = "5c427a07c1b26eaaa372dcc526a2c9d593b80021be5e81af75dea6d13f3a3984"; + version = "1.7.0.1"; + sha256 = "671987cb52152317e6bed01b20e09c031a20066ff3f76aa450965ec162971750"; libraryHaskellDepends = [ base ObjectName OpenGL StateVar transformers ]; @@ -11865,8 +11896,8 @@ self: { }: mkDerivation { pname = "OpenGL"; - version = "2.12.0.1"; - sha256 = "8b7cfc07cb4cc4a6c45910eeb9fdfe114be1f64090fa0705c3e550794c588ed5"; + version = "2.13.0.0"; + sha256 = "0f3b4d4dbe8630f405dcbddda3989cfe3811bf547b6e1cf6f8bcd45655ab9182"; libraryHaskellDepends = [ base bytestring GLURaw ObjectName OpenGLRaw StateVar text transformers @@ -11894,8 +11925,8 @@ self: { ({ mkDerivation, base, mesa, transformers }: mkDerivation { pname = "OpenGLRaw"; - version = "2.5.1.0"; - sha256 = "33a4100bd89c762658263dc6e5725dd214761d16d5d73907ad42a4d72b11d8cd"; + version = "2.5.2.1"; + sha256 = "08c3302e4b543ebed9a8dd92bb2a16550ca7b224b7ddcc3df59135d32aacb845"; libraryHaskellDepends = [ base transformers ]; librarySystemDepends = [ mesa ]; homepage = "http://www.haskell.org/haskellwiki/Opengl"; @@ -14554,26 +14585,27 @@ self: { "Spock" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring - , case-insensitive, containers, directory, focus, hashable, hspec - , hspec-wai, http-types, hvect, list-t, monad-control, mtl - , old-locale, path-pieces, random, reroute, resource-pool - , resourcet, stm, stm-containers, text, time, transformers - , transformers-base, unordered-containers, vault, wai, wai-extra - , warp + , case-insensitive, containers, crypto-random, directory, focus + , hashable, hspec, hspec-wai, http-types, hvect, list-t + , monad-control, mtl, old-locale, path-pieces, random, reroute + , resource-pool, resourcet, stm, stm-containers, text, time + , transformers, transformers-base, unordered-containers, vault, wai + , wai-extra, warp }: mkDerivation { pname = "Spock"; - version = "0.8.1.0"; - sha256 = "d9e62dba8c757b9877010c4ecbc2e79de519cf14a54c919fc99eda3a1c2e70d6"; + version = "0.9.0.0"; + sha256 = "f12419a63f9d0324c0338b05b3f44f0ec6c8790c3b21bfaff7c1ad154cb8fea6"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers - directory focus hashable http-types hvect list-t monad-control mtl - old-locale path-pieces random reroute resource-pool resourcet stm - stm-containers text time transformers transformers-base - unordered-containers vault wai wai-extra warp + crypto-random directory focus hashable http-types hvect list-t + monad-control mtl old-locale path-pieces random reroute + resource-pool resourcet stm stm-containers text time transformers + transformers-base unordered-containers vault wai wai-extra warp ]; testHaskellDepends = [ - base bytestring hspec hspec-wai http-types reroute stm text wai + base bytestring hspec hspec-wai http-types reroute stm text + unordered-containers wai wai-extra ]; homepage = "http://www.spock.li"; description = "Another Haskell web framework for rapid development"; @@ -14600,8 +14632,8 @@ self: { }: mkDerivation { pname = "Spock-digestive"; - version = "0.1.0.1"; - sha256 = "d453585fb08777a67e80ae25f1c6e390097e2f4827e0510f6c550ee2cb36e68c"; + version = "0.2.0.0"; + sha256 = "e5571d88d7b9dcafc7f5c364c8499a1d8d698d1698f2615b5f26698c85080260"; libraryHaskellDepends = [ base digestive-functors http-types mtl Spock text unordered-containers wai @@ -15125,11 +15157,12 @@ self: { pname = "TestExplode"; version = "0.1.0.0"; sha256 = "4133d9f69e7df366ac374ccb42bd9801ae66c0cd29f9f20ab849d1d8f8e79664"; + revision = "1"; + editedCabalFile = "ea885fd1fbb40a306229b73181330b31510c155257499b442dd94fa8b54bf3fc"; libraryHaskellDepends = [ base containers directory fgl graphviz interpolatedstring-perl6 mtl process text ]; - jailbreak = true; homepage = "https://github.com/testexplode/testexplode"; description = "Generates testcases from program-snippets"; license = stdenv.lib.licenses.gpl3; @@ -17344,8 +17377,8 @@ self: { }: mkDerivation { pname = "acid-state"; - version = "0.12.4"; - sha256 = "4d2db186740e8d33fab5c6fd7ef2364e0f6bc39bdf58be845fb0a57893b86255"; + version = "0.13.0"; + sha256 = "127adb9833be5b1cb6eb25f21d48dd976a0e39a4b5919095b6d03af314b85637"; libraryHaskellDepends = [ array base bytestring cereal containers directory extensible-exceptions filepath mtl network safecopy stm @@ -17356,6 +17389,27 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "acid-state-dist" = callPackage + ({ mkDerivation, acid-state, base, bytestring, cereal + , concurrent-extra, containers, directory, filepath, mtl, random + , safe, safecopy, semigroups, stm, transformers, zeromq4-haskell + }: + mkDerivation { + pname = "acid-state-dist"; + version = "0.1.0.1"; + sha256 = "868d3c28720d6757609ee8247634a04d49884cf0a049b1fca8fe542ddcc69eab"; + libraryHaskellDepends = [ + acid-state base bytestring cereal concurrent-extra containers + filepath mtl safe safecopy semigroups stm transformers + zeromq4-haskell + ]; + testHaskellDepends = [ + acid-state base directory mtl random safecopy + ]; + description = "A replication backend for acid-state"; + license = stdenv.lib.licenses.mit; + }) {}; + "acid-state-tls" = callPackage ({ mkDerivation, acid-state, base, directory, HsOpenSSL, network , safecopy @@ -19492,20 +19546,20 @@ self: { "amazonka" = callPackage ({ mkDerivation, amazonka-core, base, bytestring, conduit - , conduit-extra, directory, exceptions, free, http-client - , http-conduit, ini, lens, mmorph, monad-control, mtl, resourcet - , retry, tasty, tasty-hunit, text, time, transformers - , transformers-base, transformers-compat + , conduit-extra, directory, exceptions, http-client, http-conduit + , ini, lens, mmorph, monad-control, mtl, resourcet, retry, tasty + , tasty-hunit, text, time, transformers, transformers-base + , transformers-compat }: mkDerivation { pname = "amazonka"; - version = "1.0.1"; - sha256 = "36583da0607497b69668bc9100373031d24cc64eb467e06676b409358d4c061a"; + version = "1.1.0"; + sha256 = "60a65271453aedff93b9789e52f258ea6b6fe315a26f361710a50a825167a2c3"; libraryHaskellDepends = [ amazonka-core base bytestring conduit conduit-extra directory - exceptions free http-client http-conduit ini lens mmorph - monad-control mtl resourcet retry text time transformers - transformers-base transformers-compat + exceptions http-client http-conduit ini lens mmorph monad-control + mtl resourcet retry text time transformers transformers-base + transformers-compat ]; testHaskellDepends = [ base tasty tasty-hunit ]; homepage = "https://github.com/brendanhay/amazonka"; @@ -19519,8 +19573,8 @@ self: { }: mkDerivation { pname = "amazonka-autoscaling"; - version = "1.0.1"; - sha256 = "a74e6157a99285f556edb546ea1876507b197b1392bebcdf5f7d0ac4e418d702"; + version = "1.1.0"; + sha256 = "0ed84582688b21076214a24ba5d31a3f25f3ee7765ed0c18d44fe0459d4101ca"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19539,8 +19593,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudformation"; - version = "1.0.1"; - sha256 = "b09f594282e3e5fc13b0de3cd4f562ba9c9bfec96973d5aeba334f32a5f88fe6"; + version = "1.1.0"; + sha256 = "70d06d56987589915ac6011badf3c1f5d336814f99c09cd99424f3af312b9bf2"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19559,8 +19613,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudfront"; - version = "1.0.1"; - sha256 = "82e0d72534717397395a2109af59725b86bb9361610b1143e7bac58b7ff1c948"; + version = "1.1.0"; + sha256 = "c931a4e78ffa1e81023dc1b306c4f2195be09b0246ef7b8022311421ef78c01c"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19579,8 +19633,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudhsm"; - version = "1.0.1"; - sha256 = "88be89b5bacd848704f28ecf0544e6d9dfffa05f67e3f9317d64b17ec2caaac9"; + version = "1.1.0"; + sha256 = "b9f6ad65225dfd1eb0560a2a71a52991560ef4e69654b0053f37414c22080875"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19599,8 +19653,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudsearch"; - version = "1.0.1"; - sha256 = "9476d436b0ea895edc0aa3b0ee36458cfeea35faaee8e5b9fcc653ee5c47f027"; + version = "1.1.0"; + sha256 = "3e22407422a823f86eeff6685ccc71a4b775ed8962522d70ec49092f09c8b8ae"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19619,8 +19673,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudsearch-domains"; - version = "1.0.1"; - sha256 = "b2dd61ab239b00e884be45b305f5587ec66dbe031c4d65f93d00f297eb4400c5"; + version = "1.1.0"; + sha256 = "8f6f6ce4ce0194d0f51c6b9ed9a71a0e270c5385a4c3dd63589c6d66cfdf6872"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19639,8 +19693,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudtrail"; - version = "1.0.1"; - sha256 = "c4aedc71e6d8d18befcd90573c664a859d6a5952711512b57eba596726ddcff9"; + version = "1.1.0"; + sha256 = "a10e4dfbbef7058f8e21c5afb3f3b8108880c26bf163b8cfb048fa91ef47a4ea"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19659,8 +19713,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudwatch"; - version = "1.0.1"; - sha256 = "5562fb8ffbd5485091b7f0a8a1b6d4ab533371804341dd352c6de97fe8297233"; + version = "1.1.0"; + sha256 = "6f9d2ac648899c775daeac0ed2a80e83c16876497762b8a99afc600e6f4546e9"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19679,8 +19733,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudwatch-logs"; - version = "1.0.1"; - sha256 = "c8d16042fb42fe562a754467d3f3be13ab1dc7c862d5dd6467864fd9cdc5b551"; + version = "1.1.0"; + sha256 = "8c3c9553f43f1312881f22da35a34ad404101f3b790d2734590abd4ce5dbcfb7"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19699,8 +19753,8 @@ self: { }: mkDerivation { pname = "amazonka-codecommit"; - version = "1.0.1"; - sha256 = "a930435da46193d2a8a648fbe0d741f009b3c524127a60989740cb46e692013e"; + version = "1.1.0"; + sha256 = "abe54fee07ff52883343780cade09238da0e41d23ecc95fa9c1e3f9a8743b78a"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19719,8 +19773,8 @@ self: { }: mkDerivation { pname = "amazonka-codedeploy"; - version = "1.0.1"; - sha256 = "77be78235ebefc1f1f08a7db8b800bcd06a7dafe37c5f69413543f08926628c1"; + version = "1.1.0"; + sha256 = "0b5832f433693ea1238a0391c19765d975b24425c378ae6688ba358849ed758c"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19739,8 +19793,8 @@ self: { }: mkDerivation { pname = "amazonka-codepipeline"; - version = "1.0.1"; - sha256 = "6f573007d05e22f6afda550b8d0f61bde15ddfbe8e700779207fd78c7546b819"; + version = "1.1.0"; + sha256 = "8b892d604355caea388c8680712b8e03cee1fd85c9275cb118009cbf4f1ee7e0"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19759,8 +19813,8 @@ self: { }: mkDerivation { pname = "amazonka-cognito-identity"; - version = "1.0.1"; - sha256 = "87fe6bdcdb3f6056180c48e5b9c1d57ff64aa953e5763e93d8b28cd2d5ffe2f7"; + version = "1.1.0"; + sha256 = "a154b6645d58211b3ebeb9407a4683ae85f6a1069d9c4027da664a34b471910e"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19779,8 +19833,8 @@ self: { }: mkDerivation { pname = "amazonka-cognito-sync"; - version = "1.0.1"; - sha256 = "7dc187fc5269bba71ac05e0bdae22c08d9fd0e1988263e0828fe7f9cec4e614d"; + version = "1.1.0"; + sha256 = "0a831859befa66f52636384f3e70217e0a804d9267135010034bc047ba2c5f75"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19799,8 +19853,8 @@ self: { }: mkDerivation { pname = "amazonka-config"; - version = "1.0.1"; - sha256 = "317ed1ec7dc99e06068fb600f21be98b05dd61a73dd0d140ed644774fb81d33a"; + version = "1.1.0"; + sha256 = "960c9381c50aa26bcf5bb05704ede000ef9614488ea9f428f7d1ae6eba7c886b"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19824,8 +19878,8 @@ self: { }: mkDerivation { pname = "amazonka-core"; - version = "1.0.1"; - sha256 = "e432d7b5510685dd37688a632e3a17a8968cb3b1e08537257c054fa8f9eda946"; + version = "1.1.0"; + sha256 = "fe4b3185f61ad56e3dfddcd5050d3cfa41a997fd3c5b74ec8ed24404dada2cb6"; libraryHaskellDepends = [ aeson attoparsec base bifunctors bytestring case-insensitive conduit conduit-extra cryptonite exceptions hashable http-client @@ -19849,8 +19903,8 @@ self: { }: mkDerivation { pname = "amazonka-datapipeline"; - version = "1.0.1"; - sha256 = "d8b88c9a51eab9110650ea9e40f09950e8df2c20264cbc629b8a29c50b252dc2"; + version = "1.1.0"; + sha256 = "8c72a767f8b3546dd0e895035edfcc3a6e0fe060a2398e973938addfca7b4ce5"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19869,8 +19923,8 @@ self: { }: mkDerivation { pname = "amazonka-devicefarm"; - version = "1.0.1"; - sha256 = "9b23b6c2853b073635c8e6e76026ffa2cccd705bd7d958fa6dd2c4785a887297"; + version = "1.1.0"; + sha256 = "3c99376995534299985d2163d8cf55938d925f08c3e214b5f3567a26f4515ab1"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19889,8 +19943,8 @@ self: { }: mkDerivation { pname = "amazonka-directconnect"; - version = "1.0.1"; - sha256 = "8fc02b3ade3970117e13b2b133235c006a21914e91269cb42d63d712501d013a"; + version = "1.1.0"; + sha256 = "5ec6240b4fe226859b51e325f44f566c21a93ff91d628b6d9eafeb823152e74b"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19909,8 +19963,8 @@ self: { }: mkDerivation { pname = "amazonka-ds"; - version = "1.0.1"; - sha256 = "523f0fb329f502115aed6b1aafc7efd96ac8233d56de05379465fe3c3b7ddbf1"; + version = "1.1.0"; + sha256 = "19de365fedf51d8da57c5099e04e6d827b3c3b4b3f9aacc7e78d7bf7a9def542"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19929,8 +19983,8 @@ self: { }: mkDerivation { pname = "amazonka-dynamodb"; - version = "1.0.1"; - sha256 = "85194e782b7a44ff914af01cdc8d5c3e8285031f0b23a07ef37020c0798c9bfb"; + version = "1.1.0"; + sha256 = "b4cc74ff79ab032a06cbf7245db1d8734cf9946625a9bf00fe4974dcb8628f45"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19949,8 +20003,8 @@ self: { }: mkDerivation { pname = "amazonka-dynamodb-streams"; - version = "1.0.1"; - sha256 = "edfcfc6e4281012cbec96f2b96416cf8c3e0e2313388d677e78f4ff8e51d94f7"; + version = "1.1.0"; + sha256 = "04e4eb5b332a455d4ac40824a60a07b47c8bc73aa89d82ce85bb944b0f2cde11"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19969,8 +20023,8 @@ self: { }: mkDerivation { pname = "amazonka-ec2"; - version = "1.0.1"; - sha256 = "fd0ec9d15a97195472be403b9d8c03cdcd2f70daf4beec326c360083479d37ec"; + version = "1.1.0"; + sha256 = "c715cd05ee79755de37df834d5315041c5d582004720d7e3b18c2fa2ff28deb7"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19989,8 +20043,8 @@ self: { }: mkDerivation { pname = "amazonka-ecs"; - version = "1.0.1"; - sha256 = "77e78bf43efd1c3fb77b0d2a6cbab5140ffe13c7e8fcc22cbe7e509d73f978e8"; + version = "1.1.0"; + sha256 = "82eb9b0a963885a6c2d846e2497cf39519c8f6a07315a6cb8d07cd88246376d6"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20009,8 +20063,8 @@ self: { }: mkDerivation { pname = "amazonka-efs"; - version = "1.0.1"; - sha256 = "9ff36087cc77bf044b515e6a8fc11f4067ab76372e02b3cb7b8dadfb3ad697a2"; + version = "1.1.0"; + sha256 = "daf42240c49d66cbc715bcc2cace1f430e81b3cc78ce0e2455475f9706e4ae42"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20029,8 +20083,8 @@ self: { }: mkDerivation { pname = "amazonka-elasticache"; - version = "1.0.1"; - sha256 = "638d40a60b59e020cad3dac813563be07b5f698fd9b602784f3ac344c013ca15"; + version = "1.1.0"; + sha256 = "edc2f2e5a67c1b409b93b60862dd7b1303201d2b59b3e19931e8bde9a948e277"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20049,8 +20103,8 @@ self: { }: mkDerivation { pname = "amazonka-elasticbeanstalk"; - version = "1.0.1"; - sha256 = "43dc5564b2183011340d9751b7c4a1cf8197b215b9b857c78d68c70a35c050cb"; + version = "1.1.0"; + sha256 = "d45f9ebdda89b89f461948438e1c2d0e4eb1e7a0ab2fed229203fc29d027ed35"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20069,8 +20123,8 @@ self: { }: mkDerivation { pname = "amazonka-elastictranscoder"; - version = "1.0.1"; - sha256 = "5bac9e2c04f4c775ee7018a2073f5141fa5f062467f4eeba91e9a64e03525298"; + version = "1.1.0"; + sha256 = "f5ea457def994de22b4bc8c471ecf2355c4acf80d44c022e34d92ffdd8606500"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20089,8 +20143,8 @@ self: { }: mkDerivation { pname = "amazonka-elb"; - version = "1.0.1"; - sha256 = "4c9a033830f09147953ffc7c58c39856e1a7c62d600267029bdfce7acf786b52"; + version = "1.1.0"; + sha256 = "2f3e4a8971545bf39bedf5a75854c21733a797598318e076f2a468d8f5647a96"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20109,8 +20163,8 @@ self: { }: mkDerivation { pname = "amazonka-emr"; - version = "1.0.1"; - sha256 = "e1f289ca504d4220d1a28f055ba01cbf2e87ce42ce3ff6525a6dc1f4adaa6b96"; + version = "1.1.0"; + sha256 = "29f4c25ff4cdcd83809afa9fdc5e70a8bf89c6b1e4bcdfc7367faade023566bc"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20129,8 +20183,8 @@ self: { }: mkDerivation { pname = "amazonka-glacier"; - version = "1.0.1"; - sha256 = "4a6d67f4ac6b34316281810d10b46b46e34fd6869bbf463ef6fa6c8257da28ad"; + version = "1.1.0"; + sha256 = "61f954b805f51ca436a01f42e9068674540c3828b269e6c1547aedd976516b91"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20149,8 +20203,8 @@ self: { }: mkDerivation { pname = "amazonka-iam"; - version = "1.0.1"; - sha256 = "63d8091722baa876de7a04e92387f4b3015e7194fed25a0e0da9f6ec7ecdb441"; + version = "1.1.0"; + sha256 = "9b52ae4b69126b24be8e7dac78aab91c7b14b0ab1c162fe2e8b8e831f5e41991"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20169,8 +20223,8 @@ self: { }: mkDerivation { pname = "amazonka-importexport"; - version = "1.0.1"; - sha256 = "281e37c37bdc5d175723ba8b428c63be3a1a543d2e66ace7f8f288e7419e82fc"; + version = "1.1.0"; + sha256 = "7682771e6a51a96a69c8a5c8176b33a944b598d84a353884287b8b3183b2a5a9"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20189,8 +20243,8 @@ self: { }: mkDerivation { pname = "amazonka-kinesis"; - version = "1.0.1"; - sha256 = "f942f5a7c13d1dccd98ec52529d24e7cc26bf87d729271c00ea752255e22cd40"; + version = "1.1.0"; + sha256 = "0103f032d0ebbd562a7e510897cb50f5bed8383fbbc7ac7868564ab57fa7a0e7"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20209,8 +20263,8 @@ self: { }: mkDerivation { pname = "amazonka-kms"; - version = "1.0.1"; - sha256 = "9fc90213cb962c1fe6d49b188bb4e3c4b08db7a9820d25bdda2600b4fc0e9681"; + version = "1.1.0"; + sha256 = "0c9f0d02cc5fdf1ef64b0446d82718277c3570f761b0644504ee90d842f78b9a"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20229,8 +20283,8 @@ self: { }: mkDerivation { pname = "amazonka-lambda"; - version = "1.0.1"; - sha256 = "09b29ce0649e01ce74717f0ba9379dbf98993b217652bb310e7136c288c1b8f9"; + version = "1.1.0"; + sha256 = "07d43e6d4585a09139006708e831c7e713c1b33dbc711cc08fd6c723ace589f3"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20249,8 +20303,8 @@ self: { }: mkDerivation { pname = "amazonka-ml"; - version = "1.0.1"; - sha256 = "6a670ff312be363929409768d3172a28bf7cd549764038f1aa71fd31e2930436"; + version = "1.1.0"; + sha256 = "ef09c86c1ccf257d4dd53627a75213015482e2ce18d1c5a85b4017bb215563dc"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20269,8 +20323,8 @@ self: { }: mkDerivation { pname = "amazonka-opsworks"; - version = "1.0.1"; - sha256 = "998f65d4b6dc4a43959f7c1f2380af5e5f4fa588bc181a793eb4f3eadee5078d"; + version = "1.1.0"; + sha256 = "9ac85226c177d59135f7fde294202951b5415e9a0afbe1b7a2b2c7f57f2531c0"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20289,8 +20343,8 @@ self: { }: mkDerivation { pname = "amazonka-rds"; - version = "1.0.1"; - sha256 = "f10aa66616746f3ef5728fe50f6ce9506b13a0d9e0dab95edd4aeeb2b6a3eca0"; + version = "1.1.0"; + sha256 = "8081408044b167cde41e466073d4acd8e4732b2586c0fa637a5a323e84447b02"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20309,8 +20363,8 @@ self: { }: mkDerivation { pname = "amazonka-redshift"; - version = "1.0.1"; - sha256 = "2a10e70b53d5fc8e723660a595d521e6e4b7f0acd16430cf9a63e2199ab86e9c"; + version = "1.1.0"; + sha256 = "688e017fd663b915a80d37954bd3b48deccc5d9e90b18770ff91af46ddd9c01b"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20329,8 +20383,8 @@ self: { }: mkDerivation { pname = "amazonka-route53"; - version = "1.0.1"; - sha256 = "e559cce14249db7d13282bc376b9a5c42719d795da20cfc420c3b95afcfa26a9"; + version = "1.1.0"; + sha256 = "dde78c3ff32eb00e3342d89426ec9f6792e3ecb40af378525e74141b415c0436"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20349,8 +20403,8 @@ self: { }: mkDerivation { pname = "amazonka-route53-domains"; - version = "1.0.1"; - sha256 = "fa4e85bbe0ccf8875cd08b601b69db8fba038046c66e9b65219fecd6b3105fc3"; + version = "1.1.0"; + sha256 = "cc4e138341b187146ac10d52430abebcf1780846ace4482d838b3f1053abb9b2"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20369,8 +20423,8 @@ self: { }: mkDerivation { pname = "amazonka-s3"; - version = "1.0.1"; - sha256 = "2ba4b833b1ccb7d3ca4ac46ae88cf522951972b428987e78328e14766f77f5c4"; + version = "1.1.0"; + sha256 = "7cdb79c15c0f1152e40a464d7fd1cc6edf1526d40ca1e7f8d33d0968acdc6e71"; libraryHaskellDepends = [ amazonka-core base lens text ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20389,8 +20443,8 @@ self: { }: mkDerivation { pname = "amazonka-sdb"; - version = "1.0.1"; - sha256 = "dad868bcae8795c9e8e0719ae18bb99514d7a8bd4ee373e194531a0120e4061c"; + version = "1.1.0"; + sha256 = "fe6b9a82edc028b2895e14a5ed2f4d4efdd6c13328a87d18c1215fc2baa35cb7"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20409,8 +20463,8 @@ self: { }: mkDerivation { pname = "amazonka-ses"; - version = "1.0.1"; - sha256 = "d6ded081d5dded1b58b46d49255773e633bceb7d7526960e06dc40f0ea60bfce"; + version = "1.1.0"; + sha256 = "39b2031ca579c11992f093c9c6915133e4b182105434adb44823f3d0a56aeafd"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20429,8 +20483,8 @@ self: { }: mkDerivation { pname = "amazonka-sns"; - version = "1.0.1"; - sha256 = "eccab0209ca98f037e1e21abff164c4f6f29836e57b06bf307a97eab465bbbd7"; + version = "1.1.0"; + sha256 = "be2609584bb6e0af18af5b3a25c1281a0f665d993d8b8c14b310aba56287a3cf"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20449,8 +20503,8 @@ self: { }: mkDerivation { pname = "amazonka-sqs"; - version = "1.0.1"; - sha256 = "abf01ab527d589cc0f30d0ded41b88fb522cb003130063c1f56a8e92e1315161"; + version = "1.1.0"; + sha256 = "9bfb0cf6d07f1019bcfeeb4169c0a6dd6147e1eb9132b04f4cf256bbc8b7bcfd"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20469,8 +20523,8 @@ self: { }: mkDerivation { pname = "amazonka-ssm"; - version = "1.0.1"; - sha256 = "2aa03de9ff893045894c9873ef466100d2449e0ea5f7af3549559807a8209193"; + version = "1.1.0"; + sha256 = "3be89223c0c1110778bfeb32aeb3ed0b4fcdf85aedfce8c0a67ece34f1619f18"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20489,8 +20543,8 @@ self: { }: mkDerivation { pname = "amazonka-storagegateway"; - version = "1.0.1"; - sha256 = "676e938699d2ec73abab356c0a0a358067710ce3bf7bb210970afe90f01fd26e"; + version = "1.1.0"; + sha256 = "d3a8cd4205254d65e482ed96114cb98d233deb26d25a04a5f45b82dab01a6e0a"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20509,8 +20563,8 @@ self: { }: mkDerivation { pname = "amazonka-sts"; - version = "1.0.1"; - sha256 = "ee7f9e97fc8da24440781513995fbc5afded54a4ecc465a3d46511c22f2bd9a6"; + version = "1.1.0"; + sha256 = "566b295c705d94a91f479f82414cd3487e8e5872e1287d45d0d686670c024fb5"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20529,8 +20583,8 @@ self: { }: mkDerivation { pname = "amazonka-support"; - version = "1.0.1"; - sha256 = "4510faae1b970b48cd35519504edaa9f6f43c49ad97003c1893f34346d4483f6"; + version = "1.1.0"; + sha256 = "fd16936656d8d49b35c965945a886659c3f996fd4234843dfba7fb15152eb58f"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20549,8 +20603,8 @@ self: { }: mkDerivation { pname = "amazonka-swf"; - version = "1.0.1"; - sha256 = "84b940ed61beb7744807eb613fe8a9897f51ef609efed8f568f5d2b02e534c48"; + version = "1.1.0"; + sha256 = "85184fd03d9e0181f7f2ba7b4c1ad14b2ce46235fc5814659e3bee8e5437d323"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20569,8 +20623,8 @@ self: { }: mkDerivation { pname = "amazonka-workspaces"; - version = "1.0.1"; - sha256 = "1d110c2d674a53be3266d1c480d7adba18bd12706fb78bb81b9e26acc56cb53c"; + version = "1.1.0"; + sha256 = "0e7b0cc339022a304245f054d04e153671eaff927ad1e13c0f632bad7746ac56"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20885,8 +20939,8 @@ self: { ({ mkDerivation, base, unix }: mkDerivation { pname = "ansi-terminal"; - version = "0.6.2.1"; - sha256 = "965a38671ddd195b243af9d0284faedb52b852eace5f7cced11e6fcf2e47b7f6"; + version = "0.6.2.2"; + sha256 = "da082cfcbd7f65b808adea6c9915ad58643b8a22c7bcd21d3dbaf091828dd4bf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base unix ]; @@ -21162,22 +21216,21 @@ self: { "api-builder" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal - , containers, hspec, HTTP, http-client, http-client-tls - , http-conduit, http-types, text, transformers + , containers, hspec, HTTP, http-client, http-client-tls, http-types + , text, transformers }: mkDerivation { pname = "api-builder"; - version = "0.10.0.0"; - sha256 = "3bf1e59d1f1b60c646898e99465cfddd3ee97fd75d2f1620222cdb9a1fb8eb5f"; + version = "0.11.0.0"; + sha256 = "d8df94d14ffa9f0e60c88cf75eb221281c89251af67ac0a2068b3f774a0916c7"; libraryHaskellDepends = [ aeson base bifunctors bytestring HTTP http-client http-client-tls http-types text transformers ]; testHaskellDepends = [ - aeson base bytestring Cabal containers hspec http-conduit text + aeson base bytestring Cabal containers hspec http-client text transformers ]; - jailbreak = true; homepage = "https://github.com/intolerable/api-builder"; description = "Library for easily building REST API wrappers in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -21703,6 +21756,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "apportionment" = callPackage + ({ mkDerivation, base, containers, utility-ht }: + mkDerivation { + pname = "apportionment"; + version = "0.0.0.2"; + sha256 = "352d9564ffdb01d3312a1087f8badc544b3478185cbc27d4ca29fc1f18c9f82b"; + libraryHaskellDepends = [ base containers utility-ht ]; + homepage = "http://hub.darcs.net/thielema/apportionment"; + description = "Round a set of numbers while maintaining its sum"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "approx-rand-test" = callPackage ({ mkDerivation, base, Chart, Chart-diagrams, colour, conduit , containers, data-default, data-default-class, filepath, HUnit @@ -23645,8 +23710,8 @@ self: { }: mkDerivation { pname = "avers"; - version = "0.0.9"; - sha256 = "75a6040f0713f683ec4271c257514ed6a9a9f62315fb5471156f6f2016c18f7d"; + version = "0.0.12"; + sha256 = "fa8c71676e1400b94d38b5af8a8f0aa0335db1b867f1d22cc857b835aa61b90a"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring clock containers cryptohash filepath inflections MonadRandom mtl network network-uri @@ -23685,9 +23750,10 @@ self: { ({ mkDerivation, base, dependent-sum, mtl, process, shake }: mkDerivation { pname = "avr-shake"; - version = "0.0.1.1"; - sha256 = "f606330fbadb7f18fd6dd04585f2290ff601b76613853aff3b0c9ca95b4c722b"; + version = "0.0.1.2"; + sha256 = "60102786473f189ea0f97d97b91d9de5a2867dde466b96386c28afbe22e056cc"; libraryHaskellDepends = [ base dependent-sum mtl process shake ]; + jailbreak = true; homepage = "https://github.com/mokus0/avr-shake"; description = "AVR Crosspack actions for shake build systems"; license = stdenv.lib.licenses.publicDomain; @@ -24834,10 +24900,9 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "base-noprelude"; - version = "4.8.0.0"; - sha256 = "f4038cc4d2f47dc9c296e868e27a3087ced1cd865c65929e41be6e4ea19ab74f"; + version = "4.8.1.0"; + sha256 = "bd524ee4d4b9fb433a4f10eedf8605de3baccc9c2c533d1ab57ee6941ade4014"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/hvr/base-noprelude"; description = "\"base\" package sans \"Prelude\" module"; license = stdenv.lib.licenses.bsd3; @@ -26972,8 +27037,8 @@ self: { ({ mkDerivation, base, gmp, yices }: mkDerivation { pname = "bindings-yices"; - version = "0.2"; - sha256 = "c9a9ac5080030ee4a0c360af469745a2d96fb223946d9f64c4a9c83c4d87ce8f"; + version = "0.3.0.2"; + sha256 = "247eb63716c11cdda9275e2e726153cf19dd1a4bbd457170a2384cc55d4d18b5"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ gmp yices ]; description = "Bindings to the Yices theorem prover"; @@ -27645,24 +27710,25 @@ self: { }) {}; "bitx-bitcoin" = callPackage - ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit - , http-types, microlens, microlens-th, network, scientific, split - , text, time + ({ mkDerivation, aeson, base, bytestring, directory, hspec + , http-conduit, http-types, microlens, microlens-th, network + , pretty-show, scientific, split, text, time }: mkDerivation { pname = "bitx-bitcoin"; - version = "0.4.0.0"; - sha256 = "6c04902ab1ce6600373ba1f477878a17c6cfe00c3417596a3c96f22dbbfe492f"; + version = "0.4.0.1"; + sha256 = "2aa641c5e02e19814c707d8aa8b262411288e7db403afbee04b909507a6f8187"; libraryHaskellDepends = [ aeson base bytestring http-conduit http-types microlens microlens-th network scientific split text time ]; testHaskellDepends = [ - aeson base bytestring hspec microlens time + aeson base bytestring directory hspec microlens pretty-show text + time ]; homepage = "https://github.com/tebello-thejane/bitx-haskell"; description = "A Haskell library for working with the BitX bitcoin exchange"; - license = stdenv.lib.licenses.publicDomain; + license = stdenv.lib.licenses.bsd3; }) {}; "bk-tree" = callPackage @@ -27885,10 +27951,9 @@ self: { ({ mkDerivation, base, blaze-html, text }: mkDerivation { pname = "blaze-bootstrap"; - version = "0.1.0.0"; - sha256 = "3cdf5395b78914b273b989956ab53b83c8e36dbe6dd24c3305e2ba8e9ee42fe0"; + version = "0.1.0.1"; + sha256 = "53b54c0b55ae7a436ec7e5d4e29d50fceb1ccd459ef715236358a3c661d05163"; libraryHaskellDepends = [ base blaze-html text ]; - jailbreak = true; homepage = "http://github.com/agrafix/blaze-bootstrap"; description = "Blaze helper functions for bootstrap pages"; license = stdenv.lib.licenses.mit; @@ -28242,6 +28307,7 @@ self: { quickcheck-properties semigroups text time unordered-containers vector ]; + jailbreak = true; homepage = "https://github.com/bitemyapp/bloodhound"; description = "ElasticSearch client library for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -28606,6 +28672,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "both" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "both"; + version = "0.1.0.0"; + sha256 = "f30b3c55ade901bd6d15d4e359d7a58e5a44b44e4891d0c766731fd6879314fe"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/barrucadu/both"; + description = "Like Maybe, but with a different Monoid instance"; + license = stdenv.lib.licenses.mit; + }) {}; + "botpp" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -28828,20 +28906,22 @@ self: { "brick" = callPackage ({ mkDerivation, base, containers, contravariant, data-default - , Diff, lens, template-haskell, text, text-zipper, transformers - , vector, vty + , deepseq, Diff, lens, template-haskell, text, text-zipper + , transformers, vector, vty }: mkDerivation { pname = "brick"; - version = "0.1"; - sha256 = "b81c5276709795fd9fe14f2b456b36ee0f4ee399abaa2f738948492baf2fb230"; + version = "0.2"; + sha256 = "2bc36fd17d7dd465b370fc0b3ca49afd9cf78bc851bebd5341175a826dba9c97"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers contravariant data-default Diff lens + base containers contravariant data-default deepseq Diff lens template-haskell text text-zipper transformers vector vty ]; - executableHaskellDepends = [ base data-default lens text vty ]; + executableHaskellDepends = [ + base data-default lens text vector vty + ]; homepage = "https://github.com/jtdaugherty/brick/"; description = "A declarative terminal user interface library"; license = stdenv.lib.licenses.bsd3; @@ -29984,13 +30064,15 @@ self: { }: mkDerivation { pname = "cabal-bounds"; - version = "0.9.5"; - sha256 = "f053206ce48080c7166ede1053da9332ed73ffc8192f38e87dcfaa588e049a50"; + version = "1.0.1"; + sha256 = "07ece2976aaf2a496043039120889d1904efbb8c439581b099c70cc56d9d1720"; + revision = "1"; + editedCabalFile = "0bea75835dec3439d69a0c176bcc9aa5c82866e7293dcb60e49c7168800bd8eb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base Cabal cabal-lenses cmdargs either lens strict transformers - unordered-containers + base Cabal cabal-lenses cmdargs directory either filepath lens + strict transformers unordered-containers ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -30008,8 +30090,8 @@ self: { }: mkDerivation { pname = "cabal-cargs"; - version = "0.7.7"; - sha256 = "9f5ac25b0efcb8d9d41096c4e32c9c0ebae81cdef2be4e5d999348a9dd75c321"; + version = "0.7.8"; + sha256 = "0a13469b3077b242cc758f5b3b645d7fe4fca950d82c4b564ea616e7bd92e251"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -30070,8 +30152,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "4.30.2"; - sha256 = "bca7aae4e601e8bd72cee931cd8081331a7298f07db2260fbb3a5a0103ee4eed"; + version = "4.31.4"; + sha256 = "f700f3fef9d6ec3e95468cfe65c7b77b4ec560668ec876aeed01d833804c18bd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -30085,8 +30167,8 @@ self: { base Cabal debian lens mtl pretty Unixutils ]; testHaskellDepends = [ - base Cabal containers debian Diff filepath hsemail HUnit lens - pretty process text + base Cabal containers debian Diff directory filepath hsemail HUnit + lens pretty process text ]; homepage = "https://github.com/ddssff/cabal-debian"; description = "Create a Debianization for a Cabal package"; @@ -30217,8 +30299,8 @@ self: { }: mkDerivation { pname = "cabal-helper"; - version = "0.5.1.0"; - sha256 = "563773491cc8245c3d265c2e7847f95198aad74adcbc16a91622e7e4abef4e45"; + version = "0.5.2.0"; + sha256 = "e4328860abef0a6ff97357810f6f067018e40e0e28fa9df3b51efbc7421f689f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -30367,12 +30449,17 @@ self: { }) {}; "cabal-lenses" = callPackage - ({ mkDerivation, base, Cabal, lens, unordered-containers }: + ({ mkDerivation, base, Cabal, either, lens, strict, system-fileio + , system-filepath, text, transformers, unordered-containers + }: mkDerivation { pname = "cabal-lenses"; - version = "0.4.5"; - sha256 = "b668afea6a4d1e26384c4e7ce19cb14a54ce717c9e045661585f15a82ab109ec"; - libraryHaskellDepends = [ base Cabal lens unordered-containers ]; + version = "0.4.6"; + sha256 = "1fdb9c5e82cd1b82c0aff5392375baa339261684e8260c77308334433ea52dac"; + libraryHaskellDepends = [ + base Cabal either lens strict system-fileio system-filepath text + transformers unordered-containers + ]; jailbreak = true; description = "Lenses and traversals for the Cabal library"; license = stdenv.lib.licenses.bsd3; @@ -33057,8 +33144,8 @@ self: { pname = "chunked-data"; version = "0.2.0"; sha256 = "9aa0f3c81f9b0d7c1dde206501415f01638f20eebfbe1386dfd802bcc1bab272"; - revision = "1"; - editedCabalFile = "ba9fa66cf9c9995dfec2c5735692d6f52343a48d6c9cae4242ec399e0f421fdc"; + revision = "2"; + editedCabalFile = "8e667f090de9d53e254c511c8658c15f3c097b7652611b4f65bfabd5151319d0"; libraryHaskellDepends = [ base blaze-builder bytestring containers mono-traversable semigroups text transformers vector @@ -33731,8 +33818,8 @@ self: { }: mkDerivation { pname = "classy-prelude"; - version = "0.12.1.1"; - sha256 = "670a85ffd10ff467e5eec1164462932c00bb6282cda2987a2b92c82f09ac3d13"; + version = "0.12.3"; + sha256 = "fd7b6e97c8e462844598f76f9aef4c4f445cd833e3b72eebcc94e8c20a7d3a24"; libraryHaskellDepends = [ base basic-prelude bifunctors bytestring chunked-data containers dlist enclosed-exceptions exceptions ghc-prim hashable lifted-base @@ -33755,8 +33842,8 @@ self: { }: mkDerivation { pname = "classy-prelude-conduit"; - version = "0.12.0.1"; - sha256 = "b12758b3ebe429268ca5a0f18a61ffc9429d6cdc00b4362742ea0717460462f7"; + version = "0.12.3"; + sha256 = "d86127153f9a69a2ed87777a0a93d8174c7ff136cbefb470879982b3b4875970"; libraryHaskellDepends = [ base bytestring classy-prelude conduit conduit-combinators monad-control resourcet transformers void @@ -33776,8 +33863,8 @@ self: { }: mkDerivation { pname = "classy-prelude-yesod"; - version = "0.12.0.1"; - sha256 = "220f42a881672837513de5a425fa060fa545436b99baa02c6d5faaa697a6ff02"; + version = "0.12.3"; + sha256 = "ddc03c6e473e3355f5c5efa3cd1eecf15605ef3a109038d0350eb5890b6a3c9d"; libraryHaskellDepends = [ aeson base classy-prelude classy-prelude-conduit data-default http-conduit http-types persistent yesod yesod-newsfeed @@ -33836,6 +33923,7 @@ self: { ]; librarySystemDepends = [ openssl ]; libraryToolDepends = [ hsx2hs ]; + jailbreak = true; homepage = "http://www.clckwrks.com/"; description = "A secure, reliable content management system (CMS) and blogging platform"; license = stdenv.lib.licenses.bsd3; @@ -33855,6 +33943,7 @@ self: { executableHaskellDepends = [ acid-state base clckwrks haskeline mtl network parsec ]; + jailbreak = true; homepage = "http://www.clckwrks.com/"; description = "a command-line interface for adminstrating some aspects of clckwrks"; license = stdenv.lib.licenses.bsd3; @@ -33930,6 +34019,7 @@ self: { safecopy text web-plugins web-routes web-routes-th ]; libraryToolDepends = [ hsx2hs ]; + jailbreak = true; homepage = "http://clckwrks.com/"; description = "ircbot plugin for clckwrks"; license = stdenv.lib.licenses.bsd3; @@ -33954,6 +34044,7 @@ self: { web-routes-th ]; libraryToolDepends = [ hsx2hs ]; + jailbreak = true; homepage = "http://clckwrks.com/"; description = "media plugin for clckwrks"; license = stdenv.lib.licenses.bsd3; @@ -33980,6 +34071,7 @@ self: { web-plugins web-routes web-routes-happstack web-routes-th ]; libraryToolDepends = [ hsx2hs ]; + jailbreak = true; homepage = "http://www.clckwrks.com/"; description = "support for CMS/Blogging in clckwrks"; license = stdenv.lib.licenses.bsd3; @@ -34011,8 +34103,8 @@ self: { }: mkDerivation { pname = "clckwrks-theme-clckwrks"; - version = "0.5.0"; - sha256 = "1b72c96e2c6a2d04c3ec53727b72ab3454f82192f5f77f83ca672a56cfc55f1b"; + version = "0.5.1"; + sha256 = "93540dc0dafbf1e9bc6863c215391905201bc4653133fd01c0f0c6a9bacd6858"; libraryHaskellDepends = [ base clckwrks containers happstack-authenticate hsp hsx2hs mtl text web-plugins @@ -34543,8 +34635,8 @@ self: { ({ mkDerivation, base, bytestring, HUnit, text }: mkDerivation { pname = "cmark"; - version = "0.4.0.1"; - sha256 = "638328b59c2bb8bdcd0f3042c4554f2b2b7c6deac7770dbc8bc2813c865a35ce"; + version = "0.4.1"; + sha256 = "22f006ba36620476916c605b92de8e1f325eb2b5ebec6b30c12aee6220262330"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base HUnit text ]; homepage = "https://github.com/jgm/commonmark-hs"; @@ -36085,8 +36177,8 @@ self: { }: mkDerivation { pname = "concurrent-machines"; - version = "0.1.0.0"; - sha256 = "846fd1bcb15551750da36f525050fc0a5f03c752ccd421fb90dfc92f595a9de6"; + version = "0.1.0.1"; + sha256 = "d3db20a02c415f8aa68832212738a09d5847b31549270529c69cc4c2bd2a832e"; libraryHaskellDepends = [ async base containers lifted-async machines monad-control semigroups time transformers transformers-base @@ -36313,10 +36405,8 @@ self: { ({ mkDerivation, base, conduit, vector }: mkDerivation { pname = "conduit-audio"; - version = "0.1"; - sha256 = "8bfabae0f9e9322ffd91e1cd8afbe6a5eb716d46c0035876ab7368c44fb6bdf6"; - revision = "1"; - editedCabalFile = "bf853ba8300deda982d278245bd268e91f444ca42185bd0d57eb9feae5ab066c"; + version = "0.2"; + sha256 = "8cabe59479eb5b02cea6d64c177181eba19affe6dfb1335ae437e992417b9d55"; libraryHaskellDepends = [ base conduit vector ]; homepage = "http://github.com/mtolly/conduit-audio"; description = "Combinators to efficiently slice and dice audio streams"; @@ -36331,8 +36421,8 @@ self: { pname = "conduit-audio-lame"; version = "0.1"; sha256 = "3c85eec27bb2dbfa5f625624d1dc8ccabf22a4f62508d50a9d940be7c9aa9644"; - revision = "1"; - editedCabalFile = "34e31416cde87ad1d75570612f3e95d8f54cbeac0539a6f85b93aebaf3979c1a"; + revision = "2"; + editedCabalFile = "515e004751c00e38b2d55e549fc2c1fd73cbf86a113e9b35b2a681fcc80a546d"; libraryHaskellDepends = [ base bytestring conduit conduit-audio resourcet transformers vector ]; @@ -36351,8 +36441,8 @@ self: { pname = "conduit-audio-samplerate"; version = "0.1"; sha256 = "4f7781a30e57f6fd38f35d565ca4a94640e5b9ed62b821e7a3723d6d41a34513"; - revision = "1"; - editedCabalFile = "c3601c344d95841d594827a61b1a7ad05042dec6f62ce9952e88b3d0fe814a63"; + revision = "2"; + editedCabalFile = "6a1b8fd7fe0e3bda31d7e02eddfbf9ad569f74a130a2985b55cf09334ee0fd76"; libraryHaskellDepends = [ base conduit conduit-audio resourcet transformers vector ]; @@ -36371,8 +36461,8 @@ self: { pname = "conduit-audio-sndfile"; version = "0.1"; sha256 = "6d35ed7b38479ce2b6946d661abe11aa69c1db6821b14b52618e273604fb1b6c"; - revision = "1"; - editedCabalFile = "f753b66e55fc5332463bc54a7077b9c503439cd03c7c1c799cd60751ab954a87"; + revision = "2"; + editedCabalFile = "2a067b3ffad200da8d993ba8c57f53580b3505d912b9c9dfb160674e642f749a"; libraryHaskellDepends = [ base conduit conduit-audio hsndfile hsndfile-vector resourcet transformers @@ -37953,12 +38043,15 @@ self: { }: mkDerivation { pname = "courier"; - version = "0.1.0.15"; - sha256 = "5b14d1d5d2bd4efb563a8e5111cd23c5892034b6bfcd2e34ead8c9c3b35549aa"; + version = "0.1.1.1"; + sha256 = "950216558b5729d592c2bfd9b230ab25fe0403cd5cfa6825ec9b6123fc330ad6"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ async base bytestring cereal containers hslogger network stm text uuid ]; + executableHaskellDepends = [ base cereal ]; testHaskellDepends = [ async base cereal containers directory hslogger HUnit network stm test-framework test-framework-hunit @@ -37989,6 +38082,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "coverage" = callPackage + ({ mkDerivation, base, hspec, QuickCheck }: + mkDerivation { + pname = "coverage"; + version = "0.1.0.2"; + sha256 = "ba99dccf43de1021322a870e03fc74b9a46bc5bdffde302859f19870065e6df0"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec QuickCheck ]; + jailbreak = true; + homepage = "https://github.com/nicodelpiano/coverage"; + description = "Exhaustivity Checking Library"; + license = stdenv.lib.licenses.mit; + }) {}; + "cpio-conduit" = callPackage ({ mkDerivation, base, base16-bytestring, binary, bytestring , conduit, conduit-extra, resourcet @@ -38034,8 +38141,8 @@ self: { }: mkDerivation { pname = "cpphs"; - version = "1.19.2"; - sha256 = "bb45b22d8b00605942bc2f675c43ba826e9a861cfe1474f1aad9d427e16690a4"; + version = "1.19.3"; + sha256 = "e2546aa382e9c22942c5c2849631edc6b1d8cbea2c50762f66b740755faf57da"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38089,8 +38196,8 @@ self: { ({ mkDerivation, array, base, containers, parallel }: mkDerivation { pname = "cpsa"; - version = "2.5.2"; - sha256 = "05b32a60a1ec193beafa4e9009b210bb81933cdf30a798611e64aa13a4e2a27e"; + version = "2.5.3"; + sha256 = "c7f2d323f0b558e8a39a387f21d7f93b8449f25082d7e8515cc7f805d2a31919"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers parallel ]; @@ -39340,8 +39447,8 @@ self: { }: mkDerivation { pname = "css-syntax"; - version = "0.0.2"; - sha256 = "9ee149c46c3f76d46943bf7b374be79535aaec393b3a5dc2f176636c76382115"; + version = "0.0.4"; + sha256 = "9b9254e3471b7be615f8546a5f46b1a338d81be0f2724aa107311c3ee6ee6bd9"; libraryHaskellDepends = [ attoparsec base bytestring scientific text ]; @@ -41333,11 +41440,13 @@ self: { pname = "data-reify"; version = "0.6.1"; sha256 = "61350a1e96cb1276c2b6b8b13fa1bade5d4e63c702509a3f5e90bbc19ad9b202"; + revision = "1"; + editedCabalFile = "f7f3a5b2f482a67eb77f4ba32e15f91bcfa4c220cdda9dde22cd9d9ff18ab447"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; executableHaskellDepends = [ base ]; - homepage = "http://www.ittc.ku.edu/csdl/fpg/Tools/IOReification"; + homepage = "http://ku-fpg.github.io/software/data-reify/"; description = "Reify a recursive data structure into an explicit graph"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -42296,6 +42405,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "dead-code-detection" = callPackage + ({ mkDerivation, base, containers, directory, filepath + , getopt-generics, ghc, ghc-paths, gitrev, Glob, graph-wrapper + , hspec, interpolate, mockery, silently, string-conversions + , uniplate + }: + mkDerivation { + pname = "dead-code-detection"; + version = "0.1.1"; + sha256 = "45bc29a1b21001d9b5524f6fe808581d1871cb97e330637ba6fe4e06aef66351"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers getopt-generics ghc ghc-paths gitrev Glob + graph-wrapper silently string-conversions uniplate + ]; + testHaskellDepends = [ + base containers directory filepath getopt-generics ghc ghc-paths + gitrev Glob graph-wrapper hspec interpolate mockery silently + string-conversions uniplate + ]; + homepage = "https://github.com/soenkehahn/dead-code-detection#readme"; + description = "detect dead code in haskell projects"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dead-simple-json" = callPackage ({ mkDerivation, base, containers, parsec, template-haskell , transformers, vector @@ -42322,8 +42457,8 @@ self: { }: mkDerivation { pname = "debian"; - version = "3.87.2"; - sha256 = "2994078f24cc7467bf8ffbd14cd8838aebaceb659856f77fb91d59bbbe06ae8c"; + version = "3.88"; + sha256 = "9b347387432ca20fb4bba123cdb4de8e4ae05d49a4433d1609f37215620e6e56"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42492,14 +42627,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "deepseq_1_4_1_1" = callPackage + "deepseq_1_4_1_2" = callPackage ({ mkDerivation, array, base, HUnit, test-framework , test-framework-hunit }: mkDerivation { pname = "deepseq"; - version = "1.4.1.1"; - sha256 = "908158eb30ac6abe2fb32d9c07cc2c3dae886867520b5529c09b5e87db32b3bf"; + version = "1.4.1.2"; + sha256 = "3b7cfa5ff5eb169b3f97285be978f030d664c6e3e84a2525b2fafca4f7380651"; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ array base HUnit test-framework test-framework-hunit @@ -42917,8 +43052,8 @@ self: { ({ mkDerivation, base, containers, dependent-sum }: mkDerivation { pname = "dependent-map"; - version = "0.1.1.3"; - sha256 = "44dd913868dddfaa104c27794cbf852e8c4783fe78f49b3b2dd635b4731ec8af"; + version = "0.2.0.1"; + sha256 = "645c5c519d5cb6393ee826dfca183736be84fda87e980f0daecd7be207bb8f50"; libraryHaskellDepends = [ base containers dependent-sum ]; homepage = "https://github.com/mokus0/dependent-map"; description = "Dependent finite maps (partial dependent products)"; @@ -42929,8 +43064,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "dependent-sum"; - version = "0.2.1.0"; - sha256 = "835e799c9749822f2818dd5c7dc1e887d4c5b5a6bb37c7e4c0661a2060d6dcc0"; + version = "0.3.2.1"; + sha256 = "b91338c9d18b8977114c3ef962dc224b6a7ff12b0861c536f560260429b6a42f"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/mokus0/dependent-sum"; description = "Dependent sum type"; @@ -43245,6 +43380,7 @@ self: { sha256 = "3adffba07d4fdca79909331ec0029e09cf7895cadada5613f3e359d777c8bcc1"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base hspec ]; + jailbreak = true; homepage = "https://github.com/TGOlson/deterministic-game-engine"; description = "Simple deterministic game engine"; license = stdenv.lib.licenses.mit; @@ -44025,13 +44161,12 @@ self: { }: mkDerivation { pname = "digestive-bootstrap"; - version = "0.1.0.0"; - sha256 = "ffcf11ad8a5692569df86fdc967ce3ccaafa9b1d973f92893091e924e8683030"; + version = "0.1.0.1"; + sha256 = "eb7d7586903f07c4519c4ff862923344e912268f686394cb4f550bd9ef0418f7"; libraryHaskellDepends = [ base blaze-bootstrap blaze-html digestive-functors digestive-functors-blaze http-types text ]; - jailbreak = true; description = "Speed up form designing using digestive functors and bootstrap"; license = stdenv.lib.licenses.mit; }) {}; @@ -44374,6 +44509,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diplomacy-server" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , deepseq, diplomacy, filepath, hourglass, json-schema, mtl + , optparse-applicative, parsec, random, rest-core, rest-wai, stm + , Stream, text, transformers, transformers-compat, TypeNat, wai + , warp, warp-tls + }: + mkDerivation { + pname = "diplomacy-server"; + version = "0.1.0.0"; + sha256 = "36de8e6754843331fa36f1da296dd467dc6267a80bce3d907e4f73f4f2e4dcf6"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson async base bytestring containers deepseq diplomacy filepath + hourglass json-schema mtl optparse-applicative parsec random + rest-core rest-wai stm Stream text transformers transformers-compat + TypeNat wai warp warp-tls + ]; + jailbreak = true; + homepage = "https://github.com/avieth/diplomacy-server"; + description = "Play Diplomacy over HTTP"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "direct-binary-files" = callPackage ({ mkDerivation, base, bytestring, mtl }: mkDerivation { @@ -45291,8 +45451,8 @@ self: { ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: mkDerivation { pname = "dlist"; - version = "0.7.1.1"; - sha256 = "08b07f28e01f4a7e17239c33b37fbef0bf6073712337a97a145a583577df5efd"; + version = "0.7.1.2"; + sha256 = "332d21f16fd30d2534b6ab96c98830a14266d8f368cff21f6a47469fb3493783"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base Cabal QuickCheck ]; homepage = "https://github.com/spl/dlist"; @@ -46376,21 +46536,20 @@ self: { }) {}; "dtab" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , data-binary-ieee754, pretty, transformers + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , data-binary-ieee754, happy, pretty, transformers }: mkDerivation { pname = "dtab"; - version = "1.0"; - sha256 = "43067c07ec8dd6bedcaa985a51df834987172ba2153d089e5edf7729e99da5ff"; - revision = "2"; - editedCabalFile = "50fe31cffb6f7eab4428bf547fd0c7e7804a0f20c604692a18b213d4a54a0a7a"; + version = "1.0.0.1"; + sha256 = "d696fd2a9019c9b4916831f88217f92f809dc4341b5ffc506f8e786d91bbe069"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base binary bytestring containers data-binary-ieee754 pretty transformers ]; + libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base bytestring ]; description = "Harmonix (Guitar Hero, Rock Band) DTA/DTB metadata library"; license = "GPL"; @@ -48721,8 +48880,8 @@ self: { ({ mkDerivation, base, containers, hspec }: mkDerivation { pname = "envparse"; - version = "0.2.1"; - sha256 = "8f71913f13df34dc5092ae4d5808c086e7b7d84a0696d6891bf4727254a37dde"; + version = "0.2.2"; + sha256 = "72bbac6a4c6755c6f1f0b68a68475afb71cd6763e8fb90c88411457ff16f4a03"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers hspec ]; homepage = "https://supki.github.io/envparse"; @@ -48745,6 +48904,7 @@ self: { base bytestring hspec mtl QuickCheck quickcheck-instances text time transformers ]; + jailbreak = true; description = "An environmentally friendly way to deal with environment variables"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -49516,6 +49676,7 @@ self: { base directory hlint hspec process regex-posix xml ]; testToolDepends = [ happy ]; + jailbreak = true; homepage = "https://github.com/decomputed/euler"; description = "Mathematics utilities for Haskell"; license = stdenv.lib.licenses.mit; @@ -49737,8 +49898,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "exact-pi"; - version = "0.2.1.1"; - sha256 = "6ff443ecd07f8727089202b881125c85ef21818594ffa910dfa41eaa54eb14b9"; + version = "0.2.1.2"; + sha256 = "a6a6239cf13b18409996bad40c487b80fdf03b87fea48bb0309e32e47243ee38"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/dmcclean/exact-pi"; description = "Exact rational multiples of pi (and integer powers of pi)"; @@ -50643,6 +50804,7 @@ self: { sha256 = "c6bde8e127af0dbb2b6e426ef34eb3fafe32ccb32358b8482774e6fc4ab91e7f"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring hspec QuickCheck ]; + jailbreak = true; homepage = "https://github.com/abhinav/farmhash"; description = "Fast hash functions"; license = stdenv.lib.licenses.bsd3; @@ -50689,6 +50851,8 @@ self: { pname = "fast-logger"; version = "2.4.1"; sha256 = "e51218b5a00b8b5746fcbd1666262f9ae77b9daea5c4e351459a321c0c0a534e"; + revision = "1"; + editedCabalFile = "d33a479d4e18cae6671cd21fa47d3a62cd5674b2f234e35403bb3a8c7a56ae11"; libraryHaskellDepends = [ array auto-update base bytestring bytestring-builder directory filepath text @@ -51568,6 +51732,7 @@ self: { array base containers deepseq transformers ]; testHaskellDepends = [ base containers hspec QuickCheck ]; + jailbreak = true; description = "Martin Erwig's Functional Graph Library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -51580,6 +51745,7 @@ self: { sha256 = "840db22168432e752f9eaf7a2564afd20a0442342b61cea1ec63b21832612684"; libraryHaskellDepends = [ base fgl QuickCheck ]; testHaskellDepends = [ base containers fgl hspec QuickCheck ]; + jailbreak = true; description = "QuickCheck support for fgl"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -53002,6 +53168,7 @@ self: { sha256 = "ab4af7e815cfa2345cdf17c0e765da575f66c0b9b978c8234d620fcf933800db"; libraryHaskellDepends = [ base data-default stm stm-delay time ]; testHaskellDepends = [ base hspec stm time ]; + jailbreak = true; homepage = "https://github.com/debug-ito/fold-debounce"; description = "Fold multiple events that happen in a given period of time"; license = stdenv.lib.licenses.bsd3; @@ -53022,6 +53189,7 @@ self: { testHaskellDepends = [ base conduit hspec resourcet stm transformers ]; + jailbreak = true; homepage = "https://github.com/debug-ito/fold-debounce-conduit"; description = "Regulate input traffic from conduit Source with Control.FoldDebounce"; license = stdenv.lib.licenses.bsd3; @@ -53391,6 +53559,7 @@ self: { base bytestring data-default-class double-conversion hspec HUnit lens old-locale QuickCheck text time ]; + jailbreak = true; homepage = "https://github.com/Soostone/formattable"; description = "Business-quality formatting of numbers, dates, and other things"; license = stdenv.lib.licenses.bsd3; @@ -54108,8 +54277,8 @@ self: { ({ mkDerivation, base, containers, mtl, transformers }: mkDerivation { pname = "frpnow"; - version = "0.13"; - sha256 = "192b41e9c307dedc7004ff0e2bb50c4025a26de932dc7fa8ba6c7ffe83f3bb8d"; + version = "0.17"; + sha256 = "93da2b38fd2a597b2338e7fa132b207c690ad8c3edd26f1dda2fdcac29908b35"; libraryHaskellDepends = [ base containers mtl transformers ]; homepage = "https://github.com/atzeus/FRPNow"; description = "Principled practical FRP"; @@ -56188,8 +56357,8 @@ self: { ({ mkDerivation, base, cpphs, ghc, happy }: mkDerivation { pname = "ghc-parser"; - version = "0.1.7.0"; - sha256 = "e3e085bd656c8865d80994ad909960de448719394d1d033b75b4c6fc756a6031"; + version = "0.1.8.0"; + sha256 = "494e9df73942c5e77e01c331eaee94438c15c711d78f48c1d1c4d8977ffb5152"; libraryHaskellDepends = [ base ghc ]; libraryToolDepends = [ cpphs happy ]; homepage = "https://github.com/gibiansky/IHaskell"; @@ -57116,12 +57285,19 @@ self: { }) {}; "github-types" = callPackage - ({ mkDerivation, aeson, base, text }: + ({ mkDerivation, aeson, aeson-pretty, base, hspec, hspec-smallcheck + , http-conduit, smallcheck, text, time, unordered-containers + , vector + }: mkDerivation { pname = "github-types"; - version = "0.1.0.5"; - sha256 = "f1a4b62882d6b2f263cb411047d947ff0555be338a3699338816f20cd45bd553"; - libraryHaskellDepends = [ aeson base text ]; + version = "0.2.0"; + sha256 = "3f3675dff4076ddc64021bb5cbe89e5b609c65d2f08463a3d12d760b779ee4d8"; + libraryHaskellDepends = [ aeson base text time ]; + testHaskellDepends = [ + aeson aeson-pretty base hspec hspec-smallcheck http-conduit + smallcheck text time unordered-containers vector + ]; description = "Type definitions for objects used by the GitHub v3 API"; license = "unknown"; }) {}; @@ -57203,22 +57379,23 @@ self: { }: mkDerivation { pname = "gitit"; - version = "0.11.1.1"; - sha256 = "bc8a5662a8e262a3ebaba270f54781db28407acd2fb441fbadc6df019d7a8ec4"; + version = "0.12.0.1"; + sha256 = "552996f2624ed08cd21a73303d666292f08a1294416d2811f9d57293c9e89506"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base filepath ghc ghc-paths pandoc pandoc-types safe - ]; - executableHaskellDepends = [ aeson base base64-bytestring blaze-html bytestring ConfigFile containers directory feed filepath filestore ghc ghc-paths happstack-server highlighting-kate hoauth2 hslogger HStringTemplate HTTP http-client-tls http-conduit json mtl network network-uri old-locale old-time pandoc pandoc-types parsec pretty process - random recaptcha SHA split syb tagsoup text time uri url + random recaptcha safe SHA split syb tagsoup text time uri url utf8-string uuid xhtml xml xss-sanitize zlib ]; + executableHaskellDepends = [ + base bytestring directory filepath hslogger HTTP mtl network + network-uri syb url utf8-string + ]; homepage = "http://gitit.net"; description = "Wiki using happstack, git or darcs, and pandoc"; license = "GPL"; @@ -57725,6 +57902,7 @@ self: { libraryHaskellDepends = [ base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL ]; + jailbreak = true; homepage = "http://gloss.ouroborus.net"; description = "Painless 2D vector graphics, animations and simulations"; license = stdenv.lib.licenses.mit; @@ -57875,6 +58053,7 @@ self: { libraryHaskellDepends = [ base bmp bytestring containers GLUT OpenGL ]; + jailbreak = true; description = "Gloss picture data types and rendering functions"; license = stdenv.lib.licenses.mit; }) {}; @@ -57912,8 +58091,8 @@ self: { }: mkDerivation { pname = "glue"; - version = "0.1.2"; - sha256 = "55a2bee39073ad16ddfd2879ec91c8eb9dd78cd2e25498ef39ad6f8dc1f6ae45"; + version = "0.1.3"; + sha256 = "4668671d2ebeb32c567c8fa6f2ca46f352695e63f17fb45162837b5889f1dde7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59196,8 +59375,8 @@ self: { pname = "groundhog"; version = "0.7.0.3"; sha256 = "39713e7b3423ea34a5ac803d4a563d7f9674bbf72700e263a00c7bc70328ac58"; - revision = "1"; - editedCabalFile = "dcf9bbeaf0fd7e7ac0809902a54779097e8935a07b1e7e43c404bc683c17e7f0"; + revision = "2"; + editedCabalFile = "b4a2f7876feaaf6ad8d4589989902d4452468910c0f3f01a04827a001036f3ff"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-builder bytestring containers monad-control monad-logger mtl scientific text time @@ -59846,8 +60025,8 @@ self: { }: mkDerivation { pname = "gtk3"; - version = "0.14.0"; - sha256 = "ec548d8a63caabf449ada2c3f2589c6b15e741572affb8362161fd2ab7e4d6c8"; + version = "0.14.1"; + sha256 = "4ebbb02611cbbc2a0ff592afb8cf37ffc6c10ec716464975872f46853c38c5a7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -60969,13 +61148,14 @@ self: { pname = "hackage-diff"; version = "0.1.0.0"; sha256 = "bf8010479ba75032c6750444edc7979a65c6ce4c919a629562ddd81aa03aac4d"; + revision = "1"; + editedCabalFile = "eddc65fed41375eaa4ce2aa729bd35364d558d7e33b23fcafca58dd6ce3cff1c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ ansi-terminal async attoparsec base Cabal cpphs directory filepath haskell-src-exts HTTP mtl process text ]; - jailbreak = true; homepage = "https://github.com/blitzcode/hackage-diff"; description = "Compare the public API of different versions of a Hackage library"; license = stdenv.lib.licenses.mit; @@ -61058,6 +61238,61 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hackage-repo-tool" = callPackage + ({ mkDerivation, base, bytestring, Cabal, directory, filepath + , hackage-security, network, network-uri, optparse-applicative, tar + , time, unix, zlib + }: + mkDerivation { + pname = "hackage-repo-tool"; + version = "0.1.0.0"; + sha256 = "421eed1316a7f54d5e5d5895ff70129a7efaf0d4d2e10b27bc293ba3786c496b"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring Cabal directory filepath hackage-security network + network-uri optparse-applicative tar time unix zlib + ]; + homepage = "http://github.com/well-typed/hackage-security/"; + description = "Utility to manage secure file-based package repositories"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hackage-security" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, Cabal + , containers, cryptohash, directory, ed25519, filepath, ghc-prim + , mtl, network, network-uri, parsec, tar, template-haskell, time + , transformers, zlib + }: + mkDerivation { + pname = "hackage-security"; + version = "0.2.0.0"; + sha256 = "db1abeb34db8ecabc4e70db7a71f49789a0a1839b78dbc813f09d25973aea8d4"; + libraryHaskellDepends = [ + base base64-bytestring bytestring Cabal containers cryptohash + directory ed25519 filepath ghc-prim mtl network network-uri parsec + tar template-haskell time transformers zlib + ]; + description = "Hackage security library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hackage-security-HTTP" = callPackage + ({ mkDerivation, base, bytestring, hackage-security, HTTP, mtl + , network, network-uri, zlib + }: + mkDerivation { + pname = "hackage-security-HTTP"; + version = "0.1.0.1"; + sha256 = "56b526b2ed23201474f111f3b7ad6d77fa5359acd27498ab4a95b451617612fa"; + libraryHaskellDepends = [ + base bytestring hackage-security HTTP mtl network network-uri zlib + ]; + homepage = "http://github.com/well-typed/hackage-security/"; + description = "Hackage security bindings against the HTTP library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hackage-server" = callPackage ({ mkDerivation, acid-state, aeson, alex, array, async, attoparsec , base, base16-bytestring, base64-bytestring, binary, blaze-builder @@ -61198,6 +61433,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hackmanager" = callPackage + ({ mkDerivation, base, bytestring, Cabal, directory, file-embed + , Glob, hastache, http-client, http-client-tls, http-types, mtl + , optparse-applicative, process, text + }: + mkDerivation { + pname = "hackmanager"; + version = "0.1.0.0"; + sha256 = "8a5cebf772c8f99b2e56deb9f64a90344ded1528ac1a9967eab2776d72053546"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring Cabal directory file-embed Glob hastache + http-client http-client-tls http-types mtl process text + ]; + executableHaskellDepends = [ base optparse-applicative text ]; + homepage = "http://github.com/agrafix/hackmanager"; + description = "Generate useful files for Haskell projects"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hackport" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , directory, extensible-exceptions, filepath, HTTP, HUnit, MissingH @@ -61880,6 +62136,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hakyll-sass" = callPackage + ({ mkDerivation, base, data-default-class, hakyll, hsass }: + mkDerivation { + pname = "hakyll-sass"; + version = "0.1.0"; + sha256 = "b127379ebf20f96f5974a9f8212aa3aeed04b9e22788bc29cc9994f6f69e926c"; + libraryHaskellDepends = [ base data-default-class hakyll hsass ]; + homepage = "https://github.com/meoblast001/hakyll-sass"; + description = "Hakyll SASS compiler over hsass"; + license = stdenv.lib.licenses.mit; + }) {}; + "halberd" = callPackage ({ mkDerivation, base, Cabal, containers, haskell-names , haskell-packages, haskell-src-exts, HUnit, mtl, safe, split, syb @@ -62225,17 +62493,17 @@ self: { "hans" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bytestring, cereal , containers, fingertree, HTTP, monadLib, network, old-locale - , random, time, unix + , random, stm, time, unix }: mkDerivation { pname = "hans"; - version = "2.5.0.0"; - sha256 = "17f018763926d55ab8cc0cb763526a99399003ecaba37a7dd52157c62ce7f5a7"; + version = "2.6.0.0"; + sha256 = "2853847c2d8823e43904ddcd2fa4ad1e1b15178a18e703293459866601c057a5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring cereal containers fingertree monadLib random time - unix + base bytestring cereal containers fingertree monadLib random stm + time unix ]; executableHaskellDepends = [ base blaze-html blaze-markup bytestring cereal containers HTTP @@ -62646,6 +62914,7 @@ self: { monad-control mtl reform reform-happstack reform-hsp safecopy text web-routes web-routes-happstack web-routes-hsp web-routes-th ]; + jailbreak = true; homepage = "http://www.happstack.com/"; description = "Glue code for using Happstack with acid-state, web-routes, reform, and HSP"; license = stdenv.lib.licenses.bsd3; @@ -63134,8 +63403,8 @@ self: { }: mkDerivation { pname = "harmony"; - version = "0.1.0.3"; - sha256 = "c4d91ca6923e9d04d72590eb309020e6937aa3097b3b649db6803e527eb4c092"; + version = "0.1.1.0"; + sha256 = "453e3a4db149729e19bcbd6970abf0ed9d3c25dfffeac2c3cb5be3dcfdddc5dd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -65111,15 +65380,15 @@ self: { "haskmon" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, http-streams - , io-streams, old-locale, time, vector + , io-streams, time, vector }: mkDerivation { pname = "haskmon"; - version = "0.1.1.0"; - sha256 = "e4543d24662764a8c646b9552129ffd36a06c58c6df8f8889f2b177b9a0457f7"; + version = "0.2.1.0"; + sha256 = "69ac7e21a62f20c2fce94db01c373dbd66876a0cb016ab25a99a9dedc4f62677"; libraryHaskellDepends = [ - aeson base bytestring containers http-streams io-streams old-locale - time vector + aeson base bytestring containers http-streams io-streams time + vector ]; jailbreak = true; description = "A haskell wrapper for PokeAPI.co (www.pokeapi.co)"; @@ -66191,8 +66460,8 @@ self: { }: mkDerivation { pname = "hbro"; - version = "1.4.0.1"; - sha256 = "aafda5f16e1bc86dec50dde8ff18dbcb086987faba87cbe425225e59d107318a"; + version = "1.5.0.0"; + sha256 = "8f66263f288dba0e90cce6d6b9d2682b71acc46c2790128cba78b984c7990d6f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66217,8 +66486,8 @@ self: { }: mkDerivation { pname = "hbro-contrib"; - version = "1.4.0.0"; - sha256 = "425fbad68bd203ed4094d3c6b96d3e2d46818ec1ea6a950da8852978c3ebf86c"; + version = "1.5.0.0"; + sha256 = "0331c2024f52cfbefba781095e8309fd20cd32082a9a8887c3fcb4f52fc76fbc"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring classy-prelude containers directory glib gtk3 hbro lens monad-control mtl network-uri pango @@ -67767,12 +68036,12 @@ self: { }: mkDerivation { pname = "hexpat-lens"; - version = "0.1.3"; - sha256 = "d96d6048d8f7f6773ad8322c8ba94b8852e8408ac64cd240d94af720fffd0309"; + version = "0.1.4"; + sha256 = "35783e1bb8654ac74866b7910f7f58385a78d0005d05c26bc7efd36ca9827978"; libraryHaskellDepends = [ base bytestring deepseq hexpat hexpat-tagsoup lens ]; - jailbreak = true; + homepage = "https://github.com/tel/hexpat-lens"; description = "Lenses for Hexpat"; license = stdenv.lib.licenses.mit; }) {}; @@ -69709,18 +69978,19 @@ self: { }) { inherit (pkgs) openssl;}; "hlibsass" = callPackage - ({ mkDerivation, base, hspec, sass }: + ({ mkDerivation, base, hspec, libsass }: mkDerivation { pname = "hlibsass"; version = "0.1.4.0"; sha256 = "2673ff4a4189bdfda61e5b936e1e91c4de29ede91db40055511a835ccbd35818"; + configureFlags = [ "-fexternallibsass" ]; libraryHaskellDepends = [ base ]; - librarySystemDepends = [ sass ]; + librarySystemDepends = [ libsass ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/jakubfijalkowski/hlibsass"; description = "Low-level bindings to Libsass"; license = stdenv.lib.licenses.mit; - }) { sass = null;}; + }) { inherit (pkgs) libsass;}; "hlint" = callPackage ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs @@ -70692,8 +70962,8 @@ self: { }: mkDerivation { pname = "holy-project"; - version = "0.2.0.0"; - sha256 = "4f8feb2326214304a0326843383b3cf8e35862fb372f279c148f103ebbd09616"; + version = "0.2.0.1"; + sha256 = "b0f60f48377986212ee45a7ab360f4ef32578d4fa4b65cc21132f9c1e90a2814"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -71223,23 +71493,23 @@ self: { , base, base16-bytestring, binary, binary-conduit, bytestring , conduit, conduit-extra, containers, crypto-pubkey, cryptohash , directory, errors, fgl, graphviz, happy, hOpenPGP, ixset-typed - , lens, monad-loops, old-locale, openpgp-asciiarmor - , optparse-applicative, resourcet, text, time, transformers + , lens, monad-loops, openpgp-asciiarmor, optparse-applicative + , resourcet, text, time, time-locale-compat, transformers , unordered-containers, wl-pprint-extras, yaml }: mkDerivation { pname = "hopenpgp-tools"; - version = "0.16.2"; - sha256 = "6f491a68846e60635e0e2dbc9c95cf245d88619a19c0abf83dd51b58e48f6588"; + version = "0.16.3"; + sha256 = "8ecdffae493b7ceaf3520f28883d9e12c6cdaaf444e3230c1c8c876d4cc9d25f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson ansi-wl-pprint array attoparsec base base16-bytestring binary binary-conduit bytestring conduit conduit-extra containers crypto-pubkey cryptohash directory errors fgl graphviz hOpenPGP - ixset-typed lens monad-loops old-locale openpgp-asciiarmor - optparse-applicative resourcet text time transformers - unordered-containers wl-pprint-extras yaml + ixset-typed lens monad-loops openpgp-asciiarmor + optparse-applicative resourcet text time time-locale-compat + transformers unordered-containers wl-pprint-extras yaml ]; executableToolDepends = [ alex happy ]; homepage = "http://floss.scru.org/hopenpgp-tools"; @@ -72188,8 +72458,8 @@ self: { }: mkDerivation { pname = "hruby"; - version = "0.3.1.5"; - sha256 = "aacbd1a8b4b8a10b6f144d6bb714817d164fae2a23abd922a2c4cc39581e32f5"; + version = "0.3.1.6"; + sha256 = "f1ca9df8c55a7b97749d1252ccb236d93432d125a55a2b4b26f5812f86dc22a8"; libraryHaskellDepends = [ aeson attoparsec base bytestring scientific stm text unordered-containers vector @@ -74294,8 +74564,8 @@ self: { }: mkDerivation { pname = "hspec"; - version = "2.1.10"; - sha256 = "f8fad4636ac0c89373c1b82e77fed8702ac84278597107ba9407052b9453a154"; + version = "2.2.0"; + sha256 = "0e733942f2b0c87b62ea43627ca3c90c7e638adb390efff48e5f2f6a7fd7117f"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations HUnit QuickCheck transformers @@ -74360,8 +74630,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.1.10"; - sha256 = "682e7e77e6f6256caefa6c0582d89dbee8efd864ac14a98cfba4707a9eb20ee0"; + version = "2.2.0"; + sha256 = "44e9c15cca1639ccc24fcd925cd53f92f96322f691ed6903724a8a626629edf1"; libraryHaskellDepends = [ ansi-terminal async base deepseq hspec-expectations HUnit QuickCheck quickcheck-io random setenv tf-random time transformers @@ -74380,8 +74650,8 @@ self: { ({ mkDerivation, base, directory, filepath, hspec-meta }: mkDerivation { pname = "hspec-discover"; - version = "2.1.10"; - sha256 = "efb14e44b9beef570d55c2db4904002bf61e7744cd00a3a5fc8c236b8f071a0b"; + version = "2.2.0"; + sha256 = "fd5f7535f31b202cfe0bc4e00a97488f32e66850b867993bc4903849d7e76a70"; isLibrary = true; isExecutable = true; executableHaskellDepends = [ base directory filepath ]; @@ -74395,8 +74665,8 @@ self: { ({ mkDerivation, base, HUnit }: mkDerivation { pname = "hspec-expectations"; - version = "0.7.1"; - sha256 = "afcac6b3492a2db618e0e85e83cb106ba555fd966a3b045ee4aa30ccf199a258"; + version = "0.7.2"; + sha256 = "371a176b22ebdbc94b7bba55e0bda2296b44c11af01d20b23e4350ef7094a6f0"; libraryHaskellDepends = [ base HUnit ]; homepage = "https://github.com/sol/hspec-expectations#readme"; description = "Catchy combinators for HUnit"; @@ -74451,6 +74721,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-expectations-pretty-diff" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, Diff, haskell-src-exts + , hindent, hscolour, hspec, HUnit, text + }: + mkDerivation { + pname = "hspec-expectations-pretty-diff"; + version = "0.7.2.2"; + sha256 = "00c1ac7ceb6bed18c8c2ab7ac35342b024731e3fadf2c6304e549dc42d39ff38"; + libraryHaskellDepends = [ + ansi-terminal base Diff haskell-src-exts hindent hscolour HUnit + text + ]; + testHaskellDepends = [ aeson base hspec HUnit text ]; + homepage = "https://github.com/myfreeweb/hspec-expectations-pretty-diff#readme"; + description = "Catchy combinators for HUnit"; + license = stdenv.lib.licenses.mit; + }) {}; + "hspec-experimental" = callPackage ({ mkDerivation, base, hspec, hspec-meta, HUnit, QuickCheck }: mkDerivation { @@ -74496,8 +74784,8 @@ self: { }: mkDerivation { pname = "hspec-meta"; - version = "2.1.7"; - sha256 = "ffe41373ac24ff3e3c8d9ae5dfaf33c126c48ab16bc08c43ab91a58292f3097a"; + version = "2.2.0"; + sha256 = "bfa8fb7708368d063eab0c005addbb0b2f3227d76af55e61676584fbf3abb8ba"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74556,13 +74844,15 @@ self: { }) {}; "hspec-smallcheck" = callPackage - ({ mkDerivation, base, hspec, QuickCheck, smallcheck }: + ({ mkDerivation, base, hspec, hspec-core, QuickCheck, smallcheck }: mkDerivation { pname = "hspec-smallcheck"; - version = "0.3.0"; - sha256 = "bcb7e3e8f978177decafa7547da18717adf57228085ae49830db01b956f6cbfb"; - libraryHaskellDepends = [ base hspec smallcheck ]; - testHaskellDepends = [ base hspec QuickCheck smallcheck ]; + version = "0.4.1"; + sha256 = "c5ddd014ad58679554d2726a4442a124d7a3a9fad04c928c610cdc46773fc0f5"; + libraryHaskellDepends = [ base hspec-core smallcheck ]; + testHaskellDepends = [ + base hspec hspec-core QuickCheck smallcheck + ]; homepage = "http://hspec.github.io/"; description = "SmallCheck support for the Hspec testing framework"; license = stdenv.lib.licenses.mit; @@ -74586,6 +74876,7 @@ self: { HandsomeSoup hspec hspec-core hxt lens mtl snap snap-core text transformers ]; + jailbreak = true; homepage = "https://github.com/dbp/hspec-snap"; description = "A library for testing with Hspec and the Snap Web Framework"; license = stdenv.lib.licenses.bsd3; @@ -74683,8 +74974,8 @@ self: { }: mkDerivation { pname = "hspec-webdriver"; - version = "1.0.2"; - sha256 = "2c3508c9c185c08fcd27f7e2fde69e212eecf4488a0411fc72ab679544d86df2"; + version = "1.0.3"; + sha256 = "24b736db0703acff84dfa7ed8cbccaf8b8d1884e4f609249b7461cd1b0959ff7"; libraryHaskellDepends = [ base data-default hashable hspec hspec-core HUnit lifted-base stm text transformers unordered-containers webdriver @@ -76102,15 +76393,17 @@ self: { }) {}; "http-link-header" = callPackage - ({ mkDerivation, attoparsec, base, bytestring-conversion, errors - , hspec, hspec-attoparsec, network-uri, QuickCheck, text + ({ mkDerivation, attoparsec, base, bytestring + , bytestring-conversion, errors, hspec, hspec-attoparsec + , network-uri, QuickCheck, text }: mkDerivation { pname = "http-link-header"; - version = "0.2.0"; - sha256 = "0c46155da7d411ba590b9d9d0eb735962bb9454b16bee61c455adf7b3858b56d"; + version = "1.0.1"; + sha256 = "908bb3356d3fe24615f5498c6dca1075f76f01e034838538a3c4b0ccc342e9b7"; libraryHaskellDepends = [ - attoparsec base bytestring-conversion errors network-uri text + attoparsec base bytestring bytestring-conversion errors network-uri + text ]; testHaskellDepends = [ base hspec hspec-attoparsec QuickCheck text @@ -76647,6 +76940,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hunch" = callPackage + ({ mkDerivation, base, containers, directory, filepath + , optparse-applicative, parsec, QuickCheck, split + }: + mkDerivation { + pname = "hunch"; + version = "0.1.1"; + sha256 = "2b959733b68066abcb8bddfb982c859b772070c2a16f27d183f1c61028817bae"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers directory filepath optparse-applicative parsec + split + ]; + testHaskellDepends = [ + base containers directory filepath optparse-applicative parsec + QuickCheck split + ]; + homepage = "https://github.com/loganbraga/hunch"; + description = "CSS-like syntax for file system manipulation"; + license = stdenv.lib.licenses.mit; + }) {}; + "hunit-gui" = callPackage ({ mkDerivation, base, cairo, gtk, haskell98, HUnit }: mkDerivation { @@ -76925,8 +77241,8 @@ self: { ({ mkDerivation, base, HTF }: mkDerivation { pname = "hvect"; - version = "0.2.0.0"; - sha256 = "310fa7a975673fa99eaace924c0ec3b600d6d21d4f94625c855e97caadcc2a06"; + version = "0.3.0.0"; + sha256 = "b2931f7c3bca66b7b6fbfa46bacaf0fc6f8a6c75dc29c0567c3f682764407ebc"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HTF ]; homepage = "https://github.com/agrafix/hvect"; @@ -78432,6 +78748,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) { ige-mac-integration = null;}; + "ignore" = callPackage + ({ mkDerivation, base, directory, Glob, HTF, mtl, path, pcre-heavy + , text + }: + mkDerivation { + pname = "ignore"; + version = "0.1.1.0"; + sha256 = "aaf481fdab8bdc5a506e4726eadf56697726f82086a3cd0439526b9442c73575"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory Glob mtl path pcre-heavy text + ]; + executableHaskellDepends = [ base directory path ]; + testHaskellDepends = [ base HTF text ]; + homepage = "http://github.com/agrafix/ignore"; + description = "Handle ignore files of different VCSes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "igraph" = callPackage ({ mkDerivation, base, c2hs, containers, hashable, igraph , unordered-containers @@ -78477,8 +78813,8 @@ self: { }: mkDerivation { pname = "ihaskell"; - version = "0.6.4.1"; - sha256 = "524cf3836857ba1762f895379b533352cf25a532ad8825f93f9842d9f235adbe"; + version = "0.6.5.0"; + sha256 = "e634513efa47aa3e369c3d7fb0ad038b1cba308186d4c50268641a97a727ddbb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78501,8 +78837,7 @@ self: { setenv shelly split stm strict system-argv0 text transformers unix unordered-containers utf8-string uuid vector ]; - jailbreak = true; - homepage = "http://gibiansky.github.io/IHaskell/"; + homepage = "http://github.com/gibiansky/IHaskell"; description = "A Haskell backend kernel for the IPython project"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -80596,27 +80931,25 @@ self: { ({ mkDerivation, array, attoparsec, base, base64-bytestring , bytestring, config-value, connection, containers , data-default-class, deepseq, directory, filepath, free - , haskell-lexer, lens, network, old-locale, split, stm, text, time - , tls, transformers, vty, x509, x509-store, x509-system + , haskell-lexer, lens, network, old-locale, regex-tdfa, split, stm + , text, time, tls, transformers, vty, x509, x509-store, x509-system , x509-validation }: mkDerivation { pname = "irc-core"; - version = "1.1.0.1"; - sha256 = "a788848f0d60068ed173c394bf28ad637a85df4f3007daebe502126c1907c106"; - revision = "5"; - editedCabalFile = "8971a294711aaae3c327c2fe4f1f53eaed33a57b986585c934df43fa69e8f914"; + version = "1.1.1"; + sha256 = "9f8e78db1aacf1e74df042e951335277be5bf25e01d1206d119470b451dcd2eb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array attoparsec base base64-bytestring bytestring containers free - lens text time transformers + lens regex-tdfa text time transformers ]; executableHaskellDepends = [ array base bytestring config-value connection containers data-default-class deepseq directory filepath haskell-lexer lens - network old-locale split stm text time tls transformers vty x509 - x509-store x509-system x509-validation + network old-locale regex-tdfa split stm text time tls transformers + vty x509 x509-store x509-system x509-validation ]; homepage = "https://github.com/glguy/irc-core"; description = "An IRC client library and text client"; @@ -81556,6 +81889,8 @@ self: { pname = "jammittools"; version = "0.5.0.1"; sha256 = "fd01f32dc319f7088791ce696d0421215a624bc7a2923bb8a39e4d102148cae1"; + revision = "1"; + editedCabalFile = "723bbb15b1cdc91151255c89977d67e330f4795c35dc330c5cc324d7784d53b6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -82273,6 +82608,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "json-litobj" = callPackage + ({ mkDerivation, base, hspec, json, QuickCheck }: + mkDerivation { + pname = "json-litobj"; + version = "0.1.0.0"; + sha256 = "4ac4bd3cc6a559d48445577763497f24b0fdd748bab81d241c1392abd8a41ce6"; + libraryHaskellDepends = [ base json ]; + testHaskellDepends = [ base hspec json QuickCheck ]; + jailbreak = true; + homepage = "https://github.com/jonathankochems/json-litobj"; + description = "Extends Text.JSON to handle literal JS objects."; + license = stdenv.lib.licenses.bsd3; + }) {}; + "json-python" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, pureMD5 , python, template-haskell @@ -82932,17 +83281,12 @@ self: { }) {}; "kansas-lava-shake" = callPackage - ({ mkDerivation, base, containers, directory, filepath, hastache - , kansas-lava, shake, temporary, text - }: + ({ mkDerivation, base, hastache, kansas-lava, shake, text }: mkDerivation { pname = "kansas-lava-shake"; - version = "0.1.2"; - sha256 = "a799b6707aa7cf898d1bfb5d9273390b15a04b7d81fcd76a2bf834224ecdb303"; - libraryHaskellDepends = [ - base containers directory filepath hastache kansas-lava shake - temporary text - ]; + version = "0.2.0"; + sha256 = "34837e499a3007fb9eeb84e7c0bfd7c3c3d53e9cb84a8a8851e98b1c84f4f6a4"; + libraryHaskellDepends = [ base hastache kansas-lava shake text ]; description = "Shake rules for building Kansas Lava projects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -83442,8 +83786,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "keycode"; - version = "0.1"; - sha256 = "fb2efe1e2b85a638f784c6739533aaf5f52a6ad61f6ab6468d4fe1feab4992b3"; + version = "0.1.1"; + sha256 = "7db8ed3fb0ccfbf9cb98124a3585e883a65a93c320e2573df6bd28089276435e"; libraryHaskellDepends = [ base containers ]; homepage = "https://github.com/RyanGlScott/keycode"; description = "Maps web browser keycodes to their corresponding keyboard keys"; @@ -84328,6 +84672,7 @@ self: { template-haskell time transformers transformers-base unix utf8-string zlib ]; + jailbreak = true; homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot core functionality"; license = "GPL"; @@ -85187,6 +85532,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "language-nix" = callPackage + ({ mkDerivation, base, containers, doctest, hspec, HUnit, mtl + , parsec, QuickCheck, transformers + }: + mkDerivation { + pname = "language-nix"; + version = "1.0"; + sha256 = "6088471a2b9b270404b7e5f8dcd47f6cdf2fe0be459c7bc36c2b1caef95af6b5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers mtl parsec QuickCheck transformers + ]; + executableHaskellDepends = [ + base containers mtl parsec QuickCheck transformers + ]; + testHaskellDepends = [ + base containers doctest hspec HUnit mtl parsec QuickCheck + transformers + ]; + homepage = "https://github.com/peti/language-nix"; + description = "Haskell AST and Parsers for the Nix language"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "language-objc" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , directory, filepath, happy, newtype, pretty, process, syb @@ -85299,6 +85669,7 @@ self: { array base containers monads-tf pretty transformers utf8-string ]; libraryToolDepends = [ alex happy ]; + jailbreak = true; homepage = "http://github.com/bjpop/language-python"; description = "Parsing and pretty printing of Python code"; license = stdenv.lib.licenses.bsd3; @@ -85446,8 +85817,8 @@ self: { ({ mkDerivation, base, pretty }: mkDerivation { pname = "language-vhdl"; - version = "0.1.0.0"; - sha256 = "ca55cb762f8b6225df178280dd5a0a3bf9fde2ac0ab942cdabd6239e8dedba33"; + version = "0.1.0.2"; + sha256 = "8fe8729b350bc5577ef1c4a9228769ff8a3c4341c5b4b548f963933b034ad59e"; libraryHaskellDepends = [ base pretty ]; homepage = "https://github.com/markus-git/language-vhdl"; description = "VHDL AST and pretty printer in Haskell"; @@ -85973,8 +86344,8 @@ self: { }: mkDerivation { pname = "leksah"; - version = "0.15.1.3"; - sha256 = "de00aa714ba2e60b7450e0fb7a382bdb88cc8ed9589ef10833e93782630488cf"; + version = "0.15.1.4"; + sha256 = "85f60091febd593f996c90cb9fa0e2f2dd1bff1f18a443244be1111540ea30ad"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -86012,8 +86383,8 @@ self: { }: mkDerivation { pname = "leksah-server"; - version = "0.15.0.7"; - sha256 = "8d98649f6227f0fc3ad9aa169c74f435ec825a1333c57445860b9f8ff1ffc79d"; + version = "0.15.0.8"; + sha256 = "4367cdcbec1066dc0ef3c171f4345a495e67b68016cc90d2bceee652162b743f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -86787,8 +87158,8 @@ self: { }: mkDerivation { pname = "libjenkins"; - version = "0.8.1"; - sha256 = "bfa08eb1f4b2e7c750fffcc0fbd0356b32c086a45af045364b7a2ca3ffe70402"; + version = "0.8.2"; + sha256 = "206f7e82ee6496f408347dc0828aea8018b0e7269cae02fcfa7504c750f79ec9"; libraryHaskellDepends = [ async attoparsec base bytestring conduit containers free http-client http-conduit http-types monad-control mtl network @@ -86870,8 +87241,8 @@ self: { }: mkDerivation { pname = "libmpd"; - version = "0.9.0.2"; - sha256 = "5fb64d0196204a29bfb655118891c19310969e452599fda2667f7ff7d265d4e0"; + version = "0.9.0.3"; + sha256 = "3f0c520f19520dae35bf0d6aebf2fffef067964ace91047193b330a6dfaaa3d6"; libraryHaskellDepends = [ attoparsec base bytestring containers data-default-class filepath mtl network old-locale text time utf8-string @@ -87560,6 +87931,7 @@ self: { libraryHaskellDepends = [ base distributive lens linear OpenGL OpenGLRaw tagged ]; + jailbreak = true; homepage = "http://www.github.com/bgamari/linear-opengl"; description = "Isomorphisms between linear and OpenGL types"; license = stdenv.lib.licenses.bsd3; @@ -88178,6 +88550,7 @@ self: { testHaskellDepends = [ attoparsec base-prelude either hspec list-t list-t-text text ]; + jailbreak = true; homepage = "https://github.com/nikita-volkov/list-t-attoparsec"; description = "An \"attoparsec\" adapter for \"list-t\""; license = stdenv.lib.licenses.mit; @@ -88202,6 +88575,7 @@ self: { base-prelude conversion conversion-text either hspec html-tokenizer list-t-attoparsec list-t-text text xml-types ]; + jailbreak = true; homepage = "https://github.com/nikita-volkov/list-t-html-parser"; description = "Streaming HTML parser"; license = stdenv.lib.licenses.mit; @@ -88256,6 +88630,7 @@ self: { base base-prelude bytestring hspec list-t QuickCheck quickcheck-instances text transformers ]; + jailbreak = true; homepage = "https://github.com/nikita-volkov/list-t-text"; description = "A streaming text codec"; license = stdenv.lib.licenses.mit; @@ -89563,8 +89938,8 @@ self: { }: mkDerivation { pname = "ltk"; - version = "0.15.0.3"; - sha256 = "86e0ed96110ad0b2be8d63828e4ab8429893e4c269b28a95f4e1d70c73bc05c2"; + version = "0.15.0.4"; + sha256 = "6d39540a1aa73516d9390d8d49f1f9b8ec5f9cf15bede8cd51a25810ec345193"; libraryHaskellDepends = [ base Cabal containers filepath ghc glib gtk3 mtl parsec pretty text transformers @@ -89916,8 +90291,8 @@ self: { }: mkDerivation { pname = "lzma"; - version = "0.0.0.0"; - sha256 = "ba6bd66b58d0b378d5f95bb0436257c2862a77352f24ae7c459b82646b6e81c9"; + version = "0.0.0.1"; + sha256 = "576583fa5ac2110ca62f24dea62a1bb6effeba51c31b9fe06862dcfa8f7a38ac"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ lzma ]; testHaskellDepends = [ @@ -89928,6 +90303,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) { inherit (pkgs) lzma;}; + "lzma-clib" = callPackage + ({ mkDerivation, only-buildable-on-windows }: + mkDerivation { + pname = "lzma-clib"; + version = "5.2.1"; + sha256 = "51f0e8ea4679f80d3c22b6fbf022062b7ac12b4d6b1e6b0f938194ca9a88adcc"; + libraryHaskellDepends = [ only-buildable-on-windows ]; + jailbreak = true; + description = "liblzma C library and headers for use by LZMA bindings"; + license = stdenv.lib.licenses.publicDomain; + broken = true; + }) { only-buildable-on-windows = null;}; + "lzma-conduit" = callPackage ({ mkDerivation, base, bindings-DSL, bytestring, conduit, HUnit , lzma, QuickCheck, resourcet, test-framework, test-framework-hunit @@ -90226,14 +90614,13 @@ self: { ({ mkDerivation, base, hmatrix, transformers, utility-ht }: mkDerivation { pname = "magico"; - version = "0.0.0.1"; - sha256 = "97f4f606544bbc741b593d96167bcd4e80d2f5f98face9460a1c6ab1dab12c38"; + version = "0.0.1.1"; + sha256 = "149e482d11268d45fb6da03cfa45a0947ea7cacc259c27959314a029c06c2633"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base hmatrix transformers utility-ht ]; - jailbreak = true; homepage = "http://hub.darcs.net/thielema/magico"; description = "Compute solutions for Magico puzzle"; license = stdenv.lib.licenses.bsd3; @@ -91986,6 +92373,7 @@ self: { testHaskellDepends = [ base bytestring data-default-class hspec HUnit network process ]; + jailbreak = true; homepage = "https://github.com/philopon/memcached-binary"; description = "memcached client using binary protocol"; license = stdenv.lib.licenses.mit; @@ -92353,29 +92741,34 @@ self: { }) {}; "microformats2-parser" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, containers - , data-default, either, hspec, html-conduit, microformats2-types - , network, options, pcre-heavy, raw-strings-qq, safe, scotty - , streaming-commons, stringable, template-haskell, text, time - , wai-extra, warp, xml-lens, xss-sanitize + ({ mkDerivation, aeson, aeson-pretty, aeson-qq, base, blaze-html + , blaze-markup, bytestring, containers, data-default, either, hspec + , hspec-expectations-pretty-diff, html-conduit, lens-aeson, mtl + , network, network-uri, options, pcre-heavy, raw-strings-qq, safe + , scotty, streaming-commons, stringable, template-haskell, text + , time, transformers, unordered-containers, vector, wai-extra, warp + , xml-lens, xss-sanitize }: mkDerivation { pname = "microformats2-parser"; - version = "0.1.1"; - sha256 = "a5506e71b8ab918964c3d26982fea093f173db15ce388641dc4909aebea78c58"; + version = "1.0.1.1"; + sha256 = "281212dd0fb8d61af7c4eaf4b0fa57d31b0267c8e8e1dea12cede8a6efc1a2e9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base blaze-markup containers data-default either html-conduit - microformats2-types pcre-heavy safe text time xml-lens xss-sanitize + aeson aeson-qq base blaze-markup bytestring containers data-default + either html-conduit lens-aeson network-uri pcre-heavy safe text + time transformers unordered-containers vector xml-lens xss-sanitize ]; executableHaskellDepends = [ - base blaze-html blaze-markup microformats2-types network options - scotty streaming-commons stringable text wai-extra warp + aeson aeson-pretty base blaze-html blaze-markup data-default + network network-uri options scotty streaming-commons stringable + text wai-extra warp ]; testHaskellDepends = [ - base data-default hspec html-conduit microformats2-types - raw-strings-qq template-haskell time xml-lens + aeson-qq base bytestring data-default hspec + hspec-expectations-pretty-diff html-conduit mtl network-uri + raw-strings-qq template-haskell text time xml-lens ]; homepage = "https://github.com/myfreeweb/microformats2-parser"; description = "A Microformats 2 parser"; @@ -92403,8 +92796,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "microlens"; - version = "0.3.1.0"; - sha256 = "6c822ad2697798b5073f2d04a8951392b6cead80ede5713ad415aa4213b565ee"; + version = "0.3.2.0"; + sha256 = "a20e1082261e08b258e964484b2df4557a135832f18cd424eb8c030fbe62d402"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/aelve/microlens"; description = "A tiny part of the lens library which you can depend upon"; @@ -92460,8 +92853,8 @@ self: { }: mkDerivation { pname = "microlens-platform"; - version = "0.1.1.0"; - sha256 = "73511b2b66b356a1231d7a3a7b2da9021ad5f03c9ab61cfa659483fa03166ad6"; + version = "0.1.2.0"; + sha256 = "5a44b16b764fae1de9b29a114784abbb7aaa75270c2c4a21a026656ab1e24471"; libraryHaskellDepends = [ base hashable microlens microlens-ghc microlens-mtl microlens-th text unordered-containers vector @@ -92475,8 +92868,8 @@ self: { ({ mkDerivation, base, containers, microlens, template-haskell }: mkDerivation { pname = "microlens-th"; - version = "0.2.1.1"; - sha256 = "e38ef1cc80a44aadb9e6ffbea6647eceb84971b05a00f64bdd3fde4e2a4a7277"; + version = "0.2.1.2"; + sha256 = "ea17fb111790953667cd75e1e29823107eb2123ce41c27a77a71d5c7102a39f9"; libraryHaskellDepends = [ base containers microlens template-haskell ]; @@ -93538,8 +93931,8 @@ self: { }: mkDerivation { pname = "moesocks"; - version = "0.1.0.20"; - sha256 = "06cb6e29dde04f62c9519fa295551e4130f596a96e74fceb9c2e36552d9de52e"; + version = "0.1.0.24"; + sha256 = "0a95707996c4c6f68a222063fa22008b038865ea8a8cb57bcbedd9a5bba72ba6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -94642,17 +95035,17 @@ self: { "mono-traversable" = callPackage ({ mkDerivation, base, bytestring, comonad, containers, dlist , dlist-instances, foldl, hashable, hspec, HUnit, QuickCheck - , semigroupoids, semigroups, text, transformers + , semigroupoids, semigroups, split, text, transformers , unordered-containers, vector, vector-algorithms, vector-instances }: mkDerivation { pname = "mono-traversable"; - version = "0.9.2.1"; - sha256 = "34c3827b49e47e83bdbed647ae6ca27e049be8887904007b57b03dc006b542ef"; + version = "0.9.3"; + sha256 = "d73b495b65cdc3951e2407d07e46b3cb5b3ab074b474c0742687b616f4e7e4db"; libraryHaskellDepends = [ base bytestring comonad containers dlist dlist-instances hashable - semigroupoids semigroups text transformers unordered-containers - vector vector-algorithms vector-instances + semigroupoids semigroups split text transformers + unordered-containers vector vector-algorithms vector-instances ]; testHaskellDepends = [ base bytestring containers foldl hspec HUnit QuickCheck semigroups @@ -95552,6 +95945,7 @@ self: { http-conduit http-types process random snap-core snap-server stm text transformers ]; + jailbreak = true; description = "Continuous deployment server for use with GitHub"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -95684,8 +96078,8 @@ self: { }: mkDerivation { pname = "multihash"; - version = "0.1.1"; - sha256 = "2f2c507fdd1492bbcdca737d6c0f8abdd4a0a9941f1661fd04c6b606f9c9d227"; + version = "0.1.2"; + sha256 = "dd2b0511c900d83794dec151008b0bec07be676dc0cbb073ce11d5b754c47538"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -97285,8 +97679,8 @@ self: { }: mkDerivation { pname = "neil"; - version = "0.9"; - sha256 = "3385ec7c186bd4e51630015a0d1a2425e43b56c41c5a34571d2da02e16e9e431"; + version = "0.10"; + sha256 = "7bf2215903836e058bdbbc0c884e773f081c03f79cfa99964e620969e03a139f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -99772,8 +100166,10 @@ self: { }: mkDerivation { pname = "nurbs"; - version = "0.1.0.0"; - sha256 = "91879fb8840fc1bc907c63df125880a367ec5b52d544806be1306b235103afe7"; + version = "0.1.1.0"; + sha256 = "42459775e2b1c419343402da693465f3db61c5ab6e5666f44d810b568cf33054"; + revision = "1"; + editedCabalFile = "17ee68339f33b5fa8ccc3ddf788ee5cb3ab3f40170b93175925a1b97534afdbc"; libraryHaskellDepends = [ base base-unicode-symbols lens linear mtl ]; @@ -99796,8 +100192,8 @@ self: { }: mkDerivation { pname = "nvim-hs"; - version = "0.0.3"; - sha256 = "e5768324a22d0e282f2e9e839fbe32b0943f120aa851499f1db9388612bddcb1"; + version = "0.0.5"; + sha256 = "46474d2b4ff86a79a94af581f556a527bfc97cddea5c00d7d3cfaaa94fedc6ef"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -99836,6 +100232,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "nylas" = callPackage + ({ mkDerivation, aeson, base, bytestring, lens, lens-aeson, pipes + , pipes-aeson, pipes-bytestring, pipes-http, pipes-parse, text + , time, wreq + }: + mkDerivation { + pname = "nylas"; + version = "0.1.1"; + sha256 = "a78d4e6d4841049f447b110df0ad22a0af764d845a19791b54a8f5d29e29d6b0"; + libraryHaskellDepends = [ + aeson base bytestring lens lens-aeson pipes pipes-aeson + pipes-bytestring pipes-http pipes-parse text time wreq + ]; + homepage = "https://github.com/bts/nylas-hs"; + description = "Client for the Nylas API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "nymphaea" = callPackage ({ mkDerivation, base, cairo, containers, glade, glib, gtk, mtl , parsec, random @@ -101718,8 +102132,8 @@ self: { }: mkDerivation { pname = "packdeps"; - version = "0.4.0.3"; - sha256 = "172e351d24db1934e2507b5f516c9575c65705a0c7e8e6091f0d11f2b84d5621"; + version = "0.4.1"; + sha256 = "c43f878515ecf1e972f683a2671ed941e4389fab4920e68527f8015572a04e36"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102064,8 +102478,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.1.3.0"; - sha256 = "f3cdb3988ac223111dc7ccb3a28aa8a4db91ace098475f5e8e0c8f8bcfe6b8bd"; + version = "0.1.4.0"; + sha256 = "730cfde295f11c0c328bab8f5ad505743ad42017b899e599245cf7e2db760b23"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -103267,15 +103681,15 @@ self: { }: mkDerivation { pname = "pcre-heavy"; - version = "0.2.2"; - sha256 = "834ba945e545983a96d7aa960b86cbbbd8cf5861e367f7919ff2e2e2ea369b21"; + version = "0.2.5"; + sha256 = "01b599e8a3629795b4afb2bbb9e65bb114ddbccd867ca8806d75aa56e3bacde7"; libraryHaskellDepends = [ base bytestring pcre-light stringable template-haskell ]; testHaskellDepends = [ base doctest Glob ]; homepage = "https://github.com/myfreeweb/pcre-heavy"; description = "A regexp library on top of pcre-light you can actually use"; - license = "unknown"; + license = stdenv.lib.licenses.publicDomain; }) {}; "pcre-less" = callPackage @@ -103337,8 +103751,8 @@ self: { }: mkDerivation { pname = "pdf-toolbox-content"; - version = "0.0.3.3"; - sha256 = "2ccd016046b37ef99fc5d21876cfd9b241e0e85671a54718648fbc65edb87e0e"; + version = "0.0.4.0"; + sha256 = "de615950a445022afc2950765d5be9cc7cf16c90bbcc3b4eeded8f491e9afd54"; libraryHaskellDepends = [ attoparsec base base16-bytestring bytestring containers io-streams pdf-toolbox-core text @@ -103355,13 +103769,12 @@ self: { }: mkDerivation { pname = "pdf-toolbox-core"; - version = "0.0.3.3"; - sha256 = "1599278af33e5a053ff1f6b88d6a2db45f841988300a1723a02423bcd9b9ce00"; + version = "0.0.4.0"; + sha256 = "72760da19e24bea4f2bee3114ce702437d413c531347c8fd544fcae717c83e95"; libraryHaskellDepends = [ attoparsec base bytestring containers errors io-streams scientific transformers zlib-bindings ]; - jailbreak = true; homepage = "https://github.com/Yuras/pdf-toolbox"; description = "A collection of tools for processing PDF files"; license = stdenv.lib.licenses.bsd3; @@ -103375,8 +103788,8 @@ self: { }: mkDerivation { pname = "pdf-toolbox-document"; - version = "0.0.5.1"; - sha256 = "9a7bc1725a725340b4b290669cffbf32596ff8c1078ee5f9f549e6dd61839661"; + version = "0.0.6.0"; + sha256 = "ce5f7e1622c73ecfa24e8ec590dad12c3ca27db6bdac20738bff5f0bdce01231"; libraryHaskellDepends = [ base bytestring cipher-aes cipher-rc4 containers crypto-api cryptohash io-streams pdf-toolbox-content pdf-toolbox-core text @@ -103395,8 +103808,8 @@ self: { }: mkDerivation { pname = "pdf-toolbox-viewer"; - version = "0.0.3.3"; - sha256 = "e24b4573520eb1bc27cd8cccc06c036196f514aead62d952b45cd0d2d6eed60a"; + version = "0.0.4.0"; + sha256 = "cd7d565349c7ff1c6d3fd04e7f9523732fb03dc000a37cdb07f45ae14f93b05c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -105217,14 +105630,17 @@ self: { }) {}; "pipes-group" = callPackage - ({ mkDerivation, base, free, pipes, pipes-parse, transformers }: + ({ mkDerivation, base, doctest, free, lens-family-core, pipes + , pipes-parse, transformers + }: mkDerivation { pname = "pipes-group"; - version = "1.0.2"; - sha256 = "e056ab94a9211698505491a7958c56aa52b682b4bdc32fa0a369bc7c16906106"; + version = "1.0.3"; + sha256 = "f0f20cc29410d84faeae1fe055d3d1041a205c27403d627bd865489c7f7ec200"; libraryHaskellDepends = [ base free pipes pipes-parse transformers ]; + testHaskellDepends = [ base doctest lens-family-core ]; description = "Group streams into substreams"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -106247,10 +106663,8 @@ self: { }: mkDerivation { pname = "poly-arity"; - version = "0.0.4.1"; - sha256 = "975b761a7c81144c2455fd6c05bb7d1891782659d4fc0a01e57941c57145d497"; - revision = "2"; - editedCabalFile = "0bce1ff7388433830c7824530bb9c4fe3f4545bad44683dec2a5780028d870af"; + version = "0.0.5"; + sha256 = "d0787fa2a151080e2138b64dd4adc4dc8e41857e22fa494703f9f876e6cd25bb"; libraryHaskellDepends = [ base constraints HList ]; testHaskellDepends = [ base hspec QuickCheck quickcheck-instances @@ -106927,18 +107341,19 @@ self: { , postgresql-simple, QuickCheck, quickcheck-assertions , quickcheck-instances, resource-pool, semigroups, tasty , tasty-hunit, tasty-quickcheck, tasty-th, template-haskell, text - , time, transformers, transformers-base, transformers-compat + , th-lift, th-lift-instances, time, transformers, transformers-base + , transformers-compat }: mkDerivation { pname = "postgresql-query"; - version = "1.4.0"; - sha256 = "593bae5989407891835faffd572ee8fdfd474ff5c1e9a14395db55c9a8d6452d"; + version = "2.0.0"; + sha256 = "09b0d4c664ab4965ab61f3c30cb303d03ca18b58dfb76654d733b02572966046"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring containers data-default either exceptions file-embed haskell-src-meta hreader hset monad-control monad-logger mtl postgresql-simple resource-pool - semigroups template-haskell text time transformers - transformers-base transformers-compat + semigroups template-haskell text th-lift th-lift-instances time + transformers transformers-base transformers-compat ]; testHaskellDepends = [ attoparsec base QuickCheck quickcheck-assertions @@ -110129,9 +110544,10 @@ self: { ({ mkDerivation, base, HUnit, QuickCheck }: mkDerivation { pname = "quickcheck-io"; - version = "0.1.1"; - sha256 = "a23a6e011aafd211c2521ddb9f61ffb5d256837148b5f5c35a152bdb37d6039b"; + version = "0.1.2"; + sha256 = "50275e5253dcf0c838e340fa19eb841804deb634aeedbf33f0b46a97b89bc1cd"; libraryHaskellDepends = [ base HUnit QuickCheck ]; + homepage = "https://github.com/hspec/quickcheck-io#readme"; description = "Use HUnit assertions as QuickCheck properties"; license = stdenv.lib.licenses.mit; }) {}; @@ -111376,8 +111792,8 @@ self: { ({ mkDerivation, aeson, base, deepseq, mtl, text }: mkDerivation { pname = "react-flux"; - version = "0.9.0"; - sha256 = "6da5232f92bd5667a0ff2b6c3bbe9139ba412e82a8f619cfd05f2c056b907209"; + version = "0.9.1"; + sha256 = "704b253c655442c03eb90e1c4b36660dc6416745c041c590362c3f6762cc9615"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base deepseq mtl text ]; @@ -111942,23 +112358,23 @@ self: { "reddit" = callPackage ({ mkDerivation, aeson, api-builder, base, bytestring, Cabal - , data-default, hspec, http-conduit, http-types, network, stm, text - , time, transformers, unordered-containers, vector + , data-default-class, free, hspec, http-client, http-client-tls + , http-types, network, text, time, transformers + , unordered-containers, vector }: mkDerivation { pname = "reddit"; - version = "0.1.1.0"; - sha256 = "f3bcada2af55e8b70fffabd918ac1f4fa51cd81765e8cc8a5e4495461b579aba"; + version = "0.2.0.0"; + sha256 = "1969dea9612d12611b73f209466e6567e46a2706b59f2f243234d47bf2749ec0"; libraryHaskellDepends = [ - aeson api-builder base bytestring data-default http-conduit - http-types network stm text time transformers unordered-containers - vector + aeson api-builder base bytestring data-default-class free + http-client http-client-tls http-types network text time + transformers unordered-containers vector ]; testHaskellDepends = [ - api-builder base bytestring Cabal hspec http-conduit text time - transformers + aeson api-builder base bytestring Cabal hspec http-client + http-client-tls text time transformers ]; - jailbreak = true; homepage = "https://github.com/intolerable/reddit"; description = "Library for interfacing with Reddit's API"; license = stdenv.lib.licenses.bsd2; @@ -112317,6 +112733,7 @@ self: { testHaskellDepends = [ base containers dependent-map MemoTrie mtl ref-tf ]; + jailbreak = true; homepage = "https://github.com/ryantrinkle/reflex"; description = "Higher-order Functional Reactive Programming"; license = stdenv.lib.licenses.bsd3; @@ -112379,6 +112796,7 @@ self: { libraryHaskellDepends = [ base dependent-sum gloss reflex transformers ]; + jailbreak = true; homepage = "https://github.com/reflex-frp/reflex-gloss"; description = "An reflex interface for gloss"; license = stdenv.lib.licenses.bsd3; @@ -112699,6 +113117,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "regex-tdfa-pipes" = callPackage + ({ mkDerivation, array, base, lens, monads-tf, pipes, regex-base + , regex-tdfa + }: + mkDerivation { + pname = "regex-tdfa-pipes"; + version = "0.1.0.0"; + sha256 = "221369b630ea479034bf959e936a71646ec9d13db13035d817cc7c10eb1d3098"; + libraryHaskellDepends = [ + array base lens monads-tf pipes regex-base regex-tdfa + ]; + jailbreak = true; + homepage = "http://github.com/erisco/regex-tdfa-pipes"; + description = "Parse with regular expressions on Producers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "regex-tdfa-quasiquoter" = callPackage + ({ mkDerivation, base, regex-tdfa, template-haskell }: + mkDerivation { + pname = "regex-tdfa-quasiquoter"; + version = "0.1.0.0"; + sha256 = "acafaa4c7a536483cc75952cdb9a8e7ae0bc1b76deb5170f405c0194e64859fc"; + libraryHaskellDepends = [ base regex-tdfa template-haskell ]; + jailbreak = true; + homepage = "http://github.com/erisco/regex-tdfa-quasiquoter"; + description = "Quasi-quoter for TDFA (extended POSIX) regular expressions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "regex-tdfa-rc" = callPackage ({ mkDerivation, array, base, bytestring, containers, ghc-prim, mtl , parsec, regex-base @@ -112719,10 +113167,8 @@ self: { ({ mkDerivation, array, base, regex-base, regex-tdfa, text }: mkDerivation { pname = "regex-tdfa-text"; - version = "1.0.0.2"; - sha256 = "cdad83b2c3b871e00404eb8649b056465c5f27c494634f6324a77521c7ee27dc"; - revision = "2"; - editedCabalFile = "4b0e54f79540143c88adb071ea8e0aa3734a625db026a6a44ca2ef45b870b07c"; + version = "1.0.0.3"; + sha256 = "38d77a0d225c306c52c6d4eed12d11d05a4bc4194d547cb9a7a9b6f5a8792001"; libraryHaskellDepends = [ array base regex-base regex-tdfa text ]; description = "Text interface for regex-tdfa"; license = stdenv.lib.licenses.bsd3; @@ -113931,14 +114377,13 @@ self: { ({ mkDerivation, base, hmatrix, transformers, utility-ht }: mkDerivation { pname = "resistor-cube"; - version = "0.0"; - sha256 = "6c1eeaf029f0990b141dcdb7ba930bd3a16eb6b670a3d60cf83c0b37c65db269"; + version = "0.0.0.2"; + sha256 = "0592c448a0dcfc583ca8c6217cc4a89c5bf6875c0ec176db4490cdca8c480220"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base hmatrix transformers utility-ht ]; - jailbreak = true; homepage = "http://hub.darcs.net/thielema/resistor-cube"; description = "Compute total resistance of a cube of resistors"; license = stdenv.lib.licenses.bsd3; @@ -114358,8 +114803,8 @@ self: { }: mkDerivation { pname = "rethinkdb"; - version = "2.0.0.0"; - sha256 = "cdc4aa7a96ffeb2804ee644aee58013915388de5a21979adaa7a27456c7bb125"; + version = "2.1.0.1"; + sha256 = "3d8a61d33361e8fd90d3ac3f63f57d1f660f9102c09b406b2ac2ff571711a5cb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -114371,7 +114816,7 @@ self: { testHaskellDepends = [ base doctest ]; jailbreak = true; homepage = "http://github.com/atnnn/haskell-rethinkdb"; - description = "A driver for RethinkDB 2.0"; + description = "A driver for RethinkDB 2.1"; license = stdenv.lib.licenses.asl20; }) {}; @@ -114383,8 +114828,8 @@ self: { }: mkDerivation { pname = "rethinkdb-client-driver"; - version = "0.0.19"; - sha256 = "d1db41828f7290919cb25be67b86c8f5834266ab52485ffc6f638447ddf5f57b"; + version = "0.0.20"; + sha256 = "9cd46fed35bfb1b09283e9109e6da5d848b6e50794e4debe4819f3654d4b8381"; libraryHaskellDepends = [ aeson base binary bytestring hashable mtl network old-locale scientific template-haskell text time unordered-containers vector @@ -114515,8 +114960,8 @@ self: { }: mkDerivation { pname = "reverse-geocoding"; - version = "0.2.1"; - sha256 = "1a05a7be8baff090de7f58f0a970ad9dc1a12cb76d050ead76f6c317b60b3721"; + version = "0.2.2.1"; + sha256 = "0c63a52ef6bd4f62b9b9fe0c16e279d3cf91326847da0f3c778a8e867c059b7c"; libraryHaskellDepends = [ aeson base iso3166-country-codes lens lens-aeson text wreq ]; @@ -115623,8 +116068,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "rspp"; - version = "0.1.0.0"; - sha256 = "ec2e950158f8fdb0c9ba78778e2637a07a47b17b51d4cac5b3f2a0c43f349de6"; + version = "0.1.0.1"; + sha256 = "3e6771df48c5949c27d020d325295dbc322e0a1427db7f70bccf2552d73d5a8c"; libraryHaskellDepends = [ base ]; jailbreak = true; homepage = "http://github.com/AJChapman/rspp"; @@ -116593,8 +117038,8 @@ self: { }: mkDerivation { pname = "satchmo"; - version = "2.9.9"; - sha256 = "7c4930eab38145ddd9e086e14b8061267e3d56358884a206e9b06d775a17918c"; + version = "2.9.9.1"; + sha256 = "3414dcc5184cd34bce55eb041ff84f8985672964c64786d146b9520237ee13e2"; libraryHaskellDepends = [ array async base bytestring containers deepseq directory hashable lens memoize minisat mtl process transformers @@ -117398,6 +117843,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "scotty-rest" = callPackage + ({ mkDerivation, base, base-prelude, bytestring, convertible + , data-default-class, hspec, hspec-wai, http-date, http-media + , http-types, mtl, QuickCheck, scotty, string-conversions, text + , time, transformers, wai, wai-extra + }: + mkDerivation { + pname = "scotty-rest"; + version = "0.1.0.0"; + sha256 = "4012c5bf50c1512e7053027fd0068df817b7710f294f24bb6563a4a0b73b1dfc"; + libraryHaskellDepends = [ + base base-prelude bytestring convertible data-default-class + http-date http-media http-types mtl scotty string-conversions text + time transformers wai wai-extra + ]; + testHaskellDepends = [ + base bytestring hspec hspec-wai mtl QuickCheck scotty + string-conversions text wai + ]; + homepage = "http://github.com/ehamberg/scotty-rest"; + description = "Webmachine-style REST library for scotty"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "scotty-session" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring , crypto-api, http-types, scotty, stm, text, time, transformers @@ -117808,8 +118277,8 @@ self: { }: mkDerivation { pname = "second-transfer"; - version = "0.6.0.0"; - sha256 = "fcfcf1aa3ac621abd651d9213b070d66ab638e2dfdaaf22e8bdaa0bf1c36e2f0"; + version = "0.6.1.0"; + sha256 = "fd57241ab24d7f752326573ea74240b168b1ff6168cf20b35af9d764368c5c72"; libraryHaskellDepends = [ attoparsec base base16-bytestring binary bytestring clock conduit containers deepseq exceptions hashable hashtables hslogger http2 @@ -118071,14 +118540,13 @@ self: { }: mkDerivation { pname = "semigroupoids"; - version = "5.0.0.3"; - sha256 = "17dc07085806c6b8c79863f489f0ad534713578a529935b081691830bab4d292"; + version = "5.0.0.4"; + sha256 = "cde047e36c4072dd32fcda5846155a3dd4e844f441e4c651b886ee069d95c7c9"; libraryHaskellDepends = [ base base-orphans bifunctors comonad containers contravariant distributive semigroups tagged transformers transformers-compat ]; testHaskellDepends = [ base directory doctest filepath ]; - jailbreak = true; homepage = "http://github.com/ekmett/semigroupoids"; description = "Semigroupoids: Category sans id"; license = stdenv.lib.licenses.bsd3; @@ -118900,6 +119368,7 @@ self: { acid-state base containers hspec mtl safecopy serversession unordered-containers ]; + jailbreak = true; homepage = "https://github.com/yesodweb/serversession"; description = "Storage backend for serversession using acid-state"; license = stdenv.lib.licenses.mit; @@ -119087,12 +119556,12 @@ self: { ({ mkDerivation, base, containers, utility-ht }: mkDerivation { pname = "set-cover"; - version = "0.0.4"; - sha256 = "7200a1908e0097d2336023404f16a5493bbb67d3afe3aef9508a9569a5a0430c"; + version = "0.0.5"; + sha256 = "a3a4b4f2099780fe5652036346d7dae2bf1db4a56e77e663ca6964312dec7c99"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers utility-ht ]; - homepage = "http://code.haskell.org/~thielema/set-cover/"; + homepage = "http://hub.darcs.net/thielema/set-cover/"; description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -121521,23 +121990,25 @@ self: { }) {}; "sloane" = callPackage - ({ mkDerivation, ansi-terminal, base, bytestring, cereal - , containers, directory, download-curl, filepath, HTTP, network - , optparse-applicative, stringsearch, terminal-size, text, zlib + ({ mkDerivation, aeson, ansi-terminal, attoparsec, base + , bloomfilter, bytestring, conduit, conduit-extra, containers + , directory, filepath, http-conduit, http-types + , optparse-applicative, stringsearch, terminal-size, text + , transformers }: mkDerivation { pname = "sloane"; - version = "2.0.5"; - sha256 = "29225cd58923e0b595e6920ba035f359766f588747d9d7f4022c4d610bf7b6ca"; + version = "4.0.1"; + sha256 = "015cc227cab7e205c0684821138f36d4d38a9fee893fbf23d13add0e27ec19e9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - ansi-terminal base bytestring cereal containers directory - download-curl filepath HTTP network optparse-applicative - stringsearch terminal-size text zlib + aeson ansi-terminal attoparsec base bloomfilter bytestring conduit + conduit-extra containers directory filepath http-conduit http-types + optparse-applicative stringsearch terminal-size text transformers ]; homepage = "http://github.com/akc/sloane"; - description = "A command line interface to Sloane's On-Line Encyclopedia of Integer Sequences"; + description = "A command line interface to Sloane's OEIS"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -121812,6 +122283,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "smsaero" = callPackage + ({ mkDerivation, aeson, base, either, servant, servant-client, text + , time + }: + mkDerivation { + pname = "smsaero"; + version = "0.1.1"; + sha256 = "d6d37cae946a2bdea1f4e5d05b3bcde56ee12362c72f490bf138ca3b8d9446d3"; + libraryHaskellDepends = [ + aeson base either servant servant-client text time + ]; + homepage = "https://github.com/GetShopTV/smsaero"; + description = "SMSAero API and HTTP client based on servant library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "smt-lib" = callPackage ({ mkDerivation, array, base, directory, polyparse }: mkDerivation { @@ -122071,10 +122558,8 @@ self: { }: mkDerivation { pname = "snap-core"; - version = "0.9.7.2"; - sha256 = "526a8ebb758c8da5e966a37449fdb072af333275c1b7726ab6317ac93875f651"; - revision = "1"; - editedCabalFile = "d39520edcc970d9d1f683af9631ccbcad39536b9f88040b93efb66cbe7aefc55"; + version = "0.9.8.0"; + sha256 = "47310fcd9c347883f5985c27c1fbcfac8c5783472a01afcc720bcc850622d2db"; libraryHaskellDepends = [ attoparsec attoparsec-enumerator base blaze-builder blaze-builder-enumerator bytestring bytestring-mmap @@ -122322,6 +122807,7 @@ self: { libraryHaskellDepends = [ acid-state base mtl snap text transformers ]; + jailbreak = true; homepage = "https://github.com/mightybyte/snaplet-acid-state"; description = "acid-state snaplet for Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -122736,10 +123222,8 @@ self: { }: mkDerivation { pname = "snaplet-postgresql-simple"; - version = "0.6.0.2"; - sha256 = "b792889664db48fda8bafe5dbf306bf060ffbf0837daac4ef3ddec59534fa677"; - revision = "2"; - editedCabalFile = "cfc56ee20478bf05a650bdcb457b606a640daa71b84a3a2a3bdb8930dcbbeb7b"; + version = "0.6.0.3"; + sha256 = "0f4c86c9d94560a1e12af151a7ab9bb7e21f10c70ddb5403ae8503dd1a0cf866"; libraryHaskellDepends = [ base bytestring clientsession configurator errors lens MonadCatchIO-transformers mtl postgresql-simple @@ -126487,12 +126971,12 @@ self: { }) {}; "streaming" = callPackage - ({ mkDerivation, base, ghc-prim, mmorph, mtl, transformers }: + ({ mkDerivation, base, mmorph, mtl, transformers }: mkDerivation { pname = "streaming"; - version = "0.1.0.6"; - sha256 = "604014b7d23181e7906b81a9bca1829f8e63b8e3dc690709a7d5c348d0ff3af9"; - libraryHaskellDepends = [ base ghc-prim mmorph mtl transformers ]; + version = "0.1.0.7"; + sha256 = "67f6aed768c1a6537fcf7587d1f5ab0fcec4ab9e4489ce6802aae483f67c9362"; + libraryHaskellDepends = [ base mmorph mtl transformers ]; homepage = "https://github.com/michaelt/streaming"; description = "A free monad transformer optimized for streaming applications"; license = stdenv.lib.licenses.bsd3; @@ -126924,6 +127408,7 @@ self: { aeson base bytestring either HsOpenSSL hspec http-streams random text time transformers ]; + jailbreak = true; homepage = "https://github.com/dmjio/stripe"; description = "Stripe API for Haskell"; license = stdenv.lib.licenses.mit; @@ -129436,18 +129921,18 @@ self: { }) {}; "tasty-hspec" = callPackage - ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random, tasty - , tasty-quickcheck, tasty-smallcheck + ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random + , tagged, tasty, tasty-quickcheck, tasty-smallcheck }: mkDerivation { pname = "tasty-hspec"; - version = "1.1"; - sha256 = "260ae081474e173e957fc268455520aba320536a0495656609acbd499c349e96"; + version = "1.1.2"; + sha256 = "69c5409e70694e8ba5791aaeb272e34af37cd28665c6d1c1f742cc7f053fab67"; libraryHaskellDepends = [ - base hspec hspec-core QuickCheck random tasty tasty-quickcheck - tasty-smallcheck + base hspec hspec-core QuickCheck random tagged tasty + tasty-quickcheck tasty-smallcheck ]; - homepage = "http://github.com/mitchellwrosen/tasty-hspec"; + homepage = "https://github.com/mitchellwrosen/tasty-hspec"; description = "Hspec support for the Tasty test framework"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -129626,6 +130111,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tasty-tap" = callPackage + ({ mkDerivation, base, containers, directory, stm, tasty + , tasty-golden, tasty-hunit + }: + mkDerivation { + pname = "tasty-tap"; + version = "0.0.1"; + sha256 = "c751cea8c7a33e8ec159a661ced1642aa29c2038d876ad1d95c27121848a00c8"; + libraryHaskellDepends = [ base containers stm tasty ]; + testHaskellDepends = [ + base directory tasty tasty-golden tasty-hunit + ]; + homepage = "https://github.com/michaelxavier/tasty-tap"; + description = "TAP (Test Anything Protocol) Version 13 formatter for tasty"; + license = stdenv.lib.licenses.mit; + }) {}; + "tasty-th" = callPackage ({ mkDerivation, base, language-haskell-extract, tasty , template-haskell @@ -130360,6 +130862,8 @@ self: { pname = "test-framework-hunit"; version = "0.3.0.1"; sha256 = "d3f9fd8e5e7251fa2f4727feb1397d80d9e979a4b086ee962dc239e3662910c0"; + revision = "1"; + editedCabalFile = "ef6155a767dc221d6f4dd2740fc79f5f4525b67e4cbb5c0ef3e5503d69594b29"; libraryHaskellDepends = [ base extensible-exceptions HUnit test-framework ]; @@ -131706,6 +132210,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-traced" = callPackage + ({ mkDerivation, base, containers, mtl, template-haskell }: + mkDerivation { + pname = "th-traced"; + version = "0.0.1.0"; + sha256 = "e267a20fa11bd42a4c4018cc428051089225514f11e38ad1821842f03abbb0c2"; + libraryHaskellDepends = [ base containers mtl template-haskell ]; + homepage = "https://github.com/konn/th-traced"; + description = "Tracing Q monad computation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "th-typegraph" = callPackage ({ mkDerivation, array, base, base-compat, bytestring, containers , data-default, deepseq, ghc-prim, haskell-src-exts, hspec @@ -133070,19 +133586,19 @@ self: { }) {}; "tls" = callPackage - ({ mkDerivation, asn1-encoding, asn1-types, async, base, byteable - , bytestring, cereal, cryptonite, data-default-class, hourglass - , memory, mtl, network, QuickCheck, tasty, tasty-quickcheck - , transformers, x509, x509-store, x509-validation + ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring + , cereal, cryptonite, data-default-class, hourglass, memory, mtl + , network, QuickCheck, tasty, tasty-quickcheck, transformers, x509 + , x509-store, x509-validation }: mkDerivation { pname = "tls"; - version = "1.3.1"; - sha256 = "747f840677115d077ef548b4da54acb479253ce3cb58ad3a03275fe2b452d5d0"; + version = "1.3.2"; + sha256 = "e9f2d3685b4731cb865a1d9ea9a2ddd5dce5393c49d8fd89dd9e00e8b0e06ce4"; libraryHaskellDepends = [ - asn1-encoding asn1-types async base byteable bytestring cereal - cryptonite data-default-class memory mtl network transformers x509 - x509-store x509-validation + asn1-encoding asn1-types async base bytestring cereal cryptonite + data-default-class memory mtl network transformers x509 x509-store + x509-validation ]; testHaskellDepends = [ base bytestring cereal cryptonite data-default-class hourglass mtl @@ -133875,6 +134391,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "transient" = callPackage + ({ mkDerivation, base, containers, directory, filepath, HTTP, mtl + , network, network-info, process, random, stm, transformers + }: + mkDerivation { + pname = "transient"; + version = "0.1.0.4"; + sha256 = "d12bf8fdbe05966d67ba0966bcf9eff6b637dce128b18424c1b250108cf86468"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory filepath HTTP mtl network network-info + process random stm transformers + ]; + executableHaskellDepends = [ + base containers directory filepath HTTP mtl network random stm + transformers + ]; + homepage = "http://www.fpcomplete.com/user/agocorona"; + description = "A monad for extensible effects and primitives for unrestricted composability of applications"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "translatable-intset" = callPackage ({ mkDerivation, base, fingertree }: mkDerivation { @@ -137149,6 +137688,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "uom-plugin" = callPackage + ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra, tasty + , tasty-hunit, template-haskell, units-parser + }: + mkDerivation { + pname = "uom-plugin"; + version = "0.1.0.0"; + sha256 = "34c00b7e48152e654ae0dfeaf74a12c9fd037549489f2a13e7e9534994bb3a38"; + libraryHaskellDepends = [ + base containers ghc ghc-tcplugins-extra template-haskell + units-parser + ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + homepage = "https://github.com/adamgundry/uom-plugin"; + description = "Units of measure as a GHC typechecker plugin"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "up" = callPackage ({ mkDerivation, base, directory, filepath, lambda-options, mtl , split @@ -137795,8 +138352,8 @@ self: { ({ mkDerivation, base, bytestring }: mkDerivation { pname = "utf8-string"; - version = "1"; - sha256 = "79f388d3f089e0c483c1dc1afad524b06f1abb6e288ed9029f934cffb3b2ba08"; + version = "1.0.1.1"; + sha256 = "fb0b9e3acbe0605bcd1c63e51f290a7bbbe6628dfa3294ff453e4235fbaef140"; libraryHaskellDepends = [ base bytestring ]; homepage = "http://github.com/glguy/utf8-string/"; description = "Support for reading and writing UTF8 Strings"; @@ -137807,8 +138364,8 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "utility-ht"; - version = "0.0.10"; - sha256 = "ad8399180f495e6bb30e416a67a43d1bf82a7dd99293badd6e0d7674c1facd9f"; + version = "0.0.11"; + sha256 = "5cdcc5c1eab4029d18f1712472d69b61265c2d543a8065e1e9762b1ddc235812"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Various small helper functions for Lists, Maybes, Tuples, Functions"; @@ -138854,11 +139411,10 @@ self: { ({ mkDerivation, base, fftw, primitive, storable-complex, vector }: mkDerivation { pname = "vector-fftw"; - version = "0.1.3.2"; - sha256 = "a0bab8a9466856583b59fd40337337d2cd57995aeb3d89d3e2e4f2e80dcadb65"; + version = "0.1.3.3"; + sha256 = "131d88fa9ea17e7e46a6d886f37e77282e8e95f2022ccefd2cf11adeca0b9172"; libraryHaskellDepends = [ base primitive storable-complex vector ]; librarySystemDepends = [ fftw ]; - jailbreak = true; homepage = "http://hackage.haskell.org/package/vector-fftw"; description = "A binding to the fftw library for one-dimensional vectors"; license = stdenv.lib.licenses.bsd3; @@ -140464,17 +141020,17 @@ self: { }) {}; "wai-middleware-throttle" = callPackage - ({ mkDerivation, base, bytestring, containers, hlint, hspec - , http-types, HUnit, network, stm, token-bucket, transformers, wai - , wai-extra + ({ mkDerivation, base, bytestring, containers, hashable, hlint + , hspec, http-types, HUnit, network, stm, token-bucket + , transformers, wai, wai-extra }: mkDerivation { pname = "wai-middleware-throttle"; - version = "0.2.0.1"; - sha256 = "56b55cdb8e081693c35b35791a59b155a91a628e205c9645cbe9d160176b1d23"; + version = "0.2.0.2"; + sha256 = "b38b28d2a2dcda631cf12ff066343539986028106867594dbf07efe40e81d712"; libraryHaskellDepends = [ - base containers http-types network stm token-bucket transformers - wai + base containers hashable http-types network stm token-bucket + transformers wai ]; testHaskellDepends = [ base bytestring hlint hspec http-types HUnit stm transformers wai @@ -140570,18 +141126,25 @@ self: { }) {}; "wai-routes" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers - , http-types, monad-loops, mtl, path-pieces, random + ({ mkDerivation, aeson, base, blaze-builder, bytestring + , case-insensitive, containers, cookie, data-default-class + , filepath, hspec, hspec-wai, hspec-wai-json, http-types + , mime-types, monad-loops, mtl, path-pieces, random , template-haskell, text, wai }: mkDerivation { pname = "wai-routes"; - version = "0.7.3"; - sha256 = "92d694a9b63b8f34e1e62f5f29b65cb85566eeb9cad90b7dd34689bc296b139b"; + version = "0.8.0"; + sha256 = "3b0b8ccb5853d830c0feaad5cbb5db8e7f3499af18b027e052e169199b89959d"; libraryHaskellDepends = [ - aeson base blaze-builder bytestring containers http-types + aeson base blaze-builder bytestring case-insensitive containers + cookie data-default-class filepath http-types mime-types monad-loops mtl path-pieces random template-haskell text wai ]; + testHaskellDepends = [ + aeson base hspec hspec-wai hspec-wai-json wai + ]; + jailbreak = true; homepage = "https://ajnsit.github.io/wai-routes/"; description = "Typesafe URLs for Wai applications"; license = stdenv.lib.licenses.mit; @@ -140915,8 +141478,8 @@ self: { }: mkDerivation { pname = "warp-tls"; - version = "3.1.1"; - sha256 = "5e9a75cc877f52053c5e1ceb15427ac28bf9937750336af0f71569b4e9e213bd"; + version = "3.1.2"; + sha256 = "3940708b273b195eefdeeb63448fcb121ead5a010cad04f1c3ab4bd7470e34a2"; libraryHaskellDepends = [ base bytestring cprng-aes data-default-class network streaming-commons tls wai warp @@ -142037,8 +142600,8 @@ self: { }: mkDerivation { pname = "wiring"; - version = "0.3.0"; - sha256 = "1d99c9604d179b61687f2bec82c97dd6665fba4ea024271806abae82bb79fd30"; + version = "0.4.1"; + sha256 = "b2a6e2ac3299d109244432dbdce4094d9967f10916c31a3df5a7bf6fbcc67b01"; libraryHaskellDepends = [ base mtl template-haskell transformers ]; testHaskellDepends = [ base hspec mtl QuickCheck template-haskell transformers @@ -143127,8 +143690,8 @@ self: { }: mkDerivation { pname = "xcffib"; - version = "0.3.5"; - sha256 = "9e5a1c67a4879bbb4a2fbe2232d4ab508db34810e6ebec063e4621a817032566"; + version = "0.3.6"; + sha256 = "69941191e5be3671555670f1894cdd30a44e8e9b303561fee87c5f84f9bbe251"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -143714,12 +144277,11 @@ self: { ({ mkDerivation, base, mtl, safe, transformers, xml }: mkDerivation { pname = "xml-extractors"; - version = "0.4.0.0"; - sha256 = "98c34b3ae23141a8eda870418297615a21db8d48024821a919a7ee4f52076808"; + version = "0.4.0.1"; + sha256 = "38ffa6ab354dcaddbdd1ca4c187418715fd7d7de77abc4861c9840c88bce1e79"; libraryHaskellDepends = [ base mtl safe transformers xml ]; - jailbreak = true; homepage = "https://github.com/holmisen/xml-extractors"; - description = "Wrapper over xml to extract data from parsed xml"; + description = "Extension to the xml package to extract data from parsed xml"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -144306,8 +144868,8 @@ self: { ({ mkDerivation, base, magic, mtl, random, unix, xmonad }: mkDerivation { pname = "xmonad-wallpaper"; - version = "0.0.1.1"; - sha256 = "a720bd9f3ba17835373e4093b64b7d7f522d095281a853447943be16502fac4c"; + version = "0.0.1.2"; + sha256 = "b02e1c7a524dd9cf28d5cff6933194fe245fa4e9247f701ec87195a20a8cf265"; libraryHaskellDepends = [ base magic mtl random unix xmonad ]; description = "xmonad wallpaper extension"; license = stdenv.lib.licenses.gpl3; @@ -145071,6 +145633,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) libdevil;}; + "yate" = callPackage + ({ mkDerivation, aeson, attoparsec, base, hspec, mtl, scientific + , template-haskell, text, unordered-containers, vector + }: + mkDerivation { + pname = "yate"; + version = "0.1.0.0"; + sha256 = "20275bafdb52ce74f3c3cecb6cbb8925c7d9f40bea74d6872145ff93df49d85d"; + libraryHaskellDepends = [ + aeson attoparsec base mtl scientific template-haskell text + unordered-containers vector + ]; + testHaskellDepends = [ + attoparsec base hspec mtl unordered-containers vector + ]; + jailbreak = true; + description = "Yet Another Template Engine"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "yavie" = callPackage ({ mkDerivation, base, Cabal, directory, event-driven, filepath , monads-tf, process, regexpr @@ -145446,12 +146028,11 @@ self: { }: mkDerivation { pname = "yesod-auth-ldap-mediocre"; - version = "0.1.0.0"; - sha256 = "509eb2cc3a4895f9fe797f152b3f3511fbae7b765730016c3a93a6888290f10e"; + version = "0.1.1"; + sha256 = "ecf280a3e185d9864a9924681856fa92e5fe441d02e0f29164c3bc4d9eef430b"; libraryHaskellDepends = [ aeson base LDAP text yesod-auth yesod-core yesod-form ]; - jailbreak = true; description = "Very simlple LDAP auth for yesod"; license = stdenv.lib.licenses.mit; }) {}; @@ -145562,8 +146143,8 @@ self: { }: mkDerivation { pname = "yesod-bin"; - version = "1.4.13.3"; - sha256 = "cc84e0c8f081211c01a6c8d58544b9b7fe5c5c180d8a2edcb30a79edbe198e61"; + version = "1.4.14"; + sha256 = "6ed15a3ac5084926073c92fa7fd3ad2efa5ff8b4dc17fa4e6b1c109d57717a0c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -145646,8 +146227,8 @@ self: { "yesod-core" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-builder - , blaze-html, blaze-markup, bytestring, case-insensitive, cereal - , clientsession, conduit, conduit-extra, containers, cookie + , blaze-html, blaze-markup, byteable, bytestring, case-insensitive + , cereal, clientsession, conduit, conduit-extra, containers, cookie , data-default, deepseq, directory, exceptions, fast-logger, hspec , hspec-expectations, http-types, HUnit, lifted-base, monad-control , monad-logger, mtl, mwc-random, network, old-locale, parsec @@ -145659,11 +146240,11 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.4.13"; - sha256 = "219bf0858977468d9aa74ab5f2d330e46bbbe95d700c989b3565be5d99d319da"; + version = "1.4.15"; + sha256 = "b9878ee01f66346967a157c597d284735c66db61a18a93c319b85233500050b4"; libraryHaskellDepends = [ aeson auto-update base blaze-builder blaze-html blaze-markup - bytestring case-insensitive cereal clientsession conduit + byteable bytestring case-insensitive cereal clientsession conduit conduit-extra containers cookie data-default deepseq directory exceptions fast-logger http-types lifted-base monad-control monad-logger mtl mwc-random old-locale parsec path-pieces primitive @@ -146534,6 +147115,7 @@ self: { base bytestring hamlet hspec HUnit shakespeare template-haskell text yesod-core yesod-static yesod-test ]; + jailbreak = true; homepage = "https://bitbucket.org/wuzzeb/yesod-static-angular"; description = "Yesod generators for embedding AngularJs code into yesod-static at compile time"; license = stdenv.lib.licenses.mit; @@ -146545,8 +147127,8 @@ self: { }: mkDerivation { pname = "yesod-table"; - version = "1.0.5"; - sha256 = "873cb5ae68d3726678ce4f254a5342f56244f86e88c731ca6849691df30f85df"; + version = "1.0.6"; + sha256 = "69d4f11c31d9928551c7de3b1fc12a470e29ead58729f1b752b773be862e3b30"; libraryHaskellDepends = [ base bytestring containers contravariant text yesod-core ]; @@ -146576,8 +147158,8 @@ self: { }: mkDerivation { pname = "yesod-test"; - version = "1.4.3.1"; - sha256 = "a29e0173b31aacaa4a0235bfdcc8c7809b8685a9069a1f5b6083f204d1fd1394"; + version = "1.5"; + sha256 = "437a76419c94030c3c3d8b8a88a52f0ff9c416d56894bc4b825c62faa9a1be07"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-html blaze-markup bytestring case-insensitive containers cookie hspec-core html-conduit @@ -146655,8 +147237,8 @@ self: { }: mkDerivation { pname = "yesod-transloadit"; - version = "0.3.0.0"; - sha256 = "95c485106e4aa6d30e3b3d981ef67fafbbd2fb23597aae7780d45106d4bf565c"; + version = "0.4.0.0"; + sha256 = "a50270b5829c45c7b72a82137abf94046343f60532bcab0a8a6ef0fd9974745a"; libraryHaskellDepends = [ aeson base byteable bytestring cryptohash lens lens-aeson old-locale shakespeare text time transformers unordered-containers @@ -147756,10 +148338,10 @@ self: { ({ mkDerivation, base, binary, bytestring, containers }: mkDerivation { pname = "zmidi-core"; - version = "0.7.0"; - sha256 = "3455f95bd3451f667e224d278aae4c474e8d4efe0d44a9f76d2c1b9297671f6d"; + version = "0.8.0"; + sha256 = "aa8e7f0d0068f75f38347beb85de7716811018e8fa5b42fb5a1a3c9a11fbbada"; libraryHaskellDepends = [ base binary bytestring containers ]; - homepage = "http://code.google.com/p/copperbox/"; + homepage = "https://github.com/stephentetley/zmidi-core"; description = "Read and write MIDI files"; license = stdenv.lib.licenses.bsd3; }) {}; From 6dd889144de7c837613f4db671608cf155ba6c45 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 22 Aug 2015 21:25:18 +0200 Subject: [PATCH 022/175] haskell-deepdeq: update version used for pre 7.4.x GHC versions --- pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix index af34629e319..55432ccdac5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix @@ -38,7 +38,7 @@ self: super: { binary = self.binary_0_7_6_1; # deepseq is not a core library for this compiler. - deepseq = self.deepseq_1_4_1_1; + deepseq = self.deepseq_1_4_1_2; # transformers is not a core library for this compiler. transformers = self.transformers_0_4_3_0; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix index 1ec76e6fa19..c848a50cd36 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -35,7 +35,7 @@ self: super: { unix = null; # deepseq is not a core library for this compiler. - deepseq = self.deepseq_1_4_1_1; + deepseq = self.deepseq_1_4_1_2; # transformers is not a core library for this compiler. transformers = self.transformers_0_4_3_0; From 1e578fa36b7d4d7675fdd2bcaca3136d2560b04c Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Fri, 21 Aug 2015 05:09:56 -0400 Subject: [PATCH 023/175] haskell-cabal-helper: (temporary) testing issues --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index d8d1e3f499a..c61b9c26211 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -275,4 +275,7 @@ self: super: { # The tests in vty-ui do not build, but vty-ui itself builds. vty-ui = enableCabalFlag super.vty-ui "no-tests"; + # https://github.com/DanielG/cabal-helper/issues/10 + cabal-helper = dontCheck super.cabal-helper; + } From 412062eb488d9c9ac35cd9cf26c24aea3aa4353a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Aug 2015 22:11:57 +0200 Subject: [PATCH 024/175] haskell-semigroupoids: doctests have been fixed upstream --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index cc7ef9cfdf7..e550b15065c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -830,9 +830,6 @@ self: super: { # https://github.com/ekmett/comonad/issues/25 comonad = dontCheck super.comonad; - # https://github.com/ekmett/semigroupoids/issues/35 - semigroupoids = disableCabalFlag super.semigroupoids "doctests"; - # https://github.com/jaspervdj/websockets/issues/104 websockets = dontCheck super.websockets; From 4ce6d653bba37c6b51e75391456fcfa37828d2c6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Aug 2015 08:41:14 +0200 Subject: [PATCH 025/175] haskell-fsnotify: disable failing test suite --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e550b15065c..9aa7488beab 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -195,8 +195,9 @@ self: super: { else super.hfsevents; # FSEvents API is very buggy and tests are unreliable. See - # http://openradar.appspot.com/10207999 and similar issues - fsnotify = if pkgs.stdenv.isDarwin then dontCheck super.fsnotify else super.fsnotify; + # http://openradar.appspot.com/10207999 and similar issues. + # https://github.com/haskell-fswatch/hfsnotify/issues/62 + fsnotify = dontCheck super.fsnotify; # if pkgs.stdenv.isDarwin then dontCheck super.fsnotify else super.fsnotify; # the system-fileio tests use canonicalizePath, which fails in the sandbox system-fileio = if pkgs.stdenv.isDarwin then dontCheck super.system-fileio else super.system-fileio; From 3f6074713b7fc726a0e68f5a1e3f562147be7d9b Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Tue, 25 Aug 2015 08:52:36 -0400 Subject: [PATCH 026/175] haskell-hxt: re-enable haddock generation The bug's been closed for a while, and I manually verified that the haddock gets rendered to HTML in all versions from 7.6 -> 7.10. --- pkgs/development/haskell-modules/configuration-common.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9aa7488beab..7f823949a8e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -153,7 +153,6 @@ self: super: { hspec-discover = dontHaddock super.hspec-discover; http-client-conduit = dontHaddock super.http-client-conduit; http-client-multipart = dontHaddock super.http-client-multipart; - hxt = dontHaddock super.hxt; # https://github.com/UweSchmidt/hxt/issues/38 markdown-unlit = dontHaddock super.markdown-unlit; network-conduit = dontHaddock super.network-conduit; shakespeare-js = dontHaddock super.shakespeare-js; From d08a483bda5c3af85546259a191bc4e82bc86b68 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Aug 2015 15:31:56 +0200 Subject: [PATCH 027/175] haskell-ed25519 is broken --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7f823949a8e..7658ff1b111 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -978,4 +978,10 @@ self: super: { # https://github.com/bos/configurator/issues/22 configurator = dontCheck super.configurator; + # https://github.com/thoughtpolice/hs-ed25519/issues/9 + ed25519 = markBroken super.ed25519; + hackage-repo-tool = dontDistribute super.hackage-repo-tool; + hackage-security = dontDistribute super.hackage-security; + hackage-security-HTTP = dontDistribute super.hackage-security-HTTP; + } From b106fbfb4fa767e95370405dd45519bc3b1d975d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Aug 2015 16:07:09 +0200 Subject: [PATCH 028/175] cabal2nix: update to version 20150824 --- .../tools/haskell/cabal2nix/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 88e8c55b061..b1bd535c5fd 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -2,17 +2,17 @@ , containers, deepseq, deepseq-generics, directory, doctest, filepath , hackage-db, hspec, lens, monad-par, monad-par-extras, mtl , optparse-applicative, pretty, process, QuickCheck, regex-posix, SHA, split -, stdenv, transformers, utf8-string, makeWrapper, gitMinimal, cartel +, stdenv, transformers, utf8-string, makeWrapper, gitMinimal, cartel, data-default , nix-prefetch-scripts }: mkDerivation rec { pname = "cabal2nix"; - version = "20150807-6-g9f58996"; + version = "20150824"; src = fetchgit { url = "http://github.com/NixOS/cabal2nix.git"; - rev = "9f589961fba9fa6a92900c37cf1ab16c597b0c69"; - sha256 = "0vy18gmyrw72m98psz7hz51aqj66b98h1pdv98hf3k1hrdva3ncv"; + rev = "560fb2b1d22f4c995a526529bb034bd183e85a31"; + sha256 = "0qaa0l23lc8677wvbgz327yvfg2pxxmvrxga6568ra5kgdy4204c"; deepClone = true; }; isLibrary = false; @@ -21,19 +21,19 @@ mkDerivation rec { aeson ansi-wl-pprint base bytestring Cabal containers deepseq-generics directory filepath hackage-db lens monad-par monad-par-extras mtl optparse-applicative pretty process - regex-posix SHA split transformers utf8-string + regex-posix SHA split transformers utf8-string data-default ]; executableHaskellDepends = [ aeson ansi-wl-pprint base bytestring Cabal containers deepseq-generics directory filepath hackage-db lens monad-par monad-par-extras mtl optparse-applicative pretty process - regex-posix SHA split transformers utf8-string + regex-posix SHA split transformers utf8-string data-default ]; testHaskellDepends = [ aeson ansi-wl-pprint base bytestring Cabal containers deepseq deepseq-generics directory doctest filepath hackage-db hspec lens monad-par monad-par-extras mtl optparse-applicative pretty process - QuickCheck regex-posix SHA split transformers utf8-string + QuickCheck regex-posix SHA split transformers utf8-string data-default ]; buildDepends = [ cartel ]; buildTools = [ gitMinimal makeWrapper ]; From 358e915119b71fc02e4abb69a0e416ccd9320c0a Mon Sep 17 00:00:00 2001 From: Kevin Marsh Date: Tue, 25 Aug 2015 16:48:16 +0100 Subject: [PATCH 029/175] Update Django minor version numbers (to 1.8.4, 1.7.10, 1.4.22) --- pkgs/top-level/python-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3d89c0a2404..14ee1097155 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5130,12 +5130,12 @@ let django_1_8 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.8.3"; + version = "1.8.4"; disabled = pythonOlder "2.7"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.8/${name}.tar.gz"; - sha256 = "1fjv63rdm45j5057zb7qj4ya4pjwig1jpbwcr0bk1mazq3y59dib"; + sha256 = "1n3hb80v7wl5j2mry5pfald6i9z42a9c3m9405877iqw3v49csc2"; }; # error: invalid command 'test' @@ -5155,12 +5155,12 @@ let django_1_7 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.7.9"; + version = "1.7.10"; disabled = pythonOlder "2.7"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.7/${name}.tar.gz"; - sha256 = "0q3q46yjjsqwp0ywrkbqwiac13rdvzrd5dchdbnzh3yjwpj9ygsg"; + sha256 = "0xbwg6nyvwcbp2hvk0x3s5y823k5kizn0za1bl2rf6g6xcn7sddr"; }; # error: invalid command 'test' @@ -5225,11 +5225,11 @@ let django_1_4 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.4.21"; + version = "1.4.22"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.4/${name}.tar.gz"; - sha256 = "1x5wk3yh6ydbp4sgsxl4qjmdvcazphwkmmm99lfdb04645sijkwk"; + sha256 = "110p1mgdcf87kyr64mr2jgmyapyg27kha74yq3wjrazwfbbwkqnh"; }; # error: invalid command 'test' From 4c8b2beb55e65b9f586bf575acaaa5c609791260 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sun, 23 Aug 2015 13:42:41 +0200 Subject: [PATCH 030/175] flashplayer: 11.2.202.491 -> 11.2.202.508 --- .../browsers/mozilla-plugins/flashplayer-11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 0ded56b8aba..01c64340875 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -36,7 +36,7 @@ let # -> http://get.adobe.com/flashplayer/ - version = "11.2.202.491"; + version = "11.2.202.508"; src = if stdenv.system == "x86_64-linux" then @@ -47,7 +47,7 @@ let else rec { inherit version; url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; - sha256 = "150zlnkq8jhhphfmyzdrpgi1y2sniqgx0a5ij994in3gvari9gpl"; + sha256 = "1i0301vnz94pxcwm9wk1jjyv7gwywy6p7z26ikd5cg259myxbg75"; } else if stdenv.system == "i686-linux" then if debug then @@ -60,7 +60,7 @@ let else rec { inherit version; url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "0lwff46gjazjv04fpck0nhv47b4z1x79n09q5444npm1w5zjfgxy"; + sha256 = "1483bi34ymchv1cqg57whxhlrhhvwhcw33zjgwzmy7bacxbkj9ia"; } else throw "Flash Player is not supported on this platform"; From 617a158e3c67a0c0eb18f56dc94eb35038340561 Mon Sep 17 00:00:00 2001 From: Daniel Fox Franke Date: Sun, 23 Aug 2015 13:00:31 -0400 Subject: [PATCH 031/175] libb2: init at 0.97 --- lib/maintainers.nix | 1 + pkgs/development/libraries/libb2/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/libb2/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index db37043594a..a393648790a 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -75,6 +75,7 @@ desiderius = "Didier J. Devroye "; devhell = "devhell <\"^\"@regexmail.net>"; dezgeg = "Tuomas Tynkkynen "; + dfoxfranke = "Daniel Fox Franke "; dmalikov = "Dmitry Malikov "; doublec = "Chris Double "; ederoyd46 = "Matthew Brown "; diff --git a/pkgs/development/libraries/libb2/default.nix b/pkgs/development/libraries/libb2/default.nix new file mode 100644 index 00000000000..f4d01def94a --- /dev/null +++ b/pkgs/development/libraries/libb2/default.nix @@ -0,0 +1,18 @@ +{stdenv, fetchurl}: +with stdenv; with lib; +mkDerivation rec { + name = "libb2-${meta.version}"; + + meta = { + version = "0.97"; + description = "The BLAKE2 family of cryptographic hash functions"; + platforms = platforms.all; + maintainers = with maintainers; [ dfoxfranke ]; + license = licenses.cc0; + }; + + src = fetchurl { + url = "https://blake2.net/${name}.tar.gz"; + sha256 = "7829c7309347650239c76af7f15d9391af2587b38f0a65c250104a2efef99051"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 017601a3a4d..9bc1ea2f1b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6770,6 +6770,8 @@ let libavc1394 = callPackage ../development/libraries/libavc1394 { }; + libb2 = callPackage ../development/libraries/libb2 { }; + libbluedevil = callPackage ../development/libraries/libbluedevil { }; libbdplus = callPackage ../development/libraries/libbdplus { }; From 30313a8fb845637ed74a442e48f7c07372fc6dd7 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 26 Aug 2015 02:03:13 +0200 Subject: [PATCH 032/175] google-cloud-sdk: 0.9.65 -> 0.9.74 --- pkgs/tools/admin/google-cloud-sdk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index adfdad1f9b1..c5fbf621e2d 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, python27, python27Packages, makeWrapper}: stdenv.mkDerivation rec { - version = "0.9.65"; + version = "0.9.74"; name = "google-cloud-sdk-${version}"; src = fetchurl { - url = "https://dl.google.com/dl/cloudsdk/release/packages/google-cloud-sdk-coretools-linux-static-20150619081534.tar.gz"; - sha256 = "10158kyihkmwmb6i8n0fh1dzjvqs8xpwqp6i9xfaxsr2yzxdkqs2"; + url = "https://dl.google.com/dl/cloudsdk/release/packages/google-cloud-sdk-coretools-linux-static-20150817103450.tar.gz"; + sha256 = "0qdry40xk23c6dvr6qzqn23bg8yfflm1m00gw1mqnpr4m1425vfg"; }; buildInputs = [python27 makeWrapper]; From a04bd9301b5bcb5e61611e35db805d1469175c1d Mon Sep 17 00:00:00 2001 From: Daniel Fox Franke Date: Tue, 25 Aug 2015 20:07:29 -0400 Subject: [PATCH 033/175] hglib: init at 1.7 --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3d89c0a2404..1d5aaeb4b3a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3698,6 +3698,24 @@ let }; }; + hglib = buildPythonPackage rec { + version = "1.7"; + name = "hglib-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/python-hglib/python-hglib-${version}.tar.gz"; + sha256 = "0dc087d15b774cda82d3c8096fb0e514caeb2ddb60eed38e9056b16e279ba3c5"; + }; + + meta = { + description = "Mercurial Python library"; + homepage = "http://selenic.com/repo/python-hglib"; + license = licenses.mit; + maintainers = with maintainers; [ dfoxfranke ]; + platforms = platforms.all; + }; + }; + humanize = buildPythonPackage rec { version = "0.5.1"; name = "humanize-${version}"; From 2194295fffc068a0f035c4bf0ef1daea21912f78 Mon Sep 17 00:00:00 2001 From: Daniel Fox Franke Date: Tue, 25 Aug 2015 21:53:56 -0400 Subject: [PATCH 034/175] cvs-fast-export: init at 1.32 --- .../cvs-fast-export/default.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/applications/version-management/cvs-fast-export/default.nix diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix new file mode 100644 index 00000000000..cf80dd3ef67 --- /dev/null +++ b/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -0,0 +1,47 @@ +{stdenv, fetchurl, makeWrapper, flex, bison, + asciidoc, docbook_xml_dtd_45, docbook_xml_xslt, + libxml2, libxslt, + python27, rcs, cvs, git, + coreutils, rsync}: +with stdenv; with lib; +mkDerivation rec { + name = "cvs-fast-export-${meta.version}"; + meta = { + version = "1.32"; + description = "Export an RCS or CVS history as a fast-import stream"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ dfoxfranke ]; + homepage = "http://www.catb.org/esr/cvs-fast-export/"; + platforms = platforms.all; + }; + + src = fetchurl { + url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.32.tar.gz"; + sha256 = "5bfb9a5650517d337a96a598795b50bc40ce12172854a6581267e7be3dbcfb97"; + }; + + buildInputs = [ + flex bison asciidoc docbook_xml_dtd_45 docbook_xml_xslt libxml2 libxslt + python27 rcs cvs git makeWrapper + ]; + + preBuild = '' + makeFlagsArray=( + XML_CATALOG_FILES="${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml" + prefix="$out" + ) + ''; + + doCheck = true; + + postInstall = + let + binpath = makeSearchPath "bin" [ out rcs cvs git coreutils rsync ]; + in '' + for prog in cvs-fast-export cvsconvert cvssync; do + wrapProgram $out/bin/$prog \ + --prefix PATH : ${binpath} + done + '' + ; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9bc1ea2f1b2..4870293a443 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1242,6 +1242,8 @@ let cutter = callPackage ../tools/networking/cutter { }; + cvs_fast_export = callPackage ../applications/version-management/cvs-fast-export { }; + dadadodo = callPackage ../tools/text/dadadodo { }; daemonize = callPackage ../tools/system/daemonize { }; From 686fec3ce75419f0fcc2aaefcce65ea0c1ac4867 Mon Sep 17 00:00:00 2001 From: Daniel Fox Franke Date: Tue, 25 Aug 2015 20:08:33 -0400 Subject: [PATCH 035/175] reposurgeon: init at 3.28 --- .../reposurgeon/default.nix | 66 +++++++++++++++++++ .../reposurgeon/fix-preserve-type.patch | 12 ++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 80 insertions(+) create mode 100644 pkgs/applications/version-management/reposurgeon/default.nix create mode 100644 pkgs/applications/version-management/reposurgeon/fix-preserve-type.patch diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/applications/version-management/reposurgeon/default.nix new file mode 100644 index 00000000000..5c2dde95572 --- /dev/null +++ b/pkgs/applications/version-management/reposurgeon/default.nix @@ -0,0 +1,66 @@ +{stdenv, fetchurl, makeWrapper, python27, python27Packages, git, + docbook_xml_dtd_412, docbook_xml_xslt, asciidoc, xmlto, + cython ? null, + bazaar ? null, cvs ? null, darcs ? null, fossil ? null, + mercurial ? null, monotone ? null, rcs ? null, src ? null, + subversion ? null, cvs_fast_export ? null }: +with stdenv; with lib; +mkDerivation rec { + name = "reposurgeon-${meta.version}"; + meta = { + description = "A tool for editing version-control repository history"; + version = "3.28"; + license = licenses.bsd3; + homepage = "http://www.catb.org/esr/reposurgeon/"; + maintainers = with maintainers; [ dfoxfranke ]; + platforms = platforms.all; + }; + + src = fetchurl { + url = "http://www.catb.org/~esr/reposurgeon/reposurgeon-3.28.tar.gz"; + sha256 = "3225b44109b8630310a0ea6fe63a3485d27aa46deaf80e8d07820e01a6f62626"; + }; + + # See https://gitlab.com/esr/reposurgeon/issues/17 + patches = [ ./fix-preserve-type.patch ]; + + buildInputs = + [ docbook_xml_dtd_412 docbook_xml_xslt asciidoc xmlto makeWrapper ] ++ + optional (cython != null) cython + ; + + preBuild = '' + makeFlagsArray=( + XML_CATALOG_FILES="${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml" + prefix="$out" + pyinclude="-I${python27}/include/python2.7" + pylib="-L${python27}/lib -lpython2.7" + ) + ''; + + buildFlags = "all" + (if cython != null then " cyreposurgeon" else ""); + + installTargets = + "install" + (if cython != null then " install-cyreposurgeon" else "") + ; + + postInstall = + let + binpath = makeSearchPath "bin" ( + filter (x: x != null) + [ out git bazaar cvs darcs fossil mercurial + monotone rcs src subversion cvs_fast_export ] + ); + pythonpath = makeSearchPath (python27.sitePackages) ( + filter (x: x != null) + [ python27Packages.readline or null python27Packages.hglib or null ] + ); + in '' + for prog in reposurgeon repodiffer repotool; do + wrapProgram $out/bin/$prog \ + --prefix PATH : "${binpath}" \ + --prefix PYTHONPATH : "${pythonpath}" + done + '' + ; +} diff --git a/pkgs/applications/version-management/reposurgeon/fix-preserve-type.patch b/pkgs/applications/version-management/reposurgeon/fix-preserve-type.patch new file mode 100644 index 00000000000..ef3568b7b92 --- /dev/null +++ b/pkgs/applications/version-management/reposurgeon/fix-preserve-type.patch @@ -0,0 +1,12 @@ +diff -Nru reposurgeon-3.28/reposurgeon reposurgeon-3.28-new/reposurgeon +--- reposurgeon-3.28/reposurgeon 2015-07-05 15:17:13.000000000 -0400 ++++ reposurgeon-3.28-new/reposurgeon 2015-08-25 18:23:11.347591137 -0400 +@@ -193,7 +193,7 @@ + importer=b"git fast-import --quiet", + checkout=b"git checkout", + lister=b"git ls-files", +- preserve=(b'.git/config', b'.git/hooks'), ++ preserve=set((b'.git/config', b'.git/hooks')), + authormap=b".git/cvs-authors", + ignorename=b".gitignore", + dfltignores=b"", # Has none diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4870293a443..84eaff2ab85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2842,6 +2842,8 @@ let replace = callPackage ../tools/text/replace { }; + reposurgeon = callPackage ../applications/version-management/reposurgeon { }; + reptyr = callPackage ../os-specific/linux/reptyr {}; rescuetime = callPackage ../applications/misc/rescuetime { }; From 3b1c772d1285c4a4dd76a15fa7e1767160af2791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 26 Aug 2015 07:57:57 +0200 Subject: [PATCH 036/175] gnome-contacts: fix evaluation --- pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix index 56491331684..2e89210413f 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { gnome3.gsettings_desktop_schemas makeWrapper file libnotify folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib libxml2 libsoup gnome3.gnome_online_accounts nspr nss - gdk_pixbuf gnome3.defaulticontheme librsvg + gdk_pixbuf gnome3.defaultIconTheme librsvg libchamplain clutter_gtk geocode_glib vala automake115x autoconf db ]; From 8dc7eb961189cf10b79d27c54e471296bb6f2f76 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 26 Aug 2015 08:42:06 +0200 Subject: [PATCH 037/175] svtplay-dl: 0.10.2015.05.24 -> 0.10.2015.08.24 --- pkgs/tools/misc/svtplay-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index d84d00e2ba2..32f6312a798 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "svtplay-dl-${version}"; - version = "0.10.2015.05.24"; + version = "0.10.2015.08.24"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "0dzd5n4zvrplvm3sx017ym7jlngp4pn8nra9qx9n4wq6h4c6n6a5"; + sha256 = "1w5jknqdlyw60pxx1wmx2xqkp968r9m3xdgm95ls1pjjp0pm047c"; }; pythonPaths = [ pycrypto ]; From 0349b056958ed5f0bf08280507c2ed55ee56c9a4 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Wed, 26 Aug 2015 09:31:39 +0200 Subject: [PATCH 038/175] veriT: 201410 -> 201506 --- .../science/logic/verit/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/science/logic/verit/default.nix b/pkgs/applications/science/logic/verit/default.nix index 16a45cca644..5cafb19350c 100644 --- a/pkgs/applications/science/logic/verit/default.nix +++ b/pkgs/applications/science/logic/verit/default.nix @@ -1,24 +1,21 @@ -{ stdenv, fetchurl, gmp, flex, bison }: +{ stdenv, fetchurl, autoreconfHook, gmp, flex, bison }: stdenv.mkDerivation rec { name = "veriT-${version}"; - version = "201410"; + version = "201506"; src = fetchurl { url = "http://www.verit-solver.org/distrib/${name}.tar.gz"; - sha256 = "0b31rl3wjn3b09jpka93lx83d26m8a5pixa216vq8pmjach8q5a3"; + sha256 = "1cc9gcspw3namkdfypkians2j5dn224dsw6xx95qicad6033bsgk"; }; - buildInputs = [ gmp flex bison ]; + nativeBuildInputs = [ autoreconfHook flex bison ]; + buildInputs = [ gmp ]; - enableParallelBuilding = false; + makeFlags = [ "LEX=${flex}/bin/flex" ]; - makeFlags = [ - "EXTERN=" # use system copy of gmp - ]; - - installPhase = '' - install -D -m0755 veriT $out/bin/veriT + preInstall = '' + mkdir -p $out/bin ''; meta = with stdenv.lib; { From 1b04fbad1c8641d00f2dd43fd5b3b48c3fc5d6e1 Mon Sep 17 00:00:00 2001 From: Tim Cuthbertson Date: Wed, 26 Aug 2015 17:46:01 +1000 Subject: [PATCH 039/175] tilda: ensure wrapped executable is named "tilda" --- pkgs/applications/misc/tilda/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix index 187ab039014..c7a01f2ac1b 100644 --- a/pkgs/applications/misc/tilda/default.nix +++ b/pkgs/applications/misc/tilda/default.nix @@ -17,8 +17,12 @@ stdenv.mkDerivation rec { LD_LIBRARY_PATH = "${expat}/lib"; # ugly hack for xgettext to work during build + # The config locking scheme relies on the binary being called "tilda", + # (`pgrep -C tilda`), so a simple `wrapProgram` won't suffice: postInstall = '' - wrapProgram "$out/bin/tilda" \ + mkdir $out/bin/wrapped + mv "$out/bin/tilda" "$out/bin/wrapped/tilda" + makeWrapper "$out/bin/wrapped/tilda" "$out/bin/tilda" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; From 481807f926c69b91a4cc70361d6bc1d66964bba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Wed, 26 Aug 2015 10:53:39 +0200 Subject: [PATCH 040/175] pythonPackages.py: add meta. Closes #9257 --- pkgs/top-level/python-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 73149a08ca1..6d4843826d7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9935,6 +9935,12 @@ let url = "https://pypi.python.org/packages/source/p/py/${name}.tar.gz"; md5 = "a904aabfe4765cb754f2db84ec7bb03a"; }; + + meta = { + description = "Library with cross-python path, ini-parsing, io, code, log facilities"; + homepage = http://pylib.readthedocs.org/; + license = licenses.mit; + }; }; From ee6140beaa3a8191fc32ecc596307056b6838e66 Mon Sep 17 00:00:00 2001 From: Alexander Date: Sun, 23 Aug 2015 13:15:59 +0000 Subject: [PATCH 041/175] rosegarden: init at 14.12 --- lib/maintainers.nix | 1 + .../applications/audio/rosegarden/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 pkgs/applications/audio/rosegarden/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index a393648790a..1788df4413f 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -141,6 +141,7 @@ kragniz = "Louis Taylor "; ktosiek = "Tomasz Kontusz "; lassulus = "Lassulus "; + lebastr = "Alexander Lebedev "; leonardoce = "Leonardo Cecchi "; lethalman = "Luca Bruno "; lhvwb = "Nathaniel Baxter "; diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix new file mode 100644 index 00000000000..b22018f1612 --- /dev/null +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, qt4, pkgconfig, ladspaPlugins, ladspaH, + dssi, liblo, liblrdf, fftwSinglePrec, libsndfile, + libsamplerate, perl, makedepend, libjack2, + withLirc ? false, lirc ? null } : + +stdenv.mkDerivation (rec { + version = "14.12"; + name = "rosegarden-${version}"; + src = fetchurl { + url = "mirror://sourceforge/rosegarden/${name}.tar.bz2"; + sha256 = "0zhlxr1njyy6837f09l6p75js0j5mxmls6m02bqafv9j32wgnxpq"; + }; + + QTDIR=qt4; + + buildInputs = [ qt4 pkgconfig ladspaPlugins ladspaH dssi liblo liblrdf fftwSinglePrec + libsndfile libsamplerate perl makedepend libjack2 ] + ++ stdenv.lib.optional withLirc [ lirc ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://www.rosegardenmusic.com/; + description = "Music composition and editing environment"; + longDescription = '' + Rosegarden is a music composition and editing environment based around a MIDI sequencer that features a rich understanding of music notation and includes basic support for digital audio. + Rosegarden is an easy-to-learn, attractive application that runs on Linux, ideal for composers, musicians, music students, and small studio or home recording environments. + ''; + + maintainers = [ maintainers.lebastr ]; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9bc1ea2f1b2..b9ff2bd6d62 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2883,6 +2883,8 @@ let rockbox_utility = callPackage ../tools/misc/rockbox-utility { }; + rosegarden = callPackage ../applications/audio/rosegarden { }; + rpPPPoE = builderDefsPackage (import ../tools/networking/rp-pppoe) { inherit ppp; }; From 75ed15e174996139e439fdca407f03fadfe929da Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 26 Aug 2015 12:10:08 +0200 Subject: [PATCH 042/175] goPackages: disable parallel builds It breaks cascadia tests. If a process terminates before wait, the PID is non-existant and wait fails. Using & and wait in bash is just broken and shouldn't be used. We shall probably use GNU parallel for this job. cc @wkennington --- pkgs/development/go-modules/generic/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index fafefd325df..7ab3c892f56 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -80,8 +80,8 @@ go.stdenv.mkDerivation ( PIDS=() if [ -n "$subPackages" ] ; then for p in $subPackages ; do - go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $goPackagePath/$p & - PIDS+=("$!") + go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $goPackagePath/$p + #PIDS+=("$!") done else pushd go/src @@ -99,8 +99,8 @@ go.stdenv.mkDerivation ( if [ -n "$OUT" ]; then echo "$OUT" >&2 fi - } & - PIDS+=("$!") + } + #PIDS+=("$!") done < <(find $goPackagePath -type f -name \*.go -exec dirname {} \; | sort | uniq) popd fi @@ -119,16 +119,16 @@ go.stdenv.mkDerivation ( PIDS=() if [ -n "$subPackages" ] ; then for p in $subPackages ; do - go test -p $NIX_BUILD_CORES -v $goPackagePath/$p & + go test -p $NIX_BUILD_CORES -v $goPackagePath/$p done - PIDS+=("$!") + #PIDS+=("$!") else pushd go/src while read d; do go test -p $NIX_BUILD_CORES -v $d done < <(find $goPackagePath -type f -name \*_test.go -exec dirname {} \; | sort | uniq) popd - PIDS+=("$!") + #PIDS+=("$!") fi # Exit on error from the parallel process From 08a6b7aa46eaa504633de24de383a958a5d42072 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 26 Aug 2015 12:12:52 +0200 Subject: [PATCH 043/175] Revert "goPackages: disable parallel builds" This reverts commit 75ed15e174996139e439fdca407f03fadfe929da. Turns out it was just a missing & cc @wkennington --- pkgs/development/go-modules/generic/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 7ab3c892f56..b5ddba9b981 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -80,8 +80,8 @@ go.stdenv.mkDerivation ( PIDS=() if [ -n "$subPackages" ] ; then for p in $subPackages ; do - go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $goPackagePath/$p - #PIDS+=("$!") + go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $goPackagePath/$p & + PIDS+=("$!") done else pushd go/src @@ -99,8 +99,8 @@ go.stdenv.mkDerivation ( if [ -n "$OUT" ]; then echo "$OUT" >&2 fi - } - #PIDS+=("$!") + } & + PIDS+=("$!") done < <(find $goPackagePath -type f -name \*.go -exec dirname {} \; | sort | uniq) popd fi @@ -119,16 +119,16 @@ go.stdenv.mkDerivation ( PIDS=() if [ -n "$subPackages" ] ; then for p in $subPackages ; do - go test -p $NIX_BUILD_CORES -v $goPackagePath/$p + go test -p $NIX_BUILD_CORES -v $goPackagePath/$p & done - #PIDS+=("$!") + PIDS+=("$!") else pushd go/src while read d; do - go test -p $NIX_BUILD_CORES -v $d + go test -p $NIX_BUILD_CORES -v $d & done < <(find $goPackagePath -type f -name \*_test.go -exec dirname {} \; | sort | uniq) popd - #PIDS+=("$!") + PIDS+=("$!") fi # Exit on error from the parallel process From 0e0e3c0c08b77a64fc934795dc5d9647fbd58d42 Mon Sep 17 00:00:00 2001 From: Anton Fedotov Date: Thu, 13 Aug 2015 14:15:11 +0300 Subject: [PATCH 044/175] qemu: 2.2.1 -> 2.4.0 --- pkgs/applications/virtualization/qemu/default.nix | 8 ++++---- .../virtualization/qemu/no-etc-install.patch | 11 ++++------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index a5d403457de..46581994910 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl, pixman , attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy -, libseccomp, libaio, libcap_ng, gnutls +, libseccomp, libaio, libcap_ng, gnutls, nettle , makeWrapper , pulseSupport ? true, libpulseaudio , sdlSupport ? true, SDL @@ -11,7 +11,7 @@ with stdenv.lib; let - n = "qemu-2.2.1"; + n = "qemu-2.4.0"; audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + optionalString pulseSupport "pa," + optionalString sdlSupport "sdl,"; @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://wiki.qemu.org/download/${n}.tar.bz2"; - sha256 = "181m2ddsg3adw8y5dmimsi8x678imn9f6i5p20zbhi7pdr61a5s6"; + sha256 = "0836gqv5zcl0xswwjcns3mlkn18lyz2fiq8rl1ihcm6cpf8vkc3j"; }; buildInputs = [ python zlib pkgconfig glib ncurses perl pixman attr libcap vde2 texinfo libuuid flex bison makeWrapper lzo snappy libseccomp - libcap_ng gnutls + libcap_ng gnutls nettle ] ++ optionals pulseSupport [ libpulseaudio ] ++ optionals sdlSupport [ SDL ] diff --git a/pkgs/applications/virtualization/qemu/no-etc-install.patch b/pkgs/applications/virtualization/qemu/no-etc-install.patch index 81d29feea3d..833f030bed3 100644 --- a/pkgs/applications/virtualization/qemu/no-etc-install.patch +++ b/pkgs/applications/virtualization/qemu/no-etc-install.patch @@ -1,14 +1,11 @@ -diff --git a/Makefile b/Makefile -index d6b9dc1..ce7c493 100644 --- a/Makefile +++ b/Makefile -@@ -384,8 +384,7 @@ install-confdir: - install-sysconfig: install-datadir install-confdir - $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)" +@@ -418,7 +418,7 @@ --install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \ + + install: all $(if $(BUILD_DOCS),install-doc) \ -install-datadir install-localstatedir -+install: all $(if $(BUILD_DOCS),install-doc) install-datadir ++install-datadir ifneq ($(TOOLS),) $(call install-prog,$(TOOLS),$(DESTDIR)$(bindir)) endif From 274f7bc11784b6e86bd925e0e132c9b4e8de1730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Wed, 26 Aug 2015 12:59:57 +0200 Subject: [PATCH 045/175] catch: 1.1-3 -> 1.2.1 --- pkgs/development/libraries/catch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix index 49376b74c17..625ec2995e3 100644 --- a/pkgs/development/libraries/catch/default.nix +++ b/pkgs/development/libraries/catch/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "catch-${version}"; - version = "1.1-3"; + version = "1.2.1"; src = fetchFromGitHub { owner = "philsquared"; repo = "Catch"; - rev = "c51e86819dc993d590e5d0adaf1952f4b53e5355"; - sha256 = "0kgi7wxxysgjbpisqfj4dj0k19cyyai92f001zi8gzkybd4fkgv5"; + rev = "v" + version; + sha256 = "0rz2nmvvh66x6w2nb7l08vc5x9aqg1qfz2qfiykaz1ybc19fwck2"; }; buildInputs = [ cmake ]; From f547eaab44ed9f2323fcea74c2a91c6bf50e47f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Wed, 26 Aug 2015 13:00:23 +0200 Subject: [PATCH 046/175] openvpn: 2.3.6 -> 2.3.8 --- pkgs/tools/networking/openvpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 9dd16be4154..b2bf65ff9ee 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "openvpn-2.3.6"; + name = "openvpn-2.3.8"; src = fetchurl { url = "http://swupdate.openvpn.net/community/releases/${name}.tar.gz"; - sha256 = "09jvxr4wcsmk55gqv3cblm60kzs9ripv9h4y50d1lbn177zx5bkv"; + sha256 = "0lbw22qv3m0axhs13razr6b4x1p7jcpvf9rzb15b850wyvpka92k"; }; patches = optional stdenv.isLinux ./systemd-notify.patch; From 4825906186a7817f8b72bf83aa924fc46014fa68 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 26 Aug 2015 13:02:13 +0200 Subject: [PATCH 047/175] ikiwiki: update to version 3.20150614 Unfortunately, this update does not fix the test suite failure: | Test Summary Report | ------------------- | t/img.t (Wstat: 512 Tests: 31 Failed: 2) | Failed tests: 17-18 | Non-zero exit status: 2 | Files=59, Tests=2273, 22 wallclock secs ( 0.49 usr 0.04 sys + 16.36 cusr 5.45 csys = 22.34 CPU) | Result: FAIL | Failed 1/59 test programs. 2/2273 subtests failed. --- pkgs/applications/misc/ikiwiki/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index a076a2bb7cf..1f78355ca3a 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null); let name = "ikiwiki"; - version = "3.20150107"; + version = "3.20150614"; lib = stdenv.lib; in @@ -31,8 +31,8 @@ stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { - url = "https://github.com/joeyh/ikiwiki/archive/debian/${version}.tar.gz"; - sha256 = "12kiqjxrh93gysdp7bhglnks2md9davl8jgzqlj0m8xs5rf1972n"; + url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz"; + sha256 = "0sbs58d7faap1wp2rv7kf3gy3hid1hcpspgqs9wwms2qcki9kwa2"; }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate From c2841a2221a14b00b43d4774a7353621792b0d5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 26 Aug 2015 13:55:57 +0200 Subject: [PATCH 048/175] docker: 1.7 -> 1.8.1, fix build (go 1.4) --- pkgs/applications/virtualization/docker/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index c3b141cba81..b915e744358 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -3,13 +3,13 @@ btrfsProgs, iptables, bash, e2fsprogs, xz}: stdenv.mkDerivation rec { name = "docker-${version}"; - version = "1.7.1"; + version = "1.8.1"; src = fetchFromGitHub { owner = "docker"; repo = "docker"; rev = "v${version}"; - sha256 = "0r0j8aj1a7lbnc9piznp02h5n2gdw3v3n4q2ipmapi9ax0wj82lz"; + sha256 = "0nwd5wsw9f50jh4s5c5sfd6hnyh3g2kmxcrid36y1phabh30yrcz"; }; buildInputs = [ makeWrapper go sqlite lxc iproute bridge-utils devicemapper btrfsProgs iptables e2fsprogs ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f699ebb7ff2..16b652d8ea0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11074,7 +11074,7 @@ let dmtx-utils = callPackage (import ../tools/graphics/dmtx-utils) { }; - docker = callPackage ../applications/virtualization/docker { }; + docker = callPackage ../applications/virtualization/docker { go = go_1_4; }; doodle = callPackage ../applications/search/doodle { }; From 1e18b75170487e6790b6fff32747fe0a185cbaac Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 26 Aug 2015 15:04:27 +0200 Subject: [PATCH 049/175] Prefer local build for the test driver script --- nixos/lib/testing.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 59d05f87d5f..aa1cec1ea02 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -15,6 +15,8 @@ rec { unpackPhase = "true"; + preferLocalBuild = true; + installPhase = '' mkdir -p $out/bin From ce79122119736a63030aa2beb2de6a7c723c2e2c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 26 Aug 2015 09:35:48 -0500 Subject: [PATCH 050/175] pypy: wrap original, not symlink --- pkgs/development/interpreters/pypy/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix index a4eb7439b0d..f5cf11ead97 100644 --- a/pkgs/development/interpreters/pypy/default.nix +++ b/pkgs/development/interpreters/pypy/default.nix @@ -100,7 +100,12 @@ let ln -s $out/pypy-c/include $out/include/${libPrefix} ln -s $out/pypy-c/lib-python/${pythonVersion} $out/lib/${libPrefix} - wrapProgram "$out/bin/pypy" \ + # We must wrap the original, not the symlink. + # PyPy uses argv[0] to find its standard library, and while it knows + # how to follow symlinks, it doesn't know about wrappers. So, it + # will think the wrapper is the original. As long as the wrapper has + # the same path as the original, this is OK. + wrapProgram "$out/pypy-c/pypy-c" \ --set LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:$out/lib" \ --set LIBRARY_PATH "${LIBRARY_PATH}:$out/lib" From f3fb580f658f1738d7e8f92b575442e08867ec2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 26 Aug 2015 10:16:53 +0200 Subject: [PATCH 051/175] libqglviewer: 2.3.4 -> 2.6.3 It seems upstream no longer provides old downloads. So this unbreaks the build. --- pkgs/development/libraries/libqglviewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix index b389176b3da..86ee672d4b4 100644 --- a/pkgs/development/libraries/libqglviewer/default.nix +++ b/pkgs/development/libraries/libqglviewer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qt4 }: stdenv.mkDerivation rec { - name = "libQGLViewer-2.3.4"; + name = "libQGLViewer-2.6.3"; src = fetchurl { url = "http://www.libqglviewer.com/src/${name}.tar.gz"; - sha256 = "01b9x2n3v5x3zkky2bjpgbhn5bglqn4gd7x5j5p7y2dw0jnzz7j0"; + sha256 = "00jdkyk4wg1356c3ar6nk3hyp494ya3yvshq9m57kfmqpn3inqdy"; }; buildInputs = [ qt4 ]; From b4d8bb5626fa7a2e380aa2179a809f153e2b645c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 26 Aug 2015 10:19:28 +0200 Subject: [PATCH 052/175] libqglviewer: update meta attributes (and add platforms) --- pkgs/development/libraries/libqglviewer/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix index 86ee672d4b4..829e5f92353 100644 --- a/pkgs/development/libraries/libqglviewer/default.nix +++ b/pkgs/development/libraries/libqglviewer/default.nix @@ -17,9 +17,10 @@ stdenv.mkDerivation rec { make ''; - meta = { - description = "trackball-based 3D viewer qt widget including many useful features"; - homepage = http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer/installUnix.html; - license = stdenv.lib.licenses.gpl2; + meta = with stdenv.lib; { + description = "C++ library based on Qt that eases the creation of OpenGL 3D viewers"; + homepage = http://libqglviewer.com/; + license = licenses.gpl2; + platforms = platforms.all; }; } From d61c46c1bd79ff08cd1dac34925a92363e6d2031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 26 Aug 2015 10:20:06 +0200 Subject: [PATCH 053/175] libqglviewer: rename attrname and pkgname from libQGLViewer Ref. http://nixos.org/nixpkgs/manual/#sec-package-naming --- pkgs/development/libraries/libqglviewer/default.nix | 5 +++-- pkgs/misc/freestyle/default.nix | 6 +++--- pkgs/misc/freestyle/patch | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix index 829e5f92353..6b40eeb3b1f 100644 --- a/pkgs/development/libraries/libqglviewer/default.nix +++ b/pkgs/development/libraries/libqglviewer/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, qt4 }: stdenv.mkDerivation rec { - name = "libQGLViewer-2.6.3"; + name = "libqglviewer-2.6.3"; + version = "2.6.3"; src = fetchurl { - url = "http://www.libqglviewer.com/src/${name}.tar.gz"; + url = "http://www.libqglviewer.com/src/libQGLViewer-${version}.tar.gz"; sha256 = "00jdkyk4wg1356c3ar6nk3hyp494ya3yvshq9m57kfmqpn3inqdy"; }; diff --git a/pkgs/misc/freestyle/default.nix b/pkgs/misc/freestyle/default.nix index bb3520e300a..231b8eabb07 100644 --- a/pkgs/misc/freestyle/default.nix +++ b/pkgs/misc/freestyle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, libpng, lib3ds, freeglut, libXi, libQGLViewer +{ stdenv, fetchurl, qt4, libpng, lib3ds, freeglut, libXi, libqglviewer , swig, python }: stdenv.mkDerivation { @@ -9,9 +9,9 @@ stdenv.mkDerivation { sha256 = "1h4880fijmfy0x6dbl9hfri071rpj3lnwfzkxi1qyqhy7zyxy7ga"; }; - buildInputs = [ qt4 libpng lib3ds freeglut libXi libQGLViewer swig ]; + buildInputs = [ qt4 libpng lib3ds freeglut libXi libqglviewer swig ]; - inherit python freeglut libQGLViewer lib3ds; # if you want to use another adopt patch and Config.pri + inherit python freeglut libqglviewer lib3ds; # if you want to use another adopt patch and Config.pri buildPhase = '' export PYTHON_VERSION=2.5 diff --git a/pkgs/misc/freestyle/patch b/pkgs/misc/freestyle/patch index 733f50dbf10..dae1b66f9bb 100644 --- a/pkgs/misc/freestyle/patch +++ b/pkgs/misc/freestyle/patch @@ -155,8 +155,8 @@ diff -U3 -r a/src/libconfig.pri b/src/libconfig.pri - } - } - win32: LIBS *= QGLViewer2.lib -+ INCLUDEPATH *= $(libQGLViewer)/include -+ LIBS *= -L$(libQGLViewer)/lib -lQGLViewer ++ INCLUDEPATH *= $(libqglviewer)/include ++ LIBS *= -L$(libqglviewer)/lib -lQGLViewer } diff -U3 -r a/src/swig/Makefile b/src/swig/Makefile --- a/src/swig/Makefile 2008-06-06 22:08:06.000000000 +0200 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 887e21a505c..8b031194670 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7093,7 +7093,7 @@ let libplist = callPackage ../development/libraries/libplist { }; - libQGLViewer = callPackage ../development/libraries/libqglviewer { }; + libqglviewer = callPackage ../development/libraries/libqglviewer { }; libre = callPackage ../development/libraries/libre {}; librem = callPackage ../development/libraries/librem {}; From 4b32ac2ffe22fd47214aeca538f2b6250ebf582d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Aug 2015 21:07:42 +0200 Subject: [PATCH 054/175] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-hashes/commit/ba6c1396e121586665af82bc1f390b1d4d78c401 with hackage2nix v20150824 --- .../haskell-modules/hackage-packages.nix | 341 +++++++++++------- 1 file changed, 211 insertions(+), 130 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1f04d3a3355..55ffe105b4e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -7195,8 +7195,8 @@ self: { }: mkDerivation { pname = "HPDF"; - version = "1.4.6"; - sha256 = "c97e3a1cc0e67f0036526897eade5b4e70371cc55214f7222c4261878aab6197"; + version = "1.4.7"; + sha256 = "13476b1e0d4d2a2f88255d0928fd11d884f2a3f9f5288f31cef73610f37a6b72"; libraryHaskellDepends = [ array base binary bytestring containers mtl random vector zlib ]; @@ -9451,9 +9451,12 @@ self: { pname = "JuicyPixels-repa"; version = "0.7"; sha256 = "a556109f053d1dfd1eebd23080d5f285816a03f73e37fdc1f32e0a8df888c93a"; + revision = "1"; + editedCabalFile = "b0dcd6dae60b506057721d2732aebbece6ce380b5d7df4b2ba64592e6e3a88a8"; libraryHaskellDepends = [ base bytestring JuicyPixels repa vector ]; + jailbreak = true; description = "Convenience functions to obtain array representations of images"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -13641,6 +13644,8 @@ self: { pname = "SDL-mixer"; version = "0.6.1.1"; sha256 = "5ff4e4b795aa04a8979610c88d2be948b4b1c69b83d0a3d2ea359d0ed110a355"; + revision = "1"; + editedCabalFile = "53f7f1e750f01e8095a95548c76a8ac1fef8298aa197dbc08bf82e939a4bbe64"; libraryHaskellDepends = [ base SDL ]; description = "Binding to libSDL_mixer"; license = stdenv.lib.licenses.bsd3; @@ -14594,8 +14599,8 @@ self: { }: mkDerivation { pname = "Spock"; - version = "0.9.0.0"; - sha256 = "f12419a63f9d0324c0338b05b3f44f0ec6c8790c3b21bfaff7c1ad154cb8fea6"; + version = "0.9.0.1"; + sha256 = "0d6c97a3ca3ab56e01e4a21f6b2f3ce5a210ea9c6f64c2c1c2d2775295dee56c"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers crypto-random directory focus hashable http-types hvect list-t @@ -16156,8 +16161,8 @@ self: { ({ mkDerivation, base, text, Win32, Win32-errors }: mkDerivation { pname = "Win32-dhcp-server"; - version = "0.3.1"; - sha256 = "3236a2353c0d8c4647c55d6ce41ba92a14e5bd4a9817c782c9e1b127049a7d56"; + version = "0.3.2"; + sha256 = "3f6fd5dcd65f0883f40a5e3ee9467df0039abf7fc4f5cf0a119c56696d120664"; libraryHaskellDepends = [ base text Win32 Win32-errors ]; homepage = "http://github.com/mikesteele81/win32-dhcp-server"; description = "Win32 DHCP Server Management API"; @@ -18445,8 +18450,8 @@ self: { }: mkDerivation { pname = "aeson-schema"; - version = "0.3.0.7"; - sha256 = "af50aa3ff6974d021aeeb90e7f43d0b4082a3a81972843e1a0ee5bb8068c04e5"; + version = "0.4.0.0"; + sha256 = "2b8f58f3539644527c4ab3ff5c07742c9aa2250281b7b3cba8e2c39b88f148a8"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers ghc-prim mtl QuickCheck regex-base regex-compat regex-pcre scientific syb template-haskell @@ -18458,7 +18463,7 @@ self: { template-haskell temporary test-framework test-framework-hunit test-framework-quickcheck2 text unordered-containers vector ]; - homepage = "https://github.com/timjb/aeson-schema"; + homepage = "https://github.com/Fuuzetsu/aeson-schema"; description = "Haskell JSON schema validator and parser generator"; license = stdenv.lib.licenses.mit; }) {}; @@ -22166,24 +22171,25 @@ self: { "arithmetic" = callPackage ({ mkDerivation, base, opentheory, opentheory-bits - , opentheory-divides, opentheory-primitive, QuickCheck, random + , opentheory-divides, opentheory-prime, opentheory-primitive + , QuickCheck, random }: mkDerivation { pname = "arithmetic"; - version = "1.0"; - sha256 = "1af6acf13de40f36d95b8d34e3ba47be559f32dd0f00f1f161b2aa0536b6d5a0"; + version = "1.1"; + sha256 = "37b1ddc85799ae996df95d401a74254ea4fe78b22ab2fe51652debd4e36f1a10"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base opentheory opentheory-bits opentheory-divides + base opentheory opentheory-bits opentheory-divides opentheory-prime opentheory-primitive QuickCheck random ]; executableHaskellDepends = [ - base opentheory opentheory-bits opentheory-divides + base opentheory opentheory-bits opentheory-divides opentheory-prime opentheory-primitive QuickCheck random ]; testHaskellDepends = [ - base opentheory opentheory-bits opentheory-divides + base opentheory opentheory-bits opentheory-divides opentheory-prime opentheory-primitive QuickCheck random ]; description = "Natural number arithmetic"; @@ -41955,8 +41961,8 @@ self: { }: mkDerivation { pname = "dbmigrations"; - version = "0.8.2"; - sha256 = "3c08e5b321e6b60d0abf5f9f20ca4466c2556759aa7866d85c1ffb28c45c310c"; + version = "0.9"; + sha256 = "2e9d9d971a2a8f771148a4b19ea8226e4fa2ac2eefb11c93afa4c9983838435c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41964,11 +41970,7 @@ self: { HDBC-postgresql HDBC-sqlite3 mtl random template-haskell text time yaml-light ]; - executableHaskellDepends = [ - base bytestring configurator containers directory fgl filepath HDBC - HDBC-postgresql HDBC-sqlite3 mtl random template-haskell text time - yaml-light - ]; + executableHaskellDepends = [ base configurator ]; testHaskellDepends = [ base bytestring containers directory fgl filepath HDBC HDBC-postgresql HDBC-sqlite3 HUnit mtl process template-haskell @@ -53233,6 +53235,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "foldl-transduce" = callPackage + ({ mkDerivation, base, bytestring, comonad, containers, doctest + , foldl, semigroupoids, tasty, tasty-hunit, text, transformers + }: + mkDerivation { + pname = "foldl-transduce"; + version = "0.1.0.1"; + sha256 = "0cd71afa3ed822a01a23c9ea3ba7a4477ff75c4c2fff26d810941b3c4666e267"; + libraryHaskellDepends = [ + base bytestring comonad containers foldl semigroupoids text + transformers + ]; + testHaskellDepends = [ base doctest foldl tasty tasty-hunit text ]; + description = "Transducers for folds from foldl"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "folds" = callPackage ({ mkDerivation, base, bytestring, comonad, contravariant, deepseq , directory, doctest, filepath, lens, mtl, pointed, profunctors @@ -54277,8 +54296,8 @@ self: { ({ mkDerivation, base, containers, mtl, transformers }: mkDerivation { pname = "frpnow"; - version = "0.17"; - sha256 = "93da2b38fd2a597b2338e7fa132b207c690ad8c3edd26f1dda2fdcac29908b35"; + version = "0.18"; + sha256 = "1fafa04d5ec57b49380ad23675075acf03ba63bcf92d52d1341bad265c64b0c7"; libraryHaskellDepends = [ base containers mtl transformers ]; homepage = "https://github.com/atzeus/FRPNow"; description = "Principled practical FRP"; @@ -56921,8 +56940,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "5.20150812"; - sha256 = "0c6f8cd802b38313739b4a5c5fd8ca51493643d60f9290321039c5c0e33546f4"; + version = "5.20150824"; + sha256 = "45088dd5ff5a63ca38965e60843e42c1b8424b3437b58af68929cf61ef0819e4"; configureFlags = [ "-fassistant" "-fproduction" ]; isLibrary = false; isExecutable = true; @@ -58091,13 +58110,13 @@ self: { }: mkDerivation { pname = "glue"; - version = "0.1.3"; - sha256 = "4668671d2ebeb32c567c8fa6f2ca46f352695e63f17fb45162837b5889f1dde7"; + version = "0.2.0"; + sha256 = "784692e29ea1f5effe4ca98732431b77b2595baa5220394c1561b803e4309b2a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base ekg-core hashable lifted-base monad-control monad-loops text - time transformers transformers-base unordered-containers + base ekg-core hashable lifted-base monad-control text time + transformers transformers-base unordered-containers ]; executableHaskellDepends = [ async base ekg-core hashable lifted-base monad-control monad-loops @@ -58105,7 +58124,7 @@ self: { ]; testHaskellDepends = [ async base ekg-core hashable hspec lifted-base monad-control - monad-loops QuickCheck quickcheck-instances text time transformers + QuickCheck quickcheck-instances text time transformers transformers-base unordered-containers ]; description = "Make better services"; @@ -58331,6 +58350,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "google-cloud" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-client + , http-client-tls, http-types, mtl, scientific, stm, text, time + , unordered-containers + }: + mkDerivation { + pname = "google-cloud"; + version = "0.0.2"; + sha256 = "2c178a6f82932266e5aacced28ce146a69d4d202c855511ad993c3ce30974437"; + libraryHaskellDepends = [ + aeson base bytestring http-client http-client-tls http-types mtl + scientific stm text time unordered-containers + ]; + description = "Client for the Google Cloud APIs"; + license = stdenv.lib.licenses.mit; + }) {}; + "google-dictionary" = callPackage ({ mkDerivation, aeson, base, bytestring, HTTP, lens, mtl }: mkDerivation { @@ -61245,8 +61281,8 @@ self: { }: mkDerivation { pname = "hackage-repo-tool"; - version = "0.1.0.0"; - sha256 = "421eed1316a7f54d5e5d5895ff70129a7efaf0d4d2e10b27bc293ba3786c496b"; + version = "0.1.0.1"; + sha256 = "fc8863c28ca2cba3e7ae96bac4cc20376666eeb803b8911749a983f762c325f2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -61266,8 +61302,8 @@ self: { }: mkDerivation { pname = "hackage-security"; - version = "0.2.0.0"; - sha256 = "db1abeb34db8ecabc4e70db7a71f49789a0a1839b78dbc813f09d25973aea8d4"; + version = "0.3.0.0"; + sha256 = "7cbc4e0d7338af2d8cec5235c60270df487ef56bb2cd653a7987b1bc672a2fb6"; libraryHaskellDepends = [ base base64-bytestring bytestring Cabal containers cryptohash directory ed25519 filepath ghc-prim mtl network network-uri parsec @@ -61283,8 +61319,8 @@ self: { }: mkDerivation { pname = "hackage-security-HTTP"; - version = "0.1.0.1"; - sha256 = "56b526b2ed23201474f111f3b7ad6d77fa5359acd27498ab4a95b451617612fa"; + version = "0.1.0.2"; + sha256 = "094cc357668437e5a2ac86168fdfdd5f1784d779a706929d676d8e4d430244dc"; libraryHaskellDepends = [ base bytestring hackage-security HTTP mtl network network-uri zlib ]; @@ -66250,10 +66286,8 @@ self: { }: mkDerivation { pname = "haxy"; - version = "1.0"; - sha256 = "da1d3f638daff80fa82365d02fd6e5dbd1208e3391f6d7c21ced1ebac1ecedbb"; - revision = "2"; - editedCabalFile = "1dfd6805d921438c33b5388de37716d320af9aff2d8067837f510d43c3cf5940"; + version = "1.0.1"; + sha256 = "6db58fd3433a7c92d660f1c21b11edb739f5cdbe21b47d99336fab2928cd8f4c"; libraryHaskellDepends = [ base bytestring data-default-class hostname HTTP http-server mtl url @@ -69576,8 +69610,8 @@ self: { }: mkDerivation { pname = "hjsmin"; - version = "0.1.5.0"; - sha256 = "f4d81fd8a1cbe65642ff749aeb5866ed9487613a54d7efe6566805fe3f3bf1d7"; + version = "0.1.5.1"; + sha256 = "d1e36c8fe5dfd46819425877ca7fc6a5b422fce138de9787b7409850252decff"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72205,8 +72239,8 @@ self: { }: mkDerivation { pname = "hprotoc"; - version = "2.1.4"; - sha256 = "124d310f0a541b2267483f05e60dc3edd65933abfc51fbe67320deaab5470405"; + version = "2.1.5"; + sha256 = "463ce252cbcf6246bb80cc30efa14580b5370e8e5c5c83debfe1b24833b52353"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72592,6 +72626,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) { ole32 = null; oleaut32 = null;}; + "hs-duktape" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, bytestring, hspec + , hspec-expectations-pretty-diff, template-haskell, text + , transformers + }: + mkDerivation { + pname = "hs-duktape"; + version = "0.1.0"; + sha256 = "4627845867a5b00022b22b0f90355a7f0e9b5b703883f74a6a226507972bf429"; + libraryHaskellDepends = [ + aeson base bytestring text transformers + ]; + testHaskellDepends = [ + aeson aeson-qq base bytestring hspec hspec-expectations-pretty-diff + template-haskell text + ]; + homepage = "https://github.com/myfreeweb/hs-duktape"; + description = "Haskell bindings for a very compact embedded ECMAScript (JavaScript) engine"; + license = stdenv.lib.licenses.mit; + }) {}; + "hs-excelx" = callPackage ({ mkDerivation, base, bytestring, containers, mtl, text, time , xml-conduit, zip-archive @@ -78813,8 +78868,8 @@ self: { }: mkDerivation { pname = "ihaskell"; - version = "0.6.5.0"; - sha256 = "e634513efa47aa3e369c3d7fb0ad038b1cba308186d4c50268641a97a727ddbb"; + version = "0.7.0.3"; + sha256 = "f2df05336dae36d05ffb25f993fab51ccb727f83adb290b83ab251384e8b2e80"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78827,7 +78882,7 @@ self: { ]; executableHaskellDepends = [ aeson base bin-package-db bytestring containers directory ghc here - ipython-kernel strict text transformers unix + ipython-kernel process strict text transformers unix ]; testHaskellDepends = [ aeson base base64-bytestring bin-package-db bytestring cereal @@ -79639,6 +79694,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "indieweb-algorithms" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, bytestring, containers + , data-default, either, hspec, hspec-expectations-pretty-diff + , http-link-header, lens, lens-aeson, microformats2-parser, mtl + , network-uri, raw-strings-qq, safe, template-haskell, text, time + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "indieweb-algorithms"; + version = "0.1.0"; + sha256 = "3417c4dc270ca59b7731319e7e4009a0f5f464d038814a2db2ceac079dcc80b2"; + libraryHaskellDepends = [ + aeson base bytestring containers data-default either + http-link-header lens lens-aeson microformats2-parser network-uri + safe text time transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson aeson-qq base bytestring data-default hspec + hspec-expectations-pretty-diff microformats2-parser mtl network-uri + raw-strings-qq template-haskell text time + ]; + homepage = "https://github.com/myfreeweb/indieweb-algorithms"; + description = "A collection of implementations of IndieWeb algorithms"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "infer-upstream" = callPackage ({ mkDerivation, ansi-wl-pprint, base, github, optparse-applicative , parsec, process, text @@ -80834,8 +80915,8 @@ self: { }: mkDerivation { pname = "ipython-kernel"; - version = "0.6.1.2"; - sha256 = "1431c7442b9081dd9169348b36f0befafeedca8a773b8d5349518b39fde1e4e2"; + version = "0.7.0.0"; + sha256 = "17acfb6ac18e23a85b3fe3324af946439bf0bd886eaf5613d94c027a903174d7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80845,7 +80926,6 @@ self: { executableHaskellDepends = [ base filepath mtl parsec text transformers ]; - jailbreak = true; homepage = "http://github.com/gibiansky/IHaskell"; description = "A library for creating kernels for IPython frontends"; license = stdenv.lib.licenses.mit; @@ -87966,8 +88046,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim, mtl, transformers }: mkDerivation { pname = "linearscan"; - version = "0.7.0"; - sha256 = "37f2f77ad17b40fbf62dd823f40ef88ab8db516ced17de1d3d0493f4e4e44e8f"; + version = "0.8.0"; + sha256 = "108c26b493f21a47e171435053feef2d0fb178bb6be82baa6be5ea122b137829"; libraryHaskellDepends = [ base containers ghc-prim mtl transformers ]; @@ -87978,22 +88058,21 @@ self: { }) {}; "linearscan-hoopl" = callPackage - ({ mkDerivation, base, containers, deepseq, free, fuzzcheck, hoopl - , hspec, hspec-expectations, lens-family-core, linearscan - , QuickCheck, transformers + ({ mkDerivation, base, containers, deepseq, free, hoopl, hspec + , hspec-expectations, lens-family-core, linearscan, QuickCheck + , transformers }: mkDerivation { pname = "linearscan-hoopl"; - version = "0.7.0"; - sha256 = "db7ac77ef994fd40c1a11c9ff662d4710b29aff4ec498aeb78c6525f247b7fff"; + version = "0.8.1"; + sha256 = "cdd53114005aecb15ade491e8f662f651d91a166ab6929f73a081d9613991765"; libraryHaskellDepends = [ base containers free hoopl linearscan QuickCheck transformers ]; testHaskellDepends = [ - base containers deepseq fuzzcheck hoopl hspec hspec-expectations + base containers deepseq hoopl hspec hspec-expectations lens-family-core linearscan QuickCheck transformers ]; - jailbreak = true; homepage = "http://github.com/jwiegley/linearscan-hoopl"; description = "Makes it easy to use the linearscan register allocator with Hoopl"; license = stdenv.lib.licenses.bsd3; @@ -90403,8 +90482,8 @@ self: { ({ mkDerivation, base, network, transformers }: mkDerivation { pname = "mac"; - version = "0.1.0.0"; - sha256 = "71a14d4c4682d9d9d21eee66bc1471d28b2801517c870bbbacc57872ce84a5fa"; + version = "0.1.2.0"; + sha256 = "8ac8188429cb9e20aefa83e3943f7b4f2713248160bcbeb9080784e637e5789d"; libraryHaskellDepends = [ base network transformers ]; description = "Static Mandatory Access Control in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -91332,6 +91411,8 @@ self: { pname = "manifolds"; version = "0.1.3.1"; sha256 = "f2d286ecbcf0d391fecb61e8be56b56737d9f26d53cc68e815fc2f73766330b4"; + revision = "1"; + editedCabalFile = "078a790a2e462108e5d1ed6314f264d40b3fd1b063f56595e3874fcb5137eeea"; libraryHaskellDepends = [ base comonad constrained-categories containers deepseq hmatrix MemoTrie semigroups tagged transformers vector vector-algorithms @@ -92751,8 +92832,8 @@ self: { }: mkDerivation { pname = "microformats2-parser"; - version = "1.0.1.1"; - sha256 = "281212dd0fb8d61af7c4eaf4b0fa57d31b0267c8e8e1dea12cede8a6efc1a2e9"; + version = "1.0.1.2"; + sha256 = "94c220abb5bfd065e492f138bb72466f37cb2ecf4c53e830226b64e950a061b9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92796,8 +92877,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "microlens"; - version = "0.3.2.0"; - sha256 = "a20e1082261e08b258e964484b2df4557a135832f18cd424eb8c030fbe62d402"; + version = "0.3.3.0"; + sha256 = "42a4b7c40a02a500419cf4b18df97ca76f31db06b1947d9c7d7434daf6434eab"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/aelve/microlens"; description = "A tiny part of the lens library which you can depend upon"; @@ -92821,8 +92902,8 @@ self: { ({ mkDerivation, array, base, bytestring, containers, microlens }: mkDerivation { pname = "microlens-ghc"; - version = "0.2.0.0"; - sha256 = "d848f874c5af94c64ee8e6e0912fca305687acd5ec2b5353297943a3f5fcbf04"; + version = "0.2.1.0"; + sha256 = "0f9544e355d4c262ee94eacc893b57ad54666e473a5e4b7cd7db236fcfdd9ea3"; libraryHaskellDepends = [ array base bytestring containers microlens ]; @@ -92837,8 +92918,8 @@ self: { }: mkDerivation { pname = "microlens-mtl"; - version = "0.1.4.1"; - sha256 = "5a9a54d7804ece4bc4ab45c1784ce91df7681e2742b301754a212c7ccc2d7e70"; + version = "0.1.5.0"; + sha256 = "0f456e058d034e517eed53756d3b70438fcd91a818c93980053ab6ac86213028"; libraryHaskellDepends = [ base microlens mtl transformers transformers-compat ]; @@ -92853,8 +92934,8 @@ self: { }: mkDerivation { pname = "microlens-platform"; - version = "0.1.2.0"; - sha256 = "5a44b16b764fae1de9b29a114784abbb7aaa75270c2c4a21a026656ab1e24471"; + version = "0.1.3.0"; + sha256 = "8f2c08879fb484df0e1f2564dfa2e1fd6dd4745fefae02678e569803db97ad80"; libraryHaskellDepends = [ base hashable microlens microlens-ghc microlens-mtl microlens-th text unordered-containers vector @@ -93118,18 +93199,20 @@ self: { "milena" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, digest - , either, hspec, lens, mtl, network, QuickCheck, random - , resource-pool, transformers + , either, hspec, lens, lifted-base, listsafe, mtl, murmur-hash + , network, QuickCheck, random, resource-pool, transformers }: mkDerivation { pname = "milena"; - version = "0.2.0.0"; - sha256 = "35ef8dfd4c1b5302c55f5cd3e6df87f64937be72317f24f58c96252b4393ce22"; + version = "0.3.0.0"; + sha256 = "924fc92ec94da73dcd5d9a0505247cc77106fd8757016a9ebc1cfc574d96c753"; libraryHaskellDepends = [ - base bytestring cereal containers digest either lens mtl network - random resource-pool transformers + base bytestring cereal containers digest either lens lifted-base + listsafe mtl murmur-hash network random resource-pool transformers + ]; + testHaskellDepends = [ + base bytestring hspec mtl network QuickCheck ]; - testHaskellDepends = [ base bytestring hspec network QuickCheck ]; jailbreak = true; description = "A Kafka client for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -93931,8 +94014,8 @@ self: { }: mkDerivation { pname = "moesocks"; - version = "0.1.0.24"; - sha256 = "0a95707996c4c6f68a222063fa22008b038865ea8a8cb57bcbedd9a5bba72ba6"; + version = "0.1.0.25"; + sha256 = "c80dc33b2f5be9f4826ce51aa047b078c22d47a0900aa2fe294232c588f251a8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -101941,8 +102024,8 @@ self: { }: mkDerivation { pname = "os-release"; - version = "0.2.1"; - sha256 = "8a9237966475d4178a266479d0dd9a834bd59349116528539eab66717d884646"; + version = "0.2.2"; + sha256 = "a91357fec161695ca6868d27c150f2de05666a6a7708114b3e06ff100f4d2ca7"; libraryHaskellDepends = [ base containers parsec transformers ]; testHaskellDepends = [ base containers hlint hspec parsec process regex-compat temporary @@ -103664,8 +103747,8 @@ self: { }: mkDerivation { pname = "pcg-random"; - version = "0.1.3.1"; - sha256 = "917be65fa6f917ba3e8b1ae98774356559ff6239f0b806ac0943cf160a455d0b"; + version = "0.1.3.2"; + sha256 = "288db42bb77ffef6e57007b893b41df5a3ac8f252d5a519306448cb5802ebe71"; libraryHaskellDepends = [ base bytestring entropy primitive random time ]; @@ -105518,8 +105601,8 @@ self: { }: mkDerivation { pname = "pipes-csv"; - version = "1.4.0"; - sha256 = "d2041b32b683d1a3a74fddd09ca0f572cc21c6c9ca434a394573d23dadb32fe0"; + version = "1.4.1"; + sha256 = "9a18f4c24281e87136ea17bc73a37199333da25532a5ffed8d268eb080f5d9c4"; libraryHaskellDepends = [ base blaze-builder bytestring cassava pipes unordered-containers vector @@ -105528,7 +105611,6 @@ self: { base bytestring cassava HUnit pipes pipes-bytestring test-framework test-framework-hunit vector ]; - jailbreak = true; description = "Fast, streaming csv parser"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -108461,12 +108543,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "process_1_2_3_0" = callPackage + "process_1_3_0_0" = callPackage ({ mkDerivation, base, deepseq, directory, filepath, unix }: mkDerivation { pname = "process"; - version = "1.2.3.0"; - sha256 = "619e04157183631bd16fa921589bd4125b7db12c45287e962a7b8402a70d60c5"; + version = "1.3.0.0"; + sha256 = "709b77b7a2a5768c61759fdd000e3b9c47e05cbee7987abf82954fd15d80c3f8"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base ]; description = "Process libraries"; @@ -109085,8 +109167,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "2.7.1"; - sha256 = "31e6b0463f36a6241eaadd980648afe487061e213582b457f29e045ee4ea862f"; + version = "2.7.2"; + sha256 = "9c1cc565bfdea30d58c5306ef2dda9d4e86984f9f9004c0fe43011b481ce4db8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109248,8 +109330,8 @@ self: { }: mkDerivation { pname = "protocol-buffers"; - version = "2.1.4"; - sha256 = "ad92eb27e09c70a26353377a09b5d61715aa452215e6221e33fcd0065c15c96a"; + version = "2.1.5"; + sha256 = "1028200fcef97d76f28e9ff22100066ad6b797c56fbf0222735b1ed4ece060dd"; libraryHaskellDepends = [ array base binary bytestring containers directory filepath mtl parsec syb utf8-string @@ -109263,8 +109345,8 @@ self: { ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { pname = "protocol-buffers-descriptor"; - version = "2.1.4"; - sha256 = "7e7ff115ed7fefcaa00917ba76052d50d4f5dd786956a646d1b3180212a207d4"; + version = "2.1.5"; + sha256 = "cd653ce9ad16eadb080d6e19647da5fe5ccde7e3e2fb85464cbc460d44ca44f0"; libraryHaskellDepends = [ base bytestring containers protocol-buffers ]; @@ -113138,8 +113220,8 @@ self: { ({ mkDerivation, base, regex-tdfa, template-haskell }: mkDerivation { pname = "regex-tdfa-quasiquoter"; - version = "0.1.0.0"; - sha256 = "acafaa4c7a536483cc75952cdb9a8e7ae0bc1b76deb5170f405c0194e64859fc"; + version = "0.2.0.0"; + sha256 = "8ae16a6297b7357ef3d9f8d2e09d006e74f67b889ec7d86296eb0ac6fb2c8361"; libraryHaskellDepends = [ base regex-tdfa template-haskell ]; jailbreak = true; homepage = "http://github.com/erisco/regex-tdfa-quasiquoter"; @@ -114803,8 +114885,8 @@ self: { }: mkDerivation { pname = "rethinkdb"; - version = "2.1.0.1"; - sha256 = "3d8a61d33361e8fd90d3ac3f63f57d1f660f9102c09b406b2ac2ff571711a5cb"; + version = "2.1.0.2"; + sha256 = "80689203aafcbf26b555952953012fc1a1272d2e28cd5dcc30fcceb50951fd07"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -114814,7 +114896,6 @@ self: { ]; executableHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ base doctest ]; - jailbreak = true; homepage = "http://github.com/atnnn/haskell-rethinkdb"; description = "A driver for RethinkDB 2.1"; license = stdenv.lib.licenses.asl20; @@ -119055,8 +119136,8 @@ self: { }: mkDerivation { pname = "servant-JuicyPixels"; - version = "0.1.0.0"; - sha256 = "12914a3047b8e0e00db4f2d37a4d6f3aee0d1aa93bb76e815fdf2282ccf4d4ba"; + version = "0.2.0.0"; + sha256 = "3b2da6980c0c35ef5f9dcce145b7d59f3134b418ee659b84794d6bb6c503e4b5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119851,13 +119932,12 @@ self: { ({ mkDerivation, base, binary, bytestring, io-streams, SHA }: mkDerivation { pname = "sha-streams"; - version = "0.1.1"; - sha256 = "5134e20354eb38b5b2b5a3eebe78b618ad70970c255b38e03fb91122ea6d5ae1"; + version = "0.2.0"; + sha256 = "de53ff3189b191d2217fe61b6c2142888e501eb0f9a35a4205d8528fcd648191"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base binary bytestring io-streams SHA ]; executableHaskellDepends = [ base io-streams SHA ]; - jailbreak = true; homepage = "https://github.com/noteed/sha-streams"; description = "SHA hashes for io-streams"; license = stdenv.lib.licenses.bsd3; @@ -125191,8 +125271,8 @@ self: { }: mkDerivation { pname = "squeeze"; - version = "1.0.4.4"; - sha256 = "c4865b707eeda4e8a8588a1ce7aa835128c7dc1c0506b9f4689ced5f5852d1a2"; + version = "1.0.4.5"; + sha256 = "9079a9e9163b27612c4625542bcd530766576e1d43e496c21cc42ffdbf3c6231"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -128196,8 +128276,8 @@ self: { }: mkDerivation { pname = "sws"; - version = "0.3.1.1"; - sha256 = "8dc76a7b25543ea8006553817d19ad8217fca38f7fa037213fcb304e0b2cd42a"; + version = "0.3.1.2"; + sha256 = "e86be4df4f505f7f6eab69957ae3843455fbce9e13dd211ee65cff034449240c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -132325,19 +132405,21 @@ self: { "these" = callPackage ({ mkDerivation, base, bifunctors, containers, mtl, profunctors - , semigroupoids, semigroups, transformers, vector + , QuickCheck, semigroupoids, semigroups, tasty, tasty-quickcheck + , transformers, vector }: mkDerivation { pname = "these"; - version = "0.4.2"; - sha256 = "e732b9c0af7bfc7ae2aad97383d560d909b503ddb2fadbb6f5938679404c4543"; - revision = "1"; - editedCabalFile = "02eb71fed8c848cc4f94f1181f09a6f9667caac38746f757bd57ca881aa47629"; + version = "0.6.0.0"; + sha256 = "c8e94f28561e87a1c51498a8529a74983fe68d785b250c118d02a9a25d1b9383"; libraryHaskellDepends = [ base bifunctors containers mtl profunctors semigroupoids semigroups transformers vector ]; - jailbreak = true; + testHaskellDepends = [ + base bifunctors QuickCheck tasty tasty-quickcheck transformers + vector + ]; homepage = "https://github.com/isomorphism/these"; description = "An either-or-both data type, with corresponding hybrid error/writer monad transformer"; license = stdenv.lib.licenses.bsd3; @@ -134927,8 +135009,8 @@ self: { }: mkDerivation { pname = "tttool"; - version = "1.4.0.3"; - sha256 = "2de9817bfeee47ea168194862a2fa27c86bff3c7f5063537394c38851f7ed757"; + version = "1.4.0.4"; + sha256 = "b3e15148fa1090cdffaa91094aadedb6f80ad70ebcf9740e27d2c5256147a260"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -141134,8 +141216,8 @@ self: { }: mkDerivation { pname = "wai-routes"; - version = "0.8.0"; - sha256 = "3b0b8ccb5853d830c0feaad5cbb5db8e7f3499af18b027e052e169199b89959d"; + version = "0.8.1"; + sha256 = "0ebdf952830d550a6f56bf048ae7f554c88ab8fa0f3a3b613569f620133d41d2"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive containers cookie data-default-class filepath http-types mime-types @@ -141144,7 +141226,6 @@ self: { testHaskellDepends = [ aeson base hspec hspec-wai hspec-wai-json wai ]; - jailbreak = true; homepage = "https://ajnsit.github.io/wai-routes/"; description = "Typesafe URLs for Wai applications"; license = stdenv.lib.licenses.mit; @@ -145761,8 +145842,8 @@ self: { }: mkDerivation { pname = "yesod"; - version = "1.4.1.5"; - sha256 = "a1160d366cf2c91502bcd5c8f251041ec8a1bc962729c95d5bc572dbe9f8296b"; + version = "1.4.2"; + sha256 = "d6d13e608af954de23721261b39ee79569907beb173477db8820acc5e9f45757"; libraryHaskellDepends = [ aeson base blaze-html blaze-markup bytestring conduit-extra data-default directory fast-logger monad-control monad-logger safe @@ -147158,8 +147239,8 @@ self: { }: mkDerivation { pname = "yesod-test"; - version = "1.5"; - sha256 = "437a76419c94030c3c3d8b8a88a52f0ff9c416d56894bc4b825c62faa9a1be07"; + version = "1.5.0.1"; + sha256 = "9b19fb51e901935f8b0926e3b9bbae772d45967a747fb3a1bf9cb893724c29a4"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-html blaze-markup bytestring case-insensitive containers cookie hspec-core html-conduit @@ -147167,8 +147248,8 @@ self: { transformers wai wai-extra xml-conduit xml-types yesod-core ]; testHaskellDepends = [ - base bytestring containers hspec html-conduit HUnit text wai - xml-conduit yesod-core yesod-form + base bytestring containers hspec html-conduit http-types HUnit text + wai xml-conduit yesod-core yesod-form ]; homepage = "http://www.yesodweb.com"; description = "integration testing for WAI/Yesod Applications"; @@ -148338,8 +148419,8 @@ self: { ({ mkDerivation, base, binary, bytestring, containers }: mkDerivation { pname = "zmidi-core"; - version = "0.8.0"; - sha256 = "aa8e7f0d0068f75f38347beb85de7716811018e8fa5b42fb5a1a3c9a11fbbada"; + version = "0.8.1"; + sha256 = "5bfb08b41d20ea1d0520dac48fefe07fc4f174bcfa9de6d7eb613234e962cbd8"; libraryHaskellDepends = [ base binary bytestring containers ]; homepage = "https://github.com/stephentetley/zmidi-core"; description = "Read and write MIDI files"; From a206c227cc0b0f06d393ba10643c1453d8693b2a Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Tue, 25 Aug 2015 09:00:32 -0400 Subject: [PATCH 055/175] haskell-types-compat: Re-enable haddock generation The "real" issue (https://github.com/philopon/types-compat/issues/1) has been closed for a while, and I manually confirmed that the documentation builds correctly under 7.10.2 and 7.8.4. The package itself doesn't build older versions because of missing dependencies. --- pkgs/development/haskell-modules/configuration-common.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7658ff1b111..187b3b5109c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -157,7 +157,6 @@ self: super: { network-conduit = dontHaddock super.network-conduit; shakespeare-js = dontHaddock super.shakespeare-js; shakespeare-text = dontHaddock super.shakespeare-text; - types-compat = dontHaddock super.types-compat; # https://github.com/philopon/apiary/issues/15 wai-test = dontHaddock super.wai-test; zlib-conduit = dontHaddock super.zlib-conduit; record = dontHaddock super.record; # https://github.com/nikita-volkov/record/issues/22 From e7aff313da890e3fd0d2353d075ed8511f2ae283 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Tue, 25 Aug 2015 12:31:59 -0400 Subject: [PATCH 056/175] haskell-record: re-enable haddock generation The bug's been closed for a while, and I manually verified that the haddock gets rendered to HTML in all versions from 7.6 -> 7.10. --- pkgs/development/haskell-modules/configuration-common.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 187b3b5109c..bee83b350e9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -159,7 +159,6 @@ self: super: { shakespeare-text = dontHaddock super.shakespeare-text; wai-test = dontHaddock super.wai-test; zlib-conduit = dontHaddock super.zlib-conduit; - record = dontHaddock super.record; # https://github.com/nikita-volkov/record/issues/22 # Jailbreak doesn't get the job done because the Cabal file uses conditionals a lot. darcs = (overrideCabal super.darcs (drv: { From 9274aa93b5b0a3688ac54aa22108152703528bdd Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Wed, 26 Aug 2015 05:33:14 -0400 Subject: [PATCH 057/175] haskell-wizards: un-jailBreak The original bug is long since closed, and I verified it compiles on ghc 7.6 -> 7.10. --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index bee83b350e9..8c257b83718 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -237,9 +237,6 @@ self: super: { # tests don't compile for some odd reason jwt = dontCheck super.jwt; - # https://github.com/liamoc/wizards/issues/5 - wizards = doJailbreak super.wizards; - # https://github.com/tibbe/ekg-core/commit/c986d9750d026a0c049cf6e6610d69fc1f23121f, not yet in hackage ekg-core = doJailbreak super.ekg-core; From 416840c4809b09f200b79120128b4c94b48db5be Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Wed, 26 Aug 2015 05:43:02 -0400 Subject: [PATCH 058/175] haskell-ekg-core: un-jailBreak The referenced commit has long since been released to hackage, and the package has been verified to build properly under ghc 7.6 -> 7.10. --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8c257b83718..ed35a1d5bed 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -237,9 +237,6 @@ self: super: { # tests don't compile for some odd reason jwt = dontCheck super.jwt; - # https://github.com/tibbe/ekg-core/commit/c986d9750d026a0c049cf6e6610d69fc1f23121f, not yet in hackage - ekg-core = doJailbreak super.ekg-core; - # https://github.com/tibbe/ekg/commit/95018646f48f60d9ccf6209cc86747e0f132e737, not yet in hackage ekg = doJailbreak super.ekg; From 90144c684b64c3d428fa6023e8338e8fc5866a74 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Wed, 26 Aug 2015 05:44:06 -0400 Subject: [PATCH 059/175] haskell-ekg: un-jailBreak The referenced commit is long since released, and the package builds correctly with ghc 7.6 -> 7.10. --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ed35a1d5bed..ba5f2a68f12 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -237,9 +237,6 @@ self: super: { # tests don't compile for some odd reason jwt = dontCheck super.jwt; - # https://github.com/tibbe/ekg/commit/95018646f48f60d9ccf6209cc86747e0f132e737, not yet in hackage - ekg = doJailbreak super.ekg; - # https://github.com/NixOS/cabal2nix/issues/136 glib = addBuildDepends super.glib [pkgs.pkgconfig pkgs.glib]; gtk3 = super.gtk3.override { inherit (pkgs) gtk3; }; From 4bd9f78949817ef70596613a5bece43dc0c4c9f9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 26 Aug 2015 15:16:42 +0200 Subject: [PATCH 060/175] haskell-cabal-helper: downgrade to version 0.5.1.0 0.5.2.0 has been deprecated. --- .../haskell-modules/hackage-packages.nix | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 55ffe105b4e..89121a2c8d4 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -30299,6 +30299,30 @@ self: { }) {}; "cabal-helper" = callPackage + ({ mkDerivation, base, bytestring, Cabal, data-default, directory + , extra, filepath, ghc-prim, mtl, process, template-haskell + , temporary, transformers, unix, utf8-string + }: + mkDerivation { + pname = "cabal-helper"; + version = "0.5.1.0"; + sha256 = "563773491cc8245c3d265c2e7847f95198aad74adcbc16a91622e7e4abef4e45"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base Cabal data-default directory filepath ghc-prim mtl process + transformers + ]; + executableHaskellDepends = [ + base bytestring Cabal directory filepath process template-haskell + temporary transformers utf8-string + ]; + testHaskellDepends = [ base extra process unix ]; + description = "Simple interface to some of Cabal's configuration state used by ghc-mod"; + license = stdenv.lib.licenses.agpl3; + }) {}; + + "cabal-helper_0_5_2_0" = callPackage ({ mkDerivation, base, bytestring, Cabal, data-default, directory , extra, filepath, ghc-prim, mtl, process, template-haskell , temporary, transformers, unix, utf8-string From 7160a3200156d5c3cc7d916f51624d28d0a8003d Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Wed, 26 Aug 2015 17:08:27 +0200 Subject: [PATCH 061/175] linphone: 3.8.1 -> 3.8.5 --- .../instant-messengers/linphone/default.nix | 4 +-- .../linphone/fix-deprecated.patch | 35 ------------------- 2 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/linphone/fix-deprecated.patch diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index f9bd941b2f6..3310aace40e 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "linphone-3.8.1"; + name = "linphone-3.8.5"; src = fetchurl { url = "mirror://savannah/linphone/3.8.x/sources/${name}.tar.gz"; - sha256 = "19xwar8z5hyp1bap1s437ipv90gspmjwcq5zznds55d7r6gbqicd"; + sha256 = "10brlbwkk61nhd5v2sim1vfv11xm138l1cqqh3imhs2sigmzzlax"; }; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/linphone/fix-deprecated.patch b/pkgs/applications/networking/instant-messengers/linphone/fix-deprecated.patch deleted file mode 100644 index 8978e6e6652..00000000000 --- a/pkgs/applications/networking/instant-messengers/linphone/fix-deprecated.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/gtk/main.c b/gtk/main.c -index 7079bc8..f076127 100644 ---- a/gtk/main.c -+++ b/gtk/main.c -@@ -1643,7 +1643,7 @@ int main(int argc, char *argv[]){ - GdkPixbuf *pbuf; - const char *app_name="Linphone"; - -- g_thread_init(NULL); -+ g_type_init(); - gdk_threads_init(); - - progpath = strdup(argv[0]); -diff --git a/gtk/setupwizard.c b/gtk/setupwizard.c -index 1c54fca..45c9091 100644 ---- a/gtk/setupwizard.c -+++ b/gtk/setupwizard.c -@@ -270,7 +270,7 @@ static void account_username_changed(GtkEntry *entry, GtkWidget *w) { - linphone_account_creator_set_username(creator, gtk_entry_get_text(username)); - - if (g_regex_match_simple("^[a-zA-Z]+[a-zA-Z0-9.\\-_]{3,}$", gtk_entry_get_text(username), 0, 0)) { -- g_thread_create(check_username_availability, (void*)w, FALSE, NULL); -+ g_thread_new (NULL, check_username_availability, (void*)w); - } - else { - if (gtk_entry_get_text_length(username) < LOGIN_MIN_SIZE) { -@@ -534,7 +534,7 @@ GtkWidget * linphone_gtk_create_assistant(void){ - ok = create_pixbuf(linphone_gtk_get_ui_config("ok","ok.png")); - notok = create_pixbuf(linphone_gtk_get_ui_config("notok","notok.png")); - -- g_thread_init (NULL); -+ g_type_init (); - gdk_threads_init (); - - GtkWidget *p1=create_intro(); From 46de943ec74811d7513274b2c59aa468ec437164 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Wed, 26 Aug 2015 17:18:28 +0200 Subject: [PATCH 062/175] belle-sip: 1.4.0 -> 1.4.1 --- pkgs/development/libraries/belle-sip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 6dc1b5241f2..5975a61ff77 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -9,11 +9,11 @@ let }; in stdenv.mkDerivation rec { - name = "belle-sip-1.4.0"; + name = "belle-sip-1.4.1"; src = fetchurl { url = "mirror://savannah/linphone/belle-sip/${name}.tar.gz"; - sha256 = "1lwxfvwvclbh0bfwf69jrknqzqh1igzm293wwwbmq4kn8c5fiypz"; + sha256 = "0q1d3fqsrxi3kxcjcibr376js25h6in8c1hm7c53wz252jx6f42b"; }; nativeBuildInputs = [ jre ]; From 1d2632f8202addec972dadc03b99a0b9f65c69c8 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Wed, 26 Aug 2015 17:18:53 +0200 Subject: [PATCH 063/175] mediastreamer: 2.11.1 -> 2.11.2 --- pkgs/development/libraries/mediastreamer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 19e71fd66c1..ed81eb94185 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "mediastreamer-2.11.1"; + name = "mediastreamer-2.11.2"; src = fetchurl { url = "mirror://savannah/linphone/mediastreamer/${name}.tar.gz"; - sha256 = "0gfv4k2rsyvyq838xjgsrxmmn0fkw40apqs8vakzjwzsz2c9z8pd"; + sha256 = "1g6gawrlz1lixzs1kzckm3rxc401ww8pi00x7r5kb84bdijb02cc"; }; postPatch = '' From c35309ff0b963959276d6db45c9cf11a5024f557 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Wed, 26 Aug 2015 17:19:19 +0200 Subject: [PATCH 064/175] ortp: 0.24.2 -> 0.24.2 --- pkgs/development/libraries/ortp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix index 561d0df4e80..746f10eebed 100644 --- a/pkgs/development/libraries/ortp/default.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ortp-0.24.1"; + name = "ortp-0.24.2"; src = fetchurl { url = "mirror://savannah/linphone/ortp/sources/${name}.tar.gz"; - sha256 = "1mach7cdq4kydqkll8ra1kir818da07z253rf9pihifipqhcxv6i"; + sha256 = "05k6ianphr533qnjwxsv7jnh7fb2sq0dj1pdy1bk2w5khmlwfdyb"; }; meta = with stdenv.lib; { From a94e8f24f2bada8afde821a86bd3f9e8846a4f5a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 26 Aug 2015 14:40:20 +0200 Subject: [PATCH 065/175] mcelog: update 123 -> 124 --- pkgs/os-specific/linux/mcelog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index aa1b197e83f..c6ca6d21d2d 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub }: -let version = "123"; in +let version = "124"; in stdenv.mkDerivation { name = "mcelog-${version}"; src = fetchFromGitHub { - sha256 = "0hrpqx0wfwribzm3j132k0869xbh5wa89pzhwcych5w2w0n2i890"; + sha256 = "02yqf9vcbkw9kpl0dl619scb9njkwklspvr5mhjb307004b71qqd"; rev = "v${version}"; repo = "mcelog"; owner = "andikleen"; From a5e28d531973528cbb80e5b49267f2fa8b2ec75b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Wed, 26 Aug 2015 16:01:43 +0200 Subject: [PATCH 066/175] freenect: add version 0.5.2 --- .../libraries/freenect/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/freenect/default.nix diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix new file mode 100644 index 00000000000..c79c389128b --- /dev/null +++ b/pkgs/development/libraries/freenect/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchzip, cmake, libusb, pkgconfig, freeglut, mesa, libXi, libXmu }: + +stdenv.mkDerivation rec { + name = "freenect-${version}"; + version = "0.5.2"; + src = fetchzip { + url = "https://github.com/OpenKinect/libfreenect/archive/v${version}.tar.gz"; + sha256 = "04p4q19fkh97bn7kf0xsk6mrig2aj10i3s9z6hdrr70l6dfpf4w9"; + }; + + buildInputs = [ libusb freeglut mesa libXi libXmu ]; + nativeBuildInputs = [ cmake pkgconfig ]; + + meta = { + description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and OS X"; + inherit version; + homepage = http://openkinect.org; + license = with stdenv.lib.licenses; [ gpl2 asl20 ]; + maintainers = with stdenv.lib.maintainers; [ bennofs ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b031194670..cc38e113957 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6266,6 +6266,10 @@ let freealut = callPackage ../development/libraries/freealut { }; freeglut = callPackage ../development/libraries/freeglut { }; + + freenect = callPackage ../development/libraries/freenect { + inherit (xlibs) libXi libXmu; + }; freetype = callPackage ../development/libraries/freetype { }; From 271926d00dbac878bd2105c1d6e191b3298f138e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Wed, 26 Aug 2015 16:20:21 +0200 Subject: [PATCH 067/175] haskell: fix build of SDL-* libraries --- .../haskell-modules/configuration-common.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ba5f2a68f12..10e665b70a2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -973,4 +973,23 @@ self: super: { hackage-security = dontDistribute super.hackage-security; hackage-security-HTTP = dontDistribute super.hackage-security-HTTP; + # The cabal files for these libraries do not list the required system dependencies. + SDL-image = overrideCabal super.SDL-image (drv: { + librarySystemDepends = [ pkgs.SDL pkgs.SDL_image ] ++ drv.librarySystemDepends or []; + }); + SDL-ttf = overrideCabal super.SDL-ttf (drv: { + librarySystemDepends = [ pkgs.SDL pkgs.SDL_ttf ]; + }); + SDL-mixer = overrideCabal super.SDL-mixer (drv: { + librarySystemDepends = [ pkgs.SDL pkgs.SDL_mixer ]; + }); + SDL-gfx = overrideCabal super.SDL-gfx (drv: { + librarySystemDepends = [ pkgs.SDL pkgs.SDL_gfx ]; + }); + SDL-mpeg = overrideCabal super.SDL-mpeg (drv: { + configureFlags = (drv.configureFlags or []) ++ [ + "--extra-lib-dirs=${pkgs.smpeg}/lib" + "--extra-include-dirs=${pkgs.smpeg}/include/smpeg" + ]; + }); } From 0d6d5c907e14435cb5a460c19232faf3c96c298b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Wed, 26 Aug 2015 17:04:17 +0200 Subject: [PATCH 068/175] cwiid: new package --- pkgs/development/libraries/cwiid/default.nix | 26 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/cwiid/default.nix diff --git a/pkgs/development/libraries/cwiid/default.nix b/pkgs/development/libraries/cwiid/default.nix new file mode 100644 index 00000000000..a86bdc8e035 --- /dev/null +++ b/pkgs/development/libraries/cwiid/default.nix @@ -0,0 +1,26 @@ +{ stdenv, autoreconfHook, fetchgit, bison, flex, bluez, pkgconfig, gtk }: + +stdenv.mkDerivation rec { + name = "cwiid-2010-02-21-git"; + src = fetchgit { + url = https://github.com/abstrakraft/cwiid; + sha256 = "6f5355d036dab017da713c49d3042011fa24fb732ed0d5ee338ab6f5ff400f06"; + rev = "fadf11e89b579bcc0336a0692ac15c93785f3f82"; + }; + configureFlags = "--without-python"; + prePatch = '' + sed -i -e '/$(LDCONFIG)/d' common/include/lib.mak.in + ''; + buildInputs = [ autoreconfHook bison flex bluez pkgconfig gtk ]; + postInstall = '' + # Some programs (for example, cabal-install) have problems with the double 0 + sed -i -e "s/0.6.00/0.6.0/" $out/lib/pkgconfig/cwiid.pc + ''; + meta = { + description = "Linux Nintendo Wiimote interface"; + homepage = http://cwiid.org; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.bennofs ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc38e113957..51d8f2431cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6098,6 +6098,8 @@ let cryptopp = callPackage ../development/libraries/crypto++ { }; + cwiid = callPackage ../development/libraries/cwiid { }; + cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { }; # Make bdb5 the default as it is the last release under the custom From 8ee58a2aa3b5e621649ea4b5c77fca66ebeb7c68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Wed, 26 Aug 2015 17:34:02 +0200 Subject: [PATCH 069/175] haskell: fix freenect and hcwiid --- .../haskell-modules/configuration-common.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 10e665b70a2..2705a301124 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -992,4 +992,21 @@ self: super: { "--extra-include-dirs=${pkgs.smpeg}/include/smpeg" ]; }); + + # https://github.com/chrisdone/freenect/pull/11 + freenect = overrideCabal super.freenect (drv: { + libraryPkgconfigDepends = [ pkgs.freenect ]; + prePatch = '' echo " Pkgconfig-Depends: libfreenect" >> freenect.cabal ''; + }); + + # https://github.com/ivanperez-keera/hcwiid/pull/4 + hcwiid = overrideCabal super.hcwiid (drv: { + configureFlags = (drv.configureFlags or []) ++ [ + "--extra-lib-dirs=${pkgs.bluez}/lib" + "--extra-lib-dirs=${pkgs.cwiid}/lib" + "--extra-include-dirs=${pkgs.cwiid}/include" + "--extra-include-dirs=${pkgs.bluez}/include" + ]; + prePatch = '' sed -i -e "/Extra-Lib-Dirs/d" -e "/Include-Dirs/d" "hcwiid.cabal" ''; + }); } From cf660d03bd993474fccc674e8111642e90a086d9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 23 Aug 2015 14:03:33 +0200 Subject: [PATCH 070/175] smtube: 15.5.17 -> 15.8.0 --- pkgs/applications/video/smtube/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix index 3180a9e632a..7482a92e82b 100644 --- a/pkgs/applications/video/smtube/default.nix +++ b/pkgs/applications/video/smtube/default.nix @@ -1,14 +1,12 @@ { stdenv, fetchurl, qt4 }: stdenv.mkDerivation rec { - versionMajor = "15.5"; - versionMinor = "17"; - version = "${versionMajor}.${versionMinor}"; + version = "15.8.0"; name = "smtube-${version}"; src = fetchurl { - url = "mirror://sourceforge/smtube/SMTube/${versionMajor}/${name}.tar.bz2"; - sha256 = "0jbik41nb1b7381ybzblmmsl8b7ljl6a2zpn1dcg0cccjw5mnbyg"; + url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2"; + sha256 = "0hxh3axlhd16ffnkynm4lcfpkwkfv19y70cqgpqrdj2gl8f917bp"; }; makeFlags = [ From 444b8484d71d03b3a27b62ad75b073746864ef5b Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Wed, 26 Aug 2015 17:42:13 +0200 Subject: [PATCH 071/175] openh246: init at 1.4.0 --- .../libraries/openh264/default.nix | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/openh264/default.nix diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix new file mode 100644 index 00000000000..ff6582ca7a7 --- /dev/null +++ b/pkgs/development/libraries/openh264/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, nasm }: + +stdenv.mkDerivation rec { + name = "openh264-1.4.0"; + + src = fetchurl { + url = "https://github.com/cisco/openh264/archive/v1.4.0.tar.gz"; + sha256 = "08haj0xkyjlwbpqdinxk0cmvqw89bx89ly0kqs9lf87fy6ksgfd1"; + }; + + buildInputs = [ nasm ]; + + installPhase = '' + make PREFIX=$out install + ''; + + meta = with stdenv.lib; { + description = "A codec library which supports H.264 encoding and decoding"; + homepage = http://www.openh264.org; + license = stdenv.licenses.bsd2; + }; +} From 9635f89fff80cd243462c20a311f7340031f0f59 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 26 Aug 2015 18:32:33 +0200 Subject: [PATCH 072/175] cataclysm-dda: try disabling parallel builds (ZHF) --- pkgs/games/cataclysm-dda/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix index c8d69d3078d..ed4aed35e11 100644 --- a/pkgs/games/cataclysm-dda/default.nix +++ b/pkgs/games/cataclysm-dda/default.nix @@ -36,7 +36,8 @@ in stdenv.mkDerivation rec { --add-flags "--datadir $out/share/" ''; - enableParallelBuilding = true; + # Disable, possible problems with hydra + #enableParallelBuilding = true; meta = with stdenv.lib; { description = "A free, post apocalyptic, zombie infested rogue-like"; From 47ea8c097c08ee19f8622eae4e9e3acdc99fce3e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 26 Aug 2015 19:37:48 +0300 Subject: [PATCH 073/175] buildFHSUserEnv: add .env support --- .../build-fhs-userenv/default.nix | 44 +++++++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix index b57b687e20f..9060c073eee 100644 --- a/pkgs/build-support/build-fhs-userenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/default.nix @@ -1,4 +1,4 @@ -{ writeText, writeScriptBin, stdenv, ruby } : { env, runScript } : +{ runCommand, writeText, writeScriptBin, stdenv, ruby } : { env, runScript ? "bash" } : let name = env.pname; @@ -9,21 +9,37 @@ let ${builtins.readFile ./chroot-user.rb} ''; - init = writeText "init" '' - # Make /tmp directory - mkdir -m 1777 /tmp + init = run: writeText "${name}-init" '' + # Make /tmp directory + mkdir -m 1777 /tmp - # Expose sockets in /tmp - for i in /host-tmp/.*-unix; do - ln -s "$i" "/tmp/$(basename "$i")" - done + # Expose sockets in /tmp + for i in /host-tmp/.*-unix; do + ln -s "$i" "/tmp/$(basename "$i")" + done - [ -d "$1" ] && [ -r "$1" ] && cd "$1" - shift - exec "${runScript}" "$@" - ''; + [ -d "$1" ] && [ -r "$1" ] && cd "$1" + shift + exec ${run} "$@" + ''; -in writeScriptBin name '' +in runCommand name { + passthru.env = + runCommand "${name}-shell-env" { + shellHook = '' + exec ${chroot-user}/bin/chroot-user ${env} bash -l ${init "bash"} "$(pwd)" + ''; + } '' + echo >&2 "" + echo >&2 "*** User chroot 'env' attributes are intended for interactive nix-shell sessions, not for building! ***" + echo >&2 "" + exit 1 + ''; +} '' + mkdir -p $out/bin + cat <$out/bin/${name} #! ${stdenv.shell} - exec ${chroot-user}/bin/chroot-user ${env} bash -l ${init} "$(pwd)" "$@" + exec ${chroot-user}/bin/chroot-user ${env} bash -l ${init runScript} "\$(pwd)" "\$@" + EOF + chmod +x $out/bin/${name} '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51d8f2431cc..2350118b810 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -296,7 +296,7 @@ let buildFHSUserEnv = args: userFHSEnv { env = buildFHSEnv (removeAttrs args [ "runScript" ]); - runScript = args.runScript; + runScript = args.runScript or "bash"; }; buildMaven = callPackage ../build-support/build-maven.nix {}; From f996e0b1f2f2ac723108cddae78b67d4b990b652 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 26 Aug 2015 18:46:56 +0200 Subject: [PATCH 074/175] python box2d: use swig2 (ZHF) --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e66f8eda492..267510e3363 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1556,7 +1556,7 @@ let patches = [ ../development/python-modules/box2d/disable-test.patch ]; - propagatedBuildInputs = [ pkgs.swig pkgs.box2d ]; + propagatedBuildInputs = [ pkgs.swig2 pkgs.box2d ]; meta = { homepage = https://code.google.com/p/pybox2d/; From 1dc71534b44f44a9104062a81b51161f6b45baf4 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 26 Aug 2015 18:48:51 +0200 Subject: [PATCH 075/175] rocksdb: disable on i686 (ZHF) --- pkgs/development/libraries/rocksdb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 78623503794..c5db9787706 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { homepage = http://rocksdb.org; description = "A library that provides an embeddable, persistent key-value store for fast storage"; license = licenses.bsd3; - platforms = platforms.all; + platforms = platforms.allBut [ "i686-linux" ]; maintainers = with maintainers; [ wkennington ]; }; } From b5f7884b3075b70337134c749c8f89bf30825c0f Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 26 Aug 2015 18:53:43 +0200 Subject: [PATCH 076/175] Revert "tarsnap: 1.0.35 -> 1.0.36.1 and use upstream bash completion scripts" This reverts commit 54c7053bffe96d67274efafbc3518a2c40b2dc06. Doesn't build with nix chrooted builds. --- pkgs/tools/backup/tarsnap/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix index 7537451595f..e2857eed7d8 100644 --- a/pkgs/tools/backup/tarsnap/default.nix +++ b/pkgs/tools/backup/tarsnap/default.nix @@ -1,6 +1,11 @@ { stdenv, fetchurl, openssl, zlib, e2fsprogs }: let + bashCompletion = fetchurl { + url = "https://gist.githubusercontent.com/thoughtpolice/daa9431044883d3896f6/raw/282360677007db9739e5bf229873d3b231eb303a/tarsnap.bash"; + sha256 = "1cj7m0n3sw9vlaz2dfvf0bgaxkv1pcc0l31zb4h5rmm8z6d33405"; + }; + zshCompletion = fetchurl { url = "https://gist.githubusercontent.com/thoughtpolice/daa9431044883d3896f6/raw/282360677007db9739e5bf229873d3b231eb303a/tarsnap.zsh"; sha256 = "0pawqwichzpz29rva7mh8lpx4zznnrh2rqyzzj6h7z98l0dxpair"; @@ -8,20 +13,18 @@ let in stdenv.mkDerivation rec { name = "tarsnap-${version}"; - version = "1.0.36.1"; + version = "1.0.35"; src = fetchurl { - url = "https://www.tarsnap.com/download/tarsnap-autoconf-${version}.tgz"; - sha256 = "1446l8g39bi5xxk4x1ijc1qjrj824729887gcffig0zrw80rx452"; + url = "https://www.tarsnap.com/download/tarsnap-autoconf-1.0.35.tgz"; + sha256 = "16lc14rwrq84fz95j1g10vv0qki0qw73lzighidj5g23pib6g7vc"; }; - preConfigure = '' - configureFlags="--with-bash-completion-dir=$out/etc/bash_completion.d" - ''; - postInstall = '' # Install some handy-dandy shell completions - install -m 444 -D ${zshCompletion} $out/share/zsh/site-functions/_tarsnap + mkdir -p $out/etc/bash_completion.d $out/share/zsh/site-functions + cp ${bashCompletion} $out/etc/bash_completion.d/tarsnap.bash + cp ${zshCompletion} $out/share/zsh/site-functions/_tarsnap ''; buildInputs = [ openssl zlib e2fsprogs ]; From 66a270b9df25990daec7685aebf42fc3791fd58d Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 26 Aug 2015 18:55:22 +0200 Subject: [PATCH 077/175] rkt: disable on i686 (ZHF) --- pkgs/applications/virtualization/rkt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index 0b3300e2026..71aa7a710f9 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { homepage = http://rkt.io; license = licenses.asl20; maintainers = with maintainers; [ ragge ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } From 27233c2ea59ed4524548ab0cfc4f2909ecdc0c32 Mon Sep 17 00:00:00 2001 From: Paulus Esterhazy Date: Wed, 26 Aug 2015 12:50:19 +0200 Subject: [PATCH 078/175] ranger: works fine on Darwin (close #9454) --- pkgs/applications/misc/ranger/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 7c08bf9d2e7..c6bc87ce13d 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { description = "File manager with minimalistic curses interface"; homepage = "http://ranger.nongnu.org/"; license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ iyzsong ]; }; From f04db6d3e7e6da7d843496ae1e65f25e98ccf8ce Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 26 Aug 2015 19:48:42 +0300 Subject: [PATCH 079/175] buildFHS*Env: add documentation --- doc/functions.xml | 115 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/doc/functions.xml b/doc/functions.xml index aec8a57c21a..3e4ac3f3c6b 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -155,4 +155,119 @@ c = lib.makeOverridable f { a = 1; b = 2; } + +
+ buildFHSChrootEnv/buildFHSUserEnv + + + buildFHSChrootEnv and + buildFHSUserEnv provide a way to build and run + FHS-compatible lightweight sandboxes. They get their own isolated root with + binded /nix/store, so their footprint in terms of disk + space needed is quite small. This allows one to run software which is hard or + unfeasible to patch for NixOS -- 3rd-party source trees with FHS assumptions, + games distributed as tarballs, software with integrity checking and/or external + self-updated binaries. + + + + buildFHSChrootEnv allows to create persistent + environments, which can be constructed, deconstructed and entered by + multiple users at once. A downside is that it requires + root access for both those who create and destroy and + those who enter it. It can be useful to create environments for daemons that + one can enter and observe. + + + + buildFHSUserEnv uses Linux namespaces feature to create + temporary lightweight environments which are destroyed after all child + processes exit. It does not require root access, and can be useful to create + sandboxes and wrap applications. + + + + Those functions both rely on buildFHSEnv, which creates + an actual directory structure given a list of necessary packages and extra + build commands. + buildFHSChrootEnv and buildFHSUserEnv + both accept those arguments which are passed to + buildFHSEnv: + + + + + name + + Environment name. + + + + targetPkgs + + Packages to be installed for the main host's architecture + (i.e. x86_64 on x86_64 installations). + + + + multiPkgs + + Packages to be installed for all architectures supported by + a host (i.e. i686 and x86_64 on x86_64 installations). + + + + extraBuildCommands + + Additional commands to be executed for finalizing the + directory structure. + + + + extraBuildCommandsMulti + + Like extraBuildCommandsMulti, but + executed only on multilib architectures. + + + + + Additionally, buildFHSUserEnv accepts + runScript parameter, which is a command that would be + executed inside the sandbox and passed all the command line arguments. It + default to bash. + One can create a simple environment using a shell.nix + like that: + + + {} }: + +(pkgs.buildFHSUserEnv { + name = "simple-x11-env"; + targetPkgs = pkgs: (with pkgs; + [ udev + alsaLib + ]) ++ (with pkgs.xlibs; + [ libX11 + libXcursor + libXrandr + ]); + multiPkgs = pkgs: (with pkgs; + [ udev + alsaLib + ]) ++ (with []; + runScript = "bash"; +}).env +]]> + + + Running nix-shell would then drop you into a shell with + these libraries and binaries available. You can use this to run + closed-source applications which expect FHS structure without hassles: + simply change runScript to the application path, + e.g. ./bin/start.sh -- relative paths are supported. + +
+ From c2ae91a413fea07751a587cbe53a216edcf25b41 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 26 Aug 2015 11:17:53 -0700 Subject: [PATCH 080/175] buildGoPackage: Fix parallel test pid computation --- pkgs/development/go-modules/generic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index b5ddba9b981..d4eb127617a 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -120,15 +120,15 @@ go.stdenv.mkDerivation ( if [ -n "$subPackages" ] ; then for p in $subPackages ; do go test -p $NIX_BUILD_CORES -v $goPackagePath/$p & + PIDS+=("$!") done - PIDS+=("$!") else pushd go/src while read d; do go test -p $NIX_BUILD_CORES -v $d & + PIDS+=("$!") done < <(find $goPackagePath -type f -name \*_test.go -exec dirname {} \; | sort | uniq) popd - PIDS+=("$!") fi # Exit on error from the parallel process From 8c2f7fcfeda241e891b6913166ab0c7f2caab5fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 26 Aug 2015 20:33:29 +0200 Subject: [PATCH 081/175] apparmor: don't depend on tetex It seemed unused - no mention in the log, and builds without it. /cc maintainers: @phreedom, @thoughtpolice. --- pkgs/os-specific/linux/apparmor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index f68b436bed1..22413b2ed31 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , autoconf, automake, libtool, makeWrapper -, perl, bison, flex, glibc, gettext, which, rpm, tetex, LocaleGettext +, perl, bison, flex, glibc, gettext, which, rpm, LocaleGettext , bash, pam, TermReadKey, RpcXML, swig, python}: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - autoconf automake libtool perl bison flex gettext which rpm tetex + autoconf automake libtool perl bison flex gettext which rpm LocaleGettext pam TermReadKey RpcXML swig makeWrapper python ]; prePatch = '' From 02f9f0c7e06538ad9974d34933d7299b51e8ef6c Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 19 Jul 2015 03:50:32 +0300 Subject: [PATCH 082/175] u-boot: 2015.04 -> 2015.07 A new regularly release. Some improvements I've noted: - Keyboard on the pcDuino3 Nano now works without a hub. - Ctrl-C now correctly cancels the 'sysboot' boot menu Also, config_cmd_default.h is replaced by equivalents in the kconfig system, so the vexpress patch needs some updating. --- pkgs/misc/uboot/default.nix | 4 +- .../vexpress-Use-config_distro_bootcmd.patch | 42 +++++++++++++------ 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 675a6839c86..4fe6ae4c6e2 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -22,11 +22,11 @@ in stdenv.mkDerivation rec { name = "uboot-${defconfig}-${version}"; - version = "2015.04"; + version = "2015.07"; src = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"; - sha256 = "0q2x1wh1f6rjh9rmcnkf28dxcvp9hkhi4vzspqkzamb6b3gp06ha"; + sha256 = "1nclmyii5a1igvgjc4kxvi1fk2y82hp2iy4iywp34b3zf6ywjj0b"; }; patches = [ ./vexpress-Use-config_distro_bootcmd.patch ]; diff --git a/pkgs/misc/uboot/vexpress-Use-config_distro_bootcmd.patch b/pkgs/misc/uboot/vexpress-Use-config_distro_bootcmd.patch index 9c61847f02e..ce057b6aa65 100644 --- a/pkgs/misc/uboot/vexpress-Use-config_distro_bootcmd.patch +++ b/pkgs/misc/uboot/vexpress-Use-config_distro_bootcmd.patch @@ -1,4 +1,4 @@ -From 53a8612ff19f360363edaaf70137968f7fd6a1cd Mon Sep 17 00:00:00 2001 +From 1fb764e1866513a69b4a0c29b69f8e78ea1df7fa Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 8 Jun 2015 22:29:23 +0300 Subject: [PATCH] vexpress: Use config_distro_bootcmd @@ -7,9 +7,10 @@ Also had to hack cli_readline.c, as one codepath in cli_readline_into_buffer doesn't respect the timeout. --- common/cli_readline.c | 12 +++++++++++- + configs/vexpress_ca9x4_defconfig | 2 -- include/configs/vexpress_ca9x4.h | 1 - - include/configs/vexpress_common.h | 35 +++++++++++++++++++++++------------ - 3 files changed, 34 insertions(+), 14 deletions(-) + include/configs/vexpress_common.h | 34 ++++++++++++++++++++++------------ + 4 files changed, 33 insertions(+), 16 deletions(-) diff --git a/common/cli_readline.c b/common/cli_readline.c index 9a9fb35..ca997a9 100644 @@ -41,6 +42,22 @@ index 9a9fb35..ca997a9 100644 #ifdef CONFIG_SHOW_ACTIVITY while (!tstc()) { +diff --git a/configs/vexpress_ca9x4_defconfig b/configs/vexpress_ca9x4_defconfig +index 2947fc1..9a5123d 100644 +--- a/configs/vexpress_ca9x4_defconfig ++++ b/configs/vexpress_ca9x4_defconfig +@@ -5,11 +5,9 @@ CONFIG_TARGET_VEXPRESS_CA9X4=y + # CONFIG_CMD_IMLS is not set + # CONFIG_CMD_XIMG is not set + # CONFIG_CMD_EDITENV is not set +-# CONFIG_CMD_ENV_EXISTS is not set + # CONFIG_CMD_LOADB is not set + # CONFIG_CMD_LOADS is not set + # CONFIG_CMD_FPGA is not set +-# CONFIG_CMD_ECHO is not set + # CONFIG_CMD_ITEST is not set + # CONFIG_CMD_SETEXPR is not set + # CONFIG_CMD_NFS is not set diff --git a/include/configs/vexpress_ca9x4.h b/include/configs/vexpress_ca9x4.h index 38ac4ed..993398c 100644 --- a/include/configs/vexpress_ca9x4.h @@ -53,7 +70,7 @@ index 38ac4ed..993398c 100644 #endif /* VEXPRESS_CA9X4_H */ diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h -index db78c85..1dd069b 100644 +index 0c1da01..72850d0 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -123,7 +123,6 @@ @@ -64,16 +81,15 @@ index db78c85..1dd069b 100644 /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024) -@@ -152,6 +151,8 @@ +@@ -152,6 +151,7 @@ #define CONFIG_SYS_SERIAL0 V2M_UART0 #define CONFIG_SYS_SERIAL1 V2M_UART1 +#include -+#include /* Command line configuration */ - #define CONFIG_CMD_BDI #define CONFIG_CMD_DHCP -@@ -169,7 +170,6 @@ + #define CONFIG_CMD_PXE +@@ -163,7 +163,6 @@ #define CONFIG_SUPPORT_RAW_INITRD #define CONFIG_CMD_FAT @@ -81,7 +97,7 @@ index db78c85..1dd069b 100644 #define CONFIG_MMC 1 #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC -@@ -207,17 +207,28 @@ +@@ -201,17 +200,28 @@ GENERATED_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_GBL_DATA_OFFSET @@ -118,7 +134,7 @@ index db78c85..1dd069b 100644 #elif defined(CONFIG_VEXPRESS_EXTENDED_MEMORY_MAP) #define CONFIG_PLATFORM_ENV_SETTINGS \ "loadaddr=0xa0008000\0" \ -@@ -240,7 +251,8 @@ +@@ -234,7 +244,8 @@ "devtmpfs.mount=0 vmalloc=256M\0" \ "bootflash=run flashargs; " \ "cp ${ramdisk_addr} ${ramdisk_addr_r} ${maxramdisk}; " \ @@ -128,14 +144,14 @@ index db78c85..1dd069b 100644 /* FLASH and environment organization */ #define PHYS_FLASH_SIZE 0x04000000 /* 64MB */ -@@ -294,7 +306,6 @@ +@@ -287,7 +298,6 @@ + #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot args buffer */ - #define CONFIG_CMD_SOURCE #define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING 1 #define CONFIG_SYS_MAXARGS 16 /* max command args */ #endif /* VEXPRESS_COMMON_H */ -- -2.4.4 +2.4.5 From ae80c3e7bcf0110b4976eab3435838c7e55bfc9d Mon Sep 17 00:00:00 2001 From: Boris Sukholitko Date: Wed, 26 Aug 2015 22:11:12 +0300 Subject: [PATCH 083/175] containers: fix interfaces option bugs The default should be [], no need to check it for INTERFACES variable. --- nixos/modules/virtualisation/containers.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index d819d99e09c..59f486ff78b 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -122,7 +122,7 @@ in interfaces = mkOption { type = types.listOf types.string; - default = null; + default = []; example = [ "eth1" "eth2" ]; description = '' The list of interfaces to be moved into the container. @@ -344,9 +344,7 @@ in LOCAL_ADDRESS=${cfg.localAddress} ''} ''} - ${optionalString (cfg.interfaces != null) '' INTERFACES="${toString cfg.interfaces}" - ''} ${optionalString cfg.autoStart '' AUTO_START=1 ''} From 0912bdfa925e423106f487dcda0afa5673bb0c59 Mon Sep 17 00:00:00 2001 From: Daniel Fox Franke Date: Wed, 26 Aug 2015 15:18:06 -0400 Subject: [PATCH 084/175] cvs-fast-export: patch shebangs in source tree This allows unit tests to run successfully in chroot build environments, which lack /usr/bin/env. --- .../applications/version-management/cvs-fast-export/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix index cf80dd3ef67..15035a345d4 100644 --- a/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -25,6 +25,8 @@ mkDerivation rec { python27 rcs cvs git makeWrapper ]; + postPatch = "patchShebangs ."; + preBuild = '' makeFlagsArray=( XML_CATALOG_FILES="${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml" From 1a13d28151cb1dc0125509c0d68246ef5be2b5a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 26 Aug 2015 21:54:31 +0200 Subject: [PATCH 085/175] openocd: 0.8.0 -> 0.9.0 Build tested. --- pkgs/development/tools/misc/openocd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 7334fa8754f..258f40a6960 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "openocd-${version}"; - version = "0.8.0"; + version = "0.9.0"; src = fetchurl { url = "mirror://sourceforge/openocd/openocd-${version}.tar.bz2"; - sha256 = "0byk7hnccgmhw0f84qlkfhps38gp2xp628bfrsc03vq08hr6q1sv"; + sha256 = "0hzlnm19c4b35vsxs6ik94xbigv3ykdgr8gzrdir6sqmkan44w43"; }; buildInputs = [ libftdi libusb1 pkgconfig ]; From 3c67f862119568e295fd54b16029dfcf1d5c0a64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 26 Aug 2015 22:04:27 +0200 Subject: [PATCH 086/175] openocd: enable support for CMSIS-DAP debuggers I.e., add 'hidapi' to buildInputs. Build tested. --- pkgs/development/tools/misc/openocd/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 258f40a6960..ea52fff64cc 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -1,8 +1,4 @@ -{ stdenv, fetchurl, libftdi, libusb1, pkgconfig }: - -# TODO: Add "hidapi" as dependency to gain access to CMSIS-DAP debuggers. -# Support should be auto-detected, but if not, pass "--enable-cmsis-dap" to -# configure. +{ stdenv, fetchurl, libftdi, libusb1, pkgconfig, hidapi }: stdenv.mkDerivation rec { name = "openocd-${version}"; @@ -13,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0hzlnm19c4b35vsxs6ik94xbigv3ykdgr8gzrdir6sqmkan44w43"; }; - buildInputs = [ libftdi libusb1 pkgconfig ]; + buildInputs = [ libftdi libusb1 pkgconfig hidapi ]; configureFlags = [ "--enable-jtag_vpi" From dbd3584590a5beca5358df8354de90230446e5ae Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Wed, 26 Aug 2015 22:15:31 +0200 Subject: [PATCH 087/175] mediastreamer: introduce environment variable to set plugins directory --- .../libraries/mediastreamer/default.nix | 5 +++- .../libraries/mediastreamer/plugins_dir.patch | 24 +++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/mediastreamer/plugins_dir.patch diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index ed81eb94185..4a672b226ea 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -11,11 +11,12 @@ stdenv.mkDerivation rec { sha256 = "1g6gawrlz1lixzs1kzckm3rxc401ww8pi00x7r5kb84bdijb02cc"; }; + patches = [ ./plugins_dir.patch ]; + postPatch = '' sed -i "s/\(SRTP_LIBS=\"\$SRTP_LIBS -lsrtp\"\)/SRTP_LIBS=\"$(pkg-config --libs-only-l libsrtp)\"/g" configure ''; - # TODO: make it load plugins from *_PLUGIN_PATH nativeBuildInputs = [ pkgconfig intltool ]; propagatedBuildInputs = [ @@ -28,6 +29,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-external-ortp" "--with-srtp=${srtp}" + "--enable-xv" + "--enable-glx" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/mediastreamer/plugins_dir.patch b/pkgs/development/libraries/mediastreamer/plugins_dir.patch new file mode 100644 index 00000000000..e64bfc5a43a --- /dev/null +++ b/pkgs/development/libraries/mediastreamer/plugins_dir.patch @@ -0,0 +1,24 @@ +diff -uNr mediastreamer2/src/base/msfactory.c mediastreamer2-new/src/base/msfactory.c +--- a/src/base/msfactory.c 2015-05-13 16:53:49.801113249 +0200 ++++ b/src/base/msfactory.c 2015-08-26 21:35:44.994724647 +0200 +@@ -630,12 +630,18 @@ + } + + void ms_factory_init_plugins(MSFactory *obj) { ++ char *package_plugins_dir; + if (obj->plugins_dir == NULL) { ++ package_plugins_dir=getenv("MEDIASTREAMER_PLUGINS_DIR"); ++ if (package_plugins_dir!=NULL){ ++ obj->plugins_dir = ms_strdup(package_plugins_dir); ++ } else { + #ifdef PACKAGE_PLUGINS_DIR +- obj->plugins_dir = ms_strdup(PACKAGE_PLUGINS_DIR); ++ obj->plugins_dir = ms_strdup(PACKAGE_PLUGINS_DIR); + #else +- obj->plugins_dir = ms_strdup(""); ++ obj->plugins_dir = ms_strdup(""); + #endif ++ } + } + if (strlen(obj->plugins_dir) > 0) { + ms_message("Loading ms plugins from [%s]",obj->plugins_dir); From e8aa031d69874843c21c1bdce3eaf423b9494ab9 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Wed, 26 Aug 2015 22:16:28 +0200 Subject: [PATCH 088/175] mediastreamer-openh264: init at 1.0.0 --- .../libraries/mediastreamer/msopenh264.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/mediastreamer/msopenh264.nix diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix new file mode 100644 index 00000000000..e312c730ab2 --- /dev/null +++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, autoreconfHook, pkgconfig, mediastreamer, openh264 }: + +stdenv.mkDerivation rec { + name = "mediastreamer-openh264-${version}"; + version = "1.0.0"; + + src = fetchurl { + url = "http://download-mirror.savannah.gnu.org/releases/linphone/plugins/sources/msopenh264-${version}.tar.gz"; + sha256 = "1622ma8g4yqvxa8pqwddsmhlpwak31i8zfl88f60k71k4dplw845"; + }; + + buildInputs = [ autoreconfHook pkgconfig mediastreamer openh264 ]; + + meta = with stdenv.lib; { + description = "H.264 encoder/decoder plugin for mediastreamer2"; + homepage = http://www.linphone.org/technical-corner/mediastreamer2/overview; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c899b875400..4c8ef3e0302 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7556,6 +7556,8 @@ let # failed to build mediastreamer = callPackage ../development/libraries/mediastreamer { }; + mediastreamer-openh264 = callPackage ../development/libraries/mediastreamer/msopenh264.nix { }; + menu-cache = callPackage ../development/libraries/menu-cache { }; mesaSupported = lib.elem system lib.platforms.mesaPlatforms; @@ -7768,6 +7770,8 @@ let opal = callPackage ../development/libraries/opal {}; + openh264 = callPackage ../development/libraries/openh264 { }; + openjpeg_1 = callPackage ../development/libraries/openjpeg/1.x.nix { }; openjpeg_2_0 = callPackage ../development/libraries/openjpeg/2.0.nix { }; openjpeg_2_1 = callPackage ../development/libraries/openjpeg/2.1.nix { }; From 63a1d2a3649c16d668538b0aecd215b5513f35df Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Wed, 26 Aug 2015 22:17:41 +0200 Subject: [PATCH 089/175] linphone: wrap to find plugins --- .../networking/instant-messengers/linphone/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 3310aace40e..c894a49c20e 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp , zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, polarssl, libsoup, udev , ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip +, mediastreamer-openh264, makeWrapper }: stdenv.mkDerivation rec { @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { polarssl libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip ]; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkgconfig makeWrapper ]; configureFlags = [ "--enable-ldap" @@ -27,6 +28,12 @@ stdenv.mkDerivation rec { "--enable-external-mediastreamer" ]; + postInstall = '' + for i in $(cd $out/bin && ls); do + wrapProgram $out/bin/$i --set MEDIASTREAMER_PLUGINS_DIR ${mediastreamer-openh264}/lib/mediastreamer/plugins + done + ''; + meta = with stdenv.lib; { homepage = http://www.linphone.org/; description = "Open Source video SIP softphone"; From 74ce1df8f54436ffb8bd08adfc4c7d0466a9283c Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Wed, 26 Aug 2015 22:24:05 +0200 Subject: [PATCH 090/175] openh264: fix license --- pkgs/development/libraries/openh264/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix index ff6582ca7a7..76188d484f9 100644 --- a/pkgs/development/libraries/openh264/default.nix +++ b/pkgs/development/libraries/openh264/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A codec library which supports H.264 encoding and decoding"; homepage = http://www.openh264.org; - license = stdenv.licenses.bsd2; + license = stdenv.lib.licenses.bsd2; }; } From 3d23cb0375fd192e3dce764c2aa2556535433181 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 25 Aug 2015 16:42:03 +0200 Subject: [PATCH 091/175] eclipse-testng: 6.9.5.201506120235 -> 6.9.5.201508210528 --- pkgs/applications/editors/eclipse/plugins.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 284ea911724..61701c4abef 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -312,16 +312,16 @@ rec { testng = buildEclipsePlugin rec { name = "testng-${version}"; - version = "6.9.5.201506120235"; + version = "6.9.5.201508210528"; srcFeature = fetchurl { - url = "http://beust.com/eclipse/features/org.testng.eclipse_6.9.5.201506120235.jar"; - sha256 = "02imv0rw10pik55a7p00jin65shvhfpzgna02ky94yx7dlf9fyy9"; + url = "http://beust.com/eclipse/features/org.testng.eclipse_${version}.jar"; + sha256 = "0xalm7pvj0vx61isgkjkgj073b4hlqlzx6xnkrnnnyi0r212a26j"; }; srcPlugin = fetchurl { - url = "http://beust.com/eclipse/plugins/org.testng.eclipse_6.9.5.201506120235.jar"; - sha256 = "0ni1ky4p5l1qzph0np1qw9pcyhrvy6zmn9c8q1b5rm5xv1fcvji4"; + url = "http://beust.com/eclipse/plugins/org.testng.eclipse_${version}.jar"; + sha256 = "07wmivfvfsq6cjw5zwciajdxkfa7drk108jsr44gf4i1bv9fj055"; }; meta = with stdenv.lib; { From 771b1a535851a39999dcb9365ea6f084e755ce6a Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 25 Aug 2015 16:55:03 +0200 Subject: [PATCH 092/175] eclipse-scala: fix sha256, file changed upstream --- pkgs/applications/editors/eclipse/plugins.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 61701c4abef..8b663edccd0 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -298,7 +298,7 @@ rec { src = fetchzip { url = "http://download.scala-ide.org/sdk/lithium/e44/scala211/stable/update-site.zip"; - sha256 = "0p2dbf56rw733dhsxy9hdwmbzqlk01j8f2hci21bsipq5w2144x6"; + sha256 = "0x5cdcm7p2ynz5ryw041gb150sripf9i4m1yrfqklnn581yqm6y8"; }; meta = with stdenv.lib; { From 5c8a1fe5e123dffb1615f7400e44ae5624dfdde1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 26 Aug 2015 22:50:03 +0200 Subject: [PATCH 093/175] eclipse: name plugins "eclipse-plugin-${name}" Instead of "eclipse-${name}". The latter is slightly confusing since there are non-plugin eclipse packages named "eclipse-${name}", like eclipse-modeling or eclipse-cpp. --- pkgs/applications/editors/eclipse/plugins.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 8b663edccd0..6f09aa481e1 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -9,7 +9,7 @@ rec { , passthru ? {} , ... } @ attrs: stdenv.mkDerivation (attrs // { - name = "eclipse-" + name; + name = "eclipse-plugin-" + name; buildInputs = buildInputs ++ [ unzip ]; From 2afaaf157e22757f3a6f60f0633dbcd32aa8ca43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Wed, 26 Aug 2015 22:50:26 +0200 Subject: [PATCH 094/175] darktable: update from 1.6.7 to 1.6.8 --- pkgs/applications/graphics/darktable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index b89d59217ac..1cf24e109dd 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -9,12 +9,12 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "1.6.7"; + version = "1.6.8"; name = "darktable-${version}"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "162c9kdj71az0ipaw4kiqcxhig0hcbmzw936d390r8zhkns76l57"; + sha256 = "0189d5pn6g01rynfkhxynrqgfi24v94x8fp0fs7ilrncv0dzhxmn"; }; buildInputs = From 6e104f2f438ba97c25644256fc5bfc559b580b5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Wed, 26 Aug 2015 22:51:14 +0200 Subject: [PATCH 095/175] drumkv1: update from 0.7.0 to 0.7.1 --- pkgs/applications/audio/drumkv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 50db71ea723..7fdf1c34771 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "drumkv1-${version}"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; - sha256 = "1fbi835559qsg9fxgdbdyf5z1zlzf9n8zrq0p67damb55mmigaj8"; + sha256 = "0mpf8akqaakg7vbn8gba0ns64hzhn5xzh1qxqpchcv32swn21cq4"; }; buildInputs = [ libjack2 libsndfile lv2 qt4 ]; From d741743bcc3b16648054b79ae3fb2c81b05d2f9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Wed, 26 Aug 2015 22:51:50 +0200 Subject: [PATCH 096/175] samplv1: update from 0.7.0 to 0.7.1 --- pkgs/applications/audio/samplv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index 544422cfaea..fa9df2f603e 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "samplv1-${version}"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "0w1cl1vjhzzdyxfn8fcfgx5j5d4gi182w5b89f7qzg1akhmsqmfr"; + sha256 = "0494w1xhhadwzvdr0v4gg5pzr2w2ah2vk896znj59j1y9gn3gilq"; }; buildInputs = [ libjack2 libsndfile lv2 qt4 ]; From 977731f6c2227bc48ff2f9f628a30e3e38e09b4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Wed, 26 Aug 2015 22:52:10 +0200 Subject: [PATCH 097/175] synthv1: update from 0.6.3 to 0.7.1 --- pkgs/applications/audio/synthv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index 4a126f8774f..43003782f2f 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "synthv1-${version}"; - version = "0.6.3"; + version = "0.7.1"; src = fetchurl { url = "mirror://sourceforge/synthv1/${name}.tar.gz"; - sha256 = "19zyvrvnmi7ahwg121vl2q17j9y8ln6lvpj5wxxcwif5538q75iw"; + sha256 = "0asjhz0xj1kwysvsj9q54r8j8fy7cnr408ygfpdhg7yn24rv67hh"; }; buildInputs = [ qt4 libjack2 lv2 ]; From 538857a473483aafd6a2531ce504986cee1309de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 27 Aug 2015 00:15:02 +0200 Subject: [PATCH 098/175] Let's aim for 6 months again, so 16.03 --- .version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.version b/.version index 49aab0cba12..cde8eb0ed82 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -15.08 \ No newline at end of file +16.03 From 51cd219cd58b5cf51fb2af9231dd7385307b982e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 27 Aug 2015 00:30:42 +0200 Subject: [PATCH 099/175] .version: remove trailing newline --- .version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.version b/.version index cde8eb0ed82..1c1d9713015 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -16.03 +16.03 \ No newline at end of file From cef7bccbbf1b87cb62acb7279ca56dd1fbd86909 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Thu, 27 Aug 2015 00:50:36 +0200 Subject: [PATCH 100/175] Add artha 1.0.3: an offline thesaurus --- pkgs/applications/misc/artha/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/applications/misc/artha/default.nix diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix new file mode 100644 index 00000000000..a8914a9014d --- /dev/null +++ b/pkgs/applications/misc/artha/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, dbus_glib, gtk, pkgconfig, wordnet }: + +stdenv.mkDerivation rec { + name = "artha-${version}"; + version = "1.0.3"; + + src = fetchurl { + url = "mirror://sourceforge/artha/1.0.3/artha-1.0.3.tar.bz2"; + sha256 = "0qr4ihl7ma3cq82xi1fpzvf74mm9vsg0j035xvmcp3r6rmw2fycx"; + }; + + buildInputs = [ dbus_glib gtk pkgconfig wordnet ]; + + meta = with stdenv.lib; { + description = "An offline thesaurus based on WordNet"; + homepage = http://artha.sourceforge.net; + license = licenses.gpl2; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e5d073941d..906af1da11b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10772,6 +10772,8 @@ let arora = callPackage ../applications/networking/browsers/arora { }; + artha = callPackage ../applications/misc/artha { }; + atom = callPackage ../applications/editors/atom { gconf = gnome.GConf; }; From 268abe1cce6281f164b0aa38ef926d29557b8ff3 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 27 Aug 2015 01:44:41 +0200 Subject: [PATCH 101/175] electrum: 2.4 -> 2.4.3 --- pkgs/applications/misc/electrum/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index b1fdc50fe15..ed37b0d96bc 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { name = "electrum-${version}"; - version = "2.4"; + version = "2.4.3"; src = fetchurl { url = "https://download.electrum.org/Electrum-${version}.tar.gz"; - sha256 = "0y04m5b410y3s9vqvkbvmlvvx1nr0cyvrnl41yapz8hydw9vdkjx"; + sha256 = "00z02rdlhasryccjsw1j7563xl76i6x40ah1lnn9asad1gp6520f"; }; propagatedBuildInputs = with pythonPackages; [ @@ -27,6 +27,7 @@ buildPythonPackage rec { preInstall = '' mkdir -p $out/share sed -i 's@usr_share = .*@usr_share = os.getenv("out")+"/share"@' setup.py + pyrcc4 icons.qrc -o gui/qt/icons_rc.py ''; meta = with stdenv.lib; { From ab70c601b696ed0097afb231dc8dfa56e6c4ebcb Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Thu, 27 Aug 2015 09:24:45 +0200 Subject: [PATCH 102/175] cups: Fix printing test --- nixos/tests/printing.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index ea18114b61c..02980cee2fb 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -63,7 +63,7 @@ import ./make-test.nix ({pkgs, ... }: { foreach my $file ("${pkgs.groff.doc}/share/doc/*/examples/mom/penguin.pdf", "${pkgs.groff.doc}/share/doc/*/meref.ps", "${pkgs.cups}/share/doc/cups/images/cups.png", - "${pkgs.pcre}/share/doc/pcre/pcre.txt") + "${pkgs.pcre.doc}/share/doc/pcre/pcre.txt") { $file =~ /([^\/]*)$/; my $fn = $1; From 2c4186b0450e28e865b885729e19a5517b2511ec Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 27 Aug 2015 00:59:44 -0700 Subject: [PATCH 103/175] Fix go-tools to include cover/vet for 1.4 but not 1.5 onward --- .../compilers/go/remove-tools-1.5.patch | 18 +++--------------- pkgs/top-level/go-packages.nix | 10 ++++++---- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/pkgs/development/compilers/go/remove-tools-1.5.patch b/pkgs/development/compilers/go/remove-tools-1.5.patch index 00f4fac7476..5aad4b4abc3 100644 --- a/pkgs/development/compilers/go/remove-tools-1.5.patch +++ b/pkgs/development/compilers/go/remove-tools-1.5.patch @@ -1,22 +1,10 @@ diff --git a/src/cmd/go/pkg.go b/src/cmd/go/pkg.go -index 61e3d8d..f8475f4 100644 +index 61e3d8d..b8422ad 100644 --- a/src/cmd/go/pkg.go +++ b/src/cmd/go/pkg.go -@@ -665,7 +665,7 @@ var goTools = map[string]targetDir{ - "cmd/asm": toTool, - "cmd/compile": toTool, - "cmd/cgo": toTool, -- "cmd/cover": toTool, -+ "nixos.org/x/tools/cmd/cover": toTool, - "cmd/dist": toTool, - "cmd/doc": toTool, - "cmd/fix": toTool, -@@ -676,9 +676,9 @@ var goTools = map[string]targetDir{ - "cmd/pack": toTool, - "cmd/pprof": toTool, +@@ -678,7 +678,7 @@ var goTools = map[string]targetDir{ "cmd/trace": toTool, -- "cmd/vet": toTool, -+ "nixos.org/x/tools/cmd/vet": toTool, + "cmd/vet": toTool, "cmd/yacc": toTool, - "golang.org/x/tools/cmd/godoc": toBin, + "nixos.org/x/tools/cmd/godoc": toBin, diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 70a8c1770d1..cb7feb8cbf9 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -118,11 +118,11 @@ let }; tools = buildFromGitHub { - rev = "93604a3dc2a5ae0168456c672ec35cc90ea881e6"; - date = "2015-08-19"; + rev = "b48dc8da98ae78c3d11f220e7d327304c84e623a"; + date = "2015-08-24"; owner = "golang"; repo = "tools"; - sha256 = "1yd3hwsbsjrmx85nihss55wy91y8sld7p0599j5k9xi0n1mrxdci"; + sha256 = "187p3jjxrw2qjnzqwwrq7f9w10zh6vcnwnfl3q7ms8rbiffpjy5c"; goPackagePath = "golang.org/x/tools"; goPackageAliases = [ "code.google.com/p/go.tools" ]; @@ -136,7 +136,9 @@ let export GOTOOLDIR=$out/bin ''; - excludedPackages = "testdata"; + excludedPackages = "\\(" + + stdenv.lib.concatStringsSep "\\|" ([ "testdata" ] ++ stdenv.lib.optionals (stdenv.lib.versionAtLeast go.meta.branch "1.5") [ "vet" "cover" ]) + + "\\)"; buildInputs = [ net ]; From d0880a27dd03b0bc4318c8396d944d7831ee3b0f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 27 Aug 2015 01:00:25 -0700 Subject: [PATCH 104/175] go-modules: Fix the application of reference removal on packages like mongo-tools --- pkgs/development/go-modules/generic/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index d4eb127617a..f0d3be6487c 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -1,6 +1,9 @@ { go, govers, lib }: -{ name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {} +{ name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}, preFixup ? "" + +# We want parallel builds by default +, enableParallelBuilding ? true # Disabled flag , disabled ? false @@ -156,13 +159,16 @@ go.stdenv.mkDerivation ( dir="$NIX_BUILD_TOP/go/bin" [ -e "$dir" ] && cp -r $dir $out + + runHook postInstall + ''; + + preFixup = preFixup + '' while read file; do cat $file ${removeExpr removeReferences} > $file.tmp mv $file.tmp $file chmod +x $file done < <(find $out/bin -type f 2>/dev/null) - - runHook postInstall ''; disallowedReferences = lib.optional (!allowGoReference) go @@ -170,6 +176,8 @@ go.stdenv.mkDerivation ( passthru = passthru // lib.optionalAttrs (goPackageAliases != []) { inherit goPackageAliases; }; + enableParallelBuilding = enableParallelBuilding; + meta = { # Add default meta information platforms = lib.platforms.all; From 27ab91161d0e26e409647d9fc4a848e6e41f6f8c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 27 Aug 2015 01:00:40 -0700 Subject: [PATCH 105/175] mongo-tools: Update --- pkgs/top-level/go-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index cb7feb8cbf9..3fcc63421b9 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1737,10 +1737,10 @@ let }; mongo-tools = buildFromGitHub { - rev = "621464ebd2ba0c6ee373600b0cb7fd4216405550"; + rev = "4fcfd3e57415de95c0c016def07b95bca63cccb4"; owner = "mongodb"; repo = "mongo-tools"; - sha256 = "0hgh5h7bpn5xxnxgmw30fi51l4cb4g029nih8j8m0sr4if0n9vkf"; + sha256 = "0rm7bnb81hr0byxhvagwv8an1bky882nz68cmm2kbznzyprvhyaa"; buildInputs = [ gopass go-flags mgo openssl tomb ]; excludedPackages = "vendor"; From 00fd3b25f91807a7e341b81283b15c071313b5e8 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 27 Aug 2015 01:00:58 -0700 Subject: [PATCH 106/175] parallel: 20150722 -> 20150822 --- pkgs/tools/misc/parallel/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 1f616d8d9af..4a3b90f56d8 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,23 +1,22 @@ { fetchurl, stdenv, perl }: stdenv.mkDerivation rec { - name = "parallel-20150722"; + name = "parallel-20150822"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "0jpklc4awr5z6slgn7xjhrcpk6i8jp9mwhkkaczikvbaqzbyabkx"; + sha256 = "1ij7bjxhk2866mzh0v0v2m629b6d39r5ivwdzmh72s471m9hg45d"; }; - patchPhase = - '' sed -i "src/parallel" -e's|/usr/bin/perl|${perl}/bin/perl|g' - ''; + patchPhase = '' + sed -i "src/parallel" -e's|/usr/bin/perl|${perl}/bin/perl|g' + ''; - preBuild = - # The `sem' program wants to write to `~/.parallel'. - '' export HOME="$PWD" - ''; + # The `sem' program wants to write to `~/.parallel'. + preBuild = '' + export HOME="$PWD" + ''; - buildInputs = [ perl ]; doCheck = true; meta = with stdenv.lib; { From ca11cb828876f9d315598b3699fa9343442d1607 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 27 Aug 2015 09:46:24 +0200 Subject: [PATCH 107/175] reptyr: 0.5 -> 0.6.2 --- pkgs/os-specific/linux/reptyr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/os-specific/linux/reptyr/default.nix index e5e579081f6..99f52dc5aed 100644 --- a/pkgs/os-specific/linux/reptyr/default.nix +++ b/pkgs/os-specific/linux/reptyr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "0.5"; + version = "0.6.2"; name = "reptyr-${version}"; src = fetchurl { url = "https://github.com/nelhage/reptyr/archive/reptyr-${version}.tar.gz"; - sha256 = "077cvjjf534nxh7qqisw27a0wa61mdgyik43k50f8v090rggz2xm"; + sha256 = "07pfl0rkgm8m3f3jy8r9l2yvnhf8lgllpsk3mh57mhzdxq8fagf7"; }; makeFlags = ["PREFIX=$(out)"]; meta = { From baf76b11a63465dd93b6f9d2e5d69577c8622d76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 27 Aug 2015 10:51:37 +0200 Subject: [PATCH 108/175] vagrant: use ruby 2.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit c00405d8d9bab331055f202f61ac117900454f36) Signed-off-by: Domen Kožar --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90f5704a6eb..965ef8520db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5851,7 +5851,7 @@ let uncrustify = callPackage ../development/tools/misc/uncrustify { }; vagrant = callPackage ../development/tools/vagrant { - ruby = ruby_2_0_0; + ruby = ruby_2_2_2; }; gdb = callPackage ../development/tools/misc/gdb { From ac613f0748a83c50488c03126599cb4ef149ff0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 27 Aug 2015 09:55:03 +0200 Subject: [PATCH 109/175] opencv: remove duplicated -DCMAKE_BUILD_TYPE=Release flag The standard builder already does this. --- pkgs/development/libraries/opencv/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index e0b8dcca1af..4ce1787dbac 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -20,10 +20,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" - ]; - meta = { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = http://opencv.org/; From b65c5875e910f58a716c0a6a9cb40e67eab86b88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 27 Aug 2015 11:15:39 +0200 Subject: [PATCH 110/175] upgrade python-fedora, taskw MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 5384c08ea6d429bb25bef86a4730dd6e21bf5d65) Signed-off-by: Domen Kožar --- pkgs/top-level/python-packages.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4a210674418..7da29365218 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11058,12 +11058,13 @@ let }; python_fedora = buildPythonPackage (rec { - name = "python-fedora-0.3.33"; + version = "0.5.5"; + name = "python-fedora-${version}"; meta.maintainers = with maintainers; [ mornfall ]; src = pkgs.fetchurl { - url = "https://fedorahosted.org/releases/p/y/python-fedora/${name}.tar.gz"; - sha256 = "1g05bh7d5d0gzrlnhpnca7jpqbgs2rgnlzzbvzzxmdbmlkqi3mws"; + url = "https://pypi.python.org/packages/source/p/python-fedora/${name}.tar.gz"; + sha256 = "15m8lvbb5q4rg508i4ah8my872qrq5xjwgcgca4d3kzjv2x6fhim"; }; propagatedBuildInputs = with self; [ kitchen requests bunch paver ]; doCheck = false; @@ -13674,12 +13675,12 @@ let }; taskw = buildPythonPackage rec { - version = "1.0.2"; + version = "1.0.3"; name = "taskw-${version}"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/t/taskw/${name}.tar.gz"; - sha256 = "0wa2hwplss2r56jrwib6j9sxxm02dz78878975jk9fj10p84w5kr"; + sha256 = "1fa7bv5996ppfbryv02lpnlhk5dra63lhlwrb1i4ifqbziqfqh5n"; }; patches = [ ../development/python-modules/taskw/use-template-for-taskwarrior-install-path.patch ]; @@ -13688,6 +13689,9 @@ let --replace '@@taskwarrior@@' '${pkgs.taskwarrior}' ''; + # https://github.com/ralphbean/taskw/issues/98 + doCheck = false; + buildInputs = with self; [ nose pkgs.taskwarrior tox ]; propagatedBuildInputs = with self; [ six dateutil pytz ]; From 320f963e160926f8b42fd15c8826acb11d9382a1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Aug 2015 11:17:08 +0200 Subject: [PATCH 111/175] firefox: Build with internal cairo This might fix the recent segfaults, according to https://bugzilla.redhat.com/show_bug.cgi?id=1253086. Fixes #9368. --- pkgs/applications/networking/browsers/firefox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 326f39515fc..2c433d12db5 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { alsaLib nspr nss libnotify xlibs.pixman yasm mesa xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper - hunspell libevent libstartup_notification libvpx cairo + hunspell libevent libstartup_notification libvpx /* cairo */ gstreamer gst_plugins_base icu libpng jemalloc libpulseaudio # only headers are needed ] @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { "--enable-system-hunspell" "--enable-system-pixman" "--enable-system-sqlite" - "--enable-system-cairo" + #"--enable-system-cairo" "--enable-gstreamer" "--enable-startup-notification" "--enable-content-sandbox" # available since 26.0, but not much info available From 9855a8fcc0770ea05b09953bd292582e60c0a8b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 27 Aug 2015 11:33:21 +0200 Subject: [PATCH 112/175] mongodb-tools, drive, bosun, scollector: use Go 1.4 --- pkgs/top-level/all-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3b28ec104c..0a786d875bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -948,7 +948,7 @@ let mcrypt = callPackage ../tools/misc/mcrypt { }; - mongodb-tools = goPackages.mongo-tools; + mongodb-tools = go14Packages.mongo-tools; mstflint = callPackage ../tools/misc/mstflint { }; @@ -1346,7 +1346,7 @@ let doomseeker = callPackage ../applications/misc/doomseeker { }; - drive = callPackage ../applications/networking/drive { }; + drive = callPackage ../applications/networking/drive { goPackages = go14Packages; }; driftnet = callPackage ../tools/networking/driftnet {}; @@ -8919,8 +8919,8 @@ let bird = callPackage ../servers/bird { }; - bosun = callPackage ../servers/monitoring/bosun {}; - scollector = callPackage ../servers/monitoring/bosun/scollector.nix {}; + bosun = callPackage ../servers/monitoring/bosun { goPackages = go14Packages; }; + scollector = callPackage ../servers/monitoring/bosun/scollector.nix { goPackages = go14Packages; }; charybdis = callPackage ../servers/irc/charybdis {}; From d4ccd686483f240abad40389e5ea24e5e27b0dd6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Aug 2015 11:50:03 +0200 Subject: [PATCH 113/175] Rename rl-unstable.xml -> rl-1509.xml --- nixos/doc/manual/release-notes/release-notes.xml | 2 +- .../doc/manual/release-notes/{rl-unstable.xml => rl-1509.xml} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename nixos/doc/manual/release-notes/{rl-unstable.xml => rl-1509.xml} (98%) diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml index 70cd2d6070b..e326f89d4f4 100644 --- a/nixos/doc/manual/release-notes/release-notes.xml +++ b/nixos/doc/manual/release-notes/release-notes.xml @@ -9,7 +9,7 @@ This section lists the release notes for each stable version of NixOS and current unstable revision. - + diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-1509.xml similarity index 98% rename from nixos/doc/manual/release-notes/rl-unstable.xml rename to nixos/doc/manual/release-notes/rl-1509.xml index 8fbac05e968..d7d3d1a7fb1 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-1509.xml @@ -2,9 +2,9 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" - xml:id="sec-release-unstable"> + xml:id="sec-release-15.09"> -Release 15.07 (“Dingo”, 2015/07/??) +Release 15.09 (“Dingo”, 2015/09/??) In addition to numerous new and upgraded packages, this release has the following highlights: From 591d43ec91df4ce63a2fe26a145f4847a1cfbfd6 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 27 Aug 2015 11:54:27 +0200 Subject: [PATCH 114/175] freeswitch: use gcc 4.8 to fix build (ZHF) --- pkgs/servers/sip/freeswitch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index 5b6ff15cb10..efa70875549 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, ncurses, curl, pkgconfig, gnutls, readline, openssl, perl, libjpeg -, libzrtpcpp }: +, libzrtpcpp, gcc48 }: stdenv.mkDerivation rec { name = "freeswitch-1.2.3"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ncurses curl pkgconfig gnutls readline openssl perl libjpeg - libzrtpcpp ]; + libzrtpcpp gcc48 ]; NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; From c91d360cec29d8a8fde7d5c5037f4ad27ff21d2b Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 27 Aug 2015 12:29:45 +0200 Subject: [PATCH 115/175] pidginsipe: add nss and nspr (ZHF) --- .../instant-messengers/pidgin-plugins/sipe/default.nix | 5 +++-- pkgs/development/tools/packer/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix index b387ed350af..8b19f338d3e 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pidgin, intltool, libxml2 }: +{ stdenv, fetchurl, pidgin, intltool, libxml2, nss, nspr }: let version = "1.18.1"; in @@ -19,5 +19,6 @@ stdenv.mkDerivation { postInstall = "find $out -ls; ln -s \$out/lib/purple-2 \$out/share/pidgin-sipe"; - buildInputs = [pidgin intltool libxml2]; + buildInputs = [ pidgin intltool libxml2 nss nspr ]; + } diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 8b89e8ae82d..651e64467c4 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, gox, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: +{ stdenv, lib, go, gox, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: stdenv.mkDerivation rec { name = "packer-0.7.5"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; }; - buildInputs = [ gox ]; + buildInputs = [ go gox ]; installPhase = '' export GOPATH=$src From d9baa13d2a9c18bede6df64d2219edd28a1616c8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 26 Aug 2015 17:37:03 +0200 Subject: [PATCH 116/175] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-hashes/commit/33d64f723163fbef6e42eb82f5c12b0bea924494 with hackage2nix v20150824-28-g88e95d3 --- .../haskell-modules/hackage-packages.nix | 1471 +++++++++-------- 1 file changed, 760 insertions(+), 711 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 89121a2c8d4..88c383672b1 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -463,7 +463,7 @@ self: { homepage = "https://github.com/haskell-openal/ALUT"; description = "A binding for the OpenAL Utility Toolkit"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) freealut;}; + }) {inherit (pkgs) freealut;}; "AMI" = callPackage ({ mkDerivation, base, bytestring, containers, mtl, network @@ -717,7 +717,7 @@ self: { homepage = "http://wiki.portal.chalmers.se/agda/"; description = "A dependently typed functional programming language and proof assistant"; license = "unknown"; - }) { inherit (pkgs) emacs;}; + }) {inherit (pkgs) emacs;}; "Agda-executable" = callPackage ({ mkDerivation, Agda, base }: @@ -1244,7 +1244,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/BerkeleyDBXML"; description = "Berkeley DB binding"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) db;}; + }) {inherit (pkgs) db;}; "BerkeleyDBXML" = callPackage ({ mkDerivation, base, BerkeleyDB, bytestring, db, dbxml, xercesc @@ -1260,8 +1260,8 @@ self: { description = "Berkeley DB XML binding"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) db; dbxml = null; inherit (pkgs) xercesc; - xqilla = null;}; + }) {inherit (pkgs) db; dbxml = null; inherit (pkgs) xercesc; + xqilla = null;}; "BerlekampAlgorithm" = callPackage ({ mkDerivation, base, besout }: @@ -2189,11 +2189,11 @@ self: { description = "OpenCV based machine vision library"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { opencv_calib3d = null; opencv_contrib = null; - opencv_core = null; opencv_features2d = null; - opencv_flann = null; opencv_gpu = null; opencv_highgui = null; - opencv_imgproc = null; opencv_legacy = null; opencv_ml = null; - opencv_objdetect = null; opencv_video = null;}; + }) {opencv_calib3d = null; opencv_contrib = null; + opencv_core = null; opencv_features2d = null; opencv_flann = null; + opencv_gpu = null; opencv_highgui = null; opencv_imgproc = null; + opencv_legacy = null; opencv_ml = null; opencv_objdetect = null; + opencv_video = null;}; "Cabal_1_18_1_6" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq @@ -2687,7 +2687,7 @@ self: { description = "An FFI interface to the DevIL library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) libdevil;}; + }) {inherit (pkgs) libdevil;}; "Combinatorrent" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, cereal @@ -3759,7 +3759,7 @@ self: { description = "Partial binding to the Microsoft DirectSound API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { dsound = null;}; + }) {dsound = null;}; "DisTract" = callPackage ({ mkDerivation, base, Cabal, chunks, containers, directory @@ -4036,7 +4036,7 @@ self: { description = "Cryptographic operations"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) openssl;}; + }) {inherit (pkgs) openssl;}; "Dust-tools" = callPackage ({ mkDerivation, base, binary, bytestring, cereal, containers, csv @@ -4185,8 +4185,8 @@ self: { }: mkDerivation { pname = "Ebnf2ps"; - version = "1.0.14"; - sha256 = "6366607845856b720a6d1fc21e23a7be10128d689c608473f67c2c3bf8a26737"; + version = "1.0.15"; + sha256 = "0ecce7d721d6c8993fa6ba6cfb16f1101d85e00bbaf0b6941d36a00badea2b4b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -4458,7 +4458,7 @@ self: { description = "A new implementation of the LambdaMOO server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) pcre;}; + }) {inherit (pkgs) pcre;}; "Etage" = callPackage ({ mkDerivation, base, containers, ghc, mtl, operational, random @@ -4534,7 +4534,7 @@ self: { description = "A network analysis toolkit for Haskell"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) libpcap;}; + }) {inherit (pkgs) libpcap;}; "EuroIT" = callPackage ({ mkDerivation, base }: @@ -4662,7 +4662,7 @@ self: { description = "The Haskell FModEx raw API"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) { fmodex64 = null;}; + }) {fmodex64 = null;}; "FPretty" = callPackage ({ mkDerivation, base, containers }: @@ -4687,7 +4687,7 @@ self: { librarySystemDepends = [ ftgl ]; description = "Portable TrueType font rendering for OpenGL using the Freetype2 library"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) ftgl;}; + }) {inherit (pkgs) ftgl;}; "FTGL-bytestring" = callPackage ({ mkDerivation, base, bytestring, ftgl, StateVar-transformer @@ -4703,7 +4703,7 @@ self: { librarySystemDepends = [ ftgl ]; description = "Portable TrueType font rendering for OpenGL using the Freetype2 library"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) ftgl;}; + }) {inherit (pkgs) ftgl;}; "FTPLine" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, directory, ftphs @@ -5274,7 +5274,7 @@ self: { homepage = "http://haskell.org/haskellwiki/GLFW"; description = "A Haskell binding for GLFW"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa;}; + }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa;}; "GLFW-OGL" = callPackage ({ mkDerivation, base, libX11, libXrandr, mtl, OGL }: @@ -5288,8 +5288,7 @@ self: { description = "A binding for GLFW (OGL)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs.xlibs) libX11; - inherit (pkgs.xlibs) libXrandr;}; + }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXrandr;}; "GLFW-b" = callPackage ({ mkDerivation, base, bindings-GLFW, HUnit, test-framework @@ -5350,7 +5349,7 @@ self: { librarySystemDepends = [ libX11 mesa ]; description = "Open OpenGL context windows in X11 with libX11"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa;}; + }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa;}; "GLMatrix" = callPackage ({ mkDerivation, base, OpenGLRaw }: @@ -5376,7 +5375,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A raw binding for the OpenGL graphics system"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) freeglut; inherit (pkgs) mesa;}; + }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;}; "GLUT" = callPackage ({ mkDerivation, array, base, containers, freeglut, mesa, OpenGL @@ -5393,7 +5392,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A binding for the OpenGL Utility Toolkit"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) freeglut; inherit (pkgs) mesa;}; + }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;}; "GLUtil" = callPackage ({ mkDerivation, array, base, bytestring, containers, cpphs @@ -5825,7 +5824,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Glome"; description = "Simple 3D vector library"; license = "GPL"; - }) { inherit (self.llvmPackages) llvm;}; + }) {inherit (self.llvmPackages) llvm;}; "GlomeView" = callPackage ({ mkDerivation, base, deepseq, GlomeTrace, GlomeVec, monad-par @@ -6407,7 +6406,7 @@ self: { homepage = "https://github.com/hdbc/hdbc-odbc"; description = "ODBC driver for HDBC"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) unixODBC;}; + }) {inherit (pkgs) unixODBC;}; "HDBC-postgresql" = callPackage ({ mkDerivation, base, bytestring, convertible, HDBC, mtl, old-time @@ -6428,7 +6427,7 @@ self: { homepage = "http://github.com/hdbc/hdbc-postgresql"; description = "PostgreSQL driver for HDBC"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) postgresql;}; + }) {inherit (pkgs) postgresql;}; "HDBC-postgresql-hstore" = callPackage ({ mkDerivation, attoparsec, base, containers, HDBC, text }: @@ -6470,7 +6469,7 @@ self: { homepage = "https://github.com/hdbc/hdbc-sqlite3"; description = "Sqlite v3 driver for HDBC"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) sqlite;}; + }) {inherit (pkgs) sqlite;}; "HDRUtils" = callPackage ({ mkDerivation, array, base, colour, containers, mtl, pfstools @@ -6487,7 +6486,7 @@ self: { description = "Utilities for reading, manipulating, and writing HDR images"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) pfstools;}; + }) {inherit (pkgs) pfstools;}; "HERA" = callPackage ({ mkDerivation, base, mpfr }: @@ -6499,7 +6498,7 @@ self: { librarySystemDepends = [ mpfr ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) mpfr;}; + }) {inherit (pkgs) mpfr;}; "HFuse" = callPackage ({ mkDerivation, base, bytestring, fuse, unix }: @@ -6517,7 +6516,7 @@ self: { homepage = "https://github.com/m15k/hfuse"; description = "HFuse is a binding for the Linux FUSE library"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) fuse;}; + }) {inherit (pkgs) fuse;}; "HGL" = callPackage ({ mkDerivation, array, base, X11 }: @@ -6612,7 +6611,7 @@ self: { description = "Library to enable 3D game development for Haskell - cAudio Bindings"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) { HGamer3DCAudio015 = null;}; + }) {HGamer3DCAudio015 = null;}; "HGamer3D-CEGUI-Binding" = callPackage ({ mkDerivation, base, CEGUIBase, CEGUIOgreRenderer, hg3dcegui050 @@ -6630,8 +6629,8 @@ self: { description = "A Toolset for the Haskell Game Programmer - CEGUI Bindings"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) { CEGUIBase = null; CEGUIOgreRenderer = null; - hg3dcegui050 = null;}; + }) {CEGUIBase = null; CEGUIOgreRenderer = null; + hg3dcegui050 = null;}; "HGamer3D-Common" = callPackage ({ mkDerivation, base, clock, containers, directory, filepath @@ -6678,7 +6677,7 @@ self: { description = "Enet Binding for HGamer3D"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) enet; hg3denet050 = null;}; + }) {inherit (pkgs) enet; hg3denet050 = null;}; "HGamer3D-GUI" = callPackage ({ mkDerivation, base, HGamer3D-CEGUI-Binding, HGamer3D-Data @@ -6771,7 +6770,7 @@ self: { description = "Library to enable 3D game development for Haskell - OIS Bindings"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) { HGamer3DOIS015 = null;}; + }) {HGamer3DOIS015 = null;}; "HGamer3D-Ogre-Binding" = callPackage ({ mkDerivation, base, hg3dogre050, HGamer3D-Data, mtl, OgreMain @@ -6791,9 +6790,9 @@ self: { description = "Ogre Binding for HGamer3D"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) { OgreMain = null; OgrePaging = null; OgreProperty = null; - OgreRTShaderSystem = null; OgreTerrain = null; - hg3dogre050 = null;}; + }) {OgreMain = null; OgrePaging = null; OgreProperty = null; + OgreRTShaderSystem = null; OgreTerrain = null; + hg3dogre050 = null;}; "HGamer3D-SDL2-Binding" = callPackage ({ mkDerivation, base, bytestring, hg3dsdl2050, HGamer3D-Data @@ -6811,8 +6810,8 @@ self: { description = "SDL2 Binding for HGamer3D"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) SDL2; hg3dsdl2050 = null; - inherit (pkgs.xlibs) libX11;}; + }) {inherit (pkgs) SDL2; hg3dsdl2050 = null; + inherit (pkgs.xlibs) libX11;}; "HGamer3D-SFML-Binding" = callPackage ({ mkDerivation, base, hg3dsfml050, HGamer3D-Data, sfml-audio @@ -6830,8 +6829,8 @@ self: { description = "SFML Binding for HGamer3D"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) { hg3dsfml050 = null; sfml-audio = null; sfml-network = null; - sfml-system = null; sfml-window = null;}; + }) {hg3dsfml050 = null; sfml-audio = null; sfml-network = null; + sfml-system = null; sfml-window = null;}; "HGamer3D-WinEvent" = callPackage ({ mkDerivation, base, HGamer3D-Data, HGamer3D-SDL2-Binding, text @@ -6944,7 +6943,7 @@ self: { description = "A library to create a Java Virtual Machine and manipulate Java objects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { jvm = null;}; + }) {jvm = null;}; "HJavaScript" = callPackage ({ mkDerivation, base, pretty }: @@ -7171,7 +7170,7 @@ self: { description = "Binding to libODE"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) ode;}; + }) {inherit (pkgs) ode;}; "HOpenCV" = callPackage ({ mkDerivation, allocated-processor, base, opencv, vector-space }: @@ -7187,7 +7186,7 @@ self: { executablePkgconfigDepends = [ opencv ]; description = "A binding for the OpenCV computer vision library"; license = stdenv.lib.licenses.gpl2; - }) { inherit (pkgs) opencv;}; + }) {inherit (pkgs) opencv;}; "HPDF" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers, mtl @@ -7262,7 +7261,7 @@ self: { description = "A minimal monadic PLplot interface for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { plplotd-gnome2 = null;}; + }) {plplotd-gnome2 = null;}; "HPong" = callPackage ({ mkDerivation, base, data-accessor, data-accessor-template, GLFW @@ -8770,7 +8769,7 @@ self: { description = "HyperEstraier binding for Haskell"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; - }) { hyperestraier = null; qdbm = null;}; + }) {hyperestraier = null; qdbm = null;}; "HsJudy" = callPackage ({ mkDerivation, base, bytestring, containers, Judy }: @@ -8784,7 +8783,7 @@ self: { description = "Judy bindings, and some nice APIs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { Judy = null;}; + }) {Judy = null;}; "HsOpenSSL" = callPackage ({ mkDerivation, base, bytestring, HUnit, network, old-locale @@ -8804,7 +8803,7 @@ self: { homepage = "https://github.com/phonohawk/HsOpenSSL"; description = "Partial OpenSSL binding for Haskell"; license = stdenv.lib.licenses.publicDomain; - }) { inherit (pkgs) openssl;}; + }) {inherit (pkgs) openssl;}; "HsOpenSSL-x509-system" = callPackage ({ mkDerivation, base, bytestring, HsOpenSSL, unix }: @@ -9101,7 +9100,7 @@ self: { libraryHaskellDepends = [ array base X11 ]; librarySystemDepends = [ imlib2 ]; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) imlib2;}; + }) {inherit (pkgs) imlib2;}; "ImperativeHaskell" = callPackage ({ mkDerivation, base, mtl, template-haskell }: @@ -9629,7 +9628,7 @@ self: { description = "A compiler from Curry to Haskell"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) { kics = null;}; + }) {kics = null;}; "KiCS-debugger" = callPackage ({ mkDerivation, base, containers, curry-base, directory, filepath @@ -9710,7 +9709,7 @@ self: { description = "Kyoto Cabinet DB bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) kyotocabinet;}; + }) {inherit (pkgs) kyotocabinet;}; "L-seed" = callPackage ({ mkDerivation, base, cairo, containers, gtk, mtl, old-time @@ -9747,7 +9746,7 @@ self: { homepage = "https://github.com/ezyang/ldap-haskell"; description = "Haskell binding for C LDAP API"; license = stdenv.lib.licenses.bsd3; - }) { lber = null; inherit (pkgs) openldap;}; + }) {lber = null; inherit (pkgs) openldap;}; "LRU" = callPackage ({ mkDerivation, base, containers, QuickCheck }: @@ -10206,7 +10205,7 @@ self: { description = "an adapter for LogicGrowsOnTrees that uses MPI"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) openmpi;}; + }) {inherit (pkgs) openmpi;}; "LogicGrowsOnTrees-network" = callPackage ({ mkDerivation, base, cereal, cmdtheline, composition, containers @@ -11163,7 +11162,7 @@ self: { description = "A Haskell interface to Lego Mindstorms NXT"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) { bluetooth = null;}; + }) {bluetooth = null;}; "NXTDSL" = callPackage ({ mkDerivation, attoparsec, base, hashable, mtl, resourcet, stm @@ -11298,7 +11297,7 @@ self: { description = "Bindings for net-snmp's C API for clients"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) net_snmp;}; + }) {inherit (pkgs) net_snmp;}; "Network-NineP" = callPackage ({ mkDerivation, base, binary, bytestring, containers, convertible @@ -11331,7 +11330,7 @@ self: { description = "A binary I/O library"; license = "unknown"; broken = true; - }) { integer = null;}; + }) {integer = null;}; "NineP" = callPackage ({ mkDerivation, base, binary, bytestring }: @@ -11707,9 +11706,9 @@ self: { ]; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { comctl32 = null; comdlg32 = null; gdi32 = null; - kernel32 = null; ole32 = null; shell32 = null; user32 = null; - winmm = null; winspool = null;}; + }) {comctl32 = null; comdlg32 = null; gdi32 = null; + kernel32 = null; ole32 = null; shell32 = null; user32 = null; + winmm = null; winspool = null;}; "ObjectName" = callPackage ({ mkDerivation, base, transformers }: @@ -11847,7 +11846,7 @@ self: { homepage = "https://github.com/haskell-openal/ALUT"; description = "A binding to the OpenAL cross-platform 3D audio API"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) openal;}; + }) {inherit (pkgs) openal;}; "OpenCL" = callPackage ({ mkDerivation, base, bytestring, c2hs, mtl, OpenCL, QuickCheck }: @@ -11864,7 +11863,7 @@ self: { description = "Haskell high-level wrapper for OpenCL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { OpenCL = null;}; + }) {OpenCL = null;}; "OpenCLRaw" = callPackage ({ mkDerivation, base, bytestring, mtl }: @@ -11935,7 +11934,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A raw binding for the OpenGL graphics system"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) mesa;}; + }) {inherit (pkgs) mesa;}; "OpenGLRaw21" = callPackage ({ mkDerivation, OpenGLRaw }: @@ -12380,7 +12379,7 @@ self: { description = "Relational optimiser and code generator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) libxml2;}; + }) {inherit (pkgs) libxml2;}; "Peano" = callPackage ({ mkDerivation, base }: @@ -12421,7 +12420,7 @@ self: { description = "A perfect hashing library for mapping bytestrings to values"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { cmph = null;}; + }) {cmph = null;}; "PermuteEffects" = callPackage ({ mkDerivation, base, ReplicateEffects }: @@ -12612,7 +12611,7 @@ self: { homepage = "http://haskell.org/haskellwiki/PortMidi"; description = "A binding for PortMedia/PortMidi"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) alsaLib;}; + }) {inherit (pkgs) alsaLib;}; "PostgreSQL" = callPackage ({ mkDerivation, base, mtl }: @@ -13079,7 +13078,7 @@ self: { description = "Binding to code that controls a Segway RMP"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { canlib = null; ftd2xx = null;}; + }) {canlib = null; ftd2xx = null;}; "RNAFold" = callPackage ({ mkDerivation, ADPfusion, base, BiobaseTurner, BiobaseVienna @@ -13612,7 +13611,7 @@ self: { librarySystemDepends = [ SDL ]; description = "Binding to libSDL"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) SDL;}; + }) {inherit (pkgs) SDL;}; "SDL-gfx" = callPackage ({ mkDerivation, base, SDL }: @@ -13663,7 +13662,7 @@ self: { description = "Binding to the SMPEG library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) smpeg;}; + }) {inherit (pkgs) smpeg;}; "SDL-ttf" = callPackage ({ mkDerivation, base, SDL }: @@ -13684,12 +13683,12 @@ self: { version = "0.1.0"; sha256 = "06a20c0c8652c3c2ed53db5e638c44cb7b3f2199bc490324dfb72001e344cf0e"; libraryHaskellDepends = [ base SDL2 ]; - librarySystemDepends = [ SDL2 SDL2_ttf ]; + librarySystemDepends = [ SDL2_ttf ]; jailbreak = true; description = "Binding to libSDL-ttf"; license = stdenv.lib.licenses.mit; broken = true; - }) { SDL2 = null; inherit (pkgs) SDL2_ttf;}; + }) {SDL2 = null; inherit (pkgs) SDL2_ttf;}; "SFML" = callPackage ({ mkDerivation, base, csfml-audio, csfml-graphics, csfml-network @@ -13707,9 +13706,8 @@ self: { description = "SFML bindings"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { csfml-audio = null; csfml-graphics = null; - csfml-network = null; csfml-system = null; - csfml-window = null;}; + }) {csfml-audio = null; csfml-graphics = null; + csfml-network = null; csfml-system = null; csfml-window = null;}; "SFML-control" = callPackage ({ mkDerivation, base, mtl, SFML, template-haskell }: @@ -13995,7 +13993,7 @@ self: { description = "A .NET Bridge for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) glib; inherit (pkgs) mono;}; + }) {inherit (pkgs) glib; inherit (pkgs) mono;}; "Saturnin" = callPackage ({ mkDerivation, base, bytestring, data-default, directory, either @@ -14423,7 +14421,7 @@ self: { description = "E-library directory based on FUSE virtual file system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) zip;}; + }) {inherit (pkgs) zip;}; "SoOSiM" = callPackage ({ mkDerivation, base, concurrent-supply, containers @@ -15183,7 +15181,7 @@ self: { librarySystemDepends = [ ogg theora ]; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { ogg = null; theora = null;}; + }) {ogg = null; theora = null;}; "Thingie" = callPackage ({ mkDerivation, base, cairo, gtk, mtl }: @@ -15754,7 +15752,7 @@ self: { description = "Provides access to Vkontakte social network via public API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) curl;}; + }) {inherit (pkgs) curl;}; "Validation" = callPackage ({ mkDerivation, base, bifunctors, semigroupoids, semigroups }: @@ -16154,8 +16152,8 @@ self: { homepage = "https://github.com/haskell/win32"; description = "A binding to part of the Win32 library"; license = stdenv.lib.licenses.bsd3; - }) { advapi32 = null; gdi32 = null; shell32 = null; - shfolder = null; user32 = null; winmm = null;}; + }) {advapi32 = null; gdi32 = null; shell32 = null; + shfolder = null; user32 = null; winmm = null;}; "Win32-dhcp-server" = callPackage ({ mkDerivation, base, text, Win32, Win32-errors }: @@ -16195,7 +16193,7 @@ self: { description = "Provides missing Win32 API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { imm32 = null; msimg32 = null;}; + }) {imm32 = null; msimg32 = null;}; "Win32-junction-point" = callPackage ({ mkDerivation, base, text, Win32, Win32-errors }: @@ -16252,7 +16250,7 @@ self: { description = "Windows service applications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { Advapi32 = null;}; + }) {Advapi32 = null;}; "Win32-services-wrapper" = callPackage ({ mkDerivation, base, directory, filepath, Win32, Win32-errors @@ -16377,9 +16375,9 @@ self: { homepage = "https://github.com/haskell-pkg-janitors/X11"; description = "A binding to the X11 graphics library"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXext; - inherit (pkgs.xlibs) libXinerama; inherit (pkgs.xlibs) libXrandr; - inherit (pkgs.xlibs) libXrender;}; + }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXext; + inherit (pkgs.xlibs) libXinerama; inherit (pkgs.xlibs) libXrandr; + inherit (pkgs.xlibs) libXrender;}; "X11-extras" = callPackage ({ mkDerivation, base, libX11, X11 }: @@ -16395,7 +16393,7 @@ self: { description = "Missing bindings to the X11 graphics library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs.xlibs) libX11;}; + }) {inherit (pkgs.xlibs) libX11;}; "X11-rm" = callPackage ({ mkDerivation, base, X11 }: @@ -16421,7 +16419,7 @@ self: { description = "A binding to the Xdamage X11 extension library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { Xdamage = null;}; + }) {Xdamage = null;}; "X11-xfixes" = callPackage ({ mkDerivation, base, X11, Xfixes }: @@ -16435,7 +16433,7 @@ self: { description = "A binding to the Xfixes X11 extension library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { Xfixes = null;}; + }) {Xfixes = null;}; "X11-xft" = callPackage ({ mkDerivation, base, libXft, utf8-string, X11 }: @@ -16447,7 +16445,7 @@ self: { libraryPkgconfigDepends = [ libXft ]; description = "Bindings to the Xft, X Free Type interface library, and some Xrender parts"; license = "LGPL"; - }) { inherit (pkgs.xlibs) libXft;}; + }) {inherit (pkgs.xlibs) libXft;}; "X11-xshape" = callPackage ({ mkDerivation, base, X11 }: @@ -16484,7 +16482,7 @@ self: { description = "Bindings for the DirectX XInput library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs.xlibs) xinput;}; + }) {inherit (pkgs.xlibs) xinput;}; "XMMS" = callPackage ({ mkDerivation, base, containers, xmmsclient, xmmsclient-glib }: @@ -16498,7 +16496,7 @@ self: { description = "XMMS2 client library"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { xmmsclient = null; xmmsclient-glib = null;}; + }) {xmmsclient = null; xmmsclient-glib = null;}; "XMPP" = callPackage ({ mkDerivation, base, haskell98, hsdns, mtl, network, parsec @@ -16552,7 +16550,7 @@ self: { libraryPkgconfigDepends = [ libXau ]; description = "A binding to the X11 authentication library"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs.xlibs) libXau;}; + }) {inherit (pkgs.xlibs) libXau;}; "Xec" = callPackage ({ mkDerivation, base, binary, bytestring, cairo, containers @@ -16783,7 +16781,7 @@ self: { description = "A functional MUD client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) readline;}; + }) {inherit (pkgs) readline;}; "ZEBEDDE" = callPackage ({ mkDerivation, base, vect }: @@ -16953,7 +16951,7 @@ self: { description = "Bindings for ABC, A System for Sequential Synthesis and Verification"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) abc;}; + }) {inherit (pkgs) abc;}; "abcnotation" = callPackage ({ mkDerivation, base, parsec, prettify, process, semigroups }: @@ -18947,7 +18945,7 @@ self: { homepage = "http://github.com/phaazon/al"; description = "OpenAL 1.1 raw API."; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) openal;}; + }) {inherit (pkgs) openal;}; "alarmclock" = callPackage ({ mkDerivation, base, stm, time, unbounded-delays }: @@ -19288,7 +19286,7 @@ self: { description = "Binding to the ALSA Library API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) alsaLib;}; + }) {inherit (pkgs) alsaLib;}; "alsa-core" = callPackage ({ mkDerivation, alsaLib, base, extensible-exceptions }: @@ -19301,7 +19299,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Binding to the ALSA Library API (Exceptions)"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) alsaLib;}; + }) {inherit (pkgs) alsaLib;}; "alsa-gui" = callPackage ({ mkDerivation, alsa-core, alsa-seq, base, midi, midi-alsa, wx @@ -19342,7 +19340,7 @@ self: { description = "Bindings for the ALSA sequencer API (MIDI stuff)"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) alsaLib;}; + }) {inherit (pkgs) alsaLib;}; "alsa-mixer" = callPackage ({ mkDerivation, alsa-core, alsaLib, base, c2hs, unix }: @@ -19356,7 +19354,7 @@ self: { homepage = "https://github.com/ttuegel/alsa-mixer"; description = "Bindings to the ALSA simple mixer API"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) alsaLib;}; + }) {inherit (pkgs) alsaLib;}; "alsa-pcm" = callPackage ({ mkDerivation, alsa-core, alsaLib, array, base @@ -19376,7 +19374,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Binding to the ALSA Library API (PCM audio)"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) alsaLib;}; + }) {inherit (pkgs) alsaLib;}; "alsa-pcm-tests" = callPackage ({ mkDerivation, alsa, base }: @@ -19411,7 +19409,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Binding to the ALSA Library API (MIDI sequencer)"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) alsaLib;}; + }) {inherit (pkgs) alsaLib;}; "alsa-seq-tests" = callPackage ({ mkDerivation, alsa, base }: @@ -19481,7 +19479,7 @@ self: { description = "A Haskell binding for ALURE"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { alure = null;}; + }) {alure = null;}; "amazon-emailer" = callPackage ({ mkDerivation, base, bytestring, configurator, http-conduit @@ -19590,7 +19588,7 @@ self: { description = "Amazon Auto Scaling SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-cloudformation" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19610,7 +19608,7 @@ self: { description = "Amazon CloudFormation SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-cloudfront" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19630,7 +19628,7 @@ self: { description = "Amazon CloudFront SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-cloudhsm" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19650,7 +19648,7 @@ self: { description = "Amazon CloudHSM SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-cloudsearch" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19670,7 +19668,7 @@ self: { description = "Amazon CloudSearch SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-cloudsearch-domains" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19690,7 +19688,7 @@ self: { description = "Amazon CloudSearch Domain SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-cloudtrail" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19710,7 +19708,7 @@ self: { description = "Amazon CloudTrail SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-cloudwatch" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19730,7 +19728,7 @@ self: { description = "Amazon CloudWatch SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-cloudwatch-logs" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19750,7 +19748,7 @@ self: { description = "Amazon CloudWatch Logs SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-codecommit" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19770,7 +19768,7 @@ self: { description = "Amazon CodeCommit SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-codedeploy" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19790,7 +19788,7 @@ self: { description = "Amazon CodeDeploy SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-codepipeline" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19810,7 +19808,7 @@ self: { description = "Amazon CodePipeline SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-cognito-identity" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19830,7 +19828,7 @@ self: { description = "Amazon Cognito Identity SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-cognito-sync" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19850,7 +19848,7 @@ self: { description = "Amazon Cognito Sync SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-config" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19870,7 +19868,7 @@ self: { description = "Amazon Config SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-core" = callPackage ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring @@ -19920,7 +19918,7 @@ self: { description = "Amazon Data Pipeline SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-devicefarm" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19940,7 +19938,7 @@ self: { description = "Amazon Device Farm SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-directconnect" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19960,7 +19958,7 @@ self: { description = "Amazon Direct Connect SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-ds" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19980,7 +19978,7 @@ self: { description = "Amazon Directory Service SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-dynamodb" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20000,7 +19998,7 @@ self: { description = "Amazon DynamoDB SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-dynamodb-streams" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20020,7 +20018,7 @@ self: { description = "Amazon DynamoDB Streams SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-ec2" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20040,7 +20038,7 @@ self: { description = "Amazon Elastic Compute Cloud SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-ecs" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20060,7 +20058,7 @@ self: { description = "Amazon EC2 Container Service SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-efs" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20080,7 +20078,7 @@ self: { description = "Amazon Elastic File System SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-elasticache" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20100,7 +20098,7 @@ self: { description = "Amazon ElastiCache SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-elasticbeanstalk" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20120,7 +20118,7 @@ self: { description = "Amazon Elastic Beanstalk SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-elastictranscoder" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20140,7 +20138,7 @@ self: { description = "Amazon Elastic Transcoder SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-elb" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20160,7 +20158,7 @@ self: { description = "Amazon Elastic Load Balancing SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-emr" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20180,7 +20178,7 @@ self: { description = "Amazon Elastic MapReduce SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-glacier" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20200,7 +20198,7 @@ self: { description = "Amazon Glacier SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-iam" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20220,7 +20218,7 @@ self: { description = "Amazon Identity and Access Management SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-importexport" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20240,7 +20238,7 @@ self: { description = "Amazon Import/Export SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-kinesis" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20260,7 +20258,7 @@ self: { description = "Amazon Kinesis SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-kms" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20280,7 +20278,7 @@ self: { description = "Amazon Key Management Service SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-lambda" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20300,7 +20298,7 @@ self: { description = "Amazon Lambda SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-ml" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20320,7 +20318,7 @@ self: { description = "Amazon Machine Learning SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-opsworks" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20340,7 +20338,7 @@ self: { description = "Amazon OpsWorks SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-rds" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20360,7 +20358,7 @@ self: { description = "Amazon Relational Database Service SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-redshift" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20380,7 +20378,7 @@ self: { description = "Amazon Redshift SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-route53" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20400,7 +20398,7 @@ self: { description = "Amazon Route 53 SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-route53-domains" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20420,7 +20418,7 @@ self: { description = "Amazon Route 53 Domains SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-s3" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20440,7 +20438,7 @@ self: { description = "Amazon Simple Storage Service SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-sdb" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20460,7 +20458,7 @@ self: { description = "Amazon SimpleDB SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-ses" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20480,7 +20478,7 @@ self: { description = "Amazon Simple Email Service SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-sns" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20500,7 +20498,7 @@ self: { description = "Amazon Simple Notification Service SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-sqs" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20520,7 +20518,7 @@ self: { description = "Amazon Simple Queue Service SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-ssm" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20540,7 +20538,7 @@ self: { description = "Amazon Simple Systems Management Service SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-storagegateway" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20560,7 +20558,7 @@ self: { description = "Amazon Storage Gateway SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-sts" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20580,7 +20578,7 @@ self: { description = "Amazon Security Token Service SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-support" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20600,7 +20598,7 @@ self: { description = "Amazon Support SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-swf" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20620,7 +20618,7 @@ self: { description = "Amazon Simple Workflow Service SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "amazonka-workspaces" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20640,7 +20638,7 @@ self: { description = "Amazon WorkSpaces SDK"; license = "unknown"; broken = true; - }) { amazonka-test = null;}; + }) {amazonka-test = null;}; "ampersand" = callPackage ({ mkDerivation, base, bytestring, containers, csv, directory @@ -21125,7 +21123,7 @@ self: { description = "Haskell binding to the ANTLR parser generator C runtime library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { antlr3c = null;}; + }) {antlr3c = null;}; "anydbm" = callPackage ({ mkDerivation, base, containers, MissingH, mtl }: @@ -21162,7 +21160,7 @@ self: { description = "Bindings to libaosd, a library for Cairo-based on-screen displays"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { libaosd = null;}; + }) {libaosd = null;}; "ap-reflect" = callPackage ({ mkDerivation, base }: @@ -21195,7 +21193,7 @@ self: { homepage = "https://github.com/trskop/apache-md5"; description = "Apache specific MD5 digest algorighm"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) openssl;}; + }) {inherit (pkgs) openssl;}; "apelsin" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq @@ -21307,17 +21305,15 @@ self: { }: mkDerivation { pname = "apiary"; - version = "1.4.3"; - sha256 = "4cb377f5f081c80a5d11ffe09daad890528ed3f5e67b59265f9acc61677bcefc"; - revision = "1"; - editedCabalFile = "024867d05ec04c0b83c41e948b80c56686cc170beed600daffa8d8c725e50a32"; + version = "1.4.4"; + sha256 = "de395821116717cf654f52176e6487782522f567b288a17bab7713ff85411085"; libraryHaskellDepends = [ base blaze-builder blaze-html blaze-markup bytestring bytestring-read case-insensitive data-default-class exceptions hashable http-date http-types mime-types monad-control mtl process stringsearch template-haskell text time transformers transformers-base types-compat unix-compat unordered-containers - vault wai web-routing + vault wai wai-extra web-routing ]; testHaskellDepends = [ base bytestring http-types HUnit mtl tasty tasty-hunit @@ -21899,7 +21895,7 @@ self: { description = "FFI binding to the Intel Array Building Blocks (ArBB) virtual machine"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { arbb_dev = null;}; + }) {arbb_dev = null;}; "arbtt" = callPackage ({ mkDerivation, aeson, array, base, binary, bytestring @@ -21928,7 +21924,7 @@ self: { homepage = "http://arbtt.nomeata.de/"; description = "Automatic Rule-Based Time Tracker"; license = "GPL"; - }) { inherit (pkgs.xlibs) libXScrnSaver;}; + }) {inherit (pkgs.xlibs) libXScrnSaver;}; "archive" = callPackage ({ mkDerivation, base, bytestring, debian, debian-mirror, directory @@ -21951,7 +21947,7 @@ self: { description = "A library and programs for creating hardlinked incremental archives or backups"; license = stdenv.lib.licenses.bsd3; broken = true; - }) { debian-mirror = null; help = null;}; + }) {debian-mirror = null; help = null;}; "archiver" = callPackage ({ mkDerivation, base, bytestring, containers, curl, HTTP, network @@ -22682,7 +22678,7 @@ self: { description = "Haskell Assembler"; license = stdenv.lib.licenses.bsd3; broken = true; - }) { ghc-binary = null;}; + }) {ghc-binary = null;}; "assert" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath @@ -22739,7 +22735,7 @@ self: { description = "The Assimp asset import library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) assimp;}; + }) {inherit (pkgs) assimp;}; "astar" = callPackage ({ mkDerivation, base, containers, PSQueue }: @@ -23460,7 +23456,7 @@ self: { description = "A Haskell FFI wrapper for the Augeas API"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) augeas;}; + }) {inherit (pkgs) augeas;}; "augur" = callPackage ({ mkDerivation, base, bytestring, classify, containers, directory @@ -23805,7 +23801,7 @@ self: { description = "Low-level Awesomium bindings"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) { awesomium = null;}; + }) {awesomium = null;}; "aws" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring @@ -25509,7 +25505,7 @@ self: { description = "Pretty BerkeleyDB v4 binding"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) db;}; + }) {inherit (pkgs) db;}; "berp" = callPackage ({ mkDerivation, array, base, containers, directory @@ -25860,8 +25856,8 @@ self: { description = "Leksah plugin base"; license = "LGPL"; broken = true; - }) { leksah-dummy = null; leksah-main = null; - leksah-plugin-pane = null;}; + }) {leksah-dummy = null; leksah-main = null; + leksah-plugin-pane = null;}; "billeksah-pane" = callPackage ({ mkDerivation, base, billeksah-services, containers, directory @@ -26191,7 +26187,7 @@ self: { description = "Format to store data using the binary transform"; license = stdenv.lib.licenses.bsd3; broken = true; - }) { binary-transform = null;}; + }) {binary-transform = null;}; "binary-streams" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal @@ -26355,7 +26351,7 @@ self: { description = "Low level bindings to EsounD (ESD; Enlightened Sound Daemon)"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; - }) { esound = null;}; + }) {esound = null;}; "bindings-GLFW" = callPackage ({ mkDerivation, base, bindings-DSL, HUnit, libX11, libXcursor @@ -26376,11 +26372,11 @@ self: { ]; description = "Low-level bindings to GLFW OpenGL library"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXcursor; - inherit (pkgs.xlibs) libXext; inherit (pkgs.xlibs) libXfixes; - inherit (pkgs.xlibs) libXi; inherit (pkgs.xlibs) libXinerama; - inherit (pkgs.xlibs) libXrandr; inherit (pkgs.xlibs) libXxf86vm; - inherit (pkgs) mesa;}; + }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXcursor; + inherit (pkgs.xlibs) libXext; inherit (pkgs.xlibs) libXfixes; + inherit (pkgs.xlibs) libXi; inherit (pkgs.xlibs) libXinerama; + inherit (pkgs.xlibs) libXrandr; inherit (pkgs.xlibs) libXxf86vm; + inherit (pkgs) mesa;}; "bindings-K8055" = callPackage ({ mkDerivation, base, K8055D }: @@ -26394,7 +26390,7 @@ self: { description = "Bindings to Velleman K8055 dll"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { K8055D = null;}; + }) {K8055D = null;}; "bindings-apr" = callPackage ({ mkDerivation, apr-1, base, bindings-DSL }: @@ -26409,7 +26405,7 @@ self: { description = "Low level bindings to Apache Portable Runtime (APR)"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; - }) { apr-1 = null;}; + }) {apr-1 = null;}; "bindings-apr-util" = callPackage ({ mkDerivation, apr-util-1, base, bindings-apr, bindings-DSL }: @@ -26424,7 +26420,7 @@ self: { description = "Low level bindings to Apache Portable Runtime Utility (APR Utility)"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; - }) { apr-util-1 = null;}; + }) {apr-util-1 = null;}; "bindings-audiofile" = callPackage ({ mkDerivation, audiofile, base, bindings-DSL }: @@ -26437,7 +26433,7 @@ self: { homepage = "http://cielonegro.org/Bindings-AudioFile.html"; description = "Low level bindings to audiofile"; license = stdenv.lib.licenses.publicDomain; - }) { inherit (pkgs) audiofile;}; + }) {inherit (pkgs) audiofile;}; "bindings-bfd" = callPackage ({ mkDerivation, alex, array, base, bfd, containers, happy, opcodes @@ -26455,7 +26451,7 @@ self: { description = "Bindings for libbfd, a library of the GNU `binutils'"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) { bfd = null; opcodes = null;}; + }) {bfd = null; opcodes = null;}; "bindings-cctools" = callPackage ({ mkDerivation, bindings-DSL, dttools }: @@ -26469,7 +26465,7 @@ self: { description = "Bindings to the CCTools WorkQueue C library"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; - }) { dttools = null;}; + }) {dttools = null;}; "bindings-codec2" = callPackage ({ mkDerivation, base, binary, bindings-DSL, bytestring, codec2 @@ -26490,7 +26486,7 @@ self: { description = "Very low-level FFI bindings for Codec2"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; - }) { codec2 = null;}; + }) {codec2 = null;}; "bindings-common" = callPackage ({ mkDerivation, base }: @@ -26517,7 +26513,7 @@ self: { description = "Library for using firewire (iidc-1394) cameras"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { dc1394 = null;}; + }) {dc1394 = null;}; "bindings-directfb" = callPackage ({ mkDerivation, base, bindings-DSL, bindings-posix, directfb }: @@ -26529,7 +26525,7 @@ self: { libraryPkgconfigDepends = [ directfb ]; description = "Low level bindings to DirectFB"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) directfb;}; + }) {inherit (pkgs) directfb;}; "bindings-eskit" = callPackage ({ mkDerivation, array, base, bindings-DSL, eskit }: @@ -26545,7 +26541,7 @@ self: { description = "Bindings to ESKit"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { eskit = null;}; + }) {eskit = null;}; "bindings-fann" = callPackage ({ mkDerivation, base, bindings-DSL, fann }: @@ -26558,7 +26554,7 @@ self: { description = "Low level bindings to FANN neural network library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { fann = null;}; + }) {fann = null;}; "bindings-fluidsynth" = callPackage ({ mkDerivation, base, bindings-DSL, fluidsynth }: @@ -26571,7 +26567,7 @@ self: { homepage = "http://github.com/bgamari/bindings-fluidsynth"; description = "Haskell FFI bindings for fluidsynth software synthesizer"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) fluidsynth;}; + }) {inherit (pkgs) fluidsynth;}; "bindings-friso" = callPackage ({ mkDerivation, base, bindings-DSL, friso }: @@ -26584,7 +26580,7 @@ self: { description = "Low level bindings for friso"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; - }) { friso = null;}; + }) {friso = null;}; "bindings-glib" = callPackage ({ mkDerivation, base, bindings-DSL, glib }: @@ -26596,7 +26592,7 @@ self: { libraryPkgconfigDepends = [ glib ]; description = "Low level bindings to GLib"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) glib;}; + }) {inherit (pkgs) glib;}; "bindings-gobject" = callPackage ({ mkDerivation, base, bindings-DSL, bindings-glib, glib }: @@ -26608,7 +26604,7 @@ self: { libraryPkgconfigDepends = [ glib ]; description = "Low level bindings supporting GObject and derived libraries"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) glib;}; + }) {inherit (pkgs) glib;}; "bindings-gpgme" = callPackage ({ mkDerivation, base, bindings-DSL, gpgme }: @@ -26621,7 +26617,7 @@ self: { homepage = "http://bitbucket.org/mauricio/bindings-gpgme"; description = "Project bindings-* raw interface to gpgme"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) gpgme;}; + }) {inherit (pkgs) gpgme;}; "bindings-gsl" = callPackage ({ mkDerivation, base, bindings-DSL, gsl }: @@ -26633,7 +26629,7 @@ self: { libraryPkgconfigDepends = [ gsl ]; description = "Low level bindings to GNU GSL"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) gsl;}; + }) {inherit (pkgs) gsl;}; "bindings-gts" = callPackage ({ mkDerivation, base, bindings-DSL, bindings-glib, gts }: @@ -26646,7 +26642,7 @@ self: { description = "Low level bindings supporting GTS, the GNU Triangulated Surface Library"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) gts;}; + }) {inherit (pkgs) gts;}; "bindings-hamlib" = callPackage ({ mkDerivation, base, bindings-DSL, hamlib }: @@ -26664,7 +26660,7 @@ self: { homepage = "https://github.com/relrod/hamlib-haskell"; description = "Hamlib bindings for Haskell"; license = stdenv.lib.licenses.lgpl21; - }) { inherit (pkgs) hamlib;}; + }) {inherit (pkgs) hamlib;}; "bindings-hdf5" = callPackage ({ mkDerivation, base, bindings-DSL }: @@ -26689,7 +26685,7 @@ self: { homepage = "https://github.com/basvandijk/bindings-levmar"; description = "Low level bindings to the C levmar (Levenberg-Marquardt) library"; license = "unknown"; - }) { inherit (pkgs) blas; lapack = null;}; + }) {inherit (pkgs) blas; lapack = null;}; "bindings-libcddb" = callPackage ({ mkDerivation, base, bindings-DSL, libcddb }: @@ -26702,7 +26698,7 @@ self: { homepage = "http://bitbucket.org/mauricio/bindings-libcddb"; description = "Low level binding to libcddb"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) libcddb;}; + }) {inherit (pkgs) libcddb;}; "bindings-libffi" = callPackage ({ mkDerivation, base, bindings-DSL, libffi }: @@ -26714,7 +26710,7 @@ self: { libraryPkgconfigDepends = [ libffi ]; description = "Low level bindings to libffi"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) libffi;}; + }) {inherit (pkgs) libffi;}; "bindings-libftdi" = callPackage ({ mkDerivation, base, bindings-DSL, libftdi, libusb }: @@ -26727,7 +26723,7 @@ self: { description = "Low level bindings to libftdi"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) libftdi; inherit (pkgs) libusb;}; + }) {inherit (pkgs) libftdi; inherit (pkgs) libusb;}; "bindings-librrd" = callPackage ({ mkDerivation, base, bindings-DSL, librrd }: @@ -26741,7 +26737,7 @@ self: { description = "Low level bindings to RRDtool"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; - }) { librrd = null;}; + }) {librrd = null;}; "bindings-libstemmer" = callPackage ({ mkDerivation, base, bindings-DSL, resourcet, stemmer @@ -26758,7 +26754,7 @@ self: { description = "Binding for libstemmer with low level binding"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { stemmer = null;}; + }) {stemmer = null;}; "bindings-libusb" = callPackage ({ mkDerivation, base, bindings-DSL, libusb }: @@ -26771,7 +26767,7 @@ self: { homepage = "https://github.com/basvandijk/bindings-libusb"; description = "Low level bindings to libusb"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) libusb;}; + }) {inherit (pkgs) libusb;}; "bindings-libv4l2" = callPackage ({ mkDerivation, base, bindings-DSL, v4l2 }: @@ -26785,7 +26781,7 @@ self: { description = "bindings to libv4l2 for Linux"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { v4l2 = null;}; + }) {v4l2 = null;}; "bindings-libzip" = callPackage ({ mkDerivation, base, bindings-DSL, libzip }: @@ -26798,7 +26794,7 @@ self: { homepage = "http://bitbucket.org/astanin/hs-libzip/"; description = "Low level bindings to libzip"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) libzip;}; + }) {inherit (pkgs) libzip;}; "bindings-linux-videodev2" = callPackage ({ mkDerivation, base, bindings-DSL, ioctl }: @@ -26825,7 +26821,7 @@ self: { homepage = "https://github.com/fizruk/bindings-lxc"; description = "Direct Haskell bindings to LXC (Linux containers) C API"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) lxc;}; + }) {inherit (pkgs) lxc;}; "bindings-mmap" = callPackage ({ mkDerivation, bindings-posix }: @@ -26868,7 +26864,7 @@ self: { homepage = "http://floss.scru.org/bindings-nettle"; description = "bindings to nettle crypto library"; license = stdenv.lib.licenses.gpl3; - }) { inherit (pkgs) nettle;}; + }) {inherit (pkgs) nettle;}; "bindings-parport" = callPackage ({ mkDerivation, base, bindings-DSL }: @@ -26891,7 +26887,7 @@ self: { libraryPkgconfigDepends = [ portaudio ]; description = "Low-level bindings to portaudio library"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) portaudio;}; + }) {inherit (pkgs) portaudio;}; "bindings-posix" = callPackage ({ mkDerivation, base, bindings-DSL }: @@ -26915,7 +26911,7 @@ self: { homepage = "https://github.com/rwbarton/bindings-potrace"; description = "Low-level bindings to the potrace bitmap tracing library"; license = stdenv.lib.licenses.gpl2; - }) { inherit (pkgs) potrace;}; + }) {inherit (pkgs) potrace;}; "bindings-ppdev" = callPackage ({ mkDerivation, base, bindings-DSL, ioctl }: @@ -26960,7 +26956,7 @@ self: { homepage = "http://floss.scru.org/bindings-sane"; description = "FFI bindings to libsane"; license = stdenv.lib.licenses.gpl3; - }) { inherit (pkgs) saneBackends;}; + }) {inherit (pkgs) saneBackends;}; "bindings-sc3" = callPackage ({ mkDerivation, base, bindings-DSL, scsynth }: @@ -26974,7 +26970,7 @@ self: { description = "Low-level bindings to the SuperCollider synthesis engine library"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { scsynth = null;}; + }) {scsynth = null;}; "bindings-sipc" = callPackage ({ mkDerivation, base, sipc }: @@ -26991,7 +26987,7 @@ self: { description = "Low level bindings to SIPC"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { sipc = null;}; + }) {sipc = null;}; "bindings-sophia" = callPackage ({ mkDerivation, base, bindings-DSL }: @@ -27014,7 +27010,7 @@ self: { libraryPkgconfigDepends = [ sqlite ]; description = "Low level bindings to sqlite3"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) sqlite;}; + }) {inherit (pkgs) sqlite;}; "bindings-svm" = callPackage ({ mkDerivation, base, bindings-DSL }: @@ -27049,7 +27045,7 @@ self: { librarySystemDepends = [ gmp yices ]; description = "Bindings to the Yices theorem prover"; license = stdenv.lib.licenses.publicDomain; - }) { inherit (pkgs) gmp; inherit (pkgs) yices;}; + }) {inherit (pkgs) gmp; inherit (pkgs) yices;}; "binembed" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory @@ -27576,7 +27572,7 @@ self: { librarySystemDepends = [ gcc_s ]; description = "Efficient high-level bit operations not found in Data.Bits"; license = stdenv.lib.licenses.bsd3; - }) { gcc_s = null;}; + }) {gcc_s = null;}; "bitset" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, gmp, integer-gmp @@ -27593,7 +27589,7 @@ self: { description = "A space-efficient set data structure"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) gmp;}; + }) {inherit (pkgs) gmp;}; "bitspeak" = callPackage ({ mkDerivation, base, bindings-DSL, bindings-glib @@ -27613,7 +27609,7 @@ self: { description = "Proof-of-concept tool for writing using binary choices"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs.gnome) gtk; inherit (pkgs.gnome) pango;}; + }) {inherit (pkgs.gnome) gtk; inherit (pkgs.gnome) pango;}; "bitstream" = callPackage ({ mkDerivation, base, base-unicode-symbols, bytestring, QuickCheck @@ -27716,20 +27712,20 @@ self: { }) {}; "bitx-bitcoin" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, hspec - , http-conduit, http-types, microlens, microlens-th, network - , pretty-show, scientific, split, text, time + ({ mkDerivation, aeson, base, bytestring, directory, doctest, hspec + , http-conduit, http-types, microlens, microlens-th, network, safe + , scientific, split, text, time }: mkDerivation { pname = "bitx-bitcoin"; - version = "0.4.0.1"; - sha256 = "2aa641c5e02e19814c707d8aa8b262411288e7db403afbee04b909507a6f8187"; + version = "0.5.0.0"; + sha256 = "e52f9757e72a5f3fa2992a4f68ffb7874131357b9327ce6908200e8e89d7f9a9"; libraryHaskellDepends = [ aeson base bytestring http-conduit http-types microlens microlens-th network scientific split text time ]; testHaskellDepends = [ - aeson base bytestring directory hspec microlens pretty-show text + aeson base bytestring directory doctest hspec microlens safe text time ]; homepage = "https://github.com/tebello-thejane/bitx-haskell"; @@ -27926,7 +27922,7 @@ self: { description = "Low-level Haskell bindings to Blas"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) blas;}; + }) {inherit (pkgs) blas;}; "blastxml" = callPackage ({ mkDerivation, base, biocore, bytestring, parallel, tagsoup }: @@ -28992,7 +28988,7 @@ self: { description = "Haskell bindings to Broker, Bro's messaging library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { broker = null;}; + }) {broker = null;}; "bsd-sysctl" = callPackage ({ mkDerivation, base }: @@ -29306,7 +29302,7 @@ self: { description = "A wrapper for the Bullet physics engine"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) bullet;}; + }) {inherit (pkgs) bullet;}; "bumper" = callPackage ({ mkDerivation, base, Cabal, containers, fclabels, process @@ -29881,7 +29877,7 @@ self: { librarySystemDepends = [ bzip2 ]; description = "Compression and decompression in the bzip2 format"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) bzip2;}; + }) {inherit (pkgs) bzip2;}; "bzlib-conduit" = callPackage ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, conduit @@ -29904,7 +29900,7 @@ self: { homepage = "https://github.com/snoyberg/bzlib-conduit"; description = "Streaming compression/decompression via conduits"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) bzip2;}; + }) {inherit (pkgs) bzip2;}; "c-dsl" = callPackage ({ mkDerivation, base, language-c }: @@ -30305,8 +30301,8 @@ self: { }: mkDerivation { pname = "cabal-helper"; - version = "0.5.1.0"; - sha256 = "563773491cc8245c3d265c2e7847f95198aad74adcbc16a91622e7e4abef4e45"; + version = "0.5.3.0"; + sha256 = "6ab4dc0b9b523241f6f3ed6d6af2d5d1085fc3e384d88b6667a87df843800f66"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -30314,34 +30310,14 @@ self: { transformers ]; executableHaskellDepends = [ - base bytestring Cabal directory filepath process template-haskell - temporary transformers utf8-string + base bytestring Cabal directory filepath ghc-prim process + template-haskell temporary transformers utf8-string ]; - testHaskellDepends = [ base extra process unix ]; - description = "Simple interface to some of Cabal's configuration state used by ghc-mod"; - license = stdenv.lib.licenses.agpl3; - }) {}; - - "cabal-helper_0_5_2_0" = callPackage - ({ mkDerivation, base, bytestring, Cabal, data-default, directory - , extra, filepath, ghc-prim, mtl, process, template-haskell - , temporary, transformers, unix, utf8-string - }: - mkDerivation { - pname = "cabal-helper"; - version = "0.5.2.0"; - sha256 = "e4328860abef0a6ff97357810f6f067018e40e0e28fa9df3b51efbc7421f689f"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base Cabal data-default directory filepath ghc-prim mtl process - transformers + testHaskellDepends = [ + base bytestring Cabal data-default directory extra filepath + ghc-prim mtl process template-haskell temporary transformers unix + utf8-string ]; - executableHaskellDepends = [ - base bytestring Cabal directory filepath process template-haskell - temporary transformers utf8-string - ]; - testHaskellDepends = [ base extra process unix ]; description = "Simple interface to some of Cabal's configuration state used by ghc-mod"; license = stdenv.lib.licenses.agpl3; }) {}; @@ -30432,7 +30408,7 @@ self: { description = "The (bundled) command-line interface for Cabal and Hackage"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) zlib;}; + }) {inherit (pkgs) zlib;}; "cabal-install-ghc72" = callPackage ({ mkDerivation, array, base, Cabal, containers, directory @@ -31040,7 +31016,7 @@ self: { homepage = "http://github.com/pecorarista/hscabocha"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { cabocha = null;}; + }) {cabocha = null;}; "cached-io" = callPackage ({ mkDerivation, base, stm, time }: @@ -31132,7 +31108,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Cairo library"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) cairo;}; + }) {inherit (pkgs) cairo;}; "cairo-appbase" = callPackage ({ mkDerivation, base, cairo, glib, gtk }: @@ -31229,7 +31205,7 @@ self: { description = "Haskell binding to the Cal3D animation library"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { cal3d = null;}; + }) {cal3d = null;}; "cal3d-examples" = callPackage ({ mkDerivation, base, cal3d, cal3d-opengl, OpenGL, SDL }: @@ -31659,7 +31635,7 @@ self: { description = "mid-level bindings to CasADi"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) { casadi = null;}; + }) {casadi = null;}; "casadi-bindings-control" = callPackage ({ mkDerivation, base, casadi-bindings-core @@ -31677,7 +31653,7 @@ self: { description = "low level bindings to casadi-control"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) { casadi_control = null;}; + }) {casadi_control = null;}; "casadi-bindings-core" = callPackage ({ mkDerivation, base, casadi, casadi-bindings-internal, vector }: @@ -31690,7 +31666,7 @@ self: { description = "autogenerated low level bindings to casadi"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) { casadi = null;}; + }) {casadi = null;}; "casadi-bindings-internal" = callPackage ({ mkDerivation, base, casadi, vector }: @@ -31704,7 +31680,7 @@ self: { description = "low level bindings to CasADi"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) { casadi = null;}; + }) {casadi = null;}; "casadi-bindings-ipopt-interface" = callPackage ({ mkDerivation, base, casadi-bindings-core @@ -31721,7 +31697,7 @@ self: { description = "low level bindings to casadi-ipopt_interface"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) { casadi_ipopt_interface = null;}; + }) {casadi_ipopt_interface = null;}; "casadi-bindings-snopt-interface" = callPackage ({ mkDerivation, base, casadi-bindings-core @@ -31738,7 +31714,7 @@ self: { description = "low level bindings to casadi-snopt_interface"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) { casadi_snopt_interface = null;}; + }) {casadi_snopt_interface = null;}; "cascading" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, colour @@ -32172,7 +32148,7 @@ self: { description = "Bindings for the CCI networking library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { cci = null;}; + }) {cci = null;}; "ccnx" = callPackage ({ mkDerivation, base, bytestring }: @@ -32203,7 +32179,7 @@ self: { description = "High-level interface to CCTools' WorkQueue library"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; - }) { dttools = null;}; + }) {dttools = null;}; "cedict" = callPackage ({ mkDerivation, base, bytestring, containers, mtl, parsec @@ -32589,8 +32565,8 @@ self: { }: mkDerivation { pname = "cgrep"; - version = "6.5.2"; - sha256 = "998770126bf6dff9c230557accb1eb5bbc2b89ed03d209645a92b2f229e52c08"; + version = "6.5.3"; + sha256 = "af2f1b09aabb32fe398a575f28331979903afa00333b3f1dc0f19a6d302bca1e"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -32913,7 +32889,7 @@ self: { librarySystemDepends = [ resolv ]; description = "Confirm whether an email is valid and probably existant"; license = stdenv.lib.licenses.bsd3; - }) { resolv = null;}; + }) {resolv = null;}; "check-pvp" = callPackage ({ mkDerivation, base, Cabal, containers, explicit-exception @@ -33252,7 +33228,7 @@ self: { description = "A binding to cinvoke"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { cinvoke = null;}; + }) {cinvoke = null;}; "cio" = callPackage ({ mkDerivation, base, monad-stm, mtl, parallel-io, stm }: @@ -33952,13 +33928,12 @@ self: { web-routes-th xss-sanitize ]; librarySystemDepends = [ openssl ]; - libraryToolDepends = [ hsx2hs ]; jailbreak = true; homepage = "http://www.clckwrks.com/"; description = "A secure, reliable content management system (CMS) and blogging platform"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) openssl;}; + }) {inherit (pkgs) openssl;}; "clckwrks-cli" = callPackage ({ mkDerivation, acid-state, base, clckwrks, haskeline, mtl @@ -34100,7 +34075,6 @@ self: { tagsoup template-haskell text time time-locale-compat uuid web-plugins web-routes web-routes-happstack web-routes-th ]; - libraryToolDepends = [ hsx2hs ]; jailbreak = true; homepage = "http://www.clckwrks.com/"; description = "support for CMS/Blogging in clckwrks"; @@ -34120,7 +34094,6 @@ self: { base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro mtl text web-plugins ]; - libraryToolDepends = [ hsx2hs ]; homepage = "http://www.clckwrks.com/"; description = "simple bootstrap based template for clckwrks"; license = stdenv.lib.licenses.bsd3; @@ -34421,7 +34394,7 @@ self: { description = "timer functionality to clock IO commands"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) { QtCore = null;}; + }) {QtCore = null;}; "clogparse" = callPackage ({ mkDerivation, attoparsec, base, bytestring, filepath, text, time @@ -34642,7 +34615,7 @@ self: { description = "Bindings to the Clutter animation library"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) clutter; inherit (pkgs.gnome) pango;}; + }) {inherit (pkgs) clutter; inherit (pkgs.gnome) pango;}; "cmaes" = callPackage ({ mkDerivation, base, doctest, doctest-prop, mtl, process, random @@ -35460,6 +35433,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "comfort-graph" = callPackage + ({ mkDerivation, base, containers, QuickCheck, transformers + , utility-ht + }: + mkDerivation { + pname = "comfort-graph"; + version = "0.0.0.1"; + sha256 = "dc4cadda8bb9847f60f217d54590d5695597814557c70dafab9846b944dcfb8c"; + libraryHaskellDepends = [ + base containers QuickCheck transformers utility-ht + ]; + homepage = "http://hub.darcs.net/thielema/comfort-graph"; + description = "Graph structure with type parameters for nodes and edges"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "command" = callPackage ({ mkDerivation, base, deepseq, process }: mkDerivation { @@ -36461,7 +36450,7 @@ self: { description = "conduit-audio interface to the LAME MP3 library"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { mp3lame = null;}; + }) {mp3lame = null;}; "conduit-audio-samplerate" = callPackage ({ mkDerivation, base, conduit, conduit-audio, resourcet @@ -36481,7 +36470,7 @@ self: { description = "conduit-audio interface to the libsamplerate resampling library"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { samplerate = null;}; + }) {samplerate = null;}; "conduit-audio-sndfile" = callPackage ({ mkDerivation, base, conduit, conduit-audio, hsndfile @@ -37240,7 +37229,7 @@ self: { executableSystemDepends = [ hyperleveldb ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { hyperleveldb = null;}; + }) {hyperleveldb = null;}; "continuum-client" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, mtl @@ -38293,7 +38282,7 @@ self: { description = "Bindings for libpython"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) python3;}; + }) {inherit (pkgs) python3;}; "cql" = callPackage ({ mkDerivation, base, bytestring, cereal, Decimal, iproute @@ -38495,7 +38484,7 @@ self: { description = "A haskell binding to cracklib"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { crack = null;}; + }) {crack = null;}; "crackNum" = callPackage ({ mkDerivation, base, data-binary-ieee754, ieee754 }: @@ -39611,7 +39600,7 @@ self: { description = "Binding to the Google ctemplate library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { ctemplate = null;}; + }) {ctemplate = null;}; "ctkl" = callPackage ({ mkDerivation, array, base }: @@ -39739,7 +39728,7 @@ self: { homepage = "https://github.com/bmsherman/cublas"; description = "FFI bindings to the CUDA CUBLAS and CUSPARSE libraries"; license = stdenv.lib.licenses.bsd3; - }) { cublas = null; cusparse = null;}; + }) {cublas = null; cusparse = null;}; "cuboid" = callPackage ({ mkDerivation, base, GLUT, Yampa }: @@ -39785,8 +39774,8 @@ self: { description = "Bindings to the CUDD binary decision diagrams library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { cudd = null; dddmp = null; epd = null; inherit (pkgs) mtr; - inherit (pkgs) st; util = null;}; + }) {cudd = null; dddmp = null; epd = null; inherit (pkgs) mtr; + inherit (pkgs) st; util = null;}; "cufft" = callPackage ({ mkDerivation, base, c2hs, cuda }: @@ -39811,7 +39800,7 @@ self: { librarySystemDepends = [ curl ]; description = "Haskell binding to libcurl"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) curl;}; + }) {inherit (pkgs) curl;}; "curl-aeson" = callPackage ({ mkDerivation, aeson, base, curl, text, utf8-string }: @@ -40236,7 +40225,7 @@ self: { homepage = "http://darcs.net/"; description = "a distributed, interactive, smart revision control system"; license = "GPL"; - }) { inherit (pkgs) curl;}; + }) {inherit (pkgs) curl;}; "darcs-benchmark" = callPackage ({ mkDerivation, base, bytestring, cmdargs, containers, datetime @@ -40295,7 +40284,7 @@ self: { description = "a distributed, interactive, smart revision control system"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) curl;}; + }) {inherit (pkgs) curl;}; "darcs-buildpackage" = callPackage ({ mkDerivation, base, ConfigFile, directory, hslogger, MissingH @@ -40336,8 +40325,8 @@ self: { description = "David's Advanced Version Control System"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) curl; inherit (pkgs) ncurses; - inherit (pkgs) zlib;}; + }) {inherit (pkgs) curl; inherit (pkgs) ncurses; + inherit (pkgs) zlib;}; "darcs-fastconvert" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cmdlib, containers @@ -41780,20 +41769,20 @@ self: { "dataflow" = callPackage ({ mkDerivation, aeson, base, blaze-html, bytestring, containers - , filepath, hastache, hspec, HUnit, markdown, MissingH, mtl, parsec - , text, vector + , filepath, gitrev, hastache, hspec, HUnit, markdown, MissingH, mtl + , parsec, text, vector }: mkDerivation { pname = "dataflow"; - version = "0.7.1.0"; - sha256 = "cb7bc18db84941303981a4aafb4b07883ee869d62587f416cb0304d4a0d4bfb4"; + version = "0.7.3.0"; + sha256 = "312f2f0497cbd7e34d6eb3c4f1d113443e5375346b70628c0a22211e4baf883a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base blaze-html bytestring containers filepath hastache markdown MissingH mtl parsec text vector ]; - executableHaskellDepends = [ base bytestring text ]; + executableHaskellDepends = [ base bytestring gitrev text ]; testHaskellDepends = [ aeson base bytestring containers hspec HUnit parsec vector ]; @@ -42483,8 +42472,8 @@ self: { }: mkDerivation { pname = "debian"; - version = "3.88"; - sha256 = "9b347387432ca20fb4bba123cdb4de8e4ae05d49a4433d1609f37215620e6e56"; + version = "3.88.1"; + sha256 = "89451e4c95f798f887edace812ed6bd7418e771dd79097eafb6a1f2015a03ed9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42923,7 +42912,7 @@ self: { description = "Decimal floating point arithmetic"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { mpdec = null;}; + }) {mpdec = null;}; "deka-tests" = callPackage ({ mkDerivation, base, bytestring, containers, deka, parsec, pipes @@ -44166,7 +44155,7 @@ self: { librarySystemDepends = [ zlib ]; description = "Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) zlib;}; + }) {inherit (pkgs) zlib;}; "digest-pure" = callPackage ({ mkDerivation, array, base, bytestring, digest, QuickCheck }: @@ -44801,7 +44790,7 @@ self: { description = "Haskell bindings to the discount Markdown library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { markdown = null;}; + }) {markdown = null;}; "discrete-space-map" = callPackage ({ mkDerivation, adjunctions, base, comonad, distributive, keys @@ -45398,8 +45387,8 @@ self: { }: mkDerivation { pname = "diversity"; - version = "0.7.0.0"; - sha256 = "41181ef465f7f88904bffadb2057b7d055813b74fb360b6d07fad27b9bc6f513"; + version = "0.7.0.1"; + sha256 = "aa5e39896fe48ba067ad5c02213ada4dfbb5f089bb4d2338b58da4b95a56458b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45566,7 +45555,7 @@ self: { description = "DNS service discovery bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { dns_sd = null;}; + }) {dns_sd = null;}; "doc-review" = callPackage ({ mkDerivation, base, base64-bytestring, binary, bytestring @@ -46296,7 +46285,7 @@ self: { testPkgconfigDepends = [ libdpkg ]; description = "libdpkg bindings"; license = stdenv.lib.licenses.gpl3; - }) { inherit (pkgs) dpkg; libdpkg = null;}; + }) {inherit (pkgs) dpkg; libdpkg = null;}; "drClickOn" = callPackage ({ mkDerivation, base, containers }: @@ -46330,7 +46319,7 @@ self: { }) {}; "drawille" = callPackage - ({ mkDerivation, base, containers, hspec, QuickCheck }: + ({ mkDerivation, base, containers }: mkDerivation { pname = "drawille"; version = "0.1.0.5"; @@ -46338,7 +46327,6 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; - testHaskellDepends = [ base containers hspec QuickCheck ]; homepage = "https://github.com/yamadapc/haskell-drawille"; description = "A port of asciimoo's drawille to haskell"; license = stdenv.lib.licenses.gpl3; @@ -46771,7 +46759,7 @@ self: { description = "A monadic interface to libdvdread"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) { dvdread = null;}; + }) {dvdread = null;}; "dvi-processing" = callPackage ({ mkDerivation, base, bytestring, filepath, transformers }: @@ -46867,7 +46855,7 @@ self: { description = "A binding to the Microsoft DirectX 9 API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { d3d9 = null;}; + }) {d3d9 = null;}; "dx9d3dx" = callPackage ({ mkDerivation, base, d3dx9, dx9base, dx9d3d, Win32 }: @@ -46880,7 +46868,7 @@ self: { description = "A binding to the Microsoft DirectX 9 D3DX API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { d3dx9 = null;}; + }) {d3dx9 = null;}; "dynamic-cabal" = callPackage ({ mkDerivation, base, containers, data-default, directory, doctest @@ -47288,7 +47276,7 @@ self: { description = "Tools for automotive ECU development"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { canlib = null;}; + }) {canlib = null;}; "ed25519" = callPackage ({ mkDerivation, base, bytestring, hlint, QuickCheck }: @@ -47774,7 +47762,7 @@ self: { description = "EIBd Client"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) { eibclient = null;}; + }) {eibclient = null;}; "eigen" = callPackage ({ mkDerivation, base, binary, bytestring, mtl, primitive @@ -50118,7 +50106,7 @@ self: { description = "A Haskell binding to a subset of libexif"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) exif;}; + }) {inherit (pkgs) exif;}; "exinst" = callPackage ({ mkDerivation, base, constraints, singletons }: @@ -50992,7 +50980,7 @@ self: { librarySystemDepends = [ fcgi ]; description = "A Haskell library for writing FastCGI programs"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) fcgi;}; + }) {inherit (pkgs) fcgi;}; "fastedit" = callPackage ({ mkDerivation, base, base-prelude, bytestring, containers @@ -51511,7 +51499,7 @@ self: { description = "Compiler for the Feldspar language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { gcc_s = null;}; + }) {gcc_s = null;}; "feldspar-language" = callPackage ({ mkDerivation, array, base, bytestring, containers, data-default @@ -51557,8 +51545,8 @@ self: { description = "Signal Processing extension for Feldspar"; license = stdenv.lib.licenses.bsd3; broken = true; - }) { feldspar-compiler-shim = null; imperative-edsl = null; - monadic-edsl-priv = null;}; + }) {feldspar-compiler-shim = null; imperative-edsl = null; + monadic-edsl-priv = null;}; "fen2s" = callPackage ({ mkDerivation, api-opentheory-unicode, base, opentheory-unicode @@ -51612,7 +51600,7 @@ self: { description = "Graph-based notetaking system"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { raptor = null;}; + }) {raptor = null;}; "fez-conf" = callPackage ({ mkDerivation, base, containers, regex-compat }: @@ -51693,8 +51681,8 @@ self: { ]; description = "Minimal bindings to the FFmpeg library"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) ffmpeg; libavcodec = null; - libavformat = null; libswscale = null;}; + }) {inherit (pkgs) ffmpeg; libavcodec = null; libavformat = null; + libswscale = null;}; "ffmpeg-tutorials" = callPackage ({ mkDerivation, base, bytestring, haskell98, hs-ffmpeg, SDL, stm @@ -51731,7 +51719,7 @@ self: { jailbreak = true; description = "Bindings to the FFTW library"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) fftw; inherit (pkgs) fftwFloat;}; + }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;}; "fftwRaw" = callPackage ({ mkDerivation, base, fftw }: @@ -51744,7 +51732,7 @@ self: { homepage = "https://github.com/adamwalker/haskell-fftw-simple"; description = "Low level bindings to FFTW"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) fftw;}; + }) {inherit (pkgs) fftw;}; "fgl" = callPackage ({ mkDerivation, array, base, containers, deepseq, hspec @@ -52354,7 +52342,7 @@ self: { description = "A library for reading and writing data files in the FITS data format"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) cfitsio;}; + }) {inherit (pkgs) cfitsio;}; "fix-imports" = callPackage ({ mkDerivation, base, containers, cpphs, directory, filepath @@ -53142,7 +53130,7 @@ self: { homepage = "https://github.com/MostAwesomeDude/hsfluidsynth"; description = "Haskell bindings to FluidSynth"; license = stdenv.lib.licenses.mit; - }) { inherit (pkgs) fluidsynth;}; + }) {inherit (pkgs) fluidsynth;}; "fmark" = callPackage ({ mkDerivation, base, directory, filepath, mtl, process, Unixutils @@ -53260,19 +53248,20 @@ self: { }) {}; "foldl-transduce" = callPackage - ({ mkDerivation, base, bytestring, comonad, containers, doctest - , foldl, semigroupoids, tasty, tasty-hunit, text, transformers + ({ mkDerivation, base, bifunctors, bytestring, comonad, containers + , doctest, foldl, semigroupoids, tasty, tasty-hunit, text + , transformers }: mkDerivation { pname = "foldl-transduce"; - version = "0.1.0.1"; - sha256 = "0cd71afa3ed822a01a23c9ea3ba7a4477ff75c4c2fff26d810941b3c4666e267"; + version = "0.1.2.3"; + sha256 = "8c24ca4a7932b83fd630475ac59a48879adbe03dda6136cc493f9ad0742d5bd5"; libraryHaskellDepends = [ - base bytestring comonad containers foldl semigroupoids text - transformers + base bifunctors bytestring comonad containers foldl semigroupoids + text transformers ]; testHaskellDepends = [ base doctest foldl tasty tasty-hunit text ]; - description = "Transducers for folds from foldl"; + description = "Transducers for foldl folds"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -53347,7 +53336,7 @@ self: { description = "Simple Haskell bindings for Foma"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { foma = null;}; + }) {foma = null;}; "font-opengl-basic4x6" = callPackage ({ mkDerivation, base, GLFW-b, OpenGL }: @@ -53914,7 +53903,7 @@ self: { description = "A simple web framework"; license = stdenv.lib.licenses.bsd3; broken = true; - }) { ghc-binary = null;}; + }) {ghc-binary = null;}; "frame-markdown" = callPackage ({ mkDerivation, base, frame, pandoc }: @@ -54159,7 +54148,7 @@ self: { description = "Interface to the Kinect device"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { freenect = null; freenect_sync = null;}; + }) {freenect = null; freenect_sync = null;}; "freesect" = callPackage ({ mkDerivation, array, base, cpphs, directory, mtl, parallel @@ -54277,7 +54266,7 @@ self: { homepage = "https://github.com/RaphaelJ/friday-devil"; description = "Uses the DevIL C library to read and write images from and to files and memory buffers"; license = stdenv.lib.licenses.gpl3; - }) { inherit (pkgs) libdevil;}; + }) {inherit (pkgs) libdevil;}; "friendly-time" = callPackage ({ mkDerivation, base, hspec, old-locale, time }: @@ -54999,7 +54988,7 @@ self: { description = "FWGL GHCJS backend"; license = stdenv.lib.licenses.bsd3; broken = true; - }) { ghcjs-base = null;}; + }) {ghcjs-base = null;}; "g-npm" = callPackage ({ mkDerivation, base, HTTP, json }: @@ -55186,7 +55175,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GNOME configuration database system"; license = stdenv.lib.licenses.lgpl21; - }) { inherit (pkgs.gnome) GConf;}; + }) {inherit (pkgs.gnome) GConf;}; "gd" = callPackage ({ mkDerivation, base, bytestring, expat, fontconfig, freetype, gd @@ -55202,10 +55191,10 @@ self: { ]; description = "A Haskell binding to a subset of the GD graphics library"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) expat; inherit (pkgs) fontconfig; - inherit (pkgs) freetype; inherit (pkgs) gd; - inherit (pkgs) libjpeg; inherit (pkgs) libpng; - inherit (pkgs) zlib;}; + }) {inherit (pkgs) expat; inherit (pkgs) fontconfig; + inherit (pkgs) freetype; inherit (pkgs) gd; + inherit (pkgs) libjpeg; inherit (pkgs) libpng; + inherit (pkgs) zlib;}; "gdiff" = callPackage ({ mkDerivation, base }: @@ -55387,7 +55376,7 @@ self: { description = "Bindings to libgenders"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { genders = null;}; + }) {genders = null;}; "general-prelude" = callPackage ({ mkDerivation, base, lens, pointless-fun, strict, system-filepath @@ -56862,7 +56851,7 @@ self: { description = "Ginsu Gale Client"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) openssl;}; + }) {inherit (pkgs) openssl;}; "gio" = callPackage ({ mkDerivation, array, base, bytestring, containers, glib @@ -56995,11 +56984,10 @@ self: { homepage = "http://git-annex.branchable.com/"; description = "manage files with git, without checking their contents into git"; license = stdenv.lib.licenses.gpl3; - }) { inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; - inherit (pkgs) gnupg; inherit (pkgs) lsof; - inherit (pkgs) openssh; inherit (pkgs) perl; - inherit (pkgs) rsync; inherit (pkgs) wget; - inherit (pkgs) which;}; + }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; + inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; + inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; + inherit (pkgs) which;}; "git-checklist" = callPackage ({ mkDerivation, base, directory, filepath, optparse-applicative @@ -57308,7 +57296,7 @@ self: { homepage = "https://github.com/joeyh/github-backup"; description = "backs up everything github knows about a repository, to the repository"; license = stdenv.lib.licenses.gpl3; - }) { inherit (pkgs) git;}; + }) {inherit (pkgs) git;}; "github-post-receive" = callPackage ({ mkDerivation, aeson, base, bytestring, containers @@ -57672,7 +57660,7 @@ self: { librarySystemDepends = [ mesa ]; description = "Complete OpenGL raw bindings"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) mesa;}; + }) {inherit (pkgs) mesa;}; "gl-capture" = callPackage ({ mkDerivation, base, bytestring, OpenGL }: @@ -57699,7 +57687,7 @@ self: { description = "Binding to the glade library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs.gnome) libglade;}; + }) {inherit (pkgs.gnome) libglade;}; "gladexml-accessor" = callPackage ({ mkDerivation, base, glade, HaXml, template-haskell }: @@ -57787,7 +57775,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GLIB library for Gtk2Hs"; license = stdenv.lib.licenses.lgpl21; - }) { inherit (pkgs) glib;}; + }) {inherit (pkgs) glib;}; "glider-nlp" = callPackage ({ mkDerivation, base, Cabal, containers, HUnit, text }: @@ -58124,7 +58112,7 @@ self: { librarySystemDepends = [ glpk ]; description = "Comprehensive GLPK linear programming bindings"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) glpk;}; + }) {inherit (pkgs) glpk;}; "glue" = callPackage ({ mkDerivation, async, base, ekg-core, hashable, hspec @@ -58235,7 +58223,7 @@ self: { description = "Bindings for libgnome-keyring"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs.gnome) gnome_keyring;}; + }) {inherit (pkgs.gnome) gnome_keyring;}; "gnomevfs" = callPackage ({ mkDerivation, array, base, containers, glib, gnome_vfs @@ -58255,7 +58243,7 @@ self: { description = "Binding to the GNOME Virtual File System library"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs.gnome) gnome_vfs; gnome_vfs_module = null;}; + }) {inherit (pkgs.gnome) gnome_vfs; gnome_vfs_module = null;}; "gnuidn" = callPackage ({ mkDerivation, base, bytestring, c2hs, libidn, text }: @@ -58270,7 +58258,7 @@ self: { homepage = "https://john-millikin.com/software/haskell-gnuidn/"; description = "Bindings for GNU IDN"; license = stdenv.lib.licenses.gpl3; - }) { inherit (pkgs) libidn;}; + }) {inherit (pkgs) libidn;}; "gnuplot" = callPackage ({ mkDerivation, array, base, containers, data-accessor @@ -58305,7 +58293,7 @@ self: { homepage = "https://john-millikin.com/software/haskell-gnutls/"; description = "Bindings for GNU libgnutls"; license = stdenv.lib.licenses.gpl3; - }) { inherit (pkgs) gnutls;}; + }) {inherit (pkgs) gnutls;}; "goa" = callPackage ({ mkDerivation, base, directory, filepath, process }: @@ -58376,16 +58364,16 @@ self: { "google-cloud" = callPackage ({ mkDerivation, aeson, base, bytestring, http-client - , http-client-tls, http-types, mtl, scientific, stm, text, time - , unordered-containers + , http-client-tls, http-types, mtl, random, scientific, stm, text + , time, unordered-containers }: mkDerivation { pname = "google-cloud"; - version = "0.0.2"; - sha256 = "2c178a6f82932266e5aacced28ce146a69d4d202c855511ad993c3ce30974437"; + version = "0.0.3"; + sha256 = "16462026bc546cf51d453524ce0aae735bdc84f4d0d1f276ccc6606e41b8655f"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls http-types mtl - scientific stm text time unordered-containers + random scientific stm text time unordered-containers ]; description = "Client for the Google Cloud APIs"; license = stdenv.lib.licenses.mit; @@ -59668,7 +59656,7 @@ self: { homepage = "https://john-millikin.com/software/haskell-gsasl/"; description = "Bindings for GNU libgsasl"; license = stdenv.lib.licenses.gpl3; - }) { inherit (pkgs) gsasl;}; + }) {inherit (pkgs) gsasl;}; "gsc-weighting" = callPackage ({ mkDerivation, base, hierarchical-clustering }: @@ -59746,7 +59734,7 @@ self: { description = "Binding to the GStreamer open source multimedia framework"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) gst_plugins_base; inherit (pkgs) gstreamer;}; + }) {inherit (pkgs) gst_plugins_base; inherit (pkgs) gstreamer;}; "gt-tools" = callPackage ({ mkDerivation, base, containers, extensible-exceptions, haskeline @@ -59798,7 +59786,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Gtk+ graphical user interface library"; license = stdenv.lib.licenses.lgpl21; - }) { inherit (pkgs.gnome) gtk;}; + }) {inherit (pkgs.gnome) gtk;}; "gtk-helpers" = callPackage ({ mkDerivation, array, base, gio, glib, gtk, mtl, process @@ -59859,7 +59847,7 @@ self: { description = "Bindings for the Gtk/OS X integration library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) { gtk-mac-integration-gtk2 = null;}; + }) {gtk-mac-integration-gtk2 = null;}; "gtk-serialized-event" = callPackage ({ mkDerivation, array, base, containers, glib, gtk, haskell98, mtl @@ -59926,7 +59914,7 @@ self: { homepage = "http://github.com/travitch/gtk-traymanager"; description = "A wrapper around the eggtraymanager library for Linux system trays"; license = stdenv.lib.licenses.lgpl21; - }) { inherit (pkgs) x11;}; + }) {inherit (pkgs) x11;}; "gtk2hs-buildtools" = callPackage ({ mkDerivation, alex, array, base, containers, directory, filepath @@ -60100,7 +60088,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Gtk+ 3 graphical user interface library"; license = stdenv.lib.licenses.lgpl21; - }) { gtk3 = null;}; + }) {inherit (pkgs) gtk3;}; "gtk3-mac-integration" = callPackage ({ mkDerivation, array, base, containers, glib @@ -60117,7 +60105,7 @@ self: { description = "Bindings for the Gtk/OS X integration library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) { gtk-mac-integration-gtk3 = null;}; + }) {gtk-mac-integration-gtk3 = null;}; "gtkglext" = callPackage ({ mkDerivation, base, glib, gtk, gtk2hs-buildtools, gtkglext @@ -60135,7 +60123,7 @@ self: { description = "Binding to the GTK+ OpenGL Extension"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs.gnome) gtkglext;}; + }) {inherit (pkgs.gnome) gtkglext;}; "gtkimageview" = callPackage ({ mkDerivation, array, base, containers, glib, gtk @@ -60155,7 +60143,7 @@ self: { description = "Binding to the GtkImageView library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) gtkimageview;}; + }) {inherit (pkgs) gtkimageview;}; "gtkrsync" = callPackage ({ mkDerivation, base, gconf, glade, gtk, MissingH, process @@ -60192,7 +60180,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; - }) { inherit (pkgs.gnome) gtksourceview;}; + }) {inherit (pkgs.gnome) gtksourceview;}; "gtksourceview3" = callPackage ({ mkDerivation, array, base, containers, glib, gtk2hs-buildtools @@ -60210,7 +60198,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; - }) { inherit (pkgs.gnome) gtksourceview;}; + }) {inherit (pkgs.gnome) gtksourceview;}; "guarded-rewriting" = callPackage ({ mkDerivation, base, instant-generics }: @@ -60387,7 +60375,7 @@ self: { description = "An FFI binding to CMU/Long's BDD library"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { bdd = null; mem = null;}; + }) {bdd = null; mem = null;}; "hBDD-CUDD" = callPackage ({ mkDerivation, base, c2hs, containers, cudd, deepseq, epd, hBDD @@ -60403,8 +60391,8 @@ self: { description = "An FFI binding to the CUDD library"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { cudd = null; epd = null; inherit (pkgs) mtr; - inherit (pkgs) st; util = null;}; + }) {cudd = null; epd = null; inherit (pkgs) mtr; + inherit (pkgs) st; util = null;}; "hCsound" = callPackage ({ mkDerivation, base, c2hs, csound64, libsndfile, monads-tf @@ -60421,7 +60409,7 @@ self: { description = "interface to CSound API"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { csound64 = null; inherit (pkgs) libsndfile;}; + }) {csound64 = null; inherit (pkgs) libsndfile;}; "hDFA" = callPackage ({ mkDerivation, base, containers, directory, process }: @@ -60486,7 +60474,7 @@ self: { description = "A library for analyzing and transforming LLVM (3.5) assembly codes"; license = stdenv.lib.licenses.bsd3; broken = true; - }) { hooplext = null;}; + }) {hooplext = null;}; "hMollom" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, Crypto @@ -60717,7 +60705,7 @@ self: { description = "Optimal variable selection in chain graphical model"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) blas; lapack = null;}; + }) {inherit (pkgs) blas; lapack = null;}; "hXmixer" = callPackage ({ mkDerivation, base, directory, gtk3, process, split, text }: @@ -60893,7 +60881,7 @@ self: { description = "Hack EvHTTP (libevent) Handler"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { event = null;}; + }) {event = null;}; "hack-handler-fastcgi" = callPackage ({ mkDerivation, base, bytestring, fcgi, hack, hack-handler-cgi }: @@ -60908,7 +60896,7 @@ self: { description = "Hack handler direct to fastcgi (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) fcgi;}; + }) {inherit (pkgs) fcgi;}; "hack-handler-happstack" = callPackage ({ mkDerivation, base, bytestring, cgi, containers, data-default @@ -61705,7 +61693,7 @@ self: { homepage = "http://github.com/jystic/hadoop-formats"; description = "Read/write file formats commonly used by Hadoop"; license = stdenv.lib.licenses.asl20; - }) { inherit (pkgs) snappy;}; + }) {inherit (pkgs) snappy;}; "hadoop-rpc" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cereal, exceptions @@ -61892,7 +61880,7 @@ self: { description = "Multi-app web platform framework"; license = stdenv.lib.licenses.mit; broken = true; - }) { quickcheck-lio-instances = null;}; + }) {quickcheck-lio-instances = null;}; "hails-bin" = callPackage ({ mkDerivation, base, bson, bytestring, containers, ghc-paths @@ -62600,7 +62588,7 @@ self: { description = "Driver for real ethernet devices for HaNS"; license = stdenv.lib.licenses.bsd3; broken = true; - }) { pfq = null;}; + }) {pfq = null;}; "hapistrano" = callPackage ({ mkDerivation, base, base-compat, directory, either, filepath @@ -62647,7 +62635,7 @@ self: { description = "Binding to the appindicator library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) { appindicator = null;}; + }) {appindicator = null;}; "happindicator3" = callPackage ({ mkDerivation, appindicator, base, glib, gtk3, text }: @@ -62665,7 +62653,7 @@ self: { description = "Binding to the appindicator library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) { appindicator = null;}; + }) {appindicator = null;}; "happraise" = callPackage ({ mkDerivation, base, directory, filepath }: @@ -63207,7 +63195,7 @@ self: { homepage = "http://www.happstack.com/"; description = "extend happstack-server with https:// support (TLS/SSL)"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) openssl;}; + }) {inherit (pkgs) openssl;}; "happstack-server-tls-cryptonite" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class @@ -63434,7 +63422,7 @@ self: { description = "Networked content addressed backup and restore software"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) openssl; inherit (pkgs) sqlite;}; + }) {inherit (pkgs) openssl; inherit (pkgs) sqlite;}; "hark" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, haskell98 @@ -63494,7 +63482,7 @@ self: { libraryPkgconfigDepends = [ groonga ]; description = "Low level bindings for Groonga"; license = stdenv.lib.licenses.lgpl21; - }) { groonga = null;}; + }) {groonga = null;}; "haroonga-httpd" = callPackage ({ mkDerivation, base, directory, haroonga, http-types, old-locale @@ -63953,7 +63941,7 @@ self: { homepage = "http://github.com/cosbynator/haskakafka"; description = "Kafka bindings for Haskell"; license = stdenv.lib.licenses.mit; - }) { inherit (pkgs) rdkafka;}; + }) {inherit (pkgs) rdkafka;}; "haskanoid" = callPackage ({ mkDerivation, base, freenect, hcwiid, IfElse, MissingH, mtl, SDL @@ -64421,7 +64409,7 @@ self: { homepage = "http://github.com/bjpop/haskell-mpi"; description = "Distributed parallel programming in Haskell using MPI"; license = stdenv.lib.licenses.bsd3; - }) { open-pal = null; open-rte = null; inherit (pkgs) openmpi;}; + }) {open-pal = null; open-rte = null; inherit (pkgs) openmpi;}; "haskell-names" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers @@ -64597,7 +64585,7 @@ self: { homepage = "https://github.com/jamessanders/haskell-qrencode"; description = "Haskell bindings for libqrencode"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) qrencode;}; + }) {inherit (pkgs) qrencode;}; "haskell-reflect" = callPackage ({ mkDerivation, base, containers, hint, MonadCatchIO-mtl, mtl @@ -65106,7 +65094,7 @@ self: { description = "HaskellDB support for the HDBC PostgreSQL driver"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) postgresql;}; + }) {inherit (pkgs) postgresql;}; "haskelldb-hdbc-sqlite3" = callPackage ({ mkDerivation, base, haskelldb, haskelldb-hdbc, HDBC @@ -65199,7 +65187,7 @@ self: { description = "HaskellDB support for the HSQL Oracle driver"; license = stdenv.lib.licenses.bsd3; broken = true; - }) { hsql-oracle = null;}; + }) {hsql-oracle = null;}; "haskelldb-hsql-postgresql" = callPackage ({ mkDerivation, base, haskelldb, haskelldb-hsql, hsql @@ -65239,7 +65227,7 @@ self: { description = "HaskellDB support for the HSQL SQLite driver"; license = stdenv.lib.licenses.bsd3; broken = true; - }) { hsql-sqlite = null;}; + }) {hsql-sqlite = null;}; "haskelldb-hsql-sqlite3" = callPackage ({ mkDerivation, base, haskelldb, haskelldb-hsql, hsql @@ -65847,7 +65835,7 @@ self: { homepage = "https://github.com/otters/haspell"; description = "Haskell bindings to aspell"; license = stdenv.lib.licenses.mit; - }) { inherit (pkgs) aspell;}; + }) {inherit (pkgs) aspell;}; "hasql" = callPackage ({ mkDerivation, attoparsec, base, base-prelude, either @@ -66047,7 +66035,7 @@ self: { description = "A port of blaze-markup and blaze-html to Haste"; license = stdenv.lib.licenses.mit; broken = true; - }) { haste-lib = null;}; + }) {haste-lib = null;}; "haste-perch" = callPackage ({ mkDerivation, base, haste-compiler, transformers }: @@ -66341,7 +66329,7 @@ self: { description = "Haskell bindings for the C Wayland library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) mesa; inherit (pkgs) wayland;}; + }) {inherit (pkgs) mesa; inherit (pkgs) wayland;}; "hayoo-cli" = callPackage ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types @@ -66464,12 +66452,12 @@ self: { executableHaskellDepends = [ base containers mtl old-time OpenGL SDL SDL-mixer ]; - executableSystemDepends = [ SDL SDL_mixer ]; + executableSystemDepends = [ SDL_mixer ]; homepage = "http://www.dockerz.net/software/hbeat.html"; description = "A simple step sequencer GUI"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) SDL; inherit (pkgs) SDL_mixer;}; + }) {inherit (pkgs) SDL_mixer;}; "hblas" = callPackage ({ mkDerivation, base, blas, HUnit, lapack, primitive @@ -66487,7 +66475,7 @@ self: { description = "Human friendly BLAS and Lapack bindings for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) blas; lapack = null;}; + }) {inherit (pkgs) blas; lapack = null;}; "hblock" = callPackage ({ mkDerivation, aeson, base, blaze-markup, bytestring, cereal @@ -66722,7 +66710,7 @@ self: { description = "Library to interface with the wiimote"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; - }) { bluetooth = null; cwiid = null;}; + }) {bluetooth = null; cwiid = null;}; "hdaemonize" = callPackage ({ mkDerivation, base, extensible-exceptions, filepath, hsyslog @@ -67019,7 +67007,7 @@ self: { description = "Haskell bindings to the Discount markdown library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { markdown = null;}; + }) {markdown = null;}; "hdm" = callPackage ({ mkDerivation, base, directory, process, unix, vty }: @@ -67426,8 +67414,8 @@ self: { description = "New Relic® agent SDK wrapper for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { newrelic-collector-client = null; newrelic-common = null; - newrelic-transaction = null;}; + }) {newrelic-collector-client = null; newrelic-common = null; + newrelic-transaction = null;}; "helics-wai" = callPackage ({ mkDerivation, base, bytestring, data-default-class, helics @@ -67694,7 +67682,7 @@ self: { description = "Haskell bindings to Xen hypervisor interface"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { xenctrl = null;}; + }) {xenctrl = null;}; "henet" = callPackage ({ mkDerivation, base, bitset, bytestring, network, typesafe-endian @@ -67964,7 +67952,7 @@ self: { description = "Text Tetris"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) ncurses;}; + }) {inherit (pkgs) ncurses;}; "heukarya" = callPackage ({ mkDerivation, base, containers, deepseq, parallel, random, text @@ -68247,7 +68235,7 @@ self: { description = "Haskell binding to the FANN library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { doublefann = null; fann = null;}; + }) {doublefann = null; fann = null;}; "hfd" = callPackage ({ mkDerivation, base, bytestring, haskeline, iteratee, MissingH @@ -68567,7 +68555,7 @@ self: { description = "Various animations generated using HGL"; license = "GPL"; broken = true; - }) { HTam = null;}; + }) {HTam = null;}; "hgom" = callPackage ({ mkDerivation, base, containers, directory, filepath, mtl, parsec @@ -68613,7 +68601,7 @@ self: { description = "Binding to libharp"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { harp = null;}; + }) {harp = null;}; "hi" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, directory @@ -68693,7 +68681,7 @@ self: { libraryToolDepends = [ c2hs ]; description = "Interface to hidapi library"; license = stdenv.lib.licenses.bsd3; - }) { hidapi-libusb = null;}; + }) {hidapi-libusb = null;}; "hidapi" = callPackage ({ mkDerivation, base, bytestring, deepseq-generics, systemd }: @@ -68706,7 +68694,7 @@ self: { homepage = "https://github.com/vahokif/haskell-hidapi"; description = "Haskell bindings to HIDAPI"; license = stdenv.lib.licenses.mit; - }) { inherit (pkgs) systemd;}; + }) {inherit (pkgs) systemd;}; "hieraclus" = callPackage ({ mkDerivation, base, containers, HUnit, mtl, multiset }: @@ -68995,7 +68983,7 @@ self: { description = "Haskell Graphical User Interface for Emerge"; license = "GPL"; broken = true; - }) { mozembed = null;}; + }) {mozembed = null;}; "himg" = callPackage ({ mkDerivation, base, bytestring, directory, gtk, HTTP @@ -69765,7 +69753,7 @@ self: { description = "Haskell binding to L-BFGS-B version 3.0"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) gfortran;}; + }) {inherit (pkgs) gfortran;}; "hlcm" = callPackage ({ mkDerivation, array, base, bytestring, bytestring-csv @@ -69993,7 +69981,7 @@ self: { homepage = "https://victoredwardocallaghan.github.io/hlibBladeRF"; description = "Haskell binding to libBladeRF SDR library"; license = stdenv.lib.licenses.lgpl21; - }) { inherit (pkgs) libbladeRF;}; + }) {inherit (pkgs) libbladeRF;}; "hlibev" = callPackage ({ mkDerivation, base, ev, network }: @@ -70007,7 +69995,7 @@ self: { description = "FFI interface to libev"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { ev = null;}; + }) {ev = null;}; "hlibfam" = callPackage ({ mkDerivation, base, fam }: @@ -70020,7 +70008,7 @@ self: { description = "FFI interface to libFAM"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) fam;}; + }) {inherit (pkgs) fam;}; "hlibgit2" = callPackage ({ mkDerivation, base, bindings-DSL, openssl, process, zlib }: @@ -70033,7 +70021,7 @@ self: { testHaskellDepends = [ base process ]; description = "Low-level bindings to libgit2"; license = stdenv.lib.licenses.mit; - }) { inherit (pkgs) openssl;}; + }) {inherit (pkgs) openssl;}; "hlibsass" = callPackage ({ mkDerivation, base, hspec, libsass }: @@ -70048,7 +70036,7 @@ self: { homepage = "https://github.com/jakubfijalkowski/hlibsass"; description = "Low-level bindings to Libsass"; license = stdenv.lib.licenses.mit; - }) { inherit (pkgs) libsass;}; + }) {inherit (pkgs) libsass;}; "hlint" = callPackage ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs @@ -70198,7 +70186,7 @@ self: { homepage = "https://github.com/albertoruiz/hmatrix"; description = "Numeric Linear Algebra"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) blas; lapack = null;}; + }) {inherit (pkgs) blas; lapack = null;}; "hmatrix-banded" = callPackage ({ mkDerivation, base, hmatrix, lapack, transformers }: @@ -70213,7 +70201,7 @@ self: { description = "HMatrix interface to LAPACK functions for banded matrices"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { lapack = null;}; + }) {lapack = null;}; "hmatrix-csv" = callPackage ({ mkDerivation, base, bytestring, cassava, hmatrix, vector }: @@ -70238,7 +70226,7 @@ self: { homepage = "https://github.com/albertoruiz/hmatrix"; description = "Linear Programming based on GLPK"; license = "GPL"; - }) { inherit (pkgs) glpk;}; + }) {inherit (pkgs) glpk;}; "hmatrix-gsl" = callPackage ({ mkDerivation, array, base, gsl, hmatrix, process, random, vector @@ -70254,7 +70242,7 @@ self: { homepage = "https://github.com/albertoruiz/hmatrix"; description = "Numerical computation"; license = "GPL"; - }) { inherit (pkgs) gsl;}; + }) {inherit (pkgs) gsl;}; "hmatrix-gsl-stats" = callPackage ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex }: @@ -70268,7 +70256,7 @@ self: { description = "GSL Statistics interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) gsl;}; + }) {inherit (pkgs) gsl;}; "hmatrix-mmap" = callPackage ({ mkDerivation, base, hmatrix, mmap }: @@ -70307,7 +70295,7 @@ self: { description = "Bindings to the QuadProg++ quadratic programming library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { QuadProgpp = null;}; + }) {QuadProgpp = null;}; "hmatrix-repa" = callPackage ({ mkDerivation, base, hmatrix, repa, vector }: @@ -70560,7 +70548,7 @@ self: { description = "An ncurses mp3 player written in Haskell"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) ncurses;}; + }) {inherit (pkgs) ncurses;}; "hmpfr" = callPackage ({ mkDerivation, base, integer-gmp, mpfr }: @@ -70574,7 +70562,7 @@ self: { description = "Haskell binding to the MPFR library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) mpfr;}; + }) {inherit (pkgs) mpfr;}; "hmt" = callPackage ({ mkDerivation, array, base, bytestring, colour, containers @@ -70662,7 +70650,7 @@ self: { homepage = "https://github.com/ian-ross/hnetcdf"; description = "Haskell NetCDF library"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) netcdf;}; + }) {inherit (pkgs) netcdf;}; "hnix" = callPackage ({ mkDerivation, ansi-wl-pprint, base, containers, data-fix @@ -70922,13 +70910,12 @@ self: { libraryHaskellDepends = [ base cgen ]; librarySystemDepends = [ OgreMain ]; libraryPkgconfigDepends = [ OGRE ]; - libraryToolDepends = [ cgen cgen-hs grgen ]; + libraryToolDepends = [ cgen-hs grgen ]; homepage = "http://anttisalonen.github.com/hogre"; description = "Haskell binding to a subset of OGRE"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { OGRE = null; OgreMain = null; cgen-hs = null; - grgen = null;}; + }) {OGRE = null; OgreMain = null; cgen-hs = null; grgen = null;}; "hogre-examples" = callPackage ({ mkDerivation, base, hogre, OgreMain }: @@ -70944,7 +70931,7 @@ self: { description = "Examples for using Hogre"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { OgreMain = null;}; + }) {OgreMain = null;}; "hois" = callPackage ({ mkDerivation, base, OIS, X11 }: @@ -70961,7 +70948,7 @@ self: { description = "OIS bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { OIS = null;}; + }) {OIS = null;}; "hoist-error" = callPackage ({ mkDerivation, base, either, mtl }: @@ -71124,7 +71111,7 @@ self: { description = "OpenNI 2 binding"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { OpenNI2 = null; freenect = null;}; + }) {OpenNI2 = null; freenect = null;}; "honk" = callPackage ({ mkDerivation, base }: @@ -71283,7 +71270,7 @@ self: { description = "Core library for hoodle"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXi;}; + }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXi;}; "hoodle-extra" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base @@ -71523,7 +71510,7 @@ self: { description = "Haskell binding to libopencc"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { opencc = null;}; + }) {opencc = null;}; "hopencl" = callPackage ({ mkDerivation, base, bytestring, c2hs, HUnit, OpenCL, QuickCheck @@ -71544,7 +71531,7 @@ self: { description = "Haskell bindings for OpenCL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { OpenCL = null;}; + }) {OpenCL = null;}; "hopenpgp-tools" = callPackage ({ mkDerivation, aeson, alex, ansi-wl-pprint, array, attoparsec @@ -71586,7 +71573,7 @@ self: { homepage = "http://github.com/peti/hopenssl"; description = "FFI bindings to OpenSSL's EVP digest interface"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) openssl;}; + }) {inherit (pkgs) openssl;}; "hopfield" = callPackage ({ mkDerivation, array, base, deepseq, directory, erf @@ -71619,7 +71606,7 @@ self: { description = "Hopfield Networks, Boltzmann Machines and Clusters"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { MagickCore = null; inherit (pkgs) imagemagick;}; + }) {MagickCore = null; inherit (pkgs) imagemagick;}; "hopfield-networks" = callPackage ({ mkDerivation, base, matrix, MonadRandom, QuickCheck, split @@ -71750,7 +71737,7 @@ self: { description = "Haskell Open Sound Control Utilities"; license = "GPL"; broken = true; - }) { www-minus = null;}; + }) {www-minus = null;}; "hostname" = callPackage ({ mkDerivation, base }: @@ -71895,7 +71882,7 @@ self: { description = "Real-time heap graphing utility and profile stream server with a reusable graphing module"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) freeglut; inherit (pkgs) mesa;}; + }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;}; "hp2any-manager" = callPackage ({ mkDerivation, array, base, bytestring, cairo, containers @@ -72049,7 +72036,7 @@ self: { description = "Binding for the PAPI library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { papi = null;}; + }) {papi = null;}; "hpaste" = callPackage ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup @@ -72254,7 +72241,7 @@ self: { homepage = "https://github.com/scrive/hpqtypes"; description = "Haskell bindings to libpqtypes"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) postgresql;}; + }) {inherit (pkgs) postgresql;}; "hprotoc" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers @@ -72529,7 +72516,7 @@ self: { jailbreak = true; description = "Embed a Ruby intepreter in your Haskell program !"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) ruby;}; + }) {inherit (pkgs) ruby;}; "hs-GeoIP" = callPackage ({ mkDerivation, base, bytestring, deepseq, GeoIP }: @@ -72543,7 +72530,7 @@ self: { description = "Haskell bindings to the MaxMind GeoIPCity database via the C library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { GeoIP = null;}; + }) {GeoIP = null;}; "hs-bibutils" = callPackage ({ mkDerivation, base, syb }: @@ -72576,7 +72563,7 @@ self: { homepage = "https://github.com/tsuraan/hs-blake2"; description = "A cryptohash-inspired library for blake2"; license = stdenv.lib.licenses.bsd3; - }) { b2 = null;}; + }) {b2 = null;}; "hs-captcha" = callPackage ({ mkDerivation, base, bytestring, gd, random }: @@ -72648,7 +72635,7 @@ self: { description = "Pragmatic .NET interop for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { ole32 = null; oleaut32 = null;}; + }) {ole32 = null; oleaut32 = null;}; "hs-duktape" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring, hspec @@ -72713,7 +72700,7 @@ self: { description = "Binding to GUI library FLTK"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { fltk = null; fltk_images = null;}; + }) {fltk = null; fltk_images = null;}; "hs-gchart" = callPackage ({ mkDerivation, base, mtl }: @@ -72860,7 +72847,7 @@ self: { ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) mesos; inherit (pkgs) protobuf;}; + }) {inherit (pkgs) mesos; inherit (pkgs) protobuf;}; "hs-nombre-generator" = callPackage ({ mkDerivation, base, HandsomeSoup, hxt, random }: @@ -73128,7 +73115,7 @@ self: { description = "FFI bindings to the Xen Control library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { xenctrl = null;}; + }) {xenctrl = null;}; "hsass" = callPackage ({ mkDerivation, base, bytestring, data-default-class, filepath @@ -73640,8 +73627,7 @@ self: { description = "Haskell bindings to IIDC1394 cameras, via Camwire"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { camwire_1394 = null; dc1394_control = null; - raw1394 = null;}; + }) {camwire_1394 = null; dc1394_control = null; raw1394 = null;}; "hscassandra" = callPackage ({ mkDerivation, base, bytestring, cassandra-thrift, containers @@ -73809,8 +73795,8 @@ self: { }: mkDerivation { pname = "hsdev"; - version = "0.1.4.2"; - sha256 = "da33782330de5980bf2bbad7b3c5e18751c5b8ee7358652c55a88a09aea857d0"; + version = "0.1.4.3"; + sha256 = "66c1bf834bfff8030533f056bb57d4fc4a61d1698ea10c217c9841d2b13aa9ad"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73872,7 +73858,7 @@ self: { homepage = "http://github.com/peti/hsdns"; description = "Asynchronous DNS Resolver"; license = stdenv.lib.licenses.gpl3; - }) { inherit (pkgs) adns;}; + }) {inherit (pkgs) adns;}; "hsdns-cache" = callPackage ({ mkDerivation, base, hsdns, network, SafeSemaphore, text, time @@ -74068,7 +74054,7 @@ self: { description = "Library wrapping the GnuTLS API"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { gcrypt = null; inherit (pkgs) gnutls;}; + }) {gcrypt = null; inherit (pkgs) gnutls;}; "hsgnutls-yj" = callPackage ({ mkDerivation, base, bytestring, gcrypt, gnutls, mtl, old-time }: @@ -74082,7 +74068,7 @@ self: { description = "Library wrapping the GnuTLS API"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { gcrypt = null; inherit (pkgs) gnutls;}; + }) {gcrypt = null; inherit (pkgs) gnutls;}; "hsgsom" = callPackage ({ mkDerivation, base, containers, random, stm, time }: @@ -74145,7 +74131,7 @@ self: { description = "Signal processing and EEG data analysis"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) blas; inherit (pkgs) gsl; lapack = null;}; + }) {inherit (pkgs) blas; inherit (pkgs) gsl; lapack = null;}; "hsilop" = callPackage ({ mkDerivation, base, haskeline }: @@ -74242,7 +74228,7 @@ self: { description = "A FFI binding to libsvm"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { svm = null;}; + }) {svm = null;}; "hslinks" = callPackage ({ mkDerivation, base, Cabal, hint, MemoTrie, process, regex-compat @@ -74348,7 +74334,7 @@ self: { ]; description = "A Lua language interpreter embedding in Haskell"; license = stdenv.lib.licenses.mit; - }) { inherit (pkgs) lua;}; + }) {inherit (pkgs) lua;}; "hsmagick" = callPackage ({ mkDerivation, base, bytestring, bzip2, directory, filepath @@ -74372,11 +74358,11 @@ self: { description = "FFI bindings for the GraphicsMagick library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { GraphicsMagick = null; inherit (pkgs) bzip2; - freetype2 = null; inherit (pkgs) jasper; inherit (pkgs) lcms; - inherit (pkgs) libjpeg; inherit (pkgs) libpng; - inherit (pkgs) libxml2; tiff = null; wmflite = null; - inherit (pkgs) zlib;}; + }) {GraphicsMagick = null; inherit (pkgs) bzip2; freetype2 = null; + inherit (pkgs) jasper; inherit (pkgs) lcms; + inherit (pkgs) libjpeg; inherit (pkgs) libpng; + inherit (pkgs) libxml2; tiff = null; wmflite = null; + inherit (pkgs) zlib;}; "hsmisc" = callPackage ({ mkDerivation, base, containers, HUnit, mtl, old-locale, parsec @@ -74420,7 +74406,7 @@ self: { homepage = "http://haskell.org/haskellwiki/Hsndfile"; description = "Haskell bindings for libsndfile"; license = stdenv.lib.licenses.lgpl21; - }) { inherit (pkgs) libsndfile;}; + }) {inherit (pkgs) libsndfile;}; "hsndfile-storablevector" = callPackage ({ mkDerivation, base, hsndfile, storablevector }: @@ -74961,6 +74947,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hspec-structured-formatter" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "hspec-structured-formatter"; + version = "0.1.0.1"; + sha256 = "f670ea9a7b936ba3f22b19e00f2d19b58b58936e916b21e137a6ff3d4b868195"; + libraryHaskellDepends = [ base hspec ]; + license = stdenv.lib.licenses.mit; + }) {}; + "hspec-test-framework" = callPackage ({ mkDerivation, base, hspec, hspec-contrib, hspec-core, HUnit , QuickCheck @@ -75171,7 +75167,7 @@ self: { description = "MySQL driver for HSQL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { mysqlclient = null;}; + }) {mysqlclient = null;}; "hsql-odbc" = callPackage ({ mkDerivation, base, hsql, old-time, unixODBC }: @@ -75183,7 +75179,7 @@ self: { librarySystemDepends = [ unixODBC ]; description = "A Haskell Interface to ODBC"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) unixODBC;}; + }) {inherit (pkgs) unixODBC;}; "hsql-postgresql" = callPackage ({ mkDerivation, base, hsql, old-time, postgresql }: @@ -75195,7 +75191,7 @@ self: { librarySystemDepends = [ postgresql ]; description = "A Haskell Interface to PostgreSQL via the PQ library"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) postgresql;}; + }) {inherit (pkgs) postgresql;}; "hsql-sqlite3" = callPackage ({ mkDerivation, base, hsql, sqlite }: @@ -75207,7 +75203,7 @@ self: { librarySystemDepends = [ sqlite ]; description = "SQLite3 driver for HSQL"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) sqlite;}; + }) {inherit (pkgs) sqlite;}; "hsqml" = callPackage ({ mkDerivation, base, c2hs, containers, directory, filepath, qt5 @@ -75229,7 +75225,7 @@ self: { homepage = "http://www.gekkou.co.uk/software/hsqml/"; description = "Haskell binding for Qt Quick"; license = stdenv.lib.licenses.bsd3; - }) { qt5 = null;}; + }) {qt5 = null;}; "hsqml-datamodel" = callPackage ({ mkDerivation, base, hsqml, qt5, template-haskell, text }: @@ -75243,7 +75239,7 @@ self: { description = "HsQML (Qt5) data model"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { qt5 = null;}; + }) {qt5 = null;}; "hsqml-datamodel-vinyl" = callPackage ({ mkDerivation, base, exceptions, hsqml-datamodel, type-list @@ -75636,8 +75632,8 @@ self: { description = "embedding prolog in haskell"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) ncurses; inherit (pkgs) readline; - swipl = null;}; + }) {inherit (pkgs) ncurses; inherit (pkgs) readline; + swipl = null;}; "hsx" = callPackage ({ mkDerivation, base, haskell-src-exts, mtl, utf8-string }: @@ -75741,7 +75737,7 @@ self: { description = "Simple libzephyr bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { com_err = null; zephyr = null;}; + }) {com_err = null; zephyr = null;}; "htags" = callPackage ({ mkDerivation, base, directory, filepath, haskell-src, mtl }: @@ -76923,7 +76919,7 @@ self: { description = "Support library for Hubris, the Ruby <=> Haskell bridge"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) ruby;}; + }) {inherit (pkgs) ruby;}; "huffman" = callPackage ({ mkDerivation, base, containers, fingertree }: @@ -77185,7 +77181,7 @@ self: { description = "A Command line Interface for the Hunt server"; license = stdenv.lib.licenses.mit; broken = true; - }) { hunt-client = null;}; + }) {hunt-client = null;}; "hurdle" = callPackage ({ mkDerivation, array, base, bytestring, containers, kangaroo }: @@ -77855,7 +77851,7 @@ self: { description = "Haskell binding to the Sixense SDK for the Razer Hydra"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { sixense_x64 = null;}; + }) {sixense_x64 = null;}; "hydra-print" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory @@ -78300,7 +78296,7 @@ self: { homepage = "http://github.com/dgvncsz0f/hzk"; description = "Haskell client library for Apache Zookeeper"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) zookeeper_mt;}; + }) {inherit (pkgs) zookeeper_mt;}; "hzulip" = callPackage ({ mkDerivation, aeson, async, base, bytestring, conduit @@ -78825,7 +78821,7 @@ self: { description = "Bindings for the Gtk/OS X integration library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) { ige-mac-integration = null;}; + }) {ige-mac-integration = null;}; "ignore" = callPackage ({ mkDerivation, base, directory, Glob, HTF, mtl, path, pcre-heavy @@ -78864,7 +78860,7 @@ self: { description = "Bindings to the igraph C library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { igraph = null;}; + }) {igraph = null;}; "igrf" = callPackage ({ mkDerivation, ad, base, polynomial }: @@ -79217,15 +79213,17 @@ self: { text transformers vector ]; libraryPkgconfigDepends = [ imagemagick ]; + executablePkgconfigDepends = [ imagemagick ]; testHaskellDepends = [ base bytestring directory HUnit lifted-base QuickCheck resourcet system-filepath test-framework test-framework-hunit test-framework-quickcheck2 text transformers vector ]; + testPkgconfigDepends = [ imagemagick ]; jailbreak = true; description = "bindings to imagemagick library"; license = "unknown"; - }) { inherit (pkgs) imagemagick;}; + }) {inherit (pkgs) imagemagick;}; "imagepaste" = callPackage ({ mkDerivation, base, containers, HTTP, json, mtl, network @@ -80010,7 +80008,7 @@ self: { ]; description = "Write Haskell source files including C code inline. No FFI required."; license = stdenv.lib.licenses.mit; - }) { inherit (pkgs) gsl; gslcblas = null;}; + }) {inherit (pkgs) gsl; gslcblas = null;}; "inline-c-cpp" = callPackage ({ mkDerivation, base, inline-c, template-haskell }: @@ -80053,7 +80051,7 @@ self: { description = "Console client for encyclopedias"; license = stdenv.lib.licenses.gpl3; broken = true; - }) { aether = null;}; + }) {aether = null;}; "inserts" = callPackage ({ mkDerivation, attoparsec, base, bytestring, dlist }: @@ -80268,7 +80266,7 @@ self: { description = "Hardware accelerated AES encryption and Random Number Generation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { intel_aes = null;}; + }) {intel_aes = null;}; "interchangeable" = callPackage ({ mkDerivation, base, containers }: @@ -80850,7 +80848,7 @@ self: { description = "haskell binding to ipopt and nlopt including automatic differentiation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) ipopt; nlopt = null;}; + }) {inherit (pkgs) ipopt; nlopt = null;}; "ipprint" = callPackage ({ mkDerivation, base, Extra, haskell-src }: @@ -81416,7 +81414,7 @@ self: { description = "Iteratee-based IO with pipe operators"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) zlib;}; + }) {inherit (pkgs) zlib;}; "iterable" = callPackage ({ mkDerivation, base, mtl, tagged, template-haskell, vector }: @@ -81469,7 +81467,7 @@ self: { description = "Enumeratees for compressing and decompressing streams"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) bzip2; inherit (pkgs) zlib;}; + }) {inherit (pkgs) bzip2; inherit (pkgs) zlib;}; "iteratee-mtl" = callPackage ({ mkDerivation, base, bytestring, containers, ListLike @@ -81870,7 +81868,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/JACK"; description = "Bindings for the JACK Audio Connection Kit"; license = "GPL"; - }) { inherit (pkgs) libjack2;}; + }) {inherit (pkgs) libjack2;}; "jack-bindings" = callPackage ({ mkDerivation, base, c2hs, libjack2, mtl }: @@ -81884,7 +81882,7 @@ self: { description = "DEPRECATED Bindings to the JACK Audio Connection Kit"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) libjack2;}; + }) {inherit (pkgs) libjack2;}; "jackminimix" = callPackage ({ mkDerivation, base, hosc }: @@ -81982,7 +81980,7 @@ self: { description = "Higher level functions for linear algebra. Wraps BLAS and LAPACKE."; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) blas; cblas = null; lapacke = null;}; + }) {inherit (pkgs) blas; cblas = null; lapacke = null;}; "jammittools" = callPackage ({ mkDerivation, base, boxes, bytestring, conduit, conduit-audio @@ -82742,7 +82740,7 @@ self: { homepage = "http://stewart.guru"; description = "Call python inline from haskell"; license = stdenv.lib.licenses.mit; - }) { inherit (pkgs) python;}; + }) {inherit (pkgs) python;}; "json-qq" = callPackage ({ mkDerivation, base, haskell-src-meta, parsec, template-haskell @@ -83140,7 +83138,7 @@ self: { description = "Fast, scalable, mutable dynamic arrays, maps and hashes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { Judy = null;}; + }) {Judy = null;}; "jukebox" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers @@ -84248,7 +84246,7 @@ self: { description = "Utilities for working with many HStringTemplate templates from files"; license = stdenv.lib.licenses.bsd3; broken = true; - }) { string-templates = null;}; + }) {string-templates = null;}; "koofr-client" = callPackage ({ mkDerivation, aeson, base, bytestring, filepath, http-client @@ -84360,7 +84358,7 @@ self: { homepage = "https://github.com/corngood/ktx"; description = "A binding for libktx from Khronos"; license = stdenv.lib.licenses.mit; - }) { egl = null; inherit (pkgs) glew;}; + }) {egl = null; inherit (pkgs) glew;}; "kure" = callPackage ({ mkDerivation, base, dlist, transformers }: @@ -84398,7 +84396,7 @@ self: { librarySystemDepends = [ kyotocabinet ]; description = "Mid level bindings to Kyoto Cabinet"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) kyotocabinet;}; + }) {inherit (pkgs) kyotocabinet;}; "l-bfgs-b" = callPackage ({ mkDerivation, base, lbfgsb, vector }: @@ -84412,7 +84410,7 @@ self: { description = "Bindings to L-BFGS-B, Fortran code for limited-memory quasi-Newton bound-constrained optimization"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { lbfgsb = null;}; + }) {lbfgsb = null;}; "labeled-graph" = callPackage ({ mkDerivation, base, labeled-tree }: @@ -86487,8 +86485,8 @@ self: { }: mkDerivation { pname = "leksah-server"; - version = "0.15.0.8"; - sha256 = "4367cdcbec1066dc0ef3c171f4345a495e67b68016cc90d2bceee652162b743f"; + version = "0.15.0.9"; + sha256 = "78f2ee49b1a06fa12de242a35a9eeaaf3e8b90d7af8bffef3e1b20561826abe5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -86792,8 +86790,8 @@ self: { }: mkDerivation { pname = "lentil"; - version = "0.1.3.1"; - sha256 = "e2896c1256fda0fc85401c632ae4ca9e822f4846dc38bebd6aaee898e4e4f2a7"; + version = "0.1.4.1"; + sha256 = "b192640f9f02da76f36b03efa7e19fe6ed025b0b987e9ede0b1c3b44f9140bbd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -86847,7 +86845,7 @@ self: { homepage = "http://github.com/kim/leveldb-haskell"; description = "Haskell bindings to LevelDB"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) leveldb;}; + }) {inherit (pkgs) leveldb;}; "leveldb-haskell-fork" = callPackage ({ mkDerivation, async, base, bytestring, data-default, filepath @@ -86875,7 +86873,7 @@ self: { description = "Haskell bindings to LevelDB"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) leveldb;}; + }) {inherit (pkgs) leveldb;}; "levmar" = callPackage ({ mkDerivation, base, bindings-levmar, hmatrix, vector }: @@ -87127,7 +87125,7 @@ self: { librarySystemDepends = [ archive ]; description = "Read many archive formats with libarchive and conduit"; license = stdenv.lib.licenses.bsd3; - }) { archive = null;}; + }) {archive = null;}; "libconfig" = callPackage ({ mkDerivation, base, binary, c2hs, cereal, cereal-text, config @@ -87148,7 +87146,7 @@ self: { homepage = "https://github.com/peddie/libconfig-haskell"; description = "Haskell bindings to libconfig"; license = stdenv.lib.licenses.bsd3; - }) { config = null;}; + }) {config = null;}; "libcspm" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq @@ -87184,7 +87182,7 @@ self: { description = "Library for interacting with console applications via pseudoterminals"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) expect; inherit (pkgs) tcl;}; + }) {inherit (pkgs) expect; inherit (pkgs) tcl;}; "libffi" = callPackage ({ mkDerivation, base, bytestring, ffi, libffi }: @@ -87197,7 +87195,7 @@ self: { libraryPkgconfigDepends = [ libffi ]; description = "A binding to libffi"; license = stdenv.lib.licenses.bsd3; - }) { ffi = null; inherit (pkgs) libffi;}; + }) {ffi = null; inherit (pkgs) libffi;}; "libgit" = callPackage ({ mkDerivation, base, mtl, process }: @@ -87370,7 +87368,7 @@ self: { librarySystemDepends = [ libnotify ]; description = "Bindings to libnotify library"; license = stdenv.lib.licenses.mit; - }) { inherit (pkgs) libnotify;}; + }) {inherit (pkgs) libnotify;}; "libnvvm" = callPackage ({ mkDerivation, base, bytestring, c2hs, Cabal, cuda, HUnit, nvvm @@ -87389,7 +87387,7 @@ self: { homepage = "https://github.com/nvidia-compiler-sdk/hsnvvm"; description = "FFI binding to libNVVM, a compiler SDK component from NVIDIA"; license = stdenv.lib.licenses.mit; - }) { nvvm = null;}; + }) {nvvm = null;}; "liboleg" = callPackage ({ mkDerivation, base, CC-delcont, containers, mtl @@ -87421,7 +87419,7 @@ self: { description = "Wrapper for libpafe"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; - }) { pafe = null;}; + }) {pafe = null;}; "libpq" = callPackage ({ mkDerivation, base, bytestring, postgresql, unix }: @@ -87435,7 +87433,7 @@ self: { description = "libpq binding for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) postgresql;}; + }) {inherit (pkgs) postgresql;}; "librandomorg" = callPackage ({ mkDerivation, base, bytestring, curl }: @@ -87503,7 +87501,7 @@ self: { homepage = "https://github.com/portnov/libssh2-hs"; description = "FFI bindings to libssh2 SSH2 client library (http://libssh2.org/)"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) libssh2; ssh2 = null;}; + }) {inherit (pkgs) libssh2; ssh2 = null;}; "libssh2-conduit" = callPackage ({ mkDerivation, base, conduit, libssh2, monad-control, stm @@ -87540,8 +87538,9 @@ self: { }) {}; "libsystemd-daemon" = callPackage - ({ mkDerivation, base, bytestring, HUnit, network, systemd-daemon - , test-framework, test-framework-hunit, utf8-string + ({ mkDerivation, base, bytestring, HUnit, libsystemd-daemon + , network, systemd-daemon, test-framework, test-framework-hunit + , utf8-string }: mkDerivation { pname = "libsystemd-daemon"; @@ -87549,13 +87548,14 @@ self: { sha256 = "c03dbef58f9d32fecce539cc3f118f43e9a92418736cb8b96960f87c14f3bfe6"; libraryHaskellDepends = [ base bytestring network utf8-string ]; librarySystemDepends = [ systemd-daemon ]; + libraryPkgconfigDepends = [ libsystemd-daemon ]; testHaskellDepends = [ base HUnit network test-framework test-framework-hunit ]; description = "Haskell bindings for libsystemd-daemon"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) { systemd-daemon = null;}; + }) {libsystemd-daemon = null; systemd-daemon = null;}; "libsystemd-journal" = callPackage ({ mkDerivation, base, bytestring, hashable, hsyslog, pipes @@ -87575,7 +87575,7 @@ self: { homepage = "http://github.com/ocharles/libsystemd-journal"; description = "Haskell bindings to libsystemd-journal"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) systemd;}; + }) {inherit (pkgs) systemd;}; "libtagc" = callPackage ({ mkDerivation, base, bytestring, glib, taglib }: @@ -87590,7 +87590,7 @@ self: { homepage = "https://patch-tag.com/r/AndyStewart/libtagc/home"; description = "Binding to TagLib C library"; license = stdenv.lib.licenses.lgpl21; - }) { inherit (pkgs) taglib;}; + }) {inherit (pkgs) taglib;}; "libvirt-hs" = callPackage ({ mkDerivation, base, c2hs, syb, virt }: @@ -87605,7 +87605,7 @@ self: { description = "FFI bindings to libvirt virtualization API (http://libvirt.org)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { virt = null;}; + }) {virt = null;}; "libvorbis" = callPackage ({ mkDerivation, base, bytestring, cpu }: @@ -87630,7 +87630,7 @@ self: { description = "Binding to libxml2"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) libxml2;}; + }) {inherit (pkgs) libxml2;}; "libxml-enumerator" = callPackage ({ mkDerivation, base, bytestring, enumerator, libxml-sax, text @@ -87661,7 +87661,7 @@ self: { homepage = "https://john-millikin.com/software/haskell-libxml/"; description = "Bindings for the libXML2 SAX interface"; license = stdenv.lib.licenses.mit; - }) { inherit (pkgs) libxml2;}; + }) {inherit (pkgs) libxml2;}; "libxslt" = callPackage ({ mkDerivation, base, bytestring, libxml, xslt }: @@ -87675,7 +87675,7 @@ self: { description = "Binding to libxslt"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { xslt = null;}; + }) {xslt = null;}; "life" = callPackage ({ mkDerivation, array, base, GLUT, OpenGL, random }: @@ -87997,6 +87997,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "linear-circuit" = callPackage + ({ mkDerivation, base, comfort-graph, containers, hmatrix + , non-empty, QuickCheck, transformers, utility-ht + }: + mkDerivation { + pname = "linear-circuit"; + version = "0.0"; + sha256 = "8daca90d45a7a0a99910e863f2bedaf46b4b7caaa32cc0ef58e4c4376d72b93e"; + libraryHaskellDepends = [ + base comfort-graph containers hmatrix utility-ht + ]; + testHaskellDepends = [ + base comfort-graph containers non-empty QuickCheck transformers + utility-ht + ]; + homepage = "http://hub.darcs.net/thielema/linear-circuit"; + description = "Compute resistance of linear electrical circuits"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "linear-grammar" = callPackage ({ mkDerivation, base, containers, hspec, QuickCheck }: mkDerivation { @@ -88070,8 +88090,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim, mtl, transformers }: mkDerivation { pname = "linearscan"; - version = "0.8.0"; - sha256 = "108c26b493f21a47e171435053feef2d0fb178bb6be82baa6be5ea122b137829"; + version = "0.9.0"; + sha256 = "1ca49da5de79fd4aa6849a2b27dae5d01b3a896968e5fce29ad0c6a670065fa2"; libraryHaskellDepends = [ base containers ghc-prim mtl transformers ]; @@ -88088,8 +88108,8 @@ self: { }: mkDerivation { pname = "linearscan-hoopl"; - version = "0.8.1"; - sha256 = "cdd53114005aecb15ade491e8f662f651d91a166ab6929f73a081d9613991765"; + version = "0.9.2"; + sha256 = "fc52aedb4f8b3def5b993846543801de43cb5ea1f4091a2244626fe820382d6b"; libraryHaskellDepends = [ base containers free hoopl linearscan QuickCheck transformers ]; @@ -88215,7 +88235,7 @@ self: { description = "Linux libblkid"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) { blkid = null;}; + }) {blkid = null;}; "linux-cgroup" = callPackage ({ mkDerivation, base, filepath }: @@ -88278,7 +88298,7 @@ self: { description = "Linux kernel modules support"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { libkmod = null;}; + }) {libkmod = null;}; "linux-mount" = callPackage ({ mkDerivation, base, bytestring }: @@ -88864,7 +88884,7 @@ self: { jailbreak = true; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) picosat;}; + }) {inherit (pkgs) picosat;}; "llrbtree" = callPackage ({ mkDerivation, base }: @@ -89040,7 +89060,7 @@ self: { description = "FFI bindings to the LLVM compiler toolkit"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (self.llvmPackages) llvm;}; + }) {inherit (self.llvmPackages) llvm;}; "llvm-general" = callPackage ({ mkDerivation, array, base, bytestring, containers, HUnit @@ -89066,7 +89086,7 @@ self: { ]; description = "General purpose LLVM bindings"; license = stdenv.lib.licenses.bsd3; - }) { llvm-config = null;}; + }) {llvm-config = null;}; "llvm-general-pure" = callPackage ({ mkDerivation, base, containers, HUnit, mtl, parsec, QuickCheck @@ -89243,7 +89263,7 @@ self: { homepage = "http://github.com/dmbarbour/haskell-lmdb"; description = "Lightning MDB bindings"; license = stdenv.lib.licenses.bsd2; - }) { inherit (pkgs) lmdb;}; + }) {inherit (pkgs) lmdb;}; "load-env" = callPackage ({ mkDerivation, base, directory, hspec, HUnit, parsec }: @@ -89865,7 +89885,7 @@ self: { description = "interface to Loris API"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; - }) { loris = null;}; + }) {loris = null;}; "loshadka" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, cryptohash @@ -89992,7 +90012,7 @@ self: { description = "Lexical Style Sheets - a language for writing styles that is focused around lexical (ie, static) scoping and re-use of large components"; license = stdenv.lib.licenses.bsd3; broken = true; - }) { language-css-attoparsec = null;}; + }) {language-css-attoparsec = null;}; "lsystem" = callPackage ({ mkDerivation, base, haskell98, uu-parsinglib, wx, wxcore }: @@ -90247,7 +90267,7 @@ self: { description = "Simple ObjectiveC runtime binding"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { objc = null;}; + }) {objc = null;}; "lushtags" = callPackage ({ mkDerivation, base, haskell-src-exts, text, vector }: @@ -90404,7 +90424,7 @@ self: { homepage = "https://github.com/hvr/lzma"; description = "LZMA/XZ compression and decompression"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) lzma;}; + }) {inherit (pkgs) lzma;}; "lzma-clib" = callPackage ({ mkDerivation, only-buildable-on-windows }: @@ -90417,7 +90437,7 @@ self: { description = "liblzma C library and headers for use by LZMA bindings"; license = stdenv.lib.licenses.publicDomain; broken = true; - }) { only-buildable-on-windows = null;}; + }) {only-buildable-on-windows = null;}; "lzma-conduit" = callPackage ({ mkDerivation, base, bindings-DSL, bytestring, conduit, HUnit @@ -90439,7 +90459,7 @@ self: { homepage = "http://github.com/alphaHeavy/lzma-conduit"; description = "Conduit interface for lzma/xz compression"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) lzma;}; + }) {inherit (pkgs) lzma;}; "lzma-enumerator" = callPackage ({ mkDerivation, base, bindings-DSL, bytestring, enumerator, HUnit @@ -90462,7 +90482,7 @@ self: { homepage = "http://github.com/alphaHeavy/lzma-enumerator"; description = "Enumerator interface for lzma/xz compression"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) lzma;}; + }) {inherit (pkgs) lzma;}; "lzma-streams" = callPackage ({ mkDerivation, base, bytestring, HUnit, io-streams, lzma @@ -90699,7 +90719,7 @@ self: { description = "Rogue-like"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) ncurses;}; + }) {inherit (pkgs) ncurses;}; "magic" = callPackage ({ mkDerivation, base, file }: @@ -90711,7 +90731,7 @@ self: { librarySystemDepends = [ file ]; description = "Interface to C file/magic library"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) file;}; + }) {inherit (pkgs) file;}; "magico" = callPackage ({ mkDerivation, base, hmatrix, transformers, utility-ht }: @@ -91817,7 +91837,7 @@ self: { description = "Text matchers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) pcre;}; + }) {inherit (pkgs) pcre;}; "math-functions" = callPackage ({ mkDerivation, base, deepseq, erf, HUnit, ieee754, QuickCheck @@ -91914,7 +91934,7 @@ self: { description = "Matlab bindings and interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { eng = null; mat = null; mx = null;}; + }) {eng = null; mat = null; mx = null;}; "matrices" = callPackage ({ mkDerivation, base, primitive, tasty, tasty-hunit @@ -92238,7 +92258,7 @@ self: { description = "A Haskell binding to MeCab"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { mecab = null;}; + }) {mecab = null;}; "mecha" = callPackage ({ mkDerivation, base }: @@ -92469,8 +92489,8 @@ self: { pname = "memcached-binary"; version = "0.2.0"; sha256 = "4d895459998bfd2fb80337cfc2363a905dfd7dc62adfad0696841c570c58fb8c"; - revision = "2"; - editedCabalFile = "663a104dc09413397f9640534b6d1a743835a395598f641d02ef0dbd44093530"; + revision = "3"; + editedCabalFile = "3314b765ef10f959862577e55809bc181d16dfd3ff9443b62499b5b393eea6b3"; libraryHaskellDepends = [ base bytestring data-default-class network resource-pool storable-endian time unordered-containers @@ -92478,7 +92498,6 @@ self: { testHaskellDepends = [ base bytestring data-default-class hspec HUnit network process ]; - jailbreak = true; homepage = "https://github.com/philopon/memcached-binary"; description = "memcached client using binary protocol"; license = stdenv.lib.licenses.mit; @@ -94032,20 +94051,20 @@ self: { "moesocks" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring - , containers, cryptohash, hslogger, HsOpenSSL, lens, mtl, network - , optparse-applicative, random, safe, stm, strict, text, time + , containers, cryptohash, hslogger, HsOpenSSL, iproute, lens, mtl + , network, optparse-applicative, random, stm, strict, text, time , transformers, unix, unordered-containers }: mkDerivation { pname = "moesocks"; - version = "0.1.0.25"; - sha256 = "c80dc33b2f5be9f4826ce51aa047b078c22d47a0900aa2fe294232c588f251a8"; + version = "0.1.0.26"; + sha256 = "6b2af22a46ffea53436cfca302ad526827c4bfd7963d259304714acd1ee2bf91"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson async attoparsec base binary bytestring containers cryptohash - hslogger HsOpenSSL lens mtl network optparse-applicative random - safe stm strict text time transformers unix unordered-containers + hslogger HsOpenSSL iproute lens mtl network optparse-applicative + random stm strict text time transformers unix unordered-containers ]; homepage = "https://github.com/nfjinjing/moesocks"; description = "A functional firewall killer"; @@ -94924,8 +94943,8 @@ self: { description = "Constraint Programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { gecodeint = null; gecodekernel = null; gecodesearch = null; - gecodeset = null; gecodesupport = null;}; + }) {gecodeint = null; gecodekernel = null; gecodesearch = null; + gecodeset = null; gecodesupport = null;}; "monadio-unwrappable" = callPackage ({ mkDerivation, base, monads-tf, transformers }: @@ -95323,7 +95342,7 @@ self: { description = "Riak Resolution Proxy"; license = stdenv.lib.licenses.bsd3; broken = true; - }) { riak-bump = null; stats-web = null;}; + }) {riak-bump = null; stats-web = null;}; "montage-client" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, ListLike, mtl @@ -95347,7 +95366,7 @@ self: { description = "Riak Resolution Proxy Client"; license = stdenv.lib.licenses.bsd3; broken = true; - }) { riak-bump = null; stats-web = null;}; + }) {riak-bump = null; stats-web = null;}; "monte-carlo" = callPackage ({ mkDerivation, base, gsl-random, ieee754, primitive, QuickCheck @@ -95450,7 +95469,7 @@ self: { description = "Bindings to the morphological analyser Morfeusz"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { morfeusz = null;}; + }) {morfeusz = null;}; "morte" = callPackage ({ mkDerivation, alex, array, base, binary, containers, deepseq @@ -96012,7 +96031,7 @@ self: { description = "Bindings to libmtp"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { mtp = null;}; + }) {mtp = null;}; "mtree" = callPackage ({ mkDerivation, base, bifunctors }: @@ -97074,7 +97093,7 @@ self: { homepage = "https://github.com/bos/mysql"; description = "A low-level MySQL client library"; license = stdenv.lib.licenses.bsd3; - }) { mysql = null;}; + }) {inherit (pkgs) mysql;}; "mysql-effect" = callPackage ({ mkDerivation, base, bytestring, extensible-effects, mysql @@ -97342,7 +97361,7 @@ self: { description = "Bindings to OpenSSL HMAC"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) openssl;}; + }) {inherit (pkgs) openssl;}; "nano-md5" = callPackage ({ mkDerivation, base, bytestring, openssl }: @@ -97356,7 +97375,7 @@ self: { description = "Efficient, ByteString bindings to OpenSSL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) openssl;}; + }) {inherit (pkgs) openssl;}; "nanoAgda" = callPackage ({ mkDerivation, base, BNFC-meta, cmdargs, containers, mtl, parsec @@ -97389,7 +97408,7 @@ self: { description = "Simple Curses binding"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) ncurses;}; + }) {inherit (pkgs) ncurses;}; "nanomsg" = callPackage ({ mkDerivation, base, bytestring, nanomsg }: @@ -97402,7 +97421,7 @@ self: { jailbreak = true; description = "nanomsg - scalability protocols library"; license = stdenv.lib.licenses.publicDomain; - }) { inherit (pkgs) nanomsg;}; + }) {inherit (pkgs) nanomsg;}; "nanomsg-haskell" = callPackage ({ mkDerivation, base, binary, bytestring, nanomsg, QuickCheck @@ -97422,7 +97441,7 @@ self: { description = "Bindings to the nanomsg library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) nanomsg;}; + }) {inherit (pkgs) nanomsg;}; "nanoparsec" = callPackage ({ mkDerivation, base, bytestring, ListLike }: @@ -97676,7 +97695,7 @@ self: { homepage = "https://john-millikin.com/software/haskell-ncurses/"; description = "Modernised bindings to GNU ncurses"; license = stdenv.lib.licenses.gpl3; - }) { inherit (pkgs) ncurses;}; + }) {inherit (pkgs) ncurses;}; "ndjson-conduit" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit }: @@ -97992,7 +98011,7 @@ self: { description = "Concurrent over the network execution library"; license = stdenv.lib.licenses.bsd3; broken = true; - }) { ghc-binary = null;}; + }) {ghc-binary = null;}; "netclock" = callPackage ({ mkDerivation, base, bytestring, hosc, network }: @@ -98168,9 +98187,9 @@ self: { "nettle" = callPackage ({ mkDerivation, array, base, byteable, bytestring - , crypto-cipher-tests, crypto-cipher-types, HUnit, QuickCheck - , securemem, tagged, test-framework, test-framework-hunit - , test-framework-quickcheck2 + , crypto-cipher-tests, crypto-cipher-types, HUnit, nettle + , QuickCheck, securemem, tagged, test-framework + , test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "nettle"; @@ -98179,6 +98198,7 @@ self: { libraryHaskellDepends = [ base byteable bytestring crypto-cipher-types securemem tagged ]; + libraryPkgconfigDepends = [ nettle ]; testHaskellDepends = [ array base bytestring crypto-cipher-tests crypto-cipher-types HUnit QuickCheck tagged test-framework test-framework-hunit @@ -98188,7 +98208,7 @@ self: { description = "safe nettle binding"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {inherit (pkgs) nettle;}; "nettle-frp" = callPackage ({ mkDerivation, base, bimap, binary, bytestring, containers, mtl @@ -99554,8 +99574,8 @@ self: { description = "Network Manager, binding to libnm-glib"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { g = null; inherit (pkgs) glib; libnm-glib = null; - nm-glib = null;}; + }) {g = null; inherit (pkgs) glib; libnm-glib = null; + nm-glib = null;}; "nme" = callPackage ({ mkDerivation, base, bytestring, utf8-string }: @@ -99839,7 +99859,7 @@ self: { description = "Binding for notmuch MUA library"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) notmuch;}; + }) {inherit (pkgs) notmuch;}; "notmuch-web" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-conduit, base @@ -100581,9 +100601,8 @@ self: { description = "Oculus Rift ffi providing head tracking data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs.xlibs) libX11; - inherit (pkgs.xlibs) libXinerama; inherit (pkgs) mesa; - ovr = null; inherit (pkgs) systemd;}; + }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXinerama; + inherit (pkgs) mesa; ovr = null; inherit (pkgs) systemd;}; "oeis" = callPackage ({ mkDerivation, base, HTTP, HUnit, network, network-uri @@ -100680,7 +100699,7 @@ self: { description = "wrapper for OIS input manager for use with hogre"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { OIS = null;}; + }) {OIS = null;}; "old-locale" = callPackage ({ mkDerivation, base }: @@ -101080,7 +101099,7 @@ self: { description = "Raw Haskell bindings to OpenCV >= 2.0"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) opencv;}; + }) {inherit (pkgs) opencv;}; "opendatatable" = callPackage ({ mkDerivation, base, hxt, template-haskell, th-lift }: @@ -101148,7 +101167,7 @@ self: { description = "OpenGL ES 2.0 and 3.0 with EGL 1.4"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) { EGL = null; GLESv2 = null;}; + }) {EGL = null; GLESv2 = null;}; "openid" = callPackage ({ mkDerivation, base, bytestring, containers, HsOpenSSL, HTTP @@ -102481,7 +102500,7 @@ self: { libraryToolDepends = [ c2hs ]; description = "Haskell binding for C PAM API"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) pam;}; + }) {inherit (pkgs) pam;}; "panda" = callPackage ({ mkDerivation, base, cgi, containers, data-default, directory @@ -102695,7 +102714,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Pango text rendering engine"; license = stdenv.lib.licenses.lgpl21; - }) { inherit (pkgs.gnome) pango;}; + }) {inherit (pkgs.gnome) pango;}; "papillon" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, monads-tf @@ -103821,7 +103840,7 @@ self: { homepage = "https://github.com/Daniel-Diaz/pcre-light"; description = "A small, efficient and portable regex library for Perl 5 compatible regular expressions"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) pcre;}; + }) {inherit (pkgs) pcre;}; "pcre-light-extra" = callPackage ({ mkDerivation, base, bytestring, pcre-light }: @@ -104355,8 +104374,8 @@ self: { }: mkDerivation { pname = "persistable-record"; - version = "0.1.0.0"; - sha256 = "46f434e4193dd88d224c03e39281b8bb747289a432ade70925f70fe07bcc03fc"; + version = "0.1.0.1"; + sha256 = "ba04f5af4a988e6f4758f32ff8ff767b71680bea5bede391200aba431d0c530d"; libraryHaskellDepends = [ array base containers dlist names-th template-haskell transformers ]; @@ -105011,7 +105030,7 @@ self: { description = "Haskell bindings to pHash, the open source perceptual hash library"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) { pHash = null;}; + }) {pHash = null;}; "phone-push" = callPackage ({ mkDerivation, base, base16-bytestring, binary, bytestring @@ -106683,7 +106702,7 @@ self: { librarySystemDepends = [ poker-eval ]; description = "Binding to libpoker-eval"; license = stdenv.lib.licenses.publicDomain; - }) { inherit (pkgs) poker-eval;}; + }) {inherit (pkgs) poker-eval;}; "pokitdok" = callPackage ({ mkDerivation, aeson, base, base64-string, bytestring @@ -107092,8 +107111,8 @@ self: { description = "Binding to the Poppler"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) gdk_pixbuf; inherit (pkgs.gnome) pango; - inherit (pkgs) poppler;}; + }) {inherit (pkgs) gdk_pixbuf; inherit (pkgs.gnome) pango; + inherit (pkgs) poppler;}; "populate-setup-exe-cache" = callPackage ({ mkDerivation, base }: @@ -107129,7 +107148,7 @@ self: { homepage = "http://code.haskell.org/portaudio"; description = "Haskell bindings for the PortAudio library"; license = "unknown"; - }) { inherit (pkgs) portaudio;}; + }) {inherit (pkgs) portaudio;}; "porte" = callPackage ({ mkDerivation, base, bytestring, containers @@ -107215,7 +107234,7 @@ self: { description = "Support for Posix ACL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) acl;}; + }) {inherit (pkgs) acl;}; "posix-escape" = callPackage ({ mkDerivation, base }: @@ -107266,7 +107285,7 @@ self: { homepage = "https://bitbucket.org/merijnv/posix-pty"; description = "Pseudo terminal interaction with subprocesses"; license = stdenv.lib.licenses.bsd3; - }) { util = null;}; + }) {util = null;}; "posix-realtime" = callPackage ({ mkDerivation, base, unix }: @@ -107412,7 +107431,7 @@ self: { homepage = "http://github.com/lpsmith/postgresql-libpq"; description = "low-level binding to libpq"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) postgresql;}; + }) {inherit (pkgs) postgresql;}; "postgresql-orm" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, directory @@ -107733,7 +107752,7 @@ self: { description = "Postmaster ESMTP Server"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) adns; inherit (pkgs) openssl;}; + }) {inherit (pkgs) adns; inherit (pkgs) openssl;}; "potato-tool" = callPackage ({ mkDerivation, base, binary, bytestring, split }: @@ -109004,7 +109023,7 @@ self: { description = "Haskell bindings for the Proj4 C dynamic library"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) proj;}; + }) {inherit (pkgs) proj;}; "project-template" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, conduit @@ -109297,7 +109316,7 @@ self: { libraryToolDepends = [ c2hs ]; description = "A wrapper for the proteaaudio library"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) alsaLib;}; + }) {inherit (pkgs) alsaLib;}; "protobuf" = callPackage ({ mkDerivation, base, bytestring, cereal, containers @@ -109335,7 +109354,6 @@ self: { libraryHaskellDepends = [ base bytestring cplusplus-th template-haskell text ]; - librarySystemDepends = [ protobuf ]; executableHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring cereal cplusplus-th criterion hprotoc-fork protobuf @@ -109346,7 +109364,7 @@ self: { description = "Protocol Buffers via C++"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) protobuf;}; + }) {}; "protocol-buffers" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers @@ -109568,8 +109586,8 @@ self: { ({ mkDerivation, base, filepath, hspec, template-haskell }: mkDerivation { pname = "publicsuffix"; - version = "0.20150814"; - sha256 = "809fa6a08ed47540b7536811af17075b180b2d2a65508f9090c28614677c0edb"; + version = "0.20150827"; + sha256 = "709cf2da54e5a3351d91e866a76d97e32a0a6c3d3178b1ecdd7dfa3e63b9dc4c"; libraryHaskellDepends = [ base filepath template-haskell ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; @@ -109800,7 +109818,7 @@ self: { librarySystemDepends = [ libpulseaudio ]; description = "binding to Simple API of pulseaudio"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) libpulseaudio;}; + }) {inherit (pkgs) libpulseaudio;}; "punkt" = callPackage ({ mkDerivation, array, base, mtl, regex-tdfa, regex-tdfa-text @@ -110218,7 +110236,7 @@ self: { description = "A photo viewer daemon application with remote controlling abilities"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) libdevil;}; + }) {inherit (pkgs) libdevil;}; "pwstore-cli" = callPackage ({ mkDerivation, base, bytestring, cmdargs, HUnit, process @@ -110304,7 +110322,7 @@ self: { homepage = "http://github.com/Russell91/json-python"; description = "Call python inline from haskell"; license = stdenv.lib.licenses.mit; - }) { inherit (pkgs) python;}; + }) {inherit (pkgs) python;}; "pyfi" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, pureMD5 @@ -110322,7 +110340,7 @@ self: { homepage = "http://github.com/Russell91/pyfi"; description = "Call python inline from haskell"; license = stdenv.lib.licenses.mit; - }) { inherit (pkgs) python;}; + }) {inherit (pkgs) python;}; "python-pickle" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cereal, cmdargs @@ -110370,7 +110388,7 @@ self: { description = "double-double and quad-double number type via libqd"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { qd = null;}; + }) {qd = null;}; "qd-vec" = callPackage ({ mkDerivation, base, qd, Vec }: @@ -110396,7 +110414,7 @@ self: { description = "Simple bindings to Qhull, a library for computing convex hulls"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) qhull;}; + }) {inherit (pkgs) qhull;}; "qrcode" = callPackage ({ mkDerivation, array, base, containers, mtl, vector }: @@ -111134,7 +111152,7 @@ self: { description = "librados haskell bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { rados = null;}; + }) {rados = null;}; "rail-compiler-editor" = callPackage ({ mkDerivation, base, cairo, containers, gtk, HUnit, llvm-general @@ -111489,7 +111507,7 @@ self: { homepage = "http://galois.com"; description = "A fast, SMP parallel random data generator"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) openssl;}; + }) {inherit (pkgs) openssl;}; "randproc" = callPackage ({ mkDerivation, base }: @@ -112200,7 +112218,7 @@ self: { librarySystemDepends = [ ncurses readline ]; description = "An interface to the GNU readline library"; license = "GPL"; - }) { inherit (pkgs) ncurses; inherit (pkgs) readline;}; + }) {inherit (pkgs) ncurses; inherit (pkgs) readline;}; "readline-statevar" = callPackage ({ mkDerivation, base, readline, StateVar }: @@ -112746,7 +112764,7 @@ self: { description = "Generalization of lenses, folds and traversals to handle monads and addition"; license = stdenv.lib.licenses.bsd3; broken = true; - }) { instance-control = null;}; + }) {instance-control = null;}; "refh" = callPackage ({ mkDerivation, base, clippard, cmdargs, directory, filepath @@ -112890,7 +112908,7 @@ self: { description = "A playground for experimenting with infrastructure and common code for reflex applications"; license = stdenv.lib.licenses.bsd3; broken = true; - }) { ghcjs-base = null;}; + }) {ghcjs-base = null;}; "reflex-gloss" = callPackage ({ mkDerivation, base, dependent-sum, gloss, reflex, transformers @@ -113140,7 +113158,7 @@ self: { homepage = "http://hackage.haskell.org/package/regex-pcre"; description = "Replaces/Enhances Text.Regex"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) pcre;}; + }) {inherit (pkgs) pcre;}; "regex-pcre-builtin" = callPackage ({ mkDerivation, array, base, bytestring, containers, regex-base }: @@ -113325,7 +113343,7 @@ self: { description = "Replaces/Enhances Text.Regex"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) tre;}; + }) {inherit (pkgs) tre;}; "regex-xmlschema" = callPackage ({ mkDerivation, base, haskell98, parsec }: @@ -113753,15 +113771,15 @@ self: { }: mkDerivation { pname = "relational-query-HDBC"; - version = "0.1.0.0"; - sha256 = "729b3474dc3b0815315f09866d8309ff03ee3b7a86c02954ad0c33c44d92b4e4"; + version = "0.1.0.1"; + sha256 = "23c9296e772ab840936e6bf9916e3949726ab168de4d0a81b31505fcc08f726c"; libraryHaskellDepends = [ base containers convertible HDBC HDBC-session names-th persistable-record relational-query relational-schemas template-haskell ]; homepage = "http://khibino.github.io/haskell-relational-record/"; - description = "HDBC instance of relational join and typed query for HDBC"; + description = "HDBC instance of relational-query and typed query interface for HDBC"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -114054,7 +114072,7 @@ self: { homepage = "https://github.com/RaphaelJ/repa-devil"; description = "Support for image reading and writing of Repa arrays using in-place FFI calls"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) libdevil;}; + }) {inherit (pkgs) libdevil;}; "repa-eval" = callPackage ({ mkDerivation, base, ghc-prim }: @@ -114483,8 +114501,8 @@ self: { ({ mkDerivation, base, hmatrix, transformers, utility-ht }: mkDerivation { pname = "resistor-cube"; - version = "0.0.0.2"; - sha256 = "0592c448a0dcfc583ca8c6217cc4a89c5bf6875c0ec176db4490cdca8c480220"; + version = "0.0.0.3"; + sha256 = "09f41cea22f4b0bbf2f32c80d8eab274a520d9fe611d1b83df4d14d46afb34ad"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -115331,7 +115349,7 @@ self: { description = "Riot is an Information Organisation Tool"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) ncurses;}; + }) {inherit (pkgs) ncurses;}; "ripple" = callPackage ({ mkDerivation, aeson, attoparsec, base, base58address, binary @@ -115587,7 +115605,7 @@ self: { homepage = "http://github.com/agrafix/rocksdb-haskell"; description = "Haskell bindings to RocksDB"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) rocksdb;}; + }) {inherit (pkgs) rocksdb;}; "roguestar" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, old-time @@ -116247,7 +116265,7 @@ self: { homepage = "https://github.com/adamwalker/hrtlsdr"; description = "Bindings to librtlsdr"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) rtl-sdr;}; + }) {inherit (pkgs) rtl-sdr;}; "rtorrent-rpc" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-textual @@ -116296,6 +116314,7 @@ self: { sha256 = "d5b94ba1bc5422ab35556b56a2546047b08e895f592661a5363df37d94004496"; libraryHaskellDepends = [ base vector ]; librarySystemDepends = [ rubberband ]; + libraryPkgconfigDepends = [ rubberband ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base ]; jailbreak = true; @@ -116303,7 +116322,7 @@ self: { description = "Binding to the C++ audio stretching library Rubber Band"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) rubberband;}; + }) {inherit (pkgs) rubberband;}; "ruby-marshal" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, hspec, mtl @@ -116772,7 +116791,7 @@ self: { ]; description = "Cryptography that's easy to digest (NaCl/libsodium bindings)"; license = stdenv.lib.licenses.mit; - }) { inherit (pkgs) libsodium;}; + }) {inherit (pkgs) libsodium;}; "saltine-quickcheck" = callPackage ({ mkDerivation, base, bytestring, bytestring-arbitrary, hex @@ -116793,7 +116812,7 @@ self: { homepage = "https://github.com/tsuraan/saltine-quickcheck"; description = "Quickcheck implementations for some NaCl data"; license = stdenv.lib.licenses.mit; - }) { inherit (pkgs) libsodium;}; + }) {inherit (pkgs) libsodium;}; "salvia" = callPackage ({ mkDerivation, base, bytestring, containers, directory, fclabels @@ -116963,7 +116982,7 @@ self: { homepage = "http://www.ingolia-lab.org/samtools-tutorial.html"; description = "Binding to the C samtools library"; license = stdenv.lib.licenses.mit; - }) { inherit (pkgs) zlib;}; + }) {inherit (pkgs) zlib;}; "samtools-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, filepath, resourcet @@ -118208,7 +118227,7 @@ self: { libraryPkgconfigDepends = [ SDL2 ]; description = "Low-level bindings to SDL2"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) SDL2;}; + }) {inherit (pkgs) SDL2;}; "sdl2-image" = callPackage ({ mkDerivation, base, SDL2, sdl2, SDL2_image }: @@ -118221,7 +118240,7 @@ self: { libraryPkgconfigDepends = [ SDL2 SDL2_image ]; description = "Haskell binding to sdl2-image"; license = stdenv.lib.licenses.mit; - }) { inherit (pkgs) SDL2; inherit (pkgs) SDL2_image;}; + }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_image;}; "sdl2-ttf" = callPackage ({ mkDerivation, base, SDL2, sdl2, SDL2_ttf }: @@ -118234,7 +118253,7 @@ self: { testHaskellDepends = [ base sdl2 ]; description = "Binding to libSDL2-ttf"; license = stdenv.lib.licenses.mit; - }) { inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;}; + }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;}; "sdnv" = callPackage ({ mkDerivation, base, binary, bytestring }: @@ -118403,7 +118422,7 @@ self: { description = "Second Transfer HTTP/2 web server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) openssl;}; + }) {inherit (pkgs) openssl;}; "secret-santa" = callPackage ({ mkDerivation, base, containers, diagrams-cairo, diagrams-lib @@ -118507,7 +118526,7 @@ self: { description = "Sedna C API XML Binding"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) { sedna = null;}; + }) {sedna = null;}; "select" = callPackage ({ mkDerivation, base }: @@ -118597,7 +118616,7 @@ self: { description = "SELinux bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { selinux = null;}; + }) {selinux = null;}; "semaphore-plus" = callPackage ({ mkDerivation, base }: @@ -119887,7 +119906,7 @@ self: { homepage = "http://patch-tag.com/r/shahn/sfml-audio"; description = "minimal bindings to the audio module of sfml"; license = "unknown"; - }) { inherit (pkgs) libsndfile; inherit (pkgs) openal;}; + }) {inherit (pkgs) libsndfile; inherit (pkgs) openal;}; "sfmt" = callPackage ({ mkDerivation, base, bytestring, entropy, primitive }: @@ -120796,7 +120815,7 @@ self: { description = "Library of modules shared by sifflet and its tests and its exporters"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { gdk_x11 = null; gtk_x11 = null;}; + }) {gdk_x11 = null; gtk_x11 = null;}; "sign" = callPackage ({ mkDerivation, base, containers, deepseq, hashable, HUnit @@ -120970,7 +120989,7 @@ self: { description = "Simple Bluetooth API for Windows and Linux (bluez)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { bluetooth = null;}; + }) {bluetooth = null;}; "simple-c-value" = callPackage ({ mkDerivation, base, checkers, DebugTraceHelpers, derive, dlist @@ -121596,7 +121615,7 @@ self: { description = "Simple wrapper around libssh2"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { ssh2 = null;}; + }) {ssh2 = null;}; "simplex" = callPackage ({ mkDerivation, base, directory, filepath, mtl, process, random @@ -121689,7 +121708,7 @@ self: { description = "A programming language for simple GUIs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs.xlibs) libXft;}; + }) {inherit (pkgs.xlibs) libXft;}; "singleton-nats" = callPackage ({ mkDerivation, base, singletons }: @@ -121972,7 +121991,7 @@ self: { description = "Export Skype chat logs to text files"; license = stdenv.lib.licenses.bsd3; broken = true; - }) { ghc-binary = null;}; + }) {ghc-binary = null;}; "slack" = callPackage ({ mkDerivation, aeson, base, containers, either, http-conduit, mtl @@ -123650,7 +123669,7 @@ self: { homepage = "http://github.com/bos/snappy"; description = "Bindings to the Google Snappy library for fast compression/decompression"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) snappy;}; + }) {inherit (pkgs) snappy;}; "snappy-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, snappy }: @@ -123787,8 +123806,8 @@ self: { }: mkDerivation { pname = "snmp"; - version = "0.2.0.0"; - sha256 = "c7b8da17a08c7960c3494da4757fe059e87a4f215927e6f6977a47a2b4bc4b6e"; + version = "0.2.1.1"; + sha256 = "0737d6fc4299a00d248d263ebdde7b3451f32da3f9a6f5afac0a125eb57384a4"; libraryHaskellDepends = [ asn1-encoding asn1-parse asn1-types async base binary bytestring cipher-aes cipher-des containers crypto-cipher-types cryptohash mtl @@ -124003,7 +124022,7 @@ self: { description = "STCP socket extensions library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { sctp = null;}; + }) {sctp = null;}; "socketio" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base @@ -124316,7 +124335,7 @@ self: { description = "Write, read, convert audio signals using libsox"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) sox;}; + }) {inherit (pkgs) sox;}; "soyuz" = callPackage ({ mkDerivation, base, bytestring, cereal, cmdargs, containers @@ -124763,7 +124782,7 @@ self: { description = "Experimental web browser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs.gnome) libsoup;}; + }) {inherit (pkgs.gnome) libsoup;}; "spine" = callPackage ({ mkDerivation, base }: @@ -125236,7 +125255,7 @@ self: { librarySystemDepends = [ sqlite ]; description = "Haskell binding to sqlite3"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) sqlite;}; + }) {inherit (pkgs) sqlite;}; "sqlite-simple" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder @@ -126148,7 +126167,7 @@ self: { description = "The ST monad and STRefs"; license = stdenv.lib.licenses.bsd3; broken = true; - }) { applicative = null;}; + }) {applicative = null;}; "statgrab" = callPackage ({ mkDerivation, async, base, bytestring, statgrab, time @@ -126166,7 +126185,7 @@ self: { description = "Collect system level metrics and statistics"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) { statgrab = null;}; + }) {statgrab = null;}; "static-canvas" = callPackage ({ mkDerivation, base, double-conversion, free, mtl, text }: @@ -127078,14 +127097,31 @@ self: { ({ mkDerivation, base, mmorph, mtl, transformers }: mkDerivation { pname = "streaming"; - version = "0.1.0.7"; - sha256 = "67f6aed768c1a6537fcf7587d1f5ab0fcec4ab9e4489ce6802aae483f67c9362"; + version = "0.1.0.9"; + sha256 = "322fc0911ebb1643d4081fc8b34cf8252def719b5b749017fd8476e2eb16c467"; libraryHaskellDepends = [ base mmorph mtl transformers ]; homepage = "https://github.com/michaelt/streaming"; description = "A free monad transformer optimized for streaming applications"; license = stdenv.lib.licenses.bsd3; }) {}; + "streaming-bytestring" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, deepseq, foldl + , http-client, http-client-tls, mmorph, mtl, streaming, syb + , transformers + }: + mkDerivation { + pname = "streaming-bytestring"; + version = "0.1.0.1"; + sha256 = "06f0ec85133e273853c3a967f3f806336bb2ad84da24b610a53bb3c76d5a9e20"; + libraryHaskellDepends = [ + attoparsec base bytestring deepseq foldl http-client + http-client-tls mmorph mtl streaming syb transformers + ]; + description = "Lazy bytestring done right"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "streaming-commons" = callPackage ({ mkDerivation, array, async, base, blaze-builder, bytestring , deepseq, directory, hspec, network, process, QuickCheck, random @@ -128099,7 +128135,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the libsvg-cairo library"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) librsvg;}; + }) {inherit (pkgs) librsvg;}; "svgutils" = callPackage ({ mkDerivation, base, filepath, xml }: @@ -128213,7 +128249,7 @@ self: { description = "Transparently swapping data from in-memory structures to disk"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) tokyocabinet;}; + }) {inherit (pkgs) tokyocabinet;}; "swearjure" = callPackage ({ mkDerivation, attoparsec, base, containers, fixplate, mtl @@ -128550,7 +128586,7 @@ self: { description = "Similar code analysis"; license = "unknown"; broken = true; - }) { Synt = null;}; + }) {Synt = null;}; "syntactic" = callPackage ({ mkDerivation, base, constraints, containers, data-hash, deepseq @@ -128843,7 +128879,7 @@ self: { description = "Audio signal processing with dynamic physical dimensions"; license = "GPL"; broken = true; - }) { UniqueLogicNP = null;}; + }) {UniqueLogicNP = null;}; "synthesizer-llvm" = callPackage ({ mkDerivation, base, containers, event-list, filepath, llvm-extra @@ -129140,7 +129176,7 @@ self: { description = "Various system utils lifted to EitherT"; license = stdenv.lib.licenses.bsd3; broken = true; - }) { easy-data = null;}; + }) {easy-data = null;}; "system-uuid" = callPackage ({ mkDerivation, base, binary, bytestring, containers, libossp_uuid @@ -129165,7 +129201,7 @@ self: { homepage = "http://github.com/solidsnack/system-uuid/"; description = "Bindings to system UUID functions"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) libossp_uuid;}; + }) {inherit (pkgs) libossp_uuid;}; "systemd" = callPackage ({ mkDerivation, base, bytestring, network, transformers, unix }: @@ -129592,7 +129628,7 @@ self: { libraryPkgconfigDepends = [ taglib ]; description = "Binding to TagLib (ID3 tag library)"; license = "LGPL"; - }) { inherit (pkgs) taglib;}; + }) {inherit (pkgs) taglib;}; "taglib-api" = callPackage ({ mkDerivation, base, bytestring, containers, mtl, taglib, text @@ -129609,7 +129645,7 @@ self: { jailbreak = true; description = "An FFI layer over TagLib's C bindings"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) taglib;}; + }) {inherit (pkgs) taglib;}; "tagset-positional" = callPackage ({ mkDerivation, base, binary, containers, parsec, text @@ -129744,7 +129780,7 @@ self: { description = "Database library with left-fold interface for Oracle"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { clntsh = null; sqlplus = null;}; + }) {clntsh = null; sqlplus = null;}; "tamarin-prover" = callPackage ({ mkDerivation, aeson, array, base, binary, blaze-builder @@ -130854,7 +130890,7 @@ self: { homepage = "https://github.com/judah/terminfo"; description = "Haskell bindings to the terminfo library"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) ncurses;}; + }) {inherit (pkgs) ncurses;}; "terminfo-hs" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers @@ -130886,7 +130922,7 @@ self: { description = "A Haskell GIS Programming Environment"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { terralib4c = null; translib = null;}; + }) {terralib4c = null; translib = null;}; "tersmu" = callPackage ({ mkDerivation, base, containers, mtl, process, syb, transformers @@ -131550,7 +131586,7 @@ self: { homepage = "https://github.com/bos/text-icu"; description = "Bindings to the ICU library"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) icu;}; + }) {inherit (pkgs) icu;}; "text-icu-translit" = callPackage ({ mkDerivation, base, icu, QuickCheck, test-framework @@ -131568,7 +131604,7 @@ self: { ]; description = "ICU transliteration"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) icu;}; + }) {inherit (pkgs) icu;}; "text-json-qq" = callPackage ({ mkDerivation, base, haskell-src-meta, json, json-qq, parsec @@ -133974,7 +134010,7 @@ self: { description = "Haskell binding of Tokyo Cabinet"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) tokyocabinet;}; + }) {inherit (pkgs) tokyocabinet;}; "tokyotyrant-haskell" = callPackage ({ mkDerivation, base, bytestring, mtl, tokyocabinet, tokyotyrant @@ -133988,7 +134024,7 @@ self: { homepage = "http://www.polarmobile.com/"; description = "FFI bindings to libtokyotyrant"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) tokyocabinet; inherit (pkgs) tokyotyrant;}; + }) {inherit (pkgs) tokyocabinet; inherit (pkgs) tokyotyrant;}; "tomato-rubato-openal" = callPackage ({ mkDerivation, base, OpenAL, stm, vector }: @@ -136519,7 +136555,7 @@ self: { description = "String encoding conversion with ICU"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) icu;}; + }) {inherit (pkgs) icu;}; "udbus" = callPackage ({ mkDerivation, base, binary, bytestring, cereal, containers @@ -136584,7 +136620,7 @@ self: { description = "libudev bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { libudev = null;}; + }) {libudev = null;}; "uglymemo" = callPackage ({ mkDerivation, base, containers }: @@ -137047,7 +137083,7 @@ self: { description = "Unicode normalization using the ICU library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) icu;}; + }) {inherit (pkgs) icu;}; "unicode-prelude" = callPackage ({ mkDerivation, base }: @@ -137132,14 +137168,14 @@ self: { description = "Uniform IO over files, network, watever"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) openssl;}; + }) {inherit (pkgs) openssl;}; "uniform-pair" = callPackage ({ mkDerivation, base, ShowF }: mkDerivation { pname = "uniform-pair"; - version = "0.1.5"; - sha256 = "014187360a2aa088c507773bc4b7144e945b7e1944cf2e1d88b79f0e6b87737e"; + version = "0.1.7"; + sha256 = "be32baf4cdc36db451b1ee28502a3a357e840b800118ce9102df37ffcbca98e1"; libraryHaskellDepends = [ base ShowF ]; homepage = "https://github.com/conal/uniform-pair/"; description = "Uniform pairs with class instances"; @@ -137251,6 +137287,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "unit" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "unit"; + version = "0.1.0.0"; + sha256 = "0747cc0c3a8e6bb64343b79c079702757d81f63ae2bc7dd76727b8bcee8edc74"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + homepage = "http://github.com/cxfreeio/unit#readme"; + description = "Aliases for ()"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "units" = callPackage ({ mkDerivation, base, containers, HUnit-approx, mtl, multimap , singletons, syb, tasty, tasty-hunit, template-haskell, th-desugar @@ -139525,7 +139574,7 @@ self: { description = "A binding to the fftw library for one-dimensional vectors"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) fftw;}; + }) {inherit (pkgs) fftw;}; "vector-functorlazy" = callPackage ({ mkDerivation, base, ghc-prim, primitive, vector, vector-th-unbox @@ -139897,7 +139946,7 @@ self: { ]; description = "An MPD client with vim-like key bindings"; license = stdenv.lib.licenses.mit; - }) { inherit (pkgs) ncurses;}; + }) {inherit (pkgs) ncurses;}; "vintage-basic" = callPackage ({ mkDerivation, array, base, directory, filepath, HUnit, mtl @@ -140208,7 +140257,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the VTE library"; license = stdenv.lib.licenses.lgpl21; - }) { inherit (pkgs.gnome) vte;}; + }) {inherit (pkgs.gnome) vte;}; "vtegtk3" = callPackage ({ mkDerivation, base, glib, gtk2hs-buildtools, gtk3, pango, vte }: @@ -140224,7 +140273,7 @@ self: { description = "Binding to the VTE library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs.gnome) vte;}; + }) {inherit (pkgs.gnome) vte;}; "vty" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers @@ -140613,7 +140662,7 @@ self: { homepage = "http://www.yesodweb.com/book/web-application-interface"; description = "Wai handler to fastcgi"; license = stdenv.lib.licenses.mit; - }) { inherit (pkgs) fcgi;}; + }) {inherit (pkgs) fcgi;}; "wai-handler-launch" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, http-types @@ -140675,7 +140724,7 @@ self: { description = "Turn WAI applications into standalone GUIs using QtWebkit"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { QtWebKit = null;}; + }) {QtWebKit = null;}; "wai-hastache" = callPackage ({ mkDerivation, base, bytestring, hastache, http-types @@ -142213,7 +142262,7 @@ self: { description = "Parser and Pretty Printer for the Web IDL Language"; license = stdenv.lib.licenses.bsd3; broken = true; - }) { LEXER = null;}; + }) {LEXER = null;}; "webify" = callPackage ({ mkDerivation, base, binary, binary-strict, blaze-builder @@ -142253,7 +142302,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Webkit library"; license = stdenv.lib.licenses.lgpl21; - }) { inherit (pkgs) webkit;}; + }) {inherit (pkgs) webkit;}; "webkit-javascriptcore" = callPackage ({ mkDerivation, base, glib, gtk, gtk2hs-buildtools, webkit }: @@ -142284,7 +142333,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Webkit library"; license = stdenv.lib.licenses.lgpl21; - }) { inherit (pkgs) webkit;}; + }) {inherit (pkgs) webkit;}; "webkitgtk3-javascriptcore" = callPackage ({ mkDerivation, base, glib, gtk2hs-buildtools, gtk3, webkit @@ -142299,7 +142348,7 @@ self: { libraryToolDepends = [ gtk2hs-buildtools ]; description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) webkit;}; + }) {inherit (pkgs) webkit;}; "webpage" = callPackage ({ mkDerivation, base, blaze-html, data-default, hastache, lucid @@ -142697,7 +142746,7 @@ self: { description = "I/O library for Windows"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { kernel32 = null; ws2_32 = null;}; + }) {kernel32 = null; ws2_32 = null;}; "wiring" = callPackage ({ mkDerivation, base, hspec, mtl, QuickCheck, template-haskell @@ -142882,7 +142931,7 @@ self: { description = "Haskell bindings for the wlc library"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; - }) { wlc = null;}; + }) {wlc = null;}; "wobsurv" = callPackage ({ mkDerivation, aeson, attoparsec, base-prelude, bytestring @@ -143481,8 +143530,8 @@ self: { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell C++ wrapper"; license = "unknown"; - }) { inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa; - inherit (pkgs) wxGTK;}; + }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa; + inherit (pkgs) wxGTK;}; "wxcore" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory @@ -143500,7 +143549,7 @@ self: { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell core"; license = "unknown"; - }) { inherit (pkgs) wxGTK;}; + }) {inherit (pkgs) wxGTK;}; "wxdirect" = callPackage ({ mkDerivation, base, containers, directory, filepath, parsec @@ -143642,7 +143691,7 @@ self: { description = "Haskell FFI bindings for X11 XInput library (-lXi)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs.xlibs) libXi;}; + }) {inherit (pkgs.xlibs) libXi;}; "x509" = callPackage ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base @@ -143759,7 +143808,7 @@ self: { ]; description = "Haskell extended file attributes interface"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) attr;}; + }) {inherit (pkgs) attr;}; "xbattbar" = callPackage ({ mkDerivation, base, old-time, select, X11 }: @@ -143922,7 +143971,7 @@ self: { description = "FFI bindings to xfconf"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) { libxfconf-0 = null;}; + }) {libxfconf-0 = null;}; "xformat" = callPackage ({ mkDerivation, base }: @@ -144065,7 +144114,7 @@ self: { description = "Bindings to xine-lib"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { libxine = null; xine = null;}; + }) {libxine = null; xine = null;}; "xing-api" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, bytestring @@ -144125,7 +144174,7 @@ self: { testHaskellDepends = [ base unix ]; description = "Haskell bindings for libxkbcommon"; license = stdenv.lib.licenses.mit; - }) { inherit (pkgs) libxkbcommon;}; + }) {inherit (pkgs) libxkbcommon;}; "xkcd" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, HTTP @@ -144788,8 +144837,8 @@ self: { homepage = "http://xmobar.org"; description = "A Minimalistic Text Based Status Bar"; license = stdenv.lib.licenses.bsd3; - }) { Xrender = null; inherit (pkgs.xlibs) libXpm; - inherit (pkgs.xlibs) libXrandr; inherit (pkgs) wirelesstools;}; + }) {Xrender = null; inherit (pkgs.xlibs) libXpm; + inherit (pkgs.xlibs) libXrandr; inherit (pkgs) wirelesstools;}; "xmonad" = callPackage ({ mkDerivation, base, containers, directory, extensible-exceptions @@ -145037,7 +145086,7 @@ self: { homepage = "http://code.haskell.org/~dons/code/xosd"; description = "A binding to the X on-screen display"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) xosd;}; + }) {inherit (pkgs) xosd;}; "xournal-builder" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, double-conversion @@ -145194,7 +145243,7 @@ self: { description = "Binding to libxslt"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { xslt = null;}; + }) {xslt = null;}; "xss-sanitize" = callPackage ({ mkDerivation, attoparsec, base, containers, css-text, hspec @@ -145239,7 +145288,7 @@ self: { librarySystemDepends = [ libXtst ]; description = "Thin FFI bindings to X11 XTest library"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs.xlibs) libXtst;}; + }) {inherit (pkgs.xlibs) libXtst;}; "xturtle" = callPackage ({ mkDerivation, base, convertible, Imlib, setlocale, X11, X11-xft @@ -145392,7 +145441,7 @@ self: { description = "Bindings for YAJL, an event-based JSON implementation"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) yajl;}; + }) {inherit (pkgs) yajl;}; "yajl-enumerator" = callPackage ({ mkDerivation, base, bytestring, enumerator, json-types, text @@ -145736,7 +145785,7 @@ self: { description = "Image IO for Yarr library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) libdevil;}; + }) {inherit (pkgs) libdevil;}; "yate" = callPackage ({ mkDerivation, aeson, attoparsec, base, hspec, mtl, scientific @@ -146512,7 +146561,7 @@ self: { description = "Example programs using the Yesod Web Framework. (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) sqlite;}; + }) {inherit (pkgs) sqlite;}; "yesod-fay" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, directory @@ -147727,7 +147776,7 @@ self: { homepage = "http://code.haskell.org/~dons/code/yices-painless"; description = "An embedded language for programming the Yices SMT solver"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) gmp; inherit (pkgs) yices;}; + }) {inherit (pkgs) gmp; inherit (pkgs) yices;}; "yjftp" = callPackage ({ mkDerivation, base, directory, ftphs, haskeline, hsConfigure @@ -147991,7 +148040,7 @@ self: { homepage = "http://bitbucket.org/iago/z3-haskell"; description = "Bindings for the Z3 Theorem Prover"; license = stdenv.lib.licenses.bsd3; - }) { gomp = null; inherit (pkgs) z3;}; + }) {gomp = null; inherit (pkgs) z3;}; "zampolit" = callPackage ({ mkDerivation, base, cmdargs, containers, directory, filepath @@ -148124,7 +148173,7 @@ self: { description = "Bindings to ZeroMQ 2.1.x"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) zeromq;}; + }) {inherit (pkgs) zeromq;}; "zeromq3-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, lifted-base @@ -148166,7 +148215,7 @@ self: { description = "Bindings to ZeroMQ 3.x"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) zeromq;}; + }) {inherit (pkgs) zeromq;}; "zeromq4-haskell" = callPackage ({ mkDerivation, async, base, bytestring, containers, exceptions @@ -148187,7 +148236,7 @@ self: { homepage = "http://github.com/twittner/zeromq-haskell/"; description = "Bindings to ZeroMQ 4.x"; license = stdenv.lib.licenses.mit; - }) { inherit (pkgs) zeromq;}; + }) {inherit (pkgs) zeromq;}; "zeroth" = callPackage ({ mkDerivation, base, Cabal, derive, directory, filepath @@ -148254,7 +148303,7 @@ self: { homepage = "http://github.com/jgm/zip-archive"; description = "Library for creating and modifying zip archives"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) zip;}; + }) {inherit (pkgs) zip;}; "zip-conduit" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra @@ -148344,7 +148393,7 @@ self: { librarySystemDepends = [ zlib ]; description = "Compression and decompression in the gzip and zlib formats"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) zlib;}; + }) {inherit (pkgs) zlib;}; "zlib" = callPackage ({ mkDerivation, base, bytestring, HUnit, QuickCheck, tasty @@ -148362,7 +148411,7 @@ self: { jailbreak = true; description = "Compression and decompression in the gzip and zlib formats"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) zlib;}; + }) {inherit (pkgs) zlib;}; "zlib-bindings" = callPackage ({ mkDerivation, base, bytestring, hspec, QuickCheck, zlib }: From a9ec286d99e8800e9709e8921b934efc88e1a8cf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 26 Aug 2015 22:29:56 +0200 Subject: [PATCH 117/175] haskell-regex-tdfa-text has been fixed upstream. --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index c61b9c26211..04205825ef2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -221,9 +221,6 @@ self: super: { vector_0_10_9_2 = markBroken super.vector_0_10_9_2; hoopl_3_10_2_0 = markBroken super.hoopl_3_10_2_0; - # http://hub.darcs.net/shelarcy/regex-tdfa-text/issue/1 -- upstream seems to be asleep - regex-tdfa-text = appendPatch super.regex-tdfa-text ./patches/regex-tdfa-text.patch; - # https://github.com/HugoDaniel/RFC3339/issues/14 timerep = dontCheck super.timerep; From 93a3ba3909ca67a62c636a2fba75dd80c416bbdf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 26 Aug 2015 23:01:42 +0200 Subject: [PATCH 118/175] haskell-github-types: test suite tries to access the network --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2705a301124..41eeaf30cc5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -314,6 +314,7 @@ self: super: { concurrent-dns-cache = dontCheck super.concurrent-dns-cache; dbus = dontCheck super.dbus; # http://hydra.cryp.to/build/498404/log/raw digitalocean-kzs = dontCheck super.digitalocean-kzs; # https://github.com/KazumaSATO/digitalocean-kzs/issues/1 + github-types = dontCheck super.github-types; # http://hydra.cryp.to/build/1114046/nixlog/1/raw hadoop-rpc = dontCheck super.hadoop-rpc; # http://hydra.cryp.to/build/527461/nixlog/2/raw hasql = dontCheck super.hasql; # http://hydra.cryp.to/build/502489/nixlog/4/raw hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; }); From 03921972268934d900cc32dad253ff383926771c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 27 Aug 2015 12:52:16 +0200 Subject: [PATCH 119/175] fix python_fedora build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 959ab2ebcc19c6f44f2ec6ddb79d16af7d69d4d3) Signed-off-by: Domen Kožar --- pkgs/top-level/python-packages.nix | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7da29365218..42db423a451 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1343,16 +1343,16 @@ let maintainers = with maintainers; [ bjornfor ]; }; }; - + blaze = buildPythonPackage rec { name = "blaze-${version}"; version = "0.8.2"; - + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/blaze/${name}.tar.gz"; sha256 = "1abedabf2a1e62dd059e0942d60f27337763de26f5e3f61ed55baaf97723b624"; }; - + propagatedBuildInputs = with self; [ numpy pandas @@ -1363,7 +1363,7 @@ let sqlalchemy9 # sqlalchemy8 should also work psutil ]; - + meta = { homepage = https://github.com/ContinuumIO/blaze; description = "Allows Python users a familiar interface to query data living in other data storage systems"; @@ -2448,7 +2448,7 @@ let cffi_0_8 = buildPythonPackage rec { name = "cffi-0.8.6"; - + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/c/cffi/${name}.tar.gz"; sha256 = "0406j3sgndmx88idv5zxkkrwfqxmjl18pj8gf47nsg4ymzixjci5"; @@ -8094,22 +8094,22 @@ let plover = pythonPackages.buildPythonPackage rec { name = "plover-${version}"; version = "2.5.8"; - + meta = { description = "OpenSteno Plover stenography software"; maintainers = [ maintainers.twey ]; license = licenses.gpl2; }; - + src = pkgs.fetchurl { url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; sha256 = "23f7824a715f93eb2c41d5bafd0c6f3adda92998e9321e1ee029abe7a6ab41e5"; }; - + propagatedBuildInputs = with self; [ wxPython pyserial xlib appdirs pkgs.wmctrl ]; preConfigure = "substituteInPlace setup.py --replace /usr/share usr/share"; }; - + pymysql = buildPythonPackage rec { name = "pymysql-${version}"; version = "0.6.6"; @@ -8626,7 +8626,7 @@ let url = "https://pypi.python.org/packages/source/n/numexpr/${name}.tar.gz"; sha256 = "3ae7191c89df40db6b0a8637a4dace7c5956bc910793a53225f985f3b443c722"; }; - + # Tests fail with python 3. https://github.com/pydata/numexpr/issues/177 doCheck = !isPy3k; @@ -11068,6 +11068,11 @@ let }; propagatedBuildInputs = with self; [ kitchen requests bunch paver ]; doCheck = false; + + # https://github.com/fedora-infra/python-fedora/issues/140 + preBuild = '' + sed -i '4,15d' setup.py + ''; }); python_simple_hipchat = buildPythonPackage rec { @@ -17267,11 +17272,11 @@ let maintainers = with maintainers; [ odi ]; }; }; - + suds = buildPythonPackage rec { name = "suds-0.4"; disabled = isPy3k; - + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/suds/suds-0.4.tar.gz"; md5 = "b7502de662341ed7275b673e6bd73191"; From e65fce3af64ea0b2058a69d72bc74a0baa756bf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 27 Aug 2015 13:22:29 +0200 Subject: [PATCH 120/175] docker: fix build on i686 --- pkgs/applications/virtualization/docker/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index b915e744358..6ad59a087e9 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchFromGitHub, makeWrapper, go, lxc, sqlite, iproute, bridge-utils, devicemapper, btrfsProgs, iptables, bash, e2fsprogs, xz}: +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md + stdenv.mkDerivation rec { name = "docker-${version}"; version = "1.8.1"; @@ -16,6 +18,11 @@ stdenv.mkDerivation rec { dontStrip = true; + preConfigure = '' + mv vendor/src/github.com/opencontainers/runc/libcontainer/seccomp/{jump_amd64.go,jump_linux.go} + sed -i 's/,amd64//' vendor/src/github.com/opencontainers/runc/libcontainer/seccomp/jump_linux.go + ''; + buildPhase = '' patchShebangs . export AUTO_GOPATH=1 From 6fe75323961b4e23fd5ce71b044700c9377cbfd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 27 Aug 2015 13:41:37 +0200 Subject: [PATCH 121/175] Revert "vagrant: use ruby 2.2" This reverts commit c00405d8d9bab331055f202f61ac117900454f36. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a786d875bf..9ab994b5735 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5855,7 +5855,7 @@ let uncrustify = callPackage ../development/tools/misc/uncrustify { }; vagrant = callPackage ../development/tools/vagrant { - ruby = ruby_2_2_2; + ruby = ruby_2_0_0; }; gdb = callPackage ../development/tools/misc/gdb { From f15270833ad3e843619fc953e4b28e2d9499b3f2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Aug 2015 12:10:56 +0200 Subject: [PATCH 122/175] Don't barf JSON at users in error messages --- pkgs/stdenv/generic/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index fe7bec54ba0..249e4845bc2 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -27,7 +27,7 @@ let lib.lists.all (license: let l = lib.licenses.${license.shortName or "BROKEN"} or false; in if license == l then true else - throw ''‘${builtins.toJSON license}’ is not an attribute of lib.licenses'' + throw ''‘${showLicense license}’ is not an attribute of lib.licenses'' ) list; mutuallyExclusive = a: b: @@ -73,6 +73,8 @@ let isUnfree (lib.lists.toList attrs.meta.license) && !allowUnfreePredicate attrs; + showLicense = license: license.shortName or "unknown"; + defaultNativeBuildInputs = extraBuildInputs ++ [ ../../build-support/setup-hooks/move-docs.sh ../../build-support/setup-hooks/compress-man-pages.sh @@ -121,9 +123,9 @@ let licenseAllowed = attrs: if hasDeniedUnfreeLicense attrs && !(hasWhitelistedLicense attrs) then - throwEvalHelp "Unfree" "has an unfree license ‘${builtins.toJSON attrs.meta.license}’ which is not whitelisted" + throwEvalHelp "Unfree" "has an unfree license (‘${showLicense attrs.meta.license}’)" else if hasBlacklistedLicense attrs then - throwEvalHelp "blacklisted" "has the ‘${builtins.toJSON attrs.meta.license}’ license which is blacklisted" + throwEvalHelp "blacklisted" "has a blacklisted license (‘${showLicense attrs.meta.license}’)" else if !allowBroken && attrs.meta.broken or false then throwEvalHelp "Broken" "is marked as broken" else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem result.system attrs.meta.platforms then From 287c08d8a319fc454e3d1ce90510f7a53e9d4e5d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Aug 2015 15:24:14 +0200 Subject: [PATCH 123/175] Rename services.openssh.knownHosts -> programs.ssh.knownHosts This option configures the SSH client, not the server. --- nixos/modules/programs/ssh.nix | 74 ++++++++++++++++- nixos/modules/rename.nix | 1 + .../modules/services/networking/ssh/sshd.nix | 79 +------------------ 3 files changed, 75 insertions(+), 79 deletions(-) diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index d3183f7d2dc..e9ad47adec9 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -18,6 +18,14 @@ let exec ${askPassword} ''; + knownHosts = map (h: getAttr h cfg.knownHosts) (attrNames cfg.knownHosts); + + knownHostsText = flip (concatMapStringsSep "\n") knownHosts + (h: + concatStringsSep "," h.hostNames + " " + + (if h.publicKey != null then h.publicKey else readFile h.publicKeyFile) + ); + in { ###### interface @@ -92,16 +100,72 @@ in ''; }; + knownHosts = mkOption { + default = {}; + type = types.loaOf types.optionSet; + description = '' + The set of system-wide known SSH hosts. + ''; + example = [ + { + hostNames = [ "myhost" "myhost.mydomain.com" "10.10.1.4" ]; + publicKeyFile = literalExample "./pubkeys/myhost_ssh_host_dsa_key.pub"; + } + { + hostNames = [ "myhost2" ]; + publicKeyFile = literalExample "./pubkeys/myhost2_ssh_host_dsa_key.pub"; + } + ]; + options = { + hostNames = mkOption { + type = types.listOf types.str; + default = []; + description = '' + A list of host names and/or IP numbers used for accessing + the host's ssh service. + ''; + }; + publicKey = mkOption { + default = null; + type = types.nullOr types.str; + example = "ecdsa-sha2-nistp521 AAAAE2VjZHN...UEPg=="; + description = '' + The public key data for the host. You can fetch a public key + from a running SSH server with the ssh-keyscan + command. The public key should not include any host names, only + the key type and the key itself. + ''; + }; + publicKeyFile = mkOption { + default = null; + type = types.nullOr types.path; + description = '' + The path to the public key file for the host. The public + key file is read at build time and saved in the Nix store. + You can fetch a public key file from a running SSH server + with the ssh-keyscan command. The content + of the file should follow the same format as described for + the publicKey option. + ''; + }; + }; + }; + }; }; config = { - assertions = singleton - { assertion = cfg.forwardX11 -> cfg.setXAuthLocation; - message = "cannot enable X11 forwarding without setting XAuth location"; - }; + assertions = + [ { assertion = cfg.forwardX11 -> cfg.setXAuthLocation; + message = "cannot enable X11 forwarding without setting XAuth location"; + } + ] ++ flip mapAttrsToList cfg.knownHosts (name: data: { + assertion = (data.publicKey == null && data.publicKeyFile != null) || + (data.publicKey != null && data.publicKeyFile == null); + message = "knownHost ${name} must contain either a publicKey or publicKeyFile"; + }); # SSH configuration. Slight duplication of the sshd_config # generation in the sshd service. @@ -118,6 +182,8 @@ in ${cfg.extraConfig} ''; + environment.etc."ssh/ssh_known_hosts".text = knownHostsText; + # FIXME: this should really be socket-activated for über-awesomeness. systemd.user.services.ssh-agent = { enable = cfg.startAgent; diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 4db08b7ad3d..6f7dcb837a0 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -110,6 +110,7 @@ in zipModules ([] ++ obsolete [ "services" "sshd" "permitRootLogin" ] [ "services" "openssh" "permitRootLogin" ] ++ obsolete [ "services" "xserver" "startSSHAgent" ] [ "services" "xserver" "startOpenSSHAgent" ] ++ obsolete [ "services" "xserver" "startOpenSSHAgent" ] [ "programs" "ssh" "startAgent" ] +++ alias [ "services" "openssh" "knownHosts" ] [ "programs" "ssh" "knownHosts" ] # VirtualBox ++ obsolete [ "services" "virtualbox" "enable" ] [ "virtualisation" "virtualbox" "guest" "enable" ] diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 1c428ceddfd..4c7e4d8d088 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -9,14 +9,6 @@ let nssModulesPath = config.system.nssModules.path; - knownHosts = map (h: getAttr h cfg.knownHosts) (attrNames cfg.knownHosts); - - knownHostsText = flip (concatMapStringsSep "\n") knownHosts - (h: - concatStringsSep "," h.hostNames + " " - + (if h.publicKey != null then h.publicKey else readFile h.publicKeyFile) - ); - userOptions = { openssh.authorizedKeys = { @@ -48,8 +40,7 @@ let }; authKeysFiles = let - mkAuthKeyFile = u: { - target = "ssh/authorized_keys.d/${u.name}"; + mkAuthKeyFile = u: nameValuePair "ssh/authorized_keys.d/${u.name}" { mode = "0444"; source = pkgs.writeText "${u.name}-authorized_keys" '' ${concatStringsSep "\n" u.openssh.authorizedKeys.keys} @@ -59,7 +50,7 @@ let usersWithKeys = attrValues (flip filterAttrs config.users.extraUsers (n: u: length u.openssh.authorizedKeys.keys != 0 || length u.openssh.authorizedKeys.keyFiles != 0 )); - in map mkAuthKeyFile usersWithKeys; + in listToAttrs (map mkAuthKeyFile usersWithKeys); in @@ -211,57 +202,6 @@ in description = "Verbatim contents of sshd_config."; }; - knownHosts = mkOption { - default = {}; - type = types.loaOf types.optionSet; - description = '' - The set of system-wide known SSH hosts. - ''; - example = [ - { - hostNames = [ "myhost" "myhost.mydomain.com" "10.10.1.4" ]; - publicKeyFile = literalExample "./pubkeys/myhost_ssh_host_dsa_key.pub"; - } - { - hostNames = [ "myhost2" ]; - publicKeyFile = literalExample "./pubkeys/myhost2_ssh_host_dsa_key.pub"; - } - ]; - options = { - hostNames = mkOption { - type = types.listOf types.str; - default = []; - description = '' - A list of host names and/or IP numbers used for accessing - the host's ssh service. - ''; - }; - publicKey = mkOption { - default = null; - type = types.nullOr types.str; - example = "ecdsa-sha2-nistp521 AAAAE2VjZHN...UEPg=="; - description = '' - The public key data for the host. You can fetch a public key - from a running SSH server with the ssh-keyscan - command. The public key should not include any host names, only - the key type and the key itself. - ''; - }; - publicKeyFile = mkOption { - default = null; - type = types.nullOr types.path; - description = '' - The path to the public key file for the host. The public - key file is read at build time and saved in the Nix store. - You can fetch a public key file from a running SSH server - with the ssh-keyscan command. The content - of the file should follow the same format as described for - the publicKey option. - ''; - }; - }; - }; - moduliFile = mkOption { example = "services.openssh.moduliFile = /etc/my-local-ssh-moduli;"; type = types.path; @@ -292,14 +232,8 @@ in services.openssh.moduliFile = mkDefault "${cfgc.package}/etc/ssh/moduli"; - environment.etc = authKeysFiles ++ [ - { source = cfg.moduliFile; - target = "ssh/moduli"; - } - { text = knownHostsText; - target = "ssh/ssh_known_hosts"; - } - ]; + environment.etc = authKeysFiles // + { "ssh/moduli".source = cfg.moduliFile; }; systemd = let @@ -417,11 +351,6 @@ in assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true; message = "cannot enable X11 forwarding without setting xauth location";}] - ++ flip mapAttrsToList cfg.knownHosts (name: data: { - assertion = (data.publicKey == null && data.publicKeyFile != null) || - (data.publicKey != null && data.publicKeyFile == null); - message = "knownHost ${name} must contain either a publicKey or publicKeyFile"; - }) ++ flip map cfg.listenAddresses ({ addr, port, ... }: { assertion = addr != null; message = "addr must be specified in each listenAddresses entry"; From 7c6ff6c1da65684137d9c3554540720f2f28e6cd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Aug 2015 15:29:05 +0200 Subject: [PATCH 124/175] programs.ssh.knownHosts: Use submodule --- nixos/modules/programs/ssh.nix | 69 +++++++++++++++++----------------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index e9ad47adec9..87a00497621 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -102,7 +102,41 @@ in knownHosts = mkOption { default = {}; - type = types.loaOf types.optionSet; + type = types.loaOf (types.submodule { + options = { + hostNames = mkOption { + type = types.listOf types.str; + default = []; + description = '' + A list of host names and/or IP numbers used for accessing + the host's ssh service. + ''; + }; + publicKey = mkOption { + default = null; + type = types.nullOr types.str; + example = "ecdsa-sha2-nistp521 AAAAE2VjZHN...UEPg=="; + description = '' + The public key data for the host. You can fetch a public key + from a running SSH server with the ssh-keyscan + command. The public key should not include any host names, only + the key type and the key itself. + ''; + }; + publicKeyFile = mkOption { + default = null; + type = types.nullOr types.path; + description = '' + The path to the public key file for the host. The public + key file is read at build time and saved in the Nix store. + You can fetch a public key file from a running SSH server + with the ssh-keyscan command. The content + of the file should follow the same format as described for + the publicKey option. + ''; + }; + }; + }); description = '' The set of system-wide known SSH hosts. ''; @@ -116,39 +150,6 @@ in publicKeyFile = literalExample "./pubkeys/myhost2_ssh_host_dsa_key.pub"; } ]; - options = { - hostNames = mkOption { - type = types.listOf types.str; - default = []; - description = '' - A list of host names and/or IP numbers used for accessing - the host's ssh service. - ''; - }; - publicKey = mkOption { - default = null; - type = types.nullOr types.str; - example = "ecdsa-sha2-nistp521 AAAAE2VjZHN...UEPg=="; - description = '' - The public key data for the host. You can fetch a public key - from a running SSH server with the ssh-keyscan - command. The public key should not include any host names, only - the key type and the key itself. - ''; - }; - publicKeyFile = mkOption { - default = null; - type = types.nullOr types.path; - description = '' - The path to the public key file for the host. The public - key file is read at build time and saved in the Nix store. - You can fetch a public key file from a running SSH server - with the ssh-keyscan command. The content - of the file should follow the same format as described for - the publicKey option. - ''; - }; - }; }; }; From f6eece6f8f4aac8598aed0fbc8bfc2a621f33633 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Aug 2015 15:31:21 +0200 Subject: [PATCH 125/175] programs.ssh.knownHosts: Use attribute name This allows writing: programs.ssh.knownHosts."10.1.2.3".publicKey = "bar"; instead of programs.ssh.knownHosts = [ { hostNames = [ "10.1.2.3" ]; publicKey = "bar"; } ]; --- nixos/modules/programs/ssh.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index 87a00497621..cf7ef455eb8 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -21,7 +21,7 @@ let knownHosts = map (h: getAttr h cfg.knownHosts) (attrNames cfg.knownHosts); knownHostsText = flip (concatMapStringsSep "\n") knownHosts - (h: + (h: assert h.hostNames != []; concatStringsSep "," h.hostNames + " " + (if h.publicKey != null then h.publicKey else readFile h.publicKeyFile) ); @@ -102,7 +102,7 @@ in knownHosts = mkOption { default = {}; - type = types.loaOf (types.submodule { + type = types.loaOf (types.submodule ({ name, ... }: { options = { hostNames = mkOption { type = types.listOf types.str; @@ -136,7 +136,10 @@ in ''; }; }; - }); + config = { + hostNames = mkDefault [ name ]; + }; + })); description = '' The set of system-wide known SSH hosts. ''; From 071009ee4f840fc47dfca1ce3709b3898d5bd1cf Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 27 Aug 2015 15:12:32 +0300 Subject: [PATCH 126/175] ubootJetsonTK1: Install some more files tegra-uboot-flasher needs 'u-boot', 'u-boot-nodtb-tegra.bin' and 'u-boot.dtb' for its 'flash' subcommand, and 'u-boot-dtb-tegra.bin' for its exec subcommand. No, there's no sanity in the embedded world. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3853efc66ee..57532f115aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10245,7 +10245,7 @@ let ubootJetsonTK1 = callPackage ../misc/uboot { defconfig = "jetson-tk1_defconfig"; targetPlatforms = ["armv7l-linux"]; - filesToInstall = ["u-boot-dtb-tegra.bin"]; + filesToInstall = ["u-boot" "u-boot.dtb" "u-boot-dtb-tegra.bin" "u-boot-nodtb-tegra.bin"]; }; ubootPcduino3Nano = callPackage ../misc/uboot { From d4988bd5baed638054dfb4576411cd8d40e79b81 Mon Sep 17 00:00:00 2001 From: Enrico Fasoli Date: Thu, 27 Aug 2015 14:17:33 +0000 Subject: [PATCH 127/175] syncthing: 0.11.21 -> 0.11.22 --- pkgs/applications/networking/syncthing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 1ee9e71e782..f42426b3caf 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,12 +4,12 @@ with goPackages; buildGoPackage rec { name = "syncthing-${version}"; - version = "0.11.21"; + version = "0.11.22"; goPackagePath = "github.com/syncthing/syncthing"; src = fetchgit { url = "git://github.com/syncthing/syncthing.git"; rev = "refs/tags/v${version}"; - sha256 = "2e7faf1002570a64ef76c6bbdde781c550db6c45b30f4fa1c394102809cad977"; + sha256 = "0zdk5ppsq35s10chf8m3rw3sk9d77ms7x1vj3inw4lrm1h13w9wk"; }; subPackages = [ "cmd/syncthing" ]; From 6a41cb828ecc4b1fde67d3a8d1fac5249190bf96 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 27 Aug 2015 16:44:23 +0200 Subject: [PATCH 128/175] xdaliclock: replace use of builderDefsPackage --- pkgs/tools/misc/xdaliclock/default.nix | 61 ++++++++------------------ 1 file changed, 18 insertions(+), 43 deletions(-) diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix index 16a54c81946..33c9489a70d 100644 --- a/pkgs/tools/misc/xdaliclock/default.nix +++ b/pkgs/tools/misc/xdaliclock/default.nix @@ -1,52 +1,27 @@ -x@{builderDefsPackage - , libX11, xproto, libXt, libICE - , libSM, libXext - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl, libX11, xproto, libXt, libICE, libSM, libXext }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="xdaliclock"; - version = "2.43"; - name="${baseName}-${version}"; - project="${baseName}"; - url="http://www.jwz.org/${project}/${name}.tar.gz"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; +stdenv.mkDerivation rec { + name = "xdaliclock-${version}"; + version = "2.43"; + + src = fetchurl { + url="http://www.jwz.org/xdaliclock/${name}.tar.gz"; sha256 = "194zzp1a989k2v8qzfr81gdknr8xiz16d6fdl63jx9r3mj5klmvb"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + sourceRoot = "${name}/X11"; - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "prepareDirs" "doMakeInstall"]; + buildInputs = [ libX11 xproto libXt libICE libSM libXext ]; - prepareDirs = a.fullDepEntry '' - mkdir -p "$out/bin" "$out/share" "$out/share/man/man1" - '' ["minInit" "defEnsureDir"]; + preInstall = '' + mkdir -vp $out/bin $out/share/man/man1 + ''; - goSrcDir = "cd X11"; - - meta = { + meta = with stdenv.lib; { description = "A clock application that morphs digits when they are changed"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux ++ freebsd; - license = a.lib.licenses.free; #TODO BSD on Gentoo, looks like MIT - downloadPage = "http://www.jwz.org/xdaliclock/"; - inherit version; - updateWalker = true; + maintainers = with maintainers; [ raskin rycee ]; + platforms = with platforms; linux ++ freebsd; + license = licenses.free; #TODO BSD on Gentoo, looks like MIT + downloadPage = http://www.jwz.org/xdaliclock/; }; -}) x +} From 3dc24b9e53f62ab76da7f03945ed0217daf6c86b Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Thu, 27 Aug 2015 17:14:54 +0200 Subject: [PATCH 129/175] =?UTF-8?q?umlet=2013.2=20=E2=86=92=2013.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/misc/umlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/umlet/default.nix b/pkgs/tools/misc/umlet/default.nix index 04f3a31aa48..cc51af22f85 100644 --- a/pkgs/tools/misc/umlet/default.nix +++ b/pkgs/tools/misc/umlet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { major = "13"; - minor = "2"; + minor = "3"; version = "${major}.${minor}"; name = "umlet-${version}"; src = fetchurl { url = "http://www.umlet.com/umlet_${major}_${minor}/umlet_${version}.zip"; - sha256 = "19jngb2sr212lh3yi43bqq2skhd9cxa8yfbfc3i6fbm2v0b7i2xf"; + sha256 = "0fbr51xknk98qz576lcl25qz0s1snns2yb0j54d77xkw7pnxmvzr"; }; buildInputs = [ unzip ]; From 52d7550da317001c4015e4b1edd1d359dabe7d91 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 27 Aug 2015 18:10:46 +0200 Subject: [PATCH 130/175] gdm: point to /etc/gdm/custom.conf --- pkgs/desktops/gnome-3/3.16/core/gdm/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix index d4ef3e13eea..d3d6f4e471c 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X" ''; - configureFlags = [ "--localstatedir=/var" "--with-systemd=yes" + configureFlags = [ "--sysconfdir=/etc" + "--localstatedir=/var" + "--with-systemd=yes" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; buildInputs = [ pkgconfig glib itstool libxml2 intltool @@ -30,7 +32,10 @@ stdenv.mkDerivation rec { ''; # Disable Access Control because our X does not support FamilyServerInterpreted yet - patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.patch ./no-dbus-launch.patch ]; + patches = [ ./xserver_path.patch ./sessions_dir.patch + ./disable_x_access_control.patch ./no-dbus-launch.patch ]; + + installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GDM; From 6eb096900f143bc85f725890f76a3ab7ceca6751 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 27 Aug 2015 18:11:09 +0200 Subject: [PATCH 131/175] nixos gdm: support autologin --- .../services/x11/display-managers/gdm.nix | 65 ++++++++++++++++--- 1 file changed, 56 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 6c3c5273086..245c18ee2d9 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -18,14 +18,42 @@ in services.xserver.displayManager.gdm = { - enable = mkOption { - type = types.bool; - default = false; - example = true; - description = '' - Whether to enable GDM as the display manager. - GDM is very experimental and may render system unusable. - ''; + enable = mkEnableOption '' + Whether to enable GDM as the display manager. + GDM is very experimental and may render system unusable. + ''; + + autoLogin = mkOption { + default = {}; + + type = types.submodule { + options = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Automatically log in as the sepecified . + ''; + }; + + user = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + User to be used for the autologin. + ''; + }; + + delay = mkOption { + type = types.int; + default = 0; + description = '' + Seconds of inactivity after which the autologin will be performed. + ''; + }; + + }; + }; }; }; @@ -71,6 +99,25 @@ in programs.dconf.profiles.gdm = "${gdm}/share/dconf/profile/gdm"; + environment.etc."gdm/custom.conf".text = '' + [daemon] + ${optionalString cfg.gdm.autoLogin.enable '' + TimedLoginEnable=true + TimedLogin=${cfg.gdm.autoLogin.user} + TimedLoginDelay=${toString cfg.gdm.autoLogin.delay} + ''} + + [security] + + [xdmcp] + + [greeter] + + [chooser] + + [debug] + ''; + # GDM LFS PAM modules, adapted somehow to NixOS security.pam.services = { gdm-launch-environment.text = '' @@ -89,7 +136,7 @@ in session optional pam_permit.so ''; - gdm.text = '' + gdm.text = '' auth requisite pam_nologin.so auth required pam_env.so From 119a6ef543161f5dcd7a5347d4765fc8da178e0f Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 27 Aug 2015 18:11:30 +0200 Subject: [PATCH 132/175] gnome3 test: use gdm with autologin instead of slim --- nixos/tests/gnome3.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix index f5e0159f1c7..3425ca09951 100644 --- a/nixos/tests/gnome3.nix +++ b/nixos/tests/gnome3.nix @@ -11,8 +11,13 @@ import ./make-test.nix ({ pkgs, ...} : { services.xserver.enable = true; - services.xserver.displayManager.auto.enable = true; - services.xserver.displayManager.auto.user = "alice"; + services.xserver.displayManager.gdm = { + enable = true; + autoLogin = { + enable = true; + user = "alice"; + }; + }; services.xserver.desktopManager.gnome3.enable = true; virtualisation.memorySize = 512; @@ -21,7 +26,7 @@ import ./make-test.nix ({ pkgs, ...} : { testScript = '' $machine->waitForX; - $machine->sleep(15); + $machine->sleep(60); # Check that logging in has given the user ownership of devices. $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); From e5b6de902fd9be58dd986307fb12a088f9a5fd2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 27 Aug 2015 18:45:48 +0200 Subject: [PATCH 133/175] setuptools: 18.0.1 -> 18.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 43b3f6e59d5e948adeab1ffd74a09ec252b372fd) Signed-off-by: Domen Kožar --- pkgs/development/python-modules/setuptools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index f6030bb9526..57c455f851c 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { shortName = "setuptools-${version}"; name = "${python.executable}-${shortName}"; - version = "18.0.1"; + version = "18.2"; src = fetchurl { url = "http://pypi.python.org/packages/source/s/setuptools/${shortName}.tar.gz"; - sha256 = "152b4qlpqc54939vfx5ipjpgx0kln02n3ywpm6x25pqysngwjjad"; + sha256 = "07avbdc26yl2a46s76fc7m4vg611g8sh39l26x9dr9byya6sb509"; }; buildInputs = [ python wrapPython distutils-cfg ]; @@ -35,5 +35,5 @@ stdenv.mkDerivation rec { homepage = http://pypi.python.org/pypi/setuptools; license = [ "PSF" "ZPL" ]; platforms = platforms.all; - }; + }; } From 4e41b64511bfa075aaba20f27f6adb75548403f0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Aug 2015 16:46:30 +0200 Subject: [PATCH 134/175] valgrind: Separate doc output --- pkgs/development/tools/analysis/valgrind/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 3c59bf45eff..da127b2f8ee 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "14sgsvjjalbcqpcayyv5cndc9hfm5bigkp684b6cr6virksmlk19"; }) ./linux-4.0.patch]; + outputs = [ "out" "doc" ]; + # Perl is needed for `cg_annotate'. # GDB is needed to provide a sane default for `--db-command'. nativeBuildInputs = [ perl ]; From 97cd7cfea2d44b97e536b0d36d2ed9d4c15e998e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Aug 2015 16:56:43 +0200 Subject: [PATCH 135/175] docbook-xsl: Remove cruft --- .../stylesheets/xslt/docbook-xsl/builder.sh | 8 ------- .../stylesheets/xslt/docbook-xsl/default.nix | 22 +++++++++++++++---- 2 files changed, 18 insertions(+), 12 deletions(-) delete mode 100644 pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/builder.sh diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/builder.sh b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/builder.sh deleted file mode 100644 index 9ac8e74d93a..00000000000 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -source $stdenv/setup - -mkdir -p $out -cd $out -unpackFile $src -mkdir xml -mkdir xml/xsl -mv docbook-xsl-* xml/xsl/docbook diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix index 981aa59369d..844789665f7 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix @@ -1,10 +1,24 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "docbook-xsl-1.78.1"; - builder = ./builder.sh; + src = fetchurl { - url = mirror://sourceforge/docbook/docbook-xsl-1.78.1.tar.bz2; + url = "mirror://sourceforge/docbook/${name}.tar.bz2"; sha256 = "0rxl013ncmz1n6ymk2idvx3hix9pdabk8xn01cpcv32wmfb753y9"; }; + + buildPhase = "true"; + + installPhase = + '' + dst=$out/share/xml/docbook-xsl + mkdir -p $dst + rm -rf RELEASE* README* INSTALL TODO NEWS* BUGS install.sh svn* tools log Makefile tests extensions webhelp + mv * $dst/ + + # Backwards compatibility. Will remove eventually. + mkdir -p $out/xml/xsl + ln -s $dst $out/xml/xsl/docbook + ''; } From 0ac4ad33fd0315a5b255030e48d209fa0a638657 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Aug 2015 17:01:45 +0200 Subject: [PATCH 136/175] Unify the docbook-xsl and docbook-xsl-ns expressions --- .../xslt/docbook-xsl-ns/default.nix | 31 ---------- .../stylesheets/xslt/docbook-xsl/default.nix | 57 +++++++++++++------ pkgs/top-level/all-packages.nix | 8 +-- 3 files changed, 44 insertions(+), 52 deletions(-) delete mode 100644 pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix deleted file mode 100644 index 36d2cc48c9f..00000000000 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "docbook-xsl-ns-1.78.1"; - - src = fetchurl { - url = "mirror://sourceforge/docbook/${name}.tar.bz2"; - sha256 = "1x3sc0axk9z3i6n0jhlsmzlmb723a4sjgslm9g12by6phirdx3ng"; - }; - - buildPhase = "true"; - - installPhase = - '' - dst=$out/share/xml/docbook-xsl-ns - mkdir -p $dst - rm -rf RELEASE* README* INSTALL TODO NEWS* BUGS install.sh svn* tools log Makefile tests extensions webhelp - mv * $dst/ - - # Backwards compatibility. Will remove eventually. - mkdir -p $out/xml/xsl - ln -s $dst $out/xml/xsl/docbook - ''; - - meta = { - homepage = http://wiki.docbook.org/topic/DocBookXslStylesheets; - description = "XSL stylesheets for transforming DocBook documents into HTML and various other formats"; - maintainers = [ lib.maintainers.eelco ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix index 844789665f7..863f6044402 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix @@ -1,24 +1,47 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: -stdenv.mkDerivation rec { - name = "docbook-xsl-1.78.1"; +let - src = fetchurl { - url = "mirror://sourceforge/docbook/${name}.tar.bz2"; + common = { pname, sha256 }: stdenv.mkDerivation rec { + name = "${pname}-1.78.1"; + + src = fetchurl { + url = "mirror://sourceforge/docbook/${name}.tar.bz2"; + inherit sha256; + }; + + buildPhase = "true"; + + installPhase = + '' + dst=$out/share/xml/${pname} + mkdir -p $dst + rm -rf RELEASE* README* INSTALL TODO NEWS* BUGS install.sh svn* tools log Makefile tests extensions webhelp + mv * $dst/ + + # Backwards compatibility. Will remove eventually. + mkdir -p $out/xml/xsl + ln -s $dst $out/xml/xsl/docbook + ''; + + meta = { + homepage = http://wiki.docbook.org/topic/DocBookXslStylesheets; + description = "XSL stylesheets for transforming DocBook documents into HTML and various other formats"; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.all; + }; + }; + +in { + + docbook_xsl = common { + pname = "docbook-xsl"; sha256 = "0rxl013ncmz1n6ymk2idvx3hix9pdabk8xn01cpcv32wmfb753y9"; }; - buildPhase = "true"; + docbook_xsl_ns = common { + pname = "docbook-xsl-ns"; + sha256 = "1x3sc0axk9z3i6n0jhlsmzlmb723a4sjgslm9g12by6phirdx3ng"; + }; - installPhase = - '' - dst=$out/share/xml/docbook-xsl - mkdir -p $dst - rm -rf RELEASE* README* INSTALL TODO NEWS* BUGS install.sh svn* tools log Makefile tests extensions webhelp - mv * $dst/ - - # Backwards compatibility. Will remove eventually. - mkdir -p $out/xml/xsl - ln -s $dst $out/xml/xsl/docbook - ''; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ab994b5735..b8af711af71 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10507,14 +10507,14 @@ let docbook_xml_ebnf_dtd = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook-ebnf { }; + inherit (callPackages ../data/sgml+xml/stylesheets/xslt/docbook-xsl { }) + docbook_xsl + docbook_xsl_ns; + docbook_xml_xslt = docbook_xsl; - docbook_xsl = callPackage ../data/sgml+xml/stylesheets/xslt/docbook-xsl { }; - docbook5_xsl = docbook_xsl_ns; - docbook_xsl_ns = callPackage ../data/sgml+xml/stylesheets/xslt/docbook-xsl-ns { }; - dosemu_fonts = callPackage ../data/fonts/dosemu-fonts { }; eb-garamond = callPackage ../data/fonts/eb-garamond { }; From 150211741856f6292ebd9ea747f7fef725c84ebc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Aug 2015 17:24:42 +0200 Subject: [PATCH 137/175] sane-backends: Separate doc output --- pkgs/applications/graphics/sane/backends.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/graphics/sane/backends.nix b/pkgs/applications/graphics/sane/backends.nix index 74321549318..66fc4810e7d 100644 --- a/pkgs/applications/graphics/sane/backends.nix +++ b/pkgs/applications/graphics/sane/backends.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { sha256 = "0ba68m6bzni54axjk15i51rya7hfsdliwvqyan5msl7iaid0iir7"; }; + outputs = [ "out" "doc" "man" ]; + udevSupport = hotplugSupport; configureFlags = stdenv.lib.optional (libusb != null) "--enable-libusb_1_0"; From e96ee79006b2af363cd566e555f8383b9bfba47e Mon Sep 17 00:00:00 2001 From: Alexander Lebedev Date: Thu, 27 Aug 2015 18:57:01 +0000 Subject: [PATCH 138/175] qmidiroute: init at 0.3.0 --- .../applications/audio/qmidiroute/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/audio/qmidiroute/default.nix diff --git a/pkgs/applications/audio/qmidiroute/default.nix b/pkgs/applications/audio/qmidiroute/default.nix new file mode 100644 index 00000000000..badac0887a1 --- /dev/null +++ b/pkgs/applications/audio/qmidiroute/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, qt4, alsaLib }: + +stdenv.mkDerivation rec { + version = "0.3.0"; + name = "qmidiroute-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/project/alsamodular/QMidiRoute/${version}/${name}.tar.gz"; + sha256 = "11bfjz14z37v6hk2xyg4vrw423b5h3qgcbviv07g00ws1fgjygm2"; + }; + + buildInputs = [ pkgconfig qt4 alsaLib ]; + + meta = with stdenv.lib; { + description = "MIDI event processor and router"; + longDescription = '' + qmidiroute is a versatile MIDI event processor and router for the ALSA + sequencer. The graphical interface is based on the Qt4 toolkit. + qmidiroute permits setting up an unlimited number of MIDI maps in which + incoming events are selected, modified or even changed in type before + being directed to a dedicated ALSA output port. The maps work in + parallel, and they are organized in tabs. + ''; + + license = licenses.gpl2; + maintainers = [ maintainers.lebastr ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8af711af71..6d3f493ea3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12551,6 +12551,8 @@ let QmidiNet = callPackage ../applications/audio/QmidiNet { }; + qmidiroute = callPackage ../applications/audio/qmidiroute { }; + qmmp = callPackage ../applications/audio/qmmp { }; qrcode = callPackage ../tools/graphics/qrcode {}; From 4e478cbeaa44c2342b92730f5302ad751e90f0a3 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Thu, 27 Aug 2015 22:07:55 +0200 Subject: [PATCH 139/175] cask: 0.7.2 -> 0.7.3 --- pkgs/applications/editors/emacs-modes/cask/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/cask/default.nix b/pkgs/applications/editors/emacs-modes/cask/default.nix index 7d987e73b91..3f1967c7053 100644 --- a/pkgs/applications/editors/emacs-modes/cask/default.nix +++ b/pkgs/applications/editors/emacs-modes/cask/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, emacs, python }: stdenv.mkDerivation rec { - name = "cask-0.7.2"; + name = "cask-0.7.3"; src = fetchgit { url = "https://github.com/cask/cask.git"; - rev = "8d667e1ce3f3aa817a7b996f02058b2441f83958"; - sha256 = "08brrdyz7zsw134zwf4dyj6bj2glflszssfq8vya3mh01s38mfri"; + rev = "717b64a9ba7640ec366e8573da0c01f9c4d57b0c"; + sha256 = "0j18rzgpibisfcci6kcgjs8nlkfi1dw33dxp6ab6zaiarydwgcs5"; }; buildInputs = [ emacs python ]; From 3f14b5f226d2561c986b3d7edeb0a57b4d5d4317 Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 28 Aug 2015 10:12:21 +0900 Subject: [PATCH 140/175] firefox-bin: 40.0.2 -> 40.0.3 --- .../browsers/firefox-bin/sources.nix | 358 +++++++++--------- 1 file changed, 179 insertions(+), 179 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index d302e47f335..b29cdec27e9 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -4,185 +4,185 @@ # ruby generate_source.rb > source.nix { - version = "40.0.2"; + version = "40.0.3"; sources = [ - { locale = "ach"; arch = "linux-i686"; sha1 = "4cd453a4439460164e15ac767483335f0ab153ba"; } - { locale = "ach"; arch = "linux-x86_64"; sha1 = "2915386e271a710daf63b5fa6e4e6450cd339a23"; } - { locale = "af"; arch = "linux-i686"; sha1 = "2c64d95f8f7a82931906bb8ae6fcd6f2c976aa54"; } - { locale = "af"; arch = "linux-x86_64"; sha1 = "b9ca1f6a18283eb9eebd39173c33d7d0bbc5afe2"; } - { locale = "an"; arch = "linux-i686"; sha1 = "0a6c228d7f46bad34b431bb49d6bdc60c2778008"; } - { locale = "an"; arch = "linux-x86_64"; sha1 = "a509951f13eaab7661676f833dd9a83125309c82"; } - { locale = "ar"; arch = "linux-i686"; sha1 = "372dffb81f1be1966e95bba114f982497a2caee0"; } - { locale = "ar"; arch = "linux-x86_64"; sha1 = "82dd88dd2e4ded3c25f7ffd6b21dd51a0b693d43"; } - { locale = "as"; arch = "linux-i686"; sha1 = "52dbcef7858b57652ebd18e8b24af0c656f659e2"; } - { locale = "as"; arch = "linux-x86_64"; sha1 = "aafa712986beb5d28c51f07678f9e1f80489e199"; } - { locale = "ast"; arch = "linux-i686"; sha1 = "0f206582c5f934a490f68d5226d1829397cc45a7"; } - { locale = "ast"; arch = "linux-x86_64"; sha1 = "af49662ae762693ae916fcf491d331ad86acbf66"; } - { locale = "az"; arch = "linux-i686"; sha1 = "c9bbf9024acffabe1651d1ca9d0c13ce574d021b"; } - { locale = "az"; arch = "linux-x86_64"; sha1 = "a946941ad0fa094c54b76f0f31501cdd24582402"; } - { locale = "be"; arch = "linux-i686"; sha1 = "de19ed80796ba4423347654bbab170d72aea24b5"; } - { locale = "be"; arch = "linux-x86_64"; sha1 = "d566f37f8f908d621a51278c40e971be4a277749"; } - { locale = "bg"; arch = "linux-i686"; sha1 = "bb7c41fd32b4b97ae25c1d7b3aee187810800387"; } - { locale = "bg"; arch = "linux-x86_64"; sha1 = "b6063f82ce73e5070c983aa69d9c34dab74bc460"; } - { locale = "bn-BD"; arch = "linux-i686"; sha1 = "41b8d113a8d09d8fd28f4808ea630fcf732bee26"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "4c255a14338a602e9b8827f55c8c3f705a76f421"; } - { locale = "bn-IN"; arch = "linux-i686"; sha1 = "c24df5f5dc5493d912b34e526617ed22075f3bb1"; } - { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "b1be6518bc16874245e5a532d03a2bd7dc4fdc23"; } - { locale = "br"; arch = "linux-i686"; sha1 = "cfea274abe713d3c5df63b21489ba23766c97dad"; } - { locale = "br"; arch = "linux-x86_64"; sha1 = "10e5d0f6435a487b3331b76ac0eee51a2edb3485"; } - { locale = "bs"; arch = "linux-i686"; sha1 = "66462c0af5e9a7f9052db2d9616a44ca08d51713"; } - { locale = "bs"; arch = "linux-x86_64"; sha1 = "3a78840fe663d7876ea00cd6ecb0530f16146adf"; } - { locale = "ca"; arch = "linux-i686"; sha1 = "8321046f8cbba3d3cdea7381f2ec4323b2ba7cfb"; } - { locale = "ca"; arch = "linux-x86_64"; sha1 = "599c81a054ad7ef7c27f3be1da2289ed3404255b"; } - { locale = "cs"; arch = "linux-i686"; sha1 = "89480e776bc5add4c9270f8f92e56d1a0207e629"; } - { locale = "cs"; arch = "linux-x86_64"; sha1 = "7d7d40a7e74670eaaacb66d6a3706710d2d1cd4c"; } - { locale = "cy"; arch = "linux-i686"; sha1 = "087b794e0988484dfd7d67488c3ac197e5529c42"; } - { locale = "cy"; arch = "linux-x86_64"; sha1 = "3fd60bd6b42497d0968095294c94dcc11bdbbeda"; } - { locale = "da"; arch = "linux-i686"; sha1 = "2e22d7ff7c0a7a2f8bbf2c43f5da24c3eaf4ba8c"; } - { locale = "da"; arch = "linux-x86_64"; sha1 = "dc852f942018f08f2c3f56b3315dd039f0dd4159"; } - { locale = "de"; arch = "linux-i686"; sha1 = "a78fb79f0640fc018e4d7807bea41c6239bbdf2e"; } - { locale = "de"; arch = "linux-x86_64"; sha1 = "53a7c3e38d81df588db042bd8ee524aa67713f76"; } - { locale = "dsb"; arch = "linux-i686"; sha1 = "3721ac332975aa52f692bce9467f3919be16b4cb"; } - { locale = "dsb"; arch = "linux-x86_64"; sha1 = "602bee9867cead4ac79c05d8cb99d022de1169c6"; } - { locale = "el"; arch = "linux-i686"; sha1 = "f3809bd2b456b9548cf8415d4f15e08bf64f2561"; } - { locale = "el"; arch = "linux-x86_64"; sha1 = "6ed7be3d3f90ff01f3a8505ea61c69f1dc3f34af"; } - { locale = "en-GB"; arch = "linux-i686"; sha1 = "3bff3a0f76e6744cb1e1ab78a5c24bd9183db1d5"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "87033acbf2d3277e699b1b54552a88bd33590f75"; } - { locale = "en-US"; arch = "linux-i686"; sha1 = "65a852e9774f9f61764d01e4025b64027f10d270"; } - { locale = "en-US"; arch = "linux-x86_64"; sha1 = "99e40bfcbc4146111059cbec1557fbe3a7295285"; } - { locale = "en-ZA"; arch = "linux-i686"; sha1 = "476b5ac7062932584ef634b9bd536495fef974d6"; } - { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "51334ee2ee6bdfd7e0b02ed44d95b9d0e86a73af"; } - { locale = "eo"; arch = "linux-i686"; sha1 = "e2973dc7e1decebb24a4a90e8a4a4307ccd7d151"; } - { locale = "eo"; arch = "linux-x86_64"; sha1 = "4bb52d9197c854ceca4a9d8fed6cec016c823ea7"; } - { locale = "es-AR"; arch = "linux-i686"; sha1 = "2335e0f3bbae6eefdd1aa7ba58530f0ee9bd3534"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "8fdfc2defee83edeabc5648dcf4e4630862424b2"; } - { locale = "es-CL"; arch = "linux-i686"; sha1 = "34201da70923a68566856aaf5f33e33f80c3943a"; } - { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "03ddd10a75a6a779bc0ff1f06f2ac0f4189c21db"; } - { locale = "es-ES"; arch = "linux-i686"; sha1 = "b6456b85055178db737c3b2dbebec14ca7c373ec"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "165c5abc403322964de6fbda189c766c1490f57d"; } - { locale = "es-MX"; arch = "linux-i686"; sha1 = "defd933884c5f97c63e8f07dbd42162d7365b5a6"; } - { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "e0588631c0886ca5785f713c2fd4d52e53c901f6"; } - { locale = "et"; arch = "linux-i686"; sha1 = "732b79384c69659d674a849dfc0a4cc0905af5c0"; } - { locale = "et"; arch = "linux-x86_64"; sha1 = "30ea22676bf24205595fe3cef17f17e5fa7224c0"; } - { locale = "eu"; arch = "linux-i686"; sha1 = "a0dd6bc63af523f12f77da3d93f842434dd45fbe"; } - { locale = "eu"; arch = "linux-x86_64"; sha1 = "02e8d43be34bdd57d999ff34e93289d721fd5e18"; } - { locale = "fa"; arch = "linux-i686"; sha1 = "13cb0fc5c3f2faf5907c71a88d9fb6dcf295534f"; } - { locale = "fa"; arch = "linux-x86_64"; sha1 = "3688cb2d85620d03d8ae90535758384e0eca0b79"; } - { locale = "ff"; arch = "linux-i686"; sha1 = "de4bfeaf65c5db67029f7800d3818f60a15e0a2f"; } - { locale = "ff"; arch = "linux-x86_64"; sha1 = "3b87f8e2cbafc70264da1afabc9d4a365acdf445"; } - { locale = "fi"; arch = "linux-i686"; sha1 = "e0d1d40ae201852a7afb5c5c3995d1eaac461880"; } - { locale = "fi"; arch = "linux-x86_64"; sha1 = "d519fa72ae3acd5c5e9590242a1569e2559e7099"; } - { locale = "fr"; arch = "linux-i686"; sha1 = "4c35aade33675ee9e6ee0ba3d2826da06509f048"; } - { locale = "fr"; arch = "linux-x86_64"; sha1 = "a7f2c8c24766d4ad12a0144007eac93b99ffbc83"; } - { locale = "fy-NL"; arch = "linux-i686"; sha1 = "c809f3baf308c5cd7d9edc1a53f0b7cdb876a97c"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "182c27021f7192c50be9973850a848b138e60d0a"; } - { locale = "ga-IE"; arch = "linux-i686"; sha1 = "8bfa83a569409ae579aaf27f6878f90c9789128b"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "a68688038d975428a232f721da7f638f08fc0157"; } - { locale = "gd"; arch = "linux-i686"; sha1 = "be223957dfcf41db552e4e63ec879e4c21eb40f4"; } - { locale = "gd"; arch = "linux-x86_64"; sha1 = "d226c4ea4f987a9a8f01a8e6365e2c93ae748988"; } - { locale = "gl"; arch = "linux-i686"; sha1 = "482a19d31d1543d2645ba290d6ab2404f200b81d"; } - { locale = "gl"; arch = "linux-x86_64"; sha1 = "3bdac94346710be5c2c160153321f5bd9118c291"; } - { locale = "gu-IN"; arch = "linux-i686"; sha1 = "aafc01904d22edf7e6c4db94b3154875736de3be"; } - { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "3309dc84bf4d0b4f9aafce95f5af3ee3a01acd79"; } - { locale = "he"; arch = "linux-i686"; sha1 = "aa0f6c2f4d8f4cbd974d39cd0ef85ce7795bb00a"; } - { locale = "he"; arch = "linux-x86_64"; sha1 = "17cabcb46375f04a32ac4e156a30b97022406a46"; } - { locale = "hi-IN"; arch = "linux-i686"; sha1 = "51d3c83ff1584c315a18916100a9b2481d8b5ab8"; } - { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "0e725242eada7456e15c91acd63d37018167df71"; } - { locale = "hr"; arch = "linux-i686"; sha1 = "3f68ab7a61fd8b6731aaf3089907d9e436a2e5e1"; } - { locale = "hr"; arch = "linux-x86_64"; sha1 = "5934536499a2ded279a802110d8d8f0e802cc8c9"; } - { locale = "hsb"; arch = "linux-i686"; sha1 = "c212eaaa6329f9872e8545d634551d083e0f2db1"; } - { locale = "hsb"; arch = "linux-x86_64"; sha1 = "b6edd09144919be6932baa037f7f09ed26d5c102"; } - { locale = "hu"; arch = "linux-i686"; sha1 = "63eeba0d15763340d802802008cce554a8bbb07d"; } - { locale = "hu"; arch = "linux-x86_64"; sha1 = "c593a84cfb69ef7ee5d2a8affb15189147d0c2e1"; } - { locale = "hy-AM"; arch = "linux-i686"; sha1 = "b2b63b30ebb9a220b610c0b1696b5da55d641710"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "1c6dcf9b30383a5566448ab4e92ef0a90613e505"; } - { locale = "id"; arch = "linux-i686"; sha1 = "fdaacae2217fe365eb54b977562ed8c889c95de9"; } - { locale = "id"; arch = "linux-x86_64"; sha1 = "9def4f5554110b6af64bc91f4ad0f03a6444dfae"; } - { locale = "is"; arch = "linux-i686"; sha1 = "7b9183a80a87febfd7e8cd57b93e2edabea763a8"; } - { locale = "is"; arch = "linux-x86_64"; sha1 = "a3ab726b981b8763dbddd74a61d85c4576597fe6"; } - { locale = "it"; arch = "linux-i686"; sha1 = "eced59fb6ddd04967917142301435ea121671f62"; } - { locale = "it"; arch = "linux-x86_64"; sha1 = "e80d94b8b8868e357c571710046af3155e558a5f"; } - { locale = "ja"; arch = "linux-i686"; sha1 = "1c3cd61ba760650c7d44d98b8db66b4c7801efad"; } - { locale = "ja"; arch = "linux-x86_64"; sha1 = "e0c4b3f510eb73d06c68b5b91c707ce5c508b05e"; } - { locale = "kk"; arch = "linux-i686"; sha1 = "20ca59199a6a30bd64dcb943c2a1135885a535b4"; } - { locale = "kk"; arch = "linux-x86_64"; sha1 = "87703e39a0ea9c402cc535fb4cc04dca5b9025d4"; } - { locale = "km"; arch = "linux-i686"; sha1 = "17cd8d702482cbc1c4bb377b29e0f278cdfc8e15"; } - { locale = "km"; arch = "linux-x86_64"; sha1 = "e7372fc31e6cd893fc0ea52e2fc4105c249310d3"; } - { locale = "kn"; arch = "linux-i686"; sha1 = "947b986d5cb5454677d7b9bbcebaf437f0bcd16d"; } - { locale = "kn"; arch = "linux-x86_64"; sha1 = "7f99697ebc560e2705e4aae628ad56a132af7eb6"; } - { locale = "ko"; arch = "linux-i686"; sha1 = "b3a76512be4f2b86cad800d46d3f6c9ff9c883db"; } - { locale = "ko"; arch = "linux-x86_64"; sha1 = "3e5c4860e15651ede1ffe569062e23f474b44994"; } - { locale = "lij"; arch = "linux-i686"; sha1 = "36e66cb829024c631f91a9a05e4d4c10c5862c45"; } - { locale = "lij"; arch = "linux-x86_64"; sha1 = "216d0066b5289335c12339dd109d8f11dc4fa937"; } - { locale = "lt"; arch = "linux-i686"; sha1 = "a784ca15952a69965aa377a2dd6a0232ece0f8a4"; } - { locale = "lt"; arch = "linux-x86_64"; sha1 = "f172acd6474891177446b61bd538af09cfb30351"; } - { locale = "lv"; arch = "linux-i686"; sha1 = "161f527142c8d8551509e6132871c4901b2d64e7"; } - { locale = "lv"; arch = "linux-x86_64"; sha1 = "d0428e31ef283749f1691d787ad6983ed0677a50"; } - { locale = "mai"; arch = "linux-i686"; sha1 = "4bd535fdaf01bf8d001bc1147f0ad9e26f0bf39f"; } - { locale = "mai"; arch = "linux-x86_64"; sha1 = "fc2de8c24f0271f56b3af97e8e4bf14179d6122d"; } - { locale = "mk"; arch = "linux-i686"; sha1 = "9aacbee890a7bc3d714d85d16ab2d278dabd8e1b"; } - { locale = "mk"; arch = "linux-x86_64"; sha1 = "75c23b833812a9d0b66727b3ed28a0e494bbacb1"; } - { locale = "ml"; arch = "linux-i686"; sha1 = "cf29131fbf6d768e79ef5228cf066355a46b4466"; } - { locale = "ml"; arch = "linux-x86_64"; sha1 = "df4b6ba0c457f15eee2dcade4882b720c1e39506"; } - { locale = "mr"; arch = "linux-i686"; sha1 = "ab0cc9339d486d576e7004fd35d685421f7853f1"; } - { locale = "mr"; arch = "linux-x86_64"; sha1 = "4b10dd376a6599f60ac85d41d465f136c4d4ebdc"; } - { locale = "ms"; arch = "linux-i686"; sha1 = "3244858bd6405dc507eb4044be6b8ebaf7100e1f"; } - { locale = "ms"; arch = "linux-x86_64"; sha1 = "9db094658b9e6d4849c1ede8438427400704c80c"; } - { locale = "nb-NO"; arch = "linux-i686"; sha1 = "9a907fec062b94a8f8dd7e981ea2ab4f36bcd944"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "eafc796f1597464abe3ffd9353e7d098b528525a"; } - { locale = "nl"; arch = "linux-i686"; sha1 = "fd19ace880cfd29a4612b2543e2eab1fbbabe4a4"; } - { locale = "nl"; arch = "linux-x86_64"; sha1 = "3d8bb5f293a6f18c3f171dcfb52b737a7946aa95"; } - { locale = "nn-NO"; arch = "linux-i686"; sha1 = "0a893fef8363fa980bc2393a2e23241f0c07956c"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "3e066a7834e998422f00e10b65e58ecf9dfc7519"; } - { locale = "or"; arch = "linux-i686"; sha1 = "2448c7e794e926894208abb4d25ea3b4c5db0cbb"; } - { locale = "or"; arch = "linux-x86_64"; sha1 = "a096f8152416d6af72a28fe25a849feb22ab835e"; } - { locale = "pa-IN"; arch = "linux-i686"; sha1 = "d974227fe54d7db75fc3b2fd773cf69ff71d647b"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "b318ede019b019ee108d79e4f355311518a05963"; } - { locale = "pl"; arch = "linux-i686"; sha1 = "c9aa90d984c2112f3e0e629f95b694b6281fe1df"; } - { locale = "pl"; arch = "linux-x86_64"; sha1 = "8b3c1d3ebf013cf1c7bb448131b51920e1475240"; } - { locale = "pt-BR"; arch = "linux-i686"; sha1 = "47318f7ea3655b6fa876d77eea22a499d458b445"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "a1d42692baf6602f69fa436ed5eb6d21c60f3786"; } - { locale = "pt-PT"; arch = "linux-i686"; sha1 = "c97407ba107843f8f1f78ef70028b60bbc94ea87"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "68d1e7771a74e238ce54cff60e7279c672e4fbcd"; } - { locale = "rm"; arch = "linux-i686"; sha1 = "cecb38e05ff1c5e6c0d79781efcf2973db6f68f0"; } - { locale = "rm"; arch = "linux-x86_64"; sha1 = "5f576fdbbc9626fa9ef3986c2611285ea7fb34e3"; } - { locale = "ro"; arch = "linux-i686"; sha1 = "b97dab8ea7387a69f499c6ab9827bc81b0ffd1ad"; } - { locale = "ro"; arch = "linux-x86_64"; sha1 = "6d816a79fc954a186f9a3e9d8a909a392e0c8cb0"; } - { locale = "ru"; arch = "linux-i686"; sha1 = "3f3a3b51d488a4940211951d698c59c33199a0a0"; } - { locale = "ru"; arch = "linux-x86_64"; sha1 = "6d07bd223fd7848c4f92170f299df7091feda8dc"; } - { locale = "si"; arch = "linux-i686"; sha1 = "7b4cf9716f6c4333b143b61ce0ae7f7bf8832839"; } - { locale = "si"; arch = "linux-x86_64"; sha1 = "3887efcc6f8a87bdee12aeaeb1e4ad9666e1fba0"; } - { locale = "sk"; arch = "linux-i686"; sha1 = "5d5f9db2a454e40c20db7728140b1e7b71e0f316"; } - { locale = "sk"; arch = "linux-x86_64"; sha1 = "d8a0e81544d9055f39d0b8e425499e5da7ae2cde"; } - { locale = "sl"; arch = "linux-i686"; sha1 = "f67d1c091a83a129e0f9da21c40a21e54192dfab"; } - { locale = "sl"; arch = "linux-x86_64"; sha1 = "cf404307b7a5c1346c84f12272526ccc34509794"; } - { locale = "son"; arch = "linux-i686"; sha1 = "72d178beda4c3141ccccb0fd75d1a96e72b8f522"; } - { locale = "son"; arch = "linux-x86_64"; sha1 = "aad4b807fcbf460eb0fa0234d36092e0ca75e286"; } - { locale = "sq"; arch = "linux-i686"; sha1 = "72f0b6ff9321bf171e7991853d37416e79db2598"; } - { locale = "sq"; arch = "linux-x86_64"; sha1 = "c25dd452bd1a76d7aff4542caf4fd02f7cdcf751"; } - { locale = "sr"; arch = "linux-i686"; sha1 = "ab0f31e1f704d125d3deb73dae6b5513f4f66cec"; } - { locale = "sr"; arch = "linux-x86_64"; sha1 = "680edf9cb98b47ef92e3a9fbaa1bb66fc927003a"; } - { locale = "sv-SE"; arch = "linux-i686"; sha1 = "10e1fbc3cc3f2284fd28ce06c3af22d7010fa664"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "1317fc854581a50a4291bb38ff6954fe37d25efa"; } - { locale = "ta"; arch = "linux-i686"; sha1 = "81188a3e20db29040202b24f99b073daef759f05"; } - { locale = "ta"; arch = "linux-x86_64"; sha1 = "230488965e68f9170ca7b6623a599e4ec592012d"; } - { locale = "te"; arch = "linux-i686"; sha1 = "ff6048c8c949ef3b4fa821bedd95c046e3a7a7e4"; } - { locale = "te"; arch = "linux-x86_64"; sha1 = "02954fbabaf0688e1588652d5be08cb3784ff2aa"; } - { locale = "th"; arch = "linux-i686"; sha1 = "77759d296e5c85741aad42124e51913005215b71"; } - { locale = "th"; arch = "linux-x86_64"; sha1 = "8572f88439049bff5e32f4e9929f07c23dcde569"; } - { locale = "tr"; arch = "linux-i686"; sha1 = "07101c61d8a1a7a153c9993f29c2ae7bd46c6ae2"; } - { locale = "tr"; arch = "linux-x86_64"; sha1 = "dbd64d165bc9bb01545b6d31acdd4fb874f250a9"; } - { locale = "uk"; arch = "linux-i686"; sha1 = "0e00df0f77fd8c7adb1a7822285a8410df92dd48"; } - { locale = "uk"; arch = "linux-x86_64"; sha1 = "064760c31c2b78fd155a548f18be6bd82746aa7d"; } - { locale = "uz"; arch = "linux-i686"; sha1 = "39e185b485b6808619f4fb0853e161d31dfc07f4"; } - { locale = "uz"; arch = "linux-x86_64"; sha1 = "8842689c5894ea116f637691627f8513e22e00fb"; } - { locale = "vi"; arch = "linux-i686"; sha1 = "db96505385175ae4267ae6774c6f6375db8f7dca"; } - { locale = "vi"; arch = "linux-x86_64"; sha1 = "8a9e2e5b17619857a0a2c795ffd7c04d1a767559"; } - { locale = "xh"; arch = "linux-i686"; sha1 = "2e3e0aeff9143b74e464d532eb4c94dc72165303"; } - { locale = "xh"; arch = "linux-x86_64"; sha1 = "e24a2d824ffb5fe5f1f8678b8567fb58e925f3d4"; } - { locale = "zh-CN"; arch = "linux-i686"; sha1 = "6dbc06e58b5bf2b3b8f109c2ff1840ecfb1fdfd3"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "ae7868f33c6e4b15af3f6f6fcc18814a726d9c9f"; } - { locale = "zh-TW"; arch = "linux-i686"; sha1 = "4a46a545fbd4236b0eff0ade9ce57dc53458ad67"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "acec465483c0a2c445e9a3c9c5166c21308b9697"; } + { locale = "ach"; arch = "linux-i686"; sha1 = "68adee53b26075e18d0ef4d43da4260ec274d861"; } + { locale = "ach"; arch = "linux-x86_64"; sha1 = "8e2cc81fc414fb71e5a83c40b4a4197f6648af78"; } + { locale = "af"; arch = "linux-i686"; sha1 = "f36ae5a72738cfa70c6824a5929cb14faa60be1b"; } + { locale = "af"; arch = "linux-x86_64"; sha1 = "4b7a01e76db920d4aa1cbeb556cbe91b37070304"; } + { locale = "an"; arch = "linux-i686"; sha1 = "a71cc4c7f988f1b5470dec60a73643f53104a1b2"; } + { locale = "an"; arch = "linux-x86_64"; sha1 = "1c47a2b37a88d405a819c7bdbe84489a31e838dd"; } + { locale = "ar"; arch = "linux-i686"; sha1 = "d25ec2c169ea9a953636e0cbd4049095834c808d"; } + { locale = "ar"; arch = "linux-x86_64"; sha1 = "5f588ffb8e21ea15fb78dca128a33be734575e3e"; } + { locale = "as"; arch = "linux-i686"; sha1 = "aadbbc147c65d2436916e81bb43ca342f5c19a9d"; } + { locale = "as"; arch = "linux-x86_64"; sha1 = "9e04c39967e0a667b5a33f7436d555ac25ea4240"; } + { locale = "ast"; arch = "linux-i686"; sha1 = "9062edea598e4ec354259268be1fa2f85b8ba6d0"; } + { locale = "ast"; arch = "linux-x86_64"; sha1 = "98e6cac1de95a571ea6f88b18970c11b8056b8cb"; } + { locale = "az"; arch = "linux-i686"; sha1 = "4c23a1fb7e8ecdd1e20f9d398c387fbd766fa51e"; } + { locale = "az"; arch = "linux-x86_64"; sha1 = "5b4bb2a9906c7475c718ad0abd299606718c3880"; } + { locale = "be"; arch = "linux-i686"; sha1 = "e10d45e9c2de22d9af5db6750f5466d0fddce6d8"; } + { locale = "be"; arch = "linux-x86_64"; sha1 = "ce70351af3ce9f27051ae14e9a529cba9876aeb8"; } + { locale = "bg"; arch = "linux-i686"; sha1 = "e9546468eb2ddf67ea93563bd1a1c69736effa6b"; } + { locale = "bg"; arch = "linux-x86_64"; sha1 = "fb734bc851775335e4dbd795fb7a56ca30a2a7ae"; } + { locale = "bn-BD"; arch = "linux-i686"; sha1 = "36aeba40a75a80ab186bab0024607a263c92a8b5"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "e6f3833728864120906a7409561c09ace56713bb"; } + { locale = "bn-IN"; arch = "linux-i686"; sha1 = "c641603161439f8c982952db76a9a947a5e68f5f"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "97f560a79f9dffd208cc572875c9bd683ce7e0f7"; } + { locale = "br"; arch = "linux-i686"; sha1 = "08e490ecf22f1e6e2646ddb1bba508835593b6ae"; } + { locale = "br"; arch = "linux-x86_64"; sha1 = "e0b84df55b0ae2e216196037f62004d11074c618"; } + { locale = "bs"; arch = "linux-i686"; sha1 = "8f2f9e0870b27f4d184ee98052a78eff64192981"; } + { locale = "bs"; arch = "linux-x86_64"; sha1 = "8fbf417d8e2fe33d926bafc0fe4a4b433bd4ac93"; } + { locale = "ca"; arch = "linux-i686"; sha1 = "db308680eda482ebe59bd7807e433a3761b69160"; } + { locale = "ca"; arch = "linux-x86_64"; sha1 = "888fe735b223b2d233900c1f356de187a92eca02"; } + { locale = "cs"; arch = "linux-i686"; sha1 = "c3a185149605ec5818de19047c3a9be4cc8800b6"; } + { locale = "cs"; arch = "linux-x86_64"; sha1 = "6e6477d578bec18d7e67d35012c5d019f4055c65"; } + { locale = "cy"; arch = "linux-i686"; sha1 = "7990f07ca2fc0f28bdd2e96d5fe227b29f6eebaf"; } + { locale = "cy"; arch = "linux-x86_64"; sha1 = "11457870a82224739a5b02e7645703613b7c207b"; } + { locale = "da"; arch = "linux-i686"; sha1 = "9d96c67f5b22e6f8c114dd39230c666778d872b6"; } + { locale = "da"; arch = "linux-x86_64"; sha1 = "bff7b7716f2195fbb8e746b8e65498283c872710"; } + { locale = "de"; arch = "linux-i686"; sha1 = "7de018d1749c18a37da19db55a3070ef84e62ce4"; } + { locale = "de"; arch = "linux-x86_64"; sha1 = "44fe11de7503409417ad9c7ae0bf39c425c2dc90"; } + { locale = "dsb"; arch = "linux-i686"; sha1 = "2f9a019ff89e8b20d22d2e22cf58002a4d627228"; } + { locale = "dsb"; arch = "linux-x86_64"; sha1 = "f708084b81a3a98ac64e0e2ea4b6f97fe48a7209"; } + { locale = "el"; arch = "linux-i686"; sha1 = "77ddde8a32e0d81d5d7e136324117a4e07aaf7f0"; } + { locale = "el"; arch = "linux-x86_64"; sha1 = "dce4f745d77da895075b10f921b445e0df349edd"; } + { locale = "en-GB"; arch = "linux-i686"; sha1 = "7de8827e2929114f869af44e90dbac306b0ce9e7"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "ead42059b82f9ab565a34fa3d6b3bc0f5a211a50"; } + { locale = "en-US"; arch = "linux-i686"; sha1 = "765f0120c223d07e84bc3ebf00eeef2e2907640e"; } + { locale = "en-US"; arch = "linux-x86_64"; sha1 = "0a317d7a0926e29e6dc8c563cf09fe667141da7d"; } + { locale = "en-ZA"; arch = "linux-i686"; sha1 = "52629a4afcc9f3224e3a8fdd12f2385ffd21cf00"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "d2fa0d6970a88de5125d89ae8263517a9bbc2346"; } + { locale = "eo"; arch = "linux-i686"; sha1 = "fbd01eae326465a8f4efeb08ff44d27f04e2ed66"; } + { locale = "eo"; arch = "linux-x86_64"; sha1 = "08b0f4d181ce1f0db0a799a7876315c6752c76af"; } + { locale = "es-AR"; arch = "linux-i686"; sha1 = "1a6d77533438619715e37b43c97f131ac7066ac0"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "fae63a4b373d2074775dfa67ba7d4320cad59e61"; } + { locale = "es-CL"; arch = "linux-i686"; sha1 = "6068e7326eddf2d36afdd20dee1dd433abb0e3d0"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "010544ad413acf7210c10aa3dc99ef0cdab6b475"; } + { locale = "es-ES"; arch = "linux-i686"; sha1 = "0378eb7346f686a8a25c71febfd933f3080e7e29"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "01647b2981d62e2171f9e7b6e8286c542a00583a"; } + { locale = "es-MX"; arch = "linux-i686"; sha1 = "0f6194bce1a065d7b41fd8a46c52ea38874e9e56"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "04f6cb55cb4f9171adf14c7a11ec0271d6c2cf3e"; } + { locale = "et"; arch = "linux-i686"; sha1 = "1da33a7e75efca19810ab7e739f2b81e0d48c379"; } + { locale = "et"; arch = "linux-x86_64"; sha1 = "44d8f989b04b16eff2bcf4945d3fa4387279dfc7"; } + { locale = "eu"; arch = "linux-i686"; sha1 = "60306283826c048acb1ad0232e9c1461f49f2a95"; } + { locale = "eu"; arch = "linux-x86_64"; sha1 = "16de3bde630a31c9330fd87ed7d994443371d84e"; } + { locale = "fa"; arch = "linux-i686"; sha1 = "728780b2668bb107db51f3804a53923d1a7c8298"; } + { locale = "fa"; arch = "linux-x86_64"; sha1 = "b31affd14286e7462e6c3bca472d88025c2b917b"; } + { locale = "ff"; arch = "linux-i686"; sha1 = "52d009168db00b167df1890dee39580ccca36ab6"; } + { locale = "ff"; arch = "linux-x86_64"; sha1 = "d65def2945ea4222965fa16e653cd0db8eec9454"; } + { locale = "fi"; arch = "linux-i686"; sha1 = "f62e88efed3d68b1ad88dfe9e8111d213b2c713b"; } + { locale = "fi"; arch = "linux-x86_64"; sha1 = "708ffd36d036b4c652ac1f20bf0cba2140035bc9"; } + { locale = "fr"; arch = "linux-i686"; sha1 = "310076f077abdd7834f341091a9541a27ce1f6ce"; } + { locale = "fr"; arch = "linux-x86_64"; sha1 = "5b2e56cf8173b5c4ab0949d9f5d099dbca8f27cb"; } + { locale = "fy-NL"; arch = "linux-i686"; sha1 = "de33f286bf9c6461335dc7cc9b997c6f52de34f6"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "b53848124a0d3d1d71a4e802d99a4344edd91e03"; } + { locale = "ga-IE"; arch = "linux-i686"; sha1 = "f3bdd90591fbaa6a15b1ae671e8633af3a2765ea"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "c8594b0932650c5850a84a35953b7116c432d0a9"; } + { locale = "gd"; arch = "linux-i686"; sha1 = "546818b38dc2e21afa2a51a29c2148bfe39ce33b"; } + { locale = "gd"; arch = "linux-x86_64"; sha1 = "a70e63927324099122edc032bb699e058c1ef36c"; } + { locale = "gl"; arch = "linux-i686"; sha1 = "75d6dc5dc3adc964be970dddc128e13baaac23dd"; } + { locale = "gl"; arch = "linux-x86_64"; sha1 = "2eba733d65e7582a23d84392288d10336e978009"; } + { locale = "gu-IN"; arch = "linux-i686"; sha1 = "97285fae817794cc05e9a121c33aafeff77442cb"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "063536c1cbc29c430a8e01674f3bb62ed94e18d9"; } + { locale = "he"; arch = "linux-i686"; sha1 = "a4be53b79cd1027f517562a0723233643b6e2020"; } + { locale = "he"; arch = "linux-x86_64"; sha1 = "4fcaf3a6347beaac041f9095609a92c03700e911"; } + { locale = "hi-IN"; arch = "linux-i686"; sha1 = "80d5db7c9a65de398663b3dc659723b12cdbe502"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "920bd570abce26d713f11666852fcf5d37d00331"; } + { locale = "hr"; arch = "linux-i686"; sha1 = "5de961d08a5bba30245b714271ab4ed5d24a3bc4"; } + { locale = "hr"; arch = "linux-x86_64"; sha1 = "fb30c3ab5b224a38416eb783ee30c3aa8b4a743b"; } + { locale = "hsb"; arch = "linux-i686"; sha1 = "31113c1b61217820f9a9e3dcace821aef612edd7"; } + { locale = "hsb"; arch = "linux-x86_64"; sha1 = "381bce247ea65fee04ee94d56e70cd30cc6959bd"; } + { locale = "hu"; arch = "linux-i686"; sha1 = "90515b7c36553cdf6b88b44146766c52d1a7acd5"; } + { locale = "hu"; arch = "linux-x86_64"; sha1 = "be0542fc76fedf82b46031dbeb9f4173be2a5313"; } + { locale = "hy-AM"; arch = "linux-i686"; sha1 = "4389ed68236bdc4697f3c8e5c53fe986ccb5f277"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "0bb311890b604d1300ffa887984b4217cfb3b925"; } + { locale = "id"; arch = "linux-i686"; sha1 = "8415b519f19a3c52a5d8418046a7a67d118a38e1"; } + { locale = "id"; arch = "linux-x86_64"; sha1 = "e492caab12e6dace9dc763209a8b0803e8216d2f"; } + { locale = "is"; arch = "linux-i686"; sha1 = "663d406a587449f33561173d6e6d275964b9172d"; } + { locale = "is"; arch = "linux-x86_64"; sha1 = "0f649b13c2dad302b0cf449915f5c1a5ab7e198c"; } + { locale = "it"; arch = "linux-i686"; sha1 = "490aeed8cd9878d0f22ea99df674d1dbe134a6f3"; } + { locale = "it"; arch = "linux-x86_64"; sha1 = "2fbe0baed7379d717174be8dee4b879e6e4afd81"; } + { locale = "ja"; arch = "linux-i686"; sha1 = "64144069a001bce53651aa5b8ec835c8c61bce1b"; } + { locale = "ja"; arch = "linux-x86_64"; sha1 = "66563588c41fed8e542c89756dc235773c6d201b"; } + { locale = "kk"; arch = "linux-i686"; sha1 = "c7e4a6544d4062958d48be26df3738b15871edcd"; } + { locale = "kk"; arch = "linux-x86_64"; sha1 = "5a0c5b2dd2dfe83ea9551fd63c249bc6b41c8afc"; } + { locale = "km"; arch = "linux-i686"; sha1 = "5f8bbbd2b77447660022464d19b3bb316eeb6b53"; } + { locale = "km"; arch = "linux-x86_64"; sha1 = "8211373a9ab45f43f2a895049f49c2b9b7af3670"; } + { locale = "kn"; arch = "linux-i686"; sha1 = "48b72a568ea55462d0d80194292ada525d24ee10"; } + { locale = "kn"; arch = "linux-x86_64"; sha1 = "27fbe84930417244c900ae864589fd063358e741"; } + { locale = "ko"; arch = "linux-i686"; sha1 = "f185c79195b7018edc97bd698d2f2f4f0f619968"; } + { locale = "ko"; arch = "linux-x86_64"; sha1 = "bcb4ceb162ae954a6c79ac6e83655b981eb0c168"; } + { locale = "lij"; arch = "linux-i686"; sha1 = "037516a147c18d03a74243ea680ec2da7b893b2f"; } + { locale = "lij"; arch = "linux-x86_64"; sha1 = "1a2efb6b3253da2e525b25b1e5cf794da203a112"; } + { locale = "lt"; arch = "linux-i686"; sha1 = "0200e608a4339158bafdafe32f39581d11ca4fea"; } + { locale = "lt"; arch = "linux-x86_64"; sha1 = "b5dd68b8d170b577f49508db110a7e3ef9aa1504"; } + { locale = "lv"; arch = "linux-i686"; sha1 = "5d9a22b515130e8c351fbbc71c5ee9c2586a98ca"; } + { locale = "lv"; arch = "linux-x86_64"; sha1 = "2b49dc4f3e43c4812239798b9096f4e89c5dc101"; } + { locale = "mai"; arch = "linux-i686"; sha1 = "530dfc4740f6c9c45163d51a49d4f6da8a1442c2"; } + { locale = "mai"; arch = "linux-x86_64"; sha1 = "927c9ca797e463336a8a7c66fef59fa585a0e985"; } + { locale = "mk"; arch = "linux-i686"; sha1 = "71984f44931f8c6e21a0e5a78d33301e9efd0c56"; } + { locale = "mk"; arch = "linux-x86_64"; sha1 = "14df4792bebc70fb27aba0e8fa9fa570b3c66cd2"; } + { locale = "ml"; arch = "linux-i686"; sha1 = "8301bc4d6919b849e1e0529d79fd56dfd7941e96"; } + { locale = "ml"; arch = "linux-x86_64"; sha1 = "5f7f352c4c6a316bfd8aa825771178be5e15def0"; } + { locale = "mr"; arch = "linux-i686"; sha1 = "2da181729cd1b9816d9530bfe2da47324595ceae"; } + { locale = "mr"; arch = "linux-x86_64"; sha1 = "4665e54e425d3b783c2ef045c7d4908862a604db"; } + { locale = "ms"; arch = "linux-i686"; sha1 = "48c57c3952cd918b4547f3aa17e52f856cb441d6"; } + { locale = "ms"; arch = "linux-x86_64"; sha1 = "769b7e80547be03bc81153c56da69b0660672a5b"; } + { locale = "nb-NO"; arch = "linux-i686"; sha1 = "c5123a9df2463883c38d748c360476ec16afafbd"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "50899fd2ddeeaa0011aa68f80ea23af808a2b13d"; } + { locale = "nl"; arch = "linux-i686"; sha1 = "8d2fa9624fe78538ac3be7afef67b5f077ea9087"; } + { locale = "nl"; arch = "linux-x86_64"; sha1 = "1ce05cc5d619ad8056720ee0a3aa1c142d323577"; } + { locale = "nn-NO"; arch = "linux-i686"; sha1 = "fc1e15e364b4b35ee097cb8a8e58f193cfab07fe"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "750189f10439b7d0592b5b1e5478571778a7b80c"; } + { locale = "or"; arch = "linux-i686"; sha1 = "562b5113560d43ab0332f12eb5b77f700adc3cac"; } + { locale = "or"; arch = "linux-x86_64"; sha1 = "7eea2b63095baaaf4077d21aec79a0262014231f"; } + { locale = "pa-IN"; arch = "linux-i686"; sha1 = "a474b711304003f7872f4d89482e460d6a5c6809"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "b44b52752754082dafa7cc2fe3ab820c15ad9dee"; } + { locale = "pl"; arch = "linux-i686"; sha1 = "5b4b8acd59a82feed1015e96efef60693bebc670"; } + { locale = "pl"; arch = "linux-x86_64"; sha1 = "be13540ad54f006884e5b15c80e60c24739a3afd"; } + { locale = "pt-BR"; arch = "linux-i686"; sha1 = "289f94519a382e07e9ea85c09c50ee0c1e4c78f8"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "ee789e0347ae16caeb803db227f917c2dec7402f"; } + { locale = "pt-PT"; arch = "linux-i686"; sha1 = "fdef92aba85eb308f77d5d218eab13ce1869720d"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "dac1e72db319e193b014d53ec2a937939bfda4ee"; } + { locale = "rm"; arch = "linux-i686"; sha1 = "8bdee17c004721832b978028c8249151522d1a53"; } + { locale = "rm"; arch = "linux-x86_64"; sha1 = "876ea6b07a58dcab72cc431bd4a956f6631616a4"; } + { locale = "ro"; arch = "linux-i686"; sha1 = "4de224d9b431e802274878b1ded2831a7976772d"; } + { locale = "ro"; arch = "linux-x86_64"; sha1 = "a620baccf62ead31da80d384ea65db816240180f"; } + { locale = "ru"; arch = "linux-i686"; sha1 = "979efbef49bbe7bdd21bb8b6cddf1c79d21e6d7c"; } + { locale = "ru"; arch = "linux-x86_64"; sha1 = "cce4b5be59a7072aee27b27496cfd2b36995592e"; } + { locale = "si"; arch = "linux-i686"; sha1 = "64fce36b5536da41b0d6e2144b1d8458fd29c1ec"; } + { locale = "si"; arch = "linux-x86_64"; sha1 = "cdf1ccb39f324ada803ebc606ef86f96b813151b"; } + { locale = "sk"; arch = "linux-i686"; sha1 = "a9933f868908c2dd361df41836c8af32e5849f48"; } + { locale = "sk"; arch = "linux-x86_64"; sha1 = "5462d38f1ea28c5a0abf7523f039f5ae0b4e860a"; } + { locale = "sl"; arch = "linux-i686"; sha1 = "a7e555402c5d7460696b86a2001333f66951a4b1"; } + { locale = "sl"; arch = "linux-x86_64"; sha1 = "ded2864cea9cdb70f25eaea61d6be6d4d5aaf822"; } + { locale = "son"; arch = "linux-i686"; sha1 = "fe596ad2b09ada772a38e7504f56776ee382851e"; } + { locale = "son"; arch = "linux-x86_64"; sha1 = "c920476a3e726708b447a7c3f9b38223fb5c705c"; } + { locale = "sq"; arch = "linux-i686"; sha1 = "16b4033cd9a05717ba5b32e57935a2a9b2e86e1e"; } + { locale = "sq"; arch = "linux-x86_64"; sha1 = "dfbf24d40bd5c098aa4c00be18db9adeb278b8a1"; } + { locale = "sr"; arch = "linux-i686"; sha1 = "18e143882f23f6bd2ea7b99849d840c5649b67da"; } + { locale = "sr"; arch = "linux-x86_64"; sha1 = "c748cbc2444151a2df6dc497b26bb6107cf603a0"; } + { locale = "sv-SE"; arch = "linux-i686"; sha1 = "36abc5c42eaf284249612e2bcf5940aeedadc6b7"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "73e1b14a3f00d73f85aced9b83cc281da6fff8eb"; } + { locale = "ta"; arch = "linux-i686"; sha1 = "621451f0be0f7d3edab0f4fdfaa2199d7e18941b"; } + { locale = "ta"; arch = "linux-x86_64"; sha1 = "89a750bd28b600375823f92fac3c1ac28e26f24a"; } + { locale = "te"; arch = "linux-i686"; sha1 = "0cab27456eb5b5124a848c1fcda70e3d8f2fd9d9"; } + { locale = "te"; arch = "linux-x86_64"; sha1 = "80c1b1e5cc6385f1e8b6922024726c36bc3360fb"; } + { locale = "th"; arch = "linux-i686"; sha1 = "4c23cebce4f2548f8692d5d36ab4295bc05a4597"; } + { locale = "th"; arch = "linux-x86_64"; sha1 = "e06d1ae0f6dc90766de010102864da5cccca14df"; } + { locale = "tr"; arch = "linux-i686"; sha1 = "0916aaa3a68831ad887708d13770e29edd129ea9"; } + { locale = "tr"; arch = "linux-x86_64"; sha1 = "a875fa64a788e3fe4b115fc01ad47b631d8aba27"; } + { locale = "uk"; arch = "linux-i686"; sha1 = "d9054dcf7d37ee6e88e462926d5f769bc1392342"; } + { locale = "uk"; arch = "linux-x86_64"; sha1 = "da23b4a2c9e4434ff927c6af81a3c823e546c24e"; } + { locale = "uz"; arch = "linux-i686"; sha1 = "ee12407db146542b1094342fd618678a8f6d20a3"; } + { locale = "uz"; arch = "linux-x86_64"; sha1 = "e4c433f31561006c5ba891ca701a03713d30e115"; } + { locale = "vi"; arch = "linux-i686"; sha1 = "07d95dbe0e967732a90b8c6dd1366010791a5286"; } + { locale = "vi"; arch = "linux-x86_64"; sha1 = "18b0a04c1e38476d85457b0a79942dbe2a0b6b04"; } + { locale = "xh"; arch = "linux-i686"; sha1 = "c4e1f30a92da9ded560209d9a4b8784ec19f9fa8"; } + { locale = "xh"; arch = "linux-x86_64"; sha1 = "22bfdd2d772f6080dc569b86f27e736c38e99374"; } + { locale = "zh-CN"; arch = "linux-i686"; sha1 = "1d72f825659eec22f52cacdcf4f5890957e8a38e"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "cd1cea8be94c3c4318e0bf9c283acade45f846ff"; } + { locale = "zh-TW"; arch = "linux-i686"; sha1 = "8ddfad29ebeccdddd3e5cdff3d8167a671e6821c"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "b4b36e9624ba93ddea2cca52d974acb67ba3407b"; } ]; } From a16611948650e45bbd9e7a7fcae357e4445e51a8 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Thu, 27 Aug 2015 20:35:46 -0700 Subject: [PATCH 141/175] vimproc: Fix when run on non-NixOS linux distros Prior to this change, if there exists a /lib*/ld-linux*.so.2 on a system, vimproc will try to load vimproc_linux64.so or vimproc_linux32.so instead of vimproc_unix.so, which is what nix actually builds. --- pkgs/misc/vim-plugins/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 23f8b0e16e3..668bbf7d571 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -647,7 +647,10 @@ rec { buildInputs = [ which ]; buildPhase = '' - sed -i 's/vimproc_mac\.so/vimproc_unix\.so/' autoload/vimproc.vim + substituteInPlace autoload/vimproc.vim \ + --replace vimproc_mac.so vimproc_unix.so \ + --replace vimproc_linux64.so vimproc_unix.so \ + --replace vimproc_linux32.so vimproc_unix.so make -f make_unix.mak ''; }; From 7f3566da8a74bcb013503c7439d8ec9568b6d8b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Fri, 28 Aug 2015 05:55:56 +0200 Subject: [PATCH 142/175] services.xserver.displayManager.gdm.autoLogin: add description --- nixos/modules/services/x11/display-managers/gdm.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 245c18ee2d9..ccf0f911081 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -25,6 +25,9 @@ in autoLogin = mkOption { default = {}; + description = '' + Auto login configuration attrset. + ''; type = types.submodule { options = { @@ -78,7 +81,7 @@ in users.extraGroups.gdm.gid = config.ids.gids.gdm; services.xserver.displayManager.job = - { + { environment = { GDM_X_SERVER = "${cfg.xserverBin} ${cfg.xserverArgs}"; GDM_SESSIONS_DIR = "${cfg.session.desktops}"; @@ -177,7 +180,7 @@ in "auth required pam_deny.so"} account sufficient pam_unix.so - + password requisite pam_unix.so nullok sha512 ${optionalString config.security.pam.enableEcryptfs "password optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} From 6ec74dfdef5aa7c41ca229c3a0f69fdb402905fb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 28 Aug 2015 09:28:31 +0200 Subject: [PATCH 143/175] gmpy/gmpy2 disable for PyPy gmpy and gmpy2 are both extension modules that cannot be used with PyPy. --- pkgs/top-level/python-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 42db423a451..d992d5fef6a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3531,6 +3531,7 @@ let gmpy = buildPythonPackage rec { name = "gmpy-1.17"; + disabled = isPyPy; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/g/gmpy/${name}.zip"; @@ -3550,7 +3551,8 @@ let gmpy2 = buildPythonPackage rec { name = "gmpy2-2.0.6"; - + disabled = isPyPy; + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/g/gmpy2/${name}.zip"; md5 = "7365d880953ba54c2cdcf171c7e19b2b"; From d7d619f2cb4ea9573d9353a22d72ff30c59470e9 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 28 Aug 2015 10:36:12 +0200 Subject: [PATCH 144/175] nixos gdm: fix enable description --- nixos/modules/services/x11/display-managers/gdm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index ccf0f911081..b9808f1ffa6 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -19,7 +19,7 @@ in services.xserver.displayManager.gdm = { enable = mkEnableOption '' - Whether to enable GDM as the display manager. + GDM as the display manager. GDM is very experimental and may render system unusable. ''; From 0619a23236d56bcc538a522038bd273cc3ff8cd8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Aug 2015 11:26:44 +0200 Subject: [PATCH 145/175] firefox: Update to 40.0.3 --- pkgs/applications/networking/browsers/firefox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 2c433d12db5..ff206c50f34 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -16,14 +16,14 @@ assert stdenv.cc ? libc && stdenv.cc.libc != null; -let version = "40.0.2"; in +let version = "40.0.3"; in stdenv.mkDerivation rec { name = "firefox-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; - sha1 = "b5d79fa3684284bfeb7277e99c756b8688e8121d"; + sha1 = "6ddda46bd6540ab3ae932fbb5ffec8e9a85cab13"; }; buildInputs = From 77354ebacd57cf43590b5f658ab777b533d7cc0f Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 28 Aug 2015 11:35:15 +0200 Subject: [PATCH 146/175] gcr: 3.14.0 -> 3.16.0, should fix race condition during build --- pkgs/desktops/gnome-3/3.16/core/gcr/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix index a4a26bca192..abd5074685a 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix @@ -3,11 +3,11 @@ , gobjectIntrospection, makeWrapper, libxslt, vala, gnome3 }: stdenv.mkDerivation rec { - name = "gcr-3.14.0"; + name = "gcr-${gnome3.version}.0"; src = fetchurl { - url = "mirror://gnome/sources/gcr/3.14/${name}.tar.xz"; - sha256 = "2a2231147a01e2061f57fa9ca77557ff97bc6ceab028cee5528079f4b2fca63d"; + url = "mirror://gnome/sources/gcr/${gnome3.version}/${name}.tar.xz"; + sha256 = "0xfhi0w358lvca1jjx24x2gm67mif33dsnmi9cv5i0f83ks8vzpc"; }; buildInputs = [ @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { #doCheck = true; + enableParallelBuilding = true; + preFixup = '' wrapProgram "$out/bin/gcr-viewer" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" From 9d82f7e53e66e5594b0c8b82f6c415a0a386b580 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Aug 2015 12:36:45 +0200 Subject: [PATCH 147/175] Revert "Apache service module: allow compression" This reverts commit 164f6ff2a8485c1130cd710992a6084258cdad28 per https://github.com/NixOS/nixpkgs/pull/9407#issuecomment-134523359 (it's too site-specific). Furthermore this should be an option at the virtual host level. --- .../web-servers/apache-httpd/default.nix | 31 +------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index e3f1a7fb1bd..7350a6a68c7 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -117,7 +117,6 @@ let ] ++ (if mainCfg.multiProcessingModule == "prefork" then [ "cgi" ] else [ "cgid" ]) ++ optional enableSSL "ssl" - ++ optional mainCfg.enableCompression "deflate" ++ extraApacheModules; @@ -177,27 +176,6 @@ let SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5:!EXP ''; - # From http://paulstamatiou.com/how-to-optimize-your-apache-site-with-mod-deflate/ - compressConf = '' - SetOutputFilter DEFLATE - - # Don't compress binaries - SetEnvIfNoCase Request_URI .(?:exe|t?gz|zip|iso|tar|bz2|sit|rar) no-gzip dont-vary - # Don't compress images - SetEnvIfNoCase Request_URI .(?:gif|jpe?g|jpg|ico|png) no-gzip dont-vary - # Don't compress PDFs - SetEnvIfNoCase Request_URI .pdf no-gzip dont-vary - # Don't compress flash files (only relevant if you host your own videos) - SetEnvIfNoCase Request_URI .flv no-gzip dont-vary - # Netscape 4.X has some problems - BrowserMatch ^Mozilla/4 gzip-only-text/html - # Netscape 4.06-4.08 have some more problems - BrowserMatch ^Mozilla/4.0[678] no-gzip - # MSIE masquerades as Netscape, but it is fine - BrowserMatch \bMSIE !no-gzip !gzip-only-text/html - # Make sure proxies don't deliver the wrong content - Header append Vary User-Agent env=!dont-vary - ''; mimeConf = '' TypesConfig ${httpd}/conf/mime.types @@ -373,7 +351,6 @@ let ${mimeConf} ${loggingConf} ${browserHacks} - ${optionalString mainCfg.enableCompression compressConf} Include ${httpd}/conf/extra/httpd-default.conf Include ${httpd}/conf/extra/httpd-autoindex.conf @@ -446,7 +423,7 @@ in enable = mkOption { type = types.bool; default = false; - description = "Enable the Apache HTTP Server."; + description = "Whether to enable the Apache HTTP Server."; }; package = mkOption { @@ -609,12 +586,6 @@ in description = "Maximum number of httpd requests answered per httpd child (prefork), 0 means unlimited"; }; - - enableCompression = mkOption { - type = types.bool; - default = false; - description = "Enable compression of responses using mod_deflate."; - }; } # Include the options shared between the main server and virtual hosts. From 1852e65776b7789f9cd4f48f248112740ec4692f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Aug 2015 13:27:51 +0200 Subject: [PATCH 148/175] Fix tests that use the Valgrind docs --- nixos/tests/firefox.nix | 2 +- nixos/tests/kde4.nix | 2 +- nixos/tests/proxy.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix index 67a2779afc2..1bdabe93fec 100644 --- a/nixos/tests/firefox.nix +++ b/nixos/tests/firefox.nix @@ -14,7 +14,7 @@ import ./make-test.nix ({ pkgs, ... }: { testScript = '' $machine->waitForX; - $machine->execute("firefox file://${pkgs.valgrind}/share/doc/valgrind/html/index.html &"); + $machine->execute("firefox file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html &"); $machine->waitForWindow(qr/Valgrind/); $machine->sleep(40); # wait until Firefox has finished loading the page $machine->screenshot("screen"); diff --git a/nixos/tests/kde4.nix b/nixos/tests/kde4.nix index 981813ba2bd..dc61658cd1c 100644 --- a/nixos/tests/kde4.nix +++ b/nixos/tests/kde4.nix @@ -15,7 +15,7 @@ import ./make-test.nix ({ pkgs, ... }: { services.httpd.enable = true; services.httpd.adminAddr = "foo@example.org"; - services.httpd.documentRoot = "${pkgs.valgrind}/share/doc/valgrind/html"; + services.httpd.documentRoot = "${pkgs.valgrind.doc}/share/doc/valgrind/html"; services.xserver.displayManager.kdm.enable = true; services.xserver.displayManager.kdm.extraConfig = diff --git a/nixos/tests/proxy.nix b/nixos/tests/proxy.nix index 1653c9b2fda..b43ce1b8e68 100644 --- a/nixos/tests/proxy.nix +++ b/nixos/tests/proxy.nix @@ -7,7 +7,7 @@ let { services.httpd.enable = true; services.httpd.adminAddr = "foo@example.org"; - services.httpd.documentRoot = "${pkgs.valgrind}/share/doc/valgrind/html"; + services.httpd.documentRoot = "${pkgs.valgrind.doc}/share/doc/valgrind/html"; networking.firewall.allowedTCPPorts = [ 80 ]; }; From 01587f02a2eee51385145d361c77d12925e4ebbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 28 Aug 2015 13:59:47 +0200 Subject: [PATCH 149/175] hedgewars: 0.9.20.5 -> 0.9.21, fix build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 199be0273eb347a432d74cd50d9ef6083c73c1dd) Signed-off-by: Domen Kožar --- pkgs/games/hedgewars/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index bb776a7a10d..b92a14d84c2 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -1,27 +1,27 @@ { SDL_image, SDL_ttf, SDL_net, fpc, qt4, ghcWithPackages, ffmpeg, freeglut , stdenv, makeWrapper, fetchurl, cmake, pkgconfig, lua5_1, SDL, SDL_mixer -, zlib, libpng, mesa +, zlib, libpng, mesa, physfs }: let ghc = ghcWithPackages (pkgs: with pkgs; [ - network vector utf8-string bytestring-show random hslogger dataenc + network vector utf8-string bytestring-show random hslogger dataenc SHA entropy zlib_0_5_4_2 ]); in stdenv.mkDerivation rec { - version = "0.9.20.5"; + version = "0.9.21"; name = "hedgewars-${version}"; src = fetchurl { url = "http://download.gna.org/hedgewars/hedgewars-src-${version}.tar.bz2"; - sha256 = "1k5dq14s9pshrqlz8vnix237bcapfif4k3rc4yj4cmwdx1pqkl56"; + sha256 = "0abnzpyq6sxlfcz5b0kh6r7n1692dwrgsdsr4s216xhh9n19xm0w"; }; buildInputs = [ SDL_ttf SDL_net cmake pkgconfig lua5_1 SDL SDL_mixer SDL_image fpc - qt4 ghc ffmpeg freeglut makeWrapper + qt4 ghc ffmpeg freeglut makeWrapper physfs ]; - patches = [ ./fix-ghc-7.8-build-failure.diff ]; + patches = [ ./21eb5b79072b147d0a9b7fafca98501e7056c834.patch ]; preBuild = '' export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL_image}/lib @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapProgram $out/bin/hwengine --prefix LD_LIBRARY_PATH : $LD_LIBRARY_PATH:${mesa}/lib/:${freeglut}/lib + wrapProgram $out/bin/hwengine --prefix LD_LIBRARY_PATH : $LD_LIBRARY_PATH:${mesa}/lib/:${freeglut}/lib:${physfs}/lib ''; meta = with stdenv.lib; { From 01a874b3cfd268261f660474377826dfb53a126c Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 28 Aug 2015 15:17:14 +0200 Subject: [PATCH 150/175] gcloud-golang: mark as broken --- pkgs/top-level/go-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 3fcc63421b9..6d3354d27c9 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -619,6 +619,8 @@ let goPackagePath = "google.golang.org/cloud"; buildInputs = [ net oauth2 protobuf google-api-go-client grpc ]; excludedPackages = "oauth2"; + + meta.broken = true; }; gcloud-golang-compute-metadata = buildGoPackage rec { From 0f041e5487e01244f56916282ec56df7a1e306ec Mon Sep 17 00:00:00 2001 From: Enrico Fasoli Date: Thu, 27 Aug 2015 00:38:06 +0000 Subject: [PATCH 151/175] ne: init at 3.0.1 ne: building improvements --- pkgs/applications/editors/ne/default.nix | 34 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/editors/ne/default.nix diff --git a/pkgs/applications/editors/ne/default.nix b/pkgs/applications/editors/ne/default.nix new file mode 100644 index 00000000000..4e8324894ab --- /dev/null +++ b/pkgs/applications/editors/ne/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, ncurses, texinfo, tetex, perl, ghostscript }: + + +stdenv.mkDerivation rec { + name = "ne-${version}"; + version = "3.0.1"; + src = fetchFromGitHub { + owner = "vigna"; + repo = "ne"; + rev = version; + sha256 = "05inzhlqlf4ka22q78q389pr34bsb4lgp1i5qh550vjkb2cvbdfp"; + }; + buildInputs = [ ncurses tetex texinfo perl ghostscript ]; + dontBuild = true; + installPhase = '' + substituteInPlace src/makefile --replace "CC=c99" "cc=gcc" + substituteInPlace src/makefile --replace "-lcurses" "-lncurses" + substituteInPlace makefile --replace "./version.pl" "perl version.pl" + cd doc && make && cd .. + cd src && make && cd .. + make PREFIX=$out install + ''; + + meta = { + description = "the nice editor"; + homepage = https://github.com/vigna/ne; + longDescription = '' + ne is a free (GPL'd) text editor based on the POSIX standard that runs (we hope) on almost any +UN*X machine. ne is easy to use for the beginner, but powerful and fully configurable for the wizard, +and most sparing in its resource usage. See the manual for some highlights of ne's features. + ''; + license = stdenv.lib.licenses.gpl3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 649ea43c149..3163f4ab861 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12338,6 +12338,8 @@ let ncdc = callPackage ../applications/networking/p2p/ncdc { }; + ne = callPackage ../applications/editors/ne { }; + nedit = callPackage ../applications/editors/nedit { motif = lesstif; }; From 2927f1a8832159fb25238e2ad5ef8e202bb96935 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 28 Aug 2015 16:24:08 +0200 Subject: [PATCH 152/175] nibabel: remove failing test One of the tests explicitly calls python, which will fail with python3. The issue has been reported upstream, https://github.com/nipy/nibabel/issues/341 For now, remove the test. Fix also the license type. --- pkgs/top-level/python-packages.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d992d5fef6a..0c690dc0ad3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8406,11 +8406,17 @@ let nose modules.sqlite3 ]; + + # Test does not work on Py3k because it calls 'python'. + # https://github.com/nipy/nibabel/issues/341 + preCheck = '' + rm nisext/tests/test_testers.py + ''; meta = { homepage = http://nipy.org/nibabel/; description = "Access a multitude of neuroimaging data formats"; - license = "BSD"; + license = licenses.mit; }; }; From 89cec3c895030f37fd0c9db7f95fef507826bd84 Mon Sep 17 00:00:00 2001 From: Sibi Date: Fri, 28 Aug 2015 19:56:05 +0530 Subject: [PATCH 153/175] Add myself as maintainer (close #9495). Related to https://github.com/NixOS/cabal2nix/pull/196 --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 7c136725061..a1ec32aba0e 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -204,6 +204,7 @@ pmahoney = "Patrick Mahoney "; pmiddend = "Philipp Middendorf "; prikhi = "Pavan Rikhi "; + psibi = "Sibi "; pSub = "Pascal Wittmann "; puffnfresh = "Brian McKenna "; qknight = "Joachim Schiele "; From 15aa28f71b79d89ba2e717e9fbb401b3463870a8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 28 Aug 2015 16:51:07 +0200 Subject: [PATCH 154/175] pyfribidi: disable for pypy Extension module. pypy is unsupported. --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d992d5fef6a..ae2474c07af 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5671,7 +5671,7 @@ let pyfribidi = buildPythonPackage rec { version = "0.11.0"; name = "pyfribidi-${version}"; - disabled = isPy3k; + disabled = isPy3k || isPyPy; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pyfribidi/${name}.zip"; From 93e8a121c8438f739157f819f051c2a493b9874f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 28 Aug 2015 17:09:26 +0200 Subject: [PATCH 155/175] hedgewars: add missing patch --- ...5b79072b147d0a9b7fafca98501e7056c834.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/games/hedgewars/21eb5b79072b147d0a9b7fafca98501e7056c834.patch diff --git a/pkgs/games/hedgewars/21eb5b79072b147d0a9b7fafca98501e7056c834.patch b/pkgs/games/hedgewars/21eb5b79072b147d0a9b7fafca98501e7056c834.patch new file mode 100644 index 00000000000..1de99542bdb --- /dev/null +++ b/pkgs/games/hedgewars/21eb5b79072b147d0a9b7fafca98501e7056c834.patch @@ -0,0 +1,36 @@ +From 21eb5b79072b147d0a9b7fafca98501e7056c834 Mon Sep 17 00:00:00 2001 +From: koda +Date: Tue, 2 Jun 2015 19:51:04 +0100 +Subject: [PATCH] Fix building hedgewars-server + +--- + gameServer/CoreTypes.hs | 2 +- + gameServer/hedgewars-server.cabal | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gameServer/CoreTypes.hs b/gameServer/CoreTypes.hs +index 553e722..2c75153 100644 +--- a/gameServer/CoreTypes.hs ++++ b/gameServer/CoreTypes.hs +@@ -38,7 +38,7 @@ import RoomsAndClients + instance NFData B.ByteString + #endif + +-instance NFData (Chan a) ++instance NFData (Chan a) where rnf a = () + + instance NFData Action where + rnf (AnswerClients chans msg) = chans `deepseq` msg `deepseq` () +diff --git a/gameServer/hedgewars-server.cabal b/gameServer/hedgewars-server.cabal +index 122f2ef..f36a190 100644 +--- a/gameServer/hedgewars-server.cabal ++++ b/gameServer/hedgewars-server.cabal +@@ -33,7 +33,7 @@ Executable hedgewars-server + utf8-string, + SHA, + entropy, +- zlib ++ zlib >= 0.5.3 && < 0.6 + + if !os(windows) + build-depends: unix From 624eba18859ed09dd2acb37316a2aef450c8be3a Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 28 Aug 2015 17:22:02 +0200 Subject: [PATCH 156/175] fuppes: mark as broken This package has been broken since 2014-01-20, according to Hydra [1]. I tried various ad-hoc patching & adding missing dependencies, uncovering yet more errors. Updating is also out of the question, as nixpkgs already contains the latest version. [1]: https://hydra.nixos.org/build/25188337 --- pkgs/tools/networking/fuppes/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/fuppes/default.nix b/pkgs/tools/networking/fuppes/default.nix index 711c3516bda..67e3b581f24 100644 --- a/pkgs/tools/networking/fuppes/default.nix +++ b/pkgs/tools/networking/fuppes/default.nix @@ -50,5 +50,7 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.pierron ]; platforms = stdenv.lib.platforms.all; + + broken = true; }; } From 18926d981c9682de43f45ac56dbed66abd224f67 Mon Sep 17 00:00:00 2001 From: Kosyrev Serge <_deepfire@feelingofgreen.ru> Date: Fri, 28 Aug 2015 19:49:14 +0300 Subject: [PATCH 157/175] ghcNokinds: 2015-07-18 -> 2015-08-26 --- pkgs/development/compilers/ghc/nokinds.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/nokinds.nix b/pkgs/development/compilers/ghc/nokinds.nix index 3f0b9e866b0..6334759496f 100644 --- a/pkgs/development/compilers/ghc/nokinds.nix +++ b/pkgs/development/compilers/ghc/nokinds.nix @@ -27,14 +27,14 @@ let in stdenv.mkDerivation rec { - version = "7.11.20150718"; + version = "7.11.20150826"; name = "ghc-${version}"; # We cannot add a "nokinds" tag here; see git comment for details. - rev = "4cb79c85a4976c509a65a8638899391a60cd0962"; + rev = "5f7f64b7fc879b5ecfd6987ec5565bd90f7c0179"; src = fetchgit { url = "https://github.com/goldfirere/ghc.git"; inherit rev; - sha256 = "1pyz459hs189bw2jaz7k2j2r53nc1vfa4q3zd3zz1zm0h14lsmlv"; + sha256 = "183l4v6aw52r3ydwl8bxg1lh3cwfakb35rpy6mjg23dqmqsynmcn"; }; postUnpack = '' From 2bcad47a9008b023c7234f0be39edf3892313bcb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Aug 2015 15:30:40 +0200 Subject: [PATCH 158/175] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-hashes/commit/ca23e76c2e918c3d46ba2295191f14e87765d4db with hackage2nix v20150824-45-g9a3a80d --- .../haskell-modules/hackage-packages.nix | 779 ++++++++++-------- 1 file changed, 438 insertions(+), 341 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 88c383672b1..33b0bf30d00 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1664,7 +1664,6 @@ self: { executableHaskellDepends = [ base BlogLiterately ]; description = "Include images in blog posts with inline diagrams code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BluePrintCSS" = callPackage @@ -1709,7 +1708,6 @@ self: { homepage = "http://www.cse.chalmers.se/~emax/bookshelf/Manual.shelf.html"; description = "A simple document organizer with some wiki functionality"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Boolean" = callPackage @@ -2449,7 +2447,6 @@ self: { homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Diagrams backend for Charts"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Chart-gtk" = callPackage @@ -4305,7 +4302,6 @@ self: { homepage = "http://elm-lang.org"; description = "The Elm language module"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Emping" = callPackage @@ -5584,6 +5580,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/GeBoP"; description = "Several games"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GenI" = callPackage @@ -6500,6 +6497,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) mpfr;}; + "HFrequencyQueue" = callPackage + ({ mkDerivation, base, c-storable-deriving }: + mkDerivation { + pname = "HFrequencyQueue"; + version = "0.2.0.0"; + sha256 = "b03c5de4cbb14d379f3555698a03a076fb2d10c748c2a7054b83c74f95e30626"; + libraryHaskellDepends = [ base c-storable-deriving ]; + jailbreak = true; + homepage = "https://github.com/Bellaz/HfrequencyList"; + description = "A Queue with a random (weighted) pick function"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HFuse" = callPackage ({ mkDerivation, base, bytestring, fuse, unix }: mkDerivation { @@ -7133,7 +7144,6 @@ self: { homepage = "https://github.com/atzeus/HMap"; description = "Fast heterogeneous maps and unconstrained typeable like functionality"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HNM" = callPackage @@ -7202,7 +7212,6 @@ self: { homepage = "http://www.alpheccar.org"; description = "Generation of PDF documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HPath" = callPackage @@ -8828,7 +8837,6 @@ self: { ]; description = "Haskell integration with Parrot virtual machine"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HsPerl5" = callPackage @@ -9955,7 +9963,6 @@ self: { ]; description = "A library for lattices"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "LazyVault" = callPackage @@ -9986,7 +9993,6 @@ self: { homepage = "http://quasimal.com/projects/level_0.html"; description = "A Snake II clone written using SDL"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "LibClang" = callPackage @@ -10113,7 +10119,6 @@ self: { homepage = "http://github.com/yairchu/generator/tree"; description = "Trees and monadic trees expressed as monadic lists where the underlying monad is a list"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ListZipper" = callPackage @@ -10545,7 +10550,6 @@ self: { libraryHaskellDepends = [ base containers stringtable-atom ]; description = "A meta-object system for Haskell based on Perl 6"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Metrics" = callPackage @@ -13232,7 +13236,6 @@ self: { homepage = "http://raincat.bysusanlin.com/"; description = "A puzzle game written in Haskell with a cat in lead role"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Random123" = callPackage @@ -13622,7 +13625,6 @@ self: { libraryHaskellDepends = [ base SDL ]; description = "Binding to libSDL_gfx"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SDL-image" = callPackage @@ -13634,7 +13636,6 @@ self: { libraryHaskellDepends = [ base SDL ]; description = "Binding to libSDL_image"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SDL-mixer" = callPackage @@ -13648,7 +13649,6 @@ self: { libraryHaskellDepends = [ base SDL ]; description = "Binding to libSDL_mixer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SDL-mpeg" = callPackage @@ -13661,7 +13661,6 @@ self: { librarySystemDepends = [ smpeg ]; description = "Binding to the SMPEG library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) smpeg;}; "SDL-ttf" = callPackage @@ -13673,7 +13672,6 @@ self: { libraryHaskellDepends = [ base SDL ]; description = "Binding to libSDL_ttf"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SDL2-ttf" = callPackage @@ -15552,7 +15550,6 @@ self: { homepage = "https://github.com/avieth/TypeNat"; description = "Some Nat-indexed types for GHC"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "TypingTester" = callPackage @@ -17411,6 +17408,7 @@ self: { ]; description = "A replication backend for acid-state"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "acid-state-tls" = callPackage @@ -18562,6 +18560,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-value-parser" = callPackage + ({ mkDerivation, aeson, base-prelude, mtl-prelude, scientific, text + , unordered-containers, vector + }: + mkDerivation { + pname = "aeson-value-parser"; + version = "0.9.0"; + sha256 = "f53c0bd8a4fedb71ed74a2019b2d601ca3d315ae0db332e4f49d88f2ea68de8f"; + libraryHaskellDepends = [ + aeson base-prelude mtl-prelude scientific text unordered-containers + vector + ]; + homepage = "https://github.com/sannsyn/aeson-value-parser"; + description = "An API for parsing \"aeson\" JSON tree into Haskell types"; + license = stdenv.lib.licenses.mit; + }) {}; + "affine-invariant-ensemble-mcmc" = callPackage ({ mkDerivation, base, containers, mwc-random, primitive, split , vector @@ -18885,7 +18900,6 @@ self: { homepage = "http://github.com/dsorokin/aivika-experiment-diagrams"; description = "Diagrams backend for the Aivika simulation library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aivika-transformers" = callPackage @@ -19556,8 +19570,8 @@ self: { }: mkDerivation { pname = "amazonka"; - version = "1.1.0"; - sha256 = "60a65271453aedff93b9789e52f258ea6b6fe315a26f361710a50a825167a2c3"; + version = "1.2.0.1"; + sha256 = "4e7b7cda6b6904cfd35f92596bfe5a8e00511bbd64d7b55926ad8660f6eba950"; libraryHaskellDepends = [ amazonka-core base bytestring conduit conduit-extra directory exceptions http-client http-conduit ini lens mmorph monad-control @@ -19576,8 +19590,8 @@ self: { }: mkDerivation { pname = "amazonka-autoscaling"; - version = "1.1.0"; - sha256 = "0ed84582688b21076214a24ba5d31a3f25f3ee7765ed0c18d44fe0459d4101ca"; + version = "1.2.0.1"; + sha256 = "c48e7db56a1fc852a505b3821a4ed273b6a68e2f68ee224eb6cdfbe27c42926a"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19596,8 +19610,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudformation"; - version = "1.1.0"; - sha256 = "70d06d56987589915ac6011badf3c1f5d336814f99c09cd99424f3af312b9bf2"; + version = "1.2.0.1"; + sha256 = "813fcdb6a35888e1a0d29252f7530f192509662445b051ab17e6e4d614e98160"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19616,8 +19630,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudfront"; - version = "1.1.0"; - sha256 = "c931a4e78ffa1e81023dc1b306c4f2195be09b0246ef7b8022311421ef78c01c"; + version = "1.2.0.1"; + sha256 = "aeff7660a2d12b1382d14efa134b37ae35e4dc3745fb83f33e4fd4ac37b4c275"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19636,8 +19650,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudhsm"; - version = "1.1.0"; - sha256 = "b9f6ad65225dfd1eb0560a2a71a52991560ef4e69654b0053f37414c22080875"; + version = "1.2.0.1"; + sha256 = "64a58850be2d1df8145ca7382f7060faf873417c34b52258846ea6b4842b1389"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19656,8 +19670,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudsearch"; - version = "1.1.0"; - sha256 = "3e22407422a823f86eeff6685ccc71a4b775ed8962522d70ec49092f09c8b8ae"; + version = "1.2.0.1"; + sha256 = "d56e2690a44f331d408603234712bcbc2ef40f0375a7c1db22513c3350b3ccb5"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19676,8 +19690,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudsearch-domains"; - version = "1.1.0"; - sha256 = "8f6f6ce4ce0194d0f51c6b9ed9a71a0e270c5385a4c3dd63589c6d66cfdf6872"; + version = "1.2.0.1"; + sha256 = "f3ac35a7e9f2f9372ffabbb5b7450b4291a07609f517af8b75a4acd5d5c3610d"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19696,8 +19710,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudtrail"; - version = "1.1.0"; - sha256 = "a10e4dfbbef7058f8e21c5afb3f3b8108880c26bf163b8cfb048fa91ef47a4ea"; + version = "1.2.0.1"; + sha256 = "525e3a1f674b20e3851c67cc3d519f86b9795b046f131b91d63e7f194246542b"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19716,8 +19730,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudwatch"; - version = "1.1.0"; - sha256 = "6f9d2ac648899c775daeac0ed2a80e83c16876497762b8a99afc600e6f4546e9"; + version = "1.2.0.1"; + sha256 = "dfabf18379ec4f5431e4038d745686a58fb83a0559029cbbb77b40f9ebc6fd43"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19736,8 +19750,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudwatch-logs"; - version = "1.1.0"; - sha256 = "8c3c9553f43f1312881f22da35a34ad404101f3b790d2734590abd4ce5dbcfb7"; + version = "1.2.0.1"; + sha256 = "3b794ef9cb79daf5018a7cc850a348eb08407067f4b72c6accbd03b3be6997ca"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19756,8 +19770,8 @@ self: { }: mkDerivation { pname = "amazonka-codecommit"; - version = "1.1.0"; - sha256 = "abe54fee07ff52883343780cade09238da0e41d23ecc95fa9c1e3f9a8743b78a"; + version = "1.2.0.1"; + sha256 = "b4dcc54a0cd2faec903a037b713d1cce6ac6d4c3716b353b4108d23d4ecc0b03"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19776,8 +19790,8 @@ self: { }: mkDerivation { pname = "amazonka-codedeploy"; - version = "1.1.0"; - sha256 = "0b5832f433693ea1238a0391c19765d975b24425c378ae6688ba358849ed758c"; + version = "1.2.0.1"; + sha256 = "9b3dcfb3f92c0f2b7a68d62857e04a6eea0f57a6e72311fa5594da8574b8f557"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19796,8 +19810,8 @@ self: { }: mkDerivation { pname = "amazonka-codepipeline"; - version = "1.1.0"; - sha256 = "8b892d604355caea388c8680712b8e03cee1fd85c9275cb118009cbf4f1ee7e0"; + version = "1.2.0.1"; + sha256 = "c97df58c12793dc079d0706d9a09ea7c470219cc80e6e583441718d7017ee138"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19816,8 +19830,8 @@ self: { }: mkDerivation { pname = "amazonka-cognito-identity"; - version = "1.1.0"; - sha256 = "a154b6645d58211b3ebeb9407a4683ae85f6a1069d9c4027da664a34b471910e"; + version = "1.2.0.1"; + sha256 = "fbf21d9ca8e71d0b3305791db0f6a18256898b5c294057f515aef3991a0971cb"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19836,8 +19850,8 @@ self: { }: mkDerivation { pname = "amazonka-cognito-sync"; - version = "1.1.0"; - sha256 = "0a831859befa66f52636384f3e70217e0a804d9267135010034bc047ba2c5f75"; + version = "1.2.0.1"; + sha256 = "2008e997fa402ab3d58f22f260df18583695b612cbf1b0d3ab158321a1576e03"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19856,8 +19870,8 @@ self: { }: mkDerivation { pname = "amazonka-config"; - version = "1.1.0"; - sha256 = "960c9381c50aa26bcf5bb05704ede000ef9614488ea9f428f7d1ae6eba7c886b"; + version = "1.2.0.1"; + sha256 = "c4e60da7e09302b81e1c53b15c36e99b46d09dd37b4334e360d78879b556ef36"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19881,8 +19895,8 @@ self: { }: mkDerivation { pname = "amazonka-core"; - version = "1.1.0"; - sha256 = "fe4b3185f61ad56e3dfddcd5050d3cfa41a997fd3c5b74ec8ed24404dada2cb6"; + version = "1.2.0.1"; + sha256 = "737645a63519f535154133cf590a66e2248d436c6223539857f43069a6645d1a"; libraryHaskellDepends = [ aeson attoparsec base bifunctors bytestring case-insensitive conduit conduit-extra cryptonite exceptions hashable http-client @@ -19906,8 +19920,8 @@ self: { }: mkDerivation { pname = "amazonka-datapipeline"; - version = "1.1.0"; - sha256 = "8c72a767f8b3546dd0e895035edfcc3a6e0fe060a2398e973938addfca7b4ce5"; + version = "1.2.0.1"; + sha256 = "20178d505d690116528f8d1bf5c5650c7dca9350b583ad4bbc2b7ca5b74bc1e0"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19926,8 +19940,8 @@ self: { }: mkDerivation { pname = "amazonka-devicefarm"; - version = "1.1.0"; - sha256 = "3c99376995534299985d2163d8cf55938d925f08c3e214b5f3567a26f4515ab1"; + version = "1.2.0.1"; + sha256 = "bebf18952a56cc249175a1bf69ab1400126b3c97c45ce8b7895acbae894c3449"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19946,8 +19960,8 @@ self: { }: mkDerivation { pname = "amazonka-directconnect"; - version = "1.1.0"; - sha256 = "5ec6240b4fe226859b51e325f44f566c21a93ff91d628b6d9eafeb823152e74b"; + version = "1.2.0.1"; + sha256 = "39bd3999d29363b87fc64edac6151251a5a5075c7fe1ab48bb89114fa40cfa74"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19966,8 +19980,8 @@ self: { }: mkDerivation { pname = "amazonka-ds"; - version = "1.1.0"; - sha256 = "19de365fedf51d8da57c5099e04e6d827b3c3b4b3f9aacc7e78d7bf7a9def542"; + version = "1.2.0.1"; + sha256 = "fac88b8ac1121ec6ab9bb1c1b419262e2720c95d3c5d5e1d5ff9b0356f59af56"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19986,8 +20000,8 @@ self: { }: mkDerivation { pname = "amazonka-dynamodb"; - version = "1.1.0"; - sha256 = "b4cc74ff79ab032a06cbf7245db1d8734cf9946625a9bf00fe4974dcb8628f45"; + version = "1.2.0.1"; + sha256 = "23d44253d82d2406b528abf5f1c2ed97c72cadb9afca1a578793220648ce442c"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20006,8 +20020,8 @@ self: { }: mkDerivation { pname = "amazonka-dynamodb-streams"; - version = "1.1.0"; - sha256 = "04e4eb5b332a455d4ac40824a60a07b47c8bc73aa89d82ce85bb944b0f2cde11"; + version = "1.2.0.1"; + sha256 = "b3413412dce8dc96e449642535f623223298243d7290d778082fd6ed97511a33"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20026,8 +20040,8 @@ self: { }: mkDerivation { pname = "amazonka-ec2"; - version = "1.1.0"; - sha256 = "c715cd05ee79755de37df834d5315041c5d582004720d7e3b18c2fa2ff28deb7"; + version = "1.2.0.1"; + sha256 = "de1421ab986e9d6833fd70a0e0d3c21895813361ecc680c95816fbcaf7c6439a"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20046,8 +20060,8 @@ self: { }: mkDerivation { pname = "amazonka-ecs"; - version = "1.1.0"; - sha256 = "82eb9b0a963885a6c2d846e2497cf39519c8f6a07315a6cb8d07cd88246376d6"; + version = "1.2.0.1"; + sha256 = "19c608e5218c900da768adc9f893a91a7fc6e9070e8c5d9e444baf1ae98c7544"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20066,8 +20080,8 @@ self: { }: mkDerivation { pname = "amazonka-efs"; - version = "1.1.0"; - sha256 = "daf42240c49d66cbc715bcc2cace1f430e81b3cc78ce0e2455475f9706e4ae42"; + version = "1.2.0.1"; + sha256 = "d0f70ed2e5242cb05b7895199a06144cd4550fab64fb825eba8a1c10d9351bab"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20086,8 +20100,8 @@ self: { }: mkDerivation { pname = "amazonka-elasticache"; - version = "1.1.0"; - sha256 = "edc2f2e5a67c1b409b93b60862dd7b1303201d2b59b3e19931e8bde9a948e277"; + version = "1.2.0.1"; + sha256 = "9c4113c0dd2430432ac0233149571a7affc9dec675aaddbe7ff9e513171a1bf7"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20106,8 +20120,8 @@ self: { }: mkDerivation { pname = "amazonka-elasticbeanstalk"; - version = "1.1.0"; - sha256 = "d45f9ebdda89b89f461948438e1c2d0e4eb1e7a0ab2fed229203fc29d027ed35"; + version = "1.2.0.1"; + sha256 = "b4e135c2e904f78cab94ccab8d1d38b3b7992461bc1f41ede5ee708fcb162dc2"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20126,8 +20140,8 @@ self: { }: mkDerivation { pname = "amazonka-elastictranscoder"; - version = "1.1.0"; - sha256 = "f5ea457def994de22b4bc8c471ecf2355c4acf80d44c022e34d92ffdd8606500"; + version = "1.2.0.1"; + sha256 = "b2eaf67b39f5d19fe5ea7a6d0c79b44951cf25c41eb3af36ead6cd82cb430dd2"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20146,8 +20160,8 @@ self: { }: mkDerivation { pname = "amazonka-elb"; - version = "1.1.0"; - sha256 = "2f3e4a8971545bf39bedf5a75854c21733a797598318e076f2a468d8f5647a96"; + version = "1.2.0.1"; + sha256 = "2574b79c0b09ef82dcc7b07c9dfcb55719dd7b63ac87fb938ae7a7c45efba986"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20166,8 +20180,8 @@ self: { }: mkDerivation { pname = "amazonka-emr"; - version = "1.1.0"; - sha256 = "29f4c25ff4cdcd83809afa9fdc5e70a8bf89c6b1e4bcdfc7367faade023566bc"; + version = "1.2.0.1"; + sha256 = "43c3e80f742abbd5d2770fa5cf05138b5be2890492a295b1ccaefeb8d50662ed"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20186,8 +20200,8 @@ self: { }: mkDerivation { pname = "amazonka-glacier"; - version = "1.1.0"; - sha256 = "61f954b805f51ca436a01f42e9068674540c3828b269e6c1547aedd976516b91"; + version = "1.2.0.1"; + sha256 = "48e2c9b10a4624b6f308bd232aafe9fabe7429911ad4a7a8222277d9c58310be"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20206,8 +20220,8 @@ self: { }: mkDerivation { pname = "amazonka-iam"; - version = "1.1.0"; - sha256 = "9b52ae4b69126b24be8e7dac78aab91c7b14b0ab1c162fe2e8b8e831f5e41991"; + version = "1.2.0.1"; + sha256 = "8302e53d2e799b56629a2344a3b1d40b39b173defee1112ddb6e4e0102496d7f"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20226,8 +20240,8 @@ self: { }: mkDerivation { pname = "amazonka-importexport"; - version = "1.1.0"; - sha256 = "7682771e6a51a96a69c8a5c8176b33a944b598d84a353884287b8b3183b2a5a9"; + version = "1.2.0.1"; + sha256 = "cfb98a32f18d2b1448277f5a4c5128bd9d94ecba012d458dff65a834c86648d6"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20246,8 +20260,8 @@ self: { }: mkDerivation { pname = "amazonka-kinesis"; - version = "1.1.0"; - sha256 = "0103f032d0ebbd562a7e510897cb50f5bed8383fbbc7ac7868564ab57fa7a0e7"; + version = "1.2.0.1"; + sha256 = "831225d3400badf60a8b390e4dd692d38b8097bcb72f1247b54876c83bb532c9"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20266,8 +20280,8 @@ self: { }: mkDerivation { pname = "amazonka-kms"; - version = "1.1.0"; - sha256 = "0c9f0d02cc5fdf1ef64b0446d82718277c3570f761b0644504ee90d842f78b9a"; + version = "1.2.0.1"; + sha256 = "b69938c0c9f6bbc5d1774643f528e64ba28a6ac2bb16f1e15845061a97de85d4"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20286,8 +20300,8 @@ self: { }: mkDerivation { pname = "amazonka-lambda"; - version = "1.1.0"; - sha256 = "07d43e6d4585a09139006708e831c7e713c1b33dbc711cc08fd6c723ace589f3"; + version = "1.2.0.1"; + sha256 = "e3e0e8fd76c7dbd1ced77e9d46a4e8b57820b87b00327ccc01417ddf4c53aa0d"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20306,8 +20320,8 @@ self: { }: mkDerivation { pname = "amazonka-ml"; - version = "1.1.0"; - sha256 = "ef09c86c1ccf257d4dd53627a75213015482e2ce18d1c5a85b4017bb215563dc"; + version = "1.2.0.1"; + sha256 = "c29484802e0138ebbeb6666842ca1cd44b81e2e870ff4c1435d91d58d569bc37"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20326,8 +20340,8 @@ self: { }: mkDerivation { pname = "amazonka-opsworks"; - version = "1.1.0"; - sha256 = "9ac85226c177d59135f7fde294202951b5415e9a0afbe1b7a2b2c7f57f2531c0"; + version = "1.2.0.1"; + sha256 = "bad7706393fcfcc041ac4ae1bb39ef7320d282d2b4d9c6c8f0881379b4f91a6a"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20346,8 +20360,8 @@ self: { }: mkDerivation { pname = "amazonka-rds"; - version = "1.1.0"; - sha256 = "8081408044b167cde41e466073d4acd8e4732b2586c0fa637a5a323e84447b02"; + version = "1.2.0.1"; + sha256 = "55ae3a2e6893fc11ca156fb9d11258d1c1ad76f928ca1143cfb0b7b3d9f1806e"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20366,8 +20380,8 @@ self: { }: mkDerivation { pname = "amazonka-redshift"; - version = "1.1.0"; - sha256 = "688e017fd663b915a80d37954bd3b48deccc5d9e90b18770ff91af46ddd9c01b"; + version = "1.2.0.1"; + sha256 = "0ce218a13c314c73ea9b3f5c7e8ef31f3cf92a06f820425c48d83d175f1e77b2"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20386,8 +20400,8 @@ self: { }: mkDerivation { pname = "amazonka-route53"; - version = "1.1.0"; - sha256 = "dde78c3ff32eb00e3342d89426ec9f6792e3ecb40af378525e74141b415c0436"; + version = "1.2.0.1"; + sha256 = "8a700fc08eb4585b6d9a30c81f18bfab56ae2ae4b5474f98889959f2bda33ad0"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20406,8 +20420,8 @@ self: { }: mkDerivation { pname = "amazonka-route53-domains"; - version = "1.1.0"; - sha256 = "cc4e138341b187146ac10d52430abebcf1780846ace4482d838b3f1053abb9b2"; + version = "1.2.0.1"; + sha256 = "d486ae77163fc9d8dbb3b38afcce6ce79fba93b5194643ad98cb8dbbe31f745a"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20426,8 +20440,8 @@ self: { }: mkDerivation { pname = "amazonka-s3"; - version = "1.1.0"; - sha256 = "7cdb79c15c0f1152e40a464d7fd1cc6edf1526d40ca1e7f8d33d0968acdc6e71"; + version = "1.2.0.1"; + sha256 = "dd5b54f342d1a5f45ea62242f9acecb2be98ed15801b251316c9bef8ac7b948b"; libraryHaskellDepends = [ amazonka-core base lens text ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20446,8 +20460,8 @@ self: { }: mkDerivation { pname = "amazonka-sdb"; - version = "1.1.0"; - sha256 = "fe6b9a82edc028b2895e14a5ed2f4d4efdd6c13328a87d18c1215fc2baa35cb7"; + version = "1.2.0.1"; + sha256 = "4eebd5b37c309ee850395c2823f10636cb90c8449a1f365a11a5cf58080b4469"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20466,8 +20480,8 @@ self: { }: mkDerivation { pname = "amazonka-ses"; - version = "1.1.0"; - sha256 = "39b2031ca579c11992f093c9c6915133e4b182105434adb44823f3d0a56aeafd"; + version = "1.2.0.1"; + sha256 = "f547f472a3dee0944a7a26a7b421df10242d80762ca59392391a1326a39a427f"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20486,8 +20500,8 @@ self: { }: mkDerivation { pname = "amazonka-sns"; - version = "1.1.0"; - sha256 = "be2609584bb6e0af18af5b3a25c1281a0f665d993d8b8c14b310aba56287a3cf"; + version = "1.2.0.1"; + sha256 = "e69b15d4fe2904cd813e22a149e4dcce5c9514a34c45379bb07589fc3a606994"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20506,8 +20520,8 @@ self: { }: mkDerivation { pname = "amazonka-sqs"; - version = "1.1.0"; - sha256 = "9bfb0cf6d07f1019bcfeeb4169c0a6dd6147e1eb9132b04f4cf256bbc8b7bcfd"; + version = "1.2.0.1"; + sha256 = "e599b394468bdeb2813b8e091b5aefc5787bb10bd2bfb24d5be4ba70a5ed0134"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20526,8 +20540,8 @@ self: { }: mkDerivation { pname = "amazonka-ssm"; - version = "1.1.0"; - sha256 = "3be89223c0c1110778bfeb32aeb3ed0b4fcdf85aedfce8c0a67ece34f1619f18"; + version = "1.2.0.1"; + sha256 = "d9d47fd9820fa05fbfdd62090d9319ee6fd96f321422a995e186ab3e13d789f1"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20546,8 +20560,8 @@ self: { }: mkDerivation { pname = "amazonka-storagegateway"; - version = "1.1.0"; - sha256 = "d3a8cd4205254d65e482ed96114cb98d233deb26d25a04a5f45b82dab01a6e0a"; + version = "1.2.0.1"; + sha256 = "d73bf3187bb9fd7b50ddcc74566841d1fb4e77328bbe0dddb19a324553e9c49b"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20566,8 +20580,8 @@ self: { }: mkDerivation { pname = "amazonka-sts"; - version = "1.1.0"; - sha256 = "566b295c705d94a91f479f82414cd3487e8e5872e1287d45d0d686670c024fb5"; + version = "1.2.0.1"; + sha256 = "66502b43aea7c2f70ef4559913c58fb0ae581435d0656f1ab9f9c417bcb54a2e"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20586,8 +20600,8 @@ self: { }: mkDerivation { pname = "amazonka-support"; - version = "1.1.0"; - sha256 = "fd16936656d8d49b35c965945a886659c3f996fd4234843dfba7fb15152eb58f"; + version = "1.2.0.1"; + sha256 = "f1996613bfcfa00eac465c90ef97f18c6fe51231def2d43de1bf90fd0992e52e"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20606,8 +20620,8 @@ self: { }: mkDerivation { pname = "amazonka-swf"; - version = "1.1.0"; - sha256 = "85184fd03d9e0181f7f2ba7b4c1ad14b2ce46235fc5814659e3bee8e5437d323"; + version = "1.2.0.1"; + sha256 = "d68898d0a5205e3897b36c29830564f1aecbeff759ff5c379bdf12c1c60f1c01"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20626,8 +20640,8 @@ self: { }: mkDerivation { pname = "amazonka-workspaces"; - version = "1.1.0"; - sha256 = "0e7b0cc339022a304245f054d04e153671eaff927ad1e13c0f632bad7746ac56"; + version = "1.2.0.1"; + sha256 = "4125f1aa08ad2f9013bba8f8d0c83b41f0eeb76203fd1b7da41a306f81211448"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20903,8 +20917,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "annotated-wl-pprint"; - version = "0.6.0"; - sha256 = "3d29f11396fb0675fff25254a9f4354aa763a659fa10a48829d15fed087792e7"; + version = "0.7.0"; + sha256 = "0c262d7fe13a9a50216438ec882c13e25f31236b886a5692e3c35b85cd773d18"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/david-christiansen/annotated-wl-pprint"; description = "The Wadler/Leijen Pretty Printer, with annotation support"; @@ -21234,6 +21248,7 @@ self: { aeson base bytestring Cabal containers hspec http-client text transformers ]; + jailbreak = true; homepage = "https://github.com/intolerable/api-builder"; description = "Library for easily building REST API wrappers in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -21305,8 +21320,8 @@ self: { }: mkDerivation { pname = "apiary"; - version = "1.4.4"; - sha256 = "de395821116717cf654f52176e6487782522f567b288a17bab7713ff85411085"; + version = "1.4.5"; + sha256 = "6c6f898924b6209f33ef81bc0e2c7ceb166fc04825a8ffb4d6c5732f41429313"; libraryHaskellDepends = [ base blaze-builder blaze-html blaze-markup bytestring bytestring-read case-insensitive data-default-class exceptions @@ -24762,7 +24777,6 @@ self: { jailbreak = true; description = "Generate Code 128 barcodes as PDFs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "barecheck" = callPackage @@ -29466,7 +29480,6 @@ self: { homepage = "http://github.com/pjones/byline"; description = "Library for creating command-line interfaces (colors, menus, etc.)"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytable" = callPackage @@ -30175,6 +30188,7 @@ self: { homepage = "https://github.com/ddssff/cabal-debian"; description = "Create a Debianization for a Cabal package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-dependency-licenses" = callPackage @@ -30589,8 +30603,8 @@ self: { }: mkDerivation { pname = "cabal-rpm"; - version = "0.9.6"; - sha256 = "e501a7b3a203be2e069e26337e6bbdd0993ffe6d9e75a626089b2637393d2f1e"; + version = "0.9.7"; + sha256 = "b927e84b5a23edffa8053c3c5e5a5191c434dbcbbe7e4551f8dc840d3b17bc74"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -30865,6 +30879,7 @@ self: { homepage = "http://github.com/NixOS/cabal2nix"; description = "Convert Cabal files into Nix build instructions"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; "cabal2spec" = callPackage @@ -31773,6 +31788,7 @@ self: { homepage = "https://github.com/jb55/cased"; description = "Track string casing in its type"; license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ jb55 ]; }) {}; "cases" = callPackage @@ -33102,7 +33118,6 @@ self: { jailbreak = true; description = "measure timings of data evaluation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chu2" = callPackage @@ -34330,20 +34345,20 @@ self: { "clippings" = callPackage ({ mkDerivation, assertions, base, bifunctors, bytestring, cassava - , data-default, filepath, old-locale, parsec, safecopy, strptime - , time + , data-default, filepath, functor-infix, old-locale, parsec + , safecopy, strptime, time }: mkDerivation { pname = "clippings"; - version = "0.1.3"; - sha256 = "79e3e0c4d2ab9a37bfd0fd35ce161de45e3acf96be1ecce93726a3cdf065a036"; + version = "0.2.0"; + sha256 = "8562481c8ba001b6c401d6ebfacd458fe44b19676ce8bd2e8694cd45cf825bdb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bifunctors data-default old-locale parsec strptime time + base data-default functor-infix old-locale parsec strptime time ]; executableHaskellDepends = [ - base bifunctors bytestring cassava parsec safecopy + base bifunctors bytestring cassava functor-infix parsec safecopy ]; testHaskellDepends = [ assertions base data-default filepath old-locale parsec time @@ -35439,11 +35454,14 @@ self: { }: mkDerivation { pname = "comfort-graph"; - version = "0.0.0.1"; - sha256 = "dc4cadda8bb9847f60f217d54590d5695597814557c70dafab9846b944dcfb8c"; + version = "0.0.0.3"; + sha256 = "e379d8d331d3b0245528a4c88a0fad369a2ad9a04f45f6e57546a342bf58c783"; libraryHaskellDepends = [ base containers QuickCheck transformers utility-ht ]; + testHaskellDepends = [ + base containers QuickCheck transformers utility-ht + ]; homepage = "http://hub.darcs.net/thielema/comfort-graph"; description = "Graph structure with type parameters for nodes and edges"; license = stdenv.lib.licenses.bsd3; @@ -35642,6 +35660,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "compact-socket" = callPackage + ({ mkDerivation, base, binary, bytestring, compact, deepseq + , directory, filepath, network, unix + }: + mkDerivation { + pname = "compact-socket"; + version = "0.1.0.0"; + sha256 = "e758ee08d3013aebc013fe2d5eb1f529db56ea0f926bd2ba7bc1266cc1c9ee3b"; + libraryHaskellDepends = [ + base binary bytestring compact deepseq directory filepath network + unix + ]; + jailbreak = true; + description = "Socket functions for compact normal form"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {compact = null;}; + "compact-string" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -36207,7 +36243,6 @@ self: { ]; description = "Concurrent networked stream transducers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "concurrent-sa" = callPackage @@ -36955,7 +36990,6 @@ self: { homepage = "https://github.com/leftaroundabout/constrained-categories"; description = "Constrained clones of the category-theory type classes, using ConstraintKinds"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "constrained-normal" = callPackage @@ -38113,6 +38147,7 @@ self: { homepage = "https://github.com/nicodelpiano/coverage"; description = "Exhaustivity Checking Library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cpio-conduit" = callPackage @@ -38222,7 +38257,6 @@ self: { executableHaskellDepends = [ array base containers parallel ]; description = "Symbolic cryptographic protocol analyzer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cpu" = callPackage @@ -39259,8 +39293,8 @@ self: { }: mkDerivation { pname = "cryptonite"; - version = "0.6"; - sha256 = "a016ccaa38579beb4517807a8917801baf6e6ddb830a74af91fc064c35acf853"; + version = "0.7"; + sha256 = "6cd4d9ff100b06a08ceac56eb12153633957797b309032a963cdf3841f92ecd9"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim integer-gmp memory ]; @@ -42899,6 +42933,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dejafu" = callPackage + ({ mkDerivation, base, containers, deepseq, exceptions, monad-loops + , mtl, random, stm, transformers + }: + mkDerivation { + pname = "dejafu"; + version = "0.1.0.0"; + sha256 = "469c2f0690ede4ad83483d5ae82601471a7c737daddd116ad423d5b9202ee2b4"; + libraryHaskellDepends = [ + base containers deepseq exceptions monad-loops mtl random stm + transformers + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/barrucadu/dejafu"; + description = "Overloadable primitives for testable, potentially non-deterministic, concurrency"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "deka" = callPackage ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }: mkDerivation { @@ -43595,7 +43648,6 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "hint-based build service for the diagrams graphics EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-cairo" = callPackage @@ -43728,7 +43780,6 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Preprocessor for embedding diagrams in Haddock documentation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-hsqml" = callPackage @@ -43746,7 +43797,6 @@ self: { homepage = "https://github.com/marcinmrotek/diagrams-hsqml"; description = "HsQML (Qt5) backend for Diagrams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-html5" = callPackage @@ -44547,6 +44597,7 @@ self: { homepage = "https://github.com/avieth/diplomacy-server"; description = "Play Diplomacy over HTTP"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "direct-binary-files" = callPackage @@ -46365,6 +46416,7 @@ self: { ]; description = "PostgreSQL support for the drifter schema migration tool"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dropbox-sdk" = callPackage @@ -46567,7 +46619,6 @@ self: { executableHaskellDepends = [ base bytestring ]; description = "Harmonix (Guitar Hero, Rock Band) DTA/DTB metadata library"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dtd" = callPackage @@ -46651,7 +46702,6 @@ self: { jailbreak = true; description = "(Fast) Dynamic Time Warping"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dual-tree" = callPackage @@ -47289,7 +47339,6 @@ self: { homepage = "http://thoughtpolice.github.com/hs-ed25519"; description = "ed25519 cryptographic signatures"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ed25519-donna" = callPackage @@ -47485,7 +47534,6 @@ self: { homepage = "https://github.com/maxpow4h/editable"; description = "Interactive editors for Generics"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "editline" = callPackage @@ -48093,7 +48141,6 @@ self: { homepage = "http://github.com/JoeyEremondi/elm-build-lib"; description = "Compile Elm code to JS within Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elm-compiler" = callPackage @@ -48134,7 +48181,6 @@ self: { homepage = "http://elm-lang.org"; description = "Values to help with elm-package, elm-make, and elm-lang.org."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elm-core-sources" = callPackage @@ -48178,7 +48224,6 @@ self: { homepage = "http://github.com/elm-lang/elm-get"; description = "Tool for sharing and using Elm libraries"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elm-init" = callPackage @@ -48219,7 +48264,6 @@ self: { homepage = "http://elm-lang.org"; description = "A build tool for Elm projects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elm-package" = callPackage @@ -48251,7 +48295,6 @@ self: { homepage = "http://github.com/elm-lang/elm-package"; description = "Package manager for Elm libraries"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elm-reactor" = callPackage @@ -48276,7 +48319,6 @@ self: { homepage = "http://elm-lang.org"; description = "Interactive development tool for Elm programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elm-repl" = callPackage @@ -48303,7 +48345,6 @@ self: { homepage = "https://github.com/elm-lang/elm-repl"; description = "a REPL for Elm"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elm-server" = callPackage @@ -48324,7 +48365,6 @@ self: { homepage = "http://elm-lang.org"; description = "Server for developing Elm projects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elm-yesod" = callPackage @@ -48342,7 +48382,6 @@ self: { homepage = "http://elm-lang.org"; description = "The Elm language Yesod compatibility module"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elocrypt" = callPackage @@ -51436,6 +51475,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "feed-translator" = callPackage + ({ mkDerivation, base, blaze-html, blaze-markup, cmdargs + , containers, feed, iso639, lens, naver-translate, network-uri + , raw-strings-qq, scotty, text, transformers, wai, warp, wreq, xml + }: + mkDerivation { + pname = "feed-translator"; + version = "0.1.0.1"; + sha256 = "ca29fa44090e1f9f62dbb95ecd98a893a2a6d7ec57df3c2b8a71a42104a78fa3"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base blaze-html blaze-markup cmdargs containers feed iso639 lens + naver-translate network-uri raw-strings-qq scotty text transformers + wai warp wreq xml + ]; + jailbreak = true; + homepage = "https://github.com/dahlia/feed-translator"; + description = "Translate syndication feeds"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "feed2lj" = callPackage ({ mkDerivation, base, curl, directory, feed, haskell98, HTTP , old-locale, pureMD5, regex-posix, tagsoup, time, utf8-string @@ -52496,11 +52557,10 @@ self: { ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }: mkDerivation { pname = "fixed-vector"; - version = "0.8.0.0"; - sha256 = "39da25f74a7c0760cb4675b0116eb9581232de57566e7b323e135e1157068fc2"; + version = "0.8.1.0"; + sha256 = "3c3c29c7248c08061949843727e83ad234584ca77f8076ecd9537a185ebe3a93"; libraryHaskellDepends = [ base deepseq primitive ]; testHaskellDepends = [ base doctest filemanip primitive ]; - jailbreak = true; description = "Generic vectors with statically known size"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -53254,8 +53314,8 @@ self: { }: mkDerivation { pname = "foldl-transduce"; - version = "0.1.2.3"; - sha256 = "8c24ca4a7932b83fd630475ac59a48879adbe03dda6136cc493f9ad0742d5bd5"; + version = "0.2.0.0"; + sha256 = "38be7ab52831c7ea5ac5fd4e546b9f8b4a66305528af80aa6ec17214b6066e02"; libraryHaskellDepends = [ base bifunctors bytestring comonad containers foldl semigroupoids text transformers @@ -53263,6 +53323,7 @@ self: { testHaskellDepends = [ base doctest foldl tasty tasty-hunit text ]; description = "Transducers for foldl folds"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "folds" = callPackage @@ -54147,8 +54208,7 @@ self: { homepage = "https://github.com/chrisdone/freenect"; description = "Interface to the Kinect device"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {freenect = null; freenect_sync = null;}; + }) {inherit (pkgs) freenect; freenect_sync = null;}; "freesect" = callPackage ({ mkDerivation, array, base, cpphs, directory, mtl, parallel @@ -54474,7 +54534,6 @@ self: { homepage = "http://www.github.com/ehamberg/fswatcher/"; description = "Watch a file/directory and run a command when it's modified"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ftdi" = callPackage @@ -54640,6 +54699,7 @@ self: { homepage = "http://savannah.nongnu.org/projects/funcmp/"; description = "Functional MetaPost"; license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; "function-combine" = callPackage @@ -56203,7 +56263,6 @@ self: { ]; description = "ExactPrint for GHC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-gc-tune" = callPackage @@ -56889,7 +56948,6 @@ self: { homepage = "https://github.com/nomeata/gipeda"; description = "Git Performance Dashboard"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gist" = callPackage @@ -57109,7 +57167,6 @@ self: { homepage = "http://github.com/jwiegley/gitlib"; description = "Passively snapshots working tree changes efficiently"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "git-object" = callPackage @@ -57360,6 +57417,7 @@ self: { ]; description = "GitHub WebHook Handler"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "github-webhook-handler-snap" = callPackage @@ -57376,6 +57434,7 @@ self: { ]; description = "GitHub WebHook Handler implementation for Snap"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitignore" = callPackage @@ -57524,7 +57583,6 @@ self: { ]; description = "Libgit2 backend for gitlib"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitlib-s3" = callPackage @@ -57703,29 +57761,27 @@ self: { "glambda" = callPackage ({ mkDerivation, ansi-wl-pprint, base, containers, directory - , errors, haskeline, mtl, parsec, tasty, tasty-hunit - , template-haskell + , either, haskeline, mtl, parsec, tasty, tasty-hunit + , template-haskell, transformers }: mkDerivation { pname = "glambda"; - version = "1.0"; - sha256 = "0ef6fc8e1fedc034c6d392aad4323b1b4c825e34b1a18affc6022873de817805"; + version = "1.0.1"; + sha256 = "da42696d4ad985cd10d249457d801a234c04a29ef08acdbbd91544dabce2d16f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint base containers directory errors haskeline mtl - parsec + ansi-wl-pprint base containers directory either haskeline mtl + parsec transformers ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - ansi-wl-pprint base errors mtl parsec tasty tasty-hunit + ansi-wl-pprint base either mtl parsec tasty tasty-hunit template-haskell ]; - jailbreak = true; homepage = "https://github.com/goldfirere/glambda"; description = "A simply typed lambda calculus interpreter, written with GADTs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glapp" = callPackage @@ -57973,6 +58029,7 @@ self: { revision = "1"; editedCabalFile = "232cec279cb20afd92056320c24d3d3041199b014981492ddbbe57eeff312a5a"; libraryHaskellDepends = [ base gloss reactive-banana ]; + jailbreak = true; homepage = "https://github.com/Twey/gloss-banana"; description = "An Interface for gloss in terms of a reactive-banana Behavior"; license = stdenv.lib.licenses.gpl3; @@ -58412,7 +58469,6 @@ self: { ]; description = "Google Drive API access"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "google-html5-slide" = callPackage @@ -59377,7 +59433,6 @@ self: { ]; description = "Grid-based multimedia engine"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "grm" = callPackage @@ -60331,7 +60386,6 @@ self: { homepage = "https://github.com/Javran/h2048"; description = "a haskell implementation of Game 2048"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hArduino" = callPackage @@ -61185,6 +61239,7 @@ self: { homepage = "http://github.com/peti/hackage-db"; description = "access Hackage's package database via Data.Map"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; "hackage-diff" = callPackage @@ -61239,7 +61294,6 @@ self: { homepage = "http://fpcomplete.com"; description = "Simple mirroring utility for Hackage"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hackage-plot" = callPackage @@ -62185,12 +62239,17 @@ self: { }) {}; "hakyll-sass" = callPackage - ({ mkDerivation, base, data-default-class, hakyll, hsass }: + ({ mkDerivation, base, data-default-class, filepath, hakyll, hsass + }: mkDerivation { pname = "hakyll-sass"; - version = "0.1.0"; - sha256 = "b127379ebf20f96f5974a9f8212aa3aeed04b9e22788bc29cc9994f6f69e926c"; - libraryHaskellDepends = [ base data-default-class hakyll hsass ]; + version = "0.2.0"; + sha256 = "1c0b131f3a581aafde543fc9c3211d75c6f17f6b25d0e32cf6032f4c3377dbc5"; + revision = "1"; + editedCabalFile = "afdc3b9e76e09fc1aaf7f9cceb780a2e062ec56aab20659804b8f35d3bb85bb5"; + libraryHaskellDepends = [ + base data-default-class filepath hakyll hsass + ]; homepage = "https://github.com/meoblast001/hakyll-sass"; description = "Hakyll SASS compiler over hsass"; license = stdenv.lib.licenses.mit; @@ -62299,7 +62358,6 @@ self: { homepage = "https://github.com/lukexi/halive"; description = "A live recompiler"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "halma" = callPackage @@ -62559,7 +62617,6 @@ self: { ]; description = "IPv4 Network Stack"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hans-pcap" = callPackage @@ -62573,7 +62630,6 @@ self: { homepage = "https://github.com/tolysz/hans-pcap"; description = "Driver for real ethernet devices for HaNS"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hans-pfq" = callPackage @@ -62788,6 +62844,7 @@ self: { homepage = "http://www.happstack.com/"; description = "Happstack Authentication Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-clientsession" = callPackage @@ -62966,7 +63023,6 @@ self: { homepage = "http://www.happstack.com/"; description = "Glue code for using Happstack with acid-state, web-routes, reform, and HSP"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-hamlet" = callPackage @@ -63042,7 +63098,6 @@ self: { homepage = "http://www.happstack.com/"; description = "Support for using HSP templates in Happstack"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-hstringtemplate" = callPackage @@ -63960,7 +64015,6 @@ self: { homepage = "http://github.com/ivanperez-keera/haskanoid"; description = "A breakout game written in Yampa using SDL"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskarrow" = callPackage @@ -65035,7 +65089,6 @@ self: { homepage = "https://github.com/m4dc4p/haskelldb"; description = "HaskellDB support for HDBC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskelldb-hdbc-mysql" = callPackage @@ -65073,7 +65126,6 @@ self: { homepage = "https://github.com/m4dc4p/haskelldb"; description = "HaskellDB support for the HDBC ODBC driver"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskelldb-hdbc-postgresql" = callPackage @@ -65093,7 +65145,6 @@ self: { homepage = "https://github.com/m4dc4p/haskelldb"; description = "HaskellDB support for the HDBC PostgreSQL driver"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) postgresql;}; "haskelldb-hdbc-sqlite3" = callPackage @@ -65112,7 +65163,6 @@ self: { homepage = "https://github.com/m4dc4p/haskelldb"; description = "HaskellDB support for the HDBC SQLite driver"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskelldb-hsql" = callPackage @@ -65441,7 +65491,6 @@ self: { jailbreak = true; description = "A haskell wrapper for PokeAPI.co (www.pokeapi.co)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskoin" = callPackage @@ -66709,8 +66758,7 @@ self: { homepage = "https://github.com/ivanperez-keera/hcwiid"; description = "Library to interface with the wiimote"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {bluetooth = null; cwiid = null;}; + }) {bluetooth = null; inherit (pkgs) cwiid;}; "hdaemonize" = callPackage ({ mkDerivation, base, extensible-exceptions, filepath, hsyslog @@ -67658,7 +67706,6 @@ self: { homepage = "https://github.com/nh2/hemokit"; description = "Haskell port of the Emokit EEG project"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hen" = callPackage @@ -69848,6 +69895,7 @@ self: { homepage = "https://github.com/gebner/hledger-diff"; description = "Compares the transactions in two ledger files"; license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ gebner ]; }) {}; "hledger-interest" = callPackage @@ -69864,6 +69912,7 @@ self: { homepage = "http://github.com/peti/hledger-interest"; description = "computes interest for a given account"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; "hledger-irr" = callPackage @@ -71111,7 +71160,7 @@ self: { description = "OpenNI 2 binding"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {OpenNI2 = null; freenect = null;}; + }) {OpenNI2 = null; inherit (pkgs) freenect;}; "honk" = callPackage ({ mkDerivation, base }: @@ -71434,7 +71483,6 @@ self: { homepage = "http://github.com/bgamari/hoogle-index"; description = "Easily generate Hoogle indices for installed packages"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hooks-dir" = callPackage @@ -71573,6 +71621,7 @@ self: { homepage = "http://github.com/peti/hopenssl"; description = "FFI bindings to OpenSSL's EVP digest interface"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ simons ]; }) {inherit (pkgs) openssl;}; "hopfield" = callPackage @@ -73858,6 +73907,7 @@ self: { homepage = "http://github.com/peti/hsdns"; description = "Asynchronous DNS Resolver"; license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ simons ]; }) {inherit (pkgs) adns;}; "hsdns-cache" = callPackage @@ -73916,6 +73966,7 @@ self: { homepage = "http://github.com/peti/hsemail"; description = "Internet Message Parsers"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; "hsemail-ns" = callPackage @@ -74945,6 +74996,7 @@ self: { homepage = "https://github.com/dbp/hspec-snap"; description = "A library for testing with Hspec and the Snap Web Framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-structured-formatter" = callPackage @@ -75665,7 +75717,6 @@ self: { homepage = "http://www.happstack.com/"; description = "hsp+jmacro support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsx-xhtml" = callPackage @@ -75724,6 +75775,7 @@ self: { homepage = "http://github.com/peti/hsyslog"; description = "FFI interface to syslog(3) from POSIX.1-2001"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; "hszephyr" = callPackage @@ -76141,8 +76193,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.4.20"; - sha256 = "8d79157a2887b67d90926a267eaf21b24e914c0975e371ac079167894e308a24"; + version = "0.4.21"; + sha256 = "f6465cfec946c7acfeb210daa97e65e67c3924867072ed47193a83cf1226dc30"; libraryHaskellDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive containers cookie data-default-class deepseq @@ -78532,7 +78584,6 @@ self: { ]; description = "An IDE backend server"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ideas" = callPackage @@ -78915,7 +78966,6 @@ self: { homepage = "http://github.com/gibiansky/IHaskell"; description = "A Haskell backend kernel for the IPython project"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-aeson" = callPackage @@ -78932,7 +78982,6 @@ self: { homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for Aeson"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-basic" = callPackage @@ -78945,7 +78994,6 @@ self: { homepage = "http://www.github.com/gibiansky/IHaskell"; description = "IHaskell display instances for basic types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-blaze" = callPackage @@ -78958,7 +79006,6 @@ self: { homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for blaze-html types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-charts" = callPackage @@ -78976,7 +79023,6 @@ self: { homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for charts types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-diagrams" = callPackage @@ -79007,7 +79053,6 @@ self: { homepage = "http://www.github.com/gibiansky/IHaskell"; description = "IHaskell display instances for basic types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-hatex" = callPackage @@ -79020,7 +79065,6 @@ self: { homepage = "http://www.github.com/gibiansky/IHaskell"; description = "IHaskell display instances for hatex"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-juicypixels" = callPackage @@ -79036,7 +79080,6 @@ self: { homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell - IHaskellDisplay instances of the image types of the JuicyPixels package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-magic" = callPackage @@ -79054,7 +79097,6 @@ self: { homepage = "http://www.github.com/gibiansky/IHaskell"; description = "IHaskell display instances for bytestrings"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-parsec" = callPackage @@ -79072,7 +79114,6 @@ self: { homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for Parsec"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-plot" = callPackage @@ -79085,7 +79126,6 @@ self: { homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instance for Plot (from plot package)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-rlangqq" = callPackage @@ -79103,7 +79143,6 @@ self: { ]; description = "a rDisp quasiquote to show plots from Rlang-QQ in IHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-widgets" = callPackage @@ -79740,6 +79779,7 @@ self: { homepage = "https://github.com/myfreeweb/indieweb-algorithms"; description = "A collection of implementations of IndieWeb algorithms"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "infer-upstream" = callPackage @@ -80867,10 +80907,8 @@ self: { }: mkDerivation { pname = "iproute"; - version = "1.5.0"; - sha256 = "e33b233c681be367162c342ebf3843ec2d858db49716ef52d96546bd3f6f2557"; - revision = "1"; - editedCabalFile = "f601b3319004e7b4a4636c89996ea78fd084e9b10d15d679d7ae58e822fe19b8"; + version = "1.6.0"; + sha256 = "792c638d4957ac85d04a17864991eaa4ae09e4fb7e890ff95a7807a2875705d0"; libraryHaskellDepends = [ appar base byteorder containers network ]; @@ -81942,6 +81980,7 @@ self: { homepage = "http://github.com/peti/jailbreak-cabal"; description = "Strip version restrictions from build dependencies in Cabal files"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; "jalaali" = callPackage @@ -82005,7 +82044,6 @@ self: { homepage = "https://github.com/mtolly/jammittools"; description = "Export sheet music and audio from Windows/Mac app Jammit"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jarfind" = callPackage @@ -83070,8 +83108,8 @@ self: { }: mkDerivation { pname = "jsonsql"; - version = "0.1.0.1"; - sha256 = "3906445e73a38fadc36dcbaf927597797f0ecd3c6310acf63c48fdab79eb24d7"; + version = "0.1.2.1"; + sha256 = "93234e108034457f59e078cd2d6205a7ed4218262f0c7a39a91600e915b7966b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -84752,6 +84790,7 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot is a development tool and advanced IRC bot"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-core" = callPackage @@ -84778,6 +84817,7 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot core functionality"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-haskell-plugins" = callPackage @@ -84804,6 +84844,7 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot Haskell plugins"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-irc-plugins" = callPackage @@ -84822,6 +84863,7 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "IRC plugins for lambdabot"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-misc-plugins" = callPackage @@ -84845,6 +84887,7 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot miscellaneous plugins"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-novelty-plugins" = callPackage @@ -84863,6 +84906,7 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Novelty plugins for Lambdabot"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-reference-plugins" = callPackage @@ -84881,6 +84925,7 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot reference plugins"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-social-plugins" = callPackage @@ -84897,6 +84942,7 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Social plugins for Lambdabot"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-trusted" = callPackage @@ -85657,6 +85703,7 @@ self: { homepage = "https://github.com/peti/language-nix"; description = "Haskell AST and Parsers for the Nix language"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; "language-objc" = callPackage @@ -86472,7 +86519,6 @@ self: { homepage = "http://www.leksah.org"; description = "Haskell IDE written in Haskell"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "leksah-server" = callPackage @@ -89174,8 +89220,8 @@ self: { ({ mkDerivation, base, containers, monadLib, pretty }: mkDerivation { pname = "llvm-pretty"; - version = "0.4.0.0"; - sha256 = "6d757a9929a0b43f3e22d0799939d7489b16dd2637553bb396a47cd0318bf23f"; + version = "0.4.0.1"; + sha256 = "637506a2356076fefbf7515baa4c19ef2828fc404ab3c0ae0f9b1b2d5f04a42b"; libraryHaskellDepends = [ base containers monadLib pretty ]; description = "A pretty printing library inspired by the llvm binding"; license = stdenv.lib.licenses.bsd3; @@ -90747,7 +90793,6 @@ self: { homepage = "http://hub.darcs.net/thielema/magico"; description = "Compute solutions for Magico puzzle"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "magma" = callPackage @@ -91465,7 +91510,6 @@ self: { homepage = "https://github.com/leftaroundabout/manifolds"; description = "Working with manifolds in a direct, embedding-free way"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "map-syntax" = callPackage @@ -92897,7 +92941,6 @@ self: { homepage = "https://github.com/myfreeweb/microformats2-parser"; description = "A Microformats 2 parser"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microformats2-types" = callPackage @@ -93259,7 +93302,6 @@ self: { jailbreak = true; description = "A Kafka client for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mime" = callPackage @@ -93297,8 +93339,8 @@ self: { }: mkDerivation { pname = "mime-mail"; - version = "0.4.9"; - sha256 = "641420aa8b1d2c7f8ebf82fdb0e6000443ffba89a420f4ea11828474b244c3d0"; + version = "0.4.10"; + sha256 = "4930f9c6a906e73452a891d93b1cf545b64613ccb079fe625fa4c98c01b25677"; libraryHaskellDepends = [ base base64-bytestring blaze-builder bytestring filepath process random text @@ -94057,8 +94099,8 @@ self: { }: mkDerivation { pname = "moesocks"; - version = "0.1.0.26"; - sha256 = "6b2af22a46ffea53436cfca302ad526827c4bfd7963d259304714acd1ee2bf91"; + version = "0.1.0.27"; + sha256 = "3e520127ef1727d460d65b1219d5c585973c62fc2f31713d6743aed2406d5abe"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -97497,8 +97539,8 @@ self: { }: mkDerivation { pname = "nationstates"; - version = "0.2.0.0"; - sha256 = "88e00660570f45c3ff709a659707b5967db54730f3dff25844dde07d0b3b3a1f"; + version = "0.2.0.1"; + sha256 = "091ddee83ea21b6b8505ef5053c8b6ce58b08a578f8cd51bfe1c32745af0426c"; libraryHaskellDepends = [ base bytestring clock containers http-client http-client-tls http-types multiset transformers xml @@ -97732,13 +97774,12 @@ self: { }: mkDerivation { pname = "neat-interpolation"; - version = "0.2.2.1"; - sha256 = "de357ec4b78f68c5797d84e8bb01a35aff53e8c0d10d5d1ebbe5185d0483b303"; + version = "0.2.3"; + sha256 = "a60966321467bf8065796f37774756f94a89c443ee59fac4fbeac964d4a1c20b"; libraryHaskellDepends = [ base base-prelude parsec template-haskell ]; testHaskellDepends = [ base-prelude HTF ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/neat-interpolation"; description = "A quasiquoter for neat and simple multiline text interpolation"; license = stdenv.lib.licenses.mit; @@ -99790,8 +99831,8 @@ self: { }: mkDerivation { pname = "not-gloss"; - version = "0.7.5.0"; - sha256 = "8b22f315fe60b95e7b24bae9b206b815851f5b60082cb5139ae2d33816f315e4"; + version = "0.7.6.0"; + sha256 = "0ac24214e36b7ab50e9e2714d0806a8f732a52d1b04d596438d9fdd6c877cd8b"; libraryHaskellDepends = [ base binary bmp bytestring cereal GLUT OpenGL OpenGLRaw spatial-math time vector vector-binary-instances @@ -100558,7 +100599,6 @@ self: { homepage = "https://github.com/stackbuilders/octohat"; description = "A tested, minimal wrapper around GitHub's API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "octopus" = callPackage @@ -100982,6 +101022,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "opaleye-classy" = callPackage + ({ mkDerivation, base, bytestring, lens, mtl, opaleye + , postgresql-simple, product-profunctors, transformers + }: + mkDerivation { + pname = "opaleye-classy"; + version = "0.1.0.1"; + sha256 = "874c3f1d394653289542ef2a8ca55d8b93c01c1de78e2c0bbe1c668be39b331a"; + libraryHaskellDepends = [ + base bytestring lens mtl opaleye postgresql-simple + product-profunctors transformers + ]; + homepage = "https://github.com/benkolera/opaleye-classy/tree/master"; + description = "Opaleye wrapped up in classy MTL attire"; + license = stdenv.lib.licenses.mit; + }) {}; + "opaleye-sqlite" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring , case-insensitive, containers, contravariant, direct-sqlite @@ -101857,7 +101914,6 @@ self: { jailbreak = true; description = "An API client for http://orchestrate.io/."; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "orchid" = callPackage @@ -102626,8 +102682,8 @@ self: { pname = "pandoc-csv2table"; version = "1.0.1"; sha256 = "0b872c518f3d3f1ca178e8a6cd2581f0a3b294cfd533e19fccd0fd95dcd79d2c"; - revision = "1"; - editedCabalFile = "0924cc418394f855f93486ee6fb3bae991112c3e63df74f95afa6c2d62b09299"; + revision = "2"; + editedCabalFile = "522492bc433302f60262c0c9a19ccda171dd4eaec177f42fe75e471b79df1924"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base csv pandoc pandoc-types text ]; @@ -103503,6 +103559,7 @@ self: { testHaskellDepends = [ base hspec HUnit QuickCheck text ]; description = "Components of paths"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; "pathfinding" = callPackage @@ -103886,7 +103943,6 @@ self: { homepage = "https://github.com/Yuras/pdf-toolbox"; description = "A collection of tools for processing PDF files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pdf-toolbox-core" = callPackage @@ -103904,7 +103960,6 @@ self: { homepage = "https://github.com/Yuras/pdf-toolbox"; description = "A collection of tools for processing PDF files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pdf-toolbox-document" = callPackage @@ -103924,7 +103979,6 @@ self: { homepage = "https://github.com/Yuras/pdf-toolbox"; description = "A collection of tools for processing PDF files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pdf-toolbox-viewer" = callPackage @@ -103946,7 +104000,6 @@ self: { homepage = "https://github.com/Yuras/pdf-toolbox"; description = "Simple pdf viewer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pdf2line" = callPackage @@ -104309,6 +104362,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "period" = callPackage + ({ mkDerivation, base, hspec, HUnit, optparse-applicative, parsec + , text, text-show, time + }: + mkDerivation { + pname = "period"; + version = "0.1.0.1"; + sha256 = "b83dfef9a9de6746e0bc852f816cb00cfd564e2cc5af1bcd5c4f2c82b12b308e"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base parsec text text-show time ]; + executableHaskellDepends = [ base optparse-applicative text ]; + testHaskellDepends = [ base hspec HUnit text time ]; + homepage = "https://github.com/w3rs/period"; + description = "Parse and format date periods, collapse and expand their text representations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "perm" = callPackage ({ mkDerivation, base, catch-fd, HUnit, mtl, test-framework , test-framework-hunit, transformers @@ -104414,6 +104485,7 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, multi-backend data serialization"; license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; "persistent-cereal" = callPackage @@ -104505,6 +104577,7 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using mongoDB"; license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; "persistent-mysql" = callPackage @@ -104524,6 +104597,7 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using MySQL database server"; license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; "persistent-odbc" = callPackage @@ -104566,6 +104640,7 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; "persistent-protobuf" = callPackage @@ -104623,6 +104698,7 @@ self: { jailbreak = true; description = "Backend for persistent library using Redis"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; "persistent-refs" = callPackage @@ -104661,6 +104737,7 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using sqlite3"; license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; "persistent-template" = callPackage @@ -104684,6 +104761,7 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, non-relational, multi-backend persistence"; license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; "persistent-vector" = callPackage @@ -104731,6 +104809,7 @@ self: { jailbreak = true; description = "Backend for persistent library using Zookeeper"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; "persona" = callPackage @@ -104906,7 +104985,6 @@ self: { ]; description = "simply download a video (or a file) from a webpage and xdg-open it"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pgm" = callPackage @@ -105635,6 +105713,7 @@ self: { homepage = "http://github.com/kvanberendonck/pipes-courier"; description = "Pipes utilities for interfacing with the courier message-passing framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-csv" = callPackage @@ -105656,7 +105735,7 @@ self: { ]; description = "Fast, streaming csv parser"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ jb55 ]; }) {}; "pipes-errors" = callPackage @@ -105824,6 +105903,7 @@ self: { homepage = "http://github.com/jb55/pipes-mongodb"; description = "Stream results from MongoDB"; license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ jb55 ]; }) {}; "pipes-network" = callPackage @@ -109760,7 +109840,6 @@ self: { homepage = "http://pugscode.org/"; description = "DrIFT with pugs-specific rules"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pugs-HsSyck" = callPackage @@ -109792,7 +109871,6 @@ self: { ]; description = "Portable Haskell/POSIX layer for Pugs"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pugs-hsregex" = callPackage @@ -109995,8 +110073,8 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.7.3.0"; - sha256 = "27d9e4bd3061a2b64e10d4d7c140b2debd786772309aa36e0b7fdaa49b42b5c0"; + version = "0.7.4.1"; + sha256 = "82d41cbde580e86620d18d03f38508b2d5f0c1ce4719ac62f3ea2bbe35ee4b9f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -110019,7 +110097,6 @@ self: { homepage = "http://www.purescript.org/"; description = "PureScript Programming Language Compiler"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "purescript-bundle-fast" = callPackage @@ -111001,6 +111078,8 @@ self: { pname = "quiver-http"; version = "0.0.0.2"; sha256 = "e221dbbe65a0b4509e7efbd1e70383575175932e16b28d0cbeaa2165b7a5dfe0"; + revision = "1"; + editedCabalFile = "ca7fe920bd4fd519db582ca6fcfdc82f5e62563df3e29827f523acf423f43380"; libraryHaskellDepends = [ base bytestring http-client http-client-tls quiver ]; @@ -111573,8 +111652,8 @@ self: { }: mkDerivation { pname = "range-space"; - version = "0.1.1.2"; - sha256 = "2465f41de6245ccb481ac6734ff7dc22521bc4ed98aa874e668c06eadf2c9419"; + version = "0.1.2.0"; + sha256 = "388d6cea0511019d7e0b43989722e94202d505772271a5f84ec66d99856b38c3"; libraryHaskellDepends = [ base semigroups vector-space vector-space-points ]; @@ -111582,11 +111661,9 @@ self: { base QuickCheck semigroups test-framework test-framework-quickcheck2 time vector-space vector-space-points ]; - jailbreak = true; homepage = "https://github.com/JohnLato/range-space"; description = "A Range type with vector-space instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rangemin" = callPackage @@ -112016,20 +112093,20 @@ self: { }) {}; "reactive-banana" = callPackage - ({ mkDerivation, base, containers, hashable, HUnit, psqueues - , test-framework, test-framework-hunit, transformers + ({ mkDerivation, base, containers, hashable, HUnit, pqueue + , psqueues, test-framework, test-framework-hunit, transformers , unordered-containers, vault }: mkDerivation { pname = "reactive-banana"; - version = "0.8.1.2"; - sha256 = "ead933b650793b078a9c8c9daf86c4f1cd45007a4a1a4c96bfa5257f328863aa"; + version = "0.9.0.0"; + sha256 = "255930fdf0dcf40fe126ae2f4f274267cfd1e5f49b548618c3c84e3a8ad79683"; libraryHaskellDepends = [ - base containers hashable psqueues transformers unordered-containers + base containers hashable pqueue transformers unordered-containers vault ]; testHaskellDepends = [ - base containers hashable HUnit psqueues test-framework + base containers hashable HUnit pqueue psqueues test-framework test-framework-hunit transformers unordered-containers vault ]; homepage = "http://wiki.haskell.org/Reactive-banana"; @@ -112049,6 +112126,7 @@ self: { base data-lens data-lens-template reactive-banana SDL SDL-image SDL-ttf ]; + jailbreak = true; homepage = "https://github.com/JPMoresmau/reactive-banana-sdl"; description = "Reactive Banana bindings for SDL"; license = stdenv.lib.licenses.gpl3; @@ -112075,15 +112153,15 @@ self: { ({ mkDerivation, base, cabal-macosx, reactive-banana, wx, wxcore }: mkDerivation { pname = "reactive-banana-wx"; - version = "0.8.0.4"; - sha256 = "8fe99c2d49ae2b579716447caf9b75b31d951e57b796073bd6c1cdad530600e4"; + version = "0.9.0.1"; + sha256 = "554e9d6715665a52e6395148749d9c1ec58db2cf8dfaa4944374a605072529ba"; configureFlags = [ "-f-buildexamples" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base cabal-macosx reactive-banana wx wxcore ]; - homepage = "http://haskell.org/haskellwiki/Reactive-banana"; + homepage = "http://wiki.haskell.org/Reactive-banana"; description = "Examples for the reactive-banana library, using wxHaskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -112499,6 +112577,7 @@ self: { aeson api-builder base bytestring Cabal hspec http-client http-client-tls text time transformers ]; + jailbreak = true; homepage = "https://github.com/intolerable/reddit"; description = "Library for interfacing with Reddit's API"; license = stdenv.lib.licenses.bsd2; @@ -113915,7 +113994,6 @@ self: { homepage = "https://github.com/octomarat/HaskellDebugger"; description = "Interface to ghci debugger"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "remotion" = callPackage @@ -114511,7 +114589,6 @@ self: { homepage = "http://hub.darcs.net/thielema/resistor-cube"; description = "Compute total resistance of a cube of resistors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "resolve-trivial-conflicts" = callPackage @@ -116321,7 +116398,6 @@ self: { homepage = "https://github.com/mtolly/rubberband"; description = "Binding to the C++ audio stretching library Rubber Band"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) rubberband;}; "ruby-marshal" = callPackage @@ -119496,6 +119572,7 @@ self: { homepage = "https://github.com/yesodweb/serversession"; description = "Storage backend for serversession using acid-state"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "serversession-backend-persistent" = callPackage @@ -120239,6 +120316,7 @@ self: { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "A toolkit for making compile-time interpolated templates"; license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; "shakespeare-css" = callPackage @@ -120837,6 +120915,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "signal" = callPackage + ({ mkDerivation, base, unix }: + mkDerivation { + pname = "signal"; + version = "0.1.0.2"; + sha256 = "80643e609ce60d9be49c13cf2a11b6ed948248de413434a162f3253c66f901fe"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base unix ]; + executableHaskellDepends = [ base ]; + jailbreak = true; + homepage = "http://github.com/pmlodawski/signal"; + description = "Multiplatform signal support for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "signals" = callPackage ({ mkDerivation, array, base, constraints, containers, data-reify , exception-mtl, exception-transformers, language-c-quote @@ -122442,6 +122536,8 @@ self: { pname = "smtLib"; version = "1.0.7"; sha256 = "6e660125d16c7ad42120df7fb0bd53d1d0614532ed3956aa34f6bcd3413ac2ca"; + revision = "1"; + editedCabalFile = "7a1d7c3e0e90bddb41538fa724f410e2a6915793ab14df4dfc4074c9d09d448e"; libraryHaskellDepends = [ base pretty ]; description = "A library for working with the SMTLIB format"; license = stdenv.lib.licenses.bsd3; @@ -125775,8 +125871,8 @@ self: { , classy-prelude-conduit, conduit, conduit-extra, containers , cryptohash, cryptohash-conduit, data-default-class, directory , filepath, hspec, html-conduit, http-client, http-client-tls - , http-conduit, mime-types, monad-unlift, mono-traversable, mtl - , old-locale, optparse-applicative, optparse-simple, process + , http-conduit, lucid, mime-types, monad-unlift, mono-traversable + , mtl, old-locale, optparse-applicative, optparse-simple, process , QuickCheck, resourcet, semigroups, stackage-cli, stackage-install , stackage-metadata, stackage-types, stackage-update, stm , streaming-commons, system-fileio, system-filepath, tar, temporary @@ -125785,8 +125881,8 @@ self: { }: mkDerivation { pname = "stackage-curator"; - version = "0.10.0"; - sha256 = "36610b312932a3c348dba4f2b93fb0242312d54e729e1a522964c5b5527d9a36"; + version = "0.11.0"; + sha256 = "4e6946926728bbc91d9897e81f43c4dc5f9efa886bba51068014a78576bf754d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125794,12 +125890,12 @@ self: { base16-bytestring blaze-html byteable bytestring Cabal classy-prelude-conduit conduit conduit-extra containers cryptohash cryptohash-conduit data-default-class directory filepath - html-conduit http-client http-client-tls http-conduit mime-types - monad-unlift mono-traversable mtl old-locale process resourcet - semigroups stackage-install stackage-metadata stackage-types stm - streaming-commons system-fileio system-filepath tar temporary text - time transformers unix-compat utf8-string xml-conduit xml-types - yaml zlib + html-conduit http-client http-client-tls http-conduit lucid + mime-types monad-unlift mono-traversable mtl old-locale process + resourcet semigroups stackage-install stackage-metadata + stackage-types stm streaming-commons system-fileio system-filepath + tar temporary text time transformers unix-compat utf8-string + xml-conduit xml-types yaml zlib ]; executableHaskellDepends = [ base http-client http-client-tls optparse-applicative @@ -125809,7 +125905,6 @@ self: { base Cabal classy-prelude-conduit containers hspec http-client http-client-tls QuickCheck text yaml ]; - jailbreak = true; homepage = "https://github.com/fpco/stackage"; description = "Tools for curating Stackage bundles"; license = stdenv.lib.licenses.mit; @@ -126478,7 +126573,6 @@ self: { homepage = "https://github.com/schell/steeloverseer"; description = "A file watcher"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stemmer" = callPackage @@ -127097,8 +127191,8 @@ self: { ({ mkDerivation, base, mmorph, mtl, transformers }: mkDerivation { pname = "streaming"; - version = "0.1.0.9"; - sha256 = "322fc0911ebb1643d4081fc8b34cf8252def719b5b749017fd8476e2eb16c467"; + version = "0.1.0.11"; + sha256 = "824351fc0c99bd5141ad4fef9db85032c5fb4d5cd745b9aca1490ea4dbfccf06"; libraryHaskellDepends = [ base mmorph mtl transformers ]; homepage = "https://github.com/michaelt/streaming"; description = "A free monad transformer optimized for streaming applications"; @@ -127106,19 +127200,17 @@ self: { }) {}; "streaming-bytestring" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, deepseq, foldl - , http-client, http-client-tls, mmorph, mtl, streaming, syb + ({ mkDerivation, base, bytestring, deepseq, mmorph, mtl, streaming , transformers }: mkDerivation { pname = "streaming-bytestring"; - version = "0.1.0.1"; - sha256 = "06f0ec85133e273853c3a967f3f806336bb2ad84da24b610a53bb3c76d5a9e20"; + version = "0.1.0.2"; + sha256 = "cae7ee4205506ab7aa22904a4a055249f8225c5d6c4049313a09ce219ba98985"; libraryHaskellDepends = [ - attoparsec base bytestring deepseq foldl http-client - http-client-tls mmorph mtl streaming syb transformers + base bytestring deepseq mmorph mtl streaming transformers ]; - description = "Lazy bytestring done right"; + description = "effectful bytestrings, or: lazy bytestring done right"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -127169,6 +127261,7 @@ self: { homepage = "http://github.com/peti/streamproc"; description = "Stream Processer Arrow"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; "streams" = callPackage @@ -130001,7 +130094,6 @@ self: { ]; description = "Manage pools of possibly interdependent tasks using STM and async"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty" = callPackage @@ -130257,8 +130349,8 @@ self: { }: mkDerivation { pname = "tasty-tap"; - version = "0.0.1"; - sha256 = "c751cea8c7a33e8ec159a661ced1642aa29c2038d876ad1d95c27121848a00c8"; + version = "0.0.2"; + sha256 = "e4390ec7d63393909aa46da9346dc1abc9a4eafa4b82923b6ba776d0777784b7"; libraryHaskellDepends = [ base containers stm tasty ]; testHaskellDepends = [ base directory tasty tasty-golden tasty-hunit @@ -130492,7 +130584,6 @@ self: { homepage = "https://github.com/phaazon/tellbot"; description = "IRC tellbot"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "template" = callPackage @@ -130906,7 +130997,6 @@ self: { testHaskellDepends = [ base directory errors filepath QuickCheck ]; description = "A pure-Haskell (no FFI) module for accessing terminfo databases"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "terrahs" = callPackage @@ -132433,7 +132523,6 @@ self: { homepage = "http://github.com/bennofs/themplate/"; description = "Project templating tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "theoremquest" = callPackage @@ -132483,7 +132572,6 @@ self: { homepage = "https://github.com/isomorphism/these"; description = "An either-or-both data type, with corresponding hybrid error/writer monad transformer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "thespian" = callPackage @@ -132850,7 +132938,6 @@ self: { homepage = "https://github.com/koterpillar/tianbar"; description = "A desktop bar based on WebKit"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tic-tac-toe" = callPackage @@ -133204,7 +133291,6 @@ self: { homepage = "https://bitbucket.org/jfmueller/time-patterns"; description = "Patterns for recurring events"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "time-qq" = callPackage @@ -137174,8 +137260,8 @@ self: { ({ mkDerivation, base, ShowF }: mkDerivation { pname = "uniform-pair"; - version = "0.1.7"; - sha256 = "be32baf4cdc36db451b1ee28502a3a357e840b800118ce9102df37ffcbca98e1"; + version = "0.1.8"; + sha256 = "1668512c64d71f299a4b3f477dbf1b027cf38e65e4892c68cda3ca7f3d98e316"; libraryHaskellDepends = [ base ShowF ]; homepage = "https://github.com/conal/uniform-pair/"; description = "Uniform pairs with class instances"; @@ -137992,8 +138078,8 @@ self: { }: mkDerivation { pname = "uri-bytestring"; - version = "0.1.6"; - sha256 = "46c6d0d84fcaca2ada708b9e7421fb9529619287696c6b44c755c8dcb32ce473"; + version = "0.1.7"; + sha256 = "e29aef1ce933239fc3183e785d42f3b1f86478efc4df00f7582e97140d3a5968"; libraryHaskellDepends = [ attoparsec base blaze-builder bytestring ]; @@ -139573,7 +139659,6 @@ self: { homepage = "http://hackage.haskell.org/package/vector-fftw"; description = "A binding to the fftw library for one-dimensional vectors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) fftw;}; "vector-functorlazy" = callPackage @@ -139917,7 +140002,6 @@ self: { homepage = "http://github.com/pjones/vimeta"; description = "Frontend for video metadata tagging tools"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vimus" = callPackage @@ -140367,7 +140451,6 @@ self: { homepage = "http://jtdaugherty.github.com/vty-ui/"; description = "An interactive terminal user interface library for Vty"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vty-ui-extras" = callPackage @@ -141070,7 +141153,6 @@ self: { homepage = "https://github.com/Helkafen/wai-middleware-metrics"; description = "A WAI middleware to collect EKG request metrics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-middleware-preprocessor" = callPackage @@ -142663,6 +142745,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "why3" = callPackage + ({ mkDerivation, alex, array, base, bytestring, containers, deepseq + , directory, filepath, happy, monadLib, pretty, pretty-show + , profunctors, text + }: + mkDerivation { + pname = "why3"; + version = "0.8"; + sha256 = "8e2d6d29c6fd6f0ecd72a28c3075843533db6a086c67a2a9a520f0dcc916fbf5"; + libraryHaskellDepends = [ + array base bytestring containers deepseq directory filepath + monadLib pretty pretty-show profunctors text + ]; + libraryToolDepends = [ alex happy ]; + description = "Haskell support for the Why3 input format"; + license = stdenv.lib.licenses.mit; + }) {}; + "wikipedia4epub" = callPackage ({ mkDerivation, base, bytestring, directory, epub, filepath , haskell98, HTTP, network, regex-base, regex-posix, tagsoup, url @@ -143472,12 +143572,12 @@ self: { }) {}; "wx" = callPackage - ({ mkDerivation, base, stm, wxcore }: + ({ mkDerivation, base, stm, time, wxcore }: mkDerivation { pname = "wx"; - version = "0.91.0.0"; - sha256 = "5eba8936c4e783bb0d97ea8b8bc4140a0ff13e7529f5a2c2e1be63b707936c8c"; - libraryHaskellDepends = [ base stm wxcore ]; + version = "0.92.0.0"; + sha256 = "7a649a4445aaf4681e1c2c9e0b664bce656cc4700a527af8596920019d3295e4"; + libraryHaskellDepends = [ base stm time wxcore ]; homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell"; license = "unknown"; @@ -143519,13 +143619,13 @@ self: { ({ mkDerivation, base, libX11, mesa, wxdirect, wxGTK }: mkDerivation { pname = "wxc"; - version = "0.91.0.0"; - sha256 = "4a8fb2ce231222dec30c40b6f6eae2afc14485a0b4376f7fa49e3624a0582a6a"; + version = "0.92.0.0"; + sha256 = "ed5872f17e05055abaf4427f45f32d817b0f9be0352432fc3ffd08b65305a8dc"; libraryHaskellDepends = [ base wxdirect ]; librarySystemDepends = [ libX11 mesa ]; libraryPkgconfigDepends = [ wxGTK ]; doHaddock = false; - postInstall = "cp -v dist/build/libwxc.so.0.91.0.0 $out/lib/libwxc.so"; + postInstall = "cp -v dist/build/libwxc.so.0.92.0.0 $out/lib/libwxc.so"; postPatch = "sed -i -e '/ldconfig inst_lib_dir/d' Setup.hs"; homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell C++ wrapper"; @@ -143539,8 +143639,8 @@ self: { }: mkDerivation { pname = "wxcore"; - version = "0.91.0.0"; - sha256 = "7f52bcb0412f50fa77677a7fe9d45d087a2c9d623b89c03d9d327a18b557fb06"; + version = "0.92.0.0"; + sha256 = "332a68b658be7eeca62e9992dd01d26016a3f24e6666e803107291a3c71145b9"; libraryHaskellDepends = [ array base bytestring containers directory filepath parsec stm time wxc wxdirect @@ -143557,14 +143657,13 @@ self: { }: mkDerivation { pname = "wxdirect"; - version = "0.91.0.0"; - sha256 = "475c9f977576f1ea881461d7ac729caa71c0b5958db8500fab9b3de57ddcb49f"; + version = "0.92.0.0"; + sha256 = "b13687de38402df779780db1bc410f02a6ae6815d3e984b702d2c7c4be799ec8"; isLibrary = true; isExecutable = true; executableHaskellDepends = [ base containers directory filepath parsec process strict time ]; - jailbreak = true; homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "helper tool for building wxHaskell"; license = stdenv.lib.licenses.bsd3; @@ -144848,13 +144947,14 @@ self: { pname = "xmonad"; version = "0.11.1"; sha256 = "39e0bf227df782d7a5799c811ad0d8b70c9d6eaaa94e8cc395fcf25895d6d2dd"; + revision = "1"; + editedCabalFile = "12849de2637cf39a8c0311d81418632e719125f55db2faf931b1905d85d5bf3d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers directory extensible-exceptions filepath mtl process unix utf8-string X11 ]; - jailbreak = true; homepage = "http://xmonad.org"; description = "A tiling window manager"; license = stdenv.lib.licenses.bsd3; @@ -145396,7 +145496,6 @@ self: { homepage = "http://github.com/snoyberg/yackage"; description = "Personal Hackage replacement for testing new packages"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yahoo-finance-conduit" = callPackage @@ -145805,6 +145904,7 @@ self: { jailbreak = true; description = "Yet Another Template Engine"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yavie" = callPackage @@ -146502,8 +146602,8 @@ self: { }: mkDerivation { pname = "yesod-dsl"; - version = "0.1.1.24"; - sha256 = "a73d0796e4148507937566155287721d83c687114c1dfdfd73441ef1e6f8255f"; + version = "0.2.0"; + sha256 = "934aa5de181619e11c39054e9299271a4f447e753589d1b6eafd757216193c49"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -146518,7 +146618,6 @@ self: { ]; description = "DSL for generating Yesod subsite to manage an RDBMS;"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-eventsource" = callPackage @@ -147039,7 +147138,6 @@ self: { ]; description = "RAML style route definitions for Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-recaptcha" = callPackage @@ -147099,7 +147197,6 @@ self: { homepage = "https://github.com/frontrowed/yesod-routes-flow"; description = "Generate Flow routes for Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-routes-typescript" = callPackage @@ -147391,8 +147488,8 @@ self: { }: mkDerivation { pname = "yesod-transloadit"; - version = "0.4.0.0"; - sha256 = "a50270b5829c45c7b72a82137abf94046343f60532bcab0a8a6ef0fd9974745a"; + version = "0.4.1.0"; + sha256 = "4e0a68a2f1d90bdc4489ac18f05bff3728da89756ebbd54cc1654d6b81114c80"; libraryHaskellDepends = [ aeson base byteable bytestring cryptohash lens lens-aeson old-locale shakespeare text time transformers unordered-containers From b45e3290c90031bc41d48a9009e9034b6d6814ee Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Aug 2015 12:42:03 +0200 Subject: [PATCH 159/175] haskell-wx: new versions require wkGTK 3.0 --- pkgs/development/haskell-modules/configuration-common.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 41eeaf30cc5..528a493aba0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -591,9 +591,9 @@ self: super: { # https://github.com/vincenthz/hs-asn1/issues/12 asn1-encoding = dontCheck super.asn1-encoding; - # wxc supports wxGTX >= 2.9, but our current default version points to 2.8. - wxc = super.wxc.override { wxGTK = pkgs.wxGTK29; }; - wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK29; }; + # wxc supports wxGTX >= 3.0, but our current default version points to 2.8. + wxc = super.wxc.override { wxGTK = pkgs.wxGTK30; }; + wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK30; }; # Depends on QuickCheck 1.x. HaVSA = super.HaVSA.override { QuickCheck = self.QuickCheck_1_2_0_1; }; From c375b224b0dc891ac49f116bcd38fe4de60854ab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Aug 2015 14:23:57 +0200 Subject: [PATCH 160/175] haskell-concurrent-extra fails its test suite. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 528a493aba0..b55ffd5f461 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1010,4 +1010,8 @@ self: super: { ]; prePatch = '' sed -i -e "/Extra-Lib-Dirs/d" -e "/Include-Dirs/d" "hcwiid.cabal" ''; }); + + # https://github.com/basvandijk/concurrent-extra/issues/12 + concurrent-extra = dontCheck super.concurrent-extra; + } From 12dcb664d686a1a96855ae617e1748490b7291a4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Aug 2015 14:34:35 +0200 Subject: [PATCH 161/175] haskell-amazonka-core can't compile its test suite. --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b55ffd5f461..5e135a99973 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1014,4 +1014,7 @@ self: super: { # https://github.com/basvandijk/concurrent-extra/issues/12 concurrent-extra = dontCheck super.concurrent-extra; + # https://github.com/brendanhay/amazonka/issues/203 + amazonka-core = dontCheck super.amazonka-core; + } From 67fcedd51721eda7ef86a924f72f88d470356826 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Aug 2015 15:45:52 +0200 Subject: [PATCH 162/175] haskell-harp has been fixed upstream. --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 04205825ef2..f7b7a3b70ef 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -224,10 +224,6 @@ self: super: { # https://github.com/HugoDaniel/RFC3339/issues/14 timerep = dontCheck super.timerep; - # Upstream has no issue tracker. - harp = markBrokenVersion "0.4" super.harp; - happstack-authenticate = dontDistribute super.happstack-authenticate; - # Upstream has no issue tracker. llvm-base-types = markBroken super.llvm-base-types; llvm-analysis = dontDistribute super.llvm-analysis; From 97c5f0577df89e19221d059497068a6c4e9ae7d8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Aug 2015 15:46:18 +0200 Subject: [PATCH 163/175] haskell-llvm-general: the new version still doesn't support LLVM 3.5 --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index f7b7a3b70ef..28092f8d886 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -252,8 +252,8 @@ self: super: { HLearn-distributions = dontDistribute super.HLearn-distributions; HLearn-classification = dontDistribute super.HLearn-classification; - # Won't work with LLVM 3.5. - llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general; + # Doesn't work with LLVM 3.5. + llvm-general = markBroken super.llvm-general; # Inexplicable haddock failure # https://github.com/gregwebs/aeson-applicative/issues/2 From d34f7ded4964ba05917be14f899b534dd310ec52 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Aug 2015 19:18:55 +0200 Subject: [PATCH 164/175] ghc-head: update to current HEAD --- pkgs/development/compilers/ghc/head.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 65d52c1a3e5..fe0d0b37371 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -17,14 +17,14 @@ let in stdenv.mkDerivation rec { - version = "7.11.20150809"; + version = "7.11.20150828"; name = "ghc-${version}"; - rev = "a40ec755d8e020cd4b87975f5a751f1e35c36977"; + rev = "38c98e4f61a48084995a5347d76ddd024ce1a09c"; src = fetchgit { url = "git://git.haskell.org/ghc.git"; inherit rev; - sha256 = "1hh1p9vrd1nrfi56jan4bnlczld2qzx85v7lfb6nara2bhcgqa1l"; + sha256 = "0wnxrfzjpjcmsmd2i0zg30jg7zpw1rrfwz8r56g314l7xcns6yp1"; }; postUnpack = '' From ab37ad22f7e0881aa3ae16f64d54d505b429dc34 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Aug 2015 22:59:29 +0200 Subject: [PATCH 165/175] doc: add "other resources" section to haskell-users-guide.xml --- doc/haskell-users-guide.xml | 65 +++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/doc/haskell-users-guide.xml b/doc/haskell-users-guide.xml index 9a945d30a9b..35eac42e0cf 100644 --- a/doc/haskell-users-guide.xml +++ b/doc/haskell-users-guide.xml @@ -755,4 +755,69 @@ export NIX_CFLAGS_LINK="-L/usr/lib" +
+ Other resources + + + + The Youtube video + Nix + Loves Haskell provides an introduction into Haskell NG + aimed at beginners. The slides are available at + http://cryp.to/nixos-meetup-3-slides.pdf and also -- in a form + ready for cut & paste -- at + https://github.com/NixOS/cabal2nix/blob/master/doc/nixos-meetup-3-slides.md. + + + + + Another Youtube video is + Escaping + Cabal Hell with Nix, which discusses the subject of + Haskell development with Nix but also provides a basic + introduction to Nix as well, i.e. it's suitable for viewers with + almost no prior Nix experience. + + + + + Oliver Charles wrote a very nice + Tutorial how to + develop Haskell packages with Nix. + + + + + The Journey into the Haskell NG + infrastructure series of postings describe the new + Haskell infrastructure in great detail: + + + + + Part + 1 explains the differences between the old and the + new code and gives instructions how to migrate to the new + setup. + + + + + Part + 2 looks in-depth at how to tweak and configure your + setup by means of overrides. + + + + + Part + 3 describes the infrastructure that keeps the + Haskell package set in Nixpkgs uptodate. + + + + + +
+ From 43ea4b670cd4f1806d3cbde648e5660d6069abae Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 28 Aug 2015 15:43:35 -0700 Subject: [PATCH 166/175] ipfs: Update --- pkgs/top-level/go-packages.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 6d3354d27c9..4818eba0bb9 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1535,17 +1535,12 @@ let sha256 = "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b"; }; - ipfs = buildGoPackage rec { - rev = "952dc9c60fdff27902749222fdc30164e7eea1ee"; - name = "ipfs-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/ipfs/go-ipfs"; - - src = fetchFromGitHub { - inherit rev; - owner = "ipfs"; - repo = "go-ipfs"; - sha256 = "1mlilx1i77px85jag4jwpcy8fy0vv15hsmpr1d9zvcs3b7qhskqp"; - }; + ipfs = buildFromGitHub{ + rev = "ff26c312000da12d395c9cdba05c43f29b68b456"; + owner = "ipfs"; + repo = "go-ipfs"; + sha256 = "0qj3rwq5i4aiwn0i09skpi1s3mzqm8ma9v1cpjl7rya2y6ypx8xg"; + excludedPackages = "Godeps"; }; ldap = buildGoPackage rec { From c5e2beab9f6d92a1fc0eb975992a78d9d1c1cba1 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 28 Aug 2015 15:44:48 -0700 Subject: [PATCH 167/175] Revert mongodb-tools: use Go 1.4 Unneeded as it works fine with Go 1.5 now --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3163f4ab861..bdbed02ef2d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -948,7 +948,7 @@ let mcrypt = callPackage ../tools/misc/mcrypt { }; - mongodb-tools = go14Packages.mongo-tools; + mongodb-tools = goPackages.mongo-tools; mstflint = callPackage ../tools/misc/mstflint { }; From 5a303519fae00496e0393a81bf47f3f4d0234df0 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 28 Aug 2015 15:46:34 -0700 Subject: [PATCH 168/175] kernel: 3.12.46 -> 3.12.47 --- pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index 904aebd75be..8146f4a5dec 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.46"; + version = "3.12.47"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "01w0b1sifzivbagm724bz0mlfrm7hpbj5a3lx1yrv8xg64gni3m1"; + sha256 = "0mcchrm79zjsnxvwf1v3glhv0zs4dszi9qwhmnws3dqxaj9brgyn"; }; features.iwlwifi = true; From 500f871d45a7cb742c8ca2725aea72f8506d84e7 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 28 Aug 2015 16:17:43 -0700 Subject: [PATCH 169/175] go1.5: Fix references to go1.4 --- pkgs/development/compilers/go/1.5.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/development/compilers/go/1.5.nix b/pkgs/development/compilers/go/1.5.nix index 8abafe0d117..8e9adf165f6 100644 --- a/pkgs/development/compilers/go/1.5.nix +++ b/pkgs/development/compilers/go/1.5.nix @@ -11,6 +11,12 @@ let find $out -name "*.c" -delete cp -rf $out/bin/* $out/share/go/bin/ ''; + + removeReferences = [ go_1_4 ]; + + removeExpr = refs: lib.flip lib.concatMapStrings refs (ref: '' + | sed "s,${ref},$(echo "${ref}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" \ + ''); in stdenv.mkDerivation rec { @@ -105,8 +111,18 @@ stdenv.mkDerivation rec { ./all.bash ''; + preFixup = '' + while read file; do + cat $file ${removeExpr removeReferences} > $file.tmp + mv $file.tmp $file + chmod +x $file + done < <(find $out/share/go/pkg/bootstrap/bin -type f 2>/dev/null) + ''; + setupHook = ./setup-hook.sh; + disallowedReferences = [ go_1_4 ]; + meta = with stdenv.lib; { branch = "1.5"; homepage = http://golang.org/; From 645709eaa5a68da036132f274447b18198477e94 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 28 Aug 2015 16:29:22 -0700 Subject: [PATCH 170/175] go1.5: Remove the bootstrap as it is unneeded --- pkgs/development/compilers/go/1.5.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/development/compilers/go/1.5.nix b/pkgs/development/compilers/go/1.5.nix index 8e9adf165f6..4f9e8b25b75 100644 --- a/pkgs/development/compilers/go/1.5.nix +++ b/pkgs/development/compilers/go/1.5.nix @@ -11,12 +11,6 @@ let find $out -name "*.c" -delete cp -rf $out/bin/* $out/share/go/bin/ ''; - - removeReferences = [ go_1_4 ]; - - removeExpr = refs: lib.flip lib.concatMapStrings refs (ref: '' - | sed "s,${ref},$(echo "${ref}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" \ - ''); in stdenv.mkDerivation rec { @@ -112,11 +106,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - while read file; do - cat $file ${removeExpr removeReferences} > $file.tmp - mv $file.tmp $file - chmod +x $file - done < <(find $out/share/go/pkg/bootstrap/bin -type f 2>/dev/null) + rm -r $out/share/go/pkg/bootstrap ''; setupHook = ./setup-hook.sh; From 2d16959bb838797a60a10ae48ad35c4d818ab462 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 28 Aug 2015 16:29:48 -0700 Subject: [PATCH 171/175] goPackages: gcloud-golang don't mark broken as this breaks anything depending on metadata --- pkgs/top-level/go-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 4818eba0bb9..7c319e36517 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -619,8 +619,6 @@ let goPackagePath = "google.golang.org/cloud"; buildInputs = [ net oauth2 protobuf google-api-go-client grpc ]; excludedPackages = "oauth2"; - - meta.broken = true; }; gcloud-golang-compute-metadata = buildGoPackage rec { From 6d83b137345f435d2eb1822731a04b9524a19295 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 28 Aug 2015 17:49:03 -0700 Subject: [PATCH 172/175] ceph: 0.94.2 -> 0.94.3 --- pkgs/tools/filesystems/ceph/0.94-pre.nix | 13 ------------- pkgs/tools/filesystems/ceph/0.94.nix | 9 +++------ pkgs/top-level/all-packages.nix | 1 - 3 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 pkgs/tools/filesystems/ceph/0.94-pre.nix diff --git a/pkgs/tools/filesystems/ceph/0.94-pre.nix b/pkgs/tools/filesystems/ceph/0.94-pre.nix deleted file mode 100644 index fcf57526fd1..00000000000 --- a/pkgs/tools/filesystems/ceph/0.94-pre.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ callPackage, fetchgit, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "0.94.3"; - - src = fetchgit { - url = "https://github.com/wkennington/ceph.git"; - rev = "6218aa41e04533f0d6e62b5c7be591c2e99716ec"; - sha256 = "0cyl5i1q6lap5a6vk8fjxfpikhxzwm9zkybg37nibahi2bwjr7rr"; - }; - - patches = [ ./fix-pgrefdebugging.patch ]; -}) diff --git a/pkgs/tools/filesystems/ceph/0.94.nix b/pkgs/tools/filesystems/ceph/0.94.nix index 4dca90e5f27..f564e28c5a3 100644 --- a/pkgs/tools/filesystems/ceph/0.94.nix +++ b/pkgs/tools/filesystems/ceph/0.94.nix @@ -1,16 +1,13 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // rec { - version = "0.94.2"; + version = "0.94.3"; src = fetchgit { url = "https://github.com/ceph/ceph.git"; rev = "refs/tags/v${version}"; - sha256 = "1nhqzmxv7bz93b8rbd88wgmw9icm2lhmc94dfscgh23kfpipyd6l"; + sha256 = "020khb9978wayi4jnx7f9g1fzfg3r2xn9qw66snpd3k8w2dmycxy"; }; - patches = [ - ./fix-pgrefdebugging.patch - ./boost-158.patch - ]; + patches = [ ./fix-pgrefdebugging.patch ]; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bdbed02ef2d..e1c50957d00 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1066,7 +1066,6 @@ let libceph = ceph.lib; ceph-0_80 = callPackage ../tools/filesystems/ceph/0.80.nix { }; ceph-0_94 = callPackage ../tools/filesystems/ceph/0.94.nix { }; - ceph-0_94-pre = callPackage ../tools/filesystems/ceph/0.94-pre.nix { }; ceph = callPackage ../tools/filesystems/ceph { }; ceph-dev = lowPrio (callPackage ../tools/filesystems/ceph/dev.nix { }); ceph-git = lowPrio (callPackage ../tools/filesystems/ceph/git.nix { }); From b409331a5a96c3dd67004d25adb1d96dbb8aa468 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 28 Aug 2015 17:49:15 -0700 Subject: [PATCH 173/175] ipset: 6.24 -> 6.26 --- pkgs/os-specific/linux/ipset/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix index b76ce583b23..2db57ecef92 100644 --- a/pkgs/os-specific/linux/ipset/default.nix +++ b/pkgs/os-specific/linux/ipset/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - name = "ipset-6.24"; + name = "ipset-6.26"; src = fetchurl { url = "http://ipset.netfilter.org/${name}.tar.bz2"; - sha256 = "1l4mx78473azf7cb19fxf37gmj95k1zzabimbcmlg9h07wlgqw9h"; + sha256 = "0lbsg1fbiw9m959lgqziyivmx32z3vbnp3jhgnprkq31ia7a29kn"; }; - buildInputs = [ pkgconfig libmnl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libmnl ]; configureFlags = [ "--with-kmod=no" ]; From 3e6092fe6b4b475981f4e27e0726e8da83c507e2 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 28 Aug 2015 17:50:55 -0700 Subject: [PATCH 174/175] libraw: 0.16.0 -> 0.17.0 --- pkgs/development/libraries/libraw/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index d272ad18492..3d564fc00f8 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libraw-${version}"; - version = "0.16.0"; + version = "0.17.0"; src = fetchurl { url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz"; - sha256 = "15ng4s24grib39r0nlgrf18r2j9yh43qyx4vbif38d95xiqkix3i"; + sha256 = "043kckxjqanw8dl3m9f6kvsf0l20ywxmgxd1xb0slj6m8l4w4hz6"; }; buildInputs = [ lcms2 jasper ] ; @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"; homepage = http://www.libraw.org/; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.all; }; } From d2dce19793069b6104ff7df29af92316e7fe3b50 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 28 Aug 2015 17:53:48 -0700 Subject: [PATCH 175/175] uid_wrapper: 1.1.0 -> 1.1.1 --- pkgs/development/libraries/uid_wrapper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix index 07fffeff20d..0ec6342c39e 100644 --- a/pkgs/development/libraries/uid_wrapper/default.nix +++ b/pkgs/development/libraries/uid_wrapper/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "uid_wrapper-1.1.0"; + name = "uid_wrapper-1.1.1"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "18xdyy7rvn0zg6j44ay0sxd4q0bplq64syyki9wi8ixhkrzqn0yn"; + sha256 = "0y033cjs0kwmpx70xc4wh789vk9rw6bziizs28h50ad7lyyvx5b9"; }; - buildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; meta = with stdenv.lib; { description = "a wrapper for the user, group and hosts NSS API";